From a07d3c4cd485d99a180161f849317acac2a899e1 Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Fri, 11 Sep 2015 13:09:51 -0700
Subject: [PATCH 001/191] Display plots are now preserved, instead of
 constantly being thrown out

---
 Packages/vcs/Lib/Canvas.py   | 29 +++++++++++++++++++++--------
 Packages/vcs/Lib/VTKPlots.py |  8 ++++----
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/Packages/vcs/Lib/Canvas.py b/Packages/vcs/Lib/Canvas.py
index 7f066aec8..cf4edd2d4 100644
--- a/Packages/vcs/Lib/Canvas.py
+++ b/Packages/vcs/Lib/Canvas.py
@@ -2374,7 +2374,7 @@ Options:::
                        'xbounds', 'ybounds', 'xname', 'yname', 'xunits', 'yunits', 'xweights', 'yweights',
                        'comment1', 'comment2', 'comment3', 'comment4', 'hms', 'long_name', 'zaxis',
                        'zarray', 'zname', 'zunits', 'taxis', 'tarray', 'tname', 'tunits', 'waxis', 'warray',
-                       'wname', 'wunits', 'bg', 'ratio', 'donotstoredisplay', 'render']
+                       'wname', 'wunits', 'bg', 'ratio', 'donotstoredisplay', 'render', "display_name"]
 
     # def replot(self):
     #    """ Clears and plots with last used plot arguments
@@ -3584,14 +3584,18 @@ Options:::
                     "unknown taylordiagram graphic method: %s" %
                     arglist[4])
             t.plot(arglist[0], canvas=self, template=arglist[2], **keyargs)
-            nm, src = self.check_name_source(None, "default", "display")
-            dn = displayplot.Dp(nm)
+
+            dname = keyargs.get("display_name")
+            if dname is not None:
+                dn = vcs.elements["display"][dname]
+            else:
+                nm, src = self.check_name_source(None, "default", "display")
+                dn = displayplot.Dp(nm)
             dn.template = arglist[2]
             dn.g_type = arglist[3]
             dn.g_name = arglist[4]
             dn.array = arglist[:2]
             dn.extradisplays = t.displays
-# dn.array=arglist[0]
             for p in slab_changed_attributes.keys():
                 tmp = slab_changed_attributes[p]
                 if tmp == (None, None):
@@ -3838,9 +3842,13 @@ Options:::
             else:
                 returned_kargs = self.backend.plot(*arglist, **keyargs)
                 if not keyargs.get("donotstoredisplay", False):
-                    nm, src = self.check_name_source(
-                        None, "default", "display")
-                    dn = displayplot.Dp(nm)
+                    dname = keyargs.get("display_name")
+                    if dname is not None:
+                        dn = vcs.elements['display'][dname]
+                    else:
+                        nm, src = self.check_name_source(
+                            None, "default", "display")
+                        dn = displayplot.Dp(nm)
                     dn.template = arglist[2]
                     dn.g_type = arglist[3]
                     dn.g_name = arglist[4]
@@ -3990,6 +3998,10 @@ Options:::
             self.configurator.stop_animating()
         self.animate_info = []
         self.animate.update_animate_display_list()
+
+        preserve_display = kargs.get("preserve_display", False)
+        if "preserve_display" in kargs:
+            del kargs["preserve_display"]
         self.backend.clear(*args, **kargs)
         for nm in self.display_names:
             # Lets look at elements created by dispaly production
@@ -4004,7 +4016,8 @@ Options:::
                     for k in new_elts[e]:
                         if k in vcs.elements[e].keys():
                             del(vcs.elements[e][k])
-            del(vcs.elements["display"][nm])
+            if not preserve_display:
+                del(vcs.elements["display"][nm])
         self.display_names = []
         return
 
diff --git a/Packages/vcs/Lib/VTKPlots.py b/Packages/vcs/Lib/VTKPlots.py
index eb923f0c4..db6f45d97 100644
--- a/Packages/vcs/Lib/VTKPlots.py
+++ b/Packages/vcs/Lib/VTKPlots.py
@@ -232,15 +232,15 @@ class VTKVCSBackend(object):
             parg.append(d.g_type)
             parg.append(d.g_name)
             plots_args.append(parg)
+            key = {"display_name": dnm}
             if d.ratio is not None:
-                key_args.append({"ratio": d.ratio})
-            else:
-                key_args.append({})
+                key["ratio"] = d.ratio
+            key_args.append(key)
 
         # Have to pull out the UI layer so it doesn't get borked by the clear
         self.hideGUI()
 
-        self.canvas.clear(render=False)
+        self.canvas.clear(render=False, preserve_display=True)
 
         for i, pargs in enumerate(plots_args):
             self.canvas.plot(*pargs, render=False, **key_args[i])
-- 
GitLab


From 10e92c09f824d91719a15e1bf2093e21904f605b Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Tue, 26 Jan 2016 14:52:54 -0800
Subject: [PATCH 002/191] Made VCSAddon be a new-style object

---
 Packages/vcsaddons/Lib/core.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Packages/vcsaddons/Lib/core.py b/Packages/vcsaddons/Lib/core.py
index 38932c486..b12bf627d 100644
--- a/Packages/vcsaddons/Lib/core.py
+++ b/Packages/vcsaddons/Lib/core.py
@@ -1,7 +1,7 @@
 import vcsaddons,vcs
 import numpy
 
-class VCSaddon:
+class VCSaddon(object):
     def __init__(self,name=None,source='default',x=None,template=None):
         self._saves={}
         self.g_nslabs=1
@@ -139,14 +139,14 @@ class VCSaddon:
             self._saves={}
 
 
-    def getgm(self,name):
+    def getgm(self,source="default"):
         gm = None
         for nm in vcsaddons.gms[self.g_name].keys():
-            if name == nm:
+            if source == nm:
                 return vcsaddons.gms[self.g_name][nm]
 
         if gm is None:
-            raise "Could not find graphic method %s named: %s" % (self.g_type, name)
+            raise "Could not find graphic method %s named: %s" % (self.g_type, source)
 
     def creategm(self,name,source='default'):
         return self.__init__(name,source=source,x=self.x,template=self.template)
-- 
GitLab


From ffe9cff7445b9d94f5c35021aec22f7d67b9b6d2 Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Tue, 26 Jan 2016 14:53:32 -0800
Subject: [PATCH 003/191] Flake8'd

---
 Packages/vcsaddons/Lib/histograms.py | 95 ++++++++++++++--------------
 1 file changed, 49 insertions(+), 46 deletions(-)

diff --git a/Packages/vcsaddons/Lib/histograms.py b/Packages/vcsaddons/Lib/histograms.py
index 6e974f2a6..f51a1500b 100644
--- a/Packages/vcsaddons/Lib/histograms.py
+++ b/Packages/vcsaddons/Lib/histograms.py
@@ -1,31 +1,35 @@
 from core import VCSaddon
-import cdms2,MV2,vcs,vcsaddons
+import cdms2
+import MV2
+import vcs
+import vcsaddons
+
 
 class Ghg(VCSaddon):
-    def __init__(self,name=None,source='default',x=None,template = None):
-        self.g_name='Ghg'
-        self.g_type='histogram'
-        VCSaddon.__init__(self,name,source,x,template)
+
+    def __init__(self, name=None, source='default', x=None, template=None):
+        self.g_name = 'Ghg'
+        self.g_type = 'histogram'
+        VCSaddon.__init__(self, name, source, x, template)
         if source == 'default':
-            self.fillareastyles = ['solid',]
-            self.fillareaindices = [1,]
-            self.fillareacolors = [252,]
-            self.line = ['solid',]
-            self.linewidth=[1.0,]
-            self.linecolors=[241,]
+            self.fillareastyles = ['solid']
+            self.fillareaindices = [1]
+            self.fillareacolors = [252]
+            self.line = ['solid']
+            self.linewidth = [1.0]
+            self.linecolors = [241]
         else:
             gm = vcsaddons.gms[self.g_name][source]
-            self.fillareastyle= gm.fillareastyles
+            self.fillareastyle = gm.fillareastyles
             self.fillareaindices = gm.fillareaindices
             self.fillareacolors = gm.fillareacolors
             self.line = gm.line
             self.linewidth = gm.linewidth
             self.linecolors = gm.linecolors
-            
 
     def list(self):
         print '---------- Histogram (Ghg) member (attribute) listings ----------'
-        print 'Canvas Mode = ',self.x.mode
+        print 'Canvas Mode = ', self.x.mode
         VCSaddon.list(self)
         print 'fillareastyles = ', self.fillareastyles
         print 'fillareaindices = ', self.fillareaindices
@@ -33,26 +37,25 @@ class Ghg(VCSaddon):
         print 'line = ', self.line
         print 'linewidth = ', self.linewidth
         print 'linecolors = ', self.linecolors
-        
-    
-    def plot(self,data,template = None, bg=0, x=None):
+
+    def plot(self, data, template=None, bg=0, x=None):
         if x is None:
             x = self.x
         if template is None:
             template = self.template
-        elif isinstance(template,str):
+        elif isinstance(template, str):
             template = x.gettemplate(template)
         elif not vcs.istemplate(template):
             raise "Error did not know what to do with template: %s" % template
-        
-        if not isinstance(data,cdms2.tvariable.TransientVariable):
-            mode= cdms2.getAutoBounds()
+
+        if not isinstance(data, cdms2.tvariable.TransientVariable):
+            mode = cdms2.getAutoBounds()
             cdms2.setAutoBounds("on")
             data = MV2.array(data)
             data.getAxis(-1).getBounds()
             cdms2.setAutoBounds(mode)
 
-        while data.rank()>1:
+        while data.rank() > 1:
             data = data[0]
 
         # ok now we have a good x and a good data
@@ -61,26 +64,27 @@ class Ghg(VCSaddon):
         # create the primitive
         fill = x.createfillarea()
         line = x.createline()
-        fill.viewport = [template.data.x1,template.data.x2,template.data.y1,template.data.y2]
-        line.viewport = [template.data.x1,template.data.x2,template.data.y1,template.data.y2]
+        fill.viewport = [
+            template.data.x1, template.data.x2, template.data.y1, template.data.y2]
+        line.viewport = [
+            template.data.x1, template.data.x2, template.data.y1, template.data.y2]
         axb = data.getAxis(0).getBounds()
-        xmn,xmx = vcs.minmax(axb)
-        ymn,ymx = vcs.minmax(data)
-        
-        xmn,xmx,ymn,ymx = self.prep_plot(xmn,xmx,ymn,ymx)
-        
-        fill.worldcoordinate=[xmn,xmx,ymn,ymx]
-        line.worldcoordinate=[xmn,xmx,ymn,ymx]
-        
-        styles =[]
+        xmn, xmx = vcs.minmax(axb)
+        ymn, ymx = vcs.minmax(data)
+
+        xmn, xmx, ymn, ymx = self.prep_plot(xmn, xmx, ymn, ymx)
+
+        fill.worldcoordinate = [xmn, xmx, ymn, ymx]
+        line.worldcoordinate = [xmn, xmx, ymn, ymx]
+
+        styles = []
         cols = []
         indices = []
         lt = []
-        lw =[]
+        lw = []
         lc = []
         xs = []
         ys = []
-        
 
         for i in range(nbars):
             if i < len(self.fillareastyles):
@@ -96,21 +100,20 @@ class Ghg(VCSaddon):
             else:
                 indices.append(self.fillareaindices[-1])
             if i < len(self.line):
-                lt.append( self.line[i])
+                lt.append(self.line[i])
             else:
                 lt.append(self.line[-1])
             if i < len(self.linewidth):
-                lw.append( self.linewidth[i])
+                lw.append(self.linewidth[i])
             else:
                 lw.append(self.linewidth[-1])
             if i < len(self.line):
-                lc.append( self.linecolors[i])
+                lc.append(self.linecolors[i])
             else:
                 lc.append(self.linecolors[-1])
-            
-            xs.append( [axb[i][0],axb[i][1],axb[i][1],axb[i][0],axb[i][0]])
-            ys.append( [0,0,data[i],data[i],0])
 
+            xs.append([axb[i][0], axb[i][1], axb[i][1], axb[i][0], axb[i][0]])
+            ys.append([0, 0, data[i], data[i], 0])
 
         fill.style = styles
         fill.x = xs
@@ -123,13 +126,13 @@ class Ghg(VCSaddon):
         line.type = lt
         line.width = lw
         line.color = lc
-
+        fill.list()
         displays = []
-        displays.append(x.plot(fill,bg=bg))
-        displays.append(x.plot(line,bg=bg))
+        displays.append(x.plot(fill, bg=bg))
+        displays.append(x.plot(line, bg=bg))
 
-        x.worldcoordinate = fill.worldcoordinate 
-        dsp = template.plot(data,self,bg=bg)
+        x.worldcoordinate = fill.worldcoordinate
+        dsp = template.plot(data, self, bg=bg)
         for d in dsp:
             displays.append(d)
 
-- 
GitLab


From 26031e3a24b17a54f5dc6f62d2112f00cbf10148 Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Fri, 5 Feb 2016 08:47:54 -0800
Subject: [PATCH 004/191] Made histogram work and display variance; needs to be
 cleaned up

---
 Packages/vcsaddons/Lib/core.py       |   6 +
 Packages/vcsaddons/Lib/histograms.py | 161 ++++++++++++++++++---------
 2 files changed, 115 insertions(+), 52 deletions(-)

diff --git a/Packages/vcsaddons/Lib/core.py b/Packages/vcsaddons/Lib/core.py
index b12bf627d..c39667bb8 100644
--- a/Packages/vcsaddons/Lib/core.py
+++ b/Packages/vcsaddons/Lib/core.py
@@ -38,6 +38,7 @@ class VCSaddon(object):
             self.datawc_x2=1.e20
             self.datawc_y1=1.e20
             self.datawc_y2=1.e20
+            self.colormap="default"
             self.xmtics1='*'
             self.xmtics2='*'
             self.ymtics1='*'
@@ -48,6 +49,8 @@ class VCSaddon(object):
             self.yticlabels2='*'
             self.xaxisconvert= 'linear'
             self.yaxisconvert= 'linear'
+            self.color_1 = 16
+            self.color_2 = 239
             self.legend = None
             self.projection='linear'
         else:
@@ -58,6 +61,7 @@ class VCSaddon(object):
             self.datawc_x2=gm.datawc_x2
             self.datawc_y1=gm.datawc_y1
             self.datawc_y2=gm.datawc_x2
+            self.colormap=gm.colormap
             self.xmtics1=gm.xmtics1
             self.xmtics2=gm.xmtics2
             self.ymtics1=gm.ymtics1
@@ -68,6 +72,8 @@ class VCSaddon(object):
             self.yticlabels2=gm.yticlabels2
             self.xaxisconvert=gm.xaxisconvert
             self.yaxisconvert= gm.yaxisconvert
+            self.color_1 = gm.color_1
+            self.color_2 = gm.color_2
             self.legend = gm.legend
             self.projection=gm.projection
         self.name = name
diff --git a/Packages/vcsaddons/Lib/histograms.py b/Packages/vcsaddons/Lib/histograms.py
index f51a1500b..69c575615 100644
--- a/Packages/vcsaddons/Lib/histograms.py
+++ b/Packages/vcsaddons/Lib/histograms.py
@@ -1,6 +1,7 @@
 from core import VCSaddon
 import cdms2
 import MV2
+import numpy
 import vcs
 import vcsaddons
 
@@ -12,20 +13,22 @@ class Ghg(VCSaddon):
         self.g_type = 'histogram'
         VCSaddon.__init__(self, name, source, x, template)
         if source == 'default':
-            self.fillareastyles = ['solid']
-            self.fillareaindices = [1]
-            self.fillareacolors = [252]
-            self.line = ['solid']
-            self.linewidth = [1.0]
-            self.linecolors = [241]
+            self.line = []
+            self.linewidth = []
+            self.linecolors = []
+            self.fillareastyles = []
+            self.fillareaindices = []
+            self.fillareacolors = []
+            self.bins = []
         else:
             gm = vcsaddons.gms[self.g_name][source]
-            self.fillareastyle = gm.fillareastyles
-            self.fillareaindices = gm.fillareaindices
-            self.fillareacolors = gm.fillareacolors
             self.line = gm.line
             self.linewidth = gm.linewidth
             self.linecolors = gm.linecolors
+            self.fillareastyles = gm.fillareastyles
+            self.fillareaindices = gm.fillareaindices
+            self.fillareacolors = gm.fillareacolors
+            self.bins = gm.bins
 
     def list(self):
         print '---------- Histogram (Ghg) member (attribute) listings ----------'
@@ -37,6 +40,7 @@ class Ghg(VCSaddon):
         print 'line = ', self.line
         print 'linewidth = ', self.linewidth
         print 'linecolors = ', self.linecolors
+        print 'bins = ', self.bins
 
     def plot(self, data, template=None, bg=0, x=None):
         if x is None:
@@ -46,20 +50,34 @@ class Ghg(VCSaddon):
         elif isinstance(template, str):
             template = x.gettemplate(template)
         elif not vcs.istemplate(template):
-            raise "Error did not know what to do with template: %s" % template
-
-        if not isinstance(data, cdms2.tvariable.TransientVariable):
-            mode = cdms2.getAutoBounds()
-            cdms2.setAutoBounds("on")
-            data = MV2.array(data)
-            data.getAxis(-1).getBounds()
-            cdms2.setAutoBounds(mode)
+            raise ValueError("Error did not know what to do with template: %s" % template)
 
-        while data.rank() > 1:
-            data = data[0]
+        # We'll just flatten the data... if they want to be more precise, should pass in more precise data
+        data = data.flatten().asma()
 
         # ok now we have a good x and a good data
-        nbars = len(data)
+        if not self.bins:
+            self.bins = vcs.utils.mkscale(*vcs.minmax(data))
+
+        data_bins = numpy.digitize(data, self.bins) - 1
+        binned = [data[data_bins==i] for i in range(len(self.bins))]
+
+        means = []
+        stds = []
+
+        max_possible_deviance = 0
+
+        for ind, databin in enumerate(binned):
+            means.append(databin.mean())
+            stds.append(databin.std())
+            if len(self.bins) > ind + 1:
+                max_possible_deviance = max(means[ind] - self.bins[ind], self.bins[ind + 1] - means[ind], max_possible_deviance)
+            else:
+                max_possible_deviance = max(means[ind] - self.bins[ind], max_possible_deviance)
+
+        color_values = [std / max_possible_deviance for std in stds]
+        y_values, _ = numpy.histogram(data, self.bins)
+        nbars = len(self.bins) - 1
 
         # create the primitive
         fill = x.createfillarea()
@@ -68,9 +86,9 @@ class Ghg(VCSaddon):
             template.data.x1, template.data.x2, template.data.y1, template.data.y2]
         line.viewport = [
             template.data.x1, template.data.x2, template.data.y1, template.data.y2]
-        axb = data.getAxis(0).getBounds()
-        xmn, xmx = vcs.minmax(axb)
-        ymn, ymx = vcs.minmax(data)
+
+        xmn, xmx = vcs.minmax(self.bins)
+        ymn, ymx = 0, len(data)
 
         xmn, xmx, ymn, ymx = self.prep_plot(xmn, xmx, ymn, ymx)
 
@@ -86,34 +104,67 @@ class Ghg(VCSaddon):
         xs = []
         ys = []
 
-        for i in range(nbars):
-            if i < len(self.fillareastyles):
-                styles.append(self.fillareastyles[i])
-            else:
-                styles.append(self.fillareastyles[-1])
-            if i < len(self.fillareacolors):
-                cols.append(self.fillareacolors[i])
-            else:
-                cols.append(self.fillareacolors[-1])
-            if i < len(self.fillareaindices):
-                indices.append(self.fillareaindices[i])
-            else:
-                indices.append(self.fillareaindices[-1])
-            if i < len(self.line):
-                lt.append(self.line[i])
-            else:
-                lt.append(self.line[-1])
-            if i < len(self.linewidth):
-                lw.append(self.linewidth[i])
-            else:
-                lw.append(self.linewidth[-1])
-            if i < len(self.line):
-                lc.append(self.linecolors[i])
-            else:
-                lc.append(self.linecolors[-1])
+        levels = [.1 * i for i in range(11)]
 
-            xs.append([axb[i][0], axb[i][1], axb[i][1], axb[i][0], axb[i][0]])
-            ys.append([0, 0, data[i], data[i], 0])
+        # Extend fillarea and line attrs to levels
+        if self.fillareastyles:
+            while len(self.fillareastyles) < len(levels):
+                self.fillareastyles.append(self.fillareastyles[-1])
+        else:
+            self.fillareastyles = ["solid"] * len(levels)
+
+        if self.fillareacolors:
+            while len(self.fillareacolors) < len(levels):
+                self.fillareacolors.append(self.fillareacolors[-1])
+        else:
+            for lev in levels:
+                self.fillareacolors.append(int((self.color_2 - self.color_1) * lev) + self.color_1)
+
+        if self.fillareaindices:
+            while len(self.fillareaindices) < len(levels):
+                self.fillareaindices.append(self.fillareaindices[-1])
+        else:
+            self.fillareaindices = [1] * len(levels)
+
+        if self.line:
+            while len(self.line) < len(levels):
+                self.line.append(self.line[-1])
+        else:
+            self.line = ["solid"] * len(levels)
+
+        if self.linewidth:
+            while len(self.linewidth) < len(levels):
+                self.linewidth.append(self.linewidth[-1])
+        else:
+            self.linewidth = [1] * len(levels)
+
+        if self.linecolors:
+            while len(self.linecolors) < len(levels):
+                self.linecolors.append(self.linecolors[-1])
+        else:
+            self.linecolors = ["black"] * len(levels)
+
+        for i in range(nbars):
+            # Calculate level for bar
+            value = color_values[i]
+            for lev_ind in range(len(levels)):
+                if levels[lev_ind] > value:
+                    if lev_ind > 0:
+                        lev_ind -= 1
+                        break
+                    else:
+                        # Shouldn't ever get here since level 0 is 0
+                        assert False
+
+            styles.append(self.fillareastyles[lev_ind])
+            cols.append(self.fillareacolors[lev_ind])
+            indices.append(self.fillareaindices[lev_ind])
+            lt.append(self.line[lev_ind])
+            lw.append(self.linewidth[lev_ind])
+            lc.append(self.linecolors[lev_ind])
+
+            xs.append([self.bins[i], self.bins[i], self.bins[i + 1], self.bins[i + 1]])
+            ys.append([0, y_values[i], y_values[i], 0])
 
         fill.style = styles
         fill.x = xs
@@ -121,20 +172,26 @@ class Ghg(VCSaddon):
         fill.style
         fill.index = indices
         fill.color = cols
+        fill.colormap = self.colormap
         line.x = xs
         line.y = ys
         line.type = lt
         line.width = lw
         line.color = lc
-        fill.list()
         displays = []
         displays.append(x.plot(fill, bg=bg))
         displays.append(x.plot(line, bg=bg))
 
         x.worldcoordinate = fill.worldcoordinate
-        dsp = template.plot(data, self, bg=bg)
+
+        x_axis = cdms2.createAxis(self.bins, id="x")
+        y_axis = cdms2.createAxis(vcs.mkscale(0, len(data)), id="y")
+
+        dsp = template.plot(x, MV2.masked_array(data), self, bg=bg, X=x_axis, Y=y_axis)
         for d in dsp:
             displays.append(d)
 
         self.restore()
+        # Ugh, hack
+        x.backend.renWin.Render()
         return displays
-- 
GitLab


From 53f54dff490bd99b526ae96e49fc3ecc8362a9e5 Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Mon, 8 Feb 2016 10:12:14 -0800
Subject: [PATCH 005/191] Adjusted y scale

---
 Packages/vcsaddons/Lib/histograms.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Packages/vcsaddons/Lib/histograms.py b/Packages/vcsaddons/Lib/histograms.py
index 69c575615..0b7d7de86 100644
--- a/Packages/vcsaddons/Lib/histograms.py
+++ b/Packages/vcsaddons/Lib/histograms.py
@@ -88,7 +88,8 @@ class Ghg(VCSaddon):
             template.data.x1, template.data.x2, template.data.y1, template.data.y2]
 
         xmn, xmx = vcs.minmax(self.bins)
-        ymn, ymx = 0, len(data)
+        # Make the y scale be slightly larger than the largest bar
+        ymn, ymx = 0, max(y_values) * 1.25
 
         xmn, xmx, ymn, ymx = self.prep_plot(xmn, xmx, ymn, ymx)
 
-- 
GitLab


From 510230038dc751a8e6803964b6ab09a0e1d24e0e Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Tue, 9 Feb 2016 12:09:18 -0800
Subject: [PATCH 006/191] Fixed vcsaddons to use display plots correctly

---
 Packages/vcs/Lib/Canvas.py           | 13 ++++++--
 Packages/vcs/Lib/displayplot.py      |  5 +++-
 Packages/vcsaddons/Lib/core.py       | 44 +++++++++++++++++++++-------
 Packages/vcsaddons/Lib/histograms.py |  6 ++--
 4 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/Packages/vcs/Lib/Canvas.py b/Packages/vcs/Lib/Canvas.py
index 48327f0c0..cbe877c8e 100644
--- a/Packages/vcs/Lib/Canvas.py
+++ b/Packages/vcs/Lib/Canvas.py
@@ -3518,9 +3518,14 @@ Options:::
                     tp = "boxfill"
                 elif tp in ("xvsy", "xyvsy", "yxvsx", "scatter"):
                     tp = "1d"
-                gm = vcs.elements[tp][arglist[4]]
+                if tp in vcsaddons.gms:
+                    gm = vcsaddons.gms[tp][arglist[4]]
+                    arglist[3] = gm
+                else:
+                    gm = vcs.elements[tp][arglist[4]]
                 if hasattr(gm, "priority") and gm.priority == 0:
                     return
+
             p = self.getprojection(gm.projection)
             if p.type in round_projections and (
                     doratio == "0" or doratio[:4] == "auto"):
@@ -3729,20 +3734,22 @@ Options:::
                 del(keyargs["bg"])
             if isinstance(arglist[3], vcsaddons.core.VCSaddon):
                 if arglist[1] is None:
-                    dn = arglist[3].plot(
+                    dn = arglist[3].plot_internal(
                         arglist[0],
                         template=arglist[2],
                         bg=bg,
                         x=self,
                         **keyargs)
                 else:
-                    dn = arglist[3].plot(
+                    dn = arglist[3].plot_internal(
                         arglist[0],
                         arglist[1],
                         template=arglist[2],
                         bg=bg,
                         x=self,
                         **keyargs)
+                self.display_names.append(dn.name)
+                return dn
             else:
                 returned_kargs = self.backend.plot(*arglist, **keyargs)
                 if not keyargs.get("donotstoredisplay", False):
diff --git a/Packages/vcs/Lib/displayplot.py b/Packages/vcs/Lib/displayplot.py
index 1f00450ba..dd66fac1d 100755
--- a/Packages/vcs/Lib/displayplot.py
+++ b/Packages/vcs/Lib/displayplot.py
@@ -25,6 +25,7 @@
 #
 import VCS_validation_functions
 import vcs
+import vcsaddons
 
 
 class Dp(object):
@@ -211,7 +212,7 @@ class Dp(object):
     def _setg_type(self, value):
         value = VCS_validation_functions.checkString(self, 'g_type', value)
         value = value.lower()
-        if value not in vcs.elements and value != "text":
+        if value not in vcs.elements and value != "text" and value not in vcsaddons.gms:
             raise ValueError(
                 "invalid g_type '%s' must be one of: %s " %
                 (value, vcs.elements.keys()))
@@ -259,6 +260,7 @@ class Dp(object):
             self._g_name = "default"
             self._array = []
             self._continents = 1
+            self._continents_line = "default"
             self.ratio = None
         else:
             src = vcs.elements["display"][Dp_name_src]
@@ -269,6 +271,7 @@ class Dp(object):
             self.g_type = src.g_type
             self.g_name = src.g_name
             self.continents = src.continents
+            self.continents_line = src.continents_line
             self.priority = src.priority
             self.ratio = src.ratio
 
diff --git a/Packages/vcsaddons/Lib/core.py b/Packages/vcsaddons/Lib/core.py
index c39667bb8..8421e247c 100644
--- a/Packages/vcsaddons/Lib/core.py
+++ b/Packages/vcsaddons/Lib/core.py
@@ -5,14 +5,14 @@ class VCSaddon(object):
     def __init__(self,name=None,source='default',x=None,template=None):
         self._saves={}
         self.g_nslabs=1
-        if not self.g_name in vcsaddons.gms.keys():
-            vcsaddons.gms[self.g_name]={}
+        if not self.g_type in vcsaddons.gms.keys():
+            vcsaddons.gms[self.g_type]={}
         if name is None:
             cont = True
             while cont:
                 num= numpy.random.randint(1000)
-                nm = 'Ghg_'+str(num)
-                if not nm in vcsaddons.gms[self.g_name].keys():
+                nm = self.g_type + '_'+str(num)
+                if not nm in vcsaddons.gms[self.g_type].keys():
                     name = nm
                     cont = False
 
@@ -30,7 +30,7 @@ class VCSaddon(object):
         else:
             raise "Error did not know what to do with template: %s" % template
 
-        if name in vcsaddons.gms[self.g_name].keys():
+        if name in vcsaddons.gms[self.g_type].keys():
             raise "Error graphic method %s already exists" % name
 
         if source=='default':
@@ -54,9 +54,9 @@ class VCSaddon(object):
             self.legend = None
             self.projection='linear'
         else:
-            gm =  vcsaddons.gms[self.g_name].get(source,None)
+            gm =  vcsaddons.gms[self.g_type].get(source,None)
             if gm is None:
-                raise "error could not find graphic method %s (of type %s)" % (source, self.g_name)
+                raise "error could not find graphic method %s (of type %s)" % (source, self.g_type)
             self.datawc_x1=gm.datawc_x1
             self.datawc_x2=gm.datawc_x2
             self.datawc_y1=gm.datawc_y1
@@ -77,7 +77,7 @@ class VCSaddon(object):
             self.legend = gm.legend
             self.projection=gm.projection
         self.name = name
-        vcsaddons.gms[self.g_name][name]=self
+        vcsaddons.gms[self.g_type][name]=self
         
 
     def list(self):
@@ -128,6 +128,30 @@ class VCSaddon(object):
                         setattr(self,axes+sec+n,vcs.mklabels(sc))
         return xmn,xmx,ymn,ymx
 
+    def plot_internal(self, slab=None, slab2=None, template=None, bg=0, x=None, **kwargs):
+        """
+        Used by vcs to properly build a display plot for this graphics method.
+        """
+        if x is None:
+            x = self.x
+
+        if slab2 is not None:
+            displays = self.plot(slab, slab2, template, bg, x, **kwargs)
+        else:
+            displays = self.plot(slab, template, bg, x, **kwargs)
+
+        for display in displays:
+            # Remove the display from the canvas
+            if display.name in x.display_names:
+                x.display_names.remove(display.name)
+        nm, src = x.check_name_source(None, "default", "display")
+        display = vcs.displayplot.Dp(nm)
+        display.g_name = self.name
+        display.g_type = self.g_type
+        display.array = [slab, slab2]
+        return display
+
+
     def save(self,attribute = None):
         if attribute is not None:
             self._saves[attribute] = getattr(self,attribute)
@@ -147,9 +171,9 @@ class VCSaddon(object):
 
     def getgm(self,source="default"):
         gm = None
-        for nm in vcsaddons.gms[self.g_name].keys():
+        for nm in vcsaddons.gms[self.g_type].keys():
             if source == nm:
-                return vcsaddons.gms[self.g_name][nm]
+                return vcsaddons.gms[self.g_type][nm]
 
         if gm is None:
             raise "Could not find graphic method %s named: %s" % (self.g_type, source)
diff --git a/Packages/vcsaddons/Lib/histograms.py b/Packages/vcsaddons/Lib/histograms.py
index 0b7d7de86..d0e41c4ed 100644
--- a/Packages/vcsaddons/Lib/histograms.py
+++ b/Packages/vcsaddons/Lib/histograms.py
@@ -42,7 +42,7 @@ class Ghg(VCSaddon):
         print 'linecolors = ', self.linecolors
         print 'bins = ', self.bins
 
-    def plot(self, data, template=None, bg=0, x=None):
+    def plot(self, data, template=None, bg=0, x=None, **kwargs):
         if x is None:
             x = self.x
         if template is None:
@@ -190,9 +190,11 @@ class Ghg(VCSaddon):
 
         dsp = template.plot(x, MV2.masked_array(data), self, bg=bg, X=x_axis, Y=y_axis)
         for d in dsp:
-            displays.append(d)
+            if d is not None:
+                displays.append(d)
 
         self.restore()
         # Ugh, hack
         x.backend.renWin.Render()
+        print displays
         return displays
-- 
GitLab


From 577499883890dc9bd70c1924a3e53b011641e613 Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Wed, 10 Feb 2016 09:25:41 -0800
Subject: [PATCH 007/191] Added legend, removed print, fixed the attr lengths

---
 Packages/vcsaddons/Lib/histograms.py | 30 ++++++++++++++++------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/Packages/vcsaddons/Lib/histograms.py b/Packages/vcsaddons/Lib/histograms.py
index d0e41c4ed..bf314f246 100644
--- a/Packages/vcsaddons/Lib/histograms.py
+++ b/Packages/vcsaddons/Lib/histograms.py
@@ -109,41 +109,41 @@ class Ghg(VCSaddon):
 
         # Extend fillarea and line attrs to levels
         if self.fillareastyles:
-            while len(self.fillareastyles) < len(levels):
+            while len(self.fillareastyles) < (len(levels) - 1):
                 self.fillareastyles.append(self.fillareastyles[-1])
         else:
-            self.fillareastyles = ["solid"] * len(levels)
+            self.fillareastyles = ["solid"] * (len(levels) - 1)
 
         if self.fillareacolors:
-            while len(self.fillareacolors) < len(levels):
+            while len(self.fillareacolors) < (len(levels) - 1):
                 self.fillareacolors.append(self.fillareacolors[-1])
         else:
-            for lev in levels:
+            for lev in levels[:-1]:
                 self.fillareacolors.append(int((self.color_2 - self.color_1) * lev) + self.color_1)
 
         if self.fillareaindices:
-            while len(self.fillareaindices) < len(levels):
+            while len(self.fillareaindices) < (len(levels) - 1):
                 self.fillareaindices.append(self.fillareaindices[-1])
         else:
-            self.fillareaindices = [1] * len(levels)
+            self.fillareaindices = [1] * (len(levels) - 1)
 
         if self.line:
-            while len(self.line) < len(levels):
+            while len(self.line) < (len(levels) - 1):
                 self.line.append(self.line[-1])
         else:
-            self.line = ["solid"] * len(levels)
+            self.line = ["solid"] * (len(levels) - 1)
 
         if self.linewidth:
-            while len(self.linewidth) < len(levels):
+            while len(self.linewidth) < (len(levels) - 1):
                 self.linewidth.append(self.linewidth[-1])
         else:
-            self.linewidth = [1] * len(levels)
+            self.linewidth = [1] * (len(levels) - 1)
 
         if self.linecolors:
-            while len(self.linecolors) < len(levels):
+            while len(self.linecolors) < (len(levels) - 1):
                 self.linecolors.append(self.linecolors[-1])
         else:
-            self.linecolors = ["black"] * len(levels)
+            self.linecolors = ["black"] * (len(levels) - 1)
 
         for i in range(nbars):
             # Calculate level for bar
@@ -193,8 +193,12 @@ class Ghg(VCSaddon):
             if d is not None:
                 displays.append(d)
 
+        dsp = template.drawColorBar(self.fillareacolors, levels, legend={0: "No Variance", .1:"", .2: "", .3:"", .4:"", .5:"", .6:"", .7:"", .8:"", .9:"", 1: "High Variance"}, x=x)
+        for d in dsp:
+            if d is not None:
+                displays.append(d)
+
         self.restore()
         # Ugh, hack
         x.backend.renWin.Render()
-        print displays
         return displays
-- 
GitLab


From 3af99c72693cb37050c8b842206a8c9aaf308b8d Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Wed, 10 Feb 2016 12:37:42 -0800
Subject: [PATCH 008/191] Finishing touch-ups on histo

---
 Packages/vcs/Lib/vcs2vtk.py          | 46 ++++++++++++++++++++++++++--
 Packages/vcsaddons/Lib/histograms.py | 17 +++++-----
 2 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/Packages/vcs/Lib/vcs2vtk.py b/Packages/vcs/Lib/vcs2vtk.py
index a7b178e89..a7ab029ab 100644
--- a/Packages/vcs/Lib/vcs2vtk.py
+++ b/Packages/vcs/Lib/vcs2vtk.py
@@ -1880,7 +1880,49 @@ def generateVectorArray(data1, data2, vtk_grid):
 
 def vtkIterate(iterator):
     iterator.InitTraversal()
-    obj = iterator.GetNextItem()
+    obj = iterator.GetNextItemAsObject()
     while obj is not None:
         yield obj
-        obj = iterator.GetNextItem()
+        obj = iterator.GetNextItemAsObject()
+
+
+# transforms [v1,v2] and returns it
+# such that it is in the same order
+# and has the same middle interval as [gm1, gm2]
+def switchAndTranslate(gm1, gm2, v1, v2, wrapModulo):
+    assert(v1 < v2)
+    # keep the same middle of the interval
+    if (wrapModulo):
+        gmMiddle = float(gm1 + gm2) / 2.0
+        half = float(v2 - v1) / 2.0
+        v1 = gmMiddle - half
+        v2 = gmMiddle + half
+    # if gm margins are increasing and dataset bounds are decreasing
+    # or the other way around switch them
+    if ((gm1 - gm2) * (v1 - v2) < 0):
+        v1, v2 = v2, v1
+    return [v1, v2]
+
+
+# TODO: Get rid of this funtion and pass instead: flip and central meridian
+# This function can fail for gmbounds -89, -2 where databounds are 89, 0
+# (the cells in the margins have different sizes: 2 and 4)
+#
+# returns bounds with the same interval size as databounds
+# but in the same order and with the same middle interval
+# as gmbounds. The middle and the order are used for
+# plotting. wrapModule has YWrap, XWrap in degrees, 0 means no wrap
+def getBoundsForPlotting(gmbounds, databounds, wrapModulo):
+    """ Returns the same interval as databounds but it
+    matches the order and also it keeps the same center interval as gmbounds
+    So for instance if databounds is -40, 320 and gmbounds is -180, 180
+    this function returns
+    """
+    x1gm, x2gm, y1gm, y2gm = gmbounds[:4]
+    x1, x2, y1, y2 = databounds[:4]
+    assert (x1 < x2 and y1 < y2)
+    if not numpy.allclose([x1gm, x2gm], 1.e20):
+        x1, x2 = switchAndTranslate(x1gm, x2gm, x1, x2, wrapModulo[1] if wrapModulo else None)
+    if (isinstance(y1gm, numbers.Number) and not numpy.allclose([y1gm, y2gm], 1.e20)):
+        y1, y2 = switchAndTranslate(y1gm, y2gm, y1, y2, wrapModulo[0] if wrapModulo else None)
+    return [x1, x2, y1, y2]
diff --git a/Packages/vcsaddons/Lib/histograms.py b/Packages/vcsaddons/Lib/histograms.py
index bf314f246..3c2b4a033 100644
--- a/Packages/vcsaddons/Lib/histograms.py
+++ b/Packages/vcsaddons/Lib/histograms.py
@@ -76,7 +76,7 @@ class Ghg(VCSaddon):
                 max_possible_deviance = max(means[ind] - self.bins[ind], max_possible_deviance)
 
         color_values = [std / max_possible_deviance for std in stds]
-        y_values, _ = numpy.histogram(data, self.bins)
+        y_values = [len(databin) for databin in binned]
         nbars = len(self.bins) - 1
 
         # create the primitive
@@ -91,7 +91,7 @@ class Ghg(VCSaddon):
         # Make the y scale be slightly larger than the largest bar
         ymn, ymx = 0, max(y_values) * 1.25
 
-        xmn, xmx, ymn, ymx = self.prep_plot(xmn, xmx, ymn, ymx)
+        #xmn, xmx, ymn, ymx = self.prep_plot(xmn, xmx, ymn, ymx)
 
         fill.worldcoordinate = [xmn, xmx, ymn, ymx]
         line.worldcoordinate = [xmn, xmx, ymn, ymx]
@@ -180,14 +180,12 @@ class Ghg(VCSaddon):
         line.width = lw
         line.color = lc
         displays = []
-        displays.append(x.plot(fill, bg=bg))
-        displays.append(x.plot(line, bg=bg))
-
-        x.worldcoordinate = fill.worldcoordinate
 
         x_axis = cdms2.createAxis(self.bins, id="x")
         y_axis = cdms2.createAxis(vcs.mkscale(0, len(data)), id="y")
 
+        displays.append(x.plot(fill, bg=bg, render=False))
+
         dsp = template.plot(x, MV2.masked_array(data), self, bg=bg, X=x_axis, Y=y_axis)
         for d in dsp:
             if d is not None:
@@ -198,7 +196,10 @@ class Ghg(VCSaddon):
             if d is not None:
                 displays.append(d)
 
+
+        displays.append(x.plot(line, bg=bg))
+
+        x.worldcoordinate = fill.worldcoordinate
+
         self.restore()
-        # Ugh, hack
-        x.backend.renWin.Render()
         return displays
-- 
GitLab


From 4c0e5d7862e5a8755a6188e0a49b0cccb1486220 Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Fri, 12 Feb 2016 08:11:11 -0800
Subject: [PATCH 009/191] Made the axis be labeled correctly

---
 Packages/vcsaddons/Lib/histograms.py | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/Packages/vcsaddons/Lib/histograms.py b/Packages/vcsaddons/Lib/histograms.py
index 3c2b4a033..60f866492 100644
--- a/Packages/vcsaddons/Lib/histograms.py
+++ b/Packages/vcsaddons/Lib/histograms.py
@@ -51,6 +51,16 @@ class Ghg(VCSaddon):
             template = x.gettemplate(template)
         elif not vcs.istemplate(template):
             raise ValueError("Error did not know what to do with template: %s" % template)
+        try:
+            data_name = data.title
+        except AttributeError:
+            try:
+                data_name = data.long_name
+            except AttributeError:
+                try:
+                    data_name = data.id + data.units
+                except AttributeError:
+                    data_name = data.id
 
         # We'll just flatten the data... if they want to be more precise, should pass in more precise data
         data = data.flatten().asma()
@@ -181,12 +191,13 @@ class Ghg(VCSaddon):
         line.color = lc
         displays = []
 
-        x_axis = cdms2.createAxis(self.bins, id="x")
-        y_axis = cdms2.createAxis(vcs.mkscale(0, len(data)), id="y")
+        x_axis = cdms2.createAxis(self.bins, id=data_name)
+        y_axis = cdms2.createAxis(vcs.mkscale(0, ymx), id="bin_size")
 
         displays.append(x.plot(fill, bg=bg, render=False))
-
-        dsp = template.plot(x, MV2.masked_array(data), self, bg=bg, X=x_axis, Y=y_axis)
+        arr = MV2.masked_array(y_values)
+        arr.setAxis(0, x_axis)
+        dsp = template.plot(x, arr, self, bg=bg, X=x_axis, Y=y_axis)
         for d in dsp:
             if d is not None:
                 displays.append(d)
@@ -196,7 +207,6 @@ class Ghg(VCSaddon):
             if d is not None:
                 displays.append(d)
 
-
         displays.append(x.plot(line, bg=bg))
 
         x.worldcoordinate = fill.worldcoordinate
-- 
GitLab


From 1bb3806f83652635c3f8e44be937721ae1c22463 Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Fri, 25 Mar 2016 15:26:31 -0700
Subject: [PATCH 010/191] Fixes #1894

---
 Packages/vcs/Lib/vcsvtk/boxfillpipeline.py |  4 ++--
 Packages/vcs/Lib/vcsvtk/isofillpipeline.py | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Packages/vcs/Lib/vcsvtk/boxfillpipeline.py b/Packages/vcs/Lib/vcsvtk/boxfillpipeline.py
index 64ad4f00c..54d9b8a60 100644
--- a/Packages/vcs/Lib/vcsvtk/boxfillpipeline.py
+++ b/Packages/vcs/Lib/vcsvtk/boxfillpipeline.py
@@ -52,7 +52,7 @@ class BoxfillPipeline(Pipeline2D):
         if numpy.allclose(self._gm.level_1, 1.e20) or \
            numpy.allclose(self._gm.level_2, 1.e20):
             self._contourLevels = vcs.mkscale(self._scalarRange[0],
-                                              self._scalarRange[1])
+                                              self._scalarRange[1], nc=min(nlev, 12))
             if len(self._contourLevels) == 1:  # constant value ?
                 self._contourLevels = [self._contourLevels[0],
                                        self._contourLevels[0] + .00001]
@@ -282,7 +282,7 @@ class BoxfillPipeline(Pipeline2D):
 
         # Colortable bit
         # make sure length match
-        numLevels = len(self._contourLevels)
+        numLevels = len(self._contourLevels) - 1
         while len(self._contourColors) < numLevels:
             self._contourColors.append(self._contourColors[-1])
 
diff --git a/Packages/vcs/Lib/vcsvtk/isofillpipeline.py b/Packages/vcs/Lib/vcsvtk/isofillpipeline.py
index 59b31272a..28c7ee469 100644
--- a/Packages/vcs/Lib/vcsvtk/isofillpipeline.py
+++ b/Packages/vcs/Lib/vcsvtk/isofillpipeline.py
@@ -46,11 +46,11 @@ class IsofillPipeline(Pipeline2D):
     def _plotInternal(self):
         """Overrides baseclass implementation."""
 
-        prepedContours = self._prepContours()
-        tmpLevels = prepedContours["tmpLevels"]
-        tmpIndices = prepedContours["tmpIndices"]
-        tmpColors = prepedContours["tmpColors"]
-        tmpOpacities = prepedContours["tmpOpacities"]
+        preppedCountours = self._prepContours()
+        tmpLevels = preppedCountours["tmpLevels"]
+        tmpIndices = preppedCountours["tmpIndices"]
+        tmpColors = preppedCountours["tmpColors"]
+        tmpOpacities = preppedCountours["tmpOpacities"]
         style = self._gm.fillareastyle
 
         luts = []
-- 
GitLab


From eb791bcfb6cfb01bb44f83a916ecd0da659fa862 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 5 Apr 2016 09:37:12 -0700
Subject: [PATCH 011/191] fix #1907

---
 CMake/cdat_modules/docutils_external.cmake               | 2 +-
 CMake/cdat_modules/gdal_external.cmake                   | 4 +++-
 CMake/cdat_modules/spyder_external.cmake                 | 2 +-
 CMake/cdat_modules_extra/cdatmpi_configure_step.cmake.in | 1 +
 CMake/cmake_modules/pipinstaller.cmake                   | 2 ++
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CMake/cdat_modules/docutils_external.cmake b/CMake/cdat_modules/docutils_external.cmake
index ae62d3b59..8e419bd00 100644
--- a/CMake/cdat_modules/docutils_external.cmake
+++ b/CMake/cdat_modules/docutils_external.cmake
@@ -2,5 +2,5 @@
 # and configure and build it
 
 set(nm docutils)
-
+set(OLD "")
 include(pipinstaller)
diff --git a/CMake/cdat_modules/gdal_external.cmake b/CMake/cdat_modules/gdal_external.cmake
index 6efa6ae11..33e4c8e60 100644
--- a/CMake/cdat_modules/gdal_external.cmake
+++ b/CMake/cdat_modules/gdal_external.cmake
@@ -17,7 +17,9 @@ ExternalProject_Add(gdal
   URL_MD5 ${GDAL_MD5}
   BUILD_IN_SOURCE 1
   PATCH_COMMAND ""
-  CONFIGURE_COMMAND sh configure --prefix=${cdat_EXTERNALS} --with-hdf5=${cdat_EXTERNALS} --with-netcdf=${cdat_EXTERNALS} --with-curl=${cdat_EXTERNALS} --with-geos=${cdat_EXTERNALS}/bin/geos-config --with-python=${PYTHON_EXECUTABLE} --with-jpeg=no --with-libtiff=internal --without-jpeg12 --with-geotiff=internal
+  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -DCONFIGURE_ARGS=${gdal_configure_args} -P ${cdat_CMAKE_BINARY_DIR}/${configure_file}
+  BUILD_COMMAND ${CMAKE_COMMAND} -Dmake=$(MAKE) -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
+  INSTALL_COMMAND ${CMAKE_COMMAND} -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_install_step.cmake
   DEPENDS "${gdal_deps}"
   ${ep_log_options}
 )
diff --git a/CMake/cdat_modules/spyder_external.cmake b/CMake/cdat_modules/spyder_external.cmake
index 2f1b6631b..ef88a8338 100644
--- a/CMake/cdat_modules/spyder_external.cmake
+++ b/CMake/cdat_modules/spyder_external.cmake
@@ -2,6 +2,6 @@
 # and configure and build it
 
 set (nm spyder)
-
+set(OLD "")
 include(pipinstaller)
 
diff --git a/CMake/cdat_modules_extra/cdatmpi_configure_step.cmake.in b/CMake/cdat_modules_extra/cdatmpi_configure_step.cmake.in
index 826b0e209..b8dd0172d 100644
--- a/CMake/cdat_modules_extra/cdatmpi_configure_step.cmake.in
+++ b/CMake/cdat_modules_extra/cdatmpi_configure_step.cmake.in
@@ -4,6 +4,7 @@ set(ENV{PKG_CONFIG} "@cdat_PKG_CONFIG_EXECUTABLE@")
 include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
 
 set(ENV{CC} mpicc)
+set(ENV{CXX} mpicxx)
 
 message("CONFIGURE_ARGS IS ${CONFIGURE_ARGS}")
 message("LD_ARGS IS $ENV{@LIBRARY_PATH@}")
diff --git a/CMake/cmake_modules/pipinstaller.cmake b/CMake/cmake_modules/pipinstaller.cmake
index 09b797908..1060a0ca1 100644
--- a/CMake/cmake_modules/pipinstaller.cmake
+++ b/CMake/cmake_modules/pipinstaller.cmake
@@ -49,3 +49,5 @@ unset(GIT_CMD_STR )
 unset(USR_ENVS)
 unset(USER_BUILD_EXT_OPTS)
 unset(USER_INSTALL_OPTIONS)
+unset(OLDSTR)
+unset(OLD)
-- 
GitLab


From 89a2ec9489a6f70ad5c9ef5ad6ddd0c0cede44ed Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Wed, 6 Apr 2016 10:59:41 -0700
Subject: [PATCH 012/191] Made change to make labels better match levels, added
 precision-based rounding to labels

---
 Packages/vcs/Lib/utils.py                    | 51 ++++++++++++++------
 Packages/vcs/Lib/vcsvtk/boxfillpipeline.py   | 12 +++--
 testing/vcs/CMakeLists.txt                   |  6 ++-
 testing/vcs/test_fewer_colors_than_levels.py | 29 +++++++++++
 4 files changed, 76 insertions(+), 22 deletions(-)
 create mode 100644 testing/vcs/test_fewer_colors_than_levels.py

diff --git a/Packages/vcs/Lib/utils.py b/Packages/vcs/Lib/utils.py
index 2323200ae..91c2acc2d 100644
--- a/Packages/vcs/Lib/utils.py
+++ b/Packages/vcs/Lib/utils.py
@@ -937,7 +937,24 @@ def __split2contiguous(levels):
     return tmplevs
 
 
-def mklabels(vals, output='dict'):
+def guess_precision(num):
+    """
+    Rough guesstimate of the precision of a number. Don't use this for actual science.
+    """
+    if num == 0:
+        return 1
+    idigleft = int(float(numpy.ma.floor(numpy.ma.log10(num)))) + 1
+    aa = numpy.ma.power(10., -idigleft)
+
+    while abs(round(aa * num) - aa * num) > .000001:
+        aa = aa * 10.
+
+    total_digits = numpy.ma.floor(numpy.ma.log10(aa * numpy.ma.power(10., idigleft)))
+
+    return max(total_digits, idigleft)
+
+
+def mklabels(vals, output='dict', precision=None):
     '''
     Function : mklabels
 
@@ -957,6 +974,11 @@ def mklabels(vals, output='dict'):
     {2.0000000000000002e-05: '2E-5', 5.0000000000000002e-05: '5E-5'}
     >>> vcs.mklabels ( [.00002,.00005],output='list')
     ['2E-5', '5E-5']
+    >>> a = vcs.mkevenlevels(0, 100, nlev=9)
+    >>> vcs.mklabels(a)
+    {0.0: '  0.000000000000000', 11.11111111111111: ' 11.111111111111111', 22.22222222222222: ' 22.222222222222221', 33.33333333333333: ' 33.333333333333329', 44.44444444444444: ' 44.444444444444443', 55.55555555555556: ' 55.555555555555557', 66.66666666666666: ' 66.666666666666657', 77.77777777777777: ' 77.777777777777771', 88.88888888888889: ' 88.888888888888886', 100.0: '100.000000000000000'}
+    >>> vcs.mklabels(a, precision=4)
+    {0.0: '  0.0', 11.11111111111111: ' 11.1', 22.22222222222222: ' 22.2', 33.33333333333333: ' 33.3', 44.44444444444444: ' 44.4', 55.55555555555556: ' 55.6', 66.66666666666666: ' 66.7', 77.77777777777777: ' 77.8', 88.88888888888889: ' 88.9', 100.0: '100.0'}
     '''
     import string
     import numpy.ma
@@ -995,21 +1017,18 @@ def mklabels(vals, output='dict'):
         amax = float(numpy.ma.maximum(vals))
     #  Number of digit on the left of decimal point
     idigleft = int(numpy.ma.floor(numpy.ma.log10(amax))) + 1
-    # Now determine the number of significant figures
-    idig = 0
-    for i in range(nvals):
-        aa = numpy.ma.power(10., -idigleft)
-        while abs(round(aa * vals[i]) - aa * vals[i]) > .000001:
-            aa = aa * 10.
-        idig = numpy.ma.maximum(
-            idig,
-            numpy.ma.floor(
-                numpy.ma.log10(
-                    aa *
-                    numpy.ma.power(
-                        10.,
-                        idigleft))))
-    idig = int(idig)
+
+    if precision is None:
+        # Now determine the number of significant figures
+        idig = 0
+        for i in range(nvals):
+            aa = numpy.ma.power(10., -idigleft)
+            while abs(round(aa * vals[i]) - aa * vals[i]) > .000001:
+                aa = aa * 10.
+            idig = numpy.ma.maximum(idig, numpy.ma.floor(numpy.ma.log10(aa * numpy.ma.power(10., idigleft))))
+        idig = int(idig)
+    else:
+        idig = int(precision)
     # Now does the writing part
     lbls = []
     # First if we need an E format
diff --git a/Packages/vcs/Lib/vcsvtk/boxfillpipeline.py b/Packages/vcs/Lib/vcsvtk/boxfillpipeline.py
index 54d9b8a60..98f61794e 100644
--- a/Packages/vcs/Lib/vcsvtk/boxfillpipeline.py
+++ b/Packages/vcs/Lib/vcsvtk/boxfillpipeline.py
@@ -51,12 +51,13 @@ class BoxfillPipeline(Pipeline2D):
         nlev = (self._gm.color_2 - self._gm.color_1) + 1
         if numpy.allclose(self._gm.level_1, 1.e20) or \
            numpy.allclose(self._gm.level_2, 1.e20):
-            self._contourLevels = vcs.mkscale(self._scalarRange[0],
-                                              self._scalarRange[1], nc=min(nlev, 12))
+            self._contourLevels = vcs.mkevenlevels(self._scalarRange[0],
+                                              self._scalarRange[1], nlev=min(nlev, 12))
             if len(self._contourLevels) == 1:  # constant value ?
-                self._contourLevels = [self._contourLevels[0],
-                                       self._contourLevels[0] + .00001]
-            self._contourLabels = vcs.mklabels(self._contourLevels)
+                self._contourLevels = [self._contourLevels[0], self._contourLevels[0] + .00001]
+
+            max_precision = max(vcs.guess_precision(self._contourLevels[0]), vcs.guess_precision(self._contourLevels[-1]))
+            self._contourLabels = vcs.mklabels(self._contourLevels, precision=max_precision)
             dx = (self._contourLevels[-1] - self._contourLevels[0]) / nlev
             self._contourLevels = numpy.arange(self._contourLevels[0],
                                                self._contourLevels[-1] + dx,
@@ -282,6 +283,7 @@ class BoxfillPipeline(Pipeline2D):
 
         # Colortable bit
         # make sure length match
+        print self._contourLevels
         numLevels = len(self._contourLevels) - 1
         while len(self._contourColors) < numLevels:
             self._contourColors.append(self._contourColors[-1])
diff --git a/testing/vcs/CMakeLists.txt b/testing/vcs/CMakeLists.txt
index 69df44d3e..2bb2cde28 100644
--- a/testing/vcs/CMakeLists.txt
+++ b/testing/vcs/CMakeLists.txt
@@ -928,7 +928,11 @@ cdat_add_test(vcs_test_configurator_resize
   ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_configurator_resize.py
   ${BASELINE_DIR}/test_vcs_configurator_resize.png
 )
-
+cdat_add_test(vcs_test_fewer_colors_than_levels
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_fewer_colors_than_levels.py
+  ${BASELINE_DIR}/test_fewer_colors_than_levels.png
+)
 cdat_add_test(vcs_test_colorpicker_appearance
   "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_colorpicker_appearance.py
diff --git a/testing/vcs/test_fewer_colors_than_levels.py b/testing/vcs/test_fewer_colors_than_levels.py
new file mode 100644
index 000000000..2779d4b6d
--- /dev/null
+++ b/testing/vcs/test_fewer_colors_than_levels.py
@@ -0,0 +1,29 @@
+import vcs,cdms2,sys,os
+
+baselineImage = sys.argv[1]
+
+pth = os.path.join(os.path.dirname(__file__),"..")
+sys.path.append(pth)
+import checkimage
+
+dataset = cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
+data = dataset("clt")
+
+canvas = vcs.init()
+canvas.setantialiasing(0)
+canvas.setbgoutputdimensions(1200, 1091, units="pixels")
+canvas.drawlogooff()
+
+boxfill = canvas.createboxfill()
+
+boxfill.color_1 = 242
+boxfill.color_2 = 250
+
+canvas.plot(data, boxfill, bg=1)
+
+testImage = os.path.abspath("test_fewer_colors_than_levels.png")
+canvas.png(testImage)
+
+ret = checkimage.check_result_image(testImage, baselineImage, checkimage.defaultThreshold)
+
+sys.exit(ret)
-- 
GitLab


From a75310d17ac964828703dcf63635b9812c5bb75d Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 6 Apr 2016 11:34:34 -0700
Subject: [PATCH 013/191] Update spyder_external.cmake

---
 CMake/cdat_modules/spyder_external.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMake/cdat_modules/spyder_external.cmake b/CMake/cdat_modules/spyder_external.cmake
index ef88a8338..dede73c00 100644
--- a/CMake/cdat_modules/spyder_external.cmake
+++ b/CMake/cdat_modules/spyder_external.cmake
@@ -2,6 +2,6 @@
 # and configure and build it
 
 set (nm spyder)
-set(OLD "")
+set(OLD "OFF")
 include(pipinstaller)
 
-- 
GitLab


From ad2fe28dafab39e92273010beeeb0766c73337d2 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 6 Apr 2016 11:34:58 -0700
Subject: [PATCH 014/191] Update docutils_external.cmake

---
 CMake/cdat_modules/docutils_external.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMake/cdat_modules/docutils_external.cmake b/CMake/cdat_modules/docutils_external.cmake
index 8e419bd00..36bdaedb1 100644
--- a/CMake/cdat_modules/docutils_external.cmake
+++ b/CMake/cdat_modules/docutils_external.cmake
@@ -2,5 +2,5 @@
 # and configure and build it
 
 set(nm docutils)
-set(OLD "")
+set(OLD "OFF")
 include(pipinstaller)
-- 
GitLab


From 6c7b637eff5f87bba2544f332642c4de30cdafd9 Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Tue, 12 Apr 2016 15:13:32 -0700
Subject: [PATCH 015/191] Added documentation of plot args, deprecated some old
 ones, removed broken ones

---
 Packages/vcs/vcs/Canvas.py | 51 ++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 30 deletions(-)

diff --git a/Packages/vcs/vcs/Canvas.py b/Packages/vcs/vcs/Canvas.py
index 1032dba3c..25f8e731d 100644
--- a/Packages/vcs/vcs/Canvas.py
+++ b/Packages/vcs/vcs/Canvas.py
@@ -2264,13 +2264,13 @@ Options:::
     # Set alias for the secondary drawtextcombined.
     drawtext = drawtextcombined
 
-    _plot_keywords_ = ['variable', 'grid', 'xaxis', 'yaxis', 'xrev', 'yrev', 'continents', 'xarray', 'yarray',
-                       'name', 'time', 'units', 'ymd', 'file_comment',
-                       'xbounds', 'ybounds', 'xname', 'yname', 'xunits', 'yunits', 'xweights', 'yweights',
-                       'comment1', 'comment2', 'comment3', 'comment4', 'hms', 'long_name', 'zaxis',
-                       'zarray', 'zname', 'zunits', 'taxis', 'tarray', 'tname', 'tunits', 'waxis', 'warray',
-                       'wname', 'wunits', 'bg', 'ratio', 'donotstoredisplay', 'render', 'continents_line', "display_name"]
+    _plot_keywords_ = ['variable', 'grid', 'xaxis', 'xarray',  'xrev', 'yaxis', 'yarray', 'yrev', 'continents',
+                       'xbounds', 'ybounds', 'zaxis', 'zarray', 'taxis', 'tarray', 'waxis', 'warray', 'bg', 'ratio',
+                       'donotstoredisplay', 'render', 'continents_line', "display_name"]
 
+    _deprecated_plot_keywords_ = ["time", "units", "file_comment", "xname", "yname", "zname", "tname", "wname",
+                                  "xunits", "yunits", "zunits", "tunits", "wunits", "comment1", "comment2", "comment3",
+                                  "comment4", "long_name"]
     # def replot(self):
     #    """ Clears and plots with last used plot arguments
     #    """
@@ -2317,28 +2317,10 @@ Options:::
             '3',3: y dim will be 3 times bigger than x dim (restricted to original tempalte.data area
             Adding a 't' at the end of the ratio, makes the tickmarks and boxes move along.
 
-    Variable attribute keys:
-       comment1         = string   #Comment plotted above file_comment
-       comment2         = string   #Comment plotted above comment1
-       comment3         = string   #Comment plotted above comment2
-       comment4         = string   #Comment plotted above comment4
-       file_comment     = string   #Comment (defaults to file.comment)
-       hms              = string (hh:mm:ss) #Hour, minute, second
-       long_name        = string   #Descriptive variable name
-       name             = string   #Variable name (defaults to var.id)
-       time             = cdtime   #instance (relative or absolute),
-                                    cdtime, reltime or abstime value
-       units            = string   #Variable units
-       ymd              = string (yy/mm/dd) #Year, month, day
-
     Dimension attribute keys (dimension length=n):
        [x|y|z|t|w]array = NumPy array of length n    # x or y Dimension values
        [x|y|z|t|w]array = NumPy array of length n    # x or y Dimension values
        [x|y]bounds       = NumPy array of shape (n,2) # x or y Dimension boundaries
-       [x|y|z|t|w]name   = string                     # x or y Dimension name
-       [x|y|z|t|w]units  = string                     # x or y Dimension units
-       [x|y]weights      = NumPy array of length n    # x or y Dimension weights (used to
-                                                        calculate area-weighted mean)
 
     CDMS object:
        [x|y|z|t|w]axis   = CDMS axis object           # x or y Axis
@@ -2365,7 +2347,13 @@ Options:::
                                                       # Values 6 through 11 signify the line type
                                                       # defined by the files data_continent_other7
                                                       # through data_continent_other12.
-
+        continents_line = vcs.getline("default")    # VCS line object to define continent appearance
+        donotstoredisplay = True|False              # Whether the displayplot object generated by this plot are stored
+        render = True|False                         # Whether to actually render the plot or not (useful for doing a
+                                                    # bunch of plots in a row)
+        display_name = "__display_123"                # VCS Display plot name (used to prevent duplicate display plots)
+        ratio = 1.5|"autot"|"auto"                   # Ratio of height/width for the plot; autot and auto will choose a
+                                                    # "good" ratio for you.
     Graphics Output in Background Mode:
        bg                 = 0|1   # if ==1, create images in the background
                                                              (Don't display the VCS Canvas)
@@ -3526,11 +3514,14 @@ Options:::
                     doratio == "0" or doratio[:4] == "auto"):
                 doratio = "1t"
             for keyarg in keyargs.keys():
-                if keyarg not in self.__class__._plot_keywords_ + \
-                        self.backend._plot_keywords:
-                    warnings.warn(
-                        'Unrecognized vcs plot keyword: %s, assuming backend (%s) keyword' %
-                        (keyarg, self.backend.type))
+                if keyarg not in self.__class__._plot_keywords_ + self.backend._plot_keywords:
+                    if keyarg in self.__class__._deprecated_plot_keywords_:
+                        warnings.warn("Deprecation Warning: Keyword '%s' will be removed in the next version"
+                                      "of UV-CDAT." % keyarg)
+                    else:
+                        warnings.warn(
+                            'Unrecognized vcs plot keyword: %s, assuming backend (%s) keyword' %
+                            (keyarg, self.backend.type))
 
             if arglist[0] is not None or 'variable' in keyargs:
                 arglist[0] = self._reconstruct_tv(arglist, keyargs)
-- 
GitLab


From a82437bfa57add72c02fce63ad3c3224c67d7e3a Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Tue, 12 Apr 2016 15:15:40 -0700
Subject: [PATCH 016/191] Added documentation to clear's preserve_display arg

---
 Packages/vcs/vcs/Canvas.py   | 3 +++
 Packages/vcs/vcs/VTKPlots.py | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Packages/vcs/vcs/Canvas.py b/Packages/vcs/vcs/Canvas.py
index 25f8e731d..bd8c82310 100644
--- a/Packages/vcs/vcs/Canvas.py
+++ b/Packages/vcs/vcs/Canvas.py
@@ -3891,6 +3891,9 @@ Options:::
     a.plot(array,'default','isofill','quick')
     a.clear()
 
+  Internally, update() calls clear() to assist in removing plots. The preserve_display argument is used to
+  make sure that the display plots that are associated with the current canvas are not eliminated, and
+  are still able to be used to regenerate the plots.
 """
         if self.animate.created():
             self.animate.close()
diff --git a/Packages/vcs/vcs/VTKPlots.py b/Packages/vcs/vcs/VTKPlots.py
index d4a8241fa..4d870cd15 100644
--- a/Packages/vcs/vcs/VTKPlots.py
+++ b/Packages/vcs/vcs/VTKPlots.py
@@ -306,7 +306,7 @@ class VTKVCSBackend(object):
             key["continents_line"] = d.continents_line
             key_args.append(key)
 
-        # Have to pull out the UI layer so it doesn't get borked by the clear
+        # Have to pull out the UI layer so it doesn't get borked by the z
         self.hideGUI()
 
         if self.canvas.configurator is not None:
-- 
GitLab


From 88d77458579cf71437f4808b26547d1aa6dbda03 Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Fri, 15 Apr 2016 11:37:57 -0700
Subject: [PATCH 017/191] Fix bug in template's drawColorBox function that
 could prevent some labels from being drawn

---
 Packages/vcs/Lib/template.py | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/Packages/vcs/Lib/template.py b/Packages/vcs/Lib/template.py
index 7d5869eee..2fd255525 100644
--- a/Packages/vcs/Lib/template.py
+++ b/Packages/vcs/Lib/template.py
@@ -1844,7 +1844,7 @@ class P(object):
                    startlong])
         # Now make sure we have a legend
         if isinstance(levels[0], list):
-            # Ok these are nono contiguous levels, we will use legend only if
+            # Ok these are non-contiguous levels, we will use legend only if
             # it's a perfect match
             for i, l in enumerate(levels):
                 lt = l[0]
@@ -1869,29 +1869,30 @@ class P(object):
         else:
             if legend is None:
                 legend = vcs.mklabels(levels)
+            float_epsilon = numpy.finfo(float).eps
             if levels[0] < levels[1]:
-                ecompfunc = numpy.less_equal
-                compfunc = numpy.less
+                ecompfunc = lambda x, y: float_epsilon > x - y
+                compfunc = lambda x, y: -float_epsilon > x - y
             else:
-                ecompfunc = numpy.greater_equal
-                compfunc = numpy.greater
+                ecompfunc = lambda x, y: -float_epsilon < x - y
+                compfunc = lambda x, y: float_epsilon < x - y
             dlong = dD / (len(levels) - 1)
+
             for l in legend.keys():
+                # if legend key is between levels[0] and levels[-1]
                 if not compfunc(l, levels[0]) and not compfunc(levels[-1], l):
                     for i in range(len(levels) - 1):
-                        if ecompfunc(levels[i], l) and ecompfunc(
-                                l, levels[i + 1]):
-                            # Ok we're between 2 levels, let's add the legend
-                            # first let's figure out where to put it
-                            loc = i * dlong  # position at beginnig of level
-                            # Adds the distance from beginnig of level box
-                            loc += (l - levels[i]) / \
-                                (levels[i + 1] - levels[i]) * dlong
-                            loc += startlong  # Figures out the begining
-    # loc=((l-levels[0])/(levels[-1]-levels[0]))*dD+startlong
-                            Ll.append([loc, loc])
+                        # if legend key is (inclusive) between levels[i] and levels[i+1]
+                        if ecompfunc(levels[i], l) and ecompfunc(l, levels[i + 1]):
+                            # first let's figure out where to put the legend label
+                            location = i * dlong  # position at beginning of level
+                            # Adds the distance from beginning of level box
+                            location += (l - levels[i]) / (levels[i + 1] - levels[i]) * dlong
+                            location += startlong  # Figures out the beginning
+
+                            Ll.append([location, location])
                             Sl.append([startshrt, startshrt + dshrt])
-                            Lt.append(loc)
+                            Lt.append(location)
                             St.append(startshrt + dshrt * 1.4)
                             Tt.append(legend[l])
                             break
-- 
GitLab


From 5ab070a1b4b68eb7ccd94808638b1bfd7ed50784 Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Fri, 15 Apr 2016 11:38:36 -0700
Subject: [PATCH 018/191] Refactored legend/label logic to be in boxfill, fixed
 label generation, eliminated "guess_precision"

---
 Packages/vcs/Lib/boxfill.py                | 44 ++++++++++++++++++++
 Packages/vcs/Lib/utils.py                  | 44 +++++---------------
 Packages/vcs/Lib/vcsvtk/boxfillpipeline.py | 47 +---------------------
 3 files changed, 56 insertions(+), 79 deletions(-)

diff --git a/Packages/vcs/Lib/boxfill.py b/Packages/vcs/Lib/boxfill.py
index 231b22839..76de13e04 100755
--- a/Packages/vcs/Lib/boxfill.py
+++ b/Packages/vcs/Lib/boxfill.py
@@ -24,6 +24,7 @@ import vcs
 import cdtime
 import VCS_validation_functions
 import xmldocs
+import numpy
 import warnings
 
 
@@ -734,6 +735,49 @@ class Gfb(object):
         self.yaxisconvert = yat
     xyscale.__doc__ = xmldocs.xyscaledoc
 
+    def getlevels(self, varmin, varmax):
+        if self.boxfill_type == "custom":
+            return self.levels
+
+        if numpy.allclose(self.level_1, 1.e20) or \
+           numpy.allclose(self.level_2, 1.e20):
+            low_end = varmin
+            high_end = varmax
+        else:
+            low_end = self.level_1
+            high_end = self.level_2
+
+        if self.boxfill_type == "log10":
+            low_end = numpy.ma.log10(low_end)
+            high_end = numpy.ma.log10(high_end)
+
+        nlev = float(self.color_2 - self.color_1 + 1)
+        scale = vcs.mkscale(low_end, high_end)
+
+        low_end = scale[0]
+        high_end = scale[-1]
+
+        dx = (high_end - low_end) / nlev
+
+        contourLevels = numpy.arange(low_end, high_end + dx / 2., dx)
+        return contourLevels
+
+    def getlegendlabels(self, levels):
+        if self.legend:
+            return self.legend
+        nlev = self.color_2 - self.color_1 + 1
+        if nlev >= 12:
+            label_scale = vcs.mkscale(levels[0], levels[-1])
+            return vcs.mklabels(label_scale)
+        else:
+            # Need to line up the levels and the labels, so we'll massage the label positions
+            dx = levels[1] - levels[0]
+            # Determine what decimal place we should round the label to to "see a difference"
+            round_pos = -1 * int(numpy.ma.log10(dx))
+            round_values = [numpy.round(l, round_pos) for l in levels]
+            round_labels = vcs.mklabels(round_values, "list")
+            return {lev: label for lev, label in zip(levels, round_labels)}
+
     ###########################################################################
     #                                                                         #
     # List out boxfill graphics method members (attributes).                  #
diff --git a/Packages/vcs/Lib/utils.py b/Packages/vcs/Lib/utils.py
index 91c2acc2d..5550ae771 100644
--- a/Packages/vcs/Lib/utils.py
+++ b/Packages/vcs/Lib/utils.py
@@ -937,24 +937,7 @@ def __split2contiguous(levels):
     return tmplevs
 
 
-def guess_precision(num):
-    """
-    Rough guesstimate of the precision of a number. Don't use this for actual science.
-    """
-    if num == 0:
-        return 1
-    idigleft = int(float(numpy.ma.floor(numpy.ma.log10(num)))) + 1
-    aa = numpy.ma.power(10., -idigleft)
-
-    while abs(round(aa * num) - aa * num) > .000001:
-        aa = aa * 10.
-
-    total_digits = numpy.ma.floor(numpy.ma.log10(aa * numpy.ma.power(10., idigleft)))
-
-    return max(total_digits, idigleft)
-
-
-def mklabels(vals, output='dict', precision=None):
+def mklabels(vals, output='dict'):
     '''
     Function : mklabels
 
@@ -974,11 +957,6 @@ def mklabels(vals, output='dict', precision=None):
     {2.0000000000000002e-05: '2E-5', 5.0000000000000002e-05: '5E-5'}
     >>> vcs.mklabels ( [.00002,.00005],output='list')
     ['2E-5', '5E-5']
-    >>> a = vcs.mkevenlevels(0, 100, nlev=9)
-    >>> vcs.mklabels(a)
-    {0.0: '  0.000000000000000', 11.11111111111111: ' 11.111111111111111', 22.22222222222222: ' 22.222222222222221', 33.33333333333333: ' 33.333333333333329', 44.44444444444444: ' 44.444444444444443', 55.55555555555556: ' 55.555555555555557', 66.66666666666666: ' 66.666666666666657', 77.77777777777777: ' 77.777777777777771', 88.88888888888889: ' 88.888888888888886', 100.0: '100.000000000000000'}
-    >>> vcs.mklabels(a, precision=4)
-    {0.0: '  0.0', 11.11111111111111: ' 11.1', 22.22222222222222: ' 22.2', 33.33333333333333: ' 33.3', 44.44444444444444: ' 44.4', 55.55555555555556: ' 55.6', 66.66666666666666: ' 66.7', 77.77777777777777: ' 77.8', 88.88888888888889: ' 88.9', 100.0: '100.0'}
     '''
     import string
     import numpy.ma
@@ -1018,17 +996,15 @@ def mklabels(vals, output='dict', precision=None):
     #  Number of digit on the left of decimal point
     idigleft = int(numpy.ma.floor(numpy.ma.log10(amax))) + 1
 
-    if precision is None:
-        # Now determine the number of significant figures
-        idig = 0
-        for i in range(nvals):
-            aa = numpy.ma.power(10., -idigleft)
-            while abs(round(aa * vals[i]) - aa * vals[i]) > .000001:
-                aa = aa * 10.
-            idig = numpy.ma.maximum(idig, numpy.ma.floor(numpy.ma.log10(aa * numpy.ma.power(10., idigleft))))
-        idig = int(idig)
-    else:
-        idig = int(precision)
+    # Now determine the number of significant figures
+    idig = 0
+    for i in range(nvals):
+        aa = numpy.ma.power(10., -idigleft)
+        while abs(round(aa * vals[i]) - aa * vals[i]) > .000001:
+            aa = aa * 10.
+        idig = numpy.ma.maximum(idig, numpy.ma.floor(numpy.ma.log10(aa * numpy.ma.power(10., idigleft))))
+    idig = int(idig)
+
     # Now does the writing part
     lbls = []
     # First if we need an E format
diff --git a/Packages/vcs/Lib/vcsvtk/boxfillpipeline.py b/Packages/vcs/Lib/vcsvtk/boxfillpipeline.py
index 98f61794e..a27c724cc 100644
--- a/Packages/vcs/Lib/vcsvtk/boxfillpipeline.py
+++ b/Packages/vcs/Lib/vcsvtk/boxfillpipeline.py
@@ -47,50 +47,8 @@ class BoxfillPipeline(Pipeline2D):
 
     def _updateContourLevelsAndColorsForBoxfill(self):
         """Set contour information for a standard boxfill."""
-        # Compute levels
-        nlev = (self._gm.color_2 - self._gm.color_1) + 1
-        if numpy.allclose(self._gm.level_1, 1.e20) or \
-           numpy.allclose(self._gm.level_2, 1.e20):
-            self._contourLevels = vcs.mkevenlevels(self._scalarRange[0],
-                                              self._scalarRange[1], nlev=min(nlev, 12))
-            if len(self._contourLevels) == 1:  # constant value ?
-                self._contourLevels = [self._contourLevels[0], self._contourLevels[0] + .00001]
-
-            max_precision = max(vcs.guess_precision(self._contourLevels[0]), vcs.guess_precision(self._contourLevels[-1]))
-            self._contourLabels = vcs.mklabels(self._contourLevels, precision=max_precision)
-            dx = (self._contourLevels[-1] - self._contourLevels[0]) / nlev
-            self._contourLevels = numpy.arange(self._contourLevels[0],
-                                               self._contourLevels[-1] + dx,
-                                               dx)
-        else:
-            if self._gm.boxfill_type == "log10":
-                levslbls = vcs.mkscale(numpy.ma.log10(self._gm.level_1),
-                                       numpy.ma.log10(self._gm.level_2))
-                self._contourLevels = vcs.mkevenlevels(
-                    numpy.ma.log10(self._gm.level_1),
-                    numpy.ma.log10(self._gm.level_2), nlev=nlev)
-            else:
-                levslbls = vcs.mkscale(self._gm.level_1, self._gm.level_2)
-                self._contourLevels = vcs.mkevenlevels(self._gm.level_1,
-                                                       self._gm.level_2,
-                                                       nlev=nlev)
-            if len(self._contourLevels) > 25:
-                # Too many colors/levels need to prettyfy this for legend
-                self._contourLabels = vcs.mklabels(levslbls)
-                # Make sure extremes are in
-                legd2 = vcs.mklabels([self._contourLevels[0],
-                                      self._contourLevels[-1]])
-                self._contourLabels.update(legd2)
-            else:
-                self._contourLabels = vcs.mklabels(self._contourLevels)
-            if self._gm.boxfill_type == "log10":
-                logLabels = {}
-                for key in self._contourLabels.keys():
-                    value = self._contourLabels[key]
-                    newKey = float(numpy.ma.log10(value))
-                    logLabels[newKey] = value
-                self._contourLabels = logLabels
-
+        self._contourLevels = self._gm.getlevels(self._scalarRange[0], self._scalarRange[1])
+        self._contourLabels = self._gm.getlegendlabels(self._contourLevels)
         # Use consecutive colors:
         self._contourColors = range(self._gm.color_1, self._gm.color_2 + 1)
 
@@ -283,7 +241,6 @@ class BoxfillPipeline(Pipeline2D):
 
         # Colortable bit
         # make sure length match
-        print self._contourLevels
         numLevels = len(self._contourLevels) - 1
         while len(self._contourColors) < numLevels:
             self._contourColors.append(self._contourColors[-1])
-- 
GitLab


From 602bba871669b09b6e4622ea18d35baafa62ce42 Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Mon, 18 Apr 2016 15:00:09 -0700
Subject: [PATCH 019/191] Tweaks to get tests to pass

---
 Packages/vcs/vcs/boxfill.py  | 61 ++++++++++++++++++++++++++----------
 Packages/vcs/vcs/template.py | 18 ++++++-----
 2 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/Packages/vcs/vcs/boxfill.py b/Packages/vcs/vcs/boxfill.py
index 76de13e04..e17145437 100755
--- a/Packages/vcs/vcs/boxfill.py
+++ b/Packages/vcs/vcs/boxfill.py
@@ -739,8 +739,12 @@ class Gfb(object):
         if self.boxfill_type == "custom":
             return self.levels
 
+        nlev = float(self.color_2 - self.color_1 + 1)
+        autolevels = False
+
         if numpy.allclose(self.level_1, 1.e20) or \
            numpy.allclose(self.level_2, 1.e20):
+            autolevels = True
             low_end = varmin
             high_end = varmax
         else:
@@ -751,32 +755,57 @@ class Gfb(object):
             low_end = numpy.ma.log10(low_end)
             high_end = numpy.ma.log10(high_end)
 
-        nlev = float(self.color_2 - self.color_1 + 1)
-        scale = vcs.mkscale(low_end, high_end)
 
-        low_end = scale[0]
-        high_end = scale[-1]
+        if autolevels:
+            # Use nice values for the scale
+            scale = vcs.mkscale(low_end, high_end)
+            low_end = scale[0]
+            high_end = scale[-1]
 
         dx = (high_end - low_end) / nlev
 
-        contourLevels = numpy.arange(low_end, high_end + dx / 2., dx)
+        if dx == 0:
+            high_end += .00001
+            return [low_end, high_end]
+
+        contourLevels = numpy.arange(low_end, high_end + dx, dx)
+
         return contourLevels
 
     def getlegendlabels(self, levels):
         if self.legend:
             return self.legend
-        nlev = self.color_2 - self.color_1 + 1
-        if nlev >= 12:
-            label_scale = vcs.mkscale(levels[0], levels[-1])
-            return vcs.mklabels(label_scale)
+
+        if numpy.allclose(self.level_1, 1.e20) or \
+           numpy.allclose(self.level_2, 1.e20):
+            autolevels = True
+        else:
+            autolevels = False
+
+        if len(levels) > 12:
+            scale = vcs.mkscale(levels[0], levels[-1])
+            if autolevels:
+                return vcs.mklabels(scale)
+            else:
+                # Create our own scale
+                dx = (self.level_2 - self.level_1) / float(len(scale))
+                real_values = [self.level_1, self.level_2]
+                levels = numpy.arange(levels[0], levels[-1] + dx, dx)
         else:
-            # Need to line up the levels and the labels, so we'll massage the label positions
-            dx = levels[1] - levels[0]
-            # Determine what decimal place we should round the label to to "see a difference"
-            round_pos = -1 * int(numpy.ma.log10(dx))
-            round_values = [numpy.round(l, round_pos) for l in levels]
-            round_labels = vcs.mklabels(round_values, "list")
-            return {lev: label for lev, label in zip(levels, round_labels)}
+            real_values = levels
+
+        # Need to line up the levels and the labels, so we'll massage the label positions
+        max_round = 0
+        for l in real_values:
+            round_pos = 0
+            while numpy.round(l, round_pos) != l:
+                round_pos += 1
+            max_round = max(max_round, round_pos)
+
+        round_values = [numpy.round(l, round_pos) for l in levels]
+        round_labels = vcs.mklabels(round_values, "list")
+
+        return {lev: label for lev, label in zip(levels, round_labels)}
 
     ###########################################################################
     #                                                                         #
diff --git a/Packages/vcs/vcs/template.py b/Packages/vcs/vcs/template.py
index cb1c0217f..3eaac046b 100644
--- a/Packages/vcs/vcs/template.py
+++ b/Packages/vcs/vcs/template.py
@@ -1873,21 +1873,23 @@ class P(object):
         else:
             if legend is None:
                 legend = vcs.mklabels(levels)
-            float_epsilon = numpy.finfo(float).eps
+            # We'll use the less precise float epsilon since this is just for labels
+            float_epsilon = numpy.finfo(numpy.float32).eps
             if levels[0] < levels[1]:
-                ecompfunc = lambda x, y: float_epsilon > x - y
-                compfunc = lambda x, y: -float_epsilon > x - y
+                # <=
+                comparison = lambda a, b: float_epsilon > a - b
             else:
-                ecompfunc = lambda x, y: -float_epsilon < x - y
-                compfunc = lambda x, y: float_epsilon < x - y
+                # >=
+                comparison = lambda a, b: -float_epsilon < a - b
+
+            in_bounds = lambda x: comparison(levels[0], x) and comparison(x, levels[-1])
             dlong = dD / (len(levels) - 1)
 
             for l in legend.keys():
-                # if legend key is between levels[0] and levels[-1]
-                if not compfunc(l, levels[0]) and not compfunc(levels[-1], l):
+                if in_bounds(l):
                     for i in range(len(levels) - 1):
                         # if legend key is (inclusive) between levels[i] and levels[i+1]
-                        if ecompfunc(levels[i], l) and ecompfunc(l, levels[i + 1]):
+                        if comparison(levels[i], l) and comparison(l, levels[i + 1]):
                             # first let's figure out where to put the legend label
                             location = i * dlong  # position at beginning of level
                             # Adds the distance from beginning of level box
-- 
GitLab


From de21dafb8092fb258f0053edd9b732e806ff213a Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 19 Apr 2016 13:20:50 -0700
Subject: [PATCH 020/191] readme edits

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index f79ed08fb..f1747bb98 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 uvcdat
 ======
 [![build status](https://travis-ci.org/UV-CDAT/uvcdat.svg?branch=master)](https://travis-ci.org/UV-CDAT/uvcdat/builds)
-[![stable version](http://img.shields.io/badge/stable version-2.4.0-brightgreen.svg)](https://github.com/UV-CDAT/uvcdat/releases/tag/2.4.0)
+[![stable version](http://img.shields.io/badge/stable version-2.4.1-brightgreen.svg)](https://github.com/UV-CDAT/uvcdat/releases/tag/2.4.1)
 ![platforms](http://img.shields.io/badge/platforms-linux | osx-lightgrey.svg)
-[![DOI](https://zenodo.org/badge/doi/10.5281/zenodo.45136.svg)](http://dx.doi.org/10.5281/zenodo.45136)
+[![DOI](https://zenodo.org/badge/doi/10.5281/zenodo.50101.svg)](http://dx.doi.org/10.5281/zenodo.50101)
 
 Developed by partnering with ESGF and the community to create a larger problem-solving environment, UV-CDAT is an open source, easy-to-use application that links together disparate software subsystems and packages to form an integrated environment for analysis and visualization. This project seeks to advance climate science by fulfilling computational and diagnostic/visualization capabilities needed for DOE's climate research.
 
@@ -13,4 +13,4 @@ Developing and Contributing
 ------
 We'd love to get contributions from you! Please take a look at the
 [Contribution Documents](CONTRIBUTING.md) to see how to get your changes merged
-in.
\ No newline at end of file
+in.
-- 
GitLab


From 585e4385fa2f517a580244b9cb3755b2ec8537ac Mon Sep 17 00:00:00 2001
From: Dan Lipsa <dan.lipsa@kitware.com>
Date: Wed, 20 Apr 2016 16:31:34 -0400
Subject: [PATCH 021/191] Allow unicode strings for subsetting.

This is how they come from the web.
---
 Packages/cdms2/Lib/axis.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Packages/cdms2/Lib/axis.py b/Packages/cdms2/Lib/axis.py
index df2778854..703c0e938 100644
--- a/Packages/cdms2/Lib/axis.py
+++ b/Packages/cdms2/Lib/axis.py
@@ -2250,7 +2250,7 @@ def axisMatches(axis, specification):
 
        3. an axis object; will match if it is the same object as axis.
     """   
-    if isinstance(specification, types.StringType):
+    if isinstance(specification, basestring):
         s = string.lower(specification)
         s = s.strip()
         while s[0] == '(':
-- 
GitLab


From aa680fd6f24450f4157978745372cd266df839b0 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Thu, 21 Apr 2016 22:45:35 -0700
Subject: [PATCH 022/191] Update README.md

Adding badges for Conda
---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index f1747bb98..5968858fe 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,9 @@ uvcdat
 ![platforms](http://img.shields.io/badge/platforms-linux | osx-lightgrey.svg)
 [![DOI](https://zenodo.org/badge/doi/10.5281/zenodo.50101.svg)](http://dx.doi.org/10.5281/zenodo.50101)
 
+[![Anaconda-Server Badge](https://anaconda.org/uvcdat/uvcdat/badges/installer/conda.svg)](https://conda.anaconda.org/uvcdat)
+[![Anaconda-Server Badge](https://anaconda.org/uvcdat/uvcdat/badges/downloads.svg)](https://anaconda.org/uvcdat/uvcdat)
+
 Developed by partnering with ESGF and the community to create a larger problem-solving environment, UV-CDAT is an open source, easy-to-use application that links together disparate software subsystems and packages to form an integrated environment for analysis and visualization. This project seeks to advance climate science by fulfilling computational and diagnostic/visualization capabilities needed for DOE's climate research.
 
 Led by Lawrence Livermore National Laboratory (LLNL), the consortium consists of four DOE laboratories (Los Alamos, Lawrence Berkeley, LLNL, and Oak Ridge), two universities (University of Utah and the Polytechnic Institute of New York University), NASA, and two private companies (Kitware and tech-X) that will develop reusable software and workflow analysis and visualization applications for large-scale DOE climate modeling and measurements archives. The UV-CDAT concept is simple and flexible enough to interchange parts to expand for future DOE activities.
-- 
GitLab


From 6e372a536414695f0ecf32c240374efb063d6d1e Mon Sep 17 00:00:00 2001
From: McEnerney <mcenerney1@llnl.gov>
Date: Mon, 25 Apr 2016 10:20:54 -0700
Subject: [PATCH 023/191] change diags test 01

---
 CMake/cdat_modules/uvcmetrics_pkg.cmake | 2 +-
 testing/metrics/diagtest01.py           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMake/cdat_modules/uvcmetrics_pkg.cmake b/CMake/cdat_modules/uvcmetrics_pkg.cmake
index 7024a9580..2f8294042 100644
--- a/CMake/cdat_modules/uvcmetrics_pkg.cmake
+++ b/CMake/cdat_modules/uvcmetrics_pkg.cmake
@@ -6,7 +6,7 @@ set(UVCMETRICS_ZIP uvcmetrics-${UVCMETRICS_VERSION}.zip)
 #set(UVCMETRICS_SOURCE ${UVCMETRICS_URL}/${UVCMETRICS_ZIP})
 set(UVCMETRICS_SOURCE ${GIT_PROTOCOL}github.com/UV-CDAT/uvcmetrics.git )
 set(UVCMETRICS_MD5)
-set(UVCMETRICS_BRANCH uvcdat-2.4.1)
+set(UVCMETRICS_BRANCH master)
 
 if (NOT CDAT_BUILD_LEAN)
   add_cdat_package(UVCMETRICS "" "" ON)
diff --git a/testing/metrics/diagtest01.py b/testing/metrics/diagtest01.py
index b8cf415f0..09197a1e3 100755
--- a/testing/metrics/diagtest01.py
+++ b/testing/metrics/diagtest01.py
@@ -58,7 +58,7 @@ varid = 'T'
 vard = package.all_variables( filetable1, filetable2, sname )
 var = vard[varid]
 
-plot = sclass( [filetable1], [filetable2], varid, seasonid )
+plot = sclass( [filetable1], [filetable2], varid, seasonid, plotparms = { 'model':{}, 'obs':{}, 'diff':{} } )
 res = plot.compute()
 if res is not None:
     if res.__class__.__name__ is 'uvc_composite_plotspec':
-- 
GitLab


From 99d489b10def142ad93aa1959c31d797cfa46896 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 26 Apr 2016 08:53:03 -0700
Subject: [PATCH 024/191] cdscan removed use of old modules string and types

---
 Packages/cdms2/Script/cdscan | 84 ++++++++++++++++++------------------
 1 file changed, 41 insertions(+), 43 deletions(-)

diff --git a/Packages/cdms2/Script/cdscan b/Packages/cdms2/Script/cdscan
index 59896b1b4..8914abbdd 100755
--- a/Packages/cdms2/Script/cdscan
+++ b/Packages/cdms2/Script/cdscan
@@ -7,11 +7,9 @@ from cdms2.grid import lookupArray
 from cdms2.axis import calendarToTag, tagToCalendar
 from cdms2.cdmsobj import CdFromObject,CdString,CdScalar,CdFloat,CdDouble,CdShort,CdInt,CdLong
 import numpy
-import string
 import cdtime
 import os.path
 import copy
-import types
 from cdms2 import cdmsNode
 import re
 
@@ -258,7 +256,7 @@ def timeindex(value, units, basetime, delta, calendar):
     where t = reltime(value, units)
     and delu is the time interval (delta, delunits) (e.g., 1 month).
     """
-    if string.find(units," as ")==-1:
+    if units.find(" as ")==-1:
         tval = cdtime.reltime(value, units)
     else:
         tval = cdtime.abstime(value, units)
@@ -426,7 +424,7 @@ def disambig(name, dict, num, comparator, value):
         uniqname = '%s_%d'%(name,num)
         if dict.has_key(uniqname) and comparator(value, dict[uniqname]):
             trial_name = uniqname
-            for letter in string.lowercase:
+            for letter in 'abcdefghijklmnopqrstuvwxyz':
                 uniqname = '%s_%s'%(trial_name,letter)
                 if not dict.has_key(uniqname) or not comparator(value, dict[uniqname]):
                     break
@@ -448,7 +446,7 @@ def comparedomains(domain1, domain2):
         item2 = domain2[i]
         if type(item1)!=type(item2):
             return 1
-        if type(item1)==types.StringType:
+        if isinstance(item1, basestring):
             return item1!=item2
         elif compareaxes(item1, item2):
             return 1
@@ -486,14 +484,14 @@ def validateAttrs(node):
             if reqtype==CdFromObject:
                 reqtype = parenttype
             if reqtype!=datatype and datatype==CdString and scaletype==CdScalar:
-                if reqtype in (CdFloat,CdDouble) and type(attval)!=types.FloatType:
+                if reqtype in (CdFloat,CdDouble) and not isinstance(attval, float):
                     try:
-                        attval = string.atof(attval)
+                        attval = float(attval)
                     except:
                         if verbose:
                             print >> sys.stderr,  "Warning: %s=%s should be a float, id=%s"%(attname,attval,node.id),
                         try:
-                            attval = string.atoi(attval)
+                            attval = int(attval)
                             attval = float(attval)
                             if verbose:
                                 print "(Recasting)"
@@ -507,14 +505,14 @@ def validateAttrs(node):
                             else:
                                 if verbose:
                                     print ""
-                elif reqtype in (CdShort,CdInt,CdLong) and type(attval)!=types.IntType:
+                elif reqtype in (CdShort,CdInt,CdLong) and not isinstance(attval, int):
                     try:
-                        attval = string.atoi(attval)
+                        attval = int(attval)
                     except:
                         if verbose:
                             print >> sys.stderr,  "Warning: %s=%s should be an integer, id=%s"%(attname,attval,node.id),
                         try:
-                            attval = string.atof(attval)
+                            attval = float(attval)
                             attval = int(attval)
                             if verbose:
                                 print "(Recasting)"
@@ -530,7 +528,7 @@ def cloneWithLatCheck(axis):
     global notrimlat
 
     axisvals = origvals = axis[:]
-    if axis.isLatitude() and hasattr(axis,"units") and string.lower(axis.units[0:6])=="degree":
+    if axis.isLatitude() and hasattr(axis,"units") and axis.units[0:6].lower()=="degree":
         if notrimlat==0:
             axisvals = numpy.maximum(-90.0, numpy.minimum(90.0,axisvals))
         if not numpy.ma.allclose(axisvals, origvals) and verbose:
@@ -563,9 +561,9 @@ def addAttrs(fobj, eattrs):
 def setNodeDict(node, dict):
     for key in dict.keys():
         value = dict[key]
-        if (isinstance(value, numpy.integer) or isinstance(value, types.IntType)):
+        if (isinstance(value, numpy.integer) or isinstance(value, int)):
             datatype = CdLong
-        elif (isinstance(value, numpy.floating) or isinstance(value, types.FloatType)):
+        elif (isinstance(value, numpy.floating) or isinstance(value, float)):
             datatype = CdDouble
         else:
             datatype = CdString
@@ -696,7 +694,7 @@ def main(argv):
         if flag=='-a':
             aliasMapFile = arg
         elif flag=='-c':
-            calenkey = string.lower(arg)
+            calenkey = arg.lower()
             calendar = calendarMap[calenkey]
             overrideCalendar = 1
         elif flag=='-d':
@@ -717,7 +715,7 @@ def main(argv):
         elif flag=='--exclude':
             if arg[0]=='-':
                 raise RuntimeError, "--exclude option requires an argument"
-            excludeList = string.split(arg,',')
+            excludeList = arg.split(',')
         elif flag=='--exclude-file':
             excludePattern = arg
         elif flag=='-f':
@@ -732,7 +730,7 @@ def main(argv):
             sys.exit(0)
         elif flag=='-i':
             splitOnTime = 1
-            referenceDelta = string.atof(arg)
+            referenceDelta = float(arg)
             timeIsLinear = 1
             timeIsVector = None
         elif flag=='--ignore-open-error':
@@ -740,7 +738,7 @@ def main(argv):
         elif flag=='--include':
             if arg[0]=='-':
                 raise RuntimeError, "--include option requires an argument"
-            includeList = string.split(arg,',')
+            includeList = arg.split(',')
         elif flag=='--include-file':
             includePattern = arg
         elif flag=='-j':
@@ -748,8 +746,8 @@ def main(argv):
             timeIsLinear = None
         elif flag=='-l':
             splitOnLevel = 1
-            levelstr = string.split(arg,',')
-            levellist = map(string.atof, levelstr)
+            levelstr = arg.split(',')
+            levellist = map(float, levelstr)
             levels = numpy.array(levellist)
             levels = numpy.sort(levels)
         elif flag=='-m':
@@ -771,19 +769,19 @@ def main(argv):
             timeid = arg
             args.append(('-e','%s.axis=T'%timeid)) # Add axis=T attribute
         elif flag=='--time-linear':
-            targlist = string.split(arg,',')
-            ttzero = string.atof(targlist[0])
-            tdelta = string.atof(targlist[1])
-            tunits = string.strip(targlist[2])
+            targlist = arg.split(',')
+            ttzero = float(targlist[0])
+            tdelta = float(targlist[1])
+            tunits = targlist[2].strip()
             if len(targlist)==4:
-                tcalendar = string.strip(targlist[3])
+                tcalendar = targlist[3].strip()
             else:
                 tcalendar = None
             overrideTimeLinear = [ttzero,tdelta,tunits,tcalendar]
         elif flag=='--var-locate':
             if varLocate is None:
                 varLocate = {}
-            vname, pattern = string.split(arg,',')
+            vname, pattern = arg.split(',')
             varLocate[vname]=pattern
         elif flag=='-x':
             writeToStdout = 0
@@ -806,7 +804,7 @@ def main(argv):
     # Ignore blank paths
     realargs = []
     for arg in lastargs:
-        sarg = string.strip(arg)
+        sarg = arg.strip()
         if len(sarg)>0:
             realargs.append(sarg)
     lastargs = realargs
@@ -816,7 +814,7 @@ def main(argv):
     dsetargs = []
     for arg in lastargs:
         base, suffix = os.path.splitext(arg)
-        if string.lower(suffix) in ['.xml','.cdml']:
+        if suffix.lower() in ['.xml','.cdml']:
             dsetargs.append(arg)
         else:
             fileargs.append(arg)
@@ -872,7 +870,7 @@ def main(argv):
         modelMap = {}
         modelDirs = []
         for line in mfile.readlines():
-            mdirec, model = string.split(line)
+            mdirec, model = line.split()
             modelMap[mdirec] = model
             modelDirs.append(mdirec)
         mfile.close()
@@ -882,10 +880,10 @@ def main(argv):
         aliasMap = {}
         for line in afile.readlines():
             if line[0] not in ["'",'"']: #"
-                varid, alias = string.split(line)
+                varid, alias = line.split()
             else:
-                dummy, varid, alias = string.split(line,line[0])
-                alias = string.strip(alias)
+                dummy, varid, alias = line.split(line[0])
+                alias = alias.strip()
             aliasMap[varid] = alias
         afile.close()
 
@@ -983,7 +981,7 @@ def main(argv):
     boundsmap = {}                      # boundsmap : varid => timebounds_id
     boundsdict = {}                     # Same as vardict for time bounds
     for path in fileargs:
-        path = string.strip(path)
+        path = path.strip()
 
         # Check if the path is included
         if includePattern is not None:
@@ -1021,7 +1019,7 @@ def main(argv):
                 if mo is not None:
                     suffixPattern = modelMap[direc]
                     def gensuffix(m, mo=mo):
-                        i = string.atoi(m.group(1))
+                        i = int(m.group(1))
                         return mo.group(i)
                     varsuffix = re.sub(r'\\g<(\d)>', gensuffix, suffixPattern)
                     break
@@ -1191,7 +1189,7 @@ def main(argv):
                     if verbose and not forecast:
                         print 'Setting reference time units to', referenceTime
                     if timeIsLinear is None and timeIsVector is None:
-                        timeIsLinear = (string.lower(string.split(referenceTime)[0]) in ['hour','hours','minute','minutes','second','seconds'])
+                        timeIsLinear = referenceTime.split()[0].lower() in ['hour','hours','minute','minutes','second','seconds']
                         if timeIsLinear and verbose:
                             print 'Setting time representation to "linear"' #'
                     if timeIsLinear and referenceDelta is None:
@@ -1301,7 +1299,7 @@ def main(argv):
             if prevcal is not None and calendar != prevcal:
                 sameCalendars = 0
             prevcal = calendar
-            if string.find(units," as ")==-1:
+            if units.find(" as ")==-1:
                 time0 = cdtime.reltime(values[0],units)
             else:
                 time0 = cdtime.abstime(values[0],units)
@@ -1319,7 +1317,7 @@ def main(argv):
             if prevcal is not None and calendar != prevcal:
                 sameCalendars = 0
             prevcal = calendar
-            if string.find(units," as ")==-1:
+            if units.find(" as ")==-1:
                 time0 = cdtime.reltime(values[0],units)
             else:
                 time0 = cdtime.abstime(values[0],units)
@@ -1460,7 +1458,7 @@ def main(argv):
             domain, attributes, tcode = vardict[varname]
             for i in range(len(domain)):
                 item = domain[i]
-                if type(item)==types.StringType and item==name:
+                if isinstance(item, basestring) and item==name:
                     domain[i] = axisobj
 
         # Add bounds variables to vardict, varindex
@@ -1479,7 +1477,7 @@ def main(argv):
                         if reprVar in varids:
                             varids.append(boundsname)
                     tmpdom = boundsinfo[0]
-                    if type(tmpdom[1])==types.StringType:
+                    if isinstance(tmpdom[1], basestring):
                         bndsobj = tmpdom[0]
                         boundsdomain = (bndsobj, axisobj)
                     else:
@@ -1547,10 +1545,10 @@ def main(argv):
 
     # Generate the cdms_filemap attribute
     cdms_filemap = str(cdms_filemap_list)
-    cdms_filemap = string.replace(cdms_filemap, ' ', '')
-    cdms_filemap = string.replace(cdms_filemap, 'None', '-')
-    cdms_filemap = string.replace(cdms_filemap, '"', '') #"
-    cdms_filemap = string.replace(cdms_filemap, "'", '')
+    cdms_filemap = cdms_filemap.replace(' ', '')
+    cdms_filemap = cdms_filemap.replace('None', '-')
+    cdms_filemap = cdms_filemap.replace('"', '')
+    cdms_filemap = cdms_filemap.replace("'", '')
 
     # Dump to XML
     datasetnode = cdmsNode.DatasetNode(datasetid)
-- 
GitLab


From c9da8fbba9ae83414658ee040f63c41c0eef6f6c Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 26 Apr 2016 09:07:43 -0700
Subject: [PATCH 025/191] cleaned up avariable from using types or string
 module

---
 Packages/cdms2/Lib/avariable.py | 55 ++++++++++++++-------------------
 1 file changed, 23 insertions(+), 32 deletions(-)

diff --git a/Packages/cdms2/Lib/avariable.py b/Packages/cdms2/Lib/avariable.py
index dd2a2792d..bc20b8be5 100644
--- a/Packages/cdms2/Lib/avariable.py
+++ b/Packages/cdms2/Lib/avariable.py
@@ -3,8 +3,6 @@
 
 "CDMS Variable objects, abstract interface"
 import numpy
-import types
-import string
 import re
 import warnings
 import cdmsNode
@@ -404,7 +402,7 @@ class AbstractVariable(CdmsObj, Slab):
             
         if asarray==0 and isinstance(mv, numpy.ndarray):
             mv = mv[0]
-        if type(mv) is types.StringType and self.dtype.char not in ['?','c','O','S']:
+        if isinstance(mv, basestring) and self.dtype.char not in ['?','c','O','S']:
             mv = float(mv)
         return mv
 
@@ -423,17 +421,16 @@ class AbstractVariable(CdmsObj, Slab):
             return
             
         selftype = self.typecode()
-        valuetype = type(value)
-        if valuetype is numpy.ndarray:
+        if isnstance(value, numpy.ndarray):
             value = value.astype(selftype).item()
-        elif isinstance(value, numpy.floating) or isinstance(value, numpy.integer):
+        elif isinstance(value, (numpy.floating, numpy.integer)):
             value = numpy.array([value], selftype)
-        elif valuetype in [types.FloatType, types.IntType, types.LongType, types.ComplexType]:
+        elif isinstance(value, (float, int, long, complex)):
             try:
                 value = numpy.array([value], selftype)
             except:                     # Set fill value when ar[i:j] returns a masked value
                 value = numpy.array([numpy.ma.default_fill_value(self)], selftype)
-        elif isinstance(value,(str,numpy.string_,numpy.str,numpy.string0,numpy.str_)) and selftype in ['?','c','O','S']: # '?' for Boolean and object
+        elif isinstance(value,(basestring,numpy.string_,numpy.str,numpy.string0,numpy.str_)) and selftype in ['?','c','O','S']: # '?' for Boolean and object
             pass
         else:
             raise CDMSError, 'Invalid missing value %s'%`value`
@@ -1089,7 +1086,7 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
 
             if re.search('^regrid', regridTool, re.I):
                 if keywords.has_key('diag') and \
-                        type(keywords['diag']) == types.DictType:
+                        isinstance(keywords['diag'], dict):
                     keywords['diag']['regridTool'] = 'regrid'
 
                 # the original cdms2 regridder
@@ -1206,7 +1203,7 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
             if specs[i] is Ellipsis:
                 j = myrank  - (nsupplied - (i+1)) 
             else:
-                if isinstance(specs[i], types.IntType):
+                if isinstance(specs[i], int):
                     singles.append(j)
                 j = j + 1
             i = i + 1
@@ -1227,15 +1224,15 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
         slicelist = []
         for i in range(self.rank()):
             key = speclist[i]
-            if isinstance(key, types.IntType):  # x[i]
+            if isinstance(key, int):  # x[i]
                 slicelist.append (slice(key,key+1))
-            elif type(key) is types.SliceType: # x[i:j:k]
+            elif isinstance(key, slice): # x[i:j:k]
                 slicelist.append(key)
             elif key is unspecified or key is None or key == ':':
                 slicelist.append (slice(0, len(self.getAxis(i))))
             elif key is Ellipsis:
                 raise CDMSError, "Misuse of ellipsis in specification."
-            elif type(key) is types.TupleType:
+            elif sinstance(key, tuple):
                 slicelist.append(slice(*key))
             else:
                 raise CDMSError, 'invalid index: %s'% str(key)
@@ -1287,13 +1284,13 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
 
         for i in range(self.rank()):
             item = speclist[i]
-            if isinstance(item, types.SliceType):
+            if isinstance(item, slice):
                 newitem = item
             elif item==':' or item is None or item is unspecified:
                 axis = self.getAxis(i)
                 newitem = slice(0,len(axis))
-            elif isinstance(item, types.ListType) or \
-                 isinstance(item, types.TupleType):
+            elif isinstance(item, list) or \
+                 isinstance(item, tuple):
                 axis = self.getAxis(i)
                 if len(item)==2:        # (start,end)
                     indexInterval = axis.mapIntervalExt(item)
@@ -1314,13 +1311,7 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
                 if indexInterval is None:
                     raise CDMSError, OutOfRange + str(item)
                 newitem = slice(indexInterval[0],indexInterval[1],indexInterval[2])
-            elif isinstance(item, numpy.floating) or \
-                 isinstance(item, types.FloatType) or \
-                 isinstance(item, numpy.integer) or \
-                 isinstance(item, types.IntType) or \
-                 isinstance(item, types.LongType) or \
-                 isinstance(item, types.StringType) or \
-                 type(item) in CdtimeTypes:
+            elif isinstance(item, (numpy.floating, float, numpy.integer, int, long, basestring)) or type(item) in CdtimeTypes:
                 axis = self.getAxis(i)
                 #
                 # default is 'ccn' in axis.mapIntervalExt
@@ -1397,10 +1388,10 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
     # numpy.ma overrides
 
     def __getitem__(self, key):
-        if type(key) is types.TupleType:
+        if isinstance(key, tuple):
             speclist = self._process_specs(key, {})
         else:
-            if isinstance(key, types.IntType) and key>=len(self):
+            if isinstance(key, int) and key>=len(self):
                 raise IndexError, "Index too large: %d"%key
             speclist = self._process_specs([key], {})
 
@@ -1509,7 +1500,7 @@ def orderparse (order):
             remaining axes.
           (name) meaning an axis whose id is name
     """
-    if not isinstance(order, types.StringType):
+    if not isinstance(order, basestring):
         raise CDMSError, 'order arguments must be strings.'
     pos = 0
     result=[]
@@ -1523,8 +1514,8 @@ def orderparse (order):
         elif r == '...':
             r = Ellipsis
         elif len(r) == 1:
-            if r in string.digits:
-                r = string.atoi(r)
+            if r in '0123456789':
+                r = int(r)
         result.append(r)
         pos = m.end(0)
 
@@ -1544,9 +1535,9 @@ def order2index (axes, order):
             remaining axes.
           (name) meaning an axis whose id is name
     """
-    if isinstance(order, types.StringType):
+    if isinstance(order, basestring):
         result = orderparse(order)
-    elif isinstance(order, types.ListType):
+    elif isinstance(order, list):
         result = order
     else:
         raise CDMSError, 'order2index, order specified of bad type:' + str(type(order))
@@ -1557,7 +1548,7 @@ def order2index (axes, order):
     pos = 0
     while j < len(result):
         item = result[j]
-        if isinstance(item, types.StringType):
+        if isinstance(item, basestring):
             if item == 't': 
                 spec = 'time'
             elif item == 'x': 
@@ -1581,7 +1572,7 @@ def order2index (axes, order):
                     break
             else:
                 raise CDMSError, 'No axis matching order spec %s' %str(item)
-        elif isinstance(item, types.IntType):
+        elif isinstance(item, int):
             if item in permutation:
                 raise CDMSError, 'Duplicate item in order %s' % order
             if item >= n:
-- 
GitLab


From c9956674eb09da35755504d376765dd4f47630bb Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 26 Apr 2016 09:16:39 -0700
Subject: [PATCH 026/191] cleaned up cdmsobj from using types or string module

---
 Packages/cdms2/Lib/cdmsobj.py | 59 +++++++++++++++++------------------
 1 file changed, 28 insertions(+), 31 deletions(-)

diff --git a/Packages/cdms2/Lib/cdmsobj.py b/Packages/cdms2/Lib/cdmsobj.py
index 14c2d9bf0..b66cf7307 100644
--- a/Packages/cdms2/Lib/cdmsobj.py
+++ b/Packages/cdms2/Lib/cdmsobj.py
@@ -7,10 +7,7 @@ import cdtime
 import glob
 import os
 import re
-import string
 import sys
-import types
-#import internattr
 
 # Data types
 
@@ -204,7 +201,7 @@ def generateTime(matchobj,timespecs):
     if yrspec:
         pat,name,dimtype,pos = _specifierMap[yrspec]
         yrstr = matchobj.group(name)
-        iyr = string.atoi(yrstr)
+        iyr = int(yrstr)
 
         # Map 2-digit year to [1950,2049)
         if yrspec in ('%y','%ey'):
@@ -220,23 +217,23 @@ def generateTime(matchobj,timespecs):
         elif mospec in ('%g','%eg'):
             imo = _monthMapLower[mostr]
         elif mospec in ('%m','%em','%n','%en'):
-            imo = string.atoi(mostr)
+            imo = int(mostr)
     if dyspec:
         pat,name,dimtype,pos = _specifierMap[dyspec]
         dystr = matchobj.group(name)
-        idy = string.atoi(dystr)
+        idy = int(dystr)
     if hrspec:
         pat,name,dimtype,pos = _specifierMap[hrspec]
         hrstr = matchobj.group(name)
-        ihr = string.atoi(hrstr)
+        ihr = int(hrstr)
     if mispec:
         pat,name,dimtype,pos = _specifierMap[mispec]
         mistr = matchobj.group(name)
-        imi = string.atoi(mistr)
+        imi = int(mistr)
     if sespec:
         pat,name,dimtype,pos = _specifierMap[sespec]
         sestr = matchobj.group(name)
-        ise = string.atoi(sestr)
+        ise = int(sestr)
     return cdtime.comptime(iyr,imo,idy,ihr,imi,ise)   
 
 # Find all files in 'direc' which match 'template'.
@@ -280,9 +277,9 @@ def matchingFiles(direc,template):
         if dimtypes['etime'] != [None,None,None,None,None,None]:
             matchnames[_etime] = generateTime(matchobj,dimtypes['etime'])
         if dimtypes['level'] is not None:
-            matchnames[_level] = string.atoi(matchobj.group('level'))
+            matchnames[_level] = int(matchobj.group('level'))
         if dimtypes['elevel'] is not None:
-            matchnames[_elevel] = string.atoi(matchobj.group('elevel'))
+            matchnames[_elevel] = int(matchobj.group('elevel'))
         matchfiles.append((candfile,matchnames))
 
     return matchfiles
@@ -300,22 +297,22 @@ def getTimeAsString(spec,time):
     elif spec in ('%S','%eS'):
         specstr = str(int(time.second))
     elif spec in ('%Y','%eY'):
-        specstr = string.zfill(str(time.year),4)
+        specstr = str(time.year).zfill(4)
     elif spec in ('%d','%ed'):
         specstr = str(time.day)
     elif spec in ('%f','%ef'):
-        specstr = string.zfill(str(time.day),2)
+        specstr = str(time.day).zfill(2)
     elif spec in ('%g','%eg'):
         imo = time.month
         specstr = _monthListLower[imo-1]
     elif spec in ('%h','%eh'):
-        specstr = string.zfill(str(time.hour),2)
+        specstr = str(time.hour).zfill(2)
     elif spec in ('%m','%em'):
         specstr = str(time.month)
     elif spec in ('%n','%en'):
-        specstr = string.zfill(str(time.month),2)
+        specstr = str(time.month).zfill(2)
     elif spec in ('%y','%ey'):
-        specstr = string.zfill(str(time.year%100),2)
+        specstr = str(time.year%100).zfill(2)
     elif spec in ('%z','%ez'):
         specstr = getTimeAsString('%H',time)+'Z'+getTimeAsString('%Y',time)+getTimeAsString('%n',time)+getTimeAsString('%d',time)
     return specstr
@@ -374,9 +371,9 @@ def getPathFromTemplate(template,matchnames):
 
 def searchPattern(objlist, pattern, attribute=None, tag=None):
     if tag is not None:
-        tag = string.lower(tag)
+        tag = tag.lower()
     regexp = re.compile(pattern)
-    if type(objlist) is not types.ListType:
+    if not isinstance(objlist, list):
         objlist = [objlist]
 
     returnlist = []
@@ -395,9 +392,9 @@ def searchPattern(objlist, pattern, attribute=None, tag=None):
 
 def matchPattern(objlist, pattern, attribute=None, tag=None):
     if tag is not None:
-        tag = string.lower(tag)
+        tag = tag.lower()
     regexp = re.compile(pattern)
-    if type(objlist) is not types.ListType:
+    if not isinstance(objlist, list):
         objlist = [objlist]
 
     returnlist = []
@@ -425,8 +422,8 @@ def matchPattern(objlist, pattern, attribute=None, tag=None):
 
 def searchPredicate(objlist, predicate, tag=None):
     if tag is not None:
-        tag = string.lower(tag)
-    if type(objlist) is not types.ListType:
+        tag = tag.lower()
+    if not isinstance(objlist, list):
         objlist = [objlist]
 
     returnlist = []
@@ -490,12 +487,12 @@ class CdmsObj (object):
                     if reqtype!=datatype and datatype==CdString and scaletype==CdScalar:
                         if reqtype in (CdFloat,CdDouble):
                             try:
-                                attval = string.atof(attval)
+                                attval = float(attval)
                             except:
                                 raise RuntimeError,"%s=%s must be a float"%(attname,attval)
                         elif reqtype in (CdShort,CdInt,CdLong,CdInt64):
                             try:
-                                attval = string.atoi(attval)
+                                attval = int(attval)
                             except:
                                 raise RuntimeError,"%s=%s must be an integer"%(attname,attval)
                 adict[attname] = attval
@@ -519,12 +516,12 @@ class CdmsObj (object):
         """
         if attname is None:
             for attval in self.attributes.values():
-                if type(attval) is types.StringType and pattern.search(attval) is not None:
+                if isinstance(attval,basestring) and pattern.search(attval) is not None:
                     return 1
             return 0
         elif self.attributes.has_key(attname):
             attval = self.attributes[attname]
-            return (type(attval) is types.StringType and pattern.search(attval) is not None)
+            return isinstance(attval,basestring) and pattern.search(attval) is not None
         else:
             return 0
 
@@ -549,12 +546,12 @@ class CdmsObj (object):
         """
         if attname is None:
             for attval in self.attributes.values():
-                if type(attval) is types.StringType and pattern.match(attval) is not None:
+                if isinstance(attval,basestring) and pattern.search(attval) is not None:
                     return 1
             return 0
         elif self.attributes.has_key(attname):
             attval = self.attributes[attname]
-            return (type(attval) is types.StringType and pattern.match(attval) is not None)
+            return isinstance(attval,basestring) and pattern.search(attval) is not None
         else:
             return 0
 
@@ -573,7 +570,7 @@ class CdmsObj (object):
         result :: (list) (0) 
         :::
         """
-        if tag is None or string.lower(tag)==self._node_.tag:
+        if tag is None or tag.lower()==self._node_.tag:
             if self.searchone(pattern,attribute):
                 return [self]
             else:
@@ -596,7 +593,7 @@ class CdmsObj (object):
         result :: (list) (0) 
         :::
         """
-        if tag is None or string.lower(tag)==self._node_.tag:
+        if tag is None or tag.lower()==self._node_.tag:
             if self.matchone(pattern,attribute):
                 return [self]
             else:
@@ -619,7 +616,7 @@ class CdmsObj (object):
         result :: (list) (0) 
         :::
         """
-        if tag is None or string.lower(tag)==self._node_.tag:
+        if tag is None or tag.lower()==self._node_.tag:
             try:
                 if apply(predicate,(self,))==1:
                     result = [self]
-- 
GitLab


From fb948093cd0f4d5eea14203c56fad2c707f1a019 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 26 Apr 2016 09:40:16 -0700
Subject: [PATCH 027/191] cleaned up axis.py

---
 Packages/cdms2/Lib/axis.py       |  92 +++++++++---------
 Packages/cdms2/Lib/internattr.py | 157 -------------------------------
 2 files changed, 46 insertions(+), 203 deletions(-)
 delete mode 100644 Packages/cdms2/Lib/internattr.py

diff --git a/Packages/cdms2/Lib/axis.py b/Packages/cdms2/Lib/axis.py
index 703c0e938..458096c22 100644
--- a/Packages/cdms2/Lib/axis.py
+++ b/Packages/cdms2/Lib/axis.py
@@ -6,7 +6,7 @@ CDMS Axis objects
 """
 _debug = 0
 std_axis_attributes = ['name', 'units', 'length', 'values', 'bounds']
-import string, sys, types, copy
+import sys, copy
 import numpy
 # import regrid2._regrid
 import cdmsNode
@@ -22,13 +22,13 @@ class AliasList (UserList):
     def __init__(self, alist):
         UserList.__init__(self,alist)
     def __setitem__ (self, i, value):
-        self.data[i] = string.lower(value)
+        self.data[i] = value.lower()
     def __setslice(self, i, j, values):
-        self.data[i:j] = map(lambda x: string.lower(x), values)
+        self.data[i:j] = map(lambda x: x.lower(), values)
     def append(self, value):
-        self.data.append(string.lower(value))
+        self.data.append(value.lower())
     def extend(self, values):
-        self.data.extend(map(string.lower, values))
+        self.data.extend(map("".lower, values))
 
 level_aliases = AliasList(['plev'])
 longitude_aliases = AliasList([])
@@ -228,7 +228,7 @@ def mapLinearExt(axis, bounds, interval, indicator ='ccn', epsilon=None, stride=
     intersection is empty.
     """
     
-    indicator = string.lower(indicator)
+    indicator = indicator.lower()
     length = len(axis)
 
     # Make the interval and search array non-decreasing
@@ -615,7 +615,7 @@ class AbstractAxis(CdmsObj):
         self._doubledata_ = None
         
     def __str__ (self):
-        return string.join(self.listall(), "\n") + "\n"
+        return "\n".join(self.listall() + "\n"
 
     __repr__ = __str__
 
@@ -812,14 +812,14 @@ class AbstractAxis(CdmsObj):
         for val in self[:]:
             comptime=cdtime.reltime(val, self.units).tocomp(calendar)
             s=repr(comptime)
-            tt=string.split(s,' ')
+            tt=s.split(' ')
         
-            ttt=string.split(tt[0],'-')
+            ttt=tt[0].split('-')
             yr=int(ttt[0])
             mo=int(ttt[1])
             da=int(ttt[2])
         
-            ttt=string.split(tt[1],':')
+            ttt=tt[1].split(':')
             hr=int(ttt[0])
             dtg="%04d%02d%02d%02d"%(yr,mo,da,hr)
             result.append(dtg)
@@ -974,7 +974,7 @@ class AbstractAxis(CdmsObj):
     # calendar.
     def getCalendar(self):
         if hasattr(self,'calendar'):
-            calendar = string.lower(self.calendar)
+            calendar = self.calendar.lower()
         else:
             calendar = None
 
@@ -1009,7 +1009,7 @@ class AbstractAxis(CdmsObj):
         if self.isTime():
             if type(value) in CdtimeTypes:
                 value = value.torel(self.units, self.getCalendar()).value
-            elif type(value) is types.StringType and value not in [':',unspecified]:
+            elif isinstance(value, basestring) and value not in [':',unspecified]:
                 cal = self.getCalendar()
                 value = cdtime.s2c(value, cal).torel(self.units, cal).value
         return value
@@ -1022,7 +1022,7 @@ class AbstractAxis(CdmsObj):
             #
             # mf 20010419 test if attribute is a string (non CF), set to 360.0
             #
-            if(type(cycle) == types.StringType):
+            if isnstance(cycle, basestring):
                 cycle = 360.0
         else:
             cycle = 360.0
@@ -1106,7 +1106,7 @@ class AbstractAxis(CdmsObj):
         # check length of indicator if overridden by user
         #
 
-        indicator = string.lower(indicator)
+        indicator = indicator.lower()
         if len(indicator)==2: indicator += 'n'
 
         if( ( len(indicator) != 3 ) or
@@ -1530,24 +1530,24 @@ class Axis(AbstractAxis):
         length = len(node)
 
         # Allow key of form (slice(i,j),) etc.
-        if type(key) is types.TupleType and len(key)==1:
+        if isinstance(key, tuple) and len(key)==1:
             key = key[0]
 
-        if isinstance(key, (types.IntType, numpy.int,numpy.int32)):  # x[i]
+        if isinstance(key, (int, numpy.int,numpy.int32)):  # x[i]
             if key>=length:
                 raise IndexError, 'index out of bounds'
             else:
                 # Don't generate the entire array (if linear) just for one value
                 return node.data[key%length]
-        elif type(key) is types.SliceType: # x[i:j:k]
+        elif isinstance(key, slice): # x[i:j:k]
             if self._data_ is None:
                 self._data_ = node.getData()
             return self._data_[key.start:key.stop:key.step]
-        elif type(key) is types.EllipsisType: # x[...]
+        elif isinstance(key, Ellipsis.__class__): # x[...]
             if self._data_ is None:
                 self._data_ = node.getData()
             return self._data_
-        elif type(key) is types.TupleType:
+        elif isinstance(key, tuple):
             raise IndexError,'axis is one-dimensional'
         else:
             raise IndexError,'index must be an integer: %s'%`key`
@@ -1597,9 +1597,9 @@ class Axis(AbstractAxis):
 
     def getCalendar(self):
         if hasattr(self,'calendar'):
-            calendar = string.lower(self.calendar)
+            calendar = self.calendar.lower()
         elif self.parent is not None and hasattr(self.parent, 'calendar'):
-            calendar = string.lower(self.parent.calendar)
+            calendar = self.parent.calendar.lower()
         else:
             calendar = None
 
@@ -1781,7 +1781,7 @@ class FileAxis(AbstractAxis):
         if obj is not None:
             for attname in self._obj_.__dict__.keys():
                 attval = getattr(self._obj_,attname)
-                if type(attval)!=types.BuiltinFunctionType:
+                if not callable(attval):
                     self.__dict__[attname]  = attval
                     att = self.attributes
                     att[attname]=attval
@@ -1879,29 +1879,29 @@ class FileAxis(AbstractAxis):
         if (self._obj_ is not None) and (self.parent._mode_!='r') and not (hasattr(self.parent,'format') and self.parent.format=="DRS"):
             # For negative strides, get the equivalent slice with positive stride,
             # then reverse the result.
-            if (type(key) is types.SliceType) and (key.step is not None) and key.step<0:
+            if (isinstance(key, slice) and (key.step is not None) and key.step<0:
                 posslice = reverseSlice(key,len(self))
                 result = apply(self._obj_.getitem, (posslice,))
                 return result[::-1]
             else:
-                if isinstance(key, types.IntType) and key>=len(self):
+                if isinstance(key, int) and key>=len(self):
                     raise IndexError, 'Index out of bounds: %d'%key
-                if type(key) is not types.TupleType:
+                    if isinstance(key, tuple):
                     key = (key,)
                 return apply(self._obj_.getitem, key)
         if self._data_ is None:
             self._data_ = self.getData()
         length = len(self._data_)
-        if isinstance(key, types.IntType):  # x[i]
+        if isinstance(key, int):  # x[i]
             if key>=length:
                 raise IndexError, 'index out of bounds'
             else:
                 return self._data_[key%length]
-        elif type(key) is types.SliceType: # x[i:j:k]
+        elif isinstance(key, slice): # x[i:j:k]
             return self._data_[key.start:key.stop:key.step]
-        elif type(key) is types.EllipsisType: # x[...]
+        elif isinstance(key, Ellipsis.__class__): # x[...]
             return self._data_
-        elif type(key) is types.TupleType:
+        elif isinstance(key, tuple):
             raise IndexError,'axis is one-dimensional'
         else:
             raise IndexError,'index must be an integer or slice: %s'%`key`
@@ -2027,9 +2027,9 @@ class FileAxis(AbstractAxis):
 
     def getCalendar(self):
         if hasattr(self,'calendar'):
-            calendar = string.lower(self.calendar)
+            calendar = self.calendar.lower()
         elif self.parent is not None and hasattr(self.parent, 'calendar'):
-            calendar = string.lower(self.parent.calendar)
+            calendar = self.parent.calendar.lower()
         else:
             calendar = None
 
@@ -2126,15 +2126,15 @@ def axisMatchIndex (axes, specifications=None, omit=None, order=None):
     """
     if specifications is None:
         speclist = axes
-    elif isinstance(specifications, types.StringType):
+    elif isinstance(specifications, basestring):
         speclist = [specifications]
-    elif isinstance(specifications, types.ListType):
+    elif isinstance(specifications, list):
         speclist = specifications
-    elif isinstance(specifications, types.TupleType):
+    elif isinstance(specifications, tuple):
         speclist=list(specifications)
-    elif isinstance(specifications, types.IntType):
+    elif isinstance(specifications, int):
         speclist = [specifications]
-    elif isinstance(specifications, types.FunctionType):
+    elif callable(specifications):
         speclist = [specifications]
     else: # to allow arange, etc.
         speclist = list(numpy.ma.filled(specifications))
@@ -2142,7 +2142,7 @@ def axisMatchIndex (axes, specifications=None, omit=None, order=None):
     candidates = []
     for i in range(len(axes)):
         for s in speclist:
-            if isinstance(s, types.IntType):
+            if isinstance(s, int):
                 r = (s == i)
             else:
                 r = axisMatches(axes[i], s)
@@ -2155,15 +2155,15 @@ def axisMatchIndex (axes, specifications=None, omit=None, order=None):
 
     if omit is None:
         omitlist = []
-    elif isinstance(omit, types.StringType):
+    elif isinstance(omit, basestring):
         omitlist = [omit]
-    elif isinstance(omit, types.ListType):
+    elif isinstance(omit, list):
         omitlist = omit
-    elif isinstance(omit, types.TupleType):
+    elif isinstance(omit, tuple):
         omitlist=list(omit)
-    elif isinstance(omit, types.IntType):
+    elif isinstance(omit, int):
         omitlist = [omit]
-    elif isinstance(omit, types.FunctionType):
+    elif callable(omit):
         omitlist = [omit]
     elif isinstance(omit, AbstractAxis):
         omitlist = [omit]
@@ -2171,7 +2171,7 @@ def axisMatchIndex (axes, specifications=None, omit=None, order=None):
         raise CDMSError, 'Unknown type of omit specifier.'
 
     for s in omitlist:
-        if isinstance(s, types.IntType):
+        if isinstance(s, int):
             for i in range(len(candidates)):
                 if axes[candidates[i]] is axes[s]:
                     del candidates[i]
@@ -2251,13 +2251,13 @@ def axisMatches(axis, specification):
        3. an axis object; will match if it is the same object as axis.
     """   
     if isinstance(specification, basestring):
-        s = string.lower(specification)
+        s = specification.lower()
         s = s.strip()
         while s[0] == '(':
             if s[-1] != ')':
                 raise CDMSError, 'Malformed axis spec, ' + specification
             s = s[1:-1].strip()
-        if string.lower(axis.id) == s:
+        if axis.id.lower() == s:
             return 1
         elif (s == 'time') or (s in time_aliases):
             return axis.isTime() 
@@ -2272,7 +2272,7 @@ def axisMatches(axis, specification):
         else:
             return 0
 
-    elif isinstance(specification, types.FunctionType):
+    elif callable(specification):
         r = specification(axis)
         if r: 
             return 1
diff --git a/Packages/cdms2/Lib/internattr.py b/Packages/cdms2/Lib/internattr.py
deleted file mode 100644
index ff6ebeb0c..000000000
--- a/Packages/cdms2/Lib/internattr.py
+++ /dev/null
@@ -1,157 +0,0 @@
-"InternalAttributes (implmentation class for CDMS)"
-import types
-import PropertiedClasses
-_PCLASS = PropertiedClasses.PropertiedClass
-class AttributeDict:
-    """An attribute dictionary."""
-    def __init__ (self, owner):
-        self._owner = owner
-    
-    def __getitem__ (self, name):
-        if self.has_key(name):
-            return self._owner.__dict__[name]
-        else:
-            raise KeyError, "%s instance has no external attribute %s" % \
-                   (self._owner.__class__.__name__, name)
-
-    def __setitem__ (self, name, value):
-        if self._owner.is_internal_attribute(name):
-            raise RuntimeError, 'Cannot set internal name in external attribute dictionary.'
-        self._owner.__dict__[name] = value
-
-    def clear (self):
-        self._owner.__dict__.clear()
-
-    def get (self, name, default=None):
-        if self.has_key(name):
-            return self._owner.__dict__[name]
-        else:
-            return default
-
-    def has_key(self, name):
-        d = self._owner.__dict__
-        if d.has_key(name) and not self._owner.is_internal_attribute(name):
-            return 1
-        else:
-            return 0
-
-    def items (self):
-        result = []
-        for name, value in self._owner.__dict__.items():
-            if self._owner.is_internal_attribute(name): continue
-            result.append((name, value))
-        return result
-    
-    def keys (self):
-        result = []
-        for name in self._owner.__dict__.keys():
-            if self._owner.is_internal_attribute(name): continue
-            result.append(name)
-        return result
-
-    def update(self, d):
-        for name, value in d.items():
-            if self._owner.is_internal_attribute(name):
-                raise RuntimeError, "Cannot update attribute dict with internal name"
-        self._owner.__dict__[name] = value
-
-    def values (self):
-        result = []
-        for name, value in self._owner.__dict__.items():
-            if self._owner.is_internal_attribute(name): continue
-            result.append(value)
-        return result
-
-    def __repr__(self):
-        return 'AttributeDict (' + \
-        repr(self._owner.__dict__) + \
-        ')'
-
-    def __str__(self):
-        return str(self._owner.__dict__)
-    
-class InternalAttributesClass (_PCLASS):
-    def _getattributes (self, name):
-        """Return a dictionary-like object of the non-internal attributes."""
-        return AttributeDict(self)
-
-    def is_internal_attribute (self, name):
-        """is_internal_attribute(name) is true if name is internal."""
-        if name[0] == '_' or name in self.__class__._internal:
-            return 1
-        return 0
-
-    def replace_external_attributes(self, newAttributes):
-        """replace_external_attributes(newAttributes)
-           Replace the external attributes with dictionary newAttributes.
-        """
-        if not isinstance(newAttributes, types.DictType) and \
-           not isinstance(newAttributes, AttributeDict):
-            raise ValueError, "Argument must be a dictionary"
-        for n in self.__dict__.keys():
-            if not self.is_internal_attribute(n):
-                del self.__dict__[n]
-        for n, v in newAttributes.items():
-            self.__dict__[n] = v
-
-def initialize_internal_attributes (C):
-    "Prepare a class for life as a child of InternalAttributesClass."
-    if C.__dict__.has_key('_internal'): return
-    if not issubclass(C, InternalAttributesClass):
-        raise ValueError, 'Must be subclass of InternalAttributesClass'
-    PropertiedClasses.initialize_property_class (C)
-    C._internal = []
-    for CP in C.__bases__:
-        if issubclass(CP, InternalAttributesClass):
-            initialize_internal_attributes(CP)
-            for name in CP._internal:
-                C._internal.append(name)
-    
-def add_internal_attribute (C, *aname):
-    """add_internal_attribute (C, name, ...)
-       Make attributes name, ... internal in class C.
-    """
-    initialize_internal_attributes(C)
-    for name in aname:
-        if not name in C._internal:
-            C._internal.append(name)
-
-PropertiedClasses.set_property(InternalAttributesClass, 'attributes', 
-                               InternalAttributesClass._getattributes, 
-                               nowrite=1, nodelete=1)
-
-if __name__ == '__main__':
-    class Test(InternalAttributesClass):
-        def __init__ (self):
-            self.node = None
-            self.parent = None
-            self.__dict__['ro'] = 1
-            self.__hide = 3
-            self._p = 4
-            self.value = 1
-
-    PropertiedClasses.set_property(Test, 'ro', nowrite=1, nodelete=1)
-    add_internal_attribute(Test, 'node', 'parent', 'ro')
-
-    t1 = Test()
-    assert t1.value == 1
-    assert not t1.attributes.has_key('__hide')
-    assert not t1.attributes.has_key('_p')
-    assert t1._p == 4
-    t1.value = 2
-    assert t1.value == 2
-    assert 'value' in t1.attributes.keys()
-    t1.b = t1.value + 1
-    assert t1.b == 3
-    assert t1.b == t1.attributes['b']
-    t1.node = 'me'
-    t1.parent = 'dad'
-    assert t1.node == 'me'
-    assert 'node' not in t1.attributes.keys()
-    assert t1.ro == 1
-    try:
-        t1.ro == 2
-    except AttributeError:
-        pass
-    assert t1.ro == 1
-    print "Test passed."
-- 
GitLab


From d40cb17afc176ecc96b35b563a36b8c27966812e Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 26 Apr 2016 09:51:59 -0700
Subject: [PATCH 028/191] cleaned up cdmsNode

---
 Packages/cdms2/Lib/cdmsNode.py | 48 +++++++++++++++-------------------
 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/Packages/cdms2/Lib/cdmsNode.py b/Packages/cdms2/Lib/cdmsNode.py
index 794e4ed3b..5d82a9526 100644
--- a/Packages/cdms2/Lib/cdmsNode.py
+++ b/Packages/cdms2/Lib/cdmsNode.py
@@ -9,9 +9,7 @@ from numpy import get_printoptions, set_printoptions, inf
 import CDML
 import cdtime
 import re
-import string
 import sys
-from types import *
 from error import CDMSError
 
 # Regular expressions
@@ -309,9 +307,9 @@ class CdmsNode:
             if (validAttrs and (attname in validAttrs)) or (not validAttrs):
                 (attval,datatype)=self.attribute[attname]
                 # attvalstr = _Illegal.sub(mapIllegalToEntity,str(attval))  # Map illegal chars to entities
-                if type(attval)!=StringType:
+                if not isinstance(attval, basestring):
                     attval = `attval`
-                attvalstr = string.strip(attval)
+                attvalstr = attval.strip()
                 attvalstr = re.sub('\n','\n ',attvalstr) # Make sure continuation lines are preceded with a space
                 if attvalstr=='': attvalstr = "none"
                 fd.write("%s: %s\n"%(attname,attvalstr))
@@ -320,7 +318,7 @@ class CdmsNode:
         for attname in self.attribute.keys():
             if validAttrs and (attname not in validAttrs):
                 (attval,datatype)=self.attribute[attname]
-                if type(attval)!=StringType:
+                if not isinstance(attval, basestring):
                     attval = `attval`
                 attval = re.sub('\n','\n ',attval) # Make sure continuation lines are preceded with a space
                 fd.write("attr: %s=%s\n"%(attname,attval))
@@ -332,7 +330,7 @@ class CdmsNode:
         #     fd.write("value: %s"%(content,))
 
         # Write user attributes
-        if type(userAttrs)==StringType:
+        if isinstance(userAttrs, basestring):
             newAttrs = [userAttrs]
         else:
             newAttrs = userAttrs
@@ -356,7 +354,7 @@ class CdmsNode:
         for attname in self.attribute.keys():
             if attname in validKeys:
                 (atttype,default)=self.dtd[attname]
-                if type(atttype) is TupleType:
+                if isinstance(atttype,tuple):
                     attval=self.getExternalAttr(attname)
                     assert attval in atttype, 'Invalid attribute %s=%s must be in %s'%(attname,attval,`atttype`)
                 elif atttype==CDML.Idref:
@@ -426,7 +424,7 @@ class VariableNode(CdmsNode):
     # Create a variable.
     # If validate is true, validate immediately
     def __init__(self, id, datatype, domain):
-        assert type(datatype) is StringType, 'Invalid datatype: '+`datatype`
+        assert isinstance(datatype,basestring), 'Invalid datatype: '+`datatype`
         assert datatype in CdDatatypes, 'Invalid datatype: '+`datatype`
         CdmsNode.__init__(self,"variable",id)
         self.datatype = datatype
@@ -456,8 +454,8 @@ class AxisNode(CdmsNode):
     # If datatype is None, assume values [0,1,..,length-1]
     # data is a numpy array, if specified
     def __init__(self, id, length, datatype=CdLong,data=None):
-        assert isinstance(length, IntType), 'Invalid length: '+`length`
-        assert type(datatype) is StringType, 'Invalid datatype: '+`datatype`
+        assert isinstance(length, int), 'Invalid length: '+`length`
+        assert isinstance(datatype, basestring), 'Invalid datatype: '+`datatype`
         assert datatype in CdDatatypes, 'Invalid datatype: '+`datatype`
         if data is not None: assert isinstance(data, numpy.ndarray), 'data must be a 1-D Numeric array'
         CdmsNode.__init__(self,"axis",id)
@@ -492,7 +490,7 @@ class AxisNode(CdmsNode):
         numlist = []
         for numstring in stringlist:
             if numstring=='': continue
-            numlist.append(string.atof(numstring))
+            numlist.append(float(numstring))
         if len(numlist)>0:
             # NB! len(zero-length array) causes IndexError on Linux!
             dataArray = numpy.array(numlist,numericType)
@@ -506,7 +504,7 @@ class AxisNode(CdmsNode):
         numlist = []
         for numstring in stringlist:
             if numstring=='': continue
-            numlist.append(string.atoi(numstring))
+            numlist.append(int(numstring))
         dataArray = numpy.array(numlist,numpy.int)
         if len(dataArray)>0:
             self.partition = dataArray
@@ -722,13 +720,13 @@ class AxisNode(CdmsNode):
 # Linear data element
 class LinearDataNode(CdmsNode):
 
-    validStartTypes = [IntType,FloatType,type(cdtime.comptime(0)),type(cdtime.reltime(0,"hours"))]
-    validDeltaTypes = [IntType,FloatType,ListType]
+    validStartTypes = [int, float, type(cdtime.comptime(0)), type(cdtime.reltime(0,"hours"))]
+    validDeltaTypes = [int, float, list]
 
     def __init__(self, start, delta, length):
         assert isinstance(start, numpy.floating) or isinstance(start, numpy.integer) or (type(start) in self.validStartTypes), 'Invalid start argument: '+`start`
         assert isinstance(start, numpy.floating) or isinstance(start, numpy.integer) or (type(delta) in self.validDeltaTypes), 'Invalid delta argument: '+`delta`
-        assert isinstance(length, IntType), 'Invalid length argument: '+`length`
+        assert isinstance(length, int), 'Invalid length argument: '+`length`
         CdmsNode.__init__(self,"linear")
         self.delta = delta
         self.length = length
@@ -932,12 +930,8 @@ class AttrNode(CdmsNode):
 
     def __init__(self, name, value=None):
         CdmsNode.__init__(self,"attr")
-        if not (isinstance(value,IntType)
-                or isinstance(value,numpy.integer)
-                or isinstance(value,FloatType)
-                or isinstance(value,numpy.floating)
-                or isinstance(value,StringType)
-                or isinstance(value,NoneType)):
+        if not (isinstance(value,(int, numpy.integer, float, numpy.floating, basestring)) \
+                or value is None:
             raise CDMSError, 'Invalid attribute type: '+`value`
         self.name = name
         self.value = value
@@ -954,11 +948,11 @@ class AttrNode(CdmsNode):
     def getDatatype(self):
         if self.datatype:
             return self.datatype
-        elif type(self.value) is StringType:
+        elif isinstance(self.value, basestring):
             return CdString
-        elif isinstance(self.value, FloatType) or isinstance(self.value,numpy.floating):
+        elif isinstance(self.value, (float,numpy.floating)):
             return CdDouble
-        elif isinstance(self.value, IntType) or isinstance(self.value,numpy.integer):
+        elif isinstance(self.value, (int, numpy.integer)):
             return CdLong
         else:
             raise CDMSError, 'Invalid attribute type: '+`self.value`
@@ -970,18 +964,18 @@ class AttrNode(CdmsNode):
     #   Returns ValueError if the conversion fails
     def setValueFromString(self,valString,datatype):
         val = None
-        if type(valString) is not StringType:
+        if not isinstance(valString, basestring):
             raise CDMSError, 'input value is not a string'
         if datatype == CdString:
             val=valString
         elif datatype in (CdShort,CdInt,CdLong):
             try:
-                val=string.atoi(valString)
+                val=int(valString)
             except ValueError:
                 raise CDMSError, 'value is not an integer: '+valString
         elif datatype in (CdFloat,CdDouble):
             try:
-                val=string.atof(valString)
+                val=float(valString)
             except ValueError:
                 raise CDMSError, 'value is not floating-point: '+valString
         self.value=val
-- 
GitLab


From bf68e04105ca4367cbd048732fa6ecd26b531732 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 26 Apr 2016 09:54:00 -0700
Subject: [PATCH 029/191] cleaned up coord

---
 Packages/cdms2/Lib/coord.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Packages/cdms2/Lib/coord.py b/Packages/cdms2/Lib/coord.py
index 6f7773fd1..8460485e6 100644
--- a/Packages/cdms2/Lib/coord.py
+++ b/Packages/cdms2/Lib/coord.py
@@ -10,8 +10,6 @@ import cdtime
 import copy
 import numpy
 #import internattr
-import types
-import string
 from cdmsobj import CdmsObj
 from axis import createAxis, TransientVirtualAxis
 from error import CDMSError
@@ -118,7 +116,7 @@ class AbstractCoordinateAxis(CdmsObj):
     # calendar.
     def getCalendar(self):
         if hasattr(self,'calendar'):
-            calendar = string.lower(self.calendar)
+            calendar = self.calendar.lower()
         else:
             calendar = None
 
@@ -147,7 +145,7 @@ class AbstractCoordinateAxis(CdmsObj):
 
     # Return true iff the axis is a level axis
     def isLevel(self):
-        id = string.lower(self.id)
+        id = self.id.lower()
         if (hasattr(self,'axis') and self.axis=='Z'): return 1
         return ((id[0:3] == 'lev') or (id[0:5] == 'depth') or (id in level_aliases))
 
@@ -158,13 +156,13 @@ class AbstractCoordinateAxis(CdmsObj):
 
     # Return true iff the axis is a time axis
     def isTime(self):
-        id = string.lower(self.id)
+        id = self.id.lower()
         if (hasattr(self,'axis') and self.axis=='T'): return 1
         return (id[0:4] == 'time') or (id in time_aliases)
 
     # Return true iff the axis is a forecast axis
     def isForecast(self):
-        id = string.lower(self.id)
+        id = self.id.lower()
         if (hasattr(self,'axis') and self.axis=='F'): return 1
         return (id[0:6] == 'fctau0') or (id in forecast_aliases)
 
-- 
GitLab


From f570c2cf6112133f777fd6073769814c99b2b5e1 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 26 Apr 2016 11:23:01 -0700
Subject: [PATCH 030/191] cleaned up all (most?) files

---
 Packages/cdms2/Lib/cudsinterface.py    |  6 +++---
 Packages/cdms2/Lib/database.py         |  8 +++-----
 Packages/cdms2/Lib/dataset.py          | 19 +++++++++----------
 Packages/cdms2/Lib/fvariable.py        |  1 -
 Packages/cdms2/Lib/grid.py             |  5 ++---
 Packages/cdms2/Lib/gsStaticVariable.py |  1 -
 Packages/cdms2/Lib/mvCdmsRegrid.py     |  3 +--
 Packages/cdms2/Lib/mvSphereMesh.py     | 11 +++++------
 Packages/cdms2/Lib/selectors.py        |  4 ++--
 Packages/cdms2/Lib/slabinterface.py    |  6 +++---
 Packages/cdms2/Lib/tvariable.py        |  9 ++++-----
 Packages/cdms2/Lib/variable.py         |  1 -
 12 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/Packages/cdms2/Lib/cudsinterface.py b/Packages/cdms2/Lib/cudsinterface.py
index c97f5fdef..4232bdf44 100644
--- a/Packages/cdms2/Lib/cudsinterface.py
+++ b/Packages/cdms2/Lib/cudsinterface.py
@@ -2,7 +2,7 @@
 ## Further modified to be pure new numpy June 24th 2008
 
 "Emulation of old cu package"
-import string, types, sys
+import sys
 from error import CDMSError
 from dataset import openDataset, createDataset
 from tvariable import createVariable
@@ -215,7 +215,7 @@ class cuDataset():
         if device is None: device=sys.stdout
         if vname is None: vname = self.default_variable_name
         alist = self.listall(vname, all=all)
-        device.write(string.join(alist, "\n"))
+        device.write("\n".join(alist))
         device.write("\n")
 
     def dimensionobject (self, dname, vname=None):
@@ -357,7 +357,7 @@ class cuDataset():
                 idim = ndims - (nargs - i - 1)
                 i = i + 1
                 ne = 1
-            elif type(x) == types.TupleType:
+            elif isinstance(x,tuple):
                 cdms_args[idim] = x
                 idim = idim + 1
                 i = i + 1
diff --git a/Packages/cdms2/Lib/database.py b/Packages/cdms2/Lib/database.py
index 80f749fb4..ac8b0dc7a 100644
--- a/Packages/cdms2/Lib/database.py
+++ b/Packages/cdms2/Lib/database.py
@@ -7,9 +7,7 @@ import cdurlparse
 import copy
 import os
 import re
-import string
 import sys
-import types
 from CDMLParser import CDMLParser
 from cdmsobj import CdmsObj
 from dataset import Dataset
@@ -205,7 +203,7 @@ class LDAPDatabase(AbstractDatabase):
     
     def normalizedn(self, dn):
         explodeddn = ldap.explode_dn(dn)
-        return string.join(explodeddn,',')
+        return ','.join(explodeddn)
 
     def cachecdml(self, name, cdml, datapath):
         normaldn = self.normalizedn(name)
@@ -239,7 +237,7 @@ class LDAPDatabase(AbstractDatabase):
 
         # Get the parent dataset
         explodeddn = ldap.explode_dn(dn)
-        dsetdn = string.join(explodeddn[1:],',') # Dataset node is parent of variable
+        dsetdn = ','.join(explodeddn[1:]) # Dataset node is parent of variable
         dset = self.getDataset(dsetdn)
         rdn = explodeddn[0]
         matchobj = _Att.match(rdn)
@@ -468,7 +466,7 @@ class LDAPSearchResult(AbstractSearchResult):
 
         """
         if tag is not None:
-            tag = string.lower(tag)
+            tag = tag.lower()
 
         resultlist = []
         for entry in self:
diff --git a/Packages/cdms2/Lib/dataset.py b/Packages/cdms2/Lib/dataset.py
index 977b1d8bb..6074615de 100644
--- a/Packages/cdms2/Lib/dataset.py
+++ b/Packages/cdms2/Lib/dataset.py
@@ -7,7 +7,6 @@ import Cdunif
 import numpy
 import cdmsNode
 import os, sys
-import string
 import urllib
 import cdmsURLopener                    # Import after urllib, to handle errors
 import urlparse
@@ -280,7 +279,7 @@ Output:::
 file :: (cdms2.dataset.CdmsFile) (0) file to read from
 :::
     """
-    uri = string.strip(uri)
+    uri = uri.strip()
     (scheme,netloc,path,parameters,query,fragment)=urlparse.urlparse(uri)
     if scheme in ('','file'):
         if netloc:
@@ -417,7 +416,7 @@ def parseIndexList(text):
     for i in range(nindices):
         s = m.group(i+1)
         if s!='-':
-            result[i] = string.atoi(s)
+            result[i] = int(s)
     result[nindices] = m.group(nindices+1)
     return result, m.end()
 
@@ -744,7 +743,7 @@ class Dataset(CdmsObj, cuDataset):
     def searchPattern(self,pattern,attribute,tag):
         resultlist = []
         if tag is not None:
-            tag = string.lower(tag)
+            tag = tag.lower()
         if tag in ('dataset',None):
             if self.searchone(pattern,attribute)==1:
                 resultlist = [self]
@@ -769,7 +768,7 @@ class Dataset(CdmsObj, cuDataset):
     def matchPattern(self,pattern,attribute,tag):
         resultlist = []
         if tag is not None:
-            tag = string.lower(tag)
+            tag = tag.lower()
         if tag in ('dataset',None):
             if self.matchone(pattern,attribute)==1:
                 resultlist = [self]
@@ -797,7 +796,7 @@ class Dataset(CdmsObj, cuDataset):
     def searchPredicate(self,predicate,tag):
         resultlist = []
         if tag is not None:
-            tag = string.lower(tag)
+            tag = tag.lower()
         if tag in ('dataset',None):
             try:
                 if apply(predicate,(self,))==1:
@@ -1548,7 +1547,7 @@ class CdmsFile(CdmsObj, cuDataset):
         """
         resultlist = []
         if tag is not None:
-            tag = string.lower(tag)
+            tag = tag.lower()
         if tag in ('cdmsFile',None,'dataset'):
             if self.searchone(pattern,attribute)==1:
                 resultlist = [self]
@@ -1585,7 +1584,7 @@ class CdmsFile(CdmsObj, cuDataset):
         """
         resultlist = []
         if tag is not None:
-            tag = string.lower(tag)
+            tag = tag.lower()
         if tag in ('cdmsFile',None,'dataset'):
             if self.matchone(pattern,attribute)==1:
                 resultlist = [self]
@@ -1624,7 +1623,7 @@ class CdmsFile(CdmsObj, cuDataset):
         """
         resultlist = []
         if tag is not None:
-            tag = string.lower(tag)
+            tag = tag.lower()
         if tag in ('cdmsFile',None,'dataset'):
             try:
                 if apply(predicate,(self,))==1:
@@ -2017,7 +2016,7 @@ class CdmsFile(CdmsObj, cuDataset):
 
     def __repr__(self):
         filerep = `self._file_`
-        loc = string.find(filerep,"file")
+        loc = filerep.find("file")
         if loc==-1: loc=0
         return "<CDMS "+filerep[loc:-1]+", status: %s>"%self._status_
 
diff --git a/Packages/cdms2/Lib/fvariable.py b/Packages/cdms2/Lib/fvariable.py
index 4271e12c6..6ca32df15 100644
--- a/Packages/cdms2/Lib/fvariable.py
+++ b/Packages/cdms2/Lib/fvariable.py
@@ -4,7 +4,6 @@
 "CDMS File-based variables."
 import numpy
 import typeconv
-import types
 import re
 
 from cdmsobj import Max32int
diff --git a/Packages/cdms2/Lib/grid.py b/Packages/cdms2/Lib/grid.py
index f11ca1764..05fdf9b7c 100644
--- a/Packages/cdms2/Lib/grid.py
+++ b/Packages/cdms2/Lib/grid.py
@@ -2,7 +2,6 @@
 ## Further modified to be pure new numpy June 24th 2008
 
 """CDMS Grid objects"""
-import types
 import re
 from error import CDMSError
 import numpy #, PropertiedClasses, internattr
@@ -129,14 +128,14 @@ def setRegionSpecs(grid, coordSpec, coordType, resultSpec):
     
     if (coordSpec is None) or (coordSpec==':'):
         canonSpec = None
-    elif type(coordSpec) is types.TupleType:
+    elif isinstance(coordSpec, tuple):
         if len(coordSpec)==2:
             canonSpec = (coordSpec[0],coordSpec[1],'cc',None)
         elif len(coordSpec)==3:
             canonSpec = (coordSpec[0],coordSpec[1],coordSpec[2],None)
         elif len(coordSpec)!=4:
             raise CDMSError, 'Invalid coordinate specification: %s'%`coordSpec`
-    elif type(coordSpec) in [types.IntType, types.FloatType]:
+    elif isinstance(coordSpec, (int, float)):
         canonSpec = (coordSpec, coordSpec, 'cc', None)
     else:
         raise CDMSError, 'Invalid coordinate specification: %s'%`coordSpec`
diff --git a/Packages/cdms2/Lib/gsStaticVariable.py b/Packages/cdms2/Lib/gsStaticVariable.py
index 0332e1415..fdd740c86 100644
--- a/Packages/cdms2/Lib/gsStaticVariable.py
+++ b/Packages/cdms2/Lib/gsStaticVariable.py
@@ -9,7 +9,6 @@ No guarantee is provided whatsoever. Use at your own risk.
 
 import operator
 import cdms2
-import types
 from cdms2.error import CDMSError
 from cdms2.hgrid import AbstractCurveGrid, TransientCurveGrid, FileCurveGrid
 from cdms2.coord import TransientAxis2D, TransientVirtualAxis
diff --git a/Packages/cdms2/Lib/mvCdmsRegrid.py b/Packages/cdms2/Lib/mvCdmsRegrid.py
index 6cc0adf8a..5a1f34361 100644
--- a/Packages/cdms2/Lib/mvCdmsRegrid.py
+++ b/Packages/cdms2/Lib/mvCdmsRegrid.py
@@ -5,7 +5,6 @@ David Kindig and Alex Pletzer, Tech-X Corp. (2012)
 This code is provided with the hope that it will be useful.
 No guarantee is provided whatsoever. Use at your own risk.
 """
-import types
 import operator
 import re
 import numpy
@@ -450,7 +449,7 @@ coordMin = %7.2f, boundMin = %7.2f, coordMax = %7.2f, boundMax = %7.2f
         attrs = {}
         for a in srcVar.attributes:
             v = srcVar.attributes[a]
-            if type(v) is types.StringType:
+            if isinstance(v, basestring):
                 attrs[a] = v
 
         # if the missing value is present in the destination data, set
diff --git a/Packages/cdms2/Lib/mvSphereMesh.py b/Packages/cdms2/Lib/mvSphereMesh.py
index 2d4b7abad..7b95922e2 100644
--- a/Packages/cdms2/Lib/mvSphereMesh.py
+++ b/Packages/cdms2/Lib/mvSphereMesh.py
@@ -8,7 +8,6 @@ No guarantee is provided whatsoever. Use at your own risk.
 """
 
 import numpy
-from types import NoneType
 
 class SphereMesh:
     
@@ -34,7 +33,7 @@ class SphereMesh:
 
         # compute the min/max of elevation, needed
         # for normalization
-        if type(elvs) != NoneType:
+        if elvs is not None:
             self.minElv = min(elvs[:])
             self.maxElv = max(elvs[:])
             if hasattr(elvs, 'positive'):
@@ -44,7 +43,7 @@ class SphereMesh:
         # determine the dimensionality and 
         # whether the grid is rectilinear
         for axis in lons, lats, elvs:
-            if type(axis) != NoneType:
+            if axis is not None:
                 self.ndims += 1
                 if len(axis.shape) != 1:
                     self.isRectilinear = False
@@ -53,7 +52,7 @@ class SphereMesh:
         if self.isRectilinear:
             self.shape = []
             for axis in lons, lats, elvs:
-                if type(axis) != NoneType:
+                if axis is not None:
                     self.shape.append( len(axis) )
             self.shape.reverse()
 
@@ -63,7 +62,7 @@ class SphereMesh:
         # store lon, lat, elv as a curvilinear grid
         if self.isRectilinear:
             # apply tensore product of axes to generat curvilinear coordinates
-            if type(elvs) != NoneType:
+            if elvs is not None:
                 self.elvs = numpy.outer(numpy.outer( numpy.ones(self.shape[:0], numpy.float32), elvs),
                                         numpy.ones(self.shape[0+1:], numpy.float32)).reshape(self.shape)
             else:
@@ -77,7 +76,7 @@ class SphereMesh:
             # already in curvilinear form
             self.lons = lons[:]
             self.lats = lats[:]
-            if type(elvs) != NoneType:
+            if elvs is not None:
                 self.elvs = elvs[:]
             else:
                 self.elvs = numpy.zeros( self.shape, numpy.float32 )
diff --git a/Packages/cdms2/Lib/selectors.py b/Packages/cdms2/Lib/selectors.py
index b2ee04bc6..f22443976 100644
--- a/Packages/cdms2/Lib/selectors.py
+++ b/Packages/cdms2/Lib/selectors.py
@@ -1,6 +1,6 @@
 
 """Classes to support easy selection of climate data"""
-import string, types, cdtime
+import cdtime
 from axis import axisMatches
 from error import CDMSError
 from grid import AbstractRectGrid, defaultRegion, setRegionSpecs, LongitudeType, LatitudeType, TimeType, VerticalType
@@ -393,7 +393,7 @@ def required(values):
     """Creates a selector that requires a certain axis to be present."""
     if values is None:
         return all
-    if isinstance(values, types.StringType):
+    if isinstance(values, basestring):
         values = (values,)
     return Selector(requiredComponent(values))
 
diff --git a/Packages/cdms2/Lib/slabinterface.py b/Packages/cdms2/Lib/slabinterface.py
index e08b49ea5..642aea131 100644
--- a/Packages/cdms2/Lib/slabinterface.py
+++ b/Packages/cdms2/Lib/slabinterface.py
@@ -3,7 +3,7 @@
 
 "Read part of the old cu slab interface implemented over CDMS"
 import numpy
-import string, types, sys
+import sys
 from error import CDMSError
 from axis import std_axis_attributes
 import cdms2 as cdms
@@ -143,7 +143,7 @@ class Slab:
         for nd in range(self.rank()):
             result.append('** Dimension ' + str(nd+1) + ' **')
             result = result + self.getAxis(nd).listall(1)
-        print string.join(result, '\n')
+        print '\n'.join(result)
 
     def listdimnames(self):
         "Return a list of the names of the dimensions."
@@ -179,7 +179,7 @@ class Slab:
     def info(self, flag=None, device=None):
         "Write info about slab; include dimension values and weights if flag"
         if device is None: device = sys.stdout
-        device.write(string.join(self.listall(all=flag), "\n"))
+        device.write('\n'.join(self.listall(all=flag)))
         device.write("\n")
 
 def cdms_bounds2cu_bounds (b):
diff --git a/Packages/cdms2/Lib/tvariable.py b/Packages/cdms2/Lib/tvariable.py
index 27cab8156..7d9db8b9d 100644
--- a/Packages/cdms2/Lib/tvariable.py
+++ b/Packages/cdms2/Lib/tvariable.py
@@ -8,7 +8,6 @@ Contains also the write part of the old cu interface.
 """
 import json
 import re
-import types
 import typeconv
 import numpy
 from numpy import sctype2char
@@ -166,7 +165,7 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
         if dtype is None and typecode is not None:
             dtype = typeconv.convtypecode2(typecode)
         typecode = sctype2char(dtype)
-        if type(data) is types.TupleType:
+        if isinstance(data, tuple):
             data = list(data)
         
         AbstractVariable.__init__ (self)
@@ -252,7 +251,7 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
         if dtype is None and typecode is not None:
             dtype = typeconv.convtypecode2(typecode)
         typecode = sctype2char(dtype)
-        if type(data) is types.TupleType:
+        if isinstance(data, tuple):
             data = list(data)
         if isinstance(data, AbstractVariable):
             if not isinstance(data, TransientVariable):
@@ -479,7 +478,7 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
             raise CDMSError, "setdimattribute, dim out of bounds."
         d = self.getAxis(dim)
         if field == "name":
-            if not type(value) == types.StringType:
+            if not isinstance(value, basestring):
                raise CDMSError, "setdimattribute: name not a string"
             d.id = value
             
@@ -492,7 +491,7 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
             self.setAxis(dim, a)
 
         elif field == "units":
-            if not type(value) == types.StringType:
+            if not isinstance(value, basestring):
                raise CDMSError, "setdimattribute: units not a string"
             d.units = value
 
diff --git a/Packages/cdms2/Lib/variable.py b/Packages/cdms2/Lib/variable.py
index a1f3f7f7d..396dbdf06 100644
--- a/Packages/cdms2/Lib/variable.py
+++ b/Packages/cdms2/Lib/variable.py
@@ -11,7 +11,6 @@ import copy
 import os
 import string
 import sys
-import types
 import cdmsobj
 from cdmsobj import CdmsObj, getPathFromTemplate, Max32int
 from avariable import AbstractVariable
-- 
GitLab


From 05e2675ee1e395a89b18dd6afa713e5d08535aa4 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 26 Apr 2016 11:39:47 -0700
Subject: [PATCH 031/191] removed string odule wheen possible

---
 Packages/cdms2/Lib/CDMLParser.py | 15 +++++++--------
 Packages/cdms2/Lib/cdxmllib.py   |  1 -
 Packages/cdms2/Lib/convention.py | 27 +++++++++++++--------------
 Packages/cdms2/Lib/gengrid.py    |  9 ++++-----
 Packages/cdms2/Lib/hgrid.py      |  9 ++++-----
 Packages/cdms2/Lib/variable.py   |  5 ++---
 6 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/Packages/cdms2/Lib/CDMLParser.py b/Packages/cdms2/Lib/CDMLParser.py
index 1ff9abc56..e741e44d2 100644
--- a/Packages/cdms2/Lib/CDMLParser.py
+++ b/Packages/cdms2/Lib/CDMLParser.py
@@ -6,7 +6,6 @@ from cdxmllib import XMLParser
 import CDML
 import re
 import cdmsNode
-import string
 
 # Error constants
 InvalidAttribute = "Invalid attribute"
@@ -52,7 +51,7 @@ class CDMLParser(XMLParser):
         if not matchObj:
             if self.verbose: print 'data:',data
             if self.root:
-                self.getCurrentNode().setContentFromString(string.strip(data))
+                self.getCurrentNode().setContentFromString(data.strip())
 
     def handle_cdata(self, data):
         if self.verbose: print 'cdata:', `data`
@@ -125,7 +124,7 @@ class CDMLParser(XMLParser):
         datatype = attrs.get('datatype')
         if _Integer.match(length_s) is None:
             raise InvalidAttribute, 'length='+length_s
-        length = string.atoi(length_s)
+        length = int(length_s)
         axis = cdmsNode.AxisNode(id,length,datatype)
         partstring = attrs.get('partition')
         if partstring is not None:
@@ -202,11 +201,11 @@ class CDMLParser(XMLParser):
         start_s = attrs.get('start')
         length_s = attrs.get('length')
         if start_s is not None:
-            start = string.atoi(start_s)
+            start = int(start_s)
         else:
             start = None
         if length_s is not None:
-            length = string.atoi(length_s)
+            length = int(length_s)
         else:
             length = None
         domElem = cdmsNode.DomElemNode(name,start,length)
@@ -250,15 +249,15 @@ class CDMLParser(XMLParser):
         delta_s = attrs['delta']
         length_s = attrs['length']
         try:
-            start=string.atof(start_s)
+            start=float(start_s)
         except ValueError:
             raise InvalidAttribute, 'start='+start_s
         try:
-            delta=string.atof(delta_s)
+            delta=float(delta_s)
         except ValueError:
             raise InvalidAttribute, 'delta='+delta_s
         try:
-            length=string.atoi(length_s)
+            length=int(length_s)
         except ValueError:
             raise InvalidAttribute, 'length='+length_s
         linear = cdmsNode.LinearDataNode(start,delta,length)
diff --git a/Packages/cdms2/Lib/cdxmllib.py b/Packages/cdms2/Lib/cdxmllib.py
index baa0f6dfb..7c1aff308 100644
--- a/Packages/cdms2/Lib/cdxmllib.py
+++ b/Packages/cdms2/Lib/cdxmllib.py
@@ -3,7 +3,6 @@
 # Author: Sjoerd Mullender.
 
 import re
-import string
 
 # import warnings
 # warnings.warn("The xmllib module is obsolete.  Use xml.sax instead.",
diff --git a/Packages/cdms2/Lib/convention.py b/Packages/cdms2/Lib/convention.py
index 4e8c9053e..0ed475877 100644
--- a/Packages/cdms2/Lib/convention.py
+++ b/Packages/cdms2/Lib/convention.py
@@ -1,6 +1,5 @@
 """ metadata conventions """
 
-import string
 from error import CDMSError
 from UserList import UserList
 
@@ -13,11 +12,11 @@ class AliasList (UserList):
     def __init__(self, alist):
         UserList.__init__(self,alist)
     def __setitem__ (self, i, value):
-        self.data[i] = string.lower(value)
+        self.data[i] = value.lower()
     def __setslice(self, i, j, values):
-        self.data[i:j] = map(lambda x: string.lower(x), values)
+        self.data[i:j] = map(lambda x: x.lower(), values)
     def append(self, value):
-        self.data.append(string.lower(value))
+        self.data.append(value.lower())
 
 level_aliases = AliasList(['plev'])
 longitude_aliases = AliasList([])
@@ -37,11 +36,11 @@ class AbstractConvention:
         raise CDMSError, MethodNotImplemented
 
     def axisIsLatitude(self, axis):
-        id = string.lower(axis.id)
+        id = axis.id.lower()
         return (id[0:3] == 'lat') or (id in latitude_aliases)
 
     def axisIsLongitude(self, axis):
-        id = string.lower(axis.id)
+        id = axis.id.lower()
         return (id[0:3] == 'lon') or (id in longitude_aliases)
 
     def getVarLatId(self, var, vardict=None):
@@ -99,7 +98,7 @@ class CFConvention(COARDSConvention):
         coorddict = {}
         for var in vardict.values():
             if hasattr(var, 'coordinates'):
-                coordnames = string.split(var.coordinates)
+                coordnames = var.coordinates.lower()
                 for item in coordnames:
                     # Don't include if already a 1D coordinate axis.
                     if item in axiskeys:
@@ -127,7 +126,7 @@ class CFConvention(COARDSConvention):
         for node in dsetdict.values():
             coordnames = node.getExternalAttr('coordinates')
             if coordnames is not None:
-                coordnames = string.split(coordnames)
+                coordnames = coordnames.split()
                 for item in coordnames:
                     # Don't include if already a 1D coordinate axis.
                     if dsetdict.has_key(item) and dsetdict[item].tag=='axis':
@@ -149,7 +148,7 @@ class CFConvention(COARDSConvention):
             return (lat, nlat)
 
         if hasattr(var, 'coordinates'):
-            coordnames = string.split(var.coordinates)
+            coordnames = var.coordinates.split()
             for name in coordnames:
                 coord = vardict.get(name)
 
@@ -173,7 +172,7 @@ class CFConvention(COARDSConvention):
             return (lon, nlon)
 
         if hasattr(var, 'coordinates'):
-            coordnames = string.split(var.coordinates)
+            coordnames = var.coordinates.split()
             for name in coordnames:
                 coord = vardict.get(name)
 
@@ -191,9 +190,9 @@ class CFConvention(COARDSConvention):
     def axisIsLatitude(self, axis):
         if (hasattr(axis,'axis') and axis.axis=='Y'):
             return 1
-        elif (hasattr(axis, 'units') and string.lower(axis.units) in ['degrees_north', 'degree_north', 'degree_n', 'degrees_n', 'degreen', 'degreesn']):
+        elif (hasattr(axis, 'units') and axis.units.lower() in ['degrees_north', 'degree_north', 'degree_n', 'degrees_n', 'degreen', 'degreesn']):
             return 1
-        elif (hasattr(axis, 'standard_name') and string.lower(axis.standard_name)=='latitude'):
+        elif (hasattr(axis, 'standard_name') and axis.standard_name.lower()=='latitude'):
             return 1
         else:
             return AbstractConvention.axisIsLatitude(self, axis)
@@ -201,9 +200,9 @@ class CFConvention(COARDSConvention):
     def axisIsLongitude(self, axis):
         if (hasattr(axis,'axis') and axis.axis=='X'):
             return 1
-        elif (hasattr(axis, 'units') and string.lower(axis.units) in ['degrees_east', 'degree_east', 'degree_e', 'degrees_e', 'degreee', 'degreese']):
+        elif (hasattr(axis, 'units') and axis.units.lower() in ['degrees_east', 'degree_east', 'degree_e', 'degrees_e', 'degreee', 'degreese']):
             return 1
-        elif (hasattr(axis, 'standard_name') and string.lower(axis.standard_name)=='longitude'):
+        elif (hasattr(axis, 'standard_name') and axis.standard_name.lower()=='longitude'):
             return 1
         else:
             return AbstractConvention.axisIsLongitude(self, axis)
diff --git a/Packages/cdms2/Lib/gengrid.py b/Packages/cdms2/Lib/gengrid.py
index 1204733bc..95e6d1871 100644
--- a/Packages/cdms2/Lib/gengrid.py
+++ b/Packages/cdms2/Lib/gengrid.py
@@ -338,7 +338,6 @@ def readScripGenericGrid(fileobj, dims, whichType, whichGrid):
     whichType is the type of file, either "grid" or "mapping"
     if whichType is "mapping", whichGrid is the choice of grid, either "source" or "destination"
     """
-    import string
     from auxcoord import TransientAuxAxis1D
     from coord import TransientVirtualAxis
 
@@ -400,7 +399,7 @@ def readScripGenericGrid(fileobj, dims, whichType, whichGrid):
         ni = dims[0]
 
     boundsshape = (ni, ncorners)
-    if hasattr(cornerLat, 'units') and string.lower(cornerLat.units)[0:6]=='radian':
+    if hasattr(cornerLat, 'units') and cornerLat.units.lower()[0:6]=='radian':
         cornerLat = (cornerLat*(180.0/numpy.pi)).reshape(boundsshape)
         cornerLon = (cornerLon*(180.0/numpy.pi)).reshape(boundsshape)
 
@@ -415,21 +414,21 @@ def readScripGenericGrid(fileobj, dims, whichType, whichGrid):
         
     if vardict.has_key(gridCenterLatName):
         centerLat = fileobj(gridCenterLatName)
-        if hasattr(centerLat, "units") and string.lower(centerLat.units)=='radians':
+        if hasattr(centerLat, "units") and centerLat.units.lower()=='radians':
             centerLat *= (180.0/numpy.pi)
     else:
         centerLat = cornerLat[:,:,0]
 
     if vardict.has_key(gridCenterLonName):
         centerLon = fileobj(gridCenterLonName)
-        if hasattr(centerLon, "units") and string.lower(centerLon.units)=='radians':
+        if hasattr(centerLon, "units") and centerLon.units.lower()=='radians':
             centerLon *= (180.0/numpy.pi)
     else:
         centerLon = cornerLon[:,:,0]
 
     if hasattr(fileobj,titleName):
         gridid = getattr(fileobj, titleName)
-        gridid = string.replace(string.strip(gridid), ' ','_')
+        gridid = sgridid.strip().replace(' ','_')
     else:
         gridid="<None>"
 
diff --git a/Packages/cdms2/Lib/hgrid.py b/Packages/cdms2/Lib/hgrid.py
index 56758ad72..1f53d3702 100644
--- a/Packages/cdms2/Lib/hgrid.py
+++ b/Packages/cdms2/Lib/hgrid.py
@@ -758,7 +758,6 @@ def readScripCurveGrid(fileobj, dims, whichType, whichGrid):
     whichType is the type of file, either "grid" or "mapping"
     if whichType is "mapping", whichGrid is the choice of grid, either "source" or "destination"
     """
-    import string
     from coord import TransientAxis2D
 
     if 'S' in fileobj.variables.keys():
@@ -814,7 +813,7 @@ def readScripCurveGrid(fileobj, dims, whichType, whichGrid):
     nj = dims[0]
     gridshape = (ni, nj)
     boundsshape = (ni, nj, ncorners)
-    if hasattr(cornerLat, 'units') and string.lower(cornerLat.units)[0:6]=='radian':
+    if hasattr(cornerLat, 'units') and cornerLat.units.lower()[0:6]=='radian':
         cornerLat = (cornerLat*(180.0/numpy.pi)).reshape(boundsshape)
         cornerLon = (cornerLon*(180.0/numpy.pi)).reshape(boundsshape)
     else:
@@ -835,7 +834,7 @@ def readScripCurveGrid(fileobj, dims, whichType, whichGrid):
     if vardict.has_key(gridCenterLatName):
         centerLat = fileobj(gridCenterLatName).reshape(gridshape)
         gclat = fileobj[gridCenterLatName]
-        if hasattr(gclat, "units") and string.lower(gclat.units)=='radians':
+        if hasattr(gclat, "units") and gclat.units.lower()=='radians':
             centerLat *= (180.0/numpy.pi)
     else:
         centerLat = cornerLat[:,:,0]
@@ -843,14 +842,14 @@ def readScripCurveGrid(fileobj, dims, whichType, whichGrid):
     if vardict.has_key(gridCenterLonName):
         centerLon = fileobj(gridCenterLonName).reshape(gridshape)
         gclon = fileobj[gridCenterLonName]
-        if hasattr(gclon, "units") and string.lower(gclon.units)=='radians':
+        if hasattr(gclon, "units") and gclon.units.lower()=='radians':
             centerLon *= (180.0/numpy.pi)
     else:
         centerLon = cornerLon[:,:,0]
 
     if hasattr(fileobj,titleName):
         gridid = getattr(fileobj, titleName)
-        gridid = string.replace(string.strip(gridid), ' ','_')
+        gridid = gridid.strip().replace(' ','_')
     else:
         gridid="<None>"
 
diff --git a/Packages/cdms2/Lib/variable.py b/Packages/cdms2/Lib/variable.py
index 396dbdf06..23650e3d8 100644
--- a/Packages/cdms2/Lib/variable.py
+++ b/Packages/cdms2/Lib/variable.py
@@ -9,7 +9,6 @@ import cdmsNode
 import cdtime
 import copy
 import os
-import string
 import sys
 import cdmsobj
 from cdmsobj import CdmsObj, getPathFromTemplate, Max32int
@@ -139,7 +138,7 @@ class DatasetVariable(AbstractVariable):
                     raise CDMSError, InvalidGridElement + dename
             partlenstr = denode.getExternalAttr('partition_length')
             if partlenstr is not None:
-                truelen = string.atoi(partlenstr)
+                truelen = int(partlenstr)
             else:
                 truelen = denode.length
             self.domain.append((domelem, denode.start, denode.length, truelen))
@@ -224,7 +223,7 @@ class DatasetVariable(AbstractVariable):
             else:                       # Use template method
                 time0 = axis[interval[0]]
                 time1 = axis[interval[1]-1]
-                isabs = (string.find(axis.units," as ")!=-1)
+                isabs = (axis.units.find(" as ")!=-1)
                 if isabs:
                     start = cdtime.abstime(time0,axis.units)
                     end = cdtime.abstime(time1,axis.units)
-- 
GitLab


From 0bc3f4d47b9c21175d4cfa651640f92a4c6215d2 Mon Sep 17 00:00:00 2001
From: Dan Lipsa <dan.lipsa@kitware.com>
Date: Thu, 21 Apr 2016 11:52:28 -0400
Subject: [PATCH 032/191] ENH #1854: Tests will check for alternate baselines
 using basename_[1-9].ext

Previously the pattern used was baseline.*\.ext
---
 testing/checkimage.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/testing/checkimage.py b/testing/checkimage.py
index e0ad9db82..9871f3557 100644
--- a/testing/checkimage.py
+++ b/testing/checkimage.py
@@ -9,6 +9,7 @@ import numpy
 import vtk
 import os
 import os.path
+import re
 import sys
 import logging
 
@@ -40,13 +41,15 @@ def image_from_file(fname):
         print "Problem opening file '%s': %s"%(fname,err)
         return None
 
+# find alternate baselines for fname of the form basename_d.ext
+# where fname = basename.ext and d is a digit between 1 and 9
 def find_alternates(fname):
     dirname = os.path.dirname(fname)
     prefix, ext = os.path.splitext(os.path.split(fname)[1])
     files = os.listdir(dirname)
     results = [fname]
     for i in files:
-        if i.startswith(prefix) and i.endswith(ext) and i != prefix+ext:
+        if (re.match(prefix + '_[1-9]' + ext, i)):
             results.append(os.path.join(dirname, i))
     return results
 
-- 
GitLab


From 2bc8a27233063bbca4c0c5ec23d8e3a4894cfd19 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 26 Apr 2016 14:34:37 -0700
Subject: [PATCH 033/191] moved cdscan to lib dir so that we can import it

---
 Packages/cdms2/{Script/cdscan => Lib/cdscan.py} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Packages/cdms2/{Script/cdscan => Lib/cdscan.py} (100%)

diff --git a/Packages/cdms2/Script/cdscan b/Packages/cdms2/Lib/cdscan.py
similarity index 100%
rename from Packages/cdms2/Script/cdscan
rename to Packages/cdms2/Lib/cdscan.py
-- 
GitLab


From 50a55c122e0509915a91a7b525359dffc9475ba5 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 26 Apr 2016 14:37:29 -0700
Subject: [PATCH 034/191] symlinked cdscan so that script is still installed

---
 Packages/cdms2/Script/cdscan | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 Packages/cdms2/Script/cdscan

diff --git a/Packages/cdms2/Script/cdscan b/Packages/cdms2/Script/cdscan
new file mode 120000
index 000000000..11d1e0bf9
--- /dev/null
+++ b/Packages/cdms2/Script/cdscan
@@ -0,0 +1 @@
+../Lib/cdscan.py
\ No newline at end of file
-- 
GitLab


From d5a9a226ca5fafb65e95fa793cf8144a349adbe3 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 27 Apr 2016 08:46:49 -0700
Subject: [PATCH 035/191] Address @danlipsa comments

---
 Packages/cdms2/Lib/avariable.py | 4 ++--
 Packages/cdms2/Lib/cdmsobj.py   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Packages/cdms2/Lib/avariable.py b/Packages/cdms2/Lib/avariable.py
index bc20b8be5..db174105e 100644
--- a/Packages/cdms2/Lib/avariable.py
+++ b/Packages/cdms2/Lib/avariable.py
@@ -1232,7 +1232,7 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
                 slicelist.append (slice(0, len(self.getAxis(i))))
             elif key is Ellipsis:
                 raise CDMSError, "Misuse of ellipsis in specification."
-            elif sinstance(key, tuple):
+            elif isinstance(key, tuple):
                 slicelist.append(slice(*key))
             else:
                 raise CDMSError, 'invalid index: %s'% str(key)
@@ -1514,7 +1514,7 @@ def orderparse (order):
         elif r == '...':
             r = Ellipsis
         elif len(r) == 1:
-            if r in '0123456789':
+            if r.isdigit():
                 r = int(r)
         result.append(r)
         pos = m.end(0)
diff --git a/Packages/cdms2/Lib/cdmsobj.py b/Packages/cdms2/Lib/cdmsobj.py
index b66cf7307..8fad6b3ab 100644
--- a/Packages/cdms2/Lib/cdmsobj.py
+++ b/Packages/cdms2/Lib/cdmsobj.py
@@ -546,12 +546,12 @@ class CdmsObj (object):
         """
         if attname is None:
             for attval in self.attributes.values():
-                if isinstance(attval,basestring) and pattern.search(attval) is not None:
+                if isinstance(attval,basestring) and pattern.match(attval) is not None:
                     return 1
             return 0
         elif self.attributes.has_key(attname):
             attval = self.attributes[attname]
-            return isinstance(attval,basestring) and pattern.search(attval) is not None
+            return isinstance(attval,basestring) and pattern.match(attval) is not None
         else:
             return 0
 
-- 
GitLab


From 6fc54c9a9537d0e4f47ab84a04bdad2c2ea486fa Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 27 Apr 2016 09:08:08 -0700
Subject: [PATCH 036/191] autopep8ed

---
 Packages/cdms2/Lib/CDML.py             |  425 +++---
 Packages/cdms2/Lib/CDMLParser.py       |  180 ++-
 Packages/cdms2/Lib/MV2.py              |  524 ++++---
 Packages/cdms2/Lib/__init__.py         |   62 +-
 Packages/cdms2/Lib/auxcoord.py         |   80 +-
 Packages/cdms2/Lib/avariable.py        |  962 +++++++------
 Packages/cdms2/Lib/axis.py             | 1827 +++++++++++++-----------
 Packages/cdms2/Lib/bindex.py           |   41 +-
 Packages/cdms2/Lib/cache.py            |  167 ++-
 Packages/cdms2/Lib/cdmsNode.py         |  763 +++++-----
 Packages/cdms2/Lib/cdmsURLopener.py    |   17 +-
 Packages/cdms2/Lib/cdmsobj.py          |  438 +++---
 Packages/cdms2/Lib/cdurllib.py         |   72 +-
 Packages/cdms2/Lib/cdurlparse.py       |  339 ++---
 Packages/cdms2/Lib/cdxmllib.py         |  249 ++--
 Packages/cdms2/Lib/convention.py       |   62 +-
 Packages/cdms2/Lib/coord.py            |  201 +--
 Packages/cdms2/Lib/cudsinterface.py    |  182 +--
 Packages/cdms2/Lib/database.py         |  220 +--
 Packages/cdms2/Lib/dataset.py          | 1245 +++++++++-------
 Packages/cdms2/Lib/error.py            |    4 +-
 Packages/cdms2/Lib/forecast.py         |  226 +--
 Packages/cdms2/Lib/fvariable.py        |  137 +-
 Packages/cdms2/Lib/gengrid.py          |  106 +-
 Packages/cdms2/Lib/grid.py             |  385 ++---
 Packages/cdms2/Lib/gsHost.py           |  212 +--
 Packages/cdms2/Lib/gsMosaic.py         |  251 ++--
 Packages/cdms2/Lib/gsStaticVariable.py |  107 +-
 Packages/cdms2/Lib/gsTimeVariable.py   |  160 ++-
 Packages/cdms2/Lib/gui.py              |   31 +-
 Packages/cdms2/Lib/hgrid.py            |  247 ++--
 Packages/cdms2/Lib/mvBaseWriter.py     |   19 +-
 Packages/cdms2/Lib/mvCdmsRegrid.py     |   26 +-
 Packages/cdms2/Lib/mvSphereMesh.py     |  170 ++-
 Packages/cdms2/Lib/mvVTKSGWriter.py    |   29 +-
 Packages/cdms2/Lib/mvVTKUGWriter.py    |   47 +-
 Packages/cdms2/Lib/mvVsWriter.py       |   36 +-
 Packages/cdms2/Lib/restApi.py          |  965 +++++++------
 Packages/cdms2/Lib/selectors.py        |  286 ++--
 Packages/cdms2/Lib/slabinterface.py    |  130 +-
 Packages/cdms2/Lib/sliceut.py          |  214 +--
 Packages/cdms2/Lib/tvariable.py        |  609 ++++----
 Packages/cdms2/Lib/typeconv.py         |   30 +-
 Packages/cdms2/Lib/variable.py         |  345 ++---
 Packages/cdms2/Lib/xlink.py            |   10 +-
 45 files changed, 7050 insertions(+), 5788 deletions(-)

diff --git a/Packages/cdms2/Lib/CDML.py b/Packages/cdms2/Lib/CDML.py
index 7a6c013f3..963f70ac6 100644
--- a/Packages/cdms2/Lib/CDML.py
+++ b/Packages/cdms2/Lib/CDML.py
@@ -37,6 +37,7 @@ CdArray = "Array"
 # Note: at some point, this should be created dynamically
 # from the XML DTD file. For now, it is built statically.
 
+
 class CDML:
 
     cache = {}
@@ -47,246 +48,254 @@ class CDML:
         self.extra = self.extraCache.get(uri)
         if not self.dtd:
             self.dtd = self.buildDTD(uri)
-            self.cache[uri]=self.dtd
+            self.cache[uri] = self.dtd
             self.extra = self.buildExtra(uri)
-            self.extraCache[uri]=self.extra
+            self.extraCache[uri] = self.extra
 
-    def buildDTD(self,uri):
+    def buildDTD(self, uri):
         dtd = {}
         dtd['attr'] = {
-            'name': (Cdata,Required),
-            'datatype': (("Char","Byte","Short","Int","Long","Int64","Float","Double","String"),Required),
-            }
+            'name': (Cdata, Required),
+            'datatype':
+                (("Char", "Byte", "Short", "Int", "Long",
+                 "Int64", "Float", "Double", "String"), Required),
+        }
         dtd['axis'] = {
-            'id': (Id,Required),
-            'associate': (Idref,Implied),
-            'axis': (("X","Y","Z","T"),Implied),
-            'bounds': (Idref,Implied),
-            'calendar': (Cdata,Implied),
-            'comment': (Cdata,Implied),
-            'component': (Cdata,Implied),
-            'compress': (Cdata,Implied),
-            'datatype': (("Char","Byte","Short","Int","Long","Int64","Float","Double","String"),Required),
-            'expand': (Idref,Implied),
-            'interval': (Cdata,Implied),
-            'isvar': ( ("true","false"),"true"),
-            'length': (Cdata,Required),
-            'long_name': (Cdata,Implied),
-            'modulo': (Cdata,Implied),
-            'name_in_file': (Cdata,Implied),
-            'partition': (Cdata,Implied),
-            'partition_length': (Cdata,Implied),
-            'positive': (("up","down"),Implied),
-            'spacing': (("uniform","variable","disjoint"),Implied),
-            'topology': (("linear","circular"),Implied),
-            'weights': (Idref,Implied),
-            'units': (Cdata,Required),
-            }
+            'id': (Id, Required),
+            'associate': (Idref, Implied),
+            'axis': (("X", "Y", "Z", "T"), Implied),
+            'bounds': (Idref, Implied),
+            'calendar': (Cdata, Implied),
+            'comment': (Cdata, Implied),
+            'component': (Cdata, Implied),
+            'compress': (Cdata, Implied),
+            'datatype':
+                (("Char", "Byte", "Short", "Int", "Long",
+                 "Int64", "Float", "Double", "String"), Required),
+            'expand': (Idref, Implied),
+            'interval': (Cdata, Implied),
+            'isvar': (("true", "false"), "true"),
+            'length': (Cdata, Required),
+            'long_name': (Cdata, Implied),
+            'modulo': (Cdata, Implied),
+            'name_in_file': (Cdata, Implied),
+            'partition': (Cdata, Implied),
+            'partition_length': (Cdata, Implied),
+            'positive': (("up", "down"), Implied),
+            'spacing': (("uniform", "variable", "disjoint"), Implied),
+            'topology': (("linear", "circular"), Implied),
+            'weights': (Idref, Implied),
+            'units': (Cdata, Required),
+        }
         dtd['component'] = {
-            'name':(Idref,Required),
-            }
+            'name': (Idref, Required),
+        }
         dtd['dataset'] = {
-            'id': (Id,Required),
-            'Conventions': (Cdata,Required),
-            'appendices': (Cdata,Implied),
-            'calendar': (Cdata,Implied),
-            'cdms_filemap': (Cdata,Implied),
-            'comment': (Cdata,Implied),
-            'directory': (Cdata,Implied),
-            'frequency': (Cdata,Implied),
-            'history': (Cdata,Implied),
-            'institution': (Cdata,Implied),
-            'production': (Cdata,Implied),
-            'project': (Cdata,Implied),
-            'template': (Cdata,Implied),
-            }
+            'id': (Id, Required),
+            'Conventions': (Cdata, Required),
+            'appendices': (Cdata, Implied),
+            'calendar': (Cdata, Implied),
+            'cdms_filemap': (Cdata, Implied),
+            'comment': (Cdata, Implied),
+            'directory': (Cdata, Implied),
+            'frequency': (Cdata, Implied),
+            'history': (Cdata, Implied),
+            'institution': (Cdata, Implied),
+            'production': (Cdata, Implied),
+            'project': (Cdata, Implied),
+            'template': (Cdata, Implied),
+        }
         dtd['doclink'] = {
-            'id': (Id,Implied),
-            'xml:link': (Cdata,(Fixed,"simple")),
-            'href': (Cdata,Required),
-            'role':	(Cdata,Implied),
-            'title': (Cdata,Implied),
-            'show': (("embed","replace","new"),"replace"),
-            'actuate': (("auto","user"),Implied),
-            'behavior':(Cdata,Implied),
-            'content-role': (Cdata,Implied),
-            'content-title': (Cdata,Implied),
-            'inline':(("true","false"),"true"),
-            }
+            'id': (Id, Implied),
+            'xml:link': (Cdata, (Fixed, "simple")),
+            'href': (Cdata, Required),
+            'role': (Cdata, Implied),
+            'title': (Cdata, Implied),
+            'show': (("embed", "replace", "new"), "replace"),
+            'actuate': (("auto", "user"), Implied),
+            'behavior': (Cdata, Implied),
+            'content-role': (Cdata, Implied),
+            'content-title': (Cdata, Implied),
+            'inline': (("true", "false"), "true"),
+        }
         dtd['domain'] = {}
         dtd['domElem'] = {
-            'name':(Idref,Required),
-            'length':(Cdata,Implied),
-            'partition_length':(Cdata,Implied),
-            'start':(Cdata,Implied),
-            }
+            'name': (Idref, Required),
+            'length': (Cdata, Implied),
+            'partition_length': (Cdata, Implied),
+            'start': (Cdata, Implied),
+        }
         dtd['rectGrid'] = {
-            'id': (Id,Required),
-            'type':(("gaussian","uniform","equalarea","unknown"),"unknown"),
-            'latitude':(Idref,Required),
-            'longitude':(Idref,Required),
-            'mask':(Idref,Implied),
-            'order':(("xy","yx"),"yx"),
-            }
+            'id': (Id, Required),
+            'type':
+                (("gaussian", "uniform", "equalarea", "unknown"), "unknown"),
+            'latitude': (Idref, Required),
+            'longitude': (Idref, Required),
+            'mask': (Idref, Implied),
+            'order': (("xy", "yx"), "yx"),
+        }
         dtd['linear'] = {
-            'delta': (Cdata,Required),
-            'length': (Cdata,Required),
-            'start': (Cdata,Required),
-            }
+            'delta': (Cdata, Required),
+            'length': (Cdata, Required),
+            'start': (Cdata, Required),
+        }
         dtd['variable'] = {
-            'id': (Id,Required),
-            'add_offset': (Cdata,Implied),
-            'associate': (Cdata,Implied),
-            'axis': (Cdata,Implied),
-            'comments': (Cdata,Implied),
-            'datatype': (("Char","Byte","Short","Int","Long","Int64","Float","Double","String"),Required),
-            'grid_name': (Cdata,Implied),
-            'grid_type': (Cdata,Implied),
-            'long_name': (Cdata,Implied),
+            'id': (Id, Required),
+            'add_offset': (Cdata, Implied),
+            'associate': (Cdata, Implied),
+            'axis': (Cdata, Implied),
+            'comments': (Cdata, Implied),
+            'datatype':
+                (("Char", "Byte", "Short", "Int", "Long",
+                 "Int64", "Float", "Double", "String"), Required),
+            'grid_name': (Cdata, Implied),
+            'grid_type': (Cdata, Implied),
+            'long_name': (Cdata, Implied),
             'missing_value': (Cdata, Implied),
-            'name_in_file': (Cdata,Implied),
-            'scale_factor': (Cdata,Implied),
-            'subgrid': (Cdata,Implied),
-            'template': (Cdata,Implied),
-            'units': (Cdata,Implied),
-            'valid_max': (Cdata,Implied),
-            'valid_min': (Cdata,Implied),
-            'valid_range': (Cdata,Implied),
-            }
+            'name_in_file': (Cdata, Implied),
+            'scale_factor': (Cdata, Implied),
+            'subgrid': (Cdata, Implied),
+            'template': (Cdata, Implied),
+            'units': (Cdata, Implied),
+            'valid_max': (Cdata, Implied),
+            'valid_min': (Cdata, Implied),
+            'valid_range': (Cdata, Implied),
+        }
         dtd['xlink'] = {
-            'id': (Id,Implied),
-            'xml:link': (Cdata,(Fixed,"simple")),
-            'href': (Cdata,Required),
-            'role':	(Cdata,Implied),
-            'title': (Cdata,Implied),
-            'show': (("embed","replace","new"),"embed"),
-            'actuate': (("auto","user"),Implied),
-            'behavior':(Cdata,Implied),
-            'content-role': (("dataset","axis","grid","variable","object"),"object"),
-            'content-title': (Cdata,Implied),
-            'inline':(("true","false"),"true"),
-            }
+            'id': (Id, Implied),
+            'xml:link': (Cdata, (Fixed, "simple")),
+            'href': (Cdata, Required),
+            'role': (Cdata, Implied),
+            'title': (Cdata, Implied),
+            'show': (("embed", "replace", "new"), "embed"),
+            'actuate': (("auto", "user"), Implied),
+            'behavior': (Cdata, Implied),
+            'content-role':
+                (("dataset", "axis", "grid", "variable", "object"), "object"),
+            'content-title': (Cdata, Implied),
+            'inline': (("true", "false"), "true"),
+        }
         return dtd
 
     # Extra datatype information not included in the formal DTD.
-    def buildExtra(self,uri):
+    def buildExtra(self, uri):
         extra = {}
         extra['attr'] = {
-            'name': (CdScalar,CdString),
-            'datatype': (CdScalar,CdString),
-            }
+            'name': (CdScalar, CdString),
+            'datatype': (CdScalar, CdString),
+        }
         extra['axis'] = {
-            'id': (CdScalar,CdString),
-            'associate': (CdScalar,CdString),
-            'axis': (CdScalar,CdString),
-            'bounds': (CdArray,CdFromObject),
-            'calendar': (CdScalar,CdString),
-            'comment': (CdScalar,CdString),
-            'component': (CdScalar,CdString),
-            'compress': (CdScalar,CdString),
-            'datatype': (CdScalar,CdString),
-            'expand': (CdScalar,CdString),
-            'interval': (CdScalar,CdFromObject),
-            'isvar': (CdScalar,CdString),
-            'length': (CdScalar,CdInt),
-            'long_name': (CdScalar,CdString),
-            'modulo': (CdScalar,CdAny),
-            'name_in_file': (CdScalar,CdString),
-            'partition': (CdArray,CdInt),
-            'partition_length': (CdScalar,CdInt),
-            'positive': (CdScalar,CdString),
-            'spacing': (CdScalar,CdFromObject),
-            'topology': (CdScalar,CdString),
-            'weights': (CdArray,CdDouble),
-            'units': (CdScalar,CdString),
-            }
+            'id': (CdScalar, CdString),
+            'associate': (CdScalar, CdString),
+            'axis': (CdScalar, CdString),
+            'bounds': (CdArray, CdFromObject),
+            'calendar': (CdScalar, CdString),
+            'comment': (CdScalar, CdString),
+            'component': (CdScalar, CdString),
+            'compress': (CdScalar, CdString),
+            'datatype': (CdScalar, CdString),
+            'expand': (CdScalar, CdString),
+            'interval': (CdScalar, CdFromObject),
+            'isvar': (CdScalar, CdString),
+            'length': (CdScalar, CdInt),
+            'long_name': (CdScalar, CdString),
+            'modulo': (CdScalar, CdAny),
+            'name_in_file': (CdScalar, CdString),
+            'partition': (CdArray, CdInt),
+            'partition_length': (CdScalar, CdInt),
+            'positive': (CdScalar, CdString),
+            'spacing': (CdScalar, CdFromObject),
+            'topology': (CdScalar, CdString),
+            'weights': (CdArray, CdDouble),
+            'units': (CdScalar, CdString),
+        }
         extra['component'] = {
-            'name': (CdScalar,CdString),
-            }
+            'name': (CdScalar, CdString),
+        }
         extra['dataset'] = {
-            'id': (CdScalar,CdString),
-            'Conventions': (CdScalar,CdString),
-            'appendices': (CdScalar,CdString),
-            'calendar': (CdScalar,CdString),
-            'cdms_filemap': (CdScalar,CdString),
-            'comment': (CdScalar,CdString),
-            'directory': (CdScalar,CdString),
-            'frequency': (CdScalar,CdString),
-            'history': (CdScalar,CdString),
-            'institution': (CdScalar,CdString),
-            'production': (CdScalar,CdString),
-            'project': (CdScalar,CdString),
-            'template': (CdScalar,CdString),
-            }
+            'id': (CdScalar, CdString),
+            'Conventions': (CdScalar, CdString),
+            'appendices': (CdScalar, CdString),
+            'calendar': (CdScalar, CdString),
+            'cdms_filemap': (CdScalar, CdString),
+            'comment': (CdScalar, CdString),
+            'directory': (CdScalar, CdString),
+            'frequency': (CdScalar, CdString),
+            'history': (CdScalar, CdString),
+            'institution': (CdScalar, CdString),
+            'production': (CdScalar, CdString),
+            'project': (CdScalar, CdString),
+            'template': (CdScalar, CdString),
+        }
         extra['doclink'] = {
-            'id': (CdScalar,CdString),
-            'xml:link': (CdScalar,CdString),
-            'href': (CdScalar,CdString),
-            'role': (CdScalar,CdString),
-            'title': (CdScalar,CdString),
-            'show': (CdScalar,CdString),
-            'actuate': (CdScalar,CdString),
-            'behavior': (CdScalar,CdString),
-            'content-role': (CdScalar,CdString),
-            'content-title': (CdScalar,CdString),
-            'inline': (CdScalar,CdString),
-            }
+            'id': (CdScalar, CdString),
+            'xml:link': (CdScalar, CdString),
+            'href': (CdScalar, CdString),
+            'role': (CdScalar, CdString),
+            'title': (CdScalar, CdString),
+            'show': (CdScalar, CdString),
+            'actuate': (CdScalar, CdString),
+            'behavior': (CdScalar, CdString),
+            'content-role': (CdScalar, CdString),
+            'content-title': (CdScalar, CdString),
+            'inline': (CdScalar, CdString),
+        }
         extra['domain'] = {}
         extra['domElem'] = {
-            'name': (CdScalar,CdString),
-            'length': (CdScalar,CdInt),
-            'partition_length': (CdScalar,CdInt),
-            'start': (CdScalar,CdInt),
-            }
+            'name': (CdScalar, CdString),
+            'length': (CdScalar, CdInt),
+            'partition_length': (CdScalar, CdInt),
+            'start': (CdScalar, CdInt),
+        }
         extra['rectGrid'] = {
-            'id': (CdScalar,CdString),
-            'type': (CdScalar,CdString),
-            'latitude': (CdScalar,CdString),
-            'longitude': (CdScalar,CdString),
-            'mask': (CdScalar,CdString),
-            'order': (CdScalar,CdString),
-            }
+            'id': (CdScalar, CdString),
+            'type': (CdScalar, CdString),
+            'latitude': (CdScalar, CdString),
+            'longitude': (CdScalar, CdString),
+            'mask': (CdScalar, CdString),
+            'order': (CdScalar, CdString),
+        }
         extra['linear'] = {
-            'delta': (CdScalar,CdFromObject),
-            'length': (CdScalar,CdInt),
-            'start': (CdScalar,CdInt),
-            }
+            'delta': (CdScalar, CdFromObject),
+            'length': (CdScalar, CdInt),
+            'start': (CdScalar, CdInt),
+        }
         extra['variable'] = {
-            'id': (CdScalar,CdString),
-            'add_offset': (CdScalar,CdDouble),
-            'associate': (CdScalar,CdString),
-            'axis': (CdScalar,CdString),
-            'comments': (CdScalar,CdString),
-            'datatype': (CdScalar,CdString),
-            'grid_name': (CdScalar,CdString),
-            'grid_type': (CdScalar,CdString),
-            'long_name': (CdScalar,CdString),
-            'missing_value': (CdScalar,CdFromObject),
-            'name_in_file': (CdScalar,CdString),
-            'scale_factor': (CdScalar,CdDouble),
-            'subgrid': (CdScalar,CdString),
-            'template': (CdScalar,CdString),
-            'units': (CdScalar,CdString),
-            'valid_max': (CdScalar,CdFromObject),
-            'valid_min': (CdScalar,CdFromObject),
-            'valid_range': (CdArray,CdFromObject),
-            }
+            'id': (CdScalar, CdString),
+            'add_offset': (CdScalar, CdDouble),
+            'associate': (CdScalar, CdString),
+            'axis': (CdScalar, CdString),
+            'comments': (CdScalar, CdString),
+            'datatype': (CdScalar, CdString),
+            'grid_name': (CdScalar, CdString),
+            'grid_type': (CdScalar, CdString),
+            'long_name': (CdScalar, CdString),
+            'missing_value': (CdScalar, CdFromObject),
+            'name_in_file': (CdScalar, CdString),
+            'scale_factor': (CdScalar, CdDouble),
+            'subgrid': (CdScalar, CdString),
+            'template': (CdScalar, CdString),
+            'units': (CdScalar, CdString),
+            'valid_max': (CdScalar, CdFromObject),
+            'valid_min': (CdScalar, CdFromObject),
+            'valid_range': (CdArray, CdFromObject),
+        }
         extra['xlink'] = {
-            'id': (CdScalar,CdString),
-            'xml:link': (CdScalar,CdString),
-            'href': (CdScalar,CdString),
-            'role': (CdScalar,CdString),
-            'title': (CdScalar,CdString),
-            'show': (CdScalar,CdString),
-            'actuate': (CdScalar,CdString),
-            'behavior': (CdScalar,CdString),
-            'content-role': (CdScalar,CdString),
-            'content-title': (CdScalar,CdString),
-            'inline': (CdScalar,CdString),
-            }
+            'id': (CdScalar, CdString),
+            'xml:link': (CdScalar, CdString),
+            'href': (CdScalar, CdString),
+            'role': (CdScalar, CdString),
+            'title': (CdScalar, CdString),
+            'show': (CdScalar, CdString),
+            'actuate': (CdScalar, CdString),
+            'behavior': (CdScalar, CdString),
+            'content-role': (CdScalar, CdString),
+            'content-title': (CdScalar, CdString),
+            'inline': (CdScalar, CdString),
+        }
         return extra
 
-if __name__=='__main__':
+if __name__ == '__main__':
     cdml = CDML()
     print cdml.extra
     cdml2 = CDML()
diff --git a/Packages/cdms2/Lib/CDMLParser.py b/Packages/cdms2/Lib/CDMLParser.py
index e741e44d2..6a88eda9c 100644
--- a/Packages/cdms2/Lib/CDMLParser.py
+++ b/Packages/cdms2/Lib/CDMLParser.py
@@ -2,10 +2,10 @@
 Parse a CDML/XML file
 """
 
-from cdxmllib import XMLParser
-import CDML
+from .cdxmllib import XMLParser
+from . import CDML
 import re
-import cdmsNode
+from . import cdmsNode
 
 # Error constants
 InvalidAttribute = "Invalid attribute"
@@ -13,21 +13,23 @@ InvalidAttribute = "Invalid attribute"
 # Regular expressions
 _S = re.compile('[ \t\r\n]+$')
 _opS = '[ \t\r\n]*'
-_Integer = re.compile(_opS+'[0-9]+$'+_opS)
+_Integer = re.compile(_opS + '[0-9]+$' + _opS)
+
 
 class CDMLParser(XMLParser):
 
     def __init__(self, verbose=0):
-	XMLParser.__init__(self)
+        XMLParser.__init__(self)
         self.root = None
         self.currentPath = []         # Current path, a stack
         self.dtd = CDML.CDML().dtd
         self.verbose = verbose
 
     # Push current node on the stack
-    def pushCurrentNode(self,node):
+    def pushCurrentNode(self, node):
         self.currentPath.append(node)
-        if not self.root: self.root = node
+        if not self.root:
+            self.root = node
 
     # Pop the current node off the stack
     def popCurrentNode(self):
@@ -49,62 +51,67 @@ class CDMLParser(XMLParser):
     def handle_data(self, data):
         matchObj = _S.match(data)
         if not matchObj:
-            if self.verbose: print 'data:',data
+            if self.verbose:
+                print 'data:', data
             if self.root:
                 self.getCurrentNode().setContentFromString(data.strip())
 
     def handle_cdata(self, data):
-        if self.verbose: print 'cdata:', `data`
+        if self.verbose:
+            print 'cdata:', repr(data)
 
     def handle_proc(self, name, data):
-        if self.verbose: print 'processing:',name,`data`
+        if self.verbose:
+            print 'processing:', name, repr(data)
 
     def handle_special(self, data):
-        if self.verbose: print 'special:',`data`
+        if self.verbose:
+            print 'special:', repr(data)
 
     def handle_starttag(self, tag, method, attrs):
 
-        if self.dtd.has_key(tag):
+        if tag in self.dtd:
 
             # Check that attributes are valid
-	    validDict = self.dtd[tag]
+            validDict = self.dtd[tag]
             validAttrs = validDict.keys()
             attrnames = attrs.keys()
             for attrname in attrnames:
                 if attrname not in validAttrs:
                     self.cdml_syntax_error(self.lineno,
-                                      'unknown attribute %s of element %s' %
-                                      (attrname, tag))
+                                           'unknown attribute %s of element %s' %
+                                           (attrname, tag))
                 else:
-                    (atttype,attdefault)=validDict[attrname]
-                    if type(atttype)==type((0,)):
+                    (atttype, attdefault) = validDict[attrname]
+                    if isinstance(atttype, tuple):
                         attrval = attrs[attrname]
                         if attrval not in atttype:
                             self.cdml_syntax_error(self.lineno,
-                                              'invalid attribute value %s=%s of element %s, must be one of %s' %
-                                              (attrname,attrval,tag,atttype))
+                                                   'invalid attribute value %s=%s of element %s, must be one of %s' %
+                                                   (attrname, attrval, tag, atttype))
 
             # Check that required attributes are present,
             # and add default values
             for attrname in validAttrs:
-                (atttype,attdefault)=validDict[attrname]
-                if attdefault==CDML.Required and attrname not in attrnames:
+                (atttype, attdefault) = validDict[attrname]
+                if attdefault == CDML.Required and attrname not in attrnames:
                     self.cdml_syntax_error(self.lineno,
-                                      'element %s requires an attribute %s' %
-                                      (tag,attrname))
-                if type(attdefault)==type("") and attrname not in attrnames:
-                    attrs[attrname]=attdefault
-            
-	method(attrs)
+                                           'element %s requires an attribute %s' %
+                                           (tag, attrname))
+                if isinstance(attdefault, basestring) and attrname not in attrnames:
+                    attrs[attrname] = attdefault
+
+        method(attrs)
 
     #------------------------------------------------------------------------
     # CDML tags
 
-    def start_attr(self,attrs):
-        if self.verbose: print 'attr:',attrs
+    def start_attr(self, attrs):
+        if self.verbose:
+            print 'attr:', attrs
         name = attrs['name']
         datatype = attrs['datatype']
-        attr = cdmsNode.AttrNode(name,None)
+        attr = cdmsNode.AttrNode(name, None)
         attr.datatype = datatype
         self.pushCurrentNode(attr)
 
@@ -112,33 +119,35 @@ class CDMLParser(XMLParser):
     def end_attr(self):
         attr = self.popCurrentNode()
         var = self.getCurrentNode()
-        attr.setValueFromString(attr.getContent(),attr.datatype)
+        attr.setValueFromString(attr.getContent(), attr.datatype)
         var.setExternalAttrFromAttr(attr)
 
     #------------------------------------------------------------------------
 
-    def start_axis(self,attrs):
-        if self.verbose: print 'axis:',attrs
+    def start_axis(self, attrs):
+        if self.verbose:
+            print 'axis:', attrs
         id = attrs['id']
         length_s = attrs['length']
         datatype = attrs.get('datatype')
         if _Integer.match(length_s) is None:
-            raise InvalidAttribute, 'length='+length_s
+            raise InvalidAttribute('length=' + length_s)
         length = int(length_s)
-        axis = cdmsNode.AxisNode(id,length,datatype)
+        axis = cdmsNode.AxisNode(id, length, datatype)
         partstring = attrs.get('partition')
         if partstring is not None:
             axis.setPartitionFromString(partstring)
         axis.setExternalDict(attrs)
-        self.getCurrentNode().addId(id,axis)
+        self.getCurrentNode().addId(id, axis)
         self.pushCurrentNode(axis)
-                
+
     def end_axis(self):
         self.popCurrentNode()
 
     #------------------------------------------------------------------------
     def start_cdml(self, attrs):
-        if self.verbose: print 'cdml:',attrs
+        if self.verbose:
+            print 'cdml:', attrs
 
     def end_cdml(self):
         pass
@@ -146,36 +155,40 @@ class CDMLParser(XMLParser):
     #------------------------------------------------------------------------
 
     def start_component(self, attrs):
-        if self.verbose: print 'component:',attrs
+        if self.verbose:
+            print 'component:', attrs
 
     def end_component(self):
         pass
 
     #------------------------------------------------------------------------
     def start_compoundAxis(self, attrs):
-        if self.verbose: print 'compoundAxis:',attrs
+        if self.verbose:
+            print 'compoundAxis:', attrs
 
     def end_compoundAxis(self):
         pass
 
     #------------------------------------------------------------------------
     def start_data(self, attrs):
-        if self.verbose: print 'data:',attrs
+        if self.verbose:
+            print 'data:', attrs
 
     def end_data(self):
         pass
 
     #------------------------------------------------------------------------
 
-    def start_dataset(self,attrs):
-        if self.verbose: print 'dataset:',attrs
+    def start_dataset(self, attrs):
+        if self.verbose:
+            print 'dataset:', attrs
         id = attrs['id']
         dataset = cdmsNode.DatasetNode(id)
         dataset.setExternalDict(attrs)
         if self.root:
-            self.getCurrentNode().addId(id,dataset)
+            self.getCurrentNode().addId(id, dataset)
         self.pushCurrentNode(dataset)
-                
+
     def end_dataset(self):
         dataset = self.popCurrentNode()
         dataset.validate()
@@ -183,7 +196,8 @@ class CDMLParser(XMLParser):
     #------------------------------------------------------------------------
 
     def start_doclink(self, attrs):
-        if self.verbose: print 'docLink:',attrs
+        if self.verbose:
+            print 'docLink:', attrs
         uri = attrs['href']
         doclink = cdmsNode.DocLinkNode(uri)
         doclink.setExternalDict(attrs)
@@ -196,7 +210,8 @@ class CDMLParser(XMLParser):
     #------------------------------------------------------------------------
 
     def start_domElem(self, attrs):
-        if self.verbose: print 'domElem:',attrs
+        if self.verbose:
+            print 'domElem:', attrs
         name = attrs['name']
         start_s = attrs.get('start')
         length_s = attrs.get('length')
@@ -208,7 +223,7 @@ class CDMLParser(XMLParser):
             length = int(length_s)
         else:
             length = None
-        domElem = cdmsNode.DomElemNode(name,start,length)
+        domElem = cdmsNode.DomElemNode(name, start, length)
         domElem.setExternalDict(attrs)
         self.getCurrentNode().add(domElem)
 
@@ -217,7 +232,8 @@ class CDMLParser(XMLParser):
 
     #------------------------------------------------------------------------
     def start_domain(self, attrs):
-        if self.verbose: print 'domain:',attrs
+        if self.verbose:
+            print 'domain:', attrs
         domain = cdmsNode.DomainNode()
         self.getCurrentNode().setDomain(domain)
         self.pushCurrentNode(domain)
@@ -227,40 +243,42 @@ class CDMLParser(XMLParser):
 
     #------------------------------------------------------------------------
 
-    def start_rectGrid(self,attrs):
-        if self.verbose: print 'rectGrid:',attrs
+    def start_rectGrid(self, attrs):
+        if self.verbose:
+            print 'rectGrid:', attrs
         id = attrs['id']
         gridtype = attrs['type']
         latitude = attrs['latitude']
         longitude = attrs['longitude']
-        grid = cdmsNode.RectGridNode(id,latitude,longitude,gridtype)
+        grid = cdmsNode.RectGridNode(id, latitude, longitude, gridtype)
         grid.setExternalDict(attrs)
-        self.getCurrentNode().addId(id,grid)
+        self.getCurrentNode().addId(id, grid)
         self.pushCurrentNode(grid)
-                
+
     def end_rectGrid(self):
         self.popCurrentNode()
 
     #------------------------------------------------------------------------
 
     def start_linear(self, attrs):
-        if self.verbose: print 'linear:',attrs
+        if self.verbose:
+            print 'linear:', attrs
         start_s = attrs['start']
         delta_s = attrs['delta']
         length_s = attrs['length']
         try:
-            start=float(start_s)
+            start = float(start_s)
         except ValueError:
-            raise InvalidAttribute, 'start='+start_s
+            raise InvalidAttribute('start=' + start_s)
         try:
-            delta=float(delta_s)
+            delta = float(delta_s)
         except ValueError:
-            raise InvalidAttribute, 'delta='+delta_s
+            raise InvalidAttribute('delta=' + delta_s)
         try:
-            length=int(length_s)
+            length = int(length_s)
         except ValueError:
-            raise InvalidAttribute, 'length='+length_s
-        linear = cdmsNode.LinearDataNode(start,delta,length)
+            raise InvalidAttribute('length=' + length_s)
+        linear = cdmsNode.LinearDataNode(start, delta, length)
         self.getCurrentNode().setLinearData(linear)
 
     def end_linear(self):
@@ -268,28 +286,30 @@ class CDMLParser(XMLParser):
 
     #------------------------------------------------------------------------
 
-    def start_variable(self,attrs):
-        if self.verbose: print 'variable:',attrs
+    def start_variable(self, attrs):
+        if self.verbose:
+            print 'variable:', attrs
         id = attrs['id']
         datatype = attrs['datatype']
-        variable = cdmsNode.VariableNode(id,datatype,None)
+        variable = cdmsNode.VariableNode(id, datatype, None)
         variable.setExternalDict(attrs)
-        self.getCurrentNode().addId(id,variable)
+        self.getCurrentNode().addId(id, variable)
         self.pushCurrentNode(variable)
-                
+
     def end_variable(self):
         self.popCurrentNode()
 
     #------------------------------------------------------------------------
 
     def start_xlink(self, attrs):
-        if self.verbose: print 'xlink:',attrs
+        if self.verbose:
+            print 'xlink:', attrs
         id = attrs['id']
         uri = attrs['href']
         contentRole = attrs['content-role']
-        xlink = cdmsNode.XLinkNode(id,uri,contentRole)
+        xlink = cdmsNode.XLinkNode(id, uri, contentRole)
         xlink.setExternalDict(attrs)
-        self.getCurrentNode().addId(id,xlink)
+        self.getCurrentNode().addId(id, xlink)
         self.pushCurrentNode(xlink)
 
     def end_xlink(self):
@@ -301,30 +321,33 @@ class CDMLParser(XMLParser):
         print 'error near line %d:' % lineno, message
 
     def unknown_starttag(self, tag, attrs):
-        if self.verbose: print '**'+tag+'**:',attrs
+        if self.verbose:
+            print '**' + tag + '**:', attrs
 
     def unknown_endtag(self, tag):
         pass
 
     def unknown_entityref(self, ref):
-	self.flush()
-        if self.verbose: print '*** unknown entity ref: &' + ref + ';'
+        self.flush()
+        if self.verbose:
+            print '*** unknown entity ref: &' + ref + ';'
 
     def unknown_charref(self, ref):
-	self.flush()
-        if self.verbose: print '*** unknown char ref: &#' + ref + ';'
+        self.flush()
+        if self.verbose:
+            print '*** unknown char ref: &#' + ref + ';'
 
     def close(self):
-	XMLParser.close(self)
+        XMLParser.close(self)
 
 if __name__ == '__main__':
     import sys
-    
+
     sampfile = open(sys.argv[1])
     text = sampfile.read()
     sampfile.close()
 
-    if len(sys.argv)==2:
+    if len(sys.argv) == 2:
         verbose = 0
     else:
         verbose = 1
@@ -332,4 +355,3 @@ if __name__ == '__main__':
     p.feed(text)
     p.close()
     p.root.dump()
-    
diff --git a/Packages/cdms2/Lib/MV2.py b/Packages/cdms2/Lib/MV2.py
index b203bc6af..297cd7362 100644
--- a/Packages/cdms2/Lib/MV2.py
+++ b/Packages/cdms2/Lib/MV2.py
@@ -1,31 +1,31 @@
-## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by 
-## Further modified to be pure new numpy June 24th 2008
+# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
+# Further modified to be pure new numpy June 24th 2008
 
 "CDMS Variable objects, MaskedArray interface"
 import numpy
-import typeconv
+from . import typeconv
 from numpy import character, float, float32, float64, int, int8, int16, int32
 from numpy.ma import allclose, allequal, common_fill_value, compress, make_mask_none, dot, filled, \
-     getmask, getmaskarray, identity, indices, innerproduct, masked, put, putmask, rank, ravel, \
+    getmask, getmaskarray, identity, indices, innerproduct, masked, put, putmask, rank, ravel, \
      set_fill_value, shape, size, isMA, isMaskedArray, is_mask, isarray, \
      make_mask, make_mask_none, mask_or, nomask
 from numpy import sctype2char, get_printoptions, set_printoptions
-from avariable import AbstractVariable, getNumericCompatibility
-from tvariable import TransientVariable, asVariable
-from grid import AbstractRectGrid
-from error import CDMSError
-#from numpy.ma import *
-from axis import allclose as axisAllclose, TransientAxis, concatenate as axisConcatenate, take as axisTake
-
+from .avariable import AbstractVariable, getNumericCompatibility
+from .tvariable import TransientVariable, asVariable
+from .grid import AbstractRectGrid
+from .error import CDMSError
+# from numpy.ma import *
+from .axis import allclose as axisAllclose, TransientAxis, concatenate as axisConcatenate, take as axisTake
 
 
 create_mask = make_mask_none
 e = numpy.e
 pi = numpy.pi
-#NewAxis = numpy.oldnumeric.NewAxis
+# NewAxis = numpy.oldnumeric.NewAxis
 newaxis = numpy.newaxis
 counter = 0
 
+
 def fill_value(ar):
     return ar.fill_value
 
@@ -34,13 +34,14 @@ def _makeMaskedArg(x):
     """If x is a variable, turn it into a TransientVariable."""
     if isinstance(x, AbstractVariable) and not isinstance(x, TransientVariable):
         return x.subSlice()
-    elif isinstance(x,TransientVariable):
+    elif isinstance(x, TransientVariable):
         return x
     else:
         return array(x)
 
 
-def _extractMetadata(a, axes=None, attributes=None, id=None, omit=None, omitall=False):
+def _extractMetadata(
+        a, axes=None, attributes=None, id=None, omit=None, omitall=False):
     """Extract axes, attributes, id from 'a', if arg is None."""
     resultgrid = None
     if isinstance(a, AbstractVariable):
@@ -52,7 +53,7 @@ def _extractMetadata(a, axes=None, attributes=None, id=None, omit=None, omitall=
             attributes = a.attributes
         if id is None:
             id = "variable_%i" % TransientVariable.variable_count
-            TransientVariable.variable_count+=1
+            TransientVariable.variable_count += 1
 
         # If the grid is rectilinear, don't return an explicit grid: it's implicitly defined
         # by the axes.
@@ -60,13 +61,16 @@ def _extractMetadata(a, axes=None, attributes=None, id=None, omit=None, omitall=
         if (resultgrid is None) or (isinstance(resultgrid, AbstractRectGrid)) or (axes is None):
             resultgrid = None
 
-        # If the omitted axis was associated with the grid, the result will not be gridded.
+        # If the omitted axis was associated with the grid, the result will not
+        # be gridded.
         elif (omit is not None) and (resultgrid is not None) and (a.getAxis(omit) in resultgrid.getAxisList()):
             resultgrid = None
 
     return axes, attributes, id, resultgrid
 
+
 class var_unary_operation:
+
     def __init__(self, mafunc):
         """ var_unary_operation(mafunc)
         mafunc is an numpy.ma masked_unary_function.
@@ -74,26 +78,31 @@ class var_unary_operation:
         self.mafunc = mafunc
         self.__doc__ = mafunc.__doc__
 
-    def __call__ (self, a):
+    def __call__(self, a):
         axes, attributes, id, grid = _extractMetadata(a)
         maresult = self.mafunc(_makeMaskedArg(a))
         return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid)
 
+
 class var_unary_operation_with_axis:
+
     def __init__(self, mafunc):
         """ var_unary_operation(mafunc)
         mafunc is an numpy.ma masked_unary_function.
         """
         self.mafunc = mafunc
         self.__doc__ = mafunc.__doc__
-    def __call__ (self, a, axis=0):
+
+    def __call__(self, a, axis=0):
         axis = _conv_axis_arg(axis)
         ta = _makeMaskedArg(a)
         maresult = self.mafunc(ta, axis=axis)
-        axes, attributes, id, grid = _extractMetadata(a, omit=axis, omitall=(axis is None))
+        axes, attributes, id, grid = _extractMetadata(
+            a, omit=axis, omitall=(axis is None))
         return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid)
 
-def commonDomain(a,b,omit=None):
+
+def commonDomain(a, b, omit=None):
     """commonDomain(a,b) tests that the domains of variables/arrays a and b are equal,
     and returns the common domain if equal, or None if not equal. The domains may
     differ in that one domain may have leading axes not common
@@ -101,14 +110,15 @@ def commonDomain(a,b,omit=None):
     If <omit> is specified, as an integer i, skip comparison of the ith dimension
     and return None for the ith (common) dimension.
     """
-    
+
     if isinstance(b, AbstractVariable):
         bdom = b.getAxisList()
     else:
         bdom = None
-    return commonAxes(a,bdom,omit=omit)
+    return commonAxes(a, bdom, omit=omit)
 
-def commonAxes(a,bdom,omit=None):
+
+def commonAxes(a, bdom, omit=None):
     """Helper function for commonDomain. 'a' is a variable or array,
     'b' is an axislist or None.
     """
@@ -116,40 +126,40 @@ def commonAxes(a,bdom,omit=None):
         adom = a.getAxisList()
         arank = len(adom)
         brank = len(bdom)
-        if arank>brank:
+        if arank > brank:
             maxrank = arank
             minrank = brank
         else:
             maxrank = brank
             minrank = arank
-        diffrank = maxrank-minrank
-        if maxrank==arank:
+        diffrank = maxrank - minrank
+        if maxrank == arank:
             maxdom = adom
         else:
             maxdom = bdom
-        common = [None]*maxrank
+        common = [None] * maxrank
         if omit is None:
             iomit = None
         else:
-            iomit = omit-minrank
+            iomit = omit - minrank
 
         # Check shared dimensions, last to first
         for i in range(minrank):
-            j = -i-1
-            if j==iomit:
+            j = -i - 1
+            if j == iomit:
                 continue
             aj = adom[j]
             bj = bdom[j]
-            if len(aj)!=len(bj):
+            if len(aj) != len(bj):
                 return None
-            elif axisAllclose(aj,bj):
+            elif axisAllclose(aj, bj):
                 common[j] = aj
             else:
                 common[j] = TransientAxis(numpy.arange(len(aj)))
 
         # Copy leading (non-shared) axes
         for i in range(diffrank):
-            common[i]=maxdom[i]
+            common[i] = maxdom[i]
 
         return common
     elif isinstance(a, AbstractVariable):
@@ -162,6 +172,7 @@ def commonAxes(a,bdom,omit=None):
             bdom[omit] = None
         return bdom
 
+
 def commonGrid(a, b, axes):
     """commonGrid(a,b,axes) tests if the grids associated with variables a, b are equal,
     and consistent with the list of axes. If so, the common grid is returned, else None
@@ -182,6 +193,7 @@ def commonGrid(a, b, axes):
 
     return commonGrid1(a, gb, axes)
 
+
 def commonGrid1(a, gb, axes):
     """Helper function for commonGrid."""
     if isinstance(a, AbstractVariable):
@@ -210,7 +222,9 @@ def commonGrid1(a, gb, axes):
 
     return result
 
+
 class var_binary_operation:
+
     def __init__(self, mafunc):
         """ var_binary_operation(mafunc)
         mafunc is an numpy.ma masked_binary_function.
@@ -218,29 +232,29 @@ class var_binary_operation:
         self.mafunc = mafunc
         self.__doc__ = mafunc.__doc__
 
-    def __call__ (self, a, b):
+    def __call__(self, a, b):
         id = "variable_%i" % TransientVariable.variable_count
-        TransientVariable.variable_count+=1
-        axes = commonDomain(a,b)
-        grid = commonGrid(a,b,axes)
+        TransientVariable.variable_count += 1
+        axes = commonDomain(a, b)
+        grid = commonGrid(a, b, axes)
         ta = _makeMaskedArg(a)
         tb = _makeMaskedArg(b)
-        maresult = self.mafunc(ta,tb)
-        return TransientVariable(maresult, axes=axes, grid=grid,no_update_from=True,id=id)
+        maresult = self.mafunc(ta, tb)
+        return TransientVariable(maresult, axes=axes, grid=grid, no_update_from=True, id=id)
 
-    def reduce (self, target, axis=0):
+    def reduce(self, target, axis=0):
         ttarget = _makeMaskedArg(target)
         maresult = self.mafunc.reduce(ttarget, axis=axis)
         axes, attributes, id, grid = _extractMetadata(target, omit=axis)
         return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid)
 
-    def accumulate (self, target, axis=0):
+    def accumulate(self, target, axis=0):
         ttarget = _makeMaskedArg(target)
         maresult = self.mafunc.accumulate(ttarget, axis=axis)
         axes, attributes, id, grid = _extractMetadata(target, omit=axis)
         return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid)
-        
-    def outer (self, a, b):
+
+    def outer(self, a, b):
         """Return the function applied to the outer product of a and b"""
         a1 = _makeMaskedArg(a)
         b1 = _makeMaskedArg(b)
@@ -248,11 +262,13 @@ class var_binary_operation:
         return TransientVariable(maresult)
 
 
-def compress(a,b):
-   __doc__=numpy.ma.__doc__
-   import warnings
-   warnings.warn("arguments order for compress function has changed\nit is now: MV2.copmress(array,condition), if your code seems to not react or act wrong to a call to compress, please check this", Warning)
-   return TransientVariable(numpy.ma.compress(a,b),copy=1)
+def compress(a, b):
+    __doc__ = numpy.ma.__doc__
+    import warnings
+    warnings.warn(
+        "arguments order for compress function has changed\nit is now: MV2.copmress(array,condition), if your code seems to not react or act wrong to a call to compress, please check this",
+        Warning)
+    return TransientVariable(numpy.ma.compress(a, b), copy=1)
 
 
 sqrt = var_unary_operation(numpy.ma.sqrt)
@@ -269,27 +285,31 @@ less_equal = var_binary_operation(numpy.ma.less_equal)
 greater_equal = var_binary_operation(numpy.ma.greater_equal)
 less = var_binary_operation(numpy.ma.less)
 greater = var_binary_operation(numpy.ma.greater)
-def power (a, b, third=None):
+
+
+def power(a, b, third=None):
     "a**b"
     ta = _makeMaskedArg(a)
     tb = _makeMaskedArg(b)
-    maresult = numpy.ma.power(ta,tb,third)
+    maresult = numpy.ma.power(ta, tb, third)
     axes, attributes, id, grid = _extractMetadata(a)
     return TransientVariable(maresult, axes=axes, attributes=attributes, grid=grid, id=id)
 
-def left_shift (a, n):
+
+def left_shift(a, n):
     "Left shift n bits"
     ta = _makeMaskedArg(a)
     tb = _makeMaskedArg(n)
-    maresult = numpy.ma.left_shift(ta,numpy.ma.filled(tb))
+    maresult = numpy.ma.left_shift(ta, numpy.ma.filled(tb))
     axes, attributes, id, grid = _extractMetadata(a)
     return TransientVariable(maresult, axes=axes, attributes=attributes, grid=grid, id=id)
 
-def right_shift (a, n):
+
+def right_shift(a, n):
     "Right shift n bits"
     ta = _makeMaskedArg(a)
     tb = _makeMaskedArg(n)
-    maresult = numpy.ma.right_shift(ta,numpy.ma.filled(tb))
+    maresult = numpy.ma.right_shift(ta, numpy.ma.filled(tb))
     axes, attributes, id, grid = _extractMetadata(a)
     return TransientVariable(maresult, axes=axes, attributes=attributes, grid=grid, id=id)
 
@@ -300,27 +320,33 @@ def _convdtype(dtype, typecode):
         dtype = typeconv.convtypecode2(typecode)
     return dtype
 
+
 def _conv_axis_arg(axis):
     "Handle backward compatibility with numpy for axis arg"
     if getNumericCompatibility() and axis is None:
-        axis=0
+        axis = 0
     return axis
 
+
 def is_masked(x):
     "Is x a 0-D masked value?"
-    return isMaskedArray(x) and x.size==1 and x.ndim==0 and x.mask.item()
+    return isMaskedArray(x) and x.size == 1 and x.ndim == 0 and x.mask.item()
+
 
 def is_floating(x):
     "Is x a scalar float, either python or numpy?"
     return (isinstance(x, numpy.floating) or isinstance(x, float))
 
+
 def is_integer(x):
     "Is x a scalar integer, either python or numpy?"
     return (isinstance(x, numpy.integer) or isinstance(x, int) or isinstance(x, long))
 
+
 def get_print_limit():
     return get_printoptions()['threshold']
 
+
 def set_print_limit(limit=numpy.inf):
     set_printoptions(threshold=limit)
 
@@ -369,75 +395,113 @@ bitwise_or = var_binary_operation(numpy.ma.bitwise_or)
 bitwise_xor = var_binary_operation(numpy.ma.bitwise_xor)
 
 
-def count (a, axis = None):
-    "Count of the non-masked elements in a, or along a certain axis."   
+def count(a, axis=None):
+    "Count of the non-masked elements in a, or along a certain axis."
     if axis is None:
-        return numpy.ma.count(a,axis)
+        return numpy.ma.count(a, axis)
     else:
         ta = _makeMaskedArg(a)
-        maresult = numpy.ma.count(ta,axis)
-        axes, attributes, id, grid = _extractMetadata(a,omit=axis)
-        F=getattr(a,"fill_value",1.e20)
+        maresult = numpy.ma.count(ta, axis)
+        axes, attributes, id, grid = _extractMetadata(a, omit=axis)
+        F = getattr(a, "fill_value", 1.e20)
         return TransientVariable(maresult, axes=axes, attributes=attributes, grid=grid, id=id, fill_value=F)
 
-def sum (a, axis = None, fill_value=0, dtype=None):
+
+def sum(a, axis=None, fill_value=0, dtype=None):
     "Sum of elements along a certain axis."
     axis = _conv_axis_arg(axis)
     ta = _makeMaskedArg(a)
     maresult = numpy.ma.sum(ta, axis, dtype=dtype)
-    axes, attributes, id, grid = _extractMetadata(a, omit=axis, omitall=(axis is None))
-    F=getattr(a,"fill_value",1.e20)
+    axes, attributes, id, grid = _extractMetadata(
+        a, omit=axis, omitall=(axis is None))
+    F = getattr(a, "fill_value", 1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, grid=grid, id=id, fill_value=F)
 
-def product (a, axis = 0, dtype=None):
+
+def product(a, axis=0, dtype=None):
     "Product of elements along axis."
     ta = _makeMaskedArg(a)
     maresult = numpy.ma.product(ta, axis, dtype=dtype)
     axes, attributes, id, grid = _extractMetadata(a, omit=axis)
-    F=getattr(a,"fill_value",1.e20)
+    F = getattr(a, "fill_value", 1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, grid=grid, id=id, fill_value=F)
 
-def average (a, axis=None, weights=None, returned=False):
+
+def average(a, axis=None, weights=None, returned=False):
     axis = _conv_axis_arg(axis)
     ta = _makeMaskedArg(a)
     maresult = numpy.ma.average(ta, axis, weights, returned)
-    axes, attributes, id, grid = _extractMetadata(a, omit=axis, omitall=(axis is None))
+    axes, attributes, id, grid = _extractMetadata(
+        a, omit=axis, omitall=(axis is None))
     if returned:
-      if isinstance(maresult,tuple):
-        maresult, wresult = maresult
-      else:
-        #ok it's masked constant need to return both things by hand
-        wresult = numpy.ma.masked
-    F=getattr(a,"fill_value",1.e20)
-    r1 = TransientVariable(maresult, axes=axes, attributes=attributes, grid=grid, id=id,no_update_from=True, fill_value=F)
+        if isinstance(maresult, tuple):
+            maresult, wresult = maresult
+        else:
+            # ok it's masked constant need to return both things by hand
+            wresult = numpy.ma.masked
+    F = getattr(a, "fill_value", 1.e20)
+    r1 = TransientVariable(
+        maresult,
+        axes=axes,
+     attributes=attributes,
+     grid=grid,
+     id=id,
+     no_update_from=True,
+     fill_value=F)
     if returned:
-        F=getattr(a,"fill_value",1.e20)
-        w1 = TransientVariable(wresult, axes=axes, grid=grid, id=id,no_update_from=True, fill_value=F)
+        F = getattr(a, "fill_value", 1.e20)
+        w1 = TransientVariable(
+            wresult,
+            axes=axes,
+            grid=grid,
+            id=id,
+            no_update_from=True,
+            fill_value=F)
         return r1, w1
     else:
         return r1
 average.__doc__ = numpy.ma.average.__doc__
 
-def max (a, axis=None):
+
+def max(a, axis=None):
     axis = _conv_axis_arg(axis)
     ta = _makeMaskedArg(a)
     maresult = numpy.ma.max(ta, axis)
-    axes, attributes, id, grid = _extractMetadata(a, omit=axis, omitall=(axis is None))
-    F=getattr(a,"fill_value",1.e20)
-    r1 = TransientVariable(maresult, axes=axes, attributes=attributes, grid=grid, id=id,no_update_from=True, fill_value=F)
+    axes, attributes, id, grid = _extractMetadata(
+        a, omit=axis, omitall=(axis is None))
+    F = getattr(a, "fill_value", 1.e20)
+    r1 = TransientVariable(
+        maresult,
+        axes=axes,
+     attributes=attributes,
+     grid=grid,
+     id=id,
+     no_update_from=True,
+     fill_value=F)
     return r1
 max.__doc__ = numpy.ma.max.__doc__
-def min (a, axis=None):
+
+
+def min(a, axis=None):
     axis = _conv_axis_arg(axis)
     ta = _makeMaskedArg(a)
     maresult = numpy.ma.min(ta, axis)
-    axes, attributes, id, grid = _extractMetadata(a, omit=axis, omitall=(axis is None))
-    F=getattr(a,"fill_value",1.e20)
-    r1 = TransientVariable(maresult, axes=axes, attributes=attributes, grid=grid, id=id,no_update_from=True, fill_value=F)
+    axes, attributes, id, grid = _extractMetadata(
+        a, omit=axis, omitall=(axis is None))
+    F = getattr(a, "fill_value", 1.e20)
+    r1 = TransientVariable(
+        maresult,
+        axes=axes,
+     attributes=attributes,
+     grid=grid,
+     id=id,
+     no_update_from=True,
+     fill_value=F)
     return r1
 min.__doc__ = numpy.ma.min.__doc__
 
-def sort (a, axis=-1):
+
+def sort(a, axis=-1):
     ta = _makeMaskedArg(a)
     maresult = numpy.ma.sort(a.asma(), axis)
     axes, attributes, id, grid = _extractMetadata(a)
@@ -445,11 +509,13 @@ def sort (a, axis=-1):
     if (grid is not None) and (sortaxis in grid.getAxisList()):
         grid = None
     axes[axis] = TransientAxis(numpy.arange(len(sortaxis)))
-    F=getattr(a,"fill_value",1.e20)
+    F = getattr(a, "fill_value", 1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, grid=grid, id=id, fill_value=F)
-sort.__doc__ = numpy.ma.sort.__doc__ + "The sort axis is replaced with a dummy axis."
+sort.__doc__ = numpy.ma.sort.__doc__ + \
+    "The sort axis is replaced with a dummy axis."
 
-def choose (indices, t):
+
+def choose(indices, t):
     """Returns an array shaped like indices containing elements chosen
       from t.
       If an element of t is the special element masked, any element
@@ -458,35 +524,38 @@ def choose (indices, t):
       The result has only the default axes.
     """
     maresult = numpy.ma.choose(indices, map(_makeMaskedArg, t))
-    F=getattr(t,"fill_value",1.e20)
+    F = getattr(t, "fill_value", 1.e20)
     return TransientVariable(maresult, fill_value=F)
 
-def where (condition, x, y):
-    "where(condition, x, y) is x where condition is true, y otherwise" 
-##    axes = commonDomain(x,y)
-##    grid = commonGrid(x,y,axes)
+
+def where(condition, x, y):
+    "where(condition, x, y) is x where condition is true, y otherwise"
+# axes = commonDomain(x,y)
+# grid = commonGrid(x,y,axes)
     maresult = numpy.ma.where(condition, _makeMaskedArg(x), _makeMaskedArg(y))
     axes, attributes, id, grid = _extractMetadata(condition)
-    F=getattr(x,"fill_value",1.e20)
+    F = getattr(x, "fill_value", 1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, grid=grid, id=id, fill_value=F)
 
+
 def masked_where(condition, x, copy=1):
-    """Return x as an array masked where condition is true. 
+    """Return x as an array masked where condition is true.
        Also masked where x or condition masked.
     """
     tx = _makeMaskedArg(x)
     tcondition = _makeMaskedArg(condition)
     maresult = numpy.ma.masked_where(tcondition, tx, copy)
     axes, attributes, id, grid = _extractMetadata(x)
-    F=getattr(x,"fill_value",1.e20)
+    F = getattr(x, "fill_value", 1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
+
 def masked_greater(x, value):
     "masked_greater(x, value) = x masked where x > value"
     tx = _makeMaskedArg(x)
     maresult = numpy.ma.masked_greater(tx, value)
     axes, attributes, id, grid = _extractMetadata(x)
-    F=getattr(x,"fill_value",1.e20)
+    F = getattr(x, "fill_value", 1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
 
@@ -495,33 +564,37 @@ def masked_greater_equal(x, value):
     tx = _makeMaskedArg(x)
     maresult = numpy.ma.masked_greater_equal(tx, value)
     axes, attributes, id, grid = _extractMetadata(x)
-    F=getattr(x,"fill_value",1.e20)
+    F = getattr(x, "fill_value", 1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
+
 def masked_less(x, value):
     "masked_less(x, value) = x masked where x < value"
     tx = _makeMaskedArg(x)
     maresult = numpy.ma.masked_less(tx, value)
     axes, attributes, id, grid = _extractMetadata(x)
-    F=getattr(x,"fill_value",1.e20)
+    F = getattr(x, "fill_value", 1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
+
 def masked_less_equal(x, value):
     "masked_less_equal(x, value) = x masked where x <= value"
     tx = _makeMaskedArg(x)
     maresult = numpy.ma.masked_less_equal(tx, value)
     axes, attributes, id, grid = _extractMetadata(x)
-    F=getattr(x,"fill_value",1.e20)
+    F = getattr(x, "fill_value", 1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
+
 def masked_not_equal(x, value):
     "masked_not_equal(x, value) = x masked where x != value"
     tx = _makeMaskedArg(x)
     maresult = numpy.ma.masked_not_equal(tx, value)
     axes, attributes, id, grid = _extractMetadata(x)
-    F=getattr(x,"fill_value",1.e20)
+    F = getattr(x, "fill_value", 1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
+
 def masked_equal(x, value):
     """masked_equal(x, value) = x masked where x == value
        For floating point consider masked_values(x, value) instead.
@@ -529,40 +602,43 @@ def masked_equal(x, value):
     tx = _makeMaskedArg(x)
     maresult = numpy.ma.masked_equal(tx, value)
     axes, attributes, id, grid = _extractMetadata(x)
-    F=getattr(x,"fill_value",1.e20)
+    F = getattr(x, "fill_value", 1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
+
 def masked_outside(x, v1, v2):
     "x with mask of all values of x that are outside [v1,v2]"
     tx = _makeMaskedArg(x)
     maresult = numpy.ma.masked_outside(tx, v1, v2)
     axes, attributes, id, grid = _extractMetadata(x)
-    F=getattr(x,"fill_value",1.e20)
+    F = getattr(x, "fill_value", 1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
+
 def masked_inside(x, v1, v2):
     "x with mask of all values of x that are inside [v1,v2]"
     tx = _makeMaskedArg(x)
     maresult = numpy.ma.masked_inside(tx, v1, v2)
     axes, attributes, id, grid = _extractMetadata(x)
-    F=getattr(x,"fill_value",1.e20)
+    F = getattr(x, "fill_value", 1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
-def concatenate (arrays, axis=0, axisid=None, axisattributes=None):
+
+def concatenate(arrays, axis=0, axisid=None, axisattributes=None):
     """Concatenate the arrays along the given axis. Give the extended axis the id and
     attributes provided - by default, those of the first array."""
 
     tarrays = [_makeMaskedArg(a) for a in arrays]
     maresult = numpy.ma.concatenate(arrays, axis=axis)
-    if len(arrays)>1:
+    if len(arrays) > 1:
         varattributes = None
         varid = None
-        axes = commonDomain(tarrays[0],tarrays[1],omit=axis)
+        axes = commonDomain(tarrays[0], tarrays[1], omit=axis)
         grid = commonGrid(tarrays[0], tarrays[1], axes)
-        for i in range(len(arrays)-2):
+        for i in range(len(arrays) - 2):
             if axes is None:
                 break
-            axes = commonAxes(tarrays[i+2],axes,omit=axis)
+            axes = commonAxes(tarrays[i + 2], axes, omit=axis)
             grid = commonGrid1(a, grid, axes)
     else:
         axes = tarrays[0].getAxisList()
@@ -575,32 +651,37 @@ def concatenate (arrays, axis=0, axisid=None, axisattributes=None):
     if axes is not None:
         if axisid is None:
             axisid = tarrays[0].getAxis(axis).id
-        allunitsequal=True
+        allunitsequal = True
         try:
-            allunits=tarrays[0].getAxis(axis).units
+            allunits = tarrays[0].getAxis(axis).units
         except:
-            allunits=None
+            allunits = None
         for t in tarrays[1:]:
             try:
-                tunits=t.getAxis(axis).units
+                tunits = t.getAxis(axis).units
             except:
-                tunits=None
-            if tunits!=allunits:
-                allunitsequal=False
+                tunits = None
+            if tunits != allunits:
+                allunitsequal = False
         if allunitsequal:
             if axisattributes is None:
                 axisattributes = tarrays[0].getAxis(axis).attributes
-            axes[axis] = axisConcatenate([t.getAxis(axis) for t in tarrays], axisid, axisattributes)
+            axes[axis] = axisConcatenate(
+                [t.getAxis(axis) for t in tarrays],
+                axisid,
+                axisattributes)
 
-    # If the grid doesn't match the axislist (e.g., catenation was on latitude) then omit it.
+    # If the grid doesn't match the axislist (e.g., catenation was on
+    # latitude) then omit it.
     if grid is not None:
         for item in grid.getAxisList():
             if item not in axes:
                 grid = None
-    F=getattr(arrays[0],"fill_value",1.e20)
-    return TransientVariable(maresult, axes=axes, attributes=varattributes,id=varid,grid=grid, fill_value=F)
+    F = getattr(arrays[0], "fill_value", 1.e20)
+    return TransientVariable(maresult, axes=axes, attributes=varattributes, id=varid, grid=grid, fill_value=F)
+
 
-def take (a, indices, axis=None):
+def take(a, indices, axis=None):
     "take(a, indices, axis=None) returns selection of items from a."
     axis = _conv_axis_arg(axis)
     ta = _makeMaskedArg(a)
@@ -608,15 +689,16 @@ def take (a, indices, axis=None):
     # ma compatibility interface has a bug
     maresult = numpy.ma.take(ta, indices, axis=axis)
     axes, attributes, id, grid = _extractMetadata(a, omitall=(axis is None))
-    
+
     # If the take is on a grid axis, omit the grid.
     if (grid is not None) and (axes[axis] in grid.getAxisList()):
         grid = None
     if axes is not None:
         axes[axis] = axisTake(axes[axis], indices)
-    F=getattr(a,"fill_value",1.e20)
+    F = getattr(a, "fill_value", 1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
+
 def transpose(a, axes=None):
     "transpose(a, axes=None) reorder dimensions per tuple axes"
     ta = _makeMaskedArg(a)
@@ -628,49 +710,53 @@ def transpose(a, axes=None):
     newaxes = None
     if oldaxes is not None:
         newaxes = [oldaxes[i] for i in axes]
-    F=getattr(a,"fill_value",1.e20)
+    F = getattr(a, "fill_value", 1.e20)
     return TransientVariable(maresult, axes=newaxes, attributes=attributes, id=id, grid=grid, copy=1, fill_value=F)
 
+
 class _minimum_operation:
+
     "Object to calculate minima"
-    def __init__ (self):
+
+    def __init__(self):
         """minimum(a, b) or minimum(a)
            In one argument case returns the scalar minimum.
         """
         pass
 
-    def __call__ (self, a, b=None):
+    def __call__(self, a, b=None):
         "Execute the call behavior."
         a = _makeMaskedArg(a)
         if b is None:
             m = getmask(a)
-            if m is nomask: 
+            if m is nomask:
                 d = numpy.min(filled(a).ravel())
                 return d
-##             ac = a.compressed()
-##             if len(ac) == 0:
-##                 return masked
+# ac = a.compressed()
+# if len(ac) == 0:
+# return masked
             else:
                 return numpy.ma.min(a)
         else:
             return where(less(a, b), a, b)[...]
-       
-    def reduce (self, target, axis=0):
+
+    def reduce(self, target, axis=0):
         """Reduce target along the given axis."""
         a = _makeMaskedArg(target)
         axes, attributes, id, grid = _extractMetadata(a, omit=axis)
         m = getmask(a)
         if m is nomask:
             t = filled(a)
-            result = masked_array (numpy.minimum.reduce (t, axis))
+            result = masked_array(numpy.minimum.reduce(t, axis))
         else:
-            t = numpy.minimum.reduce(filled(a, numpy.ma.minimum_fill_value(a)), axis)
+            t = numpy.minimum.reduce(
+                filled(a, numpy.ma.minimum_fill_value(a)), axis)
             m = numpy.logical_and.reduce(m, axis)
             result = masked_array(t, m, fill_value(a))
         return TransientVariable(result, axes=axes, copy=0,
-                     fill_value=fill_value(a), grid=grid, id=id)
+                                 fill_value=fill_value(a), grid=grid, id=id)
 
-    def outer (self, a, b):
+    def outer(self, a, b):
         "Return the function applied to the outer product of a and b."
         a = _makeMaskedArg(a)
         b = _makeMaskedArg(b)
@@ -685,47 +771,51 @@ class _minimum_operation:
         d = numpy.minimum.outer(filled(a), filled(b))
         return TransientVariable(d, mask=m, copy=0)
 
-minimum = _minimum_operation () 
-    
+minimum = _minimum_operation()
+
+
 class _maximum_operation:
+
     "Object to calculate maxima"
-    def __init__ (self):
+
+    def __init__(self):
         """maximum(a, b) or maximum(a)
            In one argument case returns the scalar maximum.
         """
         pass
 
-    def __call__ (self, a, b=None):
+    def __call__(self, a, b=None):
         "Execute the call behavior."
         a = _makeMaskedArg(a)
         if b is None:
             m = getmask(a)
-            if m is nomask: 
+            if m is nomask:
                 d = numpy.max(filled(a).ravel())
                 return d
-##             ac = a.compressed()
-##             if len(ac) == 0:
-##                 return masked
+# ac = a.compressed()
+# if len(ac) == 0:
+# return masked
             else:
                 return numpy.ma.max(a)
         else:
             return where(greater(a, b), a, b)[...]
-       
-    def reduce (self, target, axis=0):
+
+    def reduce(self, target, axis=0):
         """Reduce target along the given axis."""
         axes, attributes, id, grid = _extractMetadata(target, omit=axis)
         a = _makeMaskedArg(target)
         m = getmask(a)
         if m is nomask:
             t = filled(a)
-            return masked_array (numpy.maximum.reduce (t, axis))
+            return masked_array(numpy.maximum.reduce(t, axis))
         else:
-            t = numpy.maximum.reduce(filled(a, numpy.ma.maximum_fill_value(a)), axis)
+            t = numpy.maximum.reduce(
+                filled(a, numpy.ma.maximum_fill_value(a)), axis)
             m = numpy.logical_and.reduce(m, axis)
             return TransientVariable(t, mask=m, fill_value=fill_value(a),
-                        axes = axes, grid=grid, id=id)
+                                     axes=axes, grid=grid, id=id)
 
-    def outer (self, a, b):
+    def outer(self, a, b):
         "Return the function applied to the outer product of a and b."
         a = _makeMaskedArg(a)
         b = _makeMaskedArg(b)
@@ -740,8 +830,9 @@ class _maximum_operation:
         d = numpy.maximum.outer(filled(a), filled(b))
         return TransientVariable(d, mask=m)
 
-maximum = _maximum_operation () 
-    
+maximum = _maximum_operation()
+
+
 def asarray(data, typecode=None, dtype=None):
     """asarray(data, typecode=None, dtype=None) is equivalent to array(data, dtype=None, copy=0)
        Returns data if dtype is None or data is a MaskedArray of the same dtype.
@@ -751,10 +842,12 @@ def asarray(data, typecode=None, dtype=None):
     if isinstance(data, AbstractVariable) and (dtype is None or sctype2char(dtype) == data.dtype.char):
         return data
     else:
-        F=getattr(data,"fill_value",1.e20)
+        F = getattr(data, "fill_value", 1.e20)
         return TransientVariable(data, dtype=dtype, copy=0, fill_value=F)
 
-def arrayrange(start, stop=None, step=1, typecode=None, axis=None, attributes=None, id=None, dtype=None):
+
+def arrayrange(start, stop=None, step=1, typecode=None,
+               axis=None, attributes=None, id=None, dtype=None):
     """Just like range() except it returns a variable whose type can be specfied
     by the keyword argument typecode. The axis of the result variable may be specified.
     """
@@ -767,15 +860,19 @@ def arrayrange(start, stop=None, step=1, typecode=None, axis=None, attributes=No
 
 arange = arrayrange
 
-def zeros (shape, typecode=float, savespace=0, axes=None, attributes=None, id=None, grid=None, dtype=None):
-    """zeros(n, typecode=float, savespace=0, axes=None, attributes=None, id=None) = 
+
+def zeros(shape, typecode=float, savespace=0, axes=None,
+          attributes=None, id=None, grid=None, dtype=None):
+    """zeros(n, typecode=float, savespace=0, axes=None, attributes=None, id=None) =
      an array of all zeros of the given length or shape."""
     dtype = _convdtype(dtype, typecode)
     maresult = numpy.ma.zeros(shape, dtype=dtype)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid)
-    
-def ones (shape, typecode=float, savespace=0, axes=None, attributes=None, id=None, grid=None, dtype=None):
-    """ones(n, typecode=float, savespace=0, axes=None, attributes=None, id=None) = 
+
+
+def ones(shape, typecode=float, savespace=0, axes=None,
+         attributes=None, id=None, grid=None, dtype=None):
+    """ones(n, typecode=float, savespace=0, axes=None, attributes=None, id=None) =
      an array of all ones of the given length or shape."""
     dtype = _convdtype(dtype, typecode)
     maresult = numpy.ma.ones(shape, dtype=dtype)
@@ -783,28 +880,31 @@ def ones (shape, typecode=float, savespace=0, axes=None, attributes=None, id=Non
 
 as_masked = numpy.ma.array
 
+
 def outerproduct(a, b):
     """outerproduct(a,b) = {a[i]*b[j]}, has shape (len(a),len(b))"""
-    ta = asVariable(a,writeable=1)
-    tb = asVariable(b,writeable=1)
-    maresult = numpy.ma.outerproduct(ta,tb)
-    axes = (ta.getAxis(0),tb.getAxis(0))
-    F=getattr(a,"fill_value",1.e20)
+    ta = asVariable(a, writeable=1)
+    tb = asVariable(b, writeable=1)
+    maresult = numpy.ma.outerproduct(ta, tb)
+    axes = (ta.getAxis(0), tb.getAxis(0))
+    F = getattr(a, "fill_value", 1.e20)
     return TransientVariable(maresult, axes=axes, fill_value=F)
 
-def argsort (x, axis = -1, fill_value=None):
+
+def argsort(x, axis=-1, fill_value=None):
     """Treating masked values as if they have the value fill_value,
        return sort indices for sorting along given axis.
        if fill_value is None, use fill_value(x)
-    """        
+    """
     tx = _makeMaskedArg(x)
-    maresult = numpy.ma.argsort(tx,axis=axis,fill_value=fill_value)
+    maresult = numpy.ma.argsort(tx, axis=axis, fill_value=fill_value)
     axes, attributes, id, grid = _extractMetadata(x)
-    F=getattr(x,"fill_value",1.e20)
+    F = getattr(x, "fill_value", 1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
 array = TransientVariable
 
+
 def repeat(a, repeats, axis=None):
     """repeat elements of a repeats times along axis
        repeats is a sequence of length a.shape[axis]
@@ -818,68 +918,85 @@ def repeat(a, repeats, axis=None):
         grid = None
     if axes is not None:
         axes[axis] = None
-    F=getattr(a,"fill_value",1.e20)
+    F = getattr(a, "fill_value", 1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, no_update_from=True, fill_value=F)
 
-def reshape (a, newshape, axes=None, attributes=None, id=None, grid=None):
+
+def reshape(a, newshape, axes=None, attributes=None, id=None, grid=None):
     ignore, attributes, id, ignore = _extractMetadata(a, axes, attributes, id)
     if axes is not None:
         axesshape = [len(item) for item in axes]
-        if axesshape!=list(newshape):
-            raise CDMSError, 'axes must be shaped %s'%`newshape`
+        if axesshape != list(newshape):
+            raise CDMSError('axes must be shaped %s' % repr(newshape))
     ta = _makeMaskedArg(a)
     maresult = numpy.ma.reshape(ta, newshape)
-    F=getattr(a,"fill_value",1.e20)
+    F = getattr(a, "fill_value", 1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, no_update_from=True, fill_value=F)
-reshape.__doc__="numpy doc: %s\naxes/attributes/grid are applied onto the new variable" % numpy.reshape.__doc__
+reshape.__doc__ = "numpy doc: %s\naxes/attributes/grid are applied onto the new variable" % numpy.reshape.__doc__
+
 
-def resize (a, new_shape, axes=None, attributes=None, id=None, grid=None):
+def resize(a, new_shape, axes=None, attributes=None, id=None, grid=None):
     """resize(a, new_shape) returns a new array with the specified shape.
     The original array's total size can be any size."""
     ignore, attributes, id, ignore = _extractMetadata(a, axes, attributes, id)
     if axes is not None:
         axesshape = [len(item) for item in axes]
-        if axesshape!=list(new_shape):
-            raise CDMSError, 'axes must be shaped %s'%`newshape`
+        if axesshape != list(new_shape):
+            raise CDMSError('axes must be shaped %s' % repr(newshape))
     ta = _makeMaskedArg(a)
     maresult = numpy.ma.resize(ta, new_shape)
-    F=getattr(a,"fill_value",1.e20)
+    F = getattr(a, "fill_value", 1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
-def masked_array (a, mask=None, fill_value=None, axes=None, attributes=None, id=None):
-    """masked_array(a, mask=None) = 
+
+def masked_array(a, mask=None, fill_value=None,
+                 axes=None, attributes=None, id=None):
+    """masked_array(a, mask=None) =
        array(a, mask=mask, copy=0, fill_value=fill_value)
        Use fill_value(a) if None.
     """
-    maresult = numpy.ma.masked_array(_makeMaskedArg(a), mask=mask, fill_value=fill_value)
+    maresult = numpy.ma.masked_array(
+        _makeMaskedArg(a),
+        mask=mask,
+     fill_value=fill_value)
     axes, attributes, id, grid = _extractMetadata(a, axes, attributes, id)
-    F=getattr(a,"fill_value",1.e20)
+    F = getattr(a, "fill_value", 1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
-def masked_values (data, value, rtol=1.e-5, atol=1.e-8, copy=1,
-    savespace=0, axes=None, attributes=None, id=None): 
+
+def masked_values(data, value, rtol=1.e-5, atol=1.e-8, copy=1,
+                  savespace=0, axes=None, attributes=None, id=None):
     """
        masked_values(data, value, rtol=1.e-5, atol=1.e-8)
        Create a masked array; mask is None if possible.
        May share data values with original array, but not recommended.
        Masked where abs(data-value)<= atol + rtol * abs(value)
     """
-    maresult = numpy.ma.masked_values(_makeMaskedArg(data), value, rtol=rtol, atol=atol, copy=copy)
+    maresult = numpy.ma.masked_values(
+        _makeMaskedArg(data),
+        value,
+     rtol=rtol,
+     atol=atol,
+     copy=copy)
     axes, attributes, id, grid = _extractMetadata(data, axes, attributes, id)
-    F=getattr(data,"fill_value",1.e20)
+    F = getattr(data, "fill_value", 1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
-def masked_object (data, value, copy=1, savespace=0, axes=None, attributes=None, id=None):
+
+def masked_object(data, value, copy=1,
+                  savespace=0, axes=None, attributes=None, id=None):
     "Create array masked where exactly data equal to value"
     maresult = numpy.ma.masked_object(_makeMaskedArg(data), value, copy=copy)
     axes, attributes, id, grid = _extractMetadata(data, axes, attributes, id)
-    F=getattr(data,"fill_value",1.e20)
+    F = getattr(data, "fill_value", 1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
-    
-def isMaskedVariable (x):
+
+
+def isMaskedVariable(x):
     "Is x a masked variable, that is, an instance of AbstractVariable?"
     return isinstance(x, AbstractVariable)
 
+
 def set_default_fill_value(value_type, value):
     """Set the default fill value for value_type to value.
     value_type is a string: 'real','complex','character','integer',or 'object'.
@@ -896,24 +1013,23 @@ def set_default_fill_value(value_type, value):
     elif value_type == 'object':
         numpy.ma.default_object_fill_value = value
 
-def fromfunction (f, dimensions):
+
+def fromfunction(f, dimensions):
     """Apply f to s to create an array as in numpy."""
     return TransientVariable(numpy.ma.fromfunction(f, dimensions))
 
-def diagonal (a, offset = 0, axis1=0, axis2 = 1):
-    """diagonal(a, offset=0, axis1=0, axis2 = 1) returns the given 
+
+def diagonal(a, offset=0, axis1=0, axis2=1):
+    """diagonal(a, offset=0, axis1=0, axis2 = 1) returns the given
        diagonals defined by the two dimensions of the array.
     """
-    F=getattr(a,"fill_value",1.e20)
-    return TransientVariable(numpy.ma.diagonal(_makeMaskedArg(a), 
-            offset, axis1, axis2), fill_value=F)
+    F = getattr(a, "fill_value", 1.e20)
+    return TransientVariable(numpy.ma.diagonal(_makeMaskedArg(a),
+                                               offset, axis1, axis2), fill_value=F)
 
-def fromstring (s, t):
+
+def fromstring(s, t):
     """Construct a masked array from a string. Result will have no mask.
        t is a typecode.
     """
-    return TransientArray(numpy.ma.fromstring(s,t))
-
-
-
-
+    return TransientArray(numpy.ma.fromstring(s, t))
diff --git a/Packages/cdms2/Lib/__init__.py b/Packages/cdms2/Lib/__init__.py
index 874601632..e3e53ff09 100644
--- a/Packages/cdms2/Lib/__init__.py
+++ b/Packages/cdms2/Lib/__init__.py
@@ -2,35 +2,35 @@
 CDMS module-level API
 """
 import cdat_info
-cdat_info.pingPCMDIdb("cdat","cdms2")
+cdat_info.pingPCMDIdb("cdat", "cdms2")
 
-__all__ = ["cdmsobj", "axis", "coord", "grid", "hgrid", "avariable", \
-"sliceut", "error", "variable", "fvariable", "tvariable", "dataset", \
-"database", "cache", "selectors", "MV2", "convention", "bindex", \
-"auxcoord", "gengrid", "gsHost", "gsStaticVariable", "gsTimeVariable", \
-"mvBaseWriter", "mvSphereMesh", "mvVsWriter", "mvCdmsRegrid"]
+__all__ = ["cdmsobj", "axis", "coord", "grid", "hgrid", "avariable",
+           "sliceut", "error", "variable", "fvariable", "tvariable", "dataset",
+           "database", "cache", "selectors", "MV2", "convention", "bindex",
+           "auxcoord", "gengrid", "gsHost", "gsStaticVariable", "gsTimeVariable",
+           "mvBaseWriter", "mvSphereMesh", "mvVsWriter", "mvCdmsRegrid"]
 
 # Errors
-from error import CDMSError
+from .error import CDMSError
 
 # CDMS datatypes
-from cdmsobj import CdArray, CdChar, CdByte, CdDouble, CdFloat, CdFromObject, CdInt, CdLong, CdScalar, CdShort, CdString
+from .cdmsobj import CdArray, CdChar, CdByte, CdDouble, CdFloat, CdFromObject, CdInt, CdLong, CdScalar, CdShort, CdString
 
 # Functions which operate on all objects or groups of objects
-from cdmsobj import Unlimited, getPathFromTemplate, matchPattern, matchingFiles, searchPattern, searchPredicate, setDebugMode
+from .cdmsobj import Unlimited, getPathFromTemplate, matchPattern, matchingFiles, searchPattern, searchPredicate, setDebugMode
 
 # Axis functions and classes
-from axis import AbstractAxis, axisMatches, axisMatchAxis, axisMatchIndex
-from axis import createAxis, createEqualAreaAxis, createGaussianAxis, createUniformLatitudeAxis, createUniformLongitudeAxis, setAutoBounds, getAutoBounds
+from .axis import AbstractAxis, axisMatches, axisMatchAxis, axisMatchIndex
+from .axis import createAxis, createEqualAreaAxis, createGaussianAxis, createUniformLatitudeAxis, createUniformLongitudeAxis, setAutoBounds, getAutoBounds
 
 # Grid functions
-from grid import createGenericGrid, createGlobalMeanGrid, createRectGrid, createUniformGrid, createZonalGrid, setClassifyGrids, createGaussianGrid, writeScripGrid, isGrid
+from .grid import createGenericGrid, createGlobalMeanGrid, createRectGrid, createUniformGrid, createZonalGrid, setClassifyGrids, createGaussianGrid, writeScripGrid, isGrid
 
 # Dataset functions
-from dataset import createDataset, openDataset, useNetcdf3, \
-        getNetcdfClassicFlag, getNetcdfShuffleFlag, getNetcdfDeflateFlag, getNetcdfDeflateLevelFlag,\
+from .dataset import createDataset, openDataset, useNetcdf3, \
+    getNetcdfClassicFlag, getNetcdfShuffleFlag, getNetcdfDeflateFlag, getNetcdfDeflateLevelFlag,\
         setNetcdfClassicFlag, setNetcdfShuffleFlag, setNetcdfDeflateFlag, setNetcdfDeflateLevelFlag,\
-        setNetcdfUseNCSwitchModeFlag,getNetcdfUseNCSwitchModeFlag,\
+        setNetcdfUseNCSwitchModeFlag, getNetcdfUseNCSwitchModeFlag,\
         setCompressionWarnings,\
         setNetcdf4Flag, getNetcdf4Flag,\
         setNetcdfUseParallelFlag, getNetcdfUseParallelFlag, \
@@ -39,31 +39,31 @@ from dataset import createDataset, openDataset, useNetcdf3, \
 open = openDataset
 
 # Database functions
-from database import connect, Base, Onelevel, Subtree
+from .database import connect, Base, Onelevel, Subtree
 
-#Selectors
-import selectors
-from selectors import longitude, latitude, time, level, required, \
-                      longitudeslice, latitudeslice, levelslice, timeslice
+# Selectors
+from . import selectors
+from .selectors import longitude, latitude, time, level, required, \
+    longitudeslice, latitudeslice, levelslice, timeslice
 
-from avariable import order2index, orderparse, setNumericCompatibility, getNumericCompatibility
+from .avariable import order2index, orderparse, setNumericCompatibility, getNumericCompatibility
 # TV
-from tvariable import asVariable, createVariable, isVariable
+from .tvariable import asVariable, createVariable, isVariable
 
-from mvSphereMesh import SphereMesh
-from mvBaseWriter import BaseWriter
-from mvVsWriter import VsWriter
-from mvVTKSGWriter import VTKSGWriter
-from mvVTKUGWriter import VTKUGWriter
-from mvCdmsRegrid import CdmsRegrid
+from .mvSphereMesh import SphereMesh
+from .mvBaseWriter import BaseWriter
+from .mvVsWriter import VsWriter
+from .mvVTKSGWriter import VTKSGWriter
+from .mvVTKUGWriter import VTKUGWriter
+from .mvCdmsRegrid import CdmsRegrid
 
 # Gridspec is not installed by default so just pass on if it isn't installed
 try:
-    from gsStaticVariable import StaticFileVariable
-    from gsTimeVariable import TimeFileVariable
+    from .gsStaticVariable import StaticFileVariable
+    from .gsTimeVariable import TimeFileVariable
 except:
     pass
 
-from restApi import esgfConnection,esgfDataset,FacetConnection
+from .restApi import esgfConnection, esgfDataset, FacetConnection
 
 MV = MV2
diff --git a/Packages/cdms2/Lib/auxcoord.py b/Packages/cdms2/Lib/auxcoord.py
index 24a97e8c3..334831dce 100644
--- a/Packages/cdms2/Lib/auxcoord.py
+++ b/Packages/cdms2/Lib/auxcoord.py
@@ -4,50 +4,66 @@ CDMS 1-D auxiliary coordinates.
 Note: In contrast to Axis objects (concrete classes subclassed from AbstractAxis), auxiliary coordinate variables are not monotonic in value, and do not share a name with the dimension.
 """
 
-## import internattr
-from error import CDMSError
-from coord import AbstractCoordinateAxis
-from fvariable import FileVariable
-from variable import DatasetVariable
-from tvariable import TransientVariable
-from avariable import AbstractVariable
+# import internattr
+from .error import CDMSError
+from .coord import AbstractCoordinateAxis
+from .fvariable import FileVariable
+from .variable import DatasetVariable
+from .tvariable import TransientVariable
+from .avariable import AbstractVariable
+
 
 class AbstractAuxAxis1D(AbstractCoordinateAxis):
 
-    def __init__ (self, parent=None, variableNode=None, bounds=None):
-        AbstractCoordinateAxis.__init__(self, parent, variableNode, bounds=bounds)
+    def __init__(self, parent=None, variableNode=None, bounds=None):
+        AbstractCoordinateAxis.__init__(
+            self,
+            parent,
+            variableNode,
+            bounds=bounds)
 
-    def clone (self, copyData=1):
+    def clone(self, copyData=1):
         """clone (self, copyData=1)
         Return a copy of self as a transient axis.
         If copyData is 1, make a separate copy of the data."""
-        result = TransientAuxAxis1D(self[:], copy=copyData, axes=self.getAxisList(), attributes=self.attributes, bounds=self.getBounds())
+        result = TransientAuxAxis1D(
+            self[:],
+            copy=copyData,
+            axes=self.getAxisList(),
+            attributes=self.attributes,
+            bounds=self.getBounds())
         return result
 
     def setBounds(self, bounds):
         if bounds is not None:
-            if len(bounds.shape)!=2:
-                raise CDMSError, 'Bounds must have rank=2'
-            if bounds.shape[0:1]!=self.shape:
-                raise CDMSError, 'Bounds shape %s is inconsistent with axis shape %s'%(`bounds.shape`,`self.shape`)
+            if len(bounds.shape) != 2:
+                raise CDMSError('Bounds must have rank=2')
+            if bounds.shape[0:1] != self.shape:
+                raise CDMSError(
+                    'Bounds shape %s is inconsistent with axis shape %s' %
+                    (repr(bounds.shape), repr(self.shape)))
         AbstractCoordinateAxis.setBounds(self, bounds)
 
-    def subSlice (self, *specs, **keys):
+    def subSlice(self, *specs, **keys):
         # Take a subslice, returning a TransientAuxAxis1D
         avar = AbstractVariable.subSlice(self, *specs, **keys)
         bounds = self.getBounds()
         if bounds is None:
             newbounds = None
         else:
-            newbounds = bounds[specs]   # bounds can be a numarray or DatasetVariable
+            newbounds = bounds[
+                specs]   # bounds can be a numarray or DatasetVariable
 
-        # Note: disable axis copy to preserve identity of grid and variable domains
-        result = TransientAuxAxis1D(avar, bounds=newbounds, copyaxes=0)    
+        # Note: disable axis copy to preserve identity of grid and variable
+        # domains
+        result = TransientAuxAxis1D(avar, bounds=newbounds, copyaxes=0)
         return result
 
+
 class DatasetAuxAxis1D(AbstractAuxAxis1D, DatasetVariable):
 
     # Note: node is a VariableNode
+
     def __init__(self, parent, id=None, variableNode=None, bounds=None):
         AbstractAuxAxis1D.__init__(self, parent, variableNode, bounds=bounds)
         DatasetVariable.__init__(self, parent, id, variableNode)
@@ -55,11 +71,13 @@ class DatasetAuxAxis1D(AbstractAuxAxis1D, DatasetVariable):
 
     def __repr__(self):
         if self.parent is not None:
-            return "<DatasetAuxAxis1D: %s, file: %s, shape: %s>"%(self.id, self.parent.id, `self.shape`)
+            return "<DatasetAuxAxis1D: %s, file: %s, shape: %s>" % (self.id, self.parent.id, repr(self.shape))
         else:
-            return "<DatasetAuxAxis1D: %s, file: **CLOSED**>"%self.id
+            return "<DatasetAuxAxis1D: %s, file: **CLOSED**>" % self.id
+
+# internattr.initialize_internal_attributes(DatasetAuxAxis1D) # Copy
+# internal attrs from parents
 
-## internattr.initialize_internal_attributes(DatasetAuxAxis1D) # Copy internal attrs from parents
 
 class FileAuxAxis1D(AbstractAuxAxis1D, FileVariable):
 
@@ -70,15 +88,18 @@ class FileAuxAxis1D(AbstractAuxAxis1D, FileVariable):
 
     def __repr__(self):
         if self.parent is not None:
-            return "<FileAuxAxis1D: %s, file: %s, shape: %s>"%(self.id, self.parent.id, `self.shape`)
+            return "<FileAuxAxis1D: %s, file: %s, shape: %s>" % (self.id, self.parent.id, repr(self.shape))
         else:
-            return "<FileAuxAxis1D: %s, file: **CLOSED**>"%self.id
+            return "<FileAuxAxis1D: %s, file: **CLOSED**>" % self.id
+
+# internattr.initialize_internal_attributes(FileAuxAxis1D) # Copy internal
+# attrs from parents
 
-## internattr.initialize_internal_attributes(FileAuxAxis1D) # Copy internal attrs from parents
 
 class TransientAuxAxis1D(AbstractAuxAxis1D, TransientVariable):
 
-    def __init__(self, data, typecode=None, copy=0, savespace=0, mask=None, fill_value=None,
+    def __init__(
+        self, data, typecode=None, copy=0, savespace=0, mask=None, fill_value=None,
                  axes=None, attributes=None, id=None, copyaxes=1, bounds=None):
         """Create a transient, auxiliary 1-D axis.
         All arguments are as for TransientVariable.
@@ -86,11 +107,12 @@ class TransientAuxAxis1D(AbstractAuxAxis1D, TransientVariable):
           nvert is the max number of vertices per cell.
         """
         AbstractAuxAxis1D.__init__(self, None, None, bounds=bounds)
-        TransientVariable.__init__(self, data, typecode=typecode, copy=copy, savespace=savespace,
+        TransientVariable.__init__(
+            self, data, typecode=typecode, copy=copy, savespace=savespace,
                                    mask=mask, fill_value=fill_value, axes=axes, attributes=attributes,
                                    id=id, copyaxes=copyaxes)
         if axes is not None:
             self.setBounds(bounds)
 
-## internattr.initialize_internal_attributes(TransientAuxAxis1D) # Copy internal attrs from parents
-
+# internattr.initialize_internal_attributes(TransientAuxAxis1D) # Copy
+# internal attrs from parents
diff --git a/Packages/cdms2/Lib/avariable.py b/Packages/cdms2/Lib/avariable.py
index db174105e..ae31c1171 100644
--- a/Packages/cdms2/Lib/avariable.py
+++ b/Packages/cdms2/Lib/avariable.py
@@ -1,26 +1,26 @@
-## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
-## Further modified to be pure new numpy June 24th 2008
+# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
+# Further modified to be pure new numpy June 24th 2008
 
 "CDMS Variable objects, abstract interface"
 import numpy
 import re
 import warnings
-import cdmsNode
-from cdmsobj import CdmsObj
+from . import cdmsNode
+from .cdmsobj import CdmsObj
 import cdms2
-from slabinterface import Slab
-from sliceut import *
-from error import CDMSError
-from axis import axisMatchIndex, axisMatchAxis, axisMatches, unspecified, CdtimeTypes, AbstractAxis
-import selectors
+from .slabinterface import Slab
+from .sliceut import *
+from .error import CDMSError
+from .axis import axisMatchIndex, axisMatchAxis, axisMatches, unspecified, CdtimeTypes, AbstractAxis
+from . import selectors
 import copy
 # from regrid2 import Regridder, PressureRegridder, CrossSectionRegridder
-from mvCdmsRegrid import CdmsRegrid
+from .mvCdmsRegrid import CdmsRegrid
 from regrid2.mvGenericRegrid import guessPeriodicity
-#import PropertiedClasses
-from convention import CF1
-from grid import AbstractRectGrid
-#import internattr
+# import PropertiedClasses
+from .convention import CF1
+from .grid import AbstractRectGrid
+# import internattr
 
 InvalidRegion = "Invalid region: "
 OutOfRange = "Coordinate interval is out of range or intersection has no data: "
@@ -32,9 +32,10 @@ _numeric_compatibility = False          # Backward compatibility with numpy beha
                                         # True:  return 0-D arrays
                                         #        MV axis=1 by default
 
+
 def getMinHorizontalMask(var):
     """
-    Get the minimum mask associated with 'x' and 'y' (i.e. with the 
+    Get the minimum mask associated with 'x' and 'y' (i.e. with the
     min number of ones) across all axes
     @param var CDMS variable with a mask
     @return mask array or None if order 'x' and 'y' were not found
@@ -46,7 +47,7 @@ def getMinHorizontalMask(var):
 
     shp = var.shape
     ndims = len(shp)
-    order = var.getOrder() # e.g. 'zxty-', ndims = 5
+    order = var.getOrder()  # e.g. 'zxty-', ndims = 5
 
     # run a few checks
     numX = order.count('x')
@@ -57,43 +58,43 @@ def getMinHorizontalMask(var):
         msg = """
 Not able to locate the horizontal (y, x) axes for order = %s in getMinHorizontalMask
         """ % str(order)
-        raise CDMSError, msg
-        
-    
-    ps = [] # index position of x/y, e.g. [1,3]
-    es = [] # end indices, sizes of x/y axes
+        raise CDMSError(msg)
+
+    ps = []  # index position of x/y, e.g. [1,3]
+    es = []  # end indices, sizes of x/y axes
     nonHorizShape = []
     found = False
-    for i in range(ndims-1, -1, -1):
-        # iterate backwards because the horizontal 
+    for i in range(ndims - 1, -1, -1):
+        # iterate backwards because the horizontal
         # axes are more likely to be last
         o = order[i]
         # curvilinear coordinates have '-' in place of
-        # x or y, also check for '-' but exit if we think 
+        # x or y, also check for '-' but exit if we think
         # we found the x and y coords
         if not found and (o in 'xy') or (not hasXY and o == '-'):
-            ps = [i,] + ps
-            es = [shp[i],] + es
+            ps = [i, ] + ps
+            es = [shp[i], ] + es
             if len(ps) == 2:
                 found = True
         else:
-            nonHorizShape = [shp[i],] + nonHorizShape
+            nonHorizShape = [shp[i], ] + nonHorizShape
 
     if len(ps) == 2:
-        # found all the horizontal axes, start with mask 
+        # found all the horizontal axes, start with mask
         # set to invalid everywhere
         mask = numpy.ones(es, numpy.bool8)
         # iterate over all non-horizontal axes, there can be as
         # many as you want...
         for it in MultiArrayIter(nonHorizShape):
-            inds = it.getIndices() # (i0, i1, i2)
+            inds = it.getIndices()  # (i0, i1, i2)
             # build the slice operator, there are three parts
-            # (head, middle, and tail), some parts may be 
+            # (head, middle, and tail), some parts may be
             # missing
             # slce = 'i0,' + ':,'   +   'i1,'  +   ':,' + 'i2,'
-            slce = ('%d,'*ps[0]) % tuple(inds[:ps[0]]) + ':,'            \
-                + ('%d,'*(ps[1]-ps[0]-1)) % tuple(inds[ps[0]:ps[1]-1])   \
-                + ':,' + ('%d,'*(ndims-ps[1]-1)) % tuple(inds[ps[1]-1:])
+            slce = ('%d,' * ps[0]) % tuple(inds[:ps[0]]) + ':,'            \
+                + ('%d,' * (ps[1] - ps[0] - 1)) % tuple(inds[ps[0]:ps[1] - 1])   \
+                + ':,' + \
+                ('%d,' * (ndims - ps[1] - 1)) % tuple(inds[ps[1] - 1:])
             # evaluate the slice for this time, level....
             mask &= eval('var.mask[' + slce + ']')
         return mask
@@ -101,45 +102,49 @@ Not able to locate the horizontal (y, x) axes for order = %s in getMinHorizontal
         msg = """
 Could not find all the horizontal axes for order = %s in getMinHorizontalMask
         """ % str(order)
-        raise CDMSError, msg
-    return None  
+        raise CDMSError(msg)
+    return None
+
 
 def setNumericCompatibility(mode):
     global _numeric_compatibility
-    if mode==True or mode=='on':
+    if mode or mode == 'on':
         _numeric_compatibility = True
-    elif mode==False or mode=='off':
+    elif mode == False or mode == 'off':
         _numeric_compatibility = False
 
+
 def getNumericCompatibility():
     return _numeric_compatibility
 
+
 class AbstractVariable(CdmsObj, Slab):
-    def __init__ (self, parent=None, variableNode=None):
+
+    def __init__(self, parent=None, variableNode=None):
         """Not to be called by users.
            variableNode is the variable tree node, if any.
            parent is the containing dataset instance.
         """
-        if variableNode is not None and variableNode.tag !='variable':
-            raise CDMSError, 'Node is not a variable node'
+        if variableNode is not None and variableNode.tag != 'variable':
+            raise CDMSError('Node is not a variable node')
         CdmsObj.__init__(self, variableNode)
-        val = self.__cdms_internals__ + ['id','domain']
-        self.___cdms_internals__ = val 
+        val = self.__cdms_internals__ + ['id', 'domain']
+        self.___cdms_internals__ = val
         Slab.__init__(self)
         self.id = None                  # Transient variables key on this to create a default ID
         self.parent = parent
         self._grid_ = None      # Variable grid, if any
-        if not hasattr(self,'missing_value'):
+        if not hasattr(self, 'missing_value'):
             self.missing_value = None
         elif numpy.isnan(self.missing_value):
-          self.missing_value = None
+            self.missing_value = None
 
         # Reminder: children to define self.shape and set self.id
 
-    def __array__ (self, t=None, context=None):  #Numeric, ufuncs call this
+    def __array__(self, t=None, context=None):  # Numeric, ufuncs call this
         return numpy.ma.filled(self.getValue(squeeze=0))
 
-    def __call__ (self, *args,  **kwargs):
+    def __call__(self, *args, **kwargs):
         "Selection of a subregion using selectors"
         # separate options from selector specs
         d = kwargs.copy()
@@ -152,13 +157,13 @@ class AbstractVariable(CdmsObj, Slab):
         s = selectors.Selector(*args, **d)
         # get the selection
         return s.unmodified_select(self, raw=raw,
-                                         squeeze=squeeze, 
-                                         order=order, 
-                                         grid=grid)
+                                   squeeze=squeeze,
+                                   order=order,
+                                   grid=grid)
 
     select = __call__
 
-    def rank (self):
+    def rank(self):
         return len(self.shape)
 
     def _returnArray(self, ar, squeeze, singles=None):
@@ -166,85 +171,90 @@ class AbstractVariable(CdmsObj, Slab):
         # job is to make sure we return an numpy.ma or a scalar.
         # If singles is not None, squeeze dimension indices in singles
         inf = 1.8e308
-        if isinstance(ar,cdms2.tvariable.TransientVariable):
-            result = numpy.ma.array(ar._data,mask=ar.mask)
-        elif numpy.ma.isMaskedArray(ar):   #already numpy.ma, only need squeeze.
+        if isinstance(ar, cdms2.tvariable.TransientVariable):
+            result = numpy.ma.array(ar._data, mask=ar.mask)
+        elif numpy.ma.isMaskedArray(ar):  # already numpy.ma, only need squeeze.
             result = ar
         elif isinstance(ar, numpy.ndarray):
             missing = self.getMissing()
             if missing is None:
                 result = numpy.ma.masked_array(ar)
-            elif missing==inf or missing!=missing: # (x!=x) ==> x is NaN
+            elif missing == inf or missing != missing:  # (x!=x) ==> x is NaN
                 result = numpy.ma.masked_object(ar, missing, copy=0)
-            elif ar.dtype.char=='c':
+            elif ar.dtype.char == 'c':
                 # umath.equal is not implemented
-                resultmask = (ar==missing)
+                resultmask = (ar == missing)
                 if not resultmask.any():
                     resultmask = numpy.ma.nomask
-                result = numpy.ma.masked_array(ar, mask=resultmask, fill_value=missing)
+                result = numpy.ma.masked_array(
+                    ar,
+                    mask=resultmask,
+                    fill_value=missing)
             else:
                 result = numpy.ma.masked_values(ar, missing, copy=0)
         elif ar is numpy.ma.masked:
-            return ar  
-        else: # scalar, but it might be the missing value
+            return ar
+        else:  # scalar, but it might be the missing value
             missing = self.getMissing()
             if missing is None:
-                return ar #scalar
+                return ar  # scalar
             else:
                 result = numpy.ma.masked_values(ar, missing, copy=0)
 
         squoze = 0
         if squeeze:
             n = 1
-            newshape=[]
+            newshape = []
             for s in result.shape:
-               if s == 1: 
-                   squoze = 1
-                   continue
-               else:
-                   n = n * s
-                   newshape.append(s)
+                if s == 1:
+                    squoze = 1
+                    continue
+                else:
+                    n = n * s
+                    newshape.append(s)
         elif singles is not None:
             n = 1
-            newshape=[]
+            newshape = []
             oldshape = result.shape
             for i in range(len(oldshape)):
-               if i in singles: 
-                   squoze = 1
-                   continue
-               else:
-                   s = oldshape[i]
-                   n = n * s
-                   newshape.append(s)
-            
+                if i in singles:
+                    squoze = 1
+                    continue
+                else:
+                    s = oldshape[i]
+                    n = n * s
+                    newshape.append(s)
+
         else:
             n = numpy.ma.size(result)
         if n == 1 and squeeze:
-            return numpy.ma.ravel(result)[0] # scalar or masked
+            return numpy.ma.ravel(result)[0]  # scalar or masked
         if squoze:
             result.shape = newshape
         return result
 
     def generateGridkey(self, convention, vardict):
-        """ generateGridkey(): Determine if the variable is gridded, 
+        """ generateGridkey(): Determine if the variable is gridded,
             and generate ((latname, lonname, order, maskname, class), lat, lon) if gridded,
             or (None, None, None) if not gridded. vardict is the variable dictionary of the parent"""
 
         lat, nlat = convention.getVarLatId(self, vardict)
         lon, nlon = convention.getVarLonId(self, vardict)
         if (lat is not None) and (lat is lon):
-            raise CDMSError, "Axis %s is both a latitude and longitude axis! Check standard_name and/or axis attributes."%lat.id
+            raise CDMSError(
+                "Axis %s is both a latitude and longitude axis! Check standard_name and/or axis attributes." %
+                lat.id)
 
         # Check for 2D grid
         if (lat is None) or (lon is None):
             return None, lat, lon
 
         # Check for a rectilinear grid
-        if isinstance(lat, AbstractAxis) and isinstance(lon, AbstractAxis) and (lat.rank()==lon.rank()==1):
+        if isinstance(lat, AbstractAxis) and isinstance(lon, AbstractAxis) and (lat.rank() == lon.rank() == 1):
             return self.generateRectGridkey(lat, lon), lat, lon
 
         # Check for a curvilinear grid:
-        if lat.rank()==lon.rank()==2:
+        if lat.rank() == lon.rank() == 2:
 
             # check that they are defined on the same indices as self
             vardomain = self.getAxisIds()
@@ -258,7 +268,7 @@ class AbstractVariable(CdmsObj, Slab):
                     if axisid not in vardomain:
                         allok = 0
                         break
-            
+
             # It's a curvilinear grid
             if allok:
                 if hasattr(lat, 'maskid'):
@@ -268,7 +278,7 @@ class AbstractVariable(CdmsObj, Slab):
                 return (lat.id, lon.id, 'yx', maskid, 'curveGrid'), lat, lon
 
         # Check for a generic grid:
-        if lat.rank()==lon.rank()==1:
+        if lat.rank() == lon.rank() == 1:
 
             # check that they are defined on the same indices as self
             vardomain = self.getAxisIds()
@@ -282,7 +292,7 @@ class AbstractVariable(CdmsObj, Slab):
                     if axisid not in vardomain:
                         allok = 0
                         break
-            
+
             # It's a generic grid
             if allok:
                 if hasattr(lat, 'maskid'):
@@ -307,12 +317,14 @@ class AbstractVariable(CdmsObj, Slab):
                 ilat = k
             k += 1
 
-        if ilat==-1:
-            raise CDMSError, "Cannot find latitude axis; check standard_name and/or axis attributes"
-        if ilon==-1:
-            raise CDMSError, "Cannot find longitude axis; check standard_name and/or axis attributes"
+        if ilat == -1:
+            raise CDMSError(
+                "Cannot find latitude axis; check standard_name and/or axis attributes")
+        if ilon == -1:
+            raise CDMSError(
+                "Cannot find longitude axis; check standard_name and/or axis attributes")
 
-        if ilat<ilon:
+        if ilat < ilon:
             order = "yx"
         else:
             order = "xy"
@@ -331,12 +343,14 @@ class AbstractVariable(CdmsObj, Slab):
             alist = [d[0] for d in self.getDomain()]
             gridok = grid.checkAxes(alist)
         if not gridok:
-            raise CDMSError, "grid does not match axes for variable %s"%self.id
+            raise CDMSError(
+                "grid does not match axes for variable %s" %
+                self.id)
         self._grid_ = grid
 
-    def getDomain (self):
+    def getDomain(self):
         "Get the list of axes"
-        raise CDMSError, "getDomain not overriden in child"
+        raise CDMSError("getDomain not overriden in child")
 
     def getConvention(self):
         "Get the metadata convention associated with this object."
@@ -345,14 +359,15 @@ class AbstractVariable(CdmsObj, Slab):
         else:
             result = CF1
         return result
-            
+
 # A child class may want to override this
     def getAxis(self, n):
         "Get the n-th axis"
-        if n < 0: n = n + self.rank()
+        if n < 0:
+            n = n + self.rank()
         return self.getDomain()[n][0]
 
-    def getAxisIndex (self, axis_spec):
+    def getAxisIndex(self, axis_spec):
         """Return the index of the axis specificed by axis_spec.
          Argument axis_spec and be as for axisMatches
          Return -1 if no match.
@@ -362,7 +377,7 @@ class AbstractVariable(CdmsObj, Slab):
                 return i
         return -1
 
-    def getAxisListIndex (self, axes=None, omit=None, order=None):
+    def getAxisListIndex(self, axes=None, omit=None, order=None):
         """Return a list of indices of axis objects;
            If axes is not None, include only certain axes.
            less the ones specified in omit. If axes is None,
@@ -371,15 +386,15 @@ class AbstractVariable(CdmsObj, Slab):
         """
         return axisMatchIndex(self.getAxisList(), axes, omit, order)
 
-    def getAxisList(self, axes = None, omit=None, order=None):
-        """Get the list of axis objects; 
+    def getAxisList(self, axes=None, omit=None, order=None):
+        """Get the list of axis objects;
            If axes is not None, include only certain axes.
            If omit is not None, omit those specified by omit.
            Arguments omit or axes  may be as specified in axisMatchAxis
            order is an optional string determining the output order
         """
         alist = [d[0] for d in self.getDomain()]
-        return axisMatchAxis (alist, axes, omit, order)
+        return axisMatchAxis(alist, axes, omit, order)
 
     def getAxisIds(self):
         "Get a list of axis identifiers"
@@ -397,12 +412,12 @@ class AbstractVariable(CdmsObj, Slab):
         except:
             mv = self.missing_value
 
-        if mv is None and hasattr(self,'_FillValue'):
+        if mv is None and hasattr(self, '_FillValue'):
             mv = self._FillValue
-            
-        if asarray==0 and isinstance(mv, numpy.ndarray):
+
+        if asarray == 0 and isinstance(mv, numpy.ndarray):
             mv = mv[0]
-        if isinstance(mv, basestring) and self.dtype.char not in ['?','c','O','S']:
+        if isinstance(mv, basestring) and self.dtype.char not in ['?', 'c', 'O', 'S']:
             mv = float(mv)
         return mv
 
@@ -419,7 +434,7 @@ class AbstractVariable(CdmsObj, Slab):
         if value is None:
             self._basic_set('missing_value', value)
             return
-            
+
         selftype = self.typecode()
         if isnstance(value, numpy.ndarray):
             value = value.astype(selftype).item()
@@ -429,14 +444,15 @@ class AbstractVariable(CdmsObj, Slab):
             try:
                 value = numpy.array([value], selftype)
             except:                     # Set fill value when ar[i:j] returns a masked value
-                value = numpy.array([numpy.ma.default_fill_value(self)], selftype)
-        elif isinstance(value,(basestring,numpy.string_,numpy.str,numpy.string0,numpy.str_)) and selftype in ['?','c','O','S']: # '?' for Boolean and object
+                value = numpy.array(
+                    [numpy.ma.default_fill_value(self)],
+                    selftype)
+        elif isinstance(value, (basestring, numpy.string_, numpy.str, numpy.string0, numpy.str_)) and selftype in ['?', 'c', 'O', 'S']:  # '?' for Boolean and object
             pass
         else:
-            raise CDMSError, 'Invalid missing value %s'%`value`
-        
-        self.missing_value = value
+            raise CDMSError('Invalid missing value %s' % repr(value))
 
+        self.missing_value = value
 
     def getTime(self):
         "Get the first time dimension, or None if not found"
@@ -457,11 +473,12 @@ class AbstractVariable(CdmsObj, Slab):
                 break
         else:
             return None
+
     def getForecast(self):
         return self.getForecastTime()
 
     def getLevel(self):
-        """Get the first vertical level dimension in the domain, 
+        """Get the first vertical level dimension in the domain,
            or None if not found.
         """
         for k in range(self.rank()):
@@ -479,7 +496,7 @@ class AbstractVariable(CdmsObj, Slab):
             result = grid.getLatitude()
         else:
             result = None
-            
+
         if result is None:
             for k in range(self.rank()):
                 result = self.getAxis(k)
@@ -487,7 +504,7 @@ class AbstractVariable(CdmsObj, Slab):
                     break
             else:
                 result = None
-                
+
         return result
 
     def getLongitude(self):
@@ -497,7 +514,7 @@ class AbstractVariable(CdmsObj, Slab):
             result = grid.getLongitude()
         else:
             result = None
-            
+
         if result is None:
             for k in range(self.rank()):
                 result = self.getAxis(k)
@@ -505,9 +522,8 @@ class AbstractVariable(CdmsObj, Slab):
                     break
             else:
                 result = None
-                
-        return result
 
+        return result
 
     # Get an order string, such as "tzyx"
     def getOrder(self, ids=0):
@@ -515,12 +531,12 @@ class AbstractVariable(CdmsObj, Slab):
 
          if ids == 0 (the default) for an axis that is not t,z,x,y
          the order string will contain a '-' in that location.
-         The result string will be of the same length as the number 
+         The result string will be of the same length as the number
          of axes. This makes it easy to loop over the dimensions.
 
          if ids == 1 those axes will be represented in the order
          string as (id) where id is that axis' id. The result will
-         be suitable for passing to order2index to get the 
+         be suitable for passing to order2index to get the
          corresponding axes, and to orderparse for dividing up into
          components.
         """
@@ -528,50 +544,56 @@ class AbstractVariable(CdmsObj, Slab):
         for k in range(self.rank()):
             axis = self.getAxis(k)
             if axis.isLatitude():
-                order = order+"y"
+                order = order + "y"
             elif axis.isLongitude():
-                order = order+"x"
+                order = order + "x"
             elif axis.isLevel():
-                order = order+"z"
+                order = order + "z"
             elif axis.isTime():
-                order = order+"t"
+                order = order + "t"
             elif ids:
                 order = order + '(' + axis.id + ')'
             else:
                 order = order + "-"
         return order
 
-    def subSlice (self, *specs, **keys):
-        speclist = self._process_specs (specs, keys)
-        numericSqueeze = keys.get('numericSqueeze',0)
+    def subSlice(self, *specs, **keys):
+        speclist = self._process_specs(specs, keys)
+        numericSqueeze = keys.get('numericSqueeze', 0)
 
         # Get a list of single-index specs
         if numericSqueeze:
             singles = self._single_specs(specs)
         else:
             singles = None
-        slicelist = self.specs2slices(speclist,force=1)
-        d = self.expertSlice (slicelist)
-        squeeze = keys.get ('squeeze', 0)
-        raw = keys.get('raw',0)
+        slicelist = self.specs2slices(speclist, force=1)
+        d = self.expertSlice(slicelist)
+        squeeze = keys.get('squeeze', 0)
+        raw = keys.get('raw', 0)
         order = keys.get('order', None)
         grid = keys.get('grid', None)
-        forceaxes = keys.get('forceaxes', None) # Force result to have these axes
-        raweasy = raw==1 and order is None and grid is None
+        forceaxes = keys.get(
+            'forceaxes',
+            None)  # Force result to have these axes
+        raweasy = raw == 1 and order is None and grid is None
         if not raweasy:
             if forceaxes is None:
                 axes = []
-                allaxes = [None]*self.rank()
+                allaxes = [None] * self.rank()
                 for i in range(self.rank()):
-                   slice = slicelist[i]
-                   if squeeze and numpy.ma.size(d, i) == 1:
-                       continue
-                   elif numericSqueeze and i in singles:
-                       continue
-                   # Don't wrap square-bracket slices
-                   axis = self.getAxis(i).subaxis(slice.start, slice.stop, slice.step, wrap=(numericSqueeze==0))
-                   axes.append(axis)
-                   allaxes[i] = axis
+                    slice = slicelist[i]
+                    if squeeze and numpy.ma.size(d, i) == 1:
+                        continue
+                    elif numericSqueeze and i in singles:
+                        continue
+                    # Don't wrap square-bracket slices
+                    axis = self.getAxis(
+                        i).subaxis(slice.start,
+                                   slice.stop,
+                                   slice.step,
+                                   wrap=(numericSqueeze == 0))
+                    axes.append(axis)
+                    allaxes[i] = axis
             else:
                 axes = forceaxes
 
@@ -582,42 +604,46 @@ class AbstractVariable(CdmsObj, Slab):
                 resultgrid = None
             else:
                 alist = [item[0] for item in self.getDomain()]
-                gridslices, newaxes = selfgrid.getGridSlices(alist, allaxes, slicelist)
+                gridslices, newaxes = selfgrid.getGridSlices(
+                    alist, allaxes, slicelist)
 
                 # If one of the grid axes was squeezed, the result grid is None
                 if None in newaxes:
                     resultgrid = None
                 else:
-                    resultgrid = apply(selfgrid.subSlice, gridslices, {'forceaxes': newaxes})
+                    resultgrid = selfgrid.subSlice(
+                        *gridslices,
+                        **{'forceaxes': newaxes})
 
         resultArray = self._returnArray(d, squeeze, singles=singles)
         if self.isEncoded():
-            resultArray  = self.decode(resultArray)
+            resultArray = self.decode(resultArray)
             newmissing = resultArray.fill_value
         else:
             newmissing = self.getMissing()
 
         if raweasy:
             return resultArray
-        elif len(axes)>0:
+        elif len(axes) > 0:
 
             # If forcing use of input axes, make sure they are not copied.
-            # Same if the grid is not rectilinear - this is when forceaxes is set.
+            # Same if the grid is not rectilinear - this is when forceaxes is
+            # set.
             copyaxes = (forceaxes is None) and (resultgrid is None)
-            result = TransientVariable(resultArray, 
-                                     copy=0,
-                                     fill_value = newmissing,
-                                     axes=axes,
-                                     copyaxes = copyaxes,
-                                     grid = resultgrid,
-                                     attributes=self.attributes,
-                                     id = self.id)
+            result = TransientVariable(resultArray,
+                                       copy=0,
+                                       fill_value=newmissing,
+                                       axes=axes,
+                                       copyaxes=copyaxes,
+                                       grid=resultgrid,
+                                       attributes=self.attributes,
+                                       id=self.id)
             if grid is not None:
                 order2 = grid.getOrder()
                 if order is None:
                     order = order2
                 elif order != order2:
-                    raise CDMSError, 'grid, order options not compatible.'
+                    raise CDMSError('grid, order options not compatible.')
             result = result.reorder(order).regrid(grid)
             if raw == 0:
                 return result
@@ -627,7 +653,7 @@ class AbstractVariable(CdmsObj, Slab):
         else:               # Return numpy.ma for zero rank, so that __cmp__ works.
             return resultArray
 
-    def getSlice (self, *specs, **keys):
+    def getSlice(self, *specs, **keys):
         """x.getSlice takes arguments of the following forms and produces
            a return array. The keyword argument squeeze determines whether
            or not the shape of the returned array contains dimensions whose
@@ -652,21 +678,21 @@ class AbstractVariable(CdmsObj, Slab):
            of that dimension, as in normal Python indexing.
         """
         # Turn on squeeze and raw options by default.
-        keys['numericSqueeze'] = keys.get('numericSqueeze',0)
-        keys['squeeze'] = keys.get('squeeze',1-keys['numericSqueeze'])
-        keys['raw'] = keys.get('raw',1)
+        keys['numericSqueeze'] = keys.get('numericSqueeze', 0)
+        keys['squeeze'] = keys.get('squeeze', 1 - keys['numericSqueeze'])
+        keys['raw'] = keys.get('raw', 1)
         keys['order'] = keys.get('order', None)
         keys['grid'] = keys.get('grid', None)
         isitem = keys.get('isitem', 0)
         result = self.subSlice(*specs, **keys)
 
         # return a scalar for 0-D slices
-        if isitem and result.size==1 and (not _numeric_compatibility) and not result.mask.item():
+        if isitem and result.size == 1 and (not _numeric_compatibility) and not result.mask.item():
             result = result.item()
         return result
 
     def expertSlice(self, slicelist):
-        raise CDMSError, NotImplemented + 'expertSlice'
+        raise CDMSError(NotImplemented + 'expertSlice')
 
     def getRegion(self, *specs, **keys):
         """getRegion
@@ -702,65 +728,67 @@ class AbstractVariable(CdmsObj, Slab):
         """
 
         # By default, squeeze and raw options are on
-        keys['squeeze'] = keys.get ('squeeze', 1)
-        keys['raw'] = keys.get('raw',1)
+        keys['squeeze'] = keys.get('squeeze', 1)
+        keys['raw'] = keys.get('raw', 1)
         keys['order'] = keys.get('order', None)
         keys['grid'] = keys.get('grid', None)
         return self.subRegion(*specs, **keys)
 
-    def subRegion (self, *specs, **keys):
+    def subRegion(self, *specs, **keys):
 
-        speclist = self._process_specs (specs, keys)
-        slicelist = self.reg_specs2slices (speclist)
+        speclist = self._process_specs(specs, keys)
+        slicelist = self.reg_specs2slices(speclist)
 
-        squeeze = keys.get ('squeeze', 0)
-        raw = keys.get('raw',0)
+        squeeze = keys.get('squeeze', 0)
+        raw = keys.get('raw', 0)
         order = keys.get('order', None)
         grid = keys.get('grid', None)
-        raweasy = raw==1 and order is None and grid is None
+        raweasy = raw == 1 and order is None and grid is None
         if grid is not None and order is None:
             order = grid.getOrder()
 
-
         # Check if any slice wraps around.
 
         wrapdim = -1
-        
+
         axes = []
 
         circulardim = None
-        
+
         for idim in range(len(slicelist)):
             item = slicelist[idim]
             axis = self.getAxis(idim)
             axislen = len(axis)
 
-            if(axis.isCircular()): circulardim=idim
+            if(axis.isCircular()):
+                circulardim = idim
 
-            wraptest1 = ( axis.isCircular() and speclist[idim] != unspecified)
+            wraptest1 = (axis.isCircular() and speclist[idim] != unspecified)
             start, stop = item.start, item.stop
-            wraptest2 = not ((start is None or (0<=start<axislen)) and (stop is None or (0<=stop<=axislen)))
+            wraptest2 = not ((start is None or (0 <= start < axislen)) and (
+                stop is None or (0 <= stop <= axislen)))
 
-            if ( wraptest1 and wraptest2):
+            if (wraptest1 and wraptest2):
                 if wrapdim >= 0:
-                    raise CDMSError, "Too many dimensions wrap around."
+                    raise CDMSError("Too many dimensions wrap around.")
                 wrapdim = idim
                 break
-                    
+
         else:
 
             # No wraparound, just read the data
 
-            # redo the speclist -> slice if passed circular test but not wrapped test
+            # redo the speclist -> slice if passed circular test but not
+            # wrapped test
 
             if(circulardim is not None):
-                slicelist = self.reg_specs2slices (speclist,force=circulardim)
-                
-            d = {'raw':raw, 
-                 'squeeze':squeeze,
-                 'order':order,
-                 'grid':grid,
-                }
+                slicelist = self.reg_specs2slices(speclist, force=circulardim)
+
+            d = {'raw': raw,
+                 'squeeze': squeeze,
+                 'order': order,
+                 'grid': grid,
+                 }
             return self.subSlice(*slicelist, **d)
 
         #
@@ -775,11 +803,11 @@ class AbstractVariable(CdmsObj, Slab):
         # shift the wrap slice to the positive side and calc number of cycles shifted
         #
 
-        wb=wrapslice.start
-        we=wrapslice.stop
-        ws=wrapslice.step
-        size=length
-        cycle=self.getAxis(wrapdim).getModulo()
+        wb = wrapslice.start
+        we = wrapslice.stop
+        ws = wrapslice.step
+        size = length
+        cycle = self.getAxis(wrapdim).getModulo()
 
         #
         # ncycle:
@@ -789,92 +817,93 @@ class AbstractVariable(CdmsObj, Slab):
         # ncyclesrev:
         #    resetting the world coordinate for reversed direction
         #
-        
-        ncycles=0
-        ncyclesrev=0
-
-        if(ws>0):
-
-            if(wb>0):
-                ncycles=1
-                while(wb>=0):
-                    wb=wb-size
-                    we=we-size
-                    ncycles=ncycles-1
+
+        ncycles = 0
+        ncyclesrev = 0
+
+        if(ws > 0):
+
+            if(wb > 0):
+                ncycles = 1
+                while(wb >= 0):
+                    wb = wb - size
+                    we = we - size
+                    ncycles = ncycles - 1
             else:
-                ncycles=0
-                while(wb<0):
-                    wb=wb+size
-                    we=we+size
-                    ncycles=ncycles+1
-                    
+                ncycles = 0
+                while(wb < 0):
+                    wb = wb + size
+                    we = we + size
+                    ncycles = ncycles + 1
+
             if(wb < 0):
-                wb=wb+size
-                we=we+size
-                
+                wb = wb + size
+                we = we + size
+
         #  reversed direction
-        
+
         else:
 
             # do the ncycles for resetting world coordinate
-            wbrev=wb
-            werev=we
-            werevNoneTest=0
+            wbrev = wb
+            werev = we
+            werevNoneTest = 0
             if(werev is None):
-                werev=0
-                werevNoneTest=1
+                werev = 0
+                werevNoneTest = 1
 
-            ncycleRevStart=1
+            ncycleRevStart = 1
             if(wbrev > 0):
-                ncyclesrev=ncycleRevStart
-                while(wbrev>=0):
-                    wbrev=wbrev-size
-                    werev=werev-size
-                    ncyclesrev=ncyclesrev-1
+                ncyclesrev = ncycleRevStart
+                while(wbrev >= 0):
+                    wbrev = wbrev - size
+                    werev = werev - size
+                    ncyclesrev = ncyclesrev - 1
             else:
-                ncyclesrev=0
-                while(wbrev<0):
-                    wbrev=wbrev+size
-                    werev=werev+size
-                    ncyclesrev=ncyclesrev+1
+                ncyclesrev = 0
+                while(wbrev < 0):
+                    wbrev = wbrev + size
+                    werev = werev + size
+                    ncyclesrev = ncyclesrev + 1
 
             while(werev < 0):
-                wbrev=wbrev+size
-                werev=werev+size
+                wbrev = wbrev + size
+                werev = werev + size
 
             # number of cycles to make the slice positive
-            while( we<0 and we != None ):
-                wb=wb+size
-                we=we+size
-                ncycles=ncycles+1
-
-            wb=wbrev
-            we=werev
-            if(werevNoneTest): we=None
-            
-        wrapslice=slice(wb,we,ws)
-        
+            while(we < 0 and we is not None):
+                wb = wb + size
+                we = we + size
+                ncycles = ncycles + 1
+
+            wb = wbrev
+            we = werev
+            if(werevNoneTest):
+                we = None
+
+        wrapslice = slice(wb, we, ws)
+
         #
         #  calc the actual positive slices and create data array
         #
 
-        donew=1
+        donew = 1
 
         if(donew):
 
             wraps = splitSliceExt(wrapslice, length)
 
-            for kk in range(0,len(wraps)):
-                sl=wraps[kk]
-                
+            for kk in range(0, len(wraps)):
+                sl = wraps[kk]
+
                 slicelist[wrapdim] = sl
 
                 if(kk == 0):
                     ar1 = self.getSlice(squeeze=0, *slicelist)
-                    result=ar1
+                    result = ar1
                 else:
                     ar2 = self.getSlice(squeeze=0, *slicelist)
-                    result = numpy.ma.concatenate((result,ar2),axis=wrapdim)
+                    result = numpy.ma.concatenate((result, ar2), axis=wrapdim)
 
         else:
 
@@ -883,8 +912,7 @@ class AbstractVariable(CdmsObj, Slab):
             ar1 = self.getSlice(squeeze=0, *slicelist)
             slicelist[wrapdim] = wrap2
             ar2 = self.getSlice(squeeze=0, *slicelist)
-            result = numpy.ma.concatenate((ar1,ar2),axis=wrapdim)
-
+            result = numpy.ma.concatenate((ar1, ar2), axis=wrapdim)
 
         if raweasy:
             return self._returnArray(result, squeeze)
@@ -895,26 +923,28 @@ class AbstractVariable(CdmsObj, Slab):
         #
         #----------------------------------------------------------------------
 
-        wrapspec=speclist[wrapdim]
-        
+        wrapspec = speclist[wrapdim]
+
         axes = []
         for i in range(self.rank()):
-            if squeeze and numpy.ma.size(result, i) == 1: continue
+            if squeeze and numpy.ma.size(result, i) == 1:
+                continue
 
             sl = slicelist[i]
 
             if i == wrapdim:
 
                 axis = self.getAxis(i).subAxis(wb, we, ws)
-                
+
                 if(ws > 0):
-                    delta_beg_wrap_dimvalue = ncycles*cycle
+                    delta_beg_wrap_dimvalue = ncycles * cycle
                 else:
-                    delta_beg_wrap_dimvalue = ncyclesrev*cycle
+                    delta_beg_wrap_dimvalue = ncyclesrev * cycle
 
                 axis.setBounds(axis.getBounds() - delta_beg_wrap_dimvalue)
-                
-                axis[:]= (axis[:] - delta_beg_wrap_dimvalue).astype(axis.typecode())
+
+                axis[:] = (axis[:] - delta_beg_wrap_dimvalue).astype(
+                    axis.typecode())
 
             else:
                 axis = self.getAxis(i).subaxis(sl.start, sl.stop, sl.step)
@@ -922,18 +952,18 @@ class AbstractVariable(CdmsObj, Slab):
 
         result = self._returnArray(result, squeeze)
         result = TransientVariable(result,
-                                 copy=0, 
-                                 fill_value = self.missing_value,
-                                 axes=axes,
-                                 attributes=self.attributes,
-                                 id = self.id)
+                                   copy=0,
+                                   fill_value=self.missing_value,
+                                   axes=axes,
+                                   attributes=self.attributes,
+                                   id=self.id)
         if grid is not None:
             order2 = grid.getOrder()
             if order is None:
                 order = order2
             elif order != order2:
-                raise CDMSError, 'grid, order options not compatible.'
-            
+                raise CDMSError('grid, order options not compatible.')
+
         result = result.reorder(order).regrid(grid)
         if raw == 0:
             return result
@@ -943,22 +973,22 @@ class AbstractVariable(CdmsObj, Slab):
     def getValue(self, squeeze=1):
         """Return the entire set of values."""
         return self.getSlice(Ellipsis, squeeze=squeeze)
-    
-    def assignValue(self,data):
-        raise CDMSError, NotImplemented + 'assignValue'
 
-    def reorder (self, order):
+    def assignValue(self, data):
+        raise CDMSError(NotImplemented + 'assignValue')
+
+    def reorder(self, order):
         """return self reordered per the specification order"""
-        if order is None: 
+        if order is None:
             return self
         axes = self.getAxisList()
         permutation = order2index(axes, order)
         if permutation == range(len(axes)):
             return self
-        return MV.transpose (self, permutation)
+        return MV.transpose(self, permutation)
 
-    def regrid (self, togrid, missing=None, order=None, mask=None, **keywords):
-        """return self regridded to the new grid.  
+    def regrid(self, togrid, missing=None, order=None, mask=None, **keywords):
+        """return self regridded to the new grid.
         One can use the regrid2.Regridder optional arguments as well.
 
         Example:
@@ -973,48 +1003,49 @@ class AbstractVariable(CdmsObj, Slab):
         @param keywords optional keyword arguments dependent on regridTool
         @return regridded variable
         """
-        # there is a circular dependency between cdms2 and regrid2. In 
+        # there is a circular dependency between cdms2 and regrid2. In
         # principle, cdms2 files should not import regrid2, we're bending
         # rules here...
         import regrid2
         from regrid2 import Horizontal
 
-        if togrid is None: 
+        if togrid is None:
             return self
         else:
 
-            fromgrid = self.getGrid() # this returns the horizontal grid only
+            fromgrid = self.getGrid()  # this returns the horizontal grid only
 
             # default w/o bounds
-            regridTool = 'libcf'   
+            regridTool = 'libcf'
             regridMethod = 'linear'
 
-            if self.getAxis(-1).attributes.has_key('topology'):
+            if 'topology' in self.getAxis(-1).attributes:
                 if self.getAxis(-1).attributes['topology'] == 'circular':
                     # for the ESMF regridders
-                    keywords['periodicity'] = guessPeriodicity(self.getAxis(-1).getBounds())
+                    keywords['periodicity'] = guessPeriodicity(
+                        self.getAxis(-1).getBounds())
                     keywords['mkCyclic'] = 1    # for LibCF regridder
 
             # check if there are bounds and we have esmf
-            if fromgrid.getBounds() is not None and hasattr(regrid2,"ESMFRegrid"):
+            if fromgrid.getBounds() is not None and hasattr(regrid2, "ESMFRegrid"):
                 regridTool = 'esmf'
                 regridMethod = 'linear'
                 # Hum ok if only 1 longitude regrid fails, let's check
-                if len(togrid.getLongitude())==1:
-                  # esmf can't deal with this
-                  regridTool   = "regrid2"
+                if len(togrid.getLongitude()) == 1:
+                    # esmf can't deal with this
+                    regridTool = "regrid2"
 
             # let user override
             userSpecifiesMethod = False
             for rm in 'rm', 'method', 'regridmethod', 'regrid_method', 'regridMethod':
-                if keywords.has_key(rm):
+                if rm in keywords:
                     regridMethod = keywords[rm]
                     del keywords[rm]
                     userSpecifiesMethod = True
 
             userSpecifiesTool = False
             for rt in 'rt', 'tool', 'regridtool', 'regrid_tool', 'regridTool':
-                if keywords.has_key(rt):
+                if rt in keywords:
                     regridTool = keywords[rt]
                     del keywords[rt]
                     userSpecifiesTool = True
@@ -1027,8 +1058,8 @@ class AbstractVariable(CdmsObj, Slab):
 
             # make sure the tool can do it
             if re.search('^regrid', regridTool, re.I) is not None and \
-                    (  len(fromgrid.getLatitude().shape) > 1 or \
-                         len(togrid.getLatitude().shape) > 1  ):
+                    (len(fromgrid.getLatitude().shape) > 1 or
+                     len(togrid.getLatitude().shape) > 1):
                 message = """
 avariable.regrid: regrid2 cannot do curvilinear, will switch to esmf..."
                 """
@@ -1038,7 +1069,7 @@ avariable.regrid: regrid2 cannot do curvilinear, will switch to esmf..."
             if re.search('esmf', regridTool, re.I):
                 # make sure source grids have bounds
                 haveBounds = True
-                for g in fromgrid,:
+                for g in fromgrid, :
                     for c in g.getLatitude(), g.getLongitude():
                         haveBounds &= (c.getBounds() is not None)
                 if not haveBounds:
@@ -1048,19 +1079,18 @@ avariable.regrid: regridTool = 'esmf' requires bounds for source grid, will swit
                     warnings.warn(message, Warning)
                     regridTool = 'libcf'
                     regridMethod = 'linear'
-                if not hasattr(regrid2,"ESMFRegrid"):
-                  message = """
+                if not hasattr(regrid2, "ESMFRegrid"):
+                    message = """
 avariable.regrid: regridTool = 'esmf' but your version does not seems to be built with esmf, will switch to regridTool = 'libcf'
                   """
-                  warnings.warn(message, Warning)
-                  regridTool = 'libcf'
-                  regridMethod = 'linear'
-
+                    warnings.warn(message, Warning)
+                    regridTool = 'libcf'
+                    regridMethod = 'linear'
 
             if re.search('conserv', regridMethod, re.I):
                 # make sure destination grid has bounds
                 haveBounds = True
-                for g in togrid,:
+                for g in togrid, :
                     for c in g.getLatitude(), g.getLongitude():
                         haveBounds &= (c.getBounds() is not None)
                 if not haveBounds:
@@ -1074,47 +1104,48 @@ avariable.regrid: regridMethod = 'conserve' requires bounds for destination grid
                 message = """
 avariable.regrid: We chose regridTool = %s for you among the following choices:
    Tools ->    'regrid2' (old behavior)
-               'esmf' (conserve, patch, linear) or 
+               'esmf' (conserve, patch, linear) or
                'libcf' (linear)""" % regridTool
                 warnings.warn(message, Warning)
 
             if not userSpecifiesMethod and re.search('^regrid', regridTool, re.I) is None:
                 message = """
-avariable.regrid: We chose regridMethod = %s for you among the following choices: 
+avariable.regrid: We chose regridMethod = %s for you among the following choices:
     'conserve' or 'linear' or 'patch'""" % regridMethod
                 warnings.warn(message, Warning)
 
             if re.search('^regrid', regridTool, re.I):
-                if keywords.has_key('diag') and \
+                if 'diag' in keywords and \
                         isinstance(keywords['diag'], dict):
                     keywords['diag']['regridTool'] = 'regrid'
 
                 # the original cdms2 regridder
                 regridf = Horizontal(fromgrid, togrid)
-                return regridf(self, missing=missing, order=order, 
+                return regridf(self, missing=missing, order=order,
                                mask=mask, **keywords)
 
             # emsf or libcf...
 
             srcGridMask = None
             # set the source mask if a mask is defined with the source data
-            if numpy.any(self.mask == True):
+            if numpy.any(self.mask):
                 srcGridMask = getMinHorizontalMask(self)
 
             # compute the interpolation weights
-            ro = CdmsRegrid(fromgrid, togrid, 
-                            dtype = self.dtype,
-                            regridMethod = regridMethod,
-                            regridTool = regridTool,
-                            srcGridMask = srcGridMask, 
-                            srcGridAreas = None,
-                            dstGridMask = None,
-                            dstGridAreas = None,
+            ro = CdmsRegrid(fromgrid, togrid,
+                            dtype=self.dtype,
+                            regridMethod=regridMethod,
+                            regridTool=regridTool,
+                            srcGridMask=srcGridMask,
+                            srcGridAreas=None,
+                            dstGridMask=None,
+                            dstGridAreas=None,
                             **keywords)
             # now interpolate
             return ro(self, **keywords)
 
-    def pressureRegrid (self, newLevel, missing=None, order=None, method="log"):
+    def pressureRegrid(
+            self, newLevel, missing=None, order=None, method="log"):
         """Return the variable regridded to new pressure levels.
         The variable should be a function of lat, lon, pressure, and (optionally) time.
         <newLevel> is an axis of the result pressure levels.
@@ -1126,12 +1157,13 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
 
         fromlevel = self.getLevel()
         if fromlevel is None:
-            raise CDMSError, 'No pressure level'
+            raise CDMSError('No pressure level')
         pregridf = PressureRegridder(fromlevel, newLevel)
         result = pregridf(self, missing=missing, order=order, method=method)
         return result
 
-    def crossSectionRegrid(self, newLevel, newLatitude, missing=None, order=None, method="log"):
+    def crossSectionRegrid(
+            self, newLevel, newLatitude, missing=None, order=None, method="log"):
         """Return the variable regridded to new pressure levels and latitudes.
         The variable should be a function of lat, level, and (optionally) time.
         <newLevel> is an axis of the result pressure levels.
@@ -1145,14 +1177,18 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
         fromlevel = self.getLevel()
         fromlat = self.getLatitude()
         if fromlevel is None:
-            raise CDMSError, 'No pressure level'
+            raise CDMSError('No pressure level')
         if fromlat is None:
-            raise CDMSError, 'No latitude level'
-        xregridf = CrossSectionRegridder(fromlat, newLatitude, fromlevel, newLevel)
+            raise CDMSError('No latitude level')
+        xregridf = CrossSectionRegridder(
+            fromlat,
+            newLatitude,
+            fromlevel,
+            newLevel)
         result = xregridf(self, missing=missing, order=order, method=method)
         return result
 
-    def _process_specs (self, specs, keys):
+    def _process_specs(self, specs, keys):
         """Process the arguments for a getSlice, getRegion, etc.
            Returns an array of specifications for all dimensions.
            Any Ellipsis has been eliminated.
@@ -1163,36 +1199,39 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
         if Ellipsis in specs:
             nellipses = 1
         elif numpy.newaxis in specs:
-            raise CDMSError, 'Sorry, you cannot use NewAxis in this context ' + str(specs)
+            raise CDMSError(
+                'Sorry, you cannot use NewAxis in this context ' + str(specs))
         else:
             nellipses = 0
-        if nsupplied-nellipses > myrank:
-            raise CDMSError, InvalidRegion + \
-              "too many dimensions: %d, for variable %s"%(len(specs),self.id)
+        if nsupplied - nellipses > myrank:
+            raise CDMSError(InvalidRegion +
+                            "too many dimensions: %d, for variable %s" % (len(specs), self.id))
 
-        speclist = [unspecified]*myrank
+        speclist = [unspecified] * myrank
         i = 0
         j = 0
         while i < nsupplied:
             if specs[i] is Ellipsis:
-               j = myrank  - (nsupplied - (i+1)) 
+                j = myrank - (nsupplied - (i + 1))
             else:
-               speclist[j] = specs[i]
-               j = j + 1
+                speclist[j] = specs[i]
+                j = j + 1
             i = i + 1
 
         for k, v in keys.items():
-            if k in ['squeeze','raw','grid','order']: 
+            if k in ['squeeze', 'raw', 'grid', 'order']:
                 continue
             i = self.getAxisIndex(k)
             if i >= 0:
                 if speclist[i] is not unspecified:
-                    raise CDMSError, 'Conflict between specifier %s and %s'%(`speclist[i]`,`keys`)
+                    raise CDMSError(
+                        'Conflict between specifier %s and %s' %
+                        (repr(speclist[i]), repr(keys)))
                 speclist[i] = v
 
         return speclist
 
-    def _single_specs (self, specs):
+    def _single_specs(self, specs):
         """Return a list of dimension indices where the spec is an index."""
         myrank = self.rank()
         nsupplied = len(specs)
@@ -1201,7 +1240,7 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
         singles = []
         while i < nsupplied:
             if specs[i] is Ellipsis:
-                j = myrank  - (nsupplied - (i+1)) 
+                j = myrank - (nsupplied - (i + 1))
             else:
                 if isinstance(specs[i], int):
                     singles.append(j)
@@ -1209,7 +1248,7 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
             i = i + 1
         return singles
 
-    def specs2slices (self, speclist, force=None):
+    def specs2slices(self, speclist, force=None):
         """Create an equivalent list of slices from an index specification
            An index specification is a list of acceptable items, which are
            -- an integer
@@ -1220,22 +1259,22 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
            The size of the speclist must be self.rank()
         """
         if len(speclist) != self.rank():
-            raise CDMSError, "Incorrect length of speclist in specs2slices."
+            raise CDMSError("Incorrect length of speclist in specs2slices.")
         slicelist = []
         for i in range(self.rank()):
             key = speclist[i]
             if isinstance(key, int):  # x[i]
-                slicelist.append (slice(key,key+1))
-            elif isinstance(key, slice): # x[i:j:k]
+                slicelist.append(slice(key, key + 1))
+            elif isinstance(key, slice):  # x[i:j:k]
                 slicelist.append(key)
             elif key is unspecified or key is None or key == ':':
-                slicelist.append (slice(0, len(self.getAxis(i))))
+                slicelist.append(slice(0, len(self.getAxis(i))))
             elif key is Ellipsis:
-                raise CDMSError, "Misuse of ellipsis in specification."
+                raise CDMSError("Misuse of ellipsis in specification.")
             elif isinstance(key, tuple):
                 slicelist.append(slice(*key))
             else:
-                raise CDMSError, 'invalid index: %s'% str(key)
+                raise CDMSError('invalid index: %s' % str(key))
         # Change default or negative start, stop to positive
         for i in range(self.rank()):
             axis = self.getAxis(i)
@@ -1246,86 +1285,106 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
             #
             # allow negative indices in a wrapped (isCircular() = 1) axis
             #
-            circular=(axis.isCircular() and force is None)
+            circular = (axis.isCircular() and force is None)
 
             altered = 0
-            if step is None: 
+            if step is None:
                 altered = 1
-                step=1
+                step = 1
 
-            if ( ( start is None or stop is None or start<0 or stop<0 ) and ( circular == 0 ) ):
+            if ((start is None or stop is None or start < 0 or stop < 0) and (circular == 0)):
                 altered = 1
                 adjustit = 1
-                if step>0:
-                    if start is None: 
-                        start=0
-                    if stop is None: 
-                        stop=length
-                    if start==-1 and stop==0:
-                        stop=length
+                if step > 0:
+                    if start is None:
+                        start = 0
+                    if stop is None:
+                        stop = length
+                    if start == -1 and stop == 0:
+                        stop = length
                 else:
-                    if start is None: 
-                        start=length-1
+                    if start is None:
+                        start = length - 1
                     if stop is None:
                         # stop=-1
                         adjustit = 0
-                if start<0: 
-                    start=start%length
-                if stop<0 and adjustit: 
-                    stop=stop%length
-            if altered: 
+                if start < 0:
+                    start = start % length
+                if stop < 0 and adjustit:
+                    stop = stop % length
+            if altered:
                 slicelist[i] = slice(start, stop, step)
         return slicelist
 
-    def reg_specs2slices(self, initspeclist,force=None):
+    def reg_specs2slices(self, initspeclist, force=None):
 
         # Don't use input to store return value
-        speclist=copy.copy(initspeclist)
+        speclist = copy.copy(initspeclist)
 
         for i in range(self.rank()):
             item = speclist[i]
             if isinstance(item, slice):
                 newitem = item
-            elif item==':' or item is None or item is unspecified:
+            elif item == ':' or item is None or item is unspecified:
                 axis = self.getAxis(i)
-                newitem = slice(0,len(axis))
+                newitem = slice(0, len(axis))
             elif isinstance(item, list) or \
-                 isinstance(item, tuple):
+                    isinstance(item, tuple):
                 axis = self.getAxis(i)
-                if len(item)==2:        # (start,end)
+                if len(item) == 2:        # (start,end)
                     indexInterval = axis.mapIntervalExt(item)
-                elif len(item)==3:      # (start,end,'xxx')
-                    coordInterval = (item[0],item[1])
-                    indexInterval = axis.mapIntervalExt(coordInterval,item[2])
-                elif len(item)==4:
-                    coordInterval = (item[0],item[1])
-                    indexInterval = axis.mapIntervalExt(coordInterval,item[2],item[3])
-                elif len(item)==5:
-                    coordInterval = (item[0],item[1])
-                    indexInterval = axis.mapIntervalExt(coordInterval,item[2],item[3],item[4])
-                elif len(item)==6:
-                    coordInterval = (item[0],item[1])
-                    indexInterval = axis.mapIntervalExt(coordInterval,item[2],item[3],item[4],item[5])
+                elif len(item) == 3:      # (start,end,'xxx')
+                    coordInterval = (item[0], item[1])
+                    indexInterval = axis.mapIntervalExt(coordInterval, item[2])
+                elif len(item) == 4:
+                    coordInterval = (item[0], item[1])
+                    indexInterval = axis.mapIntervalExt(
+                        coordInterval, item[2], item[3])
+                elif len(item) == 5:
+                    coordInterval = (item[0], item[1])
+                    indexInterval = axis.mapIntervalExt(
+                        coordInterval,
+                        item[2],
+                        item[3],
+                        item[4])
+                elif len(item) == 6:
+                    coordInterval = (item[0], item[1])
+                    indexInterval = axis.mapIntervalExt(
+                        coordInterval,
+                        item[2],
+                        item[3],
+                        item[4],
+                        item[5])
                 else:
-                    raise CDMSError, InvalidRegion + "invalid format for coordinate interval: %s"%str(item)
+                    raise CDMSError(
+                        InvalidRegion + "invalid format for coordinate interval: %s" %
+                        str(item))
                 if indexInterval is None:
-                    raise CDMSError, OutOfRange + str(item)
-                newitem = slice(indexInterval[0],indexInterval[1],indexInterval[2])
+                    raise CDMSError(OutOfRange + str(item))
+                newitem = slice(
+                    indexInterval[0],
+                    indexInterval[1],
+                    indexInterval[2])
             elif isinstance(item, (numpy.floating, float, numpy.integer, int, long, basestring)) or type(item) in CdtimeTypes:
                 axis = self.getAxis(i)
                 #
                 # default is 'ccn' in axis.mapIntervalExt
                 #
-                indexInterval = axis.mapIntervalExt((item,item))
+                indexInterval = axis.mapIntervalExt((item, item))
                 if indexInterval is None:
-                    raise CDMSError, OutOfRange + str(item)
-                newitem = slice(indexInterval[0],indexInterval[1],indexInterval[2])
+                    raise CDMSError(OutOfRange + str(item))
+                newitem = slice(
+                    indexInterval[0],
+                    indexInterval[1],
+                    indexInterval[2])
             else:
-                raise CDMSError, InvalidRegion + "invalid format for coordinate interval: %s"%str(item)
+                raise CDMSError(
+                    InvalidRegion + "invalid format for coordinate interval: %s" %
+                    str(item))
 
             speclist[i] = newitem
 
-        slicelist = self.specs2slices(speclist,force)
+        slicelist = self.specs2slices(speclist, force)
         return slicelist
 
     def _decodedType(self):
@@ -1340,7 +1399,7 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
 
     def isEncoded(self):
         "True iff self is represented as packed data."
-        return (hasattr(self,"scale_factor") or hasattr(self,"add_offset"))
+        return (hasattr(self, "scale_factor") or hasattr(self, "add_offset"))
 
     def decode(self, ar):
         "Decode compressed data. ar is a masked array, scalar, or numpy.ma.masked"
@@ -1348,18 +1407,20 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
         if hasattr(self, 'scale_factor'):
             scale_factor = self.scale_factor
         else:
-            scale_factor = numpy.array([1.0],resulttype)
-            
+            scale_factor = numpy.array([1.0], resulttype)
+
         if hasattr(self, 'add_offset'):
             add_offset = self.add_offset
         else:
-            add_offset = numpy.array([0.0],resulttype)
-            
+            add_offset = numpy.array([0.0], resulttype)
+
         if ar is not numpy.ma.masked:
-            result = scale_factor*ar + add_offset
-            if isinstance(result,numpy.ma.MaskedArray):
+            result = scale_factor * ar + add_offset
+            if isinstance(result, numpy.ma.MaskedArray):
                 result = result.astype(resulttype)
-                numpy.ma.set_fill_value(result, numpy.ma.default_fill_value(0.))
+                numpy.ma.set_fill_value(
+                    result,
+                    numpy.ma.default_fill_value(0.))
             else:
                 tmp = numpy.array(result)
                 result = tmp.astype(resulttype)[0]
@@ -1381,7 +1442,9 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
                         result.append(j)
                         break
                 else:
-                    raise CDMSError, 'Variable and grid do not share common dimensions: %s'%self.id
+                    raise CDMSError(
+                        'Variable and grid do not share common dimensions: %s' %
+                        self.id)
 
         return tuple(result)
 
@@ -1391,106 +1454,109 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
         if isinstance(key, tuple):
             speclist = self._process_specs(key, {})
         else:
-            if isinstance(key, int) and key>=len(self):
-                raise IndexError, "Index too large: %d"%key
+            if isinstance(key, int) and key >= len(self):
+                raise IndexError("Index too large: %d" % key)
             speclist = self._process_specs([key], {})
 
         # Note: raw=0 ensures that a TransientVariable is returned
         return self.getSlice(numericSqueeze=1, raw=0, isitem=1, *speclist)
-        
+
     def __getslice__(self, low, high):
 
         # Note: raw=0 ensures that a TransientVariable is returned
-        return self.getSlice (slice(low, high), numericSqueeze = 1, raw=0)
+        return self.getSlice(slice(low, high), numericSqueeze=1, raw=0)
 
     def typecode(self):
-        raise CDMSError, NotImplemented + 'typecode'
+        raise CDMSError(NotImplemented + 'typecode')
 
-    def __abs__(self): 
+    def __abs__(self):
         return MV.absolute(self)
 
-    def __neg__(self): 
+    def __neg__(self):
         return MV.negative(self)
 
     def __add__(self, other):
         return MV.add(self, other)
-                        
+
     __radd__ = __add__
 
-    def __lshift__ (self, n):
+    def __lshift__(self, n):
         return MV.left_shift(self, n)
 
-    def __rshift__ (self, n):
+    def __rshift__(self, n):
         return MV.right_shift(self, n)
-                        
-    def __sub__(self, other): 
+
+    def __sub__(self, other):
         return MV.subtract(self, other)
 
-    def __rsub__(self, other): 
+    def __rsub__(self, other):
         return MV.subtract(other, self)
 
     def __mul__(self, other):
         return MV.multiply(self, other)
-    
+
     __rmul__ = __mul__
 
-    def __div__(self, other): 
+    def __div__(self, other):
         return MV.divide(self, other)
 
-    def __rdiv__(self, other): 
+    def __rdiv__(self, other):
         return MV.divide(other, self)
 
-    def __pow__(self,other, third=None): 
+    def __pow__(self, other, third=None):
         return MV.power(self, other, third)
 
-    def __iadd__(self, other): 
+    def __iadd__(self, other):
         "Add other to self in place."
         return MV.add(self, other)   # See if we can improve these later.
 
-    def __isub__(self, other): 
+    def __isub__(self, other):
         "Subtract other from self in place."
         return MV.subtract(self, other)   # See if we can improve these later.
 
-    def __imul__(self, other): 
+    def __imul__(self, other):
         "Multiply self by other in place."
         return MV.multiply(self, other)   # See if we can improve these later.
 
-    def __idiv__(self, other): 
+    def __idiv__(self, other):
         "Divide self by other in place."
         return MV.divide(self, other)   # See if we can improve these later.
 
-    def __eq__(self,other): 
-        return MV.equal(self,other)
+    def __eq__(self, other):
+        return MV.equal(self, other)
 
-    def __ne__(self,other): 
-        return MV.not_equal(self,other)
+    def __ne__(self, other):
+        return MV.not_equal(self, other)
 
-    def __lt__(self,other): 
-        return MV.less(self,other)
+    def __lt__(self, other):
+        return MV.less(self, other)
 
-    def __le__(self,other): 
-        return MV.less_equal(self,other)
+    def __le__(self, other):
+        return MV.less_equal(self, other)
 
-    def __gt__(self,other): 
-        return MV.greater(self,other)
+    def __gt__(self, other):
+        return MV.greater(self, other)
 
-    def __ge__(self,other): 
-        return MV.greater_equal(self,other)
+    def __ge__(self, other):
+        return MV.greater_equal(self, other)
 
-    def __sqrt__(self): 
+    def __sqrt__(self):
         return MV.sqrt(self)
 
-    def astype (self, tc):
+    def astype(self, tc):
         "return self as array of given type."
         return self.subSlice().astype(tc)
-    
 
-## internattr.add_internal_attribute(AbstractVariable, 'id', 'parent')   
-#PropertiedClasses.set_property(AbstractVariable, 'missing_value', acts=AbstractVariable._setmissing, nodelete=1)
+
+# internattr.add_internal_attribute(AbstractVariable, 'id', 'parent')
+# PropertiedClasses.set_property(AbstractVariable, 'missing_value',
+# acts=AbstractVariable._setmissing, nodelete=1)
 
 __rp = r'\s*([-txyz0-9]{1,1}|\(\s*\w+\s*\)|[.]{3,3})\s*'
 __crp = re.compile(__rp)
-def orderparse (order):
+
+
+def orderparse(order):
     """Parse an order string. Returns a list of axes specifiers.
        Order elements can be:
           Letters t, x, y, z meaning time, longitude, latitude, level
@@ -1501,13 +1567,14 @@ def orderparse (order):
           (name) meaning an axis whose id is name
     """
     if not isinstance(order, basestring):
-        raise CDMSError, 'order arguments must be strings.'
+        raise CDMSError('order arguments must be strings.')
     pos = 0
-    result=[]
+    result = []
     order = order.strip()
     while pos < len(order):
         m = __crp.match(order, pos)
-        if m is None: break
+        if m is None:
+            break
         r = m.group(1)
         if r[0] == '(':
             pass
@@ -1520,11 +1587,12 @@ def orderparse (order):
         pos = m.end(0)
 
     if pos != len(order):
-        raise CDMSError, 'Order string "' + order + \
-                          '" malformed, index '+str(pos)
+        raise CDMSError('Order string "' + order +
+                        '" malformed, index ' + str(pos))
     return result
 
-def order2index (axes, order):
+
+def order2index(axes, order):
     """Find the index permutation of axes to match order.
        The argument order is a string.
        Order elements can be:
@@ -1540,22 +1608,23 @@ def order2index (axes, order):
     elif isinstance(order, list):
         result = order
     else:
-        raise CDMSError, 'order2index, order specified of bad type:' + str(type(order))
+        raise CDMSError(
+            'order2index, order specified of bad type:' + str(type(order)))
     n = len(axes)
     ie = n
-    permutation = [None]*n
+    permutation = [None] * n
     j = 0
     pos = 0
     while j < len(result):
         item = result[j]
         if isinstance(item, basestring):
-            if item == 't': 
+            if item == 't':
                 spec = 'time'
-            elif item == 'x': 
+            elif item == 'x':
                 spec = 'longitude'
-            elif item == 'y': 
+            elif item == 'y':
                 spec = 'latitude'
-            elif item == 'z': 
+            elif item == 'z':
                 spec = 'level'
             elif item == '-':
                 pos += 1
@@ -1566,25 +1635,26 @@ def order2index (axes, order):
             for k in range(n):
                 if axisMatches(axes[k], spec):
                     if k in permutation:
-                        raise CDMSError, 'Duplicate item in order %s' % order
+                        raise CDMSError('Duplicate item in order %s' % order)
                     permutation[pos] = k
                     pos += 1
                     break
             else:
-                raise CDMSError, 'No axis matching order spec %s' %str(item)
+                raise CDMSError('No axis matching order spec %s' % str(item))
         elif isinstance(item, int):
             if item in permutation:
-                raise CDMSError, 'Duplicate item in order %s' % order
+                raise CDMSError('Duplicate item in order %s' % order)
             if item >= n:
-                raise CDMSError, 'Index %d out of range in order %s' %\
-                                 (item,order)
+                raise CDMSError('Index %d out of range in order %s' %
+                                (item, order))
             permutation[pos] = item
             pos += 1
         elif item is Ellipsis:
             nleft = len(result) - j - 1
             pos = n - nleft
         else:
-            raise CDMSError, 'List specified for order contains bad item: ' + repr(item)
+            raise CDMSError(
+                'List specified for order contains bad item: ' + repr(item))
         j += 1
 
     for i in range(n):
@@ -1593,7 +1663,7 @@ def order2index (axes, order):
                 if permutation[j] is None:
                     permutation[j] = i
                     break
-    return permutation    
+    return permutation
 
-from tvariable import TransientVariable
-import MV2 as MV
+from .tvariable import TransientVariable
+from . import MV2 as MV
diff --git a/Packages/cdms2/Lib/axis.py b/Packages/cdms2/Lib/axis.py
index 458096c22..1f9561313 100644
--- a/Packages/cdms2/Lib/axis.py
+++ b/Packages/cdms2/Lib/axis.py
@@ -1,12 +1,13 @@
-## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by 
-## Further modified to be pure new numpy June 24th 2008
+# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
+# Further modified to be pure new numpy June 24th 2008
 
 """
 CDMS Axis objects
 """
 _debug = 0
 std_axis_attributes = ['name', 'units', 'length', 'values', 'bounds']
-import sys, copy
+import sys
+import copy
 import numpy
 # import regrid2._regrid
 import cdmsNode
@@ -16,17 +17,24 @@ from cdmsobj import CdmsObj, Max32int
 from sliceut import reverseSlice, splitSlice, splitSliceExt
 from error import CDMSError
 import forecast
-#import internattr
+# import internattr
 from UserList import UserList
+
+
 class AliasList (UserList):
+
     def __init__(self, alist):
-        UserList.__init__(self,alist)
-    def __setitem__ (self, i, value):
+        UserList.__init__(self, alist)
+
+    def __setitem__(self, i, value):
         self.data[i] = value.lower()
+
     def __setslice(self, i, j, values):
         self.data[i:j] = map(lambda x: x.lower(), values)
+
     def append(self, value):
         self.data.append(value.lower())
+
     def extend(self, values):
         self.data.extend(map("".lower, values))
 
@@ -46,35 +54,35 @@ ReadOnlyAxis = "Axis is read-only: "
 InvalidNCycles = "Invalid number of cycles requested for wrapped dimension: "
 
 ComptimeType = type(cdtime.comptime(0))
-ReltimeType = type(cdtime.reltime(0,"days"))
+ReltimeType = type(cdtime.reltime(0, "days"))
 CdtimeTypes = (ComptimeType, ReltimeType)
 
 # Map between cdtime calendar and CF tags
 calendarToTag = {
-    cdtime.MixedCalendar : 'gregorian',
-    cdtime.NoLeapCalendar : 'noleap',
-    cdtime.GregorianCalendar : 'proleptic_gregorian',
-    cdtime.JulianCalendar : 'julian',
-    cdtime.Calendar360 : '360_day',
-    cdtime.ClimCalendar : 'clim_noncf',
-    cdtime.ClimLeapCalendar : 'climleap_noncf',
-    cdtime.DefaultCalendar : 'gregorian',
-    cdtime.StandardCalendar : 'proleptic_gregorian',
+    cdtime.MixedCalendar: 'gregorian',
+    cdtime.NoLeapCalendar: 'noleap',
+    cdtime.GregorianCalendar: 'proleptic_gregorian',
+    cdtime.JulianCalendar: 'julian',
+    cdtime.Calendar360: '360_day',
+    cdtime.ClimCalendar: 'clim_noncf',
+    cdtime.ClimLeapCalendar: 'climleap_noncf',
+    cdtime.DefaultCalendar: 'gregorian',
+    cdtime.StandardCalendar: 'proleptic_gregorian',
     }
 
 tagToCalendar = {
-    'gregorian' : cdtime.MixedCalendar,
-    'standard' : cdtime.GregorianCalendar,
-    'noleap' : cdtime.NoLeapCalendar,
-    'julian' : cdtime.JulianCalendar,
-    'proleptic_gregorian' : cdtime.GregorianCalendar,
-    '360_day' : cdtime.Calendar360,
-    '360' : cdtime.Calendar360,
-    '365_day' : cdtime.NoLeapCalendar,
-    'clim' : cdtime.ClimCalendar,
-    'clim_noncf' : cdtime.ClimCalendar,
-    'climleap_noncf' : cdtime.ClimLeapCalendar,
-    'climleap' : cdtime.ClimLeapCalendar,
+    'gregorian': cdtime.MixedCalendar,
+    'standard': cdtime.GregorianCalendar,
+    'noleap': cdtime.NoLeapCalendar,
+    'julian': cdtime.JulianCalendar,
+    'proleptic_gregorian': cdtime.GregorianCalendar,
+    '360_day': cdtime.Calendar360,
+    '360': cdtime.Calendar360,
+    '365_day': cdtime.NoLeapCalendar,
+    'clim': cdtime.ClimCalendar,
+    'clim_noncf': cdtime.ClimCalendar,
+    'climleap_noncf': cdtime.ClimLeapCalendar,
+    'climleap': cdtime.ClimLeapCalendar,
     }
 
 # This is not an error message, it is used to detect which things have
@@ -86,64 +94,77 @@ _autobounds = 2                         # Automatically generate axis and grid b
                                         # Modes:
                                         # 0 : off (not bounds generation)
                                         # 1 : on  (generate bounds)
-                                        # 2 : grid (generate bounds for lat/lon grids only)
+                                        # 2 : grid (generate bounds for lat/lon
+                                        # grids only)
 
 # Set autobounds mode to 'on' or 'off'. If on, getBounds will automatically
 # generate boundary information for an axis or grid, if not explicitly defined.
 # If 'off', and no boundary data is explicitly defined, the bounds will NOT
 # be generated; getBounds will return None for the boundaries.
+
+
 def setAutoBounds(mode):
     global _autobounds
-    if mode=='on' or mode==1:
-        _autobounds=1
-    elif mode=='off' or mode==0:
-        _autobounds=0
-    elif mode=='grid' or mode==2:
-        _autobounds=2
+    if mode == 'on' or mode == 1:
+        _autobounds = 1
+    elif mode == 'off' or mode == 0:
+        _autobounds = 0
+    elif mode == 'grid' or mode == 2:
+        _autobounds = 2
+
 
 def getAutoBounds():
     return _autobounds
 
 # Create a transient axis
+
+
 def createAxis(data, bounds=None, id=None, copy=0):
     return TransientAxis(data, bounds, id, copy=copy)
 
 # Generate a Gaussian latitude axis, north-to-south
+
+
 def createGaussianAxis(nlat):
     import regrid2._regrid
 
-    lats,wts,bnds = regrid2._regrid.gridattr(nlat,'gaussian')
-
-    # For odd number of latitudes, gridattr returns 0 in the second half of lats
-    if nlat%2:
-        mid = nlat/2
-        lats[mid+1:] = -lats[:mid][::-1]
-        
-    latBounds = numpy.zeros((nlat,2),numpy.float)
-    latBounds[:,0] = bnds[:-1]
-    latBounds[:,1] = bnds[1:]
-    lat = createAxis(lats,latBounds,id="latitude")
+    lats, wts, bnds = regrid2._regrid.gridattr(nlat, 'gaussian')
+
+    # For odd number of latitudes, gridattr returns 0 in the second half of
+    # lats
+    if nlat % 2:
+        mid = nlat / 2
+        lats[mid + 1:] = -lats[:mid][::-1]
+
+    latBounds = numpy.zeros((nlat, 2), numpy.float)
+    latBounds[:, 0] = bnds[:-1]
+    latBounds[:, 1] = bnds[1:]
+    lat = createAxis(lats, latBounds, id="latitude")
     lat.designateLatitude()
     lat.units = "degrees_north"
     return lat
 
 # Generate an equal-area latitude axis, north-to-south
+
+
 def createEqualAreaAxis(nlat):
     import regrid2._regrid
 
-    lats,wts,bnds = regrid2._regrid.gridattr(nlat,'equalarea')
-    latBounds = numpy.zeros((nlat,2),numpy.float)
-    latBounds[:,0] = bnds[:-1]
-    latBounds[:,1] = bnds[1:]
-    lat = createAxis(lats,latBounds,id="latitude")
+    lats, wts, bnds = regrid2._regrid.gridattr(nlat, 'equalarea')
+    latBounds = numpy.zeros((nlat, 2), numpy.float)
+    latBounds[:, 0] = bnds[:-1]
+    latBounds[:, 1] = bnds[1:]
+    lat = createAxis(lats, latBounds, id="latitude")
     lat.designateLatitude()
     lat.units = "degrees_north"
     return lat
 
 # Generate a uniform latitude axis
+
+
 def createUniformLatitudeAxis(startLat, nlat, deltaLat):
-    latArray = startLat + deltaLat*numpy.arange(nlat)
-    lat = createAxis(latArray,id="latitude")
+    latArray = startLat + deltaLat * numpy.arange(nlat)
+    lat = createAxis(latArray, id="latitude")
     lat.designateLatitude()
     lat.units = "degrees_north"
     latBounds = lat.genGenericBounds(width=deltaLat)
@@ -151,18 +172,21 @@ def createUniformLatitudeAxis(startLat, nlat, deltaLat):
     return lat
 
 # Generate a uniform longitude axis
+
+
 def createUniformLongitudeAxis(startLon, nlon, deltaLon):
-    lonArray = startLon + deltaLon*numpy.arange(nlon)
-    lon = createAxis(lonArray,id="longitude")
+    lonArray = startLon + deltaLon * numpy.arange(nlon)
+    lon = createAxis(lonArray, id="longitude")
     lon.designateLongitude()
     lon.units = "degrees_east"
     lonBounds = lon.genGenericBounds(width=deltaLon)
     lon.setBounds(lonBounds)
     return lon
 
-def mapLinearIntersection(xind,yind,iind,
-                          aMinusEps,aPlusEps,bPlusEps,bMinusEps,
-                          boundLeft,nodeSubI,boundRight):
+
+def mapLinearIntersection(xind, yind, iind,
+                          aMinusEps, aPlusEps, bPlusEps, bMinusEps,
+                          boundLeft, nodeSubI, boundRight):
     """
 
     Return true iff the coordinate interval (a,b) intersects the node
@@ -182,34 +206,35 @@ def mapLinearIntersection(xind,yind,iind,
     """
 
     if(iind == 'n' or iind == 'e'):
-        testC_ = ( aMinusEps  <= nodeSubI   )
-        test_C = (  nodeSubI  <= bPlusEps   )
-        testO_ = (  aPlusEps  <  nodeSubI   )
-        test_O = (  nodeSubI  <  bMinusEps  )
+        testC_ = (aMinusEps <= nodeSubI)
+        test_C = (nodeSubI <= bPlusEps)
+        testO_ = (aPlusEps < nodeSubI)
+        test_O = (nodeSubI < bMinusEps)
     elif(iind == 'b'):
-        testC_ = ( aMinusEps  <= boundRight )
-        test_C = ( boundLeft  <= bPlusEps   )
-        testO_ = ( aPlusEps   <  boundRight )
-        test_O = ( boundLeft  <  bMinusEps  )
+        testC_ = (aMinusEps <= boundRight)
+        test_C = (boundLeft <= bPlusEps)
+        testO_ = (aPlusEps < boundRight)
+        test_O = (boundLeft < bMinusEps)
     elif(iind == 's'):
-        testC_ = ( aMinusEps  <= boundLeft  )
-        test_C = ( boundRight <= bPlusEps   )
-        testO_ = ( aPlusEps   <  boundLeft  )
-        test_O = ( boundRight <  bMinusEps  )
+        testC_ = (aMinusEps <= boundLeft)
+        test_C = (boundRight <= bPlusEps)
+        testO_ = (aPlusEps < boundLeft)
+        test_O = (boundRight < bMinusEps)
 
     if(xind == 'c' and yind == 'c'):
-        test=(testC_ and test_C)
+        test = (testC_ and test_C)
     elif(xind == 'c' and yind == 'o'):
-        test=(testC_ and test_O)
+        test = (testC_ and test_O)
     elif(xind == 'o' and yind == 'c'):
-        test=(testO_ and test_C)
+        test = (testO_ and test_C)
     elif(xind == 'o' and yind == 'o'):
-        test=(testO_ and test_O)
+        test = (testO_ and test_O)
 
     return(test)
 
-def mapLinearExt(axis, bounds, interval, indicator ='ccn', epsilon=None, stride=1, wrapped=0):
 
+def mapLinearExt(axis, bounds, interval,
+                 indicator='ccn', epsilon=None, stride=1, wrapped=0):
     """Map coordinate interval to index interval, without
     wraparound. interval has the form (x,y) where x and y are the
     endpoints in coordinate space. indicator is a three-character
@@ -222,137 +247,139 @@ def mapLinearExt(axis, bounds, interval, indicator ='ccn', epsilon=None, stride=
     'b' - the interval intersects the cell bounds
     's' - the cell bounds are a subset of the interval
     'e' - same as 'n', plus an extra node on either side.
-    
+
     Returns the corresponding index interval (i,j), where i<j,
     indicating the half-open index interval [i,j), or None if the
     intersection is empty.
     """
-    
+
     indicator = indicator.lower()
     length = len(axis)
 
     # Make the interval and search array non-decreasing
-    x,y = interval
-
-    iind  = indicator[2]
-    
-    if x>y:
-        x,y = y,x
-        xind  = indicator[1]
-        yind  = indicator[0]
-        
+    x, y = interval
+
+    iind = indicator[2]
+
+    if x > y:
+        x, y = y, x
+        xind = indicator[1]
+        yind = indicator[0]
+
     else:
         xind = indicator[0]
         yind = indicator[1]
 
-    if axis[0]>axis[-1]:
+    if axis[0] > axis[-1]:
         ar = axis[::-1]
-        if bounds[0,0]<bounds[0,1]:
+        if bounds[0, 0] < bounds[0, 1]:
             bd = bounds[::-1]
         else:
-            bd = bounds[::-1,::-1]
+            bd = bounds[::-1, ::-1]
         direc = 'dec'
     else:
         ar = axis
-        if bounds[0,0]<bounds[0,1]:
+        if bounds[0, 0] < bounds[0, 1]:
             bd = bounds
         else:
-            bd = bounds[:,::-1]
+            bd = bounds[:, ::-1]
         direc = 'inc'
 
     if(epsilon is None):
-        eps=1.0e-5
-        if len(ar)>1:
-            epsilon = eps * min(abs(ar[1]-ar[0]), abs(ar[-1]-ar[-2]))
+        eps = 1.0e-5
+        if len(ar) > 1:
+            epsilon = eps * min(abs(ar[1] - ar[0]), abs(ar[-1] - ar[-2]))
         else:
-            epsilon=eps
+            epsilon = eps
 
     #
     #  interval bound +/- epsilon
     #
 
-    aMinusEps=(x-epsilon)
-    aPlusEps=(x+epsilon)
-    bMinusEps=(y-epsilon)
-    bPlusEps=(y+epsilon)
-
+    aMinusEps = (x - epsilon)
+    aPlusEps = (x + epsilon)
+    bMinusEps = (y - epsilon)
+    bPlusEps = (y + epsilon)
 
-    #oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+    # oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
     #
     # out-of-bounds requests
     #
-    #oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+    # oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
 
-    if iind in ['n','e']:
+    if iind in ['n', 'e']:
         mina = ar[0]
         maxa = ar[-1]
     else:
-        mina = bd[0,0]
-        maxa = bd[-1,1]
-        
+        mina = bd[0, 0]
+        maxa = bd[-1, 1]
+
     if(bPlusEps < mina or aMinusEps > maxa):
         return None
 
-    #nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
+    # nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
     #
     # empty node check
     #
-    #nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
+    # nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
 
     # Handle empty intersections
     if (
-        ( ((aPlusEps)  >  ar[-1]) and (iind == 'n') and (xind == 'o') ) or
-        ( ((aMinusEps) >= ar[-1]) and (iind == 'n') and (xind == 'c') ) or
-        ( ((bMinusEps) <  ar[0] ) and (iind == 'n') and (yind == 'o') ) or
-        ( ((bPlusEps)  <= ar[0] ) and (iind == 'n') and (yind == 'c') ) 
+        (((aPlusEps) > ar[-1]) and (iind == 'n') and (xind == 'o')) or
+        (((aMinusEps) >= ar[-1]) and (iind == 'n') and (xind == 'c')) or
+        (((bMinusEps) < ar[0]) and (iind == 'n') and (yind == 'o')) or
+        (((bPlusEps) <= ar[0]) and (iind == 'n') and (yind == 'c'))
         ):
         return None
 
-
-    bdMaxRight=max(bd[-1][0],bd[-1][1])
-    bdMinLeft=min(bd[0][0],bd[0][1])
+    bdMaxRight = max(bd[-1][0], bd[-1][1])
+    bdMinLeft = min(bd[0][0], bd[0][1])
     if (
-        ( ( (aMinusEps) >  bdMaxRight ) and (iind != 'n') and (xind == 'o') ) or
-        ( ( (aMinusEps) >= bdMaxRight ) and (iind != 'n') and (xind == 'c') ) or
-        ( ( (bPlusEps)  <  bdMinLeft  ) and (iind != 'n') and (yind == 'o') ) or
-        ( ( (bPlusEps)  <= bdMinLeft  ) and (iind != 'n') and (yind == 'c') ) 
-        ): 
+        (((aMinusEps) > bdMaxRight) and (iind != 'n') and (xind == 'o')) or
+        (((aMinusEps) >= bdMaxRight) and (iind != 'n') and (xind == 'c')) or
+        (((bPlusEps) < bdMinLeft) and (iind != 'n') and (yind == 'o')) or
+        (((bPlusEps) <= bdMinLeft) and (iind != 'n') and (yind == 'c'))
+        ):
         return None
-    
-    # The intersection is nonempty; use searchsorted to get left/right limits for testing
 
-    ii,jj = numpy.searchsorted(ar,(x,y))
+    # The intersection is nonempty; use searchsorted to get left/right limits
+    # for testing
+
+    ii, jj = numpy.searchsorted(ar, (x, y))
 
     #
     #  find index range for left (iStart,iEnd) and right (jStart,jEnd)
     #
-    
-    # iEnd + 2 because last point in loop not done
-    iStart=ii-1
-    iEnd=ii+2
-    if(iStart < 0): iStart=0
-    if( iEnd >= length ): iEnd = length - 1
 
-    jStart=jj-1
-    jEnd=jj+2
-    if( jStart < 0 ): jStart=0
-    if( jEnd >= length ): jEnd = length - 1
+    # iEnd + 2 because last point in loop not done
+    iStart = ii - 1
+    iEnd = ii + 2
+    if(iStart < 0):
+        iStart = 0
+    if(iEnd >= length):
+        iEnd = length - 1
+
+    jStart = jj - 1
+    jEnd = jj + 2
+    if(jStart < 0):
+        jStart = 0
+    if(jEnd >= length):
+        jEnd = length - 1
 
     #
     #  initialise the index to -1 (does not exist)
     #
 
-    iInterval=-1
-    jInterval=-1
-    iIntervalB=-1
-    jIntervalB=-1
+    iInterval = -1
+    jInterval = -1
+    iIntervalB = -1
+    jIntervalB = -1
 
-    #pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp
+    # pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp
     #
     #  preliminary checks
     #
-    #pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp
-
+    # pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp
 
     if(iStart == jStart == iEnd == jEnd):
         iInterval = jInterval = iStart
@@ -362,172 +389,173 @@ def mapLinearExt(axis, bounds, interval, indicator ='ccn', epsilon=None, stride=
 
     else:
 
-        #llllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
+        # llllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
         #
         #  left interval check
         #
-        #llllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
+        # llllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
 
         # - user check
-        
-        for i in range(iStart,iEnd+1):
 
-            nodeSubI=ar[i]
-            boundLeft=bd[i][0]
-            boundRight=bd[i][1]
+        for i in range(iStart, iEnd + 1):
+
+            nodeSubI = ar[i]
+            boundLeft = bd[i][0]
+            boundRight = bd[i][1]
 
-            test=mapLinearIntersection(xind,yind,iind,
-                                       aMinusEps,aPlusEps,bPlusEps,bMinusEps,
-                                       boundLeft,nodeSubI,boundRight)
+            test = mapLinearIntersection(xind, yind, iind,
+                                       aMinusEps, aPlusEps, bPlusEps, bMinusEps,
+                                       boundLeft, nodeSubI, boundRight)
 
-            if( iInterval == -1 and test ):
+            if(iInterval == -1 and test):
                 iInterval = i
                 break
 
         # - "B" check for extension
-        
-        for i in range(iStart,iEnd+1):
 
-            nodeSubI=ar[i]
-            boundLeft=bd[i][0]
-            boundRight=bd[i][1]
+        for i in range(iStart, iEnd + 1):
 
-            testB=mapLinearIntersection(xind,yind,'b',
-                                       aMinusEps,aPlusEps,bPlusEps,bMinusEps,
-                                       boundLeft,nodeSubI,boundRight)
+            nodeSubI = ar[i]
+            boundLeft = bd[i][0]
+            boundRight = bd[i][1]
 
-            if( iIntervalB == -1 and testB ):
+            testB = mapLinearIntersection(xind, yind, 'b',
+                                       aMinusEps, aPlusEps, bPlusEps, bMinusEps,
+                                       boundLeft, nodeSubI, boundRight)
+
+            if(iIntervalB == -1 and testB):
                 iIntervalB = i
                 break
 
-        #rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr
+        # rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr
         #
         #  right interval check
         #
-        #rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr
+        # rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr
 
-        for j in range(jStart,jEnd+1):
+        for j in range(jStart, jEnd + 1):
 
-            nodeSubI=ar[j]
-            boundLeft=bd[j][0]
-            boundRight=bd[j][1]
+            nodeSubI = ar[j]
+            boundLeft = bd[j][0]
+            boundRight = bd[j][1]
 
             #
             #  user test
             #
 
-            test=mapLinearIntersection(xind,yind,iind,
-                                       aMinusEps,aPlusEps,bPlusEps,bMinusEps,
-                                       boundLeft,nodeSubI,boundRight)
+            test = mapLinearIntersection(xind, yind, iind,
+                                       aMinusEps, aPlusEps, bPlusEps, bMinusEps,
+                                       boundLeft, nodeSubI, boundRight)
 
-            if( ( jInterval == -1 and iInterval != -1 and test == 0  and j <= jEnd ) ):
-                jInterval = j-1
+            if((jInterval == -1 and iInterval != -1 and test == 0 and j <= jEnd)):
+                jInterval = j - 1
 
-            if( (j == length-1 and test == 1) ):
+            if((j == length - 1 and test == 1)):
                 jInterval = j
-                
+
                 # no break here...
 
         #
-        #  B test on right 
+        #  B test on right
         #
 
-        for j in range(jStart,jEnd+1):
+        for j in range(jStart, jEnd + 1):
 
-            nodeSubI=ar[j]
-            boundLeft=bd[j][0]
-            boundRight=bd[j][1]
+            nodeSubI = ar[j]
+            boundLeft = bd[j][0]
+            boundRight = bd[j][1]
 
-            testB=mapLinearIntersection(xind,yind,'b',
-                                       aMinusEps,aPlusEps,bPlusEps,bMinusEps,
-                                       boundLeft,nodeSubI,boundRight)
+            testB = mapLinearIntersection(xind, yind, 'b',
+                                       aMinusEps, aPlusEps, bPlusEps, bMinusEps,
+                                       boundLeft, nodeSubI, boundRight)
 
-            if( ( jIntervalB == -1 and iIntervalB != -1 and testB == 0  and j <= jEnd ) ):
-                jIntervalB = j-1
+            if((jIntervalB == -1 and iIntervalB != -1 and testB == 0 and j <= jEnd)):
+                jIntervalB = j - 1
 
-            if( ( j == length-1 and testB == 1) ):
+            if((j == length - 1 and testB == 1)):
                 jIntervalB = j
 
-
-    #eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+    # eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
     #
     #  extension check
     #
-    #eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+    # eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
 
     if(iind == 'e'):
 
         # if B index does not exist return
-        if(iIntervalB < 0 or jIntervalB <0):
+        if(iIntervalB < 0 or jIntervalB < 0):
             return None
 
         # if user index exists:
-        elif ( ( iInterval > -1 and jInterval > -1 ) ):
+        elif ((iInterval > -1 and jInterval > -1)):
 
             if(jInterval < iInterval):
-                
-                npoints=iInterval-jInterval
+
+                npoints = iInterval - jInterval
                 if(npoints > 0):
-                    (iInterval,jInterval)=(jInterval+1,iInterval+1)
-                    
+                    (iInterval, jInterval) = (jInterval + 1, iInterval + 1)
+
                 else:
-                    jInterval=iInterval
-                    iInterval=jInterval+1
-                    
+                    jInterval = iInterval
+                    iInterval = jInterval + 1
+
             else:
 
-                iInterval = iInterval-1
-                jInterval = jInterval+1
-                
+                iInterval = iInterval - 1
+                jInterval = jInterval + 1
+
         # else set index interval to B index interval
         else:
-            
-            iInterval=iIntervalB
-            jInterval=jIntervalB
+
+            iInterval = iIntervalB
+            jInterval = jIntervalB
 
         if(iInterval == jInterval):
-            if( x < ar[iInterval] and iInterval > 0 ):
-                iInterval=jInterval-1
-            elif( jIntervalB < length-1 ): 
-                jInterval=iInterval+1
+            if(x < ar[iInterval] and iInterval > 0):
+                iInterval = jInterval - 1
+            elif(jIntervalB < length - 1):
+                jInterval = iInterval + 1
 
         if(jInterval < iInterval):
-            npoints=jInterval-iInterval
+            npoints = jInterval - iInterval
             if(npoints > 2):
-                jInterval=iIntervalB
-                iInterval=jIntervalB
+                jInterval = iIntervalB
+                iInterval = jIntervalB
             else:
-                jInterval=iIntervalB
-                iInterval=jIntervalB+1
-
-        # Since the lookup is linear, ensure that the result is in range [0..length)
-        iInterval = max(iInterval,0)
-        jInterval = min(jInterval,length-1)
-            
-    #ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+                jInterval = iIntervalB
+                iInterval = jIntervalB + 1
+
+        # Since the lookup is linear, ensure that the result is in range
+        # [0..length)
+        iInterval = max(iInterval, 0)
+        jInterval = min(jInterval, length - 1)
+
+    # ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
     #
     # final checks
     #
-    #ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+    # ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
 
     # if jInteval < iInterval have a single point; set to iInterval
 
     if(jInterval < iInterval):
-        jInterval=iInterval
-        
+        jInterval = iInterval
+
     elif(jInterval < 0 and iInterval < 0):
         return None
-    
+
     # Reverse back if necessary
-    if direc=='dec':
-        iInterval,jInterval = length-jInterval-1,length-iInterval-1
-    
-    iReturn=iInterval
-    jReturn=jInterval+1
+    if direc == 'dec':
+        iInterval, jInterval = length - jInterval - 1, length - iInterval - 1
+
+    iReturn = iInterval
+    jReturn = jInterval + 1
+
+    return (iReturn, jReturn)
 
-    return (iReturn,jReturn)
 
-def lookupArray(ar,value):
+def lookupArray(ar, value):
     """Lookup value in array ar. Return index such that:
     (a) ar is monotonically increasing:
     value <= ar[index], index==0..len(ar)-1
@@ -537,42 +565,46 @@ def lookupArray(ar,value):
     value < ar[index], index==len(ar)
     """
     ar = numpy.ma.filled(ar)
-    ascending = (ar[0]<ar[-1]) or len(ar)==1
+    ascending = (ar[0] < ar[-1]) or len(ar) == 1
     if ascending:
-        index = numpy.searchsorted(ar,value)
+        index = numpy.searchsorted(ar, value)
     else:
         revar = ar[::-1]
-        index = numpy.searchsorted(revar,value)
-        if index<len(revar) and value==revar[index]:
-            index = len(ar)-index-1
+        index = numpy.searchsorted(revar, value)
+        if index < len(revar) and value == revar[index]:
+            index = len(ar) - index - 1
         else:
-            index = len(ar)-index
+            index = len(ar) - index
     return index
 
-## # Lookup a value in a monotonic 1-D array. value is a scalar
-## # Always returns a valid index for ar
-## def lookupArray(ar,value):
-##     ascending = (ar[0]<ar[-1])
-##     if ascending:
-##         index = numpy.searchsorted(ar,value)
-##     else:
-##         index = numpy.searchsorted(ar[::-1],value)
-##         index = len(ar)-index-1
-##     index = max(index,0)
-##     index = min(index,len(ar))
-##     return index
+# Lookup a value in a monotonic 1-D array. value is a scalar
+# Always returns a valid index for ar
+# def lookupArray(ar,value):
+# ascending = (ar[0]<ar[-1])
+# if ascending:
+# index = numpy.searchsorted(ar,value)
+# else:
+# index = numpy.searchsorted(ar[::-1],value)
+# index = len(ar)-index-1
+# index = max(index,0)
+# index = min(index,len(ar))
+# return index
 
 # Return true if vector vec1 is a subset of vec2, within tolerance tol.
 # Return second arg of index, if it is a subset
+
+
 def isSubsetVector(vec1, vec2, tol):
-    index = lookupArray(vec2,vec1[0])
-    if index>(len(vec2)-len(vec1)):
-        return (0,-1)                   # vec1 is too large, cannot be a subset
-    issubset = numpy.alltrue(numpy.less(numpy.absolute(vec1-vec2[index:index+len(vec1)]),tol))
+    index = lookupArray(vec2, vec1[0])
+    if index > (len(vec2) - len(vec1)):
+        return (0, -1)                   # vec1 is too large, cannot be a subset
+    issubset = numpy.alltrue(
+    numpy.less(numpy.absolute(vec1 - vec2[index:index + len(vec1)]), tol))
     if issubset:
-        return (issubset,index)
+        return (issubset, index)
     else:
-        return (0,-1)
+        return (0, -1)
+
 
 def isOverlapVector(vec1, vec2, atol=1.e-8):
     """Returns (isoverlap, index) where:
@@ -580,32 +612,35 @@ def isOverlapVector(vec1, vec2, atol=1.e-8):
     index is the index such that vec1[0]<=vec2[index]. If index==len(vec2),
     then vec1[0]>vec2[len(vec2)-1]
     """
-    index = lookupArray(vec2,vec1[0])
-    if index==0 and abs(vec1[0]-vec2[0]):
-        return (0,index)
-    elif index==len(vec2):
-        return (1,index)
+    index = lookupArray(vec2, vec1[0])
+    if index == 0 and abs(vec1[0] - vec2[0]):
+        return (0, index)
+    elif index == len(vec2):
+        return (1, index)
     else:
-        ar2 = vec2[index:index+len(vec1)]
+        ar2 = vec2[index:index + len(vec1)]
         ar1 = vec1[:len(ar2)]
         isoverlap = numpy.ma.allclose(ar1, ar2, atol=atol)
     if isoverlap:
-        return (isoverlap,index)
+        return (isoverlap, index)
     else:
-        return (0,index)
+        return (0, index)
+
 
 def allclose(ax1, ax2, rtol=1.e-5, atol=1.e-8):
     """True if all elements of axes ax1 and ax2 are close,
     in the sense of numpy.ma.allclose."""
-    return ((ax1 is ax2) or numpy.ma.allclose(ax1[:],ax2[:],rtol=rtol,atol=atol))
+    return ((ax1 is ax2) or numpy.ma.allclose(ax1[:], ax2[:], rtol=rtol, atol=atol))
 
-# AbstractAxis defines the common axis interface. 
+# AbstractAxis defines the common axis interface.
 # Concrete axis classes are derived from this class.
 
+
 class AbstractAxis(CdmsObj):
-    def __init__ (self, parent, node):
-        CdmsObj.__init__ (self, node)
-        val = self.__cdms_internals__ + ['id',]
+
+    def __init__(self, parent, node):
+        CdmsObj.__init__(self, node)
+        val = self.__cdms_internals__ + ['id', ]
         self.___cdms_internals__ = val
         self.parent = parent
         self.id = id
@@ -613,11 +648,11 @@ class AbstractAxis(CdmsObj):
         self._data_ = None
         # Cached wraparound values for circular axes
         self._doubledata_ = None
-        
-    def __str__ (self):
+
+    def __str__(self):
         return "\n".join(self.listall() + "\n"
 
-    __repr__ = __str__
+    __repr__=__str__
 
     def __len__(self):
         raise CDMSError, MethodNotImplemented
@@ -626,7 +661,7 @@ class AbstractAxis(CdmsObj):
         return (len(self),)
 
     def _getdtype(self, name):
-        tc = self.typecode()
+        tc=self.typecode()
         return numpy.dtype(tc)
 
     def __getitem__(self, key):
@@ -648,17 +683,17 @@ class AbstractAxis(CdmsObj):
     # If persistent is true, write metadata to the container.
     def designateLatitude(self, persistent=0):
         if persistent:
-            self.axis = "Y"
+            self.axis="Y"
         else:
-            self.__dict__['axis'] = "Y"
+            self.__dict__['axis']="Y"
             self.attributes['axis']="Y"
 
     # Return true iff the axis is a latitude axis
     def isLatitude(self):
-        id = self.id.strip().lower()
-        if (hasattr(self,'axis') and self.axis=='Y'): return 1
-        units = getattr(self,"units","").strip().lower()
-        if units in ["degrees_north","degree_north","degree_n","degrees_n","degreen","degreesn"]:
+        id=self.id.strip().lower()
+        if (hasattr(self, 'axis') and self.axis == 'Y'): return 1
+        units=getattr(self, "units", "").strip().lower()
+        if units in ["degrees_north", "degree_north", "degree_n", "degrees_n", "degreen", "degreesn"]:
           return 1
         return (id[0:3] == 'lat') or (id in latitude_aliases)
 
@@ -666,25 +701,25 @@ class AbstractAxis(CdmsObj):
     # If persistent is true, write metadata to the container.
     def designateLevel(self, persistent=0):
         if persistent:
-            self.axis = "Z"
+            self.axis="Z"
         else:
-            self.__dict__['axis'] = "Z"
+            self.__dict__['axis']="Z"
             self.attributes['axis']="Z"
 
     # Return true iff the axis is a level axis
     def isLevel(self):
-        id = self.id.strip().lower()
-        if (hasattr(self,'axis') and self.axis=='Z'): return 1
-        if getattr(self,"positive","").strip().lower() in ["up","down"]:
+        id=self.id.strip().lower()
+        if (hasattr(self, 'axis') and self.axis == 'Z'): return 1
+        if getattr(self, "positive", "").strip().lower() in ["up", "down"]:
           return 1
         try:
-          #Ok let's see if this thing as pressure units
+          # Ok let's see if this thing as pressure units
           import genutil
-          p=genutil.udunits(1,"Pa")
-          units=getattr(self,'units',"").strip()
+          p=genutil.udunits(1, "Pa")
+          units=getattr(self, 'units', "").strip()
           p2=p.to(units)
           return 1
-        except Exception,err:
+        except Exception, err:
           pass
         return ((id[0:3] == 'lev') or (id[0:5] == 'depth') or (id in level_aliases))
 
@@ -693,30 +728,30 @@ class AbstractAxis(CdmsObj):
     # If modulo is defined, set as circular
     def designateLongitude(self, persistent=0, modulo=360.0):
         if persistent:
-            self.axis = "X"
+            self.axis="X"
             if modulo is None:
-                self.topology = 'linear'
+                self.topology='linear'
             else:
-                self.modulo = modulo
-                self.topology = 'circular'
+                self.modulo=modulo
+                self.topology='circular'
         else:
-            self.__dict__['axis'] = "X"
+            self.__dict__['axis']="X"
             self.attributes['axis']="X"
             if modulo is None:
-                self.__dict__['topology'] = 'linear'
-                self.attributes['topology'] = 'linear'
+                self.__dict__['topology']='linear'
+                self.attributes['topology']='linear'
             else:
-                self.__dict__['modulo'] = modulo
-                self.__dict__['topology'] = 'circular'
-                self.attributes['modulo'] = modulo
-                self.attributes['topology'] = 'circular'
+                self.__dict__['modulo']=modulo
+                self.__dict__['topology']='circular'
+                self.attributes['modulo']=modulo
+                self.attributes['topology']='circular'
 
     # Return true iff the axis is a longitude axis
     def isLongitude(self):
-        id = self.id.strip().lower()
-        if (hasattr(self,'axis') and self.axis=='X'): return 1
-        units = getattr(self,"units","").strip().lower()
-        if units in ["degrees_east","degree_east","degree_e","degrees_e","degreee","degreese"]:
+        id=self.id.strip().lower()
+        if (hasattr(self, 'axis') and self.axis == 'X'): return 1
+        units=getattr(self, "units", "").strip().lower()
+        if units in ["degrees_east", "degree_east", "degree_e", "degrees_e", "degreee", "degreese"]:
           return 1
         return (id[0:3] == 'lon') or (id in longitude_aliases)
 
@@ -724,63 +759,65 @@ class AbstractAxis(CdmsObj):
     # If persistent is true, write metadata to the container.
     def designateTime(self, persistent=0, calendar=None):
         if calendar is None:
-            calendar = cdtime.DefaultCalendar
+            calendar=cdtime.DefaultCalendar
         if persistent:
-            self.axis = "T"
+            self.axis="T"
             if calendar is not None:
                 self.setCalendar(calendar, persistent)
         else:
-            self.__dict__['axis'] = "T"
-            self.attributes['axis'] = "T"
+            self.__dict__['axis']="T"
+            self.attributes['axis']="T"
             if calendar is not None:
                 self.setCalendar(calendar, persistent)
 
     # For isTime(), keep track of whether each id is for a time axis or not, for better performance.
-    # This dictionary is a class variable (not a member of any particular instance).
-    idtaxis = {}  # id:type where type is 'T' for time, 'O' for other
+    # This dictionary is a class variable (not a member of any particular
+    # instance).
+    idtaxis={}  # id:type where type is 'T' for time, 'O' for other
 
     # Return true iff the axis is a time axis
     def isTime(self):
-        id = self.id.strip().lower()
-        if hasattr(self,'axis'):
-            if self.axis=='T': return 1
+        id=self.id.strip().lower()
+        if hasattr(self, 'axis'):
+            if self.axis == 'T': return 1
             elif self.axis is not None: return 0
         # Have we saved the id-to-axis type information already?
         if id in self.idtaxis:
-            if self.idtaxis[id]=='T':
+            if self.idtaxis[id] == 'T':
                 return 1
             else:
                 return 0
-        ## Try to figure it out from units
+        # Try to figure it out from units
         try:
           import genutil
-          units=getattr(self,"units","").lower()
-          sp = units.split("since")
-          if len(sp)>1:
-            t=genutil.udunits(1,"day")
-            s = sp[0].strip()
-            if s in t.available_units() and t.known_units()[s]=="TIME":
-              self.idtaxis[id] = 'T'
+          units=getattr(self, "units", "").lower()
+          sp=units.split("since")
+          if len(sp) > 1:
+            t=genutil.udunits(1, "day")
+            s=sp[0].strip()
+            if s in t.available_units() and t.known_units()[s] == "TIME":
+              self.idtaxis[id]='T'
               return 1
-            #try the plural version since udunits only as singular (day noy days)
-            s=s+"s"
-            if s in t.available_units() and t.known_units()[s]=="TIME":
-              self.idtaxis[id] = 'T'
+            # try the plural version since udunits only as singular (day noy
+            # days)
+            s=s + "s"
+            if s in t.available_units() and t.known_units()[s] == "TIME":
+              self.idtaxis[id]='T'
               return 1
         except:
           pass
-        #return (id[0:4] == 'time') or (id in time_aliases)
+        # return (id[0:4] == 'time') or (id in time_aliases)
         if (id[0:4] == 'time') or (id in time_aliases):
             self.idtaxis[id]='T'
             return 1
         else:
-            self.idtaxis[id] = 'O'
+            self.idtaxis[id]='O'
             return 0
 
     # Return true iff the axis is a forecast axis
     def isForecast(self):
-        id = self.id.strip().lower()
-        if (hasattr(self,'axis') and self.axis=='F'): return 1
+        id=self.id.strip().lower()
+        if (hasattr(self, 'axis') and self.axis == 'F'): return 1
         return (id[0:6] == 'fctau0') or (id in forecast_aliases)
     def isForecastTime(self):
         return self.isForecast()
@@ -790,15 +827,15 @@ class AbstractAxis(CdmsObj):
         if not hasattr(self, 'units'):
             raise CDMSError, "No time units defined"
         if calendar is None:
-            calendar = self.getCalendar()
+            calendar=self.getCalendar()
         if self.isForecast():
-            result = [ forecast.comptime(t) for t in self[:] ]
+            result=[forecast.comptime(t) for t in self[:]]
         else:
-            result = []
+            result=[]
             for val in self[:]:
                 result.append(cdtime.reltime(val, self.units).tocomp(calendar))
         return result
-    
+
     #
     #  mf 20010418 -- output DTGs (YYYYMMDDHH)
     #
@@ -806,22 +843,22 @@ class AbstractAxis(CdmsObj):
         "Array version of cdtime tocomp. Returns a list of component times in DTG format."
         if not hasattr(self, 'units'):
             raise CDMSError, "No time units defined"
-        result = []
+        result=[]
         if calendar is None:
-            calendar = self.getCalendar()
+            calendar=self.getCalendar()
         for val in self[:]:
             comptime=cdtime.reltime(val, self.units).tocomp(calendar)
             s=repr(comptime)
             tt=s.split(' ')
-        
+
             ttt=tt[0].split('-')
             yr=int(ttt[0])
             mo=int(ttt[1])
             da=int(ttt[2])
-        
+
             ttt=tt[1].split(':')
             hr=int(ttt[0])
-            dtg="%04d%02d%02d%02d"%(yr,mo,da,hr)
+            dtg="%04d%02d%02d%02d" % (yr, mo, da, hr)
             result.append(dtg)
 
         return result
@@ -831,27 +868,35 @@ class AbstractAxis(CdmsObj):
         import datetime
         if not hasattr(self, 'units'):
             raise CDMSError, "No time units defined"
-        result = []
+        result=[]
         if calendar is None:
-            calendar = self.getCalendar()
+            calendar=self.getCalendar()
         for val in self[:]:
             c=cdtime.reltime(val, self.units).tocomp(calendar)
-            dtg = datetime.datetime(c.year,c.month,c.day,c.hour,c.minute,int(c.second),int((c.second-int(c.second))*1000))
+            dtg=datetime.datetime(
+    c.year,
+     c.month,
+     c.day,
+     c.hour,
+     c.minute,
+     int(c.second),
+     int((c.second - int(c.second)) * 1000))
             result.append(dtg)
         return result
 
-    def asRelativeTime( self, units=None ):
+    def asRelativeTime(self, units=None):
         "Array version of cdtime torel. Returns a list of relative times."
-        sunits = getattr(self,'units',None)
-        if sunits==None or sunits=='None':
+        sunits=getattr(self, 'units', None)
+        if sunits is None or sunits == 'None':
             raise CDMSError, "No time units defined"
-        if units==None or units=='None':
+        if units is None or units == 'None':
             units=sunits
         if self.isForecast():
-            result = [ forecast.comptime(t).torel(units) for t in self[:] ]
+            result=[forecast.comptime(t).torel(units) for t in self[:]]
         else:
-            cal = self.getCalendar()
-            result = [ cdtime.reltime(t,sunits).torel(units,cal) for t in self[:] ]
+            cal=self.getCalendar()
+            result=[cdtime.reltime(t, sunits).torel(units, cal)
+                                     for t in self[:]]
         return result
 
     def toRelativeTime(self, units, calendar=None):
@@ -860,31 +905,35 @@ class AbstractAxis(CdmsObj):
             raise CDMSError, "No time units defined"
         n=len(self[:])
         b=self.getBounds()
-        scal = self.getCalendar()
+        scal=self.getCalendar()
         if calendar is None:
-            calendar = scal
+            calendar=scal
         else:
             self.setCalendar(calendar)
         for i in range(n):
             tmp=cdtime.reltime(self[i], self.units).tocomp(scal)
-            tmp2 = numpy.array(float(tmp.torel(units, calendar).value)).astype(self[:].dtype.char)
-            ## if i==1 : print self[:].dtype.char,'tmp2:',tmp2,tmp2.astype('f'),self[i],self[i].astype('f')
+            tmp2=numpy.array(float(tmp.torel(units, calendar).value)).astype(
+                self[:].dtype.char)
+            # if i==1 : print
+            # self[:].dtype.char,'tmp2:',tmp2,tmp2.astype('f'),self[i],self[i].astype('f')
             self[i]=tmp2
             if b is not None:
-                tmp=cdtime.reltime(b[i,0], self.units).tocomp(scal)
-                b[i,0]=numpy.array(float(tmp.torel(units, calendar).value)).astype(b.dtype.char)
-                tmp=cdtime.reltime(b[i,1], self.units).tocomp(scal)
-                b[i,1]=numpy.array(float(tmp.torel(units, calendar).value)).astype(b.dtype.char)
+                tmp=cdtime.reltime(b[i, 0], self.units).tocomp(scal)
+                b[i, 0]=numpy.array(
+                    float(tmp.torel(units, calendar).value)).astype(b.dtype.char)
+                tmp=cdtime.reltime(b[i, 1], self.units).tocomp(scal)
+                b[i, 1]=numpy.array(
+                    float(tmp.torel(units, calendar).value)).astype(b.dtype.char)
         if b is not None:
             self.setBounds(b)
         self.units=units
         return
 
-#mfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmf
+# mfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmf
 #
 # mf 20010412 -- test if an Axis is intrinsically circular
 #
-#mfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmf
+# mfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmf
 
 
     # Return true iff the axis wraps around
@@ -892,22 +941,22 @@ class AbstractAxis(CdmsObj):
     # (1) self.topology=='circular', or
     # (2) self.topology is undefined, and the axis is a longitude
     def isCircularAxis(self):
-        
-        if hasattr(self,'topology'):
-            iscircle = (self.topology=='circular')
+
+        if hasattr(self, 'topology'):
+            iscircle=(self.topology == 'circular')
         elif self.isLongitude():
-            iscircle = 1
+            iscircle=1
         else:
-            iscircle = 0
+            iscircle=0
 
         return iscircle
 
 
-#mfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmf
+# mfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmf
 #
 # mf 20010405 -- test if an transient Axis is REALLY circular
 #
-#mfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmf
+# mfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmf
 
 
     # Return true iff the axis wraps around
@@ -916,45 +965,45 @@ class AbstractAxis(CdmsObj):
     # (2) self.topology is undefined, and the axis is a longitude
     def isCircular(self):
 
-        if hasattr(self,'realtopology'):
-            if self.realtopology=='circular': return 1
-            elif self.realtopology=='linear': return 0
+        if hasattr(self, 'realtopology'):
+            if self.realtopology == 'circular': return 1
+            elif self.realtopology == 'linear': return 0
         if(len(self) < 2):
             return 0
-        
-        baxis = self[0]
-        eaxis = self[-1]
-        deltaend = self[-1] - self[-2]
-        eaxistest = eaxis + deltaend - baxis
+
+        baxis=self[0]
+        eaxis=self[-1]
+        deltaend=self[-1] - self[-2]
+        eaxistest=eaxis + deltaend - baxis
 
         cycle=self.getModuloCycle()
 
-        tol=0.01*deltaend
+        tol=0.01 * deltaend
 
         test=0
         if(abs(eaxistest - cycle) < tol): test=1
-        
-        if hasattr(self,'topology') and test == 1:
-            iscircle = (self.topology=='circular')
+
+        if hasattr(self, 'topology') and test == 1:
+            iscircle=(self.topology == 'circular')
         elif (self.isLongitude() and test == 1):
-            iscircle = 1
+            iscircle=1
         else:
-            iscircle = 0
+            iscircle=0
 
         # save realtopology attribute in __dict__, don't write it to the file
-        if iscircle==1:  self.__dict__['realtopology'] = 'circular'
-        elif iscircle==0: self.__dict__['realtopology'] = 'linear'
+        if iscircle == 1: self.__dict__['realtopology']='circular'
+        elif iscircle == 0: self.__dict__['realtopology']='linear'
         return iscircle
 
     def designateCircular(self, modulo, persistent=0):
         if persistent:
-            self.topology = 'circular'
-            self.modulo = modulo
+            self.topology='circular'
+            self.modulo=modulo
         else:
-            self.__dict__['topology'] = 'circular'
-            self.__dict__['modulo'] = modulo
-            self.attributes['modulo'] = modulo
-            self.attributes['topology'] = 'linear'
+            self.__dict__['topology']='circular'
+            self.__dict__['modulo']=modulo
+            self.attributes['modulo']=modulo
+            self.attributes['topology']='linear'
 
     def isLinear(self):
         raise CDMSError, MethodNotImplemented
@@ -973,62 +1022,62 @@ class AbstractAxis(CdmsObj):
     # or None. If the axis does not have a calendar attribute, return the global
     # calendar.
     def getCalendar(self):
-        if hasattr(self,'calendar'):
-            calendar = self.calendar.lower()
+        if hasattr(self, 'calendar'):
+            calendar=self.calendar.lower()
         else:
-            calendar = None
+            calendar=None
 
-        cdcal = tagToCalendar.get(calendar, cdtime.DefaultCalendar)
+        cdcal=tagToCalendar.get(calendar, cdtime.DefaultCalendar)
         return cdcal
 
     # Set the calendar
     def setCalendar(self, calendar, persistent=1):
         if persistent:
-            self.calendar = calendarToTag.get(calendar, None)
+            self.calendar=calendarToTag.get(calendar, None)
             self.attributes['calendar']=self.calendar
             if self.calendar is None:
                 raise CDMSError, InvalidCalendar % calendar
         else:
-            self.__dict__['calendar'] = calendarToTag.get(calendar, None)
+            self.__dict__['calendar']=calendarToTag.get(calendar, None)
             self.attributes['calendar']=self.calendar
             if self.__dict__['calendar'] is None:
                 raise CDMSError, InvalidCalendar % calendar
 
     def getData(self):
         raise CDMSError, MethodNotImplemented
- 
+
     # Return the entire array
     def getValue(self):
         return self.__getitem__(slice(None))
 
-    def assignValue(self,data):
-        self.__setitem__(slice(None),data)
+    def assignValue(self, data):
+        self.__setitem__(slice(None), data)
 
     def _time2value(self, value):
         """ Map value of type comptime, reltime, or string of form "yyyy-mm-dd hh:mi:ss" to value"""
         if self.isTime():
             if type(value) in CdtimeTypes:
-                value = value.torel(self.units, self.getCalendar()).value
-            elif isinstance(value, basestring) and value not in [':',unspecified]:
-                cal = self.getCalendar()
-                value = cdtime.s2c(value, cal).torel(self.units, cal).value
+                value=value.torel(self.units, self.getCalendar()).value
+            elif isinstance(value, basestring) and value not in [':', unspecified]:
+                cal=self.getCalendar()
+                value=cdtime.s2c(value, cal).torel(self.units, cal).value
         return value
 
 
     def getModuloCycle(self):
 
-        if hasattr(self,'modulo'):
-            cycle = self.modulo
+        if hasattr(self, 'modulo'):
+            cycle=self.modulo
             #
             # mf 20010419 test if attribute is a string (non CF), set to 360.0
             #
             if isnstance(cycle, basestring):
-                cycle = 360.0
+                cycle=360.0
         else:
-            cycle = 360.0
+            cycle=360.0
 
         if isinstance(cycle, numpy.ndarray):
-            cycle = cycle[0]
+            cycle=cycle[0]
 
         return(cycle)
 
@@ -1040,7 +1089,7 @@ class AbstractAxis(CdmsObj):
 
         return(self.getModuloCycle())
 
-    def mapInterval(self,interval,indicator='ccn',cycle=None):
+    def mapInterval(self, interval, indicator='ccn', cycle=None):
         """
         Map coordinate interval to index interval. interval has one of the forms:
 
@@ -1071,295 +1120,301 @@ class AbstractAxis(CdmsObj):
         Note: if the interval is interior to the axis, but does not span any
         axis element, a singleton (i,i+1) indicating an adjacent index is returned.
         """
-        i,j,k = self.mapIntervalExt(interval,indicator,cycle)
-        j = min(j, i+len(self))
-        #i=i-1
-        return (i,j)
+        i, j, k=self.mapIntervalExt(interval, indicator, cycle)
+        j=min(j, i + len(self))
+        # i=i-1
+        return (i, j)
 
 
-#mfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmf
+# mfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmf
 #
 # mf 20010308 - 20010412 -- general handing of wrapping
 #
-#mfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmf
+# mfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmf
 
-    def mapIntervalExt(self,interval,indicator='ccn',cycle=None,epsilon=None):
+    def mapIntervalExt(
+        self, interval, indicator='ccn', cycle=None, epsilon=None):
         """Like mapInterval, but returns (i,j,k) where k is stride,
         and (i,j) is not restricted to one cycle."""
 
         # nCycleMax : max number of cycles a user a specify in wrapping
 
         nCycleMax=6
-        
+
         # interval is None returns the full interval
-        if interval is None or interval==':':
+        if interval is None or interval == ':':
             return (0, len(self), 1)
 
         # Allow intervals of the same form as getRegion.
-        if len(interval)==3:
-            x,y,indicator = interval
-            interval = (x,y)
-        elif len(interval)==4:
-            x,y,indicator,cycle = interval
-            interval = (x,y)
+        if len(interval) == 3:
+            x, y, indicator=interval
+            interval=(x, y)
+        elif len(interval) == 4:
+            x, y, indicator, cycle=interval
+            interval=(x, y)
 
         # check length of indicator if overridden by user
         #
 
-        indicator = indicator.lower()
-        if len(indicator)==2: indicator += 'n'
+        indicator=indicator.lower()
+        if len(indicator) == 2: indicator += 'n'
 
-        if( ( len(indicator) != 3 ) or
-               ( (indicator[0] != 'c' and indicator[0] != 'o') or
+        if((len(indicator) != 3) or
+               ((indicator[0] != 'c' and indicator[0] != 'o') or
                  (indicator[1] != 'c' and indicator[1] != 'o') or
                  (indicator[2] != 'n' and indicator[2] != 'b' and indicator[2] != 's' and
                   indicator[2] != 'e')
                  )
             ):
             raise CDMSError, "EEE: 3-character interval/intersection indicator incomplete or incorrect = "\
-                 +indicator
-       
+                 + indicator
+
         if self._data_ is None:
-            self._data_ = self.getData()
+            self._data_=self.getData()
 
-        #ttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt
+        # ttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt
         # Handle time types
-        interval = (self._time2value(interval[0]), self._time2value(interval[1]))
+        interval=(
+    self._time2value(interval[0]),
+     self._time2value(interval[1]))
 
         # If the interval is reversed wrt self, reverse the interval and
         # set the stride to -1
-        if (interval[0]<=interval[1])==(self[0]<=self[-1]):
+        if (interval[0] <= interval[1]) == (self[0] <= self[-1]):
             stride=1
         else:
             stride=-1
-            interval = (interval[1],interval[0])
-            indicator = indicator[1]+indicator[0]+indicator[2]
+            interval=(interval[1], interval[0])
+            indicator=indicator[1] + indicator[0] + indicator[2]
 
-        #mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
+        # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
         #
         # basic test for wrapping - is axis REALLY circular?
         #
-        #ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+        # ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
 
-        xind = indicator[0]
-        yind = indicator[1]
-        iind = indicator[2]
+        xind=indicator[0]
+        yind=indicator[1]
+        iind=indicator[2]
 
-        xi,yi = interval
+        xi, yi=interval
 
-        length = len(self)
-        ar = self[:]
-        ar0 = ar[0]
-        arn = ar[-1]
-        armin = min(ar0,arn)
-        armax = max(ar0,arn)
+        length=len(self)
+        ar=self[:]
+        ar0=ar[0]
+        arn=ar[-1]
+        armin=min(ar0, arn)
+        armax=max(ar0, arn)
 
         # Wrapped if circular and at least one value is outside the axis range.
-        wraptest1 = self.isCircular()
-        wraptest2 = not ((armin <= xi <= armax) and (armin <= yi <= armax))
-        
+        wraptest1=self.isCircular()
+        wraptest2=not ((armin <= xi <= armax) and (armin <= yi <= armax))
+
         if (wraptest1 and wraptest2):
 
             #
-            #  find cycle and calc # of cycles in the interval
+            # find cycle and calc # of cycles in the interval
             #
-            
+
             cycle=self.getModulo()
-            
-            intervalLength=yi-xi
-            intervalCycles=intervalLength/cycle
-            
-            bd = self.getBounds()
-            
-            nPointsCycle = len(ar)
 
-            ar0 = ar[0]
-            ar1 = ar[-1]
+            intervalLength=yi - xi
+            intervalCycles=intervalLength / cycle
+
+            bd=self.getBounds()
+
+            nPointsCycle=len(ar)
+
+            ar0=ar[0]
+            ar1=ar[-1]
 
             #
             # test for reversed coordinates
             #
-            
-            if ar0>ar1:
-                cycle = -1 * abs(cycle)
 
-            #eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+            if ar0 > ar1:
+                cycle=-1 * abs(cycle)
+
+            # eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
             #
             #  make sure xi<yi and shift to positive axis indices
             #
-            #eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-            
+            # eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+
             # Ensure that xi<yi
-            
-            if cycle>0 and yi<xi: xi,yi = yi,xi
-            if cycle<0 and yi>xi: xi,yi = yi,xi
+
+            if cycle > 0 and yi < xi: xi, yi=yi, xi
+            if cycle < 0 and yi > xi: xi, yi=yi, xi
 
             # calculate the number of cycles to shift to positive side
-            
-            nCycleShift=numpy.floor((xi-ar0)/cycle)
-            xp = xi - cycle * nCycleShift
-            yp = xp + intervalLength
 
-            # Extend the data vector with wraparound number of cycles in interval and shifts
+            nCycleShift=numpy.floor((xi - ar0) / cycle)
+            xp=xi - cycle * nCycleShift
+            yp=xp + intervalLength
+
+            # Extend the data vector with wraparound number of cycles in
+            # interval and shifts
+
+            nCycle=int(intervalCycles + 1.0 + 0.5) + abs(nCycleShift)
+
 
-            nCycle = int(intervalCycles + 1.0 + 0.5) + abs(nCycleShift)
-            
-                
             #
             # check if nCycle is > nCycleMax
             #
             if(nCycle >= nCycleMax):
                 raise CDMSError, InvalidNCycles + repr(nCycle)
 
-            self._doubledata_ = numpy.concatenate(( ar, ar + cycle ))
+            self._doubledata_=numpy.concatenate((ar, ar + cycle))
             k=2
-            while(k<nCycle):
-                self._doubledata_ = numpy.concatenate(( self._doubledata_, ar + k*cycle ) )
-                k=k+1
+            while(k < nCycle):
+                self._doubledata_=numpy.concatenate(
+                    (self._doubledata_, ar + k * cycle))
+                k=k + 1
 
             # Map the canonical coordinate interval (xp,yp) in the 'extended' data array
             # create axis to get the bounds array
 
-            bigar = self._doubledata_
+            bigar=self._doubledata_
             bigarAxis=createAxis(bigar)
-            bd = bigarAxis.getBounds()
+            bd=bigarAxis.getBounds()
             if bd is None:              # In case autobounds is off
-                bd = bigarAxis.genGenericBounds()
+                bd=bigarAxis.genGenericBounds()
 
             # run the more general mapLinearExt to get the indices
-            
-            indexInterval= mapLinearExt(bigar,bd,(xp,yp),indicator,wrapped=1)
+
+            indexInterval=mapLinearExt(
+                bigar, bd, (xp, yp), indicator, wrapped=1)
 
             #
             # check to make sure we got an interval
             #
-            
+
             if(indexInterval is None):
                 return None
 
-            i,j=indexInterval
+            i, j=indexInterval
 
             #
             #  now shift i back
             #
 
-            i = i + int(nCycleShift*float(nPointsCycle))
+            i=i + int(nCycleShift * float(nPointsCycle))
 
-            #   
+            #
             #  adjust the length of the output interval by the indicator
             #  mapLinear does the calc correctly, we have to modify because we
             #  are overriding with the (float)(number of cycles) in the interval
             #
-            
-            j = j + int(nCycleShift*float(nPointsCycle))
-            retval = (i,j)
-            
+
+            j=j + int(nCycleShift * float(nPointsCycle))
+            retval=(i, j)
+
         else:
-            bd = self.getBounds()
+            bd=self.getBounds()
             if bd is None:              # In case autobounds is off
-                bd = self.genGenericBounds()
-            retval = mapLinearExt(ar, bd, interval, indicator)
+                bd=self.genGenericBounds()
+            retval=mapLinearExt(ar, bd, interval, indicator)
 
         if retval is not None:
-            i,j = retval
-            if stride==-1:
+            i, j=retval
+            if stride == -1:
                 if(j == length):
-                    i,j=j-1,i-1
+                    i, j=j - 1, i - 1
                 else:
-                    i,j=j-1,i-1
-                if j==-1:
+                    i, j=j - 1, i - 1
+                if j == -1:
                     j=None
 
-            retval = (i,j,stride)
+            retval=(i, j, stride)
 
         return retval
 
-    def subaxis(self,i,j,k=1, wrap=True):
+    def subaxis(self, i, j, k=1, wrap=True):
         """Create a transient axis for the index slice [i:j:k]
         The stride k can be positive or negative. Wraparound is
         supported for longitude dimensions or those with a modulus attribute.
         """
-        fullBounds = self.getBounds()
+        fullBounds=self.getBounds()
         _debug=0
         _debugprefix="SS__XX subaxis "
-        
+
 
         # Handle wraparound
-        modulo = None
-        size = len(self)
-        
+        modulo=None
+        size=len(self)
+
         #----------------------------------------------------------------------
-        # mf 20010328 negative stride i >= vice i > 
+        # mf 20010328 negative stride i >= vice i >
         #----------------------------------------------------------------------
-        
-        if wrap and ((k>0 and j>size) or (k<0 and i >= size)) and self.isCircular():
-            modulo = self.getModuloCycle()
+
+        if wrap and ((k > 0 and j > size) or (k < 0 and i >= size)) and self.isCircular():
+            modulo=self.getModuloCycle()
 
         if modulo is not None:
             # If self is decreasing and stride is positive,
             # or self is increasing and stride is negative, subtract the modulus,
             # otherwise add it.
-            if (self[0]>self[-1])==(k>0):
-                modulo = -modulo
+            if (self[0] > self[-1]) == (k > 0):
+                modulo=-modulo
 
             #----------------------------------------------------------------------
             #
             #  mf 20010329 -- N vice two slice scheme (more general)
             #
-            #----------------------------------------------------------------------
+            #------------------------------------------------------------------
 
             donew=1
 
             if(donew):
 
-                sn = splitSliceExt(slice(i,j,k),size)
-                if(_debug): print "SSSS1-------------------- ",sn,len(sn)
+                sn=splitSliceExt(slice(i, j, k), size)
+                if(_debug): print "SSSS1-------------------- ", sn, len(sn)
 
-                for kk in range(0,len(sn)):
+                for kk in range(0, len(sn)):
                     sl=sn[kk]
-                    if(_debug): print "SSSSSSSS kk = ",kk,sl
-                    part = self[sl] + kk*modulo
-                    if(_debug): print "SSSSSSSSSSSSSSS modulo",part[0],part[-1],modulo
+                    if(_debug): print "SSSSSSSS kk = ", kk, sl
+                    part=self[sl] + kk * modulo
+                    if(_debug): print "SSSSSSSSSSSSSSS modulo", part[0], part[-1], modulo
                     if(kk == 0):
-                        data = part
+                        data=part
                     else:
-                        data = numpy.concatenate((data,part))
+                        data=numpy.concatenate((data, part))
 
                     if fullBounds is not None:
-                        bound = fullBounds[sl] + kk*modulo
+                        bound=fullBounds[sl] + kk * modulo
                         if (kk == 0):
-                            bounds = bound
+                            bounds=bound
                         else:
-                            bounds = numpy.concatenate((bounds,bound))
+                            bounds=numpy.concatenate((bounds, bound))
                     else:
-                        bounds = None
-                        
-            
+                        bounds=None
+
+
             else:
-                
-                s1, s2 = splitSlice(slice(i,j,k),size)
-                if(_debug): print "SSSS0: original ",s1,s2
-                
-                part1 = self[s1]
-                part2 = self[s2]+modulo
-                if(_debug): print "SSSSSSSSSSSSSSS modulo",self[0],self[-1],modulo
-                data = numpy.concatenate((part1,part2))
+
+                s1, s2=splitSlice(slice(i, j, k), size)
+                if(_debug): print "SSSS0: original ", s1, s2
+
+                part1=self[s1]
+                part2=self[s2] + modulo
+                if(_debug): print "SSSSSSSSSSSSSSS modulo", self[0], self[-1], modulo
+                data=numpy.concatenate((part1, part2))
                 if fullBounds is not None:
-                    bounds1 = fullBounds[s1]
-                    bounds2 = fullBounds[s2]+modulo
-                    bounds = numpy.concatenate((bounds1,bounds2))
+                    bounds1=fullBounds[s1]
+                    bounds2=fullBounds[s2] + modulo
+                    bounds=numpy.concatenate((bounds1, bounds2))
                 else:
-                    bounds = None
-            
+                    bounds=None
+
 
         else:                           # no wraparound
-            data = self[i:j:k]
+            data=self[i:j:k]
             if fullBounds is not None:
-                bounds = fullBounds[i:j:k]
+                bounds=fullBounds[i:j:k]
             else:
-                bounds = None
-        
-        newaxis = TransientAxis(data, bounds, id=self.id, copy=1)
+                bounds=None
+
+        newaxis=TransientAxis(data, bounds, id=self.id, copy=1)
 
         if self.isLatitude(): newaxis.designateLatitude()
         if self.isLongitude(): newaxis.designateLongitude()
@@ -1367,190 +1422,201 @@ class AbstractAxis(CdmsObj):
         if self.isTime(): newaxis.designateTime()
 
         for attname in self.attributes.keys():
-            if attname not in ["datatype", "length","isvar","name_in_file","partition","partition_length"]:
+            if attname not in ["datatype", "length", "isvar", "name_in_file", "partition", "partition_length"]:
                 setattr(newaxis, attname, getattr(self, attname))
-                newaxis.attributes[attname]=getattr(self,attname)
+                newaxis.attributes[attname]=getattr(self, attname)
 
         # Change circular topology to linear if a strict subset was copied
-        if hasattr(self,"topology") and self.topology=="circular" and len(newaxis)<len(self):
+        if hasattr(self, "topology") and self.topology == "circular" and len(newaxis) < len(self):
             newaxis.topology="linear"
 
         return newaxis
-    
+
 #----------------------------------------------------------------------
 # mf 2001 set calls to subAxis as subaxis
 #----------------------------------------------------------------------
 
-    subAxis = subaxis
+    subAxis=subaxis
 
     def typecode(self):
         raise CDMSError, MethodNotImplemented
 
-    # Check that a boundary array is valid, raise exception if not. bounds is an array of shape (n,2)
-    def validateBounds(self,bounds):
-        requiredShape = (len(self),2)
-        requiredShape2 = (len(self)+1,)
-        if bounds.shape!=requiredShape and bounds.shape!=requiredShape2:
+    # Check that a boundary array is valid, raise exception if not. bounds is
+    # an array of shape (n,2)
+    def validateBounds(self, bounds):
+        requiredShape=(len(self), 2)
+        requiredShape2=(len(self) + 1,)
+        if bounds.shape != requiredShape and bounds.shape != requiredShape2:
             raise CDMSError, InvalidBoundsArray + \
-                 'shape is %s, should be %s or %s'%(`bounds.shape`,`requiredShape`,`requiredShape2`)
-        if bounds.shape==requiredShape2: # case of "n+1" bounds
+                 'shape is %s, should be %s or %s' % (
+    `bounds.shape`,
+     `requiredShape`,
+     `requiredShape2`)
+        if bounds.shape == requiredShape2:  # case of "n+1" bounds
             bounds2=numpy.zeros(requiredShape)
-            bounds2[:,0]=bounds[:-1]
-            bounds2[:,1]=bounds[1::]
+            bounds2[:, 0]=bounds[:-1]
+            bounds2[:, 1]=bounds[1::]
             bounds=bounds2
-        mono = (bounds[0,0]<=bounds[0,1])
+        mono=(bounds[0, 0] <= bounds[0, 1])
         if mono:
             for i in range(bounds.shape[0]):
-                if not bounds[i,0]<=self[i]<=bounds[i,1]:
+                if not bounds[i, 0] <= self[i] <= bounds[i, 1]:
                     raise CDMSError, InvalidBoundsArray + \
-'bounds[%i]=%f is not in the range [%f,%f]'%(i,self[i],bounds[i,0],bounds[i,1])
+'bounds[%i]=%f is not in the range [%f,%f]' % (
+    i, self[i], bounds[i, 0], bounds[i, 1])
         else:
             for i in range(bounds.shape[0]):
-                if not bounds[i,0]>=self[i]>=bounds[i,1]:
+                if not bounds[i, 0] >= self[i] >= bounds[i, 1]:
                     raise CDMSError, InvalidBoundsArray + \
-'bounds[%i]=%f is not in the range [%f,%f]'%(i,self[i],bounds[i,1],bounds[i,0])
+'bounds[%i]=%f is not in the range [%f,%f]' % (
+    i, self[i], bounds[i, 1], bounds[i, 0])
         return bounds
 
-    # Generate bounds from midpoints. width is the width of the zone if the axis has one value.
+    # Generate bounds from midpoints. width is the width of the zone if the
+    # axis has one value.
     def genGenericBounds(self, width=1.0):
         if self._data_ is None:
-            self._data_ = self.getData()
-        ar = self._data_
-        if len(self)>1:
-            leftPoint = numpy.array([1.5*ar[0]-0.5*ar[1]])
-            midArray = (ar[0:-1]+ar[1:])/2.0
-            rightPoint = numpy.array([1.5*ar[-1]-0.5*ar[-2]])
-            bnds = numpy.concatenate((leftPoint,midArray,rightPoint))
+            self._data_=self.getData()
+        ar=self._data_
+        if len(self) > 1:
+            leftPoint=numpy.array([1.5 * ar[0] - 0.5 * ar[1]])
+            midArray=(ar[0:-1] + ar[1:]) / 2.0
+            rightPoint=numpy.array([1.5 * ar[-1] - 0.5 * ar[-2]])
+            bnds=numpy.concatenate((leftPoint, midArray, rightPoint))
         else:
-            delta = width/2.0
-            bnds = numpy.array([self[0]-delta,self[0]+delta])
+            delta=width / 2.0
+            bnds=numpy.array([self[0] - delta, self[0] + delta])
 
         # Transform to (n,2) array
-        retbnds = numpy.zeros((len(ar),2),numpy.float)
-        retbnds[:,0] = bnds[:-1]
-        retbnds[:,1] = bnds[1:]
+        retbnds=numpy.zeros((len(ar), 2), numpy.float)
+        retbnds[:, 0]=bnds[:-1]
+        retbnds[:, 1]=bnds[1:]
 
         if self.isLatitude():
-            retbnds[0,:] = numpy.maximum(-90.0, numpy.minimum(90.0,retbnds[0,:]))
-            retbnds[-1,:] = numpy.maximum(-90.0, numpy.minimum(90.0,retbnds[-1,:]))
+            retbnds[0, :]=numpy.maximum(
+    -90.0, numpy.minimum(90.0, retbnds[0, :]))
+            retbnds[-1, :]=numpy.maximum(
+    -90.0, numpy.minimum(90.0, retbnds[-1, :]))
 
         return retbnds
 
-    def clone (self, copyData=1):
+    def clone(self, copyData=1):
         """clone (self, copyData=1)
         Return a copy of self as a transient axis.
         If copyData is 1, make a separate copy of the data."""
-        b = self.getBounds()
-        if copyData==1:
-            mycopy = createAxis(copy.copy(self[:]))
+        b=self.getBounds()
+        if copyData == 1:
+            mycopy=createAxis(copy.copy(self[:]))
         else:
-            mycopy = createAxis(self[:])
-        mycopy.id = self.id
+            mycopy=createAxis(self[:])
+        mycopy.id=self.id
         try:
             mycopy.setBounds(b)
         except CDMSError:
-            b = mycopy.genGenericBounds()
+            b=mycopy.genGenericBounds()
             mycopy.setBounds(b)
         for k, v in self.attributes.items():
            setattr(mycopy, k, v)
         return mycopy
 
-    def listall (self, all=None):
+    def listall(self, all=None):
         "Get list of info about this axis."
-        aname = self.id
-        result = []
+        aname=self.id
+        result=[]
         result.append('   id: ' + aname)
         if self.isLatitude(): result.append('   Designated a latitude axis.')
         if self.isLongitude(): result.append('   Designated a longitude axis.')
         if self.isTime(): result.append('   Designated a time axis.')
         if self.isLevel(): result.append('   Designated a level axis.')
         try:
-            units = self.units
+            units=self.units
             result.append('   units:  ' + units)
         except:
             pass
-        d = self.getValue()
+        d=self.getValue()
         result.append('   Length: ' + str(len(d)))
         result.append('   First:  ' + str(d[0]))
         result.append('   Last:   ' + str(d[-1]))
-        flag = 1
+        flag=1
         for k in self.attributes.keys():
             if k in std_axis_attributes: continue
             if flag:
                 result.append('   Other axis attributes:')
-                flag = 0
-            result.append('      '+k+': '+str(self.attributes[k]))
+                flag=0
+            result.append('      ' + k + ': ' + str(self.attributes[k]))
         result.append('   Python id:  %s' % hex(id(self)))
 
         if all:
             result.append("   Values:")
             result.append(str(d))
-            b = self.getBounds()
+            b=self.getBounds()
             result.append("   Bounds:")
             result.append(str(b))
         return result
 
     def info(self, flag=None, device=None):
         "Write info about axis; include dimension values and weights if flag"
-        if device is None: device = sys.stdout
+        if device is None: device=sys.stdout
         device.write(str(self))
 
     def isVirtual(self):
         "Return true iff coordinate values are implicitly defined."
         return 0
 
-    shape = property(_getshape,None)
-    dtype = _getdtype
+    shape=property(_getshape, None)
+    dtype=_getdtype
 
-## PropertiedClasses.set_property(AbstractAxis, 'shape', 
-##                         AbstractAxis._getshape, nowrite=1, nodelete=1)
-## PropertiedClasses.set_property(AbstractAxis, 'dtype', 
-##                         AbstractAxis._getdtype, nowrite=1, nodelete=1)
-## internattr.add_internal_attribute (AbstractAxis, 'id', 'parent')
+# PropertiedClasses.set_property(AbstractAxis, 'shape',
+# AbstractAxis._getshape, nowrite=1, nodelete=1)
+# PropertiedClasses.set_property(AbstractAxis, 'dtype',
+# AbstractAxis._getdtype, nowrite=1, nodelete=1)
+# internattr.add_internal_attribute (AbstractAxis, 'id', 'parent')
 
 # One-dimensional coordinate axis in a dataset
 class Axis(AbstractAxis):
-    def __init__(self,parent,axisNode=None):
+    def __init__(self, parent, axisNode=None):
         if axisNode is not None and axisNode.tag != 'axis':
                raise CDMSError, 'Creating axis, node is not an axis node.'
         AbstractAxis.__init__(self, parent, axisNode)
         if axisNode is not None:
             if axisNode.partition is not None:
-                flatpart = axisNode.partition
-                self.__dict__['partition']=numpy.reshape(flatpart,(len(flatpart)/2,2))
+                flatpart=axisNode.partition
+                self.__dict__['partition']=numpy.reshape(
+    flatpart, (len(flatpart) / 2, 2))
                 self.attributes['partition']=self.partition
-        self.id = axisNode.id
-    
+        self.id=axisNode.id
+
     def typecode(self):
         return cdmsNode.CdToNumericType.get(self._node_.datatype)
 
     # Handle slices of the form x[i], x[i:j:k], x[(slice(i,j,k),)], and x[...]
     def __getitem__(self, key):
-        node = self._node_
-        length = len(node)
+        node=self._node_
+        length=len(node)
 
         # Allow key of form (slice(i,j),) etc.
-        if isinstance(key, tuple) and len(key)==1:
-            key = key[0]
+        if isinstance(key, tuple) and len(key) == 1:
+            key=key[0]
 
-        if isinstance(key, (int, numpy.int,numpy.int32)):  # x[i]
-            if key>=length:
+        if isinstance(key, (int, numpy.int, numpy.int32)):  # x[i]
+            if key >= length:
                 raise IndexError, 'index out of bounds'
             else:
-                # Don't generate the entire array (if linear) just for one value
-                return node.data[key%length]
-        elif isinstance(key, slice): # x[i:j:k]
+                # Don't generate the entire array (if linear) just for one
+                # value
+                return node.data[key % length]
+        elif isinstance(key, slice):  # x[i:j:k]
             if self._data_ is None:
-                self._data_ = node.getData()
+                self._data_=node.getData()
             return self._data_[key.start:key.stop:key.step]
-        elif isinstance(key, Ellipsis.__class__): # x[...]
+        elif isinstance(key, Ellipsis.__class__):  # x[...]
             if self._data_ is None:
-                self._data_ = node.getData()
+                self._data_=node.getData()
             return self._data_
         elif isinstance(key, tuple):
-            raise IndexError,'axis is one-dimensional'
+            raise IndexError, 'axis is one-dimensional'
         else:
-            raise IndexError,'index must be an integer: %s'%`key`
+            raise IndexError, 'index must be an integer: %s' % `key`
 
     # Get axis data
     def getData(self):
@@ -1559,7 +1625,7 @@ class Axis(AbstractAxis):
     # Handle slices of the form x[i:j]
     def __getslice__(self, low, high):
         if self._data_ is None:
-            self._data_ = self.getData()
+            self._data_=self.getData()
         return self._data_[low:high]
 
     def __len__(self):
@@ -1567,85 +1633,85 @@ class Axis(AbstractAxis):
 
     # Return true iff the axis representation is linear
     def isLinear(self):
-        return self._node_.dataRepresent==cdmsNode.CdLinear
+        return self._node_.dataRepresent == cdmsNode.CdLinear
 
     # Return the bounds array, or generate a default if autoBounds mode is on
     def getBounds(self):
-        boundsArray = self.getExplicitBounds()
+        boundsArray=self.getExplicitBounds()
         try:
             self.validateBounds(boundsArray)
         except:
-            boundsArray = None
-        abopt = getAutoBounds()
-        if boundsArray is None and (abopt==1 or (abopt==2 and (self.isLatitude() or self.isLongitude()))) :
-            boundsArray = self.genGenericBounds()
-            
+            boundsArray=None
+        abopt=getAutoBounds()
+        if boundsArray is None and (abopt == 1 or (abopt == 2 and (self.isLatitude() or self.isLongitude()))):
+            boundsArray=self.genGenericBounds()
+
         return boundsArray
 
     # Return the bounds array, or None
     def getExplicitBounds(self):
-        boundsArray = None
-        if hasattr(self,'bounds'):
-            boundsName = self.bounds
+        boundsArray=None
+        if hasattr(self, 'bounds'):
+            boundsName=self.bounds
             try:
-                boundsVar = self.parent.variables[boundsName]
-                boundsArray = numpy.ma.filled(boundsVar.getSlice())
+                boundsVar=self.parent.variables[boundsName]
+                boundsArray=numpy.ma.filled(boundsVar.getSlice())
             except KeyError:
-                boundsArray = None
+                boundsArray=None
 
         return boundsArray
 
     def getCalendar(self):
-        if hasattr(self,'calendar'):
-            calendar = self.calendar.lower()
+        if hasattr(self, 'calendar'):
+            calendar=self.calendar.lower()
         elif self.parent is not None and hasattr(self.parent, 'calendar'):
-            calendar = self.parent.calendar.lower()
+            calendar=self.parent.calendar.lower()
         else:
-            calendar = None
+            calendar=None
 
-        cdcal = tagToCalendar.get(calendar, cdtime.DefaultCalendar)
+        cdcal=tagToCalendar.get(calendar, cdtime.DefaultCalendar)
         return cdcal
 
 # In-memory coordinate axis
 class TransientAxis(AbstractAxis):
-    axis_count = 0
+    axis_count=0
     def __init__(self, data, bounds=None, id=None, attributes=None, copy=0):
         AbstractAxis.__init__(self, None, None)
         if id is None:
-            TransientAxis.axis_count = TransientAxis.axis_count + 1
-            id = 'axis_' + str(TransientAxis.axis_count)
+            TransientAxis.axis_count=TransientAxis.axis_count + 1
+            id='axis_' + str(TransientAxis.axis_count)
         if attributes is None:
-            if hasattr(data, 'attributes'): attributes = data.attributes
+            if hasattr(data, 'attributes'): attributes=data.attributes
         if attributes is not None:
             for name, value in attributes.items():
                 if name not in ['missing_value', 'name']:
                     setattr(self, name, value)
-        self.id = id
+        self.id=id
         if isinstance(data, AbstractAxis):
             if copy == 0:
-                self._data_ = data[:]
+                self._data_=data[:]
             else:
-                self._data_ = numpy.array(data[:])
+                self._data_=numpy.array(data[:])
         elif isinstance(data, numpy.ndarray):
             if copy == 0:
-                self._data_ = data
+                self._data_=data
             else:
-                self._data_ = numpy.array(data)
+                self._data_=numpy.array(data)
         elif isinstance(data, numpy.ma.MaskedArray):
             if numpy.ma.getmask(data) is not numpy.ma.nomask:
                 raise CDMSError, \
                       'Cannot construct an axis with a missing value.'
-            data = data.data
+            data=data.data
             if copy == 0:
-                self._data_ = data
+                self._data_=data
             else:
-                self._data_ = numpy.array(data)
+                self._data_=numpy.array(data)
         elif data is None:
-            self._data_ = None
+            self._data_=None
         else:
-            self._data_ = numpy.array(data)
+            self._data_=numpy.array(data)
 
-        self._doubledata_ = None
+        self._doubledata_=None
         self.setBounds(bounds)
 
     def __getitem__(self, key):
@@ -1655,10 +1721,10 @@ class TransientAxis(AbstractAxis):
         return self._data_[low:high]
 
     def __setitem__(self, index, value):
-        self._data_[index] = numpy.ma.filled(value)
+        self._data_[index]=numpy.ma.filled(value)
 
     def __setslice__(self, low, high, value):
-        self._data_[low:high] = numpy.ma.filled(value)
+        self._data_[low:high]=numpy.ma.filled(value)
 
     def __len__(self):
         return len(self._data_)
@@ -1666,7 +1732,7 @@ class TransientAxis(AbstractAxis):
     def getBounds(self):
         if self._bounds_ is not None:
             return copy.copy(self._bounds_)
-        elif (getAutoBounds()==1 or (getAutoBounds()==2 and (self.isLatitude() or self.isLongitude()))):
+        elif (getAutoBounds() == 1 or (getAutoBounds() == 2 and (self.isLatitude() or self.isLongitude()))):
             return self.genGenericBounds()
         else:
             return None
@@ -1682,29 +1748,33 @@ class TransientAxis(AbstractAxis):
     #
     # mf 20010308 - add validate key word, by default do not validate
     #
-    def setBounds(self, bounds, persistent=0, validate=0, index=None, boundsid=None):
+    def setBounds(self, bounds, persistent=0,
+                  validate=0, index=None, boundsid=None):
         if bounds is not None:
             if isinstance(bounds, numpy.ma.MaskedArray):
-                bounds = numpy.ma.filled(bounds)
+                bounds=numpy.ma.filled(bounds)
             if validate:
-                bounds = self.validateBounds(bounds)
+                bounds=self.validateBounds(bounds)
             else:                       # Just do the absolute minimum validation
-                requiredShape = (len(self),2)
-                requiredShape2 = (len(self)+1,)
-                if bounds.shape!=requiredShape and bounds.shape!=requiredShape2:
+                requiredShape=(len(self), 2)
+                requiredShape2=(len(self) + 1,)
+                if bounds.shape != requiredShape and bounds.shape != requiredShape2:
                     raise CDMSError, InvalidBoundsArray + \
-                          'shape is %s, should be %s or %s'%(`bounds.shape`,`requiredShape`,`requiredShape2`)
-                if bounds.shape==requiredShape2: # case of "n+1" bounds
+                          'shape is %s, should be %s or %s' % (
+    `bounds.shape`,
+     `requiredShape`,
+     `requiredShape2`)
+                if bounds.shape == requiredShape2:  # case of "n+1" bounds
                     bounds2=numpy.zeros(requiredShape)
-                    bounds2[:,0]=bounds[:-1]
-                    bounds2[:,1]=bounds[1::]
+                    bounds2[:, 0]=bounds[:-1]
+                    bounds2[:, 1]=bounds[1::]
                     bounds=bounds2
-            self._bounds_ = copy.copy(bounds)
+            self._bounds_=copy.copy(bounds)
         else:
-            if (getAutoBounds()==1 or (getAutoBounds()==2 and (self.isLatitude() or self.isLongitude()))):
-                self._bounds_ = self.genGenericBounds()
+            if (getAutoBounds() == 1 or (getAutoBounds() == 2 and (self.isLatitude() or self.isLongitude()))):
+                self._bounds_=self.genGenericBounds()
             else:
-                self._bounds_ = None
+                self._bounds_=None
 
     def isLinear(self):
         return 0
@@ -1719,17 +1789,17 @@ class TransientVirtualAxis(TransientAxis):
 
     def __init__(self, axisname, axislen):
         TransientAxis.__init__(self, None, id=axisname)
-        self._virtualLength = axislen # length of the axis
+        self._virtualLength=axislen  # length of the axis
 
     def __len__(self):
         return self._virtualLength
 
-    def __str__ (self):
-        return "<TransientVirtualAxis %s(%d)>"%(self.id, self._virtualLength)
+    def __str__(self):
+        return "<TransientVirtualAxis %s(%d)>" % (self.id, self._virtualLength)
 
-    __repr__ = __str__
+    __repr__=__str__
 
-    def clone (self, copyData=1):
+    def clone(self, copyData=1):
         """clone (self, copyData=1)
         Return a copy of self as a transient virtual axis.
         If copyData is 1, make a separate copy of the data."""
@@ -1747,7 +1817,7 @@ class TransientVirtualAxis(TransientAxis):
 
     def setBounds(self, bounds):
         "No boundaries on virtual axes"
-        self._bounds_ = None
+        self._bounds_=None
 
     def __getitem__(self, key):
         return self.getData()[key]
@@ -1755,79 +1825,84 @@ class TransientVirtualAxis(TransientAxis):
     def __getslice__(self, low, high):
         return self.getData()[low:high]
 
-## PropertiedClasses.initialize_property_class (TransientVirtualAxis)
+# PropertiedClasses.initialize_property_class (TransientVirtualAxis)
 
 # One-dimensional coordinate axis in a CdmsFile.
 class FileAxis(AbstractAxis):
-    
+
     def __init__(self, parent, axisname, obj=None):
-        AbstractAxis.__init__ (self, parent, None)
-        val = self.__cdms_internals__ +['name_in_file',]
-        self.___cdms_internals__ = val
-        self.id = axisname
-        self._obj_ = obj
+        AbstractAxis.__init__(self, parent, None)
+        val=self.__cdms_internals__ + ['name_in_file', ]
+        self.___cdms_internals__=val
+        self.id=axisname
+        self._obj_=obj
         # Overshadows file boundary data, if not None
-        self._boundsArray_ = None
-        (units,typecode,name_in_file,parent_varname,dimtype,ncid) = \
-                   parent._file_.dimensioninfo[axisname]
-        self.__dict__['_units'] = units
-        att = self.attributes
+        self._boundsArray_=None
+        (units, typecode, name_in_file, parent_varname,
+         dimtype, ncid)=parent._file_.dimensioninfo[axisname]
+        self.__dict__['_units']=units
+        att=self.attributes
         att['units']=units
-        self.attributes = att
-        self.name_in_file = self.id
+        self.attributes=att
+        self.name_in_file=self.id
         if name_in_file:
-            self.name_in_file = name_in_file
+            self.name_in_file=name_in_file
         # Combine the attributes of the variable object, if any
         if obj is not None:
             for attname in self._obj_.__dict__.keys():
-                attval = getattr(self._obj_,attname)
+                attval=getattr(self._obj_, attname)
                 if not callable(attval):
-                    self.__dict__[attname]  = attval
-                    att = self.attributes
+                    self.__dict__[attname]=attval
+                    att=self.attributes
                     att[attname]=attval
-                    self.attributes= att
-        
+                    self.attributes=att
+
     def getData(self):
-        if cdmsobj._debug==1:
-            print 'Getting array for axis',self.id
+        if cdmsobj._debug == 1:
+            print 'Getting array for axis', self.id
         if self.parent is None:
             raise CDMSError, FileWasClosed + self.id
         try:
-            result = self.parent._file_.readDimension(self.id)
+            result=self.parent._file_.readDimension(self.id)
         except:
             try:
-                result = apply(self._obj_.getitem, (slice(None,None),))
+                result=apply(self._obj_.getitem, (slice(None, None),))
             except:
-                raise CDMSError,'Data for dimension %s not found'%self.id
+                raise CDMSError, 'Data for dimension %s not found' % self.id
         return result
 
     def typecode(self):
         if self.parent is None:
             raise CDMSError, FileWasClosed + self.id
-        (units,typecode,name_in_file,parent_varname,dimtype,ncid) = \
-                             self.parent._file_.dimensioninfo[self.id]
+        (units, typecode, name_in_file, parent_varname,
+         dimtype, ncid)=self.parent._file_.dimensioninfo[self.id]
         return typecode
-    
+
     def _setunits(self, value):
-        self._units = value
+        self._units=value
         self.attributes['units']=value
         if self.parent is None:
             raise CDMSError, FileWasClosed + self.id
         setattr(self._obj_, 'units', value)
-        (units,typecode,name_in_file,parent_varname,dimtype,ncid) = \
-            self.parent._file_.dimensioninfo[self.id]
-        self.parent._file_.dimensioninfo[self.id] = \
-                  (value,typecode,name_in_file,parent_varname,dimtype,ncid)
+        (units, typecode, name_in_file, parent_varname,
+         dimtype, ncid)=self.parent._file_.dimensioninfo[self.id]
+        self.parent._file_.dimensioninfo[self.id]=(
+    value,
+     typecode,
+     name_in_file,
+     parent_varname,
+     dimtype,
+     ncid)
     def _getunits(self):
         return self._units
 
     def _delunits(self):
         del(self._units)
         del(self.attributes['units'])
-        delattr(self._obj_,'units')
+        delattr(self._obj_, 'units')
 
 
-    def __getattr__(self,name):
+    def __getattr__(self, name):
         if name == 'units':
             return self._units
         try:
@@ -1835,27 +1910,27 @@ class FileAxis(AbstractAxis):
         except:
             raise AttributeError
     # setattr writes external attributes to the file
-    def __setattr__ (self, name, value):
+    def __setattr__(self, name, value):
         if name == 'units':
             self._setunits(value)
             return
         if hasattr(self, 'parent') and self.parent is None:
             raise CDMSError, FileWasClosed + self.id
-##         s = self.get_property_s (name)
-##         if s is not None:
-##             s(self, name, value)
-##             return
-        if not name in self.__cdms_internals__ and name[0]!='_':
+# s = self.get_property_s (name)
+# if s is not None:
+# s(self, name, value)
+# return
+        if not name in self.__cdms_internals__ and name[0] != '_':
             setattr(self._obj_, name, value)
             self.attributes[name]=value
-        self.__dict__[name]  = value
+        self.__dict__[name]=value
 
     # delattr deletes external global attributes in the file
     def __delattr__(self, name):
-##         d = self.get_property_d(name)
-##         if d is not None:
-##             d(self, name)
-##             return
+# d = self.get_property_d(name)
+# if d is not None:
+# d(self, name)
+# return
         if name == "units":
             self._delunits()
             return
@@ -1870,83 +1945,84 @@ class FileAxis(AbstractAxis):
 
     # Read data
     # If the axis has a related Cdunif variable object, just read that variable
-    # otherwise, cache the Cdunif (read-only) data values in self._data_. in this case, 
-    # the axis is not extensible, so it is not necessary to reread it each time.
+    # otherwise, cache the Cdunif (read-only) data values in self._data_. in this case,
+    # the axis is not extensible, so it is not necessary to reread it each
+    # time.
     def __getitem__(self, key):
         if self.parent is None:
             raise CDMSError, FileWasClosed + self.id
         # See __getslice__ comment below.
-        if (self._obj_ is not None) and (self.parent._mode_!='r') and not (hasattr(self.parent,'format') and self.parent.format=="DRS"):
+        if (self._obj_ is not None) and (self.parent._mode_ != 'r') and not (hasattr(self.parent, 'format') and self.parent.format == "DRS"):
             # For negative strides, get the equivalent slice with positive stride,
             # then reverse the result.
-            if (isinstance(key, slice) and (key.step is not None) and key.step<0:
-                posslice = reverseSlice(key,len(self))
-                result = apply(self._obj_.getitem, (posslice,))
+            if (isinstance(key, slice) and (key.step is not None) and key.step < 0:
+                posslice=reverseSlice(key, len(self))
+                result=apply(self._obj_.getitem, (posslice,))
                 return result[::-1]
             else:
-                if isinstance(key, int) and key>=len(self):
-                    raise IndexError, 'Index out of bounds: %d'%key
+                if isinstance(key, int) and key >= len(self):
+                    raise IndexError, 'Index out of bounds: %d' % key
                     if isinstance(key, tuple):
-                    key = (key,)
+                    key=(key,)
                 return apply(self._obj_.getitem, key)
         if self._data_ is None:
-            self._data_ = self.getData()
-        length = len(self._data_)
+            self._data_=self.getData()
+        length=len(self._data_)
         if isinstance(key, int):  # x[i]
-            if key>=length:
+            if key >= length:
                 raise IndexError, 'index out of bounds'
             else:
-                return self._data_[key%length]
-        elif isinstance(key, slice): # x[i:j:k]
+                return self._data_[key % length]
+        elif isinstance(key, slice):  # x[i:j:k]
             return self._data_[key.start:key.stop:key.step]
-        elif isinstance(key, Ellipsis.__class__): # x[...]
+        elif isinstance(key, Ellipsis.__class__):  # x[...]
             return self._data_
         elif isinstance(key, tuple):
-            raise IndexError,'axis is one-dimensional'
+            raise IndexError, 'axis is one-dimensional'
         else:
-            raise IndexError,'index must be an integer or slice: %s'%`key`
+            raise IndexError, 'index must be an integer or slice: %s' % `key`
 
     def __getslice__(self, low, high):
         # Hack to prevent netCDF overflow error on 64-bit architectures
-        high = min(Max32int, high)
-        
+        high=min(Max32int, high)
+
         # Hack to fix a DRS bug: force use of readDimension for DRS axes.
         # Since DRS is read-only here, it is OK just to cache all dimensions.
         if self.parent is None:
             raise CDMSError, FileWasClosed + self.id
-        if (self._obj_ is not None) and (self.parent._mode_!='r') and not (hasattr(self.parent,'format') and self.parent.format=="DRS"):
-            return apply(self._obj_.getslice,(low,high))
+        if (self._obj_ is not None) and (self.parent._mode_ != 'r') and not (hasattr(self.parent, 'format') and self.parent.format == "DRS"):
+            return apply(self._obj_.getslice, (low, high))
         else:
             if self._data_ is None:
-                self._data_ = self.getData()
+                self._data_=self.getData()
             return self._data_[low:high]
 
     def __setitem__(self, index, value):
         if self._obj_ is None:
             raise CDMSError, ReadOnlyAxis + self.id
         if self.parent is None:
-            raise CDMSError, FileWasClosed+self.id
-        return apply(self._obj_.setitem,(index,numpy.ma.filled(value)))
+            raise CDMSError, FileWasClosed + self.id
+        return apply(self._obj_.setitem, (index, numpy.ma.filled(value)))
 
     def __setslice__(self, low, high, value):
         # Hack to prevent netCDF overflow error on 64-bit architectures
-        high = min(Max32int, high)
+        high=min(Max32int, high)
         if self._obj_ is None:
             raise CDMSError, ReadOnlyAxis + self.id
         if self.parent is None:
-            raise CDMSError, FileWasClosed+self.id
-        return apply(self._obj_.setslice,(low,high,numpy.ma.filled(value)))
+            raise CDMSError, FileWasClosed + self.id
+        return apply(self._obj_.setslice, (low, high, numpy.ma.filled(value)))
 
     def __len__(self):
         if self.parent is None:
             raise CDMSError, FileWasClosed + self.id
         if self._obj_ is not None:
-            length = len(self._obj_)
+            length=len(self._obj_)
         elif self._data_ is None:
-            self._data_ = self.getData()
-            length = len(self._data_)
+            self._data_=self.getData()
+            length=len(self._data_)
         else:
-            length = len(self._data_)
+            length=len(self._data_)
         return length
 
     def isLinear(self):
@@ -1954,31 +2030,31 @@ class FileAxis(AbstractAxis):
 
     # Return the bounds array, or generate a default if autobounds mode is set
     def getBounds(self):
-        boundsArray = self.getExplicitBounds()
+        boundsArray=self.getExplicitBounds()
         try:
-            boundsArray = self.validateBounds(boundsArray)
-        except Exception,err:
-            boundsArray = None
-        if boundsArray is None and (getAutoBounds()==1 or (getAutoBounds()==2 and (self.isLatitude() or self.isLongitude()))):
-            boundsArray = self.genGenericBounds()
-            
+            boundsArray=self.validateBounds(boundsArray)
+        except Exception, err:
+            boundsArray=None
+        if boundsArray is None and (getAutoBounds() == 1 or (getAutoBounds() == 2 and (self.isLatitude() or self.isLongitude()))):
+            boundsArray=self.genGenericBounds()
+
         return boundsArray
 
     # Return the bounds array, or None
     def getExplicitBounds(self):
         if self._boundsArray_ is None:
-            boundsArray = None
-            if hasattr(self,'bounds'):
-                boundsName = self.bounds
+            boundsArray=None
+            if hasattr(self, 'bounds'):
+                boundsName=self.bounds
                 try:
-                    boundsVar = self.parent[boundsName]
-                    boundsArray = numpy.ma.filled(boundsVar)
-                    self._boundsArray_ = boundsArray  # for climatology performance
-                except KeyError,err:
+                    boundsVar=self.parent[boundsName]
+                    boundsArray=numpy.ma.filled(boundsVar)
+                    self._boundsArray_=boundsArray  # for climatology performance
+                except KeyError, err:
                     print err
-                    boundsArray = None
+                    boundsArray=None
         else:
-            boundsArray = self._boundsArray_
+            boundsArray=self._boundsArray_
 
         return boundsArray
 
@@ -1989,58 +2065,63 @@ class FileAxis(AbstractAxis):
     # index in the extended dimension (default is index=0).
     # If the bounds variable is new, use the name boundsid, or 'bounds_<varid>'
     # if unspecified.
-    def setBounds(self, bounds, persistent=0, validate=0, index=None, boundsid=None):
+    def setBounds(self, bounds, persistent=0,
+                  validate=0, index=None, boundsid=None):
         if persistent:
             if index is None:
                 if validate:
-                    bounds = self.validateBounds(bounds)
-                index = 0
+                    bounds=self.validateBounds(bounds)
+                index=0
 
             # Create the bound axis, if necessary
-            file = self.parent
+            file=self.parent
             if file._boundAxis_ is None:
 
                 # First look for 'bound' of length two
-                if file.axes.has_key("bound") and len(file.axes["bound"])==2:
-                    file._boundAxis_ = file.axes["bound"]
+                if file.axes.has_key("bound") and len(file.axes["bound"]) == 2:
+                    file._boundAxis_=file.axes["bound"]
                 else:
-                    file._boundAxis_ = file.createVirtualAxis("bound",2)
+                    file._boundAxis_=file.createVirtualAxis("bound", 2)
 
             # Create the boundary variable if necessary
-            if hasattr(self,'bounds'):
-                boundName = self.bounds
-                boundVar = file.variables[boundName]
+            if hasattr(self, 'bounds'):
+                boundName=self.bounds
+                boundVar=file.variables[boundName]
             else:
                 if boundsid is None:
-                    boundName = "bounds_"+self.id
+                    boundName="bounds_" + self.id
                 else:
-                    boundName = boundsid
-                boundVar = file.createVariable(boundName, cdmsNode.NumericToCdType.get(bounds.dtype.char), (self,file._boundAxis_))
+                    boundName=boundsid
+                boundVar=file.createVariable(
+    boundName,
+     cdmsNode.NumericToCdType.get(bounds.dtype.char),
+     (self,
+     file._boundAxis_))
                 # And link to self
-                self.bounds = boundName
-                self._boundsArray_ = None
+                self.bounds=boundName
+                self._boundsArray_=None
 
-            boundVar[index:index+len(bounds)] = bounds
+            boundVar[index:index + len(bounds)]=bounds
 
         else:
-            self._boundsArray_ = copy.copy(bounds)
+            self._boundsArray_=copy.copy(bounds)
 
     def getCalendar(self):
-        if hasattr(self,'calendar'):
-            calendar = self.calendar.lower()
+        if hasattr(self, 'calendar'):
+            calendar=self.calendar.lower()
         elif self.parent is not None and hasattr(self.parent, 'calendar'):
-            calendar = self.parent.calendar.lower()
+            calendar=self.parent.calendar.lower()
         else:
-            calendar = None
+            calendar=None
 
-        cdcal = tagToCalendar.get(calendar, cdtime.DefaultCalendar)
+        cdcal=tagToCalendar.get(calendar, cdtime.DefaultCalendar)
         return cdcal
 
     def isVirtual(self):
         "Return true iff coordinate values are implicitly defined."
 
         # No virtual axes in GrADS files
-        if self.parent is not None and hasattr(self.parent, 'format') and self.parent.format=='GRADS':
+        if self.parent is not None and hasattr(self.parent, 'format') and self.parent.format == 'GRADS':
             return 0
         return (self._obj_ is None)
 
@@ -2050,11 +2131,11 @@ class FileAxis(AbstractAxis):
             return (self.parent._file_.dimensions[self.id] is None)
         else:
             return False
-## PropertiedClasses.set_property (FileAxis, 'units', 
-##                                 acts=FileAxis._setunits,
-##                                 nodelete=1
-##                                )
-## internattr.add_internal_attribute(FileAxis, 'name_in_file')
+# PropertiedClasses.set_property (FileAxis, 'units',
+# acts=FileAxis._setunits,
+# nodelete=1
+# )
+# internattr.add_internal_attribute(FileAxis, 'name_in_file')
 
 class FileVirtualAxis(FileAxis):
     """An axis with no explicit representation of data values in the file.
@@ -2066,8 +2147,8 @@ class FileVirtualAxis(FileAxis):
 
     def __init__(self, parent, axisname, axislen):
         FileAxis.__init__(self, parent, axisname)
-        self._virtualLength = axislen # length of the axis
-        
+        self._virtualLength=axislen  # length of the axis
+
     def __len__(self):
         return self._virtualLength
 
@@ -2078,95 +2159,95 @@ class FileVirtualAxis(FileAxis):
         "Return true iff coordinate values are implicitly defined."
         return 1
 
-## PropertiedClasses.initialize_property_class (FileVirtualAxis)
+# PropertiedClasses.initialize_property_class (FileVirtualAxis)
 
-######## Functions for selecting axes
-def axisMatchAxis (axes, specifications=None, omit=None, order=None):
-    """Given a list of axes and a specification or list of 
+# Functions for selecting axes
+def axisMatchAxis(axes, specifications=None, omit=None, order=None):
+    """Given a list of axes and a specification or list of
      specificatons, and a specification or list of specifications
-     of those axes to omit, return a list of 
-     those axes in the list that match the specification but 
-     do not include in the list any axes that matches an omit 
+     of those axes to omit, return a list of
+     those axes in the list that match the specification but
+     do not include in the list any axes that matches an omit
      specification.
 
      If specifications is None, include all axes less the omitted ones.
 
-     Individual specifications must be integer indices into axes or 
+     Individual specifications must be integer indices into axes or
      matching criteria as detailed in axisMatches.
 
      Axes are returned in the order they occur in the axes argument unless
-     order is given. 
+     order is given.
 
-     order can be a string containing the symbols t,x,y,z, or -. 
-     If a - is given, any elements of the result not chosen otherwise are 
+     order can be a string containing the symbols t,x,y,z, or -.
+     If a - is given, any elements of the result not chosen otherwise are
      filled in from left to right with remaining candidates.
     """
     return [axes[i] for i in \
             axisMatchIndex(axes, specifications, omit, order)]
 
-def axisMatchIndex (axes, specifications=None, omit=None, order=None):
-    """Given a list of axes and a specification or list of 
+def axisMatchIndex(axes, specifications=None, omit=None, order=None):
+    """Given a list of axes and a specification or list of
      specificatons, and a specification or list of specifications
-     of those axes to omit, return a list of the indices of 
-     those axes in the list that match the specification but 
-     do not include in the list any axes that matches an omit 
+     of those axes to omit, return a list of the indices of
+     those axes in the list that match the specification but
+     do not include in the list any axes that matches an omit
      specification.
 
      If specifications is None, include all axes less the omitted ones.
 
-     Individual specifications must be integer indices into axes or 
+     Individual specifications must be integer indices into axes or
      matching criteria as detailed in axisMatches.
 
      The indices of axes are returned in the order the axes
      occur in the axes argument, unless order is given.
 
-     order can be a string containing the symbols t,x,y,z, or -. 
-     If a - is given, any elements of the result not chosen otherwise are 
+     order can be a string containing the symbols t,x,y,z, or -.
+     If a - is given, any elements of the result not chosen otherwise are
      filled in from left to right with remaining candidates.
     """
     if specifications is None:
-        speclist = axes
+        speclist=axes
     elif isinstance(specifications, basestring):
-        speclist = [specifications]
+        speclist=[specifications]
     elif isinstance(specifications, list):
-        speclist = specifications
+        speclist=specifications
     elif isinstance(specifications, tuple):
         speclist=list(specifications)
     elif isinstance(specifications, int):
-        speclist = [specifications]
+        speclist=[specifications]
     elif callable(specifications):
-        speclist = [specifications]
-    else: # to allow arange, etc.
-        speclist = list(numpy.ma.filled(specifications))
+        speclist=[specifications]
+    else:  # to allow arange, etc.
+        speclist=list(numpy.ma.filled(specifications))
 
-    candidates = []
+    candidates=[]
     for i in range(len(axes)):
         for s in speclist:
             if isinstance(s, int):
-                r = (s == i)
+                r=(s == i)
             else:
-                r = axisMatches(axes[i], s)
+                r=axisMatches(axes[i], s)
             if r:
                 candidates.append(i)
                 break
 
     if not candidates:
-        return candidates   #list empty
+        return candidates  # list empty
 
     if omit is None:
-        omitlist = []
+        omitlist=[]
     elif isinstance(omit, basestring):
-        omitlist = [omit]
+        omitlist=[omit]
     elif isinstance(omit, list):
-        omitlist = omit
+        omitlist=omit
     elif isinstance(omit, tuple):
         omitlist=list(omit)
     elif isinstance(omit, int):
-        omitlist = [omit]
+        omitlist=[omit]
     elif callable(omit):
-        omitlist = [omit]
+        omitlist=[omit]
     elif isinstance(omit, AbstractAxis):
-        omitlist = [omit]
+        omitlist=[omit]
     else:
         raise CDMSError, 'Unknown type of omit specifier.'
 
@@ -2179,11 +2260,11 @@ def axisMatchIndex (axes, specifications=None, omit=None, order=None):
         elif isinstance(s, AbstractAxis):
             for i in range(len(candidates)):
                 if s is axes[candidates[i]]:
-                    del candidates[i] 
+                    del candidates[i]
                     break
         else:
             for i in range(len(candidates)):
-                r = axisMatches(axes[candidates[i]], s)
+                r=axisMatches(axes[candidates[i]], s)
                 if r:
                     del candidates[i]
                     break
@@ -2191,31 +2272,31 @@ def axisMatchIndex (axes, specifications=None, omit=None, order=None):
     if order is None:
         return candidates
 
-    n = len(candidates)
-    m = len(order)
-    result = [None]*n
+    n=len(candidates)
+    m=len(order)
+    result=[None] * n
 # this loop is done this way for future escapes where elements of order
 # are not single chars.
-    j = 0
-    io = 0
+    j=0
+    io=0
     while j < n:
         if j >= m or order[io] == '-':
-            result[j] = candidates[0]
+            result[j]=candidates[0]
             del candidates[0]
             j += 1
             io += 1
             continue
         elif order[j] == 't':
-            oj = 'time'
+            oj='time'
             io += 1
         elif order[j] == 'x':
-            oj = 'longitude'
+            oj='longitude'
             io += 1
         elif order[j] == 'y':
-            oj = 'latitude'
+            oj='latitude'
             io += 1
         elif order[j] == 'z':
-            oj = 'level'
+            oj='level'
             io += 1
         else:
             # later could put in escaped ids or indices
@@ -2223,21 +2304,21 @@ def axisMatchIndex (axes, specifications=None, omit=None, order=None):
 
         for i in range(n):
             if axisMatches(axes[candidates[i]], oj):
-                result[j] = candidates[i]
+                result[j]=candidates[i]
                 del candidates[i]
                 break
         else:
             raise CDMSError, "Axis requested in order specification not there"
-        j += 1    
+        j += 1
     return result
-            
+
 
 def axisMatches(axis, specification):
     """Return 1 or 0 depending on whether axis matches the specification.
        Specification must be one of:
-       1. a string representing an axis id or one of 
-          the keywords time, fctau0, latitude or lat, longitude or lon, or 
-          lev or level. 
+       1. a string representing an axis id or one of
+          the keywords time, fctau0, latitude or lat, longitude or lon, or
+          lev or level.
 
           axis may be surrounded with parentheses or spaces.
 
@@ -2249,20 +2330,20 @@ def axisMatches(axis, specification):
           if the value returned is true, the axis matches.
 
        3. an axis object; will match if it is the same object as axis.
-    """   
+    """
     if isinstance(specification, basestring):
-        s = specification.lower()
-        s = s.strip()
+        s=specification.lower()
+        s=s.strip()
         while s[0] == '(':
             if s[-1] != ')':
                 raise CDMSError, 'Malformed axis spec, ' + specification
-            s = s[1:-1].strip()
+            s=s[1:-1].strip()
         if axis.id.lower() == s:
             return 1
         elif (s == 'time') or (s in time_aliases):
-            return axis.isTime() 
+            return axis.isTime()
         elif (s == 'fctau0') or (s in forecast_aliases):
-            return axis.isForecast() 
+            return axis.isForecast()
         elif (s[0:3] == 'lat') or (s in latitude_aliases):
             return axis.isLatitude()
         elif (s[0:3] == 'lon') or (s in longitude_aliases):
@@ -2273,10 +2354,10 @@ def axisMatches(axis, specification):
             return 0
 
     elif callable(specification):
-        r = specification(axis)
-        if r: 
+        r=specification(axis)
+        if r:
             return 1
-        else: 
+        else:
             return 0
 
     elif isinstance(specification, AbstractAxis):
@@ -2284,26 +2365,26 @@ def axisMatches(axis, specification):
 
     raise CDMSError, "Specification not acceptable: "\
           + str(type(specification)) + ', ' + str(specification)
-    
+
 def concatenate(axes, id=None, attributes=None):
     """Concatenate the axes, return a transient axis."""
-    
-    data = numpy.ma.concatenate([ax[:] for ax in axes])
-    boundsArray = [ax.getBounds() for ax in axes]
+
+    data=numpy.ma.concatenate([ax[:] for ax in axes])
+    boundsArray=[ax.getBounds() for ax in axes]
     if None in boundsArray:
-        bounds = None
+        bounds=None
     else:
-        bounds = numpy.ma.concatenate(boundsArray)
+        bounds=numpy.ma.concatenate(boundsArray)
     return TransientAxis(data, bounds=bounds, id=id, attributes=attributes)
 
 def take(ax, indices):
     """Take values indicated by indices list, return a transient axis."""
 
     # Bug in ma compatibility module
-    data = numpy.ma.take(ax[:], indices)
-    abounds = ax.getBounds()
+    data=numpy.ma.take(ax[:], indices)
+    abounds=ax.getBounds()
     if abounds is not None:
-        bounds = numpy.ma.take(abounds, indices, axis=0)
+        bounds=numpy.ma.take(abounds, indices, axis=0)
     else:
-        bounds = None
+        bounds=None
     return TransientAxis(data, bounds=bounds, id=ax.id, attributes=ax.attributes)
diff --git a/Packages/cdms2/Lib/bindex.py b/Packages/cdms2/Lib/bindex.py
index 9156c9709..913d6fdbd 100644
--- a/Packages/cdms2/Lib/bindex.py
+++ b/Packages/cdms2/Lib/bindex.py
@@ -1,9 +1,11 @@
-## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by 
-## Further modified to be pure new numpy June 24th 2008
+# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
+# Further modified to be pure new numpy June 24th 2008
 
 """Bin index for non-rectilinear grids"""
 
-import _bindex, numpy 
+import _bindex
+import numpy
+
 
 def bindexHorizontalGrid(latlin, lonlin):
     """Create a bin index for a horizontal grid.
@@ -12,14 +14,16 @@ def bindexHorizontalGrid(latlin, lonlin):
 
     Returns the index.
     """
-    lonlin = numpy.mod(lonlin,360)
-    NI,NJ = _bindex.getLens()
-    head = numpy.zeros(NI*NJ,dtype='l')       # This should match NBINI, NBINJ in bindex.c
-    next = numpy.zeros(len(latlin),dtype='l')
+    lonlin = numpy.mod(lonlin, 360)
+    NI, NJ = _bindex.getLens()
+    head = numpy.zeros(NI * NJ, dtype='l')
+                       # This should match NBINI, NBINJ in bindex.c
+    next = numpy.zeros(len(latlin), dtype='l')
     _bindex.bindex(latlin, lonlin, head, next)
-    
+
     return (head, next)
 
+
 def intersectHorizontalGrid(latspecs, lonspecs, latlin, lonlin, index):
     """Intersect a horizontal grid with a lat-lon region.
 
@@ -31,7 +35,7 @@ def intersectHorizontalGrid(latspecs, lonspecs, latlin, lonlin, index):
     Returns an array of indices, in latlin/lonlin, of the points in
     the intersection.
     """
-    points = numpy.zeros(len(latlin),dtype='l')
+    points = numpy.zeros(len(latlin), dtype='l')
     if latspecs is None:
         slat = -90.0
         elat = 90.0
@@ -41,14 +45,14 @@ def intersectHorizontalGrid(latspecs, lonspecs, latlin, lonlin, index):
         elat = latspecs[1]
         latopt = latspecs[2]
 
-    if slat>elat:
+    if slat > elat:
         tmp = slat
         slat = elat
         elat = tmp
 
     # If the longitude range is >=360.0, just intersect with the full range.
     # Otherwise, the points array could overflow and generate a seg fault.
-    if lonspecs is None or abs(lonspecs[1]-lonspecs[0])>=360.0:
+    if lonspecs is None or abs(lonspecs[1] - lonspecs[0]) >= 360.0:
         slon = 0.0
         elon = 360.0
         lonopt = 'co'
@@ -57,11 +61,22 @@ def intersectHorizontalGrid(latspecs, lonspecs, latlin, lonlin, index):
         elon = lonspecs[1]
         lonopt = lonspecs[2]
 
-    if slon>elon:
+    if slon > elon:
         tmp = slon
         slon = elon
         elon = tmp
 
-    npoints = _bindex.intersect(slat, slon, elat, elon, latlin, lonlin, index[0], index[1], points, latopt, lonopt)
+    npoints = _bindex.intersect(
+        slat,
+        slon,
+     elat,
+     elon,
+     latlin,
+     lonlin,
+     index[0],
+     index[1],
+     points,
+     latopt,
+     lonopt)
 
     return points[:npoints]
diff --git a/Packages/cdms2/Lib/cache.py b/Packages/cdms2/Lib/cache.py
index c7456b503..12163fe94 100644
--- a/Packages/cdms2/Lib/cache.py
+++ b/Packages/cdms2/Lib/cache.py
@@ -1,8 +1,16 @@
 """
 CDMS cache management and file movement objects
 """
-import cdurllib, urlparse, tempfile, os, time, cdmsobj, sys, errno, shelve
-from error import CDMSError
+import cdurllib
+import urlparse
+import tempfile
+import os
+import time
+import cdmsobj
+import sys
+import errno
+import shelve
+from .error import CDMSError
 MethodNotImplemented = "Method not yet implemented"
 SchemeNotSupported = "Scheme not supported: "
 LockError = "Lock error:"
@@ -14,6 +22,7 @@ _lock_max_tries = 10                    # Number of tries for a lock
 _lock_naptime = 1                       # Seconds between lock tries
 _cache_tempdir = None                   # Default temporary directory
 
+
 def lock(filename):
     """
     Acquire a file-based lock with the given name.
@@ -32,48 +41,50 @@ def lock(filename):
     while (not success) and (tries < _lock_max_tries):
         try:
             if cdmsobj._debug:
-                print 'Process %d: Trying to acquire lock %s'%(os.getpid(),path)
-            fd = os.open(path, os.O_CREAT | os.O_WRONLY | os.O_EXCL, 0666)
+                print 'Process %d: Trying to acquire lock %s' % (os.getpid(), path)
+            fd = os.open(path, os.O_CREAT | os.O_WRONLY | os.O_EXCL, 0o666)
 
         # If the open failed because the file already exists, keep trying, otherwise
         # reraise the error
         except OSError:
-            if sys.exc_value.errno!=errno.EEXIST:
+            if sys.exc_value.errno != errno.EEXIST:
                 raise
             tries = tries + 1
         else:
             if cdmsobj._debug:
-                print 'Process %d: Acquired lock %s after %d tries'%(os.getpid(),path,tries)
+                print 'Process %d: Acquired lock %s after %d tries' % (os.getpid(), path, tries)
             success = 1
             break
 
         # Sleep until next retry
         if cdmsobj._debug:
-            print 'Process %d: Failed to acquire lock %s, sleeping'%(os.getpid(),path)
+            print 'Process %d: Failed to acquire lock %s, sleeping' % (os.getpid(), path)
         time.sleep(_lock_naptime)
 
     # Error if the lock could not be acquired
     if not success:
-        raise CDMSError, LockError + 'Could not acquire a lock on %s'%path
+        raise CDMSError(LockError + 'Could not acquire a lock on %s' % path)
 
     # The lock succeeded, so just close the file - we don't need to write
     # anything here
     else:
         os.close(fd)
 
+
 def unlock(filename):
     """
     Delete a file-based lock with the given name.
-    Usage:unlock(filename) 
+    Usage:unlock(filename)
     If the function returns, the lock was successfully deleted.
     Note: This function is UNIX-specific.
     """
 
     path = lockpath(filename)
     if cdmsobj._debug:
-        print 'Process %d: Unlocking %s'%(os.getpid(),path)
+        print 'Process %d: Unlocking %s' % (os.getpid(), path)
     os.unlink(path)
 
+
 def lockpath(filename):
     """
     Generate the pathname of a lock. Creates the directory containing the lock
@@ -84,12 +95,12 @@ def lockpath(filename):
 
     if not _cache_tempdir:
         tempfile.mktemp()
-        _cache_tempdir = os.path.join(tempfile.tempdir,'cdms')
+        _cache_tempdir = os.path.join(tempfile.tempdir, 'cdms')
         if not os.path.isdir(_cache_tempdir):
             if cdmsobj._debug:
-                print 'Process %d: Creating cache directory %s'%(os.getpid(),_cache_tempdir)
-            os.mkdir(_cache_tempdir,0777)
-    return os.path.join(_cache_tempdir,filename)
+                print 'Process %d: Creating cache directory %s' % (os.getpid(), _cache_tempdir)
+            os.mkdir(_cache_tempdir, 0o777)
+    return os.path.join(_cache_tempdir, filename)
 
 _useWindow = 0                          # If true, use a progress dialog
 _pythonTransfer = 0
@@ -97,6 +108,7 @@ _globusTransfer = 1
 _requestManagerTransfer = 2
 _transferMethod = _pythonTransfer       # Method of transferring files
 
+
 def useWindow():
     """
     Specify that dialog windows should be used if possible. Do not call this directly, use
@@ -105,6 +117,7 @@ def useWindow():
     global _useWindow
     _useWindow = 1
 
+
 def useTTY():
     """
     Informational messages such as FTP status should be sent to the terminal. See useWindow.
@@ -112,6 +125,7 @@ def useTTY():
     global _useWindow
     _useWindow = 0
 
+
 def useGlobusTransfer():
     """
     Specify that file transfers should use the Globus storage API (SC-API). See usePythonTransfer.
@@ -119,6 +133,7 @@ def useGlobusTransfer():
     global _transferMethod
     _transferMethod = _globusTransfer
 
+
 def usePythonTransfer():
     """
     Specify that file transfers should use the Python libraries urllib, ftplib. See useGlobusTransfer.
@@ -126,15 +141,18 @@ def usePythonTransfer():
     global _transferMethod
     _transferMethod = _pythonTransfer
 
+
 def useRequestManagerTransfer():
     try:
         import reqm
     except ImportError:
-        raise CDMSError, RequestManagerNotSupported
+        raise CDMSError(RequestManagerNotSupported)
     global _transferMethod
     _transferMethod = _requestManagerTransfer
 
-def copyFile(fromURL, toURL, callback=None, lcpath=None, userid=None, useReplica=1):
+
+def copyFile(fromURL, toURL, callback=None,
+             lcpath=None, userid=None, useReplica=1):
     """
     Copy file <fromURL> to local file <toURL>. For FTP transfers, if cache._useWindow is true,
     display a progress dialog, otherwise just print progress messages.
@@ -145,15 +163,16 @@ def copyFile(fromURL, toURL, callback=None, lcpath=None, userid=None, useReplica
     """
     if callback is None:
         if _useWindow:
-            import gui
+            from . import gui
             dialogParent = gui.getProgressParent()
             dialog = gui.CdProgressDialog(dialogParent, fromURL)
             callback = gui.updateProgressGui
         else:
             callback = cdurllib.sampleReportHook
-    (scheme,netloc,path,parameters,query,fragment)=urlparse.urlparse(fromURL)
-    if scheme=='ftp':
-        if _transferMethod==_pythonTransfer:
+    (scheme, netloc, path, parameters, query,
+     fragment) = urlparse.urlparse(fromURL)
+    if scheme == 'ftp':
+        if _transferMethod == _pythonTransfer:
             urlopener = cdurllib.CDURLopener()
 
             # In window environment, attach the dialog to the opener. This will
@@ -167,51 +186,57 @@ def copyFile(fromURL, toURL, callback=None, lcpath=None, userid=None, useReplica
             except:
                 if _useWindow:
                     dialog.Destroy()
-                raise 
-        elif _transferMethod==_globusTransfer: # Transfer via Globus SC-API
+                raise
+        elif _transferMethod == _globusTransfer:  # Transfer via Globus SC-API
             try:
                 import globus.storage
             except ImportError:
-                raise CDMSError, GlobusNotSupported
+                raise CDMSError(GlobusNotSupported)
 
-            globus.storage.transfer(fromURL, "file:"+toURL)
+            globus.storage.transfer(fromURL, "file:" + toURL)
         else:
-            raise CDMSError, SchemeNotSupported + scheme
+            raise CDMSError(SchemeNotSupported + scheme)
         return
-    elif _transferMethod==_requestManagerTransfer: # Request manager gransfer
-        import reqm, signal
+    elif _transferMethod == _requestManagerTransfer:  # Request manager gransfer
+        import reqm
+        import signal
 
         # Define an alarm handler, to poll the request manager
         def handler(signum, frame):
             pass
 
-        # Obtain server reference from environment variable ESG_REQM_REF if present
+        # Obtain server reference from environment variable ESG_REQM_REF if
+        # present
         serverRef = os.environ.get('ESG_REQM_REF', '/tmp/esg_rqm.ref')
         server = reqm.RequestManager(iorFile=serverRef)
-        result, token = server.requestFile(userid, lcpath, path, toURL, useReplica)
+        result, token = server.requestFile(
+            userid, lcpath, path, toURL, useReplica)
         server.execute(token)
 
         # Poll the request manager for completion, signalled by estim<=0.0
-        while 1:
+        while True:
             signal.signal(signal.SIGALRM, handler)
             estim = server.estimate(token)
-            print 'Estimate: ',estim
-            if estim<=0.0: break
+            print 'Estimate: ', estim
+            if estim <= 0.0:
+                break
             signal.alarm(3)             # Number of seconds between polls
             signal.pause()
 
         #!!!! Remove this when gsincftp uses the right target name !!!
-            
-##         oldpath = os.path.join(os.path.dirname(toURL),path)
-##         os.rename(oldpath,toURL)
+
+# oldpath = os.path.join(os.path.dirname(toURL),path)
+# os.rename(oldpath,toURL)
 
         #!!!!
-        
+
         return
     else:
-        raise CDMSError, SchemeNotSupported + scheme
+        raise CDMSError(SchemeNotSupported + scheme)
 
 # A simple data cache
+
+
 class Cache:
 
     indexpath = None                    # Path of data cache index
@@ -227,9 +252,10 @@ class Cache:
             except:
                 pass
             lock("index_lock")
-            self.index = shelve.open(self.indexpath) # Persistent cache index
+            self.index = shelve.open(self.indexpath)  # Persistent cache index
             try:
-                os.chmod(self.indexpath,0666) # Make index file world writeable
+                os.chmod(self.indexpath, 0o666)
+                         # Make index file world writeable
             except:
                 pass
             self.index.close()
@@ -237,7 +263,7 @@ class Cache:
             # Clean up pending read notifications in the cache. This will also
             # mess up tranfers in progress...
             self.clean()
-            self.direc = os.path.dirname(self.indexpath) # Cache directory
+            self.direc = os.path.dirname(self.indexpath)  # Cache directory
 
     def get(self, filekey):
         """
@@ -269,7 +295,7 @@ class Cache:
         lock("index_lock")
         try:
             if cdmsobj._debug:
-                print 'Process %d: Adding cache file %s,\n   key %s'%(os.getpid(),path,filekey)
+                print 'Process %d: Adding cache file %s,\n   key %s' % (os.getpid(), path, filekey)
             self.index = shelve.open(self.indexpath)
             self.index[filekey] = path
         except:
@@ -294,7 +320,8 @@ class Cache:
             pass
         unlock("index_lock")
 
-    def copyFile(self, fromURL, filekey, lcpath=None, userid=None, useReplica=None):
+    def copyFile(self, fromURL, filekey,
+                 lcpath=None, userid=None, useReplica=None):
         """
         Copy the file <fromURL> into the cache. Return the result path.
 
@@ -302,9 +329,9 @@ class Cache:
         <userid> is the string user ID, <useReplica> is true iff the request manager should
         search the replica catalog for the actual file to transfer.
         """
-        
+
         # Put a notification into the cache, that this file is being read.
-        self.put(filekey,"__READ_PENDING__")
+        self.put(filekey, "__READ_PENDING__")
 
         # Get a temporary file in the cache
         tempdir = tempfile.tempdir
@@ -314,21 +341,29 @@ class Cache:
 
         # Copy to the temporary file
         try:
-            copyFile(fromURL, toPath, lcpath=lcpath, userid=userid, useReplica=useReplica)
-            os.chmod(toPath,0666)           # Make cache files world writeable
+            copyFile(
+                fromURL,
+                toPath,
+                lcpath=lcpath,
+                userid=userid,
+                useReplica=useReplica)
+            os.chmod(toPath, 0o666)
+                     # Make cache files world writeable
         except:
-            # Remove the notification on error, and the temp file, then re-raise
+            # Remove the notification on error, and the temp file, then
+            # re-raise
             self.deleteEntry(filekey)
             if os.path.isfile(toPath):
                 os.unlink(toPath)
             raise
 
         # Add to the cache index
-        self.put(filekey,toPath)
+        self.put(filekey, toPath)
 
         return toPath
 
-    def getFile(self, fromURL, filekey, naptime=5, maxtries=60, lcpath=None, userid=None, useReplica=None):
+    def getFile(self, fromURL, filekey, naptime=5,
+                maxtries=60, lcpath=None, userid=None, useReplica=None):
         """
         Get the file with <fileURL>. If the file is in the cache, read it.
         If another process is transferring it into the cache, wait for the
@@ -351,23 +386,34 @@ class Cache:
         """
         # If the file is being read into the cache, just wait for it
         tempname = self.get(filekey)
-        # Note: This is not bulletproof: another process could set the cache at this point
+        # Note: This is not bulletproof: another process could set the cache at
+        # this point
         if tempname is None:
-            fpath = self.copyFile(fromURL,filekey,lcpath=lcpath,userid=userid,useReplica=useReplica)
-        elif tempname=="__READ_PENDING__":
+            fpath = self.copyFile(
+                fromURL,
+                filekey,
+                lcpath=lcpath,
+                userid=userid,
+                useReplica=useReplica)
+        elif tempname == "__READ_PENDING__":
             success = 0
             for i in range(maxtries):
                 if cdmsobj._debug:
-                    print 'Process %d: Waiting for read completion, %s'%(os.getpid(),`filekey`)
+                    print 'Process %d: Waiting for read completion, %s' % (os.getpid(), repr(filekey))
                 time.sleep(naptime)
                 tempname = self.get(filekey)
 
                 # The read failed, or the entry was deleted.
                 if tempname is None:
-                    fpath = self.copyFile(fromURL,filekey,lcpath=lcpath,userid=userid,useReplica=useReplica)
+                    fpath = self.copyFile(
+                        fromURL,
+                        filekey,
+                        lcpath=lcpath,
+                        userid=userid,
+                        useReplica=useReplica)
 
                 # The read is not yet complete
-                elif tempname=="__READ_PENDING__":
+                elif tempname == "__READ_PENDING__":
                     continue
 
                 # The read is finished.
@@ -376,13 +422,13 @@ class Cache:
                     success = 1
                     break
             if not success:
-                raise CDMSError, TimeOutError +`filekey`
+                raise CDMSError(TimeOutError + repr(filekey))
 
         else:
             fpath = tempname
 
         if cdmsobj._debug:
-            print 'Process %d: Got file %s from cache %s'%(os.getpid(),fromURL,fpath)
+            print 'Process %d: Got file %s from cache %s' % (os.getpid(), fromURL, fpath)
         return fpath
 
     def delete(self):
@@ -394,10 +440,11 @@ class Cache:
             self.index = shelve.open(self.indexpath)
             for key in self.index.keys():
                 path = self.index[key]
-                if path=="__READ_PENDING__": continue # Don't remove read-pending notifications
+                if path == "__READ_PENDING__":
+                    continue  # Don't remove read-pending notifications
                 try:
                     if cdmsobj._debug:
-                        print 'Process %d: Deleting cache file %s'%(os.getpid(),path)
+                        print 'Process %d: Deleting cache file %s' % (os.getpid(), path)
                     os.unlink(path)
                 except:
                     pass
@@ -415,7 +462,7 @@ class Cache:
         self.index = shelve.open(self.indexpath)
         for key in self.index.keys():
             path = self.index[key]
-            if path=="__READ_PENDING__":
+            if path == "__READ_PENDING__":
                 del self.index[key]
         self.index.close()
         unlock("index_lock")
diff --git a/Packages/cdms2/Lib/cdmsNode.py b/Packages/cdms2/Lib/cdmsNode.py
index 5d82a9526..3e34f34f7 100644
--- a/Packages/cdms2/Lib/cdmsNode.py
+++ b/Packages/cdms2/Lib/cdmsNode.py
@@ -1,5 +1,5 @@
-## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by 
-## Further modified to be pure new numpy June 24th 2008
+# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
+# Further modified to be pure new numpy June 24th 2008
 
 """
 CDMS node classes
@@ -13,10 +13,12 @@ import sys
 from error import CDMSError
 
 # Regular expressions
-_Name = re.compile('[a-zA-Z0-9_:][-a-zA-Z0-9._:]*$') # Note: allows digit as first character
+_Name = re.compile('[a-zA-Z0-9_:][-a-zA-Z0-9._:]*$')
+                   # Note: allows digit as first character
 _Integer = re.compile('[0-9]+$')
 _ArraySep = re.compile('[\[\],\s]+')
-_Illegal = re.compile('([<>&\"\'])|([^\t\r\n -\176\240-\377])')   #" illegal chars in content
+_Illegal = re.compile('([<>&\"\'])|([^\t\r\n -\176\240-\377])')
+                      #" illegal chars in content
 
 # Data types
 
@@ -31,42 +33,51 @@ CdDouble = CDML.CdDouble
 CdString = CDML.CdString
 CdFromObject = CDML.CdFromObject
 CdAny = CDML.CdAny
-CdDatatypes = [CdChar,CdByte,CdShort,CdInt,CdLong,CdInt64,CdFloat,CdDouble,CdString]
+CdDatatypes = [
+    CdChar,
+     CdByte,
+     CdShort,
+     CdInt,
+     CdLong,
+     CdInt64,
+     CdFloat,
+     CdDouble,
+     CdString]
 
 CdScalar = CDML.CdScalar
 CdArray = CDML.CdArray
 
-NumericToCdType = {numpy.sctype2char(numpy.float32):CdFloat,
-                   numpy.sctype2char(numpy.float):CdDouble,
-                   numpy.sctype2char(numpy.int16):CdShort,
-                   numpy.sctype2char(numpy.int32):CdInt,
-                   numpy.sctype2char(numpy.int):CdLong,
-                   numpy.sctype2char(numpy.int64):CdInt64,
-                   numpy.sctype2char(numpy.intc):CdLong,
-                   numpy.sctype2char(numpy.int8):CdByte,
-                   'c':CdChar,
-                   'B':'B',
-                   'H':'H',
-                   'L':'L',
-                   'q':CdInt64,
-                   'Q':'Q',
-                   'S':'S'
+NumericToCdType = {numpy.sctype2char(numpy.float32): CdFloat,
+                   numpy.sctype2char(numpy.float): CdDouble,
+                   numpy.sctype2char(numpy.int16): CdShort,
+                   numpy.sctype2char(numpy.int32): CdInt,
+                   numpy.sctype2char(numpy.int): CdLong,
+                   numpy.sctype2char(numpy.int64): CdInt64,
+                   numpy.sctype2char(numpy.intc): CdLong,
+                   numpy.sctype2char(numpy.int8): CdByte,
+                   'c': CdChar,
+                   'B': 'B',
+                   'H': 'H',
+                   'L': 'L',
+                   'q': CdInt64,
+                   'Q': 'Q',
+                   'S': 'S'
                    }
 
-CdToNumericType = {CdChar:'c',
-                   CdByte:numpy.int8,
-                   CdShort:numpy.int16,
-                   CdInt:numpy.int32,
-                   CdLong:numpy.int,
-                   CdInt64:numpy.int64,
-                   CdFloat:numpy.float32,
-                   CdDouble:numpy.float}
+CdToNumericType = {CdChar: 'c',
+                   CdByte: numpy.int8,
+                   CdShort: numpy.int16,
+                   CdInt: numpy.int32,
+                   CdLong: numpy.int,
+                   CdInt64: numpy.int64,
+                   CdFloat: numpy.float32,
+                   CdDouble: numpy.float}
 
 # Grid types
 UnknownGridType = "unknown"
 GaussianGridType = "gaussian"
 UniformGridType = "uniform"
-CdGridtypes = [UnknownGridType,GaussianGridType,UniformGridType]
+CdGridtypes = [UnknownGridType, GaussianGridType, UniformGridType]
 
 DuplicateIdError = "Duplicate identifier: "
 InvalidArgumentError = "Invalid argument: "
@@ -74,6 +85,8 @@ InvalidDatatype = "Invalid datatype: "
 InvalidGridtype = "Invalid grid type: "
 InvalidIdError = "Invalid identifier: "
 NotMonotonic = "Result array is not monotonic "
+
+
 class NotMonotonicError(CDMSError):
     pass
 
@@ -94,6 +107,8 @@ CdSingleton = 2
 # '"' --> &quot;
 # "'" --> &apos;
 # all other illegal characters are removed #"
+
+
 def mapIllegalToEntity(matchobj):
     s = matchobj.group(0)
     if s == '<':
@@ -102,49 +117,55 @@ def mapIllegalToEntity(matchobj):
         return '&gt;'
     elif s == '&':
         return '&amp;'
-    elif s == '"':   #"
+    elif s == '"':  # "
         return '&quot;'
-    elif s=="'":
+    elif s == "'":
         return '&apos;'
     else:
         return ""
 
 # Named node
+
+
 class CdmsNode:
 
     def __init__(self, tag, id=None, parent=None):
         if id and _Name.match(id) is None:
             raise CDMSError, InvalidIdError + id
-        self.attribute = {}             # External attributes, attribute[name]=(value,cdDatatype)
+        self.attribute = {}
+            # External attributes, attribute[name]=(value,cdDatatype)
         self.child = []                 # Children
         self.id = id                    # Identifier string
         self.parent = parent            # Parent node in a tree, None for root
         self.tag = tag                  # XML tag string
         self.content = None             # XML content string
-        self.dtd = CDML.CDML().dtd.get(self.tag)  # CDML Document Type Definition for this tag
-        self.extra = CDML.CDML().extra.get(self.tag) # Extra datatype constraints
+        self.dtd = CDML.CDML().dtd.get(self.tag)
+                             # CDML Document Type Definition for this tag
+        self.extra = CDML.CDML().extra.get(
+            self.tag)  # Extra datatype constraints
         CdmsNode.mapToExternal(self)    # Don't call subclass mapToExternal!
 
     # Map to external attributes
     def mapToExternal(self):
         if self.id is not None and _Name.match(self.id) is None:
             raise CDMSError, InvalidIdError + self.id
-        if self.id is not None: self.setExternalAttr('id',self.id)
+        if self.id is not None:
+            self.setExternalAttr('id', self.id)
 
     # Set content from a string. The interpretation
     # of content is class-dependent
-    def setContentFromString(self,content):
-        self.content=content
+    def setContentFromString(self, content):
+        self.content = content
 
     # Get content
     def getContent(self):
         return self.content
 
     # Add a child node
-    def add(self,child):
+    def add(self, child):
         if child is not None:
             self.child.append(child)
-            child.parent=self
+            child.parent = self
         return child
 
     # Return a list of child nodes
@@ -152,13 +173,13 @@ class CdmsNode:
         return self.child
 
     # Get the child node at index k
-    def getChildAt(self,index):
+    def getChildAt(self, index):
         return self.child[index]
 
     # Remove and return the child at index k
-    def removeChildAt(self,index):
+    def removeChildAt(self, index):
         child = self.child[index]
-        self.child = self.child[:index]+self.child[index+1:]
+        self.child = self.child[:index] + self.child[index + 1:]
         return child
 
     # Get the number of children
@@ -166,7 +187,7 @@ class CdmsNode:
         return len(self.child)
 
     # Get the index of a node
-    def getIndex(self,node):
+    def getIndex(self, node):
         index = -1
         for i in range(len(self.child)):
             if node is self.child[i]:
@@ -180,20 +201,21 @@ class CdmsNode:
 
     # True iff node is a leaf node
     def isLeaf(self):
-        return self.child==[]
+        return self.child == []
 
     # Set an external attribute
     # 'attr' is an Attr object
     def setExternalAttrFromAttr(self, attr):
-        if attr.value is None: return
-        self.attribute[attr.name]=(attr.value,attr.getDatatype())
+        if attr.value is None:
+            return
+        self.attribute[attr.name] = (attr.value, attr.getDatatype())
 
     # Get an external attribute, as an Attr instance
     def getExternalAttrAsAttr(self, name):
         attrPair = self.attribute.get(name)
         if attrPair:
-            (value,datatype) = attrPair
-            attr = AttrNode(name,value)
+            (value, datatype) = attrPair
+            attr = AttrNode(name, value)
             attr.datatype = datatype
             return attr
         else:
@@ -201,7 +223,7 @@ class CdmsNode:
 
     # Set an external attribute
     def setExternalAttr(self, name, value, datatype=None):
-        attr = AttrNode(name,value)
+        attr = AttrNode(name, value)
         attr.datatype = datatype
         self.setExternalAttrFromAttr(attr)
 
@@ -209,7 +231,7 @@ class CdmsNode:
     def getExternalAttr(self, name):
         attrPair = self.attribute.get(name)
         if attrPair:
-            (value,datatype) = attrPair
+            (value, datatype) = attrPair
             return value
         else:
             return None
@@ -220,71 +242,88 @@ class CdmsNode:
 
     # Set the external attribute dictionary. The input dictionary
     # is of the form {name:value,...} where value is a string.
-    def setExternalDict(self,dict):
+    def setExternalDict(self, dict):
         for key in dict.keys():
-            self.attribute[key]=(dict[key],CdString)
+            self.attribute[key] = (dict[key], CdString)
 
     # Write to a file, with formatting.
     # tablevel is the start number of tabs
-    def write(self,fd=None,tablevel=0,format=1):
-        if fd is None: fd = sys.stdout
+    def write(self, fd=None, tablevel=0, format=1):
+        if fd is None:
+            fd = sys.stdout
         printLimit = get_printoptions()['threshold']
-        set_printoptions(threshold=inf)            # Ensure that all Numeric array values will be printed
+        set_printoptions(threshold=inf)
+                         # Ensure that all Numeric array values will be printed
         if self.dtd:
             validAttrs = self.dtd.keys()
         else:
             validAttrs = None
 
-        if format: fd.write(tablevel*'\t')
-        fd.write('<'+self.tag)
-        if format: fd.write('\n')
+        if format:
+            fd.write(tablevel * '\t')
+        fd.write('<' + self.tag)
+        if format:
+            fd.write('\n')
 
         # Write valid attributes
         for attname in self.attribute.keys():
             if (validAttrs and (attname in validAttrs)) or (not validAttrs):
-                if format: fd.write((tablevel+1)*'\t')
-                (attval,datatype)=self.attribute[attname]
+                if format:
+                    fd.write((tablevel + 1) * '\t')
+                (attval, datatype) = self.attribute[attname]
                 # attvalstr = string.replace(str(attval),'"',"'") # Map " to '
-                attvalstr = _Illegal.sub(mapIllegalToEntity,str(attval))  # Map illegal chars to entities
+                attvalstr = _Illegal.sub(
+    mapIllegalToEntity,
+     str(attval))  # Map illegal chars to entities
                 if format:
-                    fd.write(attname+'\t="'+attvalstr+'"')
+                    fd.write(attname + '\t="' + attvalstr + '"')
                 else:
-                    fd.write(' '+attname+'="'+attvalstr+'"')
-                if format: fd.write('\n')
-        if format: fd.write((tablevel+1)*'\t')
+                    fd.write(' ' + attname + '="' + attvalstr + '"')
+                if format:
+                    fd.write('\n')
+        if format:
+            fd.write((tablevel + 1) * '\t')
         fd.write('>')
-        if format: fd.write('\n')
+        if format:
+            fd.write('\n')
 
         # Write extra attributes
         for attname in self.attribute.keys():
             if validAttrs and (attname not in validAttrs):
-                (attval,datatype)=self.attribute[attname]
-                attr = AttrNode(attname,attval)
-                attr.datatype=datatype
+                (attval, datatype) = self.attribute[attname]
+                attr = AttrNode(attname, attval)
+                attr.datatype = datatype
                 attr.mapToExternal()
-                attr.write(fd,tablevel+1,format)
+                attr.write(fd, tablevel + 1, format)
 
         # Write content
         content = self.getContent()
         if content is not None:
-            content = _Illegal.sub(mapIllegalToEntity,content)  # Map illegal chars to entities
-            if format: fd.write((tablevel+1)*'\t')
+            content = _Illegal.sub(
+    mapIllegalToEntity,
+     content)  # Map illegal chars to entities
+            if format:
+                fd.write((tablevel + 1) * '\t')
             fd.write(content)
-            if format: fd.write('\n')
+            if format:
+                fd.write('\n')
 
         # Write children
         for node in self.child:
-            node.write(fd,tablevel+1,format)
+            node.write(fd, tablevel + 1, format)
 
-        if format: fd.write((tablevel+1)*'\t')
-        fd.write('</'+self.tag+'>')
-        if format: fd.write('\n')
+        if format:
+            fd.write((tablevel + 1) * '\t')
+        fd.write('</' + self.tag + '>')
+        if format:
+            fd.write('\n')
         set_printoptions(threshold=printLimit)  # Restore original
 
-    # Write to a file without formatting. 
-    def write_raw(self,fd=None):
-        if fd is None: fd = sys.stdout
-        self.write(fd,0,0)
+    # Write to a file without formatting.
+    def write_raw(self, fd=None):
+        if fd is None:
+            fd = sys.stdout
+        self.write(fd, 0, 0)
 
     # Write an LDIF (LDAP interchange format) entry
     # parentdn is the parent LDAP distinguished name
@@ -292,41 +331,50 @@ class CdmsNode:
     # A trailing newline is added iff format==1
     # Note: unlike write, this does not write children as well
     def write_ldif(self, parentdn, userAttrs=[], fd=None, format=1):
-        if fd is None: fd = sys.stdout
+        if fd is None:
+            fd = sys.stdout
         if self.dtd:
             validAttrs = self.dtd.keys()
         else:
             validAttrs = None
 
         # Write distinguished name
-        newdn = "%s=%s,%s"%(self.tag,self.id,parentdn)
-        fd.write("dn: %s\n"%newdn)
+        newdn = "%s=%s,%s" % (self.tag, self.id, parentdn)
+        fd.write("dn: %s\n" % newdn)
 
         # Write valid attributes
         for attname in self.attribute.keys():
             if (validAttrs and (attname in validAttrs)) or (not validAttrs):
-                (attval,datatype)=self.attribute[attname]
-                # attvalstr = _Illegal.sub(mapIllegalToEntity,str(attval))  # Map illegal chars to entities
+                (attval, datatype) = self.attribute[attname]
+                # attvalstr = _Illegal.sub(mapIllegalToEntity,str(attval))  #
+                # Map illegal chars to entities
                 if not isinstance(attval, basestring):
                     attval = `attval`
                 attvalstr = attval.strip()
-                attvalstr = re.sub('\n','\n ',attvalstr) # Make sure continuation lines are preceded with a space
-                if attvalstr=='': attvalstr = "none"
-                fd.write("%s: %s\n"%(attname,attvalstr))
-        
+                attvalstr = re.sub(
+    '\n',
+     '\n ',
+     attvalstr)  # Make sure continuation lines are preceded with a space
+                if attvalstr == '':
+                    attvalstr = "none"
+                fd.write("%s: %s\n" % (attname, attvalstr))
+
         # Write extra attributes
         for attname in self.attribute.keys():
             if validAttrs and (attname not in validAttrs):
-                (attval,datatype)=self.attribute[attname]
+                (attval, datatype) = self.attribute[attname]
                 if not isinstance(attval, basestring):
                     attval = `attval`
-                attval = re.sub('\n','\n ',attval) # Make sure continuation lines are preceded with a space
-                fd.write("attr: %s=%s\n"%(attname,attval))
+                attval = re.sub(
+    '\n',
+     '\n ',
+     attval)  # Make sure continuation lines are preceded with a space
+                fd.write("attr: %s=%s\n" % (attname, attval))
 
         # Write content
         # content = self.getContent()
         # if content is not None:
-        #     content = _Illegal.sub(mapIllegalToEntity,content)  # Map illegal chars to entities
+        # content = _Illegal.sub(mapIllegalToEntity,content)  # Map illegal chars to entities
         #     fd.write("value: %s"%(content,))
 
         # Write user attributes
@@ -335,61 +383,64 @@ class CdmsNode:
         else:
             newAttrs = userAttrs
         for entry in list(newAttrs):
-            fd.write("%s\n"%entry)
+            fd.write("%s\n" % entry)
 
         # Write classes
         fd.write("objectclass: top\n")
-        fd.write("objectclass: %s\n"%(self.tag))
+        fd.write("objectclass: %s\n" % (self.tag))
 
-        if format==1:
+        if format == 1:
             fd.write('\n')
 
         return newdn
 
     # Validate attributes
-    def validate(self,idtable=None):
+    def validate(self, idtable=None):
 
         # Check validity of enumerated values and references
         validKeys = self.dtd.keys()
         for attname in self.attribute.keys():
             if attname in validKeys:
-                (atttype,default)=self.dtd[attname]
-                if isinstance(atttype,tuple):
-                    attval=self.getExternalAttr(attname)
-                    assert attval in atttype, 'Invalid attribute %s=%s must be in %s'%(attname,attval,`atttype`)
-                elif atttype==CDML.Idref:
-                    attval=self.getExternalAttr(attname)
+                (atttype, default) = self.dtd[attname]
+                if isinstance(atttype, tuple):
+                    attval = self.getExternalAttr(attname)
+                    assert attval in atttype, 'Invalid attribute %s=%s must be in %s' % (
+                        attname, attval, `atttype`)
+                elif atttype == CDML.Idref:
+                    attval = self.getExternalAttr(attname)
                     if idtable:
                         if not idtable.has_key(attval):
-                            print 'Warning: ID reference not found: %s=%s'%(attname,attval)
-            
+                            print 'Warning: ID reference not found: %s=%s' % (attname, attval)
+
         # Validate children
         for node in self.children():
             node.validate(idtable)
-    
+
 # Container object for other CDMS objects
+
+
 class DatasetNode(CdmsNode):
 
     def __init__(self, id):
-        CdmsNode.__init__(self,"dataset",id )
+        CdmsNode.__init__(self, "dataset", id)
         self.idtable = {}
 
     # Validate the dataset and all child nodes
-    def validate(self,idtable=None):
+    def validate(self, idtable=None):
         if not idtable:
-            idtable=self.idtable
-        CdmsNode.validate(self,idtable)
+            idtable = self.idtable
+        CdmsNode.validate(self, idtable)
 
     # Add a child node with an ID
-    def addId(self,id,child):
-        if self.idtable.has_key(id): 
-            raise CDMSError, DuplicateIdError +id
-        CdmsNode.add(self,child)
-        self.idtable[id]=child
+    def addId(self, id, child):
+        if self.idtable.has_key(id):
+            raise CDMSError, DuplicateIdError + id
+        CdmsNode.add(self, child)
+        self.idtable[id] = child
         return child
 
     # Get a child node from its ID
-    def getChildNamed(self,id):
+    def getChildNamed(self, id):
         return self.idtable.get(id)
 
     # Get the ID table
@@ -399,66 +450,80 @@ class DatasetNode(CdmsNode):
     # Dump to a CDML file.
     # path is the file to dump to, or None for standard output.
     # if format is true, write with tab, newline formatting
-    def dump(self,path=None,format=1):
+    def dump(self, path=None, format=1):
         if path:
             try:
-                fd = open(path,'w')
+                fd = open(path, 'w')
             except IOError:
-                raise IOError,'%s: %s'%(sys.exc_value,path)
+                raise IOError, '%s: %s' % (sys.exc_value, path)
         else:
             fd = sys.stdout
         fd.write('<?xml version="1.0"?>')
-        if format: fd.write('\n')
-        fd.write('<!DOCTYPE dataset SYSTEM "http://www-pcmdi.llnl.gov/software/cdms/cdml.dtd">')
-        if format: fd.write('\n')
-        self.write(fd,0,format)
-        if fd!=sys.stdout: fd.close()
+        if format:
+            fd.write('\n')
+        fd.write(
+            '<!DOCTYPE dataset SYSTEM "http://www-pcmdi.llnl.gov/software/cdms/cdml.dtd">')
+        if format:
+            fd.write('\n')
+        self.write(fd, 0, format)
+        if fd != sys.stdout:
+            fd.close()
 
 # Spatio-temporal variable
 # Two ways to create a variable:
 # (1) var = VariableNode(id,datatype,domain)
 # (2) var = VariableNode(id,datatype)
 #     var.setDomain(domain)
+
+
 class VariableNode(CdmsNode):
 
     # Create a variable.
     # If validate is true, validate immediately
+
     def __init__(self, id, datatype, domain):
-        assert isinstance(datatype,basestring), 'Invalid datatype: '+`datatype`
-        assert datatype in CdDatatypes, 'Invalid datatype: '+`datatype`
-        CdmsNode.__init__(self,"variable",id)
+        assert isinstance(
+    datatype, basestring), 'Invalid datatype: ' + `datatype`
+        assert datatype in CdDatatypes, 'Invalid datatype: ' + `datatype`
+        CdmsNode.__init__(self, "variable", id)
         self.datatype = datatype
         self.setDomain(domain)
         VariableNode.mapToExternal(self)
 
     # Set the domain
-    def setDomain(self,domain):
+    def setDomain(self, domain):
         if not self.isLeaf():
             self.removeChildAt(0)
         self.add(domain)
 
     # Get the domain
     def getDomain(self):
-        if self.getChildCount()>0:
+        if self.getChildCount() > 0:
             return self.getChildAt(0)
         else:
             return None
 
     # Map to external attributes
     def mapToExternal(self):
-        self.setExternalAttr('datatype',self.datatype)
-        
+        self.setExternalAttr('datatype', self.datatype)
+
 # Coordinate axis
+
+
 class AxisNode(CdmsNode):
 
     # If datatype is None, assume values [0,1,..,length-1]
     # data is a numpy array, if specified
-    def __init__(self, id, length, datatype=CdLong,data=None):
-        assert isinstance(length, int), 'Invalid length: '+`length`
-        assert isinstance(datatype, basestring), 'Invalid datatype: '+`datatype`
-        assert datatype in CdDatatypes, 'Invalid datatype: '+`datatype`
-        if data is not None: assert isinstance(data, numpy.ndarray), 'data must be a 1-D Numeric array'
-        CdmsNode.__init__(self,"axis",id)
+
+    def __init__(self, id, length, datatype=CdLong, data=None):
+        assert isinstance(length, int), 'Invalid length: ' + `length`
+        assert isinstance(
+    datatype, basestring), 'Invalid datatype: ' + `datatype`
+        assert datatype in CdDatatypes, 'Invalid datatype: ' + `datatype`
+        if data is not None:
+            assert isinstance(
+    data, numpy.ndarray), 'data must be a 1-D Numeric array'
+        CdmsNode.__init__(self, "axis", id)
         self.datatype = datatype
         self.data = data
         # data representation is CdLinear or CdVector
@@ -477,48 +542,51 @@ class AxisNode(CdmsNode):
 
     # Map to external attributes
     def mapToExternal(self):
-        self.setExternalAttr('datatype',self.datatype)
-        self.setExternalAttr('length',self.length)
+        self.setExternalAttr('datatype', self.datatype)
+        self.setExternalAttr('length', self.length)
 
     # Set data from content string
     # The content of an axis is the data array.
-    def setContentFromString(self,datastring):
+    def setContentFromString(self, datastring):
         datatype = self.datatype
         numericType = CdToNumericType.get(datatype)
-        if numericType is None: raise CDMSError, InvalidDatatype + datatype
+        if numericType is None:
+            raise CDMSError, InvalidDatatype + datatype
         stringlist = _ArraySep.split(datastring)
         numlist = []
         for numstring in stringlist:
-            if numstring=='': continue
+            if numstring == '':
+                continue
             numlist.append(float(numstring))
-        if len(numlist)>0:
+        if len(numlist) > 0:
             # NB! len(zero-length array) causes IndexError on Linux!
-            dataArray = numpy.array(numlist,numericType)
+            dataArray = numpy.array(numlist, numericType)
             self.data = dataArray
             self.length = len(self.data)
 
     # Set the partition from a string. This does not
     # set the external string representation
-    def setPartitionFromString(self,partstring):
+    def setPartitionFromString(self, partstring):
         stringlist = _ArraySep.split(partstring)
         numlist = []
         for numstring in stringlist:
-            if numstring=='': continue
+            if numstring == '':
+                continue
             numlist.append(int(numstring))
-        dataArray = numpy.array(numlist,numpy.int)
-        if len(dataArray)>0:
+        dataArray = numpy.array(numlist, numpy.int)
+        if len(dataArray) > 0:
             self.partition = dataArray
 
     # Get the content string: the data values if the representation
     # is as a vector, or ane empty string otherwise
     def getContent(self):
-        if self.data is None or self.dataRepresent==CdLinear:
+        if self.data is None or self.dataRepresent == CdLinear:
             return ''
         else:
             return str(self.data)
 
     # Set the data as an array, check for monotonicity
-    def setData(self,data):
+    def setData(self, data):
 
         # If this axis is currently linear, remove the linear node
         if self.dataRepresent == CdLinear:
@@ -527,8 +595,8 @@ class AxisNode(CdmsNode):
         self.data = data
         self.dataRepresent = CdVector
         self.length = len(data)
-        self.setExternalAttr('length',self.length)
-        if self.monotonicity()==CdNotMonotonic:
+        self.setExternalAttr('length', self.length)
+        if self.monotonicity() == CdNotMonotonic:
             raise NotMonotonicError, NotMonotonic
 
     # Get the data as an array
@@ -540,9 +608,9 @@ class AxisNode(CdmsNode):
 
     # Set the data as a linear vector
     # If the partition is set, derive the vector length from it
-    def setLinearData(self,linearNode, partition=None):
+    def setLinearData(self, linearNode, partition=None):
         self.data = linearNode
-        if self.getChildCount()>0:
+        if self.getChildCount() > 0:
             self.removeChildAt(0)           # Remove the previous linear node
         self.add(linearNode)
         self.dataRepresent = CdLinear
@@ -553,23 +621,23 @@ class AxisNode(CdmsNode):
             self.partition = partition
             self.length = partition[-1]
             linearNode.length = self.length
-            self.setExternalAttr('partition',str(self.partition))
-        self.setExternalAttr('length',self.length)
+            self.setExternalAttr('partition', str(self.partition))
+        self.setExternalAttr('length', self.length)
 
     # Test if axis data vectors are equal
-    def equal(self,axis):
+    def equal(self, axis):
         # Require that partitions (if any) are equal
         if self.partition is not None and axis.partition is not None:
-            if len(self.partition)!=len(axis.partition):
+            if len(self.partition) != len(axis.partition):
                 return 0
-            if not numpy.alltrue(numpy.equal(self.partition,axis.partition)):
+            if not numpy.alltrue(numpy.equal(self.partition, axis.partition)):
                 return 0
         elif self.partition is not None or axis.partition is not None:
             return 0
-        
+
         if self.dataRepresent == axis.dataRepresent == CdVector:
             try:
-                return numpy.alltrue(numpy.equal(self.data,axis.data))
+                return numpy.alltrue(numpy.equal(self.data, axis.data))
             except ValueError:
                 return 0
         elif self.dataRepresent == axis.dataRepresent == CdLinear:
@@ -581,34 +649,34 @@ class AxisNode(CdmsNode):
 
     # Test if axis data vectors are element-wise close
     # True iff for each respective element a and b, abs((b-a)/b)<=eps
-    def isClose(self,axis,eps):
-        if eps==0:
+    def isClose(self, axis, eps):
+        if eps == 0:
             return self.equal(axis)
         if self.dataRepresent == axis.dataRepresent == CdVector:
             try:
-                return numpy.alltrue(numpy.less_equal(numpy.absolute(self.data-axis.data),numpy.absolute(eps*self.data)))
+                return numpy.alltrue(numpy.less_equal(numpy.absolute(self.data - axis.data), numpy.absolute(eps * self.data)))
             except ValueError:
                 return 0
         elif self.dataRepresent == axis.dataRepresent == CdLinear:
-            return self.data.isClose(axis.data,eps)
+            return self.data.isClose(axis.data, eps)
         elif self.dataRepresent == CdVector:
-            return axis.data.isCloseVector(self.data,eps)
+            return axis.data.isCloseVector(self.data, eps)
         else:
-            return self.data.isCloseVector(axis.data,eps)
+            return self.data.isCloseVector(axis.data, eps)
 
     # Test for strict monotonicity.
     # Returns CdNotMonotonic, CdIncreasing, CdDecreasing, or CdSingleton
     def monotonicity(self):
         if self.dataRepresent == CdLinear:
             return self.data.monotonicity()
-        elif self.length==1:
+        elif self.length == 1:
             return CdSingleton
         else:
             first = self.data[:-1]
             second = self.data[1:]
-            if numpy.alltrue(numpy.less(first,second)):
+            if numpy.alltrue(numpy.less(first, second)):
                 return CdIncreasing
-            elif numpy.alltrue(numpy.greater(first,second)):
+            elif numpy.alltrue(numpy.greater(first, second)):
                 return CdDecreasing
             else:
                 return CdNotMonotonic
@@ -616,24 +684,24 @@ class AxisNode(CdmsNode):
     # Extend axes. 'isreltime' is true iff
     # the axes are relative time axes
     # If allowgaps is true, allow gaps when extending linear vectors
-    def extend(self,axis,isreltime=0,allowgaps=0):
+    def extend(self, axis, isreltime=0, allowgaps=0):
         # Set trylin true if should try to catenate linear vectors
-        if self.dataRepresent==CdLinear:
+        if self.dataRepresent == CdLinear:
             anode = self.data
-            if axis.dataRepresent==CdLinear:
+            if axis.dataRepresent == CdLinear:
                 bnode = axis.data
                 trylin = 1
-            elif axis.length==1:
+            elif axis.length == 1:
                 bnode = LinearDataNode(axis.data[0], 0.0, 1)
                 trylin = 1
             else:
                 trylin = 0
-        elif self.length==1: 
+        elif self.length == 1:
             anode = LinearDataNode(self.data[0], 0.0, 1)
-            if axis.dataRepresent==CdLinear:
+            if axis.dataRepresent == CdLinear:
                 bnode = axis.data
                 trylin = 1
-            elif axis.length==1:
+            elif axis.length == 1:
                 bnode = LinearDataNode(axis.data[0], 0.0, 1)
                 trylin = 1
             else:
@@ -641,25 +709,25 @@ class AxisNode(CdmsNode):
         else:
             trylin = 0
 
-        if isreltime==1:
+        if isreltime == 1:
             units1 = self.getExternalAttr('units')
             units2 = axis.getExternalAttr('units')
         else:
             units1 = units2 = None
 
-        if trylin==1:
+        if trylin == 1:
             try:
                 aindex = 0
                 alength = anode.length
                 bindex = alength
                 blength = bnode.length
-                if isreltime==1 and units1 and units2 and units1!=units2:
-                    rtime = cdtime.reltime(bnode.start,units2)
+                if isreltime == 1 and units1 and units2 and units1 != units2:
+                    rtime = cdtime.reltime(bnode.start, units2)
                     offset = rtime.torel(units1).value
-                    bnode.start = bnode.start+offset
+                    bnode.start = bnode.start + offset
                 else:
                     offset = None
-                linNode = anode.concatenate(bnode,allowgaps)
+                linNode = anode.concatenate(bnode, allowgaps)
             except NotMonotonicError:
                 # The dimensions cannot be extended as linear arrays,
                 # so try to extend them as vectors
@@ -667,15 +735,20 @@ class AxisNode(CdmsNode):
             else:
                 # Extend the partition attribute
                 if offset is not None:
-                    bindex = int(offset/linNode.delta+0.5)
-                if self.partition  is None:
-                    partition = numpy.array([aindex,aindex+alength,bindex,bindex+blength])
-                    self.partition_length = alength+blength
+                    bindex = int(offset / linNode.delta + 0.5)
+                if self.partition is None:
+                    partition = numpy.array(
+    [aindex,
+     aindex + alength,
+     bindex,
+     bindex + blength])
+                    self.partition_length = alength + blength
                 else:
-                    partition = numpy.concatenate((self.partition,[bindex,bindex+blength]))
-                    self.partition_length = self.partition_length+blength
-                self.setLinearData(linNode,partition)
-                self.setExternalAttr('partition_length',self.partition_length)
+                    partition = numpy.concatenate(
+    (self.partition, [bindex, bindex + blength]))
+                    self.partition_length = self.partition_length + blength
+                self.setLinearData(linNode, partition)
+                self.setExternalAttr('partition_length', self.partition_length)
                 return self
 
         # Else get both axis vectors, concatenate
@@ -688,29 +761,31 @@ class AxisNode(CdmsNode):
         blength = len(ar2)
 
         # Adjust array2 if relative time and units differ
-        if isreltime==1:
+        if isreltime == 1:
             if units1 and units2 and units1 != units2:
-                rtime = cdtime.reltime(0.0,units2)
+                rtime = cdtime.reltime(0.0, units2)
                 delta = rtime.torel(units1).value
-                ar2 = ar2+delta
+                ar2 = ar2 + delta
 
-        ar = numpy.concatenate((ar1,ar2))
+        ar = numpy.concatenate((ar1, ar2))
         try:
             self.setData(ar)
         except NotMonotonicError:
             # Restore original array and resignal
             self.setData(ar1)
-            raise NotMonotonicError, NotMonotonic+`ar`
+            raise NotMonotonicError, NotMonotonic + `ar`
 
         # Extend the partition attribute
-        if self.partition  is None:
-            self.partition = numpy.array([aindex,aindex+alength,bindex,bindex+blength])
-            self.partition_length = alength+blength
+        if self.partition is None:
+            self.partition = numpy.array(
+    [aindex, aindex + alength, bindex, bindex + blength])
+            self.partition_length = alength + blength
         else:
-            self.partition = numpy.concatenate((self.partition,[bindex,bindex+blength]))
-            self.partition_length = self.partition_length+blength
-        self.setExternalAttr('partition',str(self.partition))
-        self.setExternalAttr('partition_length',self.partition_length)
+            self.partition = numpy.concatenate(
+                (self.partition, [bindex, bindex + blength]))
+            self.partition_length = self.partition_length + blength
+        self.setExternalAttr('partition', str(self.partition))
+        self.setExternalAttr('partition_length', self.partition_length)
 
         return self
 
@@ -718,16 +793,21 @@ class AxisNode(CdmsNode):
         return len(self.data)
 
 # Linear data element
+
+
 class LinearDataNode(CdmsNode):
 
-    validStartTypes = [int, float, type(cdtime.comptime(0)), type(cdtime.reltime(0,"hours"))]
+    validStartTypes = [
+        int, float, type(cdtime.comptime(0)), type(cdtime.reltime(0, "hours"))]
     validDeltaTypes = [int, float, list]
 
     def __init__(self, start, delta, length):
-        assert isinstance(start, numpy.floating) or isinstance(start, numpy.integer) or (type(start) in self.validStartTypes), 'Invalid start argument: '+`start`
-        assert isinstance(start, numpy.floating) or isinstance(start, numpy.integer) or (type(delta) in self.validDeltaTypes), 'Invalid delta argument: '+`delta`
-        assert isinstance(length, int), 'Invalid length argument: '+`length`
-        CdmsNode.__init__(self,"linear")
+        assert isinstance(start, numpy.floating) or isinstance(start, numpy.integer) or (
+            type(start) in self.validStartTypes), 'Invalid start argument: ' + `start`
+        assert isinstance(start, numpy.floating) or isinstance(start, numpy.integer) or (
+            type(delta) in self.validDeltaTypes), 'Invalid delta argument: ' + `delta`
+        assert isinstance(length, int), 'Invalid length argument: ' + `length`
+        CdmsNode.__init__(self, "linear")
         self.delta = delta
         self.length = length
         self.start = start
@@ -735,53 +815,57 @@ class LinearDataNode(CdmsNode):
 
     # Get an indexed value
     def __getitem__(self, index):
-        return self.start + index*self.delta
+        return self.start + index * self.delta
 
     # Map to external attributes
     def mapToExternal(self):
-        self.setExternalAttr("start",self.start)
-        self.setExternalAttr("delta",self.delta)
-        self.setExternalAttr("length",self.length)
+        self.setExternalAttr("start", self.start)
+        self.setExternalAttr("delta", self.delta)
+        self.setExternalAttr("length", self.length)
 
     # Equality of linear vectors
-    def equal(self,axis):
-        return self.delta==axis.delta and self.length==axis.length and self.start==axis.start
+    def equal(self, axis):
+        return self.delta == axis.delta and self.length == axis.length and self.start == axis.start
 
     # Closeness of linear vectors
-    def isClose(self,axis,eps):
-        if eps==0:
+    def isClose(self, axis, eps):
+        if eps == 0:
             return self.equal(axis)
         else:
-            return self.delta==axis.delta and self.length==axis.length and abs(self.start-axis.start)<=abs(eps*self.start)
+            return self.delta == axis.delta and self.length == axis.length and abs(self.start - axis.start) <= abs(eps * self.start)
 
     # Equality of linear vector and array
-    def equalVector(self,ar):
-        diff = ar[1:]-ar[:-1]
+    def equalVector(self, ar):
+        diff = ar[1:] - ar[:-1]
         try:
-            comp = numpy.alltrue(numpy.equal((self.delta)*numpy.ones(self.length-1),diff))
+            comp = numpy.alltrue(
+    numpy.equal((self.delta) * numpy.ones(self.length - 1), diff))
         except ValueError:
             return 0
         return comp
 
     # Closeness of linear vector and array
-    def isCloseVector(self,ar,eps):
-        if eps==0:
+    def isCloseVector(self, ar, eps):
+        if eps == 0:
             return self.equalVector(ar)
-        diff = ar[1:]-ar[:-1]
-        diff2 = self.delta*numpy.ones(self.length-1)
+        diff = ar[1:] - ar[:-1]
+        diff2 = self.delta * numpy.ones(self.length - 1)
         try:
-            comp = numpy.alltrue(numpy.less_equal(numpy.absolute(diff2-diff),numpy.absolute(eps*diff2)))
+            comp = numpy.alltrue(
+    numpy.less_equal(numpy.absolute(diff2 - diff),
+     numpy.absolute(eps * diff2)))
         except ValueError:
             return 0
         return comp
 
-    # Return monotonicity: CdNotMonotonic, CdIncreasing, CdDecreasing, or CdSingleton
+    # Return monotonicity: CdNotMonotonic, CdIncreasing, CdDecreasing, or
+    # CdSingleton
     def monotonicity(self):
-        if self.length==1:
+        if self.length == 1:
             return CdSingleton
-        elif self.delta>0.0:
+        elif self.delta > 0.0:
             return CdIncreasing
-        elif self.delta<0.0:
+        elif self.delta < 0.0:
             return CdDecreasing
         else:
             return CdNotMonotonic
@@ -789,34 +873,39 @@ class LinearDataNode(CdmsNode):
     # Return a vector representation, given a CDMS datatype
     def toVector(self, datatype):
         numericType = CdToNumericType.get(datatype)
-        if numericType is None: raise CDMSError, InvalidDatatype + datatype
+        if numericType is None:
+            raise CDMSError, InvalidDatatype + datatype
         start = self.start
         delta = self.delta
         length = self.length
-        if length>1:
-            stop = start + (length-0.99)*delta
-            if delta==0.0: delta=1.0
-            ar = numpy.arange(start,stop,delta,numericType)
+        if length > 1:
+            stop = start + (length - 0.99) * delta
+            if delta == 0.0:
+                delta = 1.0
+            ar = numpy.arange(start, stop, delta, numericType)
         else:
-            ar = numpy.array([start],numericType)
+            ar = numpy.array([start], numericType)
         return ar
 
     # Concatenate linear arrays, preserving linearity
     # If allowgaps is set, don't require that the linear arrays be contiguous
     # Return a new linear node
-    def concatenate(self,linearNode,allowgaps=0):
-        if self.length>1 and linearNode.length>1 and self.delta != linearNode.delta:
-            raise NotMonotonicError, NotMonotonic + 'linear vector deltas do not match: %s,%s'%(`self.delta`,`linearNode.delta`)
+    def concatenate(self, linearNode, allowgaps=0):
+        if self.length > 1 and linearNode.length > 1 and self.delta != linearNode.delta:
+            raise NotMonotonicError, NotMonotonic + \
+                'linear vector deltas do not match: %s,%s' % (
+                    `self.delta`, `linearNode.delta`)
 
-        if self.length>1:
+        if self.length > 1:
             delta = self.delta
-        elif linearNode.length>1:
+        elif linearNode.length > 1:
             delta = linearNode.delta
         else:
             delta = linearNode.start - self.start
-        if allowgaps==0:
-            if linearNode.start-self.start != self.length*delta:
-                raise NotMonotonicError, NotMonotonic + 'linear vectors are not contiguous'
+        if allowgaps == 0:
+            if linearNode.start - self.start != self.length * delta:
+                raise NotMonotonicError, NotMonotonic + \
+                    'linear vectors are not contiguous'
         length = self.length + linearNode.length
         return LinearDataNode(self.start, delta, length)
 
@@ -824,12 +913,16 @@ class LinearDataNode(CdmsNode):
         return self.length
 
 # Rectilinear lat-lon grid
+
+
 class RectGridNode(CdmsNode):
 
     # Create a grid
     # All arguments are strings
-    def __init__(self, id, latitude, longitude, gridtype=UnknownGridType, order="yx", mask=None):
-        CdmsNode.__init__(self,"rectGrid",id)
+
+    def __init__(self, id, latitude, longitude,
+                 gridtype=UnknownGridType, order="yx", mask=None):
+        CdmsNode.__init__(self, "rectGrid", id)
         self.latitude = latitude
         self.longitude = longitude
         self.gridtype = gridtype
@@ -839,17 +932,20 @@ class RectGridNode(CdmsNode):
 
     # Map to external attributes
     def mapToExternal(self):
-        self.setExternalAttr('type',self.gridtype)
+        self.setExternalAttr('type', self.gridtype)
         self.setExternalAttr('latitude', self.latitude)
-        self.setExternalAttr('longitude',self.longitude)
-        self.setExternalAttr('order',self.order)
-        if self.mask is not None: self.setExternalAttr('mask',self.mask)
+        self.setExternalAttr('longitude', self.longitude)
+        self.setExternalAttr('order', self.order)
+        if self.mask is not None:
+            self.setExternalAttr('mask', self.mask)
 
 # Link to an external element
+
+
 class XLinkNode(CdmsNode):
 
     def __init__(self, id, uri, contentRole, content=''):
-        CdmsNode.__init__(self,"xlink",id)
+        CdmsNode.__init__(self, "xlink", id)
         self.uri = uri
         self.contentRole = contentRole
         self.content = content
@@ -857,33 +953,39 @@ class XLinkNode(CdmsNode):
 
     # Map to external attributes
     def mapToExternal(self):
-        self.setExternalAttr("href",self.uri,CdString)
-        self.setExternalAttr("content-role",self.contentRole,CdString)
+        self.setExternalAttr("href", self.uri, CdString)
+        self.setExternalAttr("content-role", self.contentRole, CdString)
 
 # Link to a document
+
+
 class DocLinkNode(CdmsNode):
 
     def __init__(self, uri, content=''):
-        CdmsNode.__init__(self,"doclink")
+        CdmsNode.__init__(self, "doclink")
         self.uri = uri
         self.content = content
         DocLinkNode.mapToExternal(self)
 
     # Map to external attributes
     def mapToExternal(self):
-        self.setExternalAttr("href",self.uri,CdString)
+        self.setExternalAttr("href", self.uri, CdString)
 
 # Domain
+
+
 class DomainNode(CdmsNode):
 
     def __init__(self):
-        CdmsNode.__init__(self,"domain")
+        CdmsNode.__init__(self, "domain")
 
 # Domain element
+
+
 class DomElemNode(CdmsNode):
 
     def __init__(self, name, start=None, length=None):
-        CdmsNode.__init__(self,"domElem")
+        CdmsNode.__init__(self, "domElem")
         self.name = name
         self.start = start
         self.length = length
@@ -891,14 +993,16 @@ class DomElemNode(CdmsNode):
 
     # Map to external attributes
     def mapToExternal(self):
-        self.setExternalAttr('name',self.name)
-        if self.start is not None: self.setExternalAttr('start',self.start)
-        if self.length is not None: self.setExternalAttr('length',self.length)
+        self.setExternalAttr('name', self.name)
+        if self.start is not None:
+            self.setExternalAttr('start', self.start)
+        if self.length is not None:
+            self.setExternalAttr('length', self.length)
 
     # Set the name
-    def setName(self,name):
+    def setName(self, name):
         self.name = name
-        self.setExternalAttr('name',self.name)
+        self.setExternalAttr('name', self.name)
 
     # Get the name
     def getName(self):
@@ -906,78 +1010,85 @@ class DomElemNode(CdmsNode):
 
     # Write to a file, with formatting.
     # tablevel is the start number of tabs
-    def write(self,fd=None,tablevel=0,format=1):
-        if fd is None: fd = sys.stdout
-        if format: fd.write(tablevel*'\t')
-        fd.write('<'+self.tag)
+    def write(self, fd=None, tablevel=0, format=1):
+        if fd is None:
+            fd = sys.stdout
+        if format:
+            fd.write(tablevel * '\t')
+        fd.write('<' + self.tag)
         for attname in self.attribute.keys():
-            (attval,datatype)=self.attribute[attname]
+            (attval, datatype) = self.attribute[attname]
             # attvalstr = string.replace(str(attval),'"',"'") # Map " to '
-            attvalstr = _Illegal.sub(mapIllegalToEntity,str(attval))  # Map illegal chars to entities
-            fd.write(' '+attname+'="'+attvalstr+'"')
+            attvalstr = _Illegal.sub(
+    mapIllegalToEntity,
+     str(attval))  # Map illegal chars to entities
+            fd.write(' ' + attname + '="' + attvalstr + '"')
         fd.write('/>')
-        if format: fd.write('\n')
+        if format:
+            fd.write('\n')
 
 # Attribute node - only used as a placeholder during parse and write
 #   Attr nodes are not placed on the tree
 #
 # Two ways to create an Attr object:
 # (1) attr = AttrNode(name,value)
-#     datatype = sometype # optionally, to override intrinsic type
+# datatype = sometype # optionally, to override intrinsic type
 # (2) attr = AttrNode(name,None)
 #     attr.setValueFromString(somestring,sometype)
+
+
 class AttrNode(CdmsNode):
 
     def __init__(self, name, value=None):
-        CdmsNode.__init__(self,"attr")
-        if not (isinstance(value,(int, numpy.integer, float, numpy.floating, basestring)) \
+        CdmsNode.__init__(self, "attr")
+        if not (isinstance(value, (int, numpy.integer, float, numpy.floating, basestring))
                 or value is None:
-            raise CDMSError, 'Invalid attribute type: '+`value`
-        self.name = name
-        self.value = value
-        self.datatype = None            # CDMS datatype, use getDatatype to retrieve
-        self.content = ''             # string content
+            raise CDMSError, 'Invalid attribute type: ' + `value`
+        self.name=name
+        self.value=value
+        self.datatype=None            # CDMS datatype, use getDatatype to retrieve
+        self.content=''             # string content
 
     # Note: mapToExternal is not called at init time, must be called explicitly
     #   if needed
     def mapToExternal(self):
-        self.attribute['name']=(self.name,CdString)
-        self.attribute['datatype']=(self.getDatatype(),CdString)
-        self.content = self.getValueAsString()
+        self.attribute['name']=(self.name, CdString)
+        self.attribute['datatype']=(self.getDatatype(), CdString)
+        self.content=self.getValueAsString()
 
     def getDatatype(self):
         if self.datatype:
             return self.datatype
         elif isinstance(self.value, basestring):
             return CdString
-        elif isinstance(self.value, (float,numpy.floating)):
+        elif isinstance(self.value, (float, numpy.floating)):
             return CdDouble
         elif isinstance(self.value, (int, numpy.integer)):
             return CdLong
         else:
-            raise CDMSError, 'Invalid attribute type: '+`self.value`
+            raise CDMSError, 'Invalid attribute type: ' + `self.value`
 
     def getLength(self):
         return 1
 
     # Map a string of a given datatype to a value
     #   Returns ValueError if the conversion fails
-    def setValueFromString(self,valString,datatype):
-        val = None
+    def setValueFromString(self, valString, datatype):
+        val=None
         if not isinstance(valString, basestring):
             raise CDMSError, 'input value is not a string'
         if datatype == CdString:
             val=valString
-        elif datatype in (CdShort,CdInt,CdLong):
+        elif datatype in (CdShort, CdInt, CdLong):
             try:
                 val=int(valString)
             except ValueError:
-                raise CDMSError, 'value is not an integer: '+valString
-        elif datatype in (CdFloat,CdDouble):
+                raise CDMSError, 'value is not an integer: ' + valString
+        elif datatype in (CdFloat, CdDouble):
             try:
                 val=float(valString)
             except ValueError:
-                raise CDMSError, 'value is not floating-point: '+valString
+                raise CDMSError, 'value is not floating-point: ' + valString
         self.value=val
         self.datatype=datatype
         return val
@@ -987,36 +1098,40 @@ class AttrNode(CdmsNode):
 
     # Set content
     # This may be called multiple times, so append
-    def setContentFromString(self,content):
-        self.content = self.content+content
+    def setContentFromString(self, content):
+        self.content=self.content + content
 
     # Write to a file, with formatting.
     # tablevel is the start number of tabs
-    def write(self,fd=None,tablevel=0,format=1):
-        if fd is None: fd = sys.stdout
+    def write(self, fd=None, tablevel=0, format=1):
+        if fd is None: fd=sys.stdout
         if self.dtd:
-            validAttrs = self.dtd.keys()
+            validAttrs=self.dtd.keys()
         else:
-            validAttrs = None
+            validAttrs=None
 
-        if format: fd.write(tablevel*'\t')
-        fd.write('<'+self.tag)
+        if format: fd.write(tablevel * '\t')
+        fd.write('<' + self.tag)
 
         # Write valid attributes
         for attname in self.attribute.keys():
             if (validAttrs and (attname in validAttrs)) or (not validAttrs):
-                (attval,datatype)=self.attribute[attname]
+                (attval, datatype)=self.attribute[attname]
                 # attvalstr = string.replace(str(attval),'"',"'") # Map " to '
-                attvalstr = _Illegal.sub(mapIllegalToEntity,str(attval))  # Map illegal chars to entities
-                fd.write(' '+attname+'="'+attvalstr+'"')
+                attvalstr=_Illegal.sub(
+    mapIllegalToEntity,
+     str(attval))  # Map illegal chars to entities
+                fd.write(' ' + attname + '="' + attvalstr + '"')
         fd.write('>')
 
         # Write content
         if self.content is not None:
-            content = _Illegal.sub(mapIllegalToEntity,self.content)  # Map illegal chars to entities
+            content=_Illegal.sub(
+    mapIllegalToEntity,
+     self.content)  # Map illegal chars to entities
             fd.write(content)
 
-        fd.write('</'+self.tag+'>')
+        fd.write('</' + self.tag + '>')
         if format: fd.write('\n')
 
 if __name__ == '__main__':
@@ -1049,7 +1164,7 @@ if __name__ == '__main__':
     # hAxis = AxisNode('h',len(h),CdDouble,h)
     # jAxis = AxisNode('j',len(j),CdDouble); jAxis.setLinearData(j)
     # kAxis = AxisNode('k',len(k),CdDouble,k)
-    
+
     # print aAxis.monotonicity()
     # print hAxis.monotonicity()
     # print kAxis.monotonicity()
@@ -1057,29 +1172,29 @@ if __name__ == '__main__':
     # print dAxis.monotonicity()
     # print jAxis.monotonicity()
 
-    m = LinearDataNode(1,2,3)
-    n = LinearDataNode(11,2,3)
-    p = LinearDataNode(15,-4,3)
-    q = numpy.array([4.,2.,1.])
-    r = numpy.array([11.,9.,8.])
-    s = numpy.array([7.])
-    t = numpy.array([9.])
-    v = numpy.array([5.])
-
-    mAxis = AxisNode('m',len(m),CdLong); mAxis.setLinearData(m)
-    nAxis = AxisNode('n',len(n),CdLong); nAxis.setLinearData(n)
-    pAxis = AxisNode('p',len(p),CdLong); pAxis.setLinearData(p)
-    qAxis = AxisNode('q',len(q),CdDouble,q)
-    rAxis = AxisNode('r',len(r),CdDouble,r)
-    sAxis = AxisNode('s',len(s),CdDouble,s)
-    tAxis = AxisNode('t',len(t),CdDouble,t)
-    vAxis = AxisNode('v',len(v),CdDouble,v)
+    m=LinearDataNode(1, 2, 3)
+    n=LinearDataNode(11, 2, 3)
+    p=LinearDataNode(15, -4, 3)
+    q=numpy.array([4., 2., 1.])
+    r=numpy.array([11., 9., 8.])
+    s=numpy.array([7.])
+    t=numpy.array([9.])
+    v=numpy.array([5.])
+
+    mAxis=AxisNode('m', len(m), CdLong); mAxis.setLinearData(m)
+    nAxis=AxisNode('n', len(n), CdLong); nAxis.setLinearData(n)
+    pAxis=AxisNode('p', len(p), CdLong); pAxis.setLinearData(p)
+    qAxis=AxisNode('q', len(q), CdDouble, q)
+    rAxis=AxisNode('r', len(r), CdDouble, r)
+    sAxis=AxisNode('s', len(s), CdDouble, s)
+    tAxis=AxisNode('t', len(t), CdDouble, t)
+    vAxis=AxisNode('v', len(v), CdDouble, v)
 
     def printType(axis):
-        if axis.dataRepresent==CdLinear: print 'linear'
+        if axis.dataRepresent == CdLinear: print 'linear'
         else: print 'vector'
-        
-    def testit(a,b):
+
+    def testit(a, b):
         import copy
         x=copy.copy(a)
         print x.extend(b).getData()
@@ -1095,6 +1210,6 @@ if __name__ == '__main__':
     # testit(mAxis,rAxis)
     # testit(vAxis,nAxis)
     # testit(sAxis,rAxis)
-    
+
     # Errors:
     # testit(mAxis,nAxis)
diff --git a/Packages/cdms2/Lib/cdmsURLopener.py b/Packages/cdms2/Lib/cdmsURLopener.py
index f401bf8d5..e0b710131 100644
--- a/Packages/cdms2/Lib/cdmsURLopener.py
+++ b/Packages/cdms2/Lib/cdmsURLopener.py
@@ -3,15 +3,16 @@
 
 import urllib
 
+
 class CDMSURLopener(urllib.FancyURLopener):
 
-	# Override FancyURLopener error handling - raise an exception
-        # Can also define function http_error_DDD where DDD is the 3-digit error code,
-        # to handle specific errors.
-	def http_error_default(self, url, fp, errcode, errmsg, headers):
-		void = fp.read()
-		fp.close()
-		raise IOError, ('http error', errcode, errmsg, headers)
+    # Override FancyURLopener error handling - raise an exception
+    # Can also define function http_error_DDD where DDD is the 3-digit error code,
+    # to handle specific errors.
 
-urllib._urlopener = CDMSURLopener()
+    def http_error_default(self, url, fp, errcode, errmsg, headers):
+        void = fp.read()
+        fp.close()
+        raise IOError('http error', errcode, errmsg, headers)
 
+urllib._urlopener = CDMSURLopener()
diff --git a/Packages/cdms2/Lib/cdmsobj.py b/Packages/cdms2/Lib/cdmsobj.py
index 8fad6b3ab..30961e26b 100644
--- a/Packages/cdms2/Lib/cdmsobj.py
+++ b/Packages/cdms2/Lib/cdmsobj.py
@@ -2,7 +2,7 @@
 CDMS module-level functions and definitions
 """
 
-import cdmsNode
+from . import cdmsNode
 import cdtime
 import glob
 import os
@@ -26,7 +26,7 @@ CdArray = cdmsNode.CdArray
 
 Unlimited = 1                           # Unlimited axis designator
 
-Max32int = 2**31-1                      # Maximum 32-bit integer
+Max32int = 2**31 - 1                      # Maximum 32-bit integer
 
 # Regular expressions for each template specifier
 _Daynum = '[0-3][0-9]'
@@ -41,7 +41,7 @@ _Percent = '%'
 _Second = '[0-5][0-9]'
 _Year2 = '[0-9][0-9]'
 _Year4 = '[0-9]{4,4}'
-_Zulu = _Hour+'[z|Z]'+_Year4+_Monthnum+_Daynum
+_Zulu = _Hour + '[z|Z]' + _Year4 + _Monthnum + _Daynum
 
 # Positions for time lists
 _yr = 0
@@ -93,42 +93,67 @@ _specifierMap = {
     '%v': (_Name, 'name', 'var', None),
     '%y': (_Year2, 'year2', 'time', _yr),
     '%z': (_Zulu, 'zulu', 'time', None),
-    }
-
-_monthListUpper = ['JAN','FEB','MAR','APR','MAY','JUN','JUL','AUG','SEP','OCT','NOV','DEC']
+}
+
+_monthListUpper = [
+    'JAN',
+     'FEB',
+     'MAR',
+     'APR',
+     'MAY',
+     'JUN',
+     'JUL',
+     'AUG',
+     'SEP',
+     'OCT',
+     'NOV',
+     'DEC']
 _monthMapUpper = {
-    'JAN':1,
-    'FEB':2,
-    'MAR':3,
-    'APR':4,
-    'MAY':5,
-    'JUN':6,
-    'JUL':7,
-    'AUG':8,
-    'SEP':9,
-    'OCT':10,
-    'NOV':11,
-    'DEC':12,
-    }
-
-_monthListLower = ['jan','feb','mar','apr','may','jun','jul','aug','sep','oct','nov','dec']
+    'JAN': 1,
+    'FEB': 2,
+    'MAR': 3,
+    'APR': 4,
+    'MAY': 5,
+    'JUN': 6,
+    'JUL': 7,
+    'AUG': 8,
+    'SEP': 9,
+    'OCT': 10,
+    'NOV': 11,
+    'DEC': 12,
+}
+
+_monthListLower = [
+    'jan',
+     'feb',
+     'mar',
+     'apr',
+     'may',
+     'jun',
+     'jul',
+     'aug',
+     'sep',
+     'oct',
+     'nov',
+     'dec']
 _monthMapLower = {
-    'jan':1,
-    'feb':2,
-    'mar':3,
-    'apr':4,
-    'may':5,
-    'jun':6,
-    'jul':7,
-    'aug':8,
-    'sep':9,
-    'oct':10,
-    'nov':11,
-    'dec':12,
-    }
-
-_specre = re.compile('(%%|%G|%H|%L|%M|%S|%Y|%d|%eG|%eH|%eL|%eM|%eS|%eY|%ed|%ef|%eg|%eh|%em|%en|%ey|%ez|%f|%g|%h|%m|%n|%v|%y|%z)')
-_filere = re.compile('[^'+os.sep+']+')
+    'jan': 1,
+    'feb': 2,
+    'mar': 3,
+    'apr': 4,
+    'may': 5,
+    'jun': 6,
+    'jul': 7,
+    'aug': 8,
+    'sep': 9,
+    'oct': 10,
+    'nov': 11,
+    'dec': 12,
+}
+
+_specre = re.compile(
+    '(%%|%G|%H|%L|%M|%S|%Y|%d|%eG|%eH|%eL|%eM|%eS|%eY|%ed|%ef|%eg|%eh|%em|%en|%ey|%ez|%f|%g|%h|%m|%n|%v|%y|%z)')
+_filere = re.compile('[^' + os.sep + ']+')
 
 _debug = 0                              # Print debug info
 
@@ -137,12 +162,14 @@ AbsoluteTemplate = "Template must be a relative path: "
 # Module-level functions
 
 # Set debug mode, to 'on' or 'off'
+
+
 def setDebugMode(mode):
     global _debug
-    if mode=='on':
-        _debug=1
-    elif mode=='off':
-        _debug=0
+    if mode == 'on':
+        _debug = 1
+    elif mode == 'off':
+        _debug = 0
 
 # Map a template to a regular expression
 # Returns (regex,dimtypes), where regex is the regular expression
@@ -151,206 +178,226 @@ def setDebugMode(mode):
 # where specStrings is the specifier associated with the dimension type,
 # or for time, the list of specifiers in the order (yr,mo,dy,hr,mi,se)
 # where each element is the specifier for that time element
+
+
 def templateToRegex(template):
 
     matchspec = {}
-    dimtypes = {'var':None,
-                'time':[None,None,None,None,None,None],
-                'etime':[None,None,None,None,None,None],
-                'level':None,
-                'elevel':None,
+    dimtypes = {'var': None,
+                'time': [None, None, None, None, None, None],
+                'etime': [None, None, None, None, None, None],
+                'level': None,
+                'elevel': None,
                 }
 
     # Map spec to regex
     # (The default arg bring matchspec and dimtypes into the local scope)
     def retspec(matchobj, matchspec=matchspec, dimtypes=dimtypes):
         spec = matchobj.group(0)
-        pat,name,dimtype,pos = _specifierMap[spec]
+        pat, name, dimtype, pos = _specifierMap[spec]
 
-        if dimtype=='var':
-            dimtypes['var']=spec
-        elif dimtype in ('time','etime'):
+        if dimtype == 'var':
+            dimtypes['var'] = spec
+        elif dimtype in ('time', 'etime'):
             if pos is not None:
-                dimtypes[dimtype][pos]=spec
-            elif name in ('zulu','ezulu'):
-                pass # Crack Zulu time
-        elif dimtype in ('level','elevel'):
-            dimtypes[dimtype]=spec
-
-        if matchspec.has_key(spec):
-            return '(?P='+name+')'
+                dimtypes[dimtype][pos] = spec
+            elif name in ('zulu', 'ezulu'):
+                pass  # Crack Zulu time
+        elif dimtype in ('level', 'elevel'):
+            dimtypes[dimtype] = spec
+
+        if spec in matchspec:
+            return '(?P=' + name + ')'
         else:
             matchspec[spec] = 1
-            return '(?P<'+name+'>'+pat+')'
-        
-    templatere = _specre.sub(retspec,template)
-    return (templatere,dimtypes)
+            return '(?P<' + name + '>' + pat + ')'
+
+    templatere = _specre.sub(retspec, template)
+    return (templatere, dimtypes)
+
 
 def retglob(matchobj):
     return '*'
 
 # Generate a component time from a matchobj and list of specs
-def generateTime(matchobj,timespecs):
+
+
+def generateTime(matchobj, timespecs):
     iyr = 0
     imo = 1
     idy = 1
     ihr = 0
     imi = 0
     ise = 0
-    yrspec,mospec,dyspec,hrspec,mispec,sespec = timespecs
+    yrspec, mospec, dyspec, hrspec, mispec, sespec = timespecs
     if yrspec:
-        pat,name,dimtype,pos = _specifierMap[yrspec]
+        pat, name, dimtype, pos = _specifierMap[yrspec]
         yrstr = matchobj.group(name)
         iyr = int(yrstr)
 
         # Map 2-digit year to [1950,2049)
-        if yrspec in ('%y','%ey'):
-            if iyr<50:
-                iyr = iyr+2000
+        if yrspec in ('%y', '%ey'):
+            if iyr < 50:
+                iyr = iyr + 2000
             else:
-                iyr = iyr+1900
+                iyr = iyr + 1900
     if mospec:
-        pat,name,dimtype,pos = _specifierMap[mospec]
+        pat, name, dimtype, pos = _specifierMap[mospec]
         mostr = matchobj.group(name)
-        if mospec in ('%G','%eG'):
+        if mospec in ('%G', '%eG'):
             imo = _monthMapUpper[mostr]
-        elif mospec in ('%g','%eg'):
+        elif mospec in ('%g', '%eg'):
             imo = _monthMapLower[mostr]
-        elif mospec in ('%m','%em','%n','%en'):
+        elif mospec in ('%m', '%em', '%n', '%en'):
             imo = int(mostr)
     if dyspec:
-        pat,name,dimtype,pos = _specifierMap[dyspec]
+        pat, name, dimtype, pos = _specifierMap[dyspec]
         dystr = matchobj.group(name)
         idy = int(dystr)
     if hrspec:
-        pat,name,dimtype,pos = _specifierMap[hrspec]
+        pat, name, dimtype, pos = _specifierMap[hrspec]
         hrstr = matchobj.group(name)
         ihr = int(hrstr)
     if mispec:
-        pat,name,dimtype,pos = _specifierMap[mispec]
+        pat, name, dimtype, pos = _specifierMap[mispec]
         mistr = matchobj.group(name)
         imi = int(mistr)
     if sespec:
-        pat,name,dimtype,pos = _specifierMap[sespec]
+        pat, name, dimtype, pos = _specifierMap[sespec]
         sestr = matchobj.group(name)
         ise = int(sestr)
-    return cdtime.comptime(iyr,imo,idy,ihr,imi,ise)   
+    return cdtime.comptime(iyr, imo, idy, ihr, imi, ise)
 
 # Find all files in 'direc' which match 'template'.
 # template is a relative path, and may contain specifiers
 # in directory names. Returns a list [(f,m),..,(f,m)] where
 # f is a matching file name, and m is a list [var,time,etime,level,elevel]
 # of matching values in f. Any or all elems of the list may be None.
-def matchingFiles(direc,template):
+
+
+def matchingFiles(direc, template):
 
     if os.path.isabs(template):
-        raise AbsoluteTemplate, template
+        raise AbsoluteTemplate(template)
 
     # Generate a glob pattern
     normTemplate = os.path.normpath(template)
-    globPattern = _filere.sub(retglob,normTemplate)
+    globPattern = _filere.sub(retglob, normTemplate)
 
     # Map the template to a regular expression
-    templatere,dimtypes = templateToRegex(template)
+    templatere, dimtypes = templateToRegex(template)
     ctre = re.compile(templatere)
 
     # Get a list of candidate files
     try:
         os.chdir(direc)
     except os.error:
-        raise IOError,'%s: %s'%(sys.exc_value,direc)
-        
+        raise IOError('%s: %s' % (sys.exc_info()[1], direc))
+
     candlist = glob.glob(globPattern)
 
-    # Look for matches 
+    # Look for matches
     matchfiles = []
     for candfile in candlist:
         matchobj = ctre.match(candfile)
 
         # Create matching values
-        if matchobj is None: continue
-        matchnames = [None,None,None,None,None]
+        if matchobj is None:
+            continue
+        matchnames = [None, None, None, None, None]
         if dimtypes['var'] is not None:
             matchnames[_var] = matchobj.group('name')
-        if dimtypes['time'] != [None,None,None,None,None,None]:
-            matchnames[_time] = generateTime(matchobj,dimtypes['time'])
-        if dimtypes['etime'] != [None,None,None,None,None,None]:
-            matchnames[_etime] = generateTime(matchobj,dimtypes['etime'])
+        if dimtypes['time'] != [None, None, None, None, None, None]:
+            matchnames[_time] = generateTime(matchobj, dimtypes['time'])
+        if dimtypes['etime'] != [None, None, None, None, None, None]:
+            matchnames[_etime] = generateTime(matchobj, dimtypes['etime'])
         if dimtypes['level'] is not None:
             matchnames[_level] = int(matchobj.group('level'))
         if dimtypes['elevel'] is not None:
             matchnames[_elevel] = int(matchobj.group('elevel'))
-        matchfiles.append((candfile,matchnames))
+        matchfiles.append((candfile, matchnames))
 
     return matchfiles
 
 # Get a string time component from a spec and a component time
-def getTimeAsString(spec,time):
 
-    if spec in ('%G','%eG'):
+
+def getTimeAsString(spec, time):
+
+    if spec in ('%G', '%eG'):
         imo = time.month
-        specstr = _monthListUpper[imo-1]
-    elif spec in ('%H','%eH'):
+        specstr = _monthListUpper[imo - 1]
+    elif spec in ('%H', '%eH'):
         specstr = str(time.hour)
-    elif spec in ('%M','%eM'):
+    elif spec in ('%M', '%eM'):
         specstr = str(time.minute)
-    elif spec in ('%S','%eS'):
+    elif spec in ('%S', '%eS'):
         specstr = str(int(time.second))
-    elif spec in ('%Y','%eY'):
+    elif spec in ('%Y', '%eY'):
         specstr = str(time.year).zfill(4)
-    elif spec in ('%d','%ed'):
+    elif spec in ('%d', '%ed'):
         specstr = str(time.day)
-    elif spec in ('%f','%ef'):
+    elif spec in ('%f', '%ef'):
         specstr = str(time.day).zfill(2)
-    elif spec in ('%g','%eg'):
+    elif spec in ('%g', '%eg'):
         imo = time.month
-        specstr = _monthListLower[imo-1]
-    elif spec in ('%h','%eh'):
+        specstr = _monthListLower[imo - 1]
+    elif spec in ('%h', '%eh'):
         specstr = str(time.hour).zfill(2)
-    elif spec in ('%m','%em'):
+    elif spec in ('%m', '%em'):
         specstr = str(time.month)
-    elif spec in ('%n','%en'):
+    elif spec in ('%n', '%en'):
         specstr = str(time.month).zfill(2)
-    elif spec in ('%y','%ey'):
-        specstr = str(time.year%100).zfill(2)
-    elif spec in ('%z','%ez'):
-        specstr = getTimeAsString('%H',time)+'Z'+getTimeAsString('%Y',time)+getTimeAsString('%n',time)+getTimeAsString('%d',time)
+    elif spec in ('%y', '%ey'):
+        specstr = str(time.year % 100).zfill(2)
+    elif spec in ('%z', '%ez'):
+        specstr = getTimeAsString(
+            '%H',
+            time) + 'Z' + getTimeAsString(
+                '%Y',
+                time) + getTimeAsString(
+            '%n',
+             time) + getTimeAsString(
+                '%d',
+                 time)
     return specstr
 
 # Generate a file path, given a template and matchname list.
 # matchnames is a list [varname,time,etime,level,elevel], where
 # any or all elems may be None.  If matchnames be a longer list,
 # it is not an error but the additional elements are ignored.
-def getPathFromTemplate(template,matchnames):
+
+
+def getPathFromTemplate(template, matchnames):
 
     # Map spec to value string
     # (Default arg brings matchnames into the local scope)
     def retpath(matchobj, matchnames=matchnames):
         spec = matchobj.group(0)
-        pat,name,dimtype,pos = _specifierMap[spec]
-        var,time,etime,level,elevel = matchnames[0:5]
+        pat, name, dimtype, pos = _specifierMap[spec]
+        var, time, etime, level, elevel = matchnames[0:5]
 
-        if dimtype=='var':
+        if dimtype == 'var':
             if var is None:
                 specstr = spec
             else:
                 specstr = var
-        elif dimtype=='time':
+        elif dimtype == 'time':
             if time is None:
                 specstr = spec
             else:
-                specstr = getTimeAsString(spec,time)
-        elif dimtype=='etime':
+                specstr = getTimeAsString(spec, time)
+        elif dimtype == 'etime':
             if etime is None:
                 specstr = spec
             else:
-                specstr = getTimeAsString(spec,etime)
-        elif dimtype=='level':
+                specstr = getTimeAsString(spec, etime)
+        elif dimtype == 'level':
             if level is None:
                 specstr = spec
             else:
                 specstr = str(level)
-        elif dimtype=='elevel':
+        elif dimtype == 'elevel':
             if elevel is None:
                 specstr = spec
             else:
@@ -358,7 +405,7 @@ def getPathFromTemplate(template,matchnames):
 
         return specstr
 
-    path = _specre.sub(retpath,template)
+    path = _specre.sub(retpath, template)
     return path
 
 # Search an object or list of objects for a string attribute which
@@ -369,6 +416,7 @@ def getPathFromTemplate(template,matchnames):
 # 'rectGrid','xlink', or None.  If tag is None, all object classes are
 # searched.  If attribute is None, all attributes are searched.
 
+
 def searchPattern(objlist, pattern, attribute=None, tag=None):
     if tag is not None:
         tag = tag.lower()
@@ -378,7 +426,7 @@ def searchPattern(objlist, pattern, attribute=None, tag=None):
 
     returnlist = []
     for obj in objlist:
-        returnlist = returnlist + obj.searchPattern(regexp,attribute,tag)
+        returnlist = returnlist + obj.searchPattern(regexp, attribute, tag)
 
     return returnlist
 
@@ -390,6 +438,7 @@ def searchPattern(objlist, pattern, attribute=None, tag=None):
 # 'rectGrid','xlink', or None.  If tag is None, all object classes are
 # searched.  If attribute is None, all attributes are searched.
 
+
 def matchPattern(objlist, pattern, attribute=None, tag=None):
     if tag is not None:
         tag = tag.lower()
@@ -399,7 +448,7 @@ def matchPattern(objlist, pattern, attribute=None, tag=None):
 
     returnlist = []
     for obj in objlist:
-        returnlist = returnlist + obj.matchPattern(regexp,attribute,tag)
+        returnlist = returnlist + obj.matchPattern(regexp, attribute, tag)
 
     return returnlist
 
@@ -418,7 +467,9 @@ def matchPattern(objlist, pattern, attribute=None, tag=None):
 #
 #   lambda obj: obj.partition_length > 1000
 #
-# is sufficient, it is not necessary to test for the existence of the attribute.
+# is sufficient, it is not necessary to test for the existence of the
+# attribute.
+
 
 def searchPredicate(objlist, predicate, tag=None):
     if tag is not None:
@@ -428,7 +479,7 @@ def searchPredicate(objlist, predicate, tag=None):
 
     returnlist = []
     for obj in objlist:
-        returnlist = returnlist + obj.searchPredicate(predicate,tag)
+        returnlist = returnlist + obj.searchPredicate(predicate, tag)
 
     return returnlist
 
@@ -436,74 +487,80 @@ def searchPredicate(objlist, predicate, tag=None):
 # Classes
 
 # Generic CDMS object has a tree node, attributes
+
+
 class CdmsObj (object):
-##     def __setattr__(self,name,value):
-##         object.__setattr__(self,name,value)
-##         if not name in self.__cdms_internals__ and not name[0]=='_':
-##             self.attributes[name]=value
-## ##             if name == 'shape' :
-## ##                 print self.__class__,name,value
+# def __setattr__(self,name,value):
+# object.__setattr__(self,name,value)
+# if not name in self.__cdms_internals__ and not name[0]=='_':
+# self.attributes[name]=value
+# if name == 'shape' :
+# print self.__class__,name,value
 
     def _listatts(self):
-        dic={}
-        for nm,val in self.__dict__.items():
-            if (nm[0]!='_' and not nm in self.__cdms_internals__) or nm in ['_FillValue']:
-                dic[nm]=val
+        dic = {}
+        for nm, val in self.__dict__.items():
+            if (nm[0] != '_' and not nm in self.__cdms_internals__) or nm in ['_FillValue']:
+                dic[nm] = val
             if nm == '_units':
-                dic['units']=val
+                dic['units'] = val
         return dic
-    def _setatts(self,value):
+
+    def _setatts(self, value):
         return
 
-    attributes = property(_listatts,_setatts)
-    
-        
-    def __init__(self, node = None):
-        if not hasattr(self,'___cdms_internals__'):
-            self.__dict__['___cdms_internals__']=[
-                '__cdms_internals__','___cdms_internals__',
-                '_node_','_obj_',
-                '_numericType_','_grid_','_bounds_',
-                'parent','attributes','shape','autoApiInfo']
-        self.attributes={}
+    attributes = property(_listatts, _setatts)
+
+    def __init__(self, node=None):
+        if not hasattr(self, '___cdms_internals__'):
+            self.__dict__['___cdms_internals__'] = [
+                '__cdms_internals__', '___cdms_internals__',
+                '_node_', '_obj_',
+                '_numericType_', '_grid_', '_bounds_',
+                'parent', 'attributes', 'shape', 'autoApiInfo']
+        self.attributes = {}
         self._node_ = node
         if node is not None:
-            # Build an attribute dictionary from the node, 
+            # Build an attribute dictionary from the node,
             # CDML datatype constraints
 
-            if hasattr(node,'datatype'):
+            if hasattr(node, 'datatype'):
                 parenttype = node.datatype
             else:
                 parenttype = None
             atts = node.getExternalDict()
             adict = self.__dict__
             for attname in atts.keys():
-                (attval,datatype)=atts[attname] # (XML value, datatype)
+                (attval, datatype) = atts[attname]  # (XML value, datatype)
                 constraint = node.extra.get(attname)
                 if constraint is not None:
-                    (scaletype,reqtype)=constraint # (CdScalar|CdArray, required type)
-                    if reqtype==CdFromObject:
+                    (scaletype,
+                     reqtype) = constraint  # (CdScalar|CdArray, required type)
+                    if reqtype == CdFromObject:
                         reqtype = parenttype
-                    if reqtype!=datatype and datatype==CdString and scaletype==CdScalar:
-                        if reqtype in (CdFloat,CdDouble):
+                    if reqtype != datatype and datatype == CdString and scaletype == CdScalar:
+                        if reqtype in (CdFloat, CdDouble):
                             try:
                                 attval = float(attval)
                             except:
-                                raise RuntimeError,"%s=%s must be a float"%(attname,attval)
-                        elif reqtype in (CdShort,CdInt,CdLong,CdInt64):
+                                raise RuntimeError(
+                                    "%s=%s must be a float" %
+                                    (attname, attval))
+                        elif reqtype in (CdShort, CdInt, CdLong, CdInt64):
                             try:
                                 attval = int(attval)
                             except:
-                                raise RuntimeError,"%s=%s must be an integer"%(attname,attval)
+                                raise RuntimeError(
+                                    "%s=%s must be an integer" %
+                                    (attname, attval))
                 adict[attname] = attval
                 self.attributes[attname] = attval
 
-
     def searchone(self, pattern, attname):
         """Return true if the attribute with name attname is a string
         attribute which contains the compiled regular expression pattern, or
         if attname is None and pattern matches at least one string
-        attribute. Return false if the attribute is not found or is not 
+        attribute. Return false if the attribute is not found or is not
         a string.
         :::
         Input:::
@@ -516,12 +573,12 @@ class CdmsObj (object):
         """
         if attname is None:
             for attval in self.attributes.values():
-                if isinstance(attval,basestring) and pattern.search(attval) is not None:
+                if isinstance(attval, basestring) and pattern.search(attval) is not None:
                     return 1
             return 0
-        elif self.attributes.has_key(attname):
+        elif attname in self.attributes:
             attval = self.attributes[attname]
-            return isinstance(attval,basestring) and pattern.search(attval) is not None
+            return isinstance(attval, basestring) and pattern.search(attval) is not None
         else:
             return 0
 
@@ -546,18 +603,19 @@ class CdmsObj (object):
         """
         if attname is None:
             for attval in self.attributes.values():
-                if isinstance(attval,basestring) and pattern.match(attval) is not None:
+                if isinstance(attval, basestring) and pattern.match(attval) is not None:
                     return 1
             return 0
-        elif self.attributes.has_key(attname):
+        elif attname in self.attributes:
             attval = self.attributes[attname]
-            return isinstance(attval,basestring) and pattern.match(attval) is not None
+            return isinstance(attval, basestring) and pattern.match(attval) is not None
         else:
             return 0
 
     # Search for a pattern in a string-valued attribute. If attribute is None,
-    # search all string attributes. If tag is not None, it must match the internal node tag.
-    def searchPattern(self,pattern,attribute,tag):
+    # search all string attributes. If tag is not None, it must match the
+    # internal node tag.
+    def searchPattern(self, pattern, attribute, tag):
         """
         Search for a pattern in a string-valued attribute. If attribute is None, search all string attributes. If tag is not None, it must match the internal node tag.
         :::
@@ -567,11 +625,11 @@ class CdmsObj (object):
         tag :: (str/None) (2) node tag
         :::
         Output:::
-        result :: (list) (0) 
+        result :: (list) (0)
         :::
         """
-        if tag is None or tag.lower()==self._node_.tag:
-            if self.searchone(pattern,attribute):
+        if tag is None or tag.lower() == self._node_.tag:
+            if self.searchone(pattern, attribute):
                 return [self]
             else:
                 return []
@@ -579,8 +637,9 @@ class CdmsObj (object):
             return []
 
     # Match a pattern in a string-valued attribute. If attribute is None,
-    # search all string attributes. If tag is not None, it must match the internal node tag.
-    def matchPattern(self,pattern,attribute,tag):
+    # search all string attributes. If tag is not None, it must match the
+    # internal node tag.
+    def matchPattern(self, pattern, attribute, tag):
         """
         Match for a pattern in a string-valued attribute. If attribute is None, search all string attributes. If tag is not None, it must match the internal node tag.
         :::
@@ -590,11 +649,11 @@ class CdmsObj (object):
         tag :: (str/None) (2) node tag
         :::
         Output:::
-        result :: (list) (0) 
+        result :: (list) (0)
         :::
         """
-        if tag is None or tag.lower()==self._node_.tag:
-            if self.matchone(pattern,attribute):
+        if tag is None or tag.lower() == self._node_.tag:
+            if self.matchone(pattern, attribute):
                 return [self]
             else:
                 return []
@@ -604,7 +663,7 @@ class CdmsObj (object):
     # Apply a truth-valued predicate. Return a list containing a single instance: [self]
     # if the predicate is true and either tag is None or matches the object node tag.
     # If the predicate returns false, return an empty list
-    def searchPredicate(self,predicate,tag):
+    def searchPredicate(self, predicate, tag):
         """
         Apply a truth-valued predicate. Return a list containing a single instance: [self] if the predicate is true and either tag is None or matches the object node tag. If the predicate returns false, return an empty list
         :::
@@ -613,12 +672,12 @@ class CdmsObj (object):
         tag :: (str/None) (1) node tag
         :::
         Output:::
-        result :: (list) (0) 
+        result :: (list) (0)
         :::
         """
-        if tag is None or tag.lower()==self._node_.tag:
+        if tag is None or tag.lower() == self._node_.tag:
             try:
-                if apply(predicate,(self,))==1:
+                if predicate(*(self,)) == 1:
                     result = [self]
             except:
                 result = []
@@ -626,7 +685,7 @@ class CdmsObj (object):
             result = []
         return result
 
-    def dump(self,path=None,format=1):
+    def dump(self, path=None, format=1):
         """ dump(self,path=None,format=1)
         Dump an XML representation of this object to a file.
         'path' is the result file name, None for standard output.
@@ -641,24 +700,21 @@ class CdmsObj (object):
         :::
         """
         if self._node_ is None:
-            raise CDMSError, "No tree node found"
-        self._node_.dump(path,format)
+            raise CDMSError("No tree node found")
+        self._node_.dump(path, format)
 
     def _getinternals(self):
         return self.___cdms_internals__
-    def _setinternals(self,value):
+
+    def _setinternals(self, value):
         self.___cdms_internals__ = value
-    __cdms_internals__ = property(_getinternals,_setinternals)
-#internattr.add_internal_attribute(CdmsObj)
+    __cdms_internals__ = property(_getinternals, _setinternals)
+# internattr.add_internal_attribute(CdmsObj)
 
 if __name__ == '__main__':
     x = CdmsObj(None)
     x.someatt = 1
     assert x.attributes['someatt'] == x.someatt
-    assert not x.attributes.has_key('_node')
+    assert '_node' not in x.attributes
     # need tests for the search routines...
     print "Test passed."
-
-
-
-
diff --git a/Packages/cdms2/Lib/cdurllib.py b/Packages/cdms2/Lib/cdurllib.py
index 6ae1848b3..eefccb114 100644
--- a/Packages/cdms2/Lib/cdurllib.py
+++ b/Packages/cdms2/Lib/cdurllib.py
@@ -1,13 +1,18 @@
 """Customized URLopener"""
 
-import urllib, getpass, socket, string, sys
+import urllib
+import getpass
+import socket
+import string
+import sys
 
 MAXFTPCACHE = 10        # Trim the ftp cache beyond this size
 
+
 class CDURLopener(urllib.URLopener):
 
     def __init__(self, proxies=None):
-        urllib.URLopener.__init__(self,proxies)
+        urllib.URLopener.__init__(self, proxies)
         self._userObject = None
 
     # Attach an object to be returned with callbacks
@@ -17,12 +22,15 @@ class CDURLopener(urllib.URLopener):
     # Use FTP protocol
     def open_ftp(self, url):
         host, path = urllib.splithost(url)
-        if not host: raise IOError, ('ftp error', 'no host given')
+        if not host:
+            raise IOError, ('ftp error', 'no host given')
         host, port = urllib.splitport(host)
         user, host = urllib.splituser(host)
         # if user: user, passwd = splitpasswd(user)
-        if user: passwd = getpass.getpass()
-        else: passwd = None
+        if user:
+            passwd = getpass.getpass()
+        else:
+            passwd = None
         host = urllib.unquote(host)
         user = urllib.unquote(user or '')
         passwd = urllib.unquote(passwd or '')
@@ -36,7 +44,8 @@ class CDURLopener(urllib.URLopener):
         path = urllib.unquote(path)
         dirs = string.splitfields(path, '/')
         dirs, file = dirs[:-1], dirs[-1]
-        if dirs and not dirs[0]: dirs = dirs[1:]
+        if dirs and not dirs[0]:
+            dirs = dirs[1:]
         key = (user, host, port, string.joinfields(dirs, '/'))
         # XXX thread unsafe!
         if len(self.ftpcache) > MAXFTPCACHE:
@@ -47,12 +56,14 @@ class CDURLopener(urllib.URLopener):
                     del self.ftpcache[k]
                     v.close()
         try:
-            if not self.ftpcache.has_key(key):
-                print 'Creating ftpwrapper: ',user,host,port,dirs
+            if key not in self.ftpcache:
+                print 'Creating ftpwrapper: ', user, host, port, dirs
                 self.ftpcache[key] = \
                     urllib.ftpwrapper(user, passwd, host, port, dirs)
-            if not file: type = 'D'
-            else: type = 'I'
+            if not file:
+                type = 'D'
+            else:
+                type = 'I'
             for attr in attrs:
                 attr, value = urllib.splitvalue(attr)
                 if string.lower(attr) == 'type' and \
@@ -60,18 +71,19 @@ class CDURLopener(urllib.URLopener):
                     type = string.upper(value)
             (fp, retrlen) = self.ftpcache[key].retrfile(file, type)
             if retrlen is not None and retrlen >= 0:
-                import mimetools, StringIO
+                import mimetools
+                import StringIO
                 headers = mimetools.Message(StringIO.StringIO(
                     'Content-Length: %d\n' % retrlen))
             else:
                 headers = noheaders()
             return urllib.addinfourl(fp, headers, "ftp:" + url)
-        except urllib.ftperrors(), msg:
+        except urllib.ftperrors() as msg:
             raise IOError, ('ftp error', msg), sys.exc_info()[2]
 
     def retrieve(self, url, filename=None, reporthook=None, blocksize=262144):
         url = urllib.unwrap(url)
-        if self.tempcache and self.tempcache.has_key(url):
+        if self.tempcache and url in self.tempcache:
             return self.tempcache[url]
         type, url1 = urllib.splittype(url)
         if not filename and (not type or type == 'file'):
@@ -80,7 +92,7 @@ class CDURLopener(urllib.URLopener):
                 hdrs = fp.info()
                 del fp
                 return url2pathname(urllib.splithost(url1)[1]), hdrs
-            except IOError, msg:
+            except IOError as msg:
                 pass
         fp = self.open(url)
         headers = fp.info()
@@ -101,28 +113,28 @@ class CDURLopener(urllib.URLopener):
         size = -1
         blocknum = 1
         if reporthook:
-            if headers.has_key("content-length"):
+            if "content-length" in headers:
                 size = int(headers["Content-Length"])
             stayopen = reporthook(0, bs, size, self._userObject)
-            if stayopen==0:
+            if stayopen == 0:
                 raise KeyboardInterrupt
         bytesread = 0
         block = fp.read(bs)
         if reporthook:
             stayopen = reporthook(1, bs, size, self._userObject)
-            if stayopen==0:
+            if stayopen == 0:
                 raise KeyboardInterrupt
         while block:
             tfp.write(block)
             bytesread = bytesread + len(block)
-##             print blocknum, bytesread, size,
-##             if blocknum*blocksize!=bytesread:
-##                 print ' (*)'
-##             else:
-##                 print
+# print blocknum, bytesread, size,
+# if blocknum*blocksize!=bytesread:
+# print ' (*)'
+# else:
+# print
             if block and reporthook:
                 stayopen = reporthook(blocknum, bs, size, self._userObject)
-                if stayopen==0:
+                if stayopen == 0:
                     raise KeyboardInterrupt
             blocknum = blocknum + 1
             block = fp.read(bs)
@@ -132,23 +144,25 @@ class CDURLopener(urllib.URLopener):
         del tfp
         return result
 
+
 def sampleReportHook(blocknum, blocksize, size, userObj):
-    sizekb = size/1024
-    percent = min(100,int(100.0*float(blocknum*blocksize)/float(size)))
-    print "Read: %3d%% of %dK"%(percent,sizekb)
+    sizekb = size / 1024
+    percent = min(100, int(100.0 * float(blocknum * blocksize) / float(size)))
+    print "Read: %3d%% of %dK" % (percent, sizekb)
     return 1
 
 if __name__ == '__main__':
 
     import sys
-    if len(sys.argv)!=4:
+    if len(sys.argv) != 4:
         print 'Usage: cdurllib.py URL filename blocksize'
         sys.exit(1)
 
     url = sys.argv[1]
     filename = sys.argv[2]
     blocksize = int(sys.argv[3])
-    
+
     urlopener = CDURLopener()
-    fname, headers = urlopener.retrieve(url, filename, sampleReportHook, blocksize)
+    fname, headers = urlopener.retrieve(
+        url, filename, sampleReportHook, blocksize)
     print fname, 'written'
diff --git a/Packages/cdms2/Lib/cdurlparse.py b/Packages/cdms2/Lib/cdurlparse.py
index e743ebbc8..d88dd4087 100644
--- a/Packages/cdms2/Lib/cdurlparse.py
+++ b/Packages/cdms2/Lib/cdurlparse.py
@@ -9,25 +9,26 @@ from string import joinfields, splitfields, find, rfind
 
 # A classification of schemes ('' means apply by default)
 uses_relative = ['ftp', 'http', 'ldap', 'gopher', 'nntp', 'wais', 'file',
-		 'https', 'shttp',
-		 'prospero', '']
+                 'https', 'shttp',
+                 'prospero', '']
 uses_netloc = ['ftp', 'http', 'ldap', 'gopher', 'nntp', 'telnet', 'wais',
-	       'file',
-	       'https', 'shttp', 'snews',
-	       'prospero', '']
+               'file',
+               'https', 'shttp', 'snews',
+               'prospero', '']
 non_hierarchical = ['gopher', 'hdl', 'mailto', 'news', 'telnet', 'wais',
-		    'snews',
-		    ]
+                    'snews',
+                    ]
 uses_params = ['ftp', 'hdl', 'prospero', 'http', 'ldap',
-	       'https', 'shttp',
-	       '']
+               'https', 'shttp',
+               '']
 uses_query = ['http', 'ldap', 'wais',
-	      'https', 'shttp',
-	      'gopher',
-	      '']
-uses_fragment = ['ftp', 'hdl', 'http', 'ldap', 'gopher', 'news', 'nntp', 'wais',
-		 'https', 'shttp', 'snews',
-		 'file', 'prospero', '']
+              'https', 'shttp',
+              'gopher',
+              '']
+uses_fragment = [
+    'ftp', 'hdl', 'http', 'ldap', 'gopher', 'news', 'nntp', 'wais',
+                 'https', 'shttp', 'snews',
+                 'file', 'prospero', '']
 
 # Characters valid in scheme names
 scheme_chars = string.letters + string.digits + '+-.'
@@ -35,6 +36,7 @@ scheme_chars = string.letters + string.digits + '+-.'
 MAX_CACHE_SIZE = 20
 _parse_cache = {}
 
+
 def clear_cache():
     """Clear the parse cache."""
     global _parse_cache
@@ -46,134 +48,141 @@ def clear_cache():
 # Return a 6-tuple: (scheme, netloc, path, params, query, fragment).
 # Note that we don't break the components up in smaller bits
 # (e.g. netloc is a single string) and we don't expand % escapes.
-def urlparse(url, scheme = '', allow_fragments = 1):
-	key = url, scheme, allow_fragments
-	cached = _parse_cache.get(key, None)
-	if cached:
-		return cached
-	if len(_parse_cache) >= MAX_CACHE_SIZE:	# avoid runaway growth
-	    clear_cache()
-	find = string.find
-	netloc = path = params = query = fragment = ''
-	i = find(url, ':')
-	if i > 0:
-		if url[:i] in ['http','ldap']: # optimize the common case
-			scheme = string.lower(url[:i])
-			url = url[i+1:]
-			if url[:2] == '//':
-				i = find(url, '/', 2)
-				if i < 0:
-					i = len(url)
-				netloc = url[2:i]
-				url = url[i:]
-			if allow_fragments:
-				i = string.rfind(url, '#')
-				if i >= 0:
-					fragment = url[i+1:]
-					url = url[:i]
-			i = find(url, '?')
-			if i >= 0:
-				query = url[i+1:]
-				url = url[:i]
-			i = find(url, ';')
-			if i >= 0:
-				params = url[i+1:]
-				url = url[:i]
-			tuple = scheme, netloc, url, params, query, fragment
-			_parse_cache[key] = tuple
-			return tuple
-		for c in url[:i]:
-			if c not in scheme_chars:
-				break
-		else:
-			scheme, url = string.lower(url[:i]), url[i+1:]
-	if scheme in uses_netloc:
-		if url[:2] == '//':
-			i = find(url, '/', 2)
-			if i < 0:
-				i = len(url)
-			netloc, url = url[2:i], url[i:]
-	if allow_fragments and scheme in uses_fragment:
-		i = string.rfind(url, '#')
-		if i >= 0:
-			url, fragment = url[:i], url[i+1:]
-	if scheme in uses_query:
-		i = find(url, '?')
-		if i >= 0:
-			url, query = url[:i], url[i+1:]
-	if scheme in uses_params:
-		i = find(url, ';')
-		if i >= 0:
-			url, params = url[:i], url[i+1:]
-	tuple = scheme, netloc, url, params, query, fragment
-	_parse_cache[key] = tuple
-	return tuple
+def urlparse(url, scheme='', allow_fragments=1):
+    key = url, scheme, allow_fragments
+    cached = _parse_cache.get(key, None)
+    if cached:
+        return cached
+    if len(_parse_cache) >= MAX_CACHE_SIZE:  # avoid runaway growth
+        clear_cache()
+    find = string.find
+    netloc = path = params = query = fragment = ''
+    i = find(url, ':')
+    if i > 0:
+        if url[:i] in ['http', 'ldap']:  # optimize the common case
+            scheme = string.lower(url[:i])
+            url = url[i + 1:]
+            if url[:2] == '//':
+                i = find(url, '/', 2)
+                if i < 0:
+                    i = len(url)
+                netloc = url[2:i]
+                url = url[i:]
+            if allow_fragments:
+                i = string.rfind(url, '#')
+                if i >= 0:
+                    fragment = url[i + 1:]
+                    url = url[:i]
+            i = find(url, '?')
+            if i >= 0:
+                query = url[i + 1:]
+                url = url[:i]
+            i = find(url, ';')
+            if i >= 0:
+                params = url[i + 1:]
+                url = url[:i]
+            tuple = scheme, netloc, url, params, query, fragment
+            _parse_cache[key] = tuple
+            return tuple
+        for c in url[:i]:
+            if c not in scheme_chars:
+                break
+        else:
+            scheme, url = string.lower(url[:i]), url[i + 1:]
+    if scheme in uses_netloc:
+        if url[:2] == '//':
+            i = find(url, '/', 2)
+            if i < 0:
+                i = len(url)
+            netloc, url = url[2:i], url[i:]
+    if allow_fragments and scheme in uses_fragment:
+        i = string.rfind(url, '#')
+        if i >= 0:
+            url, fragment = url[:i], url[i + 1:]
+    if scheme in uses_query:
+        i = find(url, '?')
+        if i >= 0:
+            url, query = url[:i], url[i + 1:]
+    if scheme in uses_params:
+        i = find(url, ';')
+        if i >= 0:
+            url, params = url[:i], url[i + 1:]
+    tuple = scheme, netloc, url, params, query, fragment
+    _parse_cache[key] = tuple
+    return tuple
 
 # Put a parsed URL back together again.  This may result in a slightly
 # different, but equivalent URL, if the URL that was parsed originally
 # had redundant delimiters, e.g. a ? with an empty query (the draft
 # states that these are equivalent).
-def urlunparse((scheme, netloc, url, params, query, fragment)):
-	if netloc or (scheme in uses_netloc and url[:2] == '//'):
-		if url[:1] != '/': url = '/' + url
-		url = '//' + (netloc or '') + url
-	if scheme:
-		url = scheme + ':' + url
-	if params:
-		url = url + ';' + params
-	if query:
-		url = url + '?' + query
-	if fragment:
-		url = url + '#' + fragment
-	return url
+
+
+def urlunparse(xxx_todo_changeme):
+    (scheme, netloc, url, params, query, fragment) = xxx_todo_changeme
+    if netloc or (scheme in uses_netloc and url[:2] == '//'):
+        if url[:1] != '/':
+            url = '/' + url
+        url = '//' + (netloc or '') + url
+    if scheme:
+        url = scheme + ':' + url
+    if params:
+        url = url + ';' + params
+    if query:
+        url = url + '?' + query
+    if fragment:
+        url = url + '#' + fragment
+    return url
 
 # Join a base URL and a possibly relative URL to form an absolute
 # interpretation of the latter.
-def urljoin(base, url, allow_fragments = 1):
-	if not base:
-		return url
-	bscheme, bnetloc, bpath, bparams, bquery, bfragment = \
-		urlparse(base, '', allow_fragments)
-	scheme, netloc, path, params, query, fragment = \
-		urlparse(url, bscheme, allow_fragments)
-	if scheme != bscheme or scheme not in uses_relative:
-		return urlunparse((scheme, netloc, path,
-				   params, query, fragment))
-	if scheme in uses_netloc:
-		if netloc:
-			return urlunparse((scheme, netloc, path,
-					   params, query, fragment))
-		netloc = bnetloc
-	if path[:1] == '/':
-		return urlunparse((scheme, netloc, path,
-				   params, query, fragment))
-	if not path:
-		return urlunparse((scheme, netloc, bpath,
-				   params, query or bquery, fragment))
-	i = rfind(bpath, '/')
-	if i >= 0:
-		path = bpath[:i] + '/' + path
-	segments = splitfields(path, '/')
-	if segments[-1] == '.':
-		segments[-1] = ''
-	while '.' in segments:
-		segments.remove('.')
-	while 1:
-		i = 1
-		n = len(segments) - 1
-		while i < n:
-			if segments[i] == '..' and segments[i-1]:
-				del segments[i-1:i+1]
-				break
-			i = i+1
-		else:
-			break
-	if len(segments) == 2 and segments[1] == '..' and segments[0] == '':
-		segments[-1] = ''
-	elif len(segments) >= 2 and segments[-1] == '..':
-		segments[-2:] = ['']
-	return urlunparse((scheme, netloc, joinfields(segments, '/'),
-			   params, query, fragment))
+
+
+def urljoin(base, url, allow_fragments=1):
+    if not base:
+        return url
+    bscheme, bnetloc, bpath, bparams, bquery, bfragment = \
+        urlparse(base, '', allow_fragments)
+    scheme, netloc, path, params, query, fragment = \
+        urlparse(url, bscheme, allow_fragments)
+    if scheme != bscheme or scheme not in uses_relative:
+        return urlunparse((scheme, netloc, path,
+                           params, query, fragment))
+    if scheme in uses_netloc:
+        if netloc:
+            return urlunparse((scheme, netloc, path,
+                               params, query, fragment))
+        netloc = bnetloc
+    if path[:1] == '/':
+        return urlunparse((scheme, netloc, path,
+                           params, query, fragment))
+    if not path:
+        return urlunparse((scheme, netloc, bpath,
+                           params, query or bquery, fragment))
+    i = rfind(bpath, '/')
+    if i >= 0:
+        path = bpath[:i] + '/' + path
+    segments = splitfields(path, '/')
+    if segments[-1] == '.':
+        segments[-1] = ''
+    while '.' in segments:
+        segments.remove('.')
+    while True:
+        i = 1
+        n = len(segments) - 1
+        while i < n:
+            if segments[i] == '..' and segments[i - 1]:
+                del segments[i - 1:i + 1]
+                break
+            i = i + 1
+        else:
+            break
+    if len(segments) == 2 and segments[1] == '..' and segments[0] == '':
+        segments[-1] = ''
+    elif len(segments) >= 2 and segments[-1] == '..':
+        segments[-2:] = ['']
+    return urlunparse((scheme, netloc, joinfields(segments, '/'),
+                       params, query, fragment))
+
 
 def urldefrag(url):
     """Removes any existing fragment from URL.
@@ -222,35 +231,37 @@ test_input = """
 """
 # XXX The result for //g is actually http://g/; is this a problem?
 
+
 def test():
-	import sys
-	base = ''
-	if sys.argv[1:]:
-		fn = sys.argv[1]
-		if fn == '-':
-			fp = sys.stdin
-		else:
-			fp = open(fn)
-	else:
-		import StringIO
-		fp = StringIO.StringIO(test_input)
-	while 1:
-		line = fp.readline()
-		if not line: break
-		words = string.split(line)
-		if not words:
-			continue
-		url = words[0]
-		parts = urlparse(url)
-		print '%-10s : %s' % (url, parts)
-		abs = urljoin(base, url)
-		if not base:
-			base = abs
-		wrapped = '<URL:%s>' % abs
-		print '%-10s = %s' % (url, wrapped)
-		if len(words) == 3 and words[1] == '=':
-			if wrapped != words[2]:
-				print 'EXPECTED', words[2], '!!!!!!!!!!'
+    import sys
+    base = ''
+    if sys.argv[1:]:
+        fn = sys.argv[1]
+        if fn == '-':
+            fp = sys.stdin
+        else:
+            fp = open(fn)
+    else:
+        import StringIO
+        fp = StringIO.StringIO(test_input)
+    while True:
+        line = fp.readline()
+        if not line:
+            break
+        words = string.split(line)
+        if not words:
+            continue
+        url = words[0]
+        parts = urlparse(url)
+        print '%-10s : %s' % (url, parts)
+        abs = urljoin(base, url)
+        if not base:
+            base = abs
+        wrapped = '<URL:%s>' % abs
+        print '%-10s = %s' % (url, wrapped)
+        if len(words) == 3 and words[1] == '=':
+            if wrapped != words[2]:
+                print 'EXPECTED', words[2], '!!!!!!!!!!'
 
 if __name__ == '__main__':
-	test()
+    test()
diff --git a/Packages/cdms2/Lib/cdxmllib.py b/Packages/cdms2/Lib/cdxmllib.py
index 7c1aff308..70b91d9ba 100644
--- a/Packages/cdms2/Lib/cdxmllib.py
+++ b/Packages/cdms2/Lib/cdxmllib.py
@@ -11,6 +11,7 @@ import re
 
 version = '0.3'
 
+
 class Error(RuntimeError):
     pass
 
@@ -20,7 +21,7 @@ _S = '[ \t\r\n]+'                       # white space
 _opS = '[ \t\r\n]*'                     # optional white space
 _Name = '[a-zA-Z_:][-a-zA-Z0-9._:]*'    # valid XML name
 _QStr = "(?:'[^']*'|\"[^\"]*\")"        # quoted XML string
-illegal = re.compile('[^\t\r\n -\176\240-\377]') # illegal chars in content
+illegal = re.compile('[^\t\r\n -\176\240-\377]')  # illegal chars in content
 interesting = re.compile('[]&<]')
 
 amp = re.compile('&')
@@ -33,37 +34,37 @@ newline = re.compile('\n')
 attrfind = re.compile(
     _S + '(?P<name>' + _Name + ')'
     '(' + _opS + '=' + _opS +
-    '(?P<value>'+_QStr+'|[-a-zA-Z0-9.:+*%?!\(\)_#=~]+))?')
+    '(?P<value>' + _QStr + '|[-a-zA-Z0-9.:+*%?!\(\)_#=~]+))?')
 starttagopen = re.compile('<' + _Name)
 starttagend = re.compile(_opS + '(?P<slash>/?)>')
-starttagmatch = re.compile('<(?P<tagname>'+_Name+')'
-                      '(?P<attrs>(?:'+attrfind.pattern+')*)'+
-                      starttagend.pattern)
+starttagmatch = re.compile('<(?P<tagname>' + _Name + ')'
+                           '(?P<attrs>(?:' + attrfind.pattern + ')*)' +
+                           starttagend.pattern)
 endtagopen = re.compile('</')
 endbracket = re.compile(_opS + '>')
-endbracketfind = re.compile('(?:[^>\'"]|'+_QStr+')*>')
+endbracketfind = re.compile('(?:[^>\'"]|' + _QStr + ')*>')
 tagfind = re.compile(_Name)
 cdataopen = re.compile(r'<!\[CDATA\[')
 cdataclose = re.compile(r'\]\]>')
 # this matches one of the following:
 # SYSTEM SystemLiteral
 # PUBLIC PubidLiteral SystemLiteral
-_SystemLiteral = '(?P<%s>'+_QStr+')'
+_SystemLiteral = '(?P<%s>' + _QStr + ')'
 _PublicLiteral = '(?P<%s>"[-\'\(\)+,./:=?;!*#@$_%% \n\ra-zA-Z0-9]*"|' \
-                        "'[-\(\)+,./:=?;!*#@$_%% \n\ra-zA-Z0-9]*')"
+    "'[-\(\)+,./:=?;!*#@$_%% \n\ra-zA-Z0-9]*')"
 _ExternalId = '(?:SYSTEM|' \
-                 'PUBLIC'+_S+_PublicLiteral%'pubid'+ \
-              ')'+_S+_SystemLiteral%'syslit'
-doctype = re.compile('<!DOCTYPE'+_S+'(?P<name>'+_Name+')'
-                     '(?:'+_S+_ExternalId+')?'+_opS)
-xmldecl = re.compile('<\?xml'+_S+
-                     'version'+_opS+'='+_opS+'(?P<version>'+_QStr+')'+
-                     '(?:'+_S+'encoding'+_opS+'='+_opS+
-                        "(?P<encoding>'[A-Za-z][-A-Za-z0-9._]*'|"
-                        '"[A-Za-z][-A-Za-z0-9._]*"))?'
-                     '(?:'+_S+'standalone'+_opS+'='+_opS+
-                        '(?P<standalone>\'(?:yes|no)\'|"(?:yes|no)"))?'+
-                     _opS+'\?>')
+    'PUBLIC' + _S + _PublicLiteral % 'pubid' + \
+              ')' + _S + _SystemLiteral % 'syslit'
+doctype = re.compile('<!DOCTYPE' + _S + '(?P<name>' + _Name + ')'
+                     '(?:' + _S + _ExternalId + ')?' + _opS)
+xmldecl = re.compile('<\?xml' + _S +
+                     'version' + _opS + '=' + _opS + '(?P<version>' + _QStr + ')' +
+                     '(?:' + _S + 'encoding' + _opS + '=' + _opS +
+                     "(?P<encoding>'[A-Za-z][-A-Za-z0-9._]*'|"
+                     '"[A-Za-z][-A-Za-z0-9._]*"))?'
+                     '(?:' + _S + 'standalone' + _opS + '=' + _opS +
+                     '(?P<standalone>\'(?:yes|no)\'|"(?:yes|no)"))?' +
+                     _opS + '\?>')
 procopen = re.compile(r'<\?(?P<proc>' + _Name + ')' + _opS)
 procclose = re.compile(_opS + r'\?>')
 commentopen = re.compile('<!--')
@@ -74,10 +75,10 @@ attrtrans = string.maketrans(' \r\n\t', '    ')
 # definitions for XML namespaces
 _NCName = '[a-zA-Z_][-a-zA-Z0-9._]*'    # XML Name, minus the ":"
 ncname = re.compile(_NCName + '$')
-qname = re.compile('(?:(?P<prefix>' + _NCName + '):)?' # optional prefix
+qname = re.compile('(?:(?P<prefix>' + _NCName + '):)?'  # optional prefix
                    '(?P<local>' + _NCName + ')$')
 
-xmlns = re.compile('xmlns(?::(?P<ncname>'+_NCName+'))?$')
+xmlns = re.compile('xmlns(?::(?P<ncname>' + _NCName + '))?$')
 
 # XML parser base class -- find tags and call handler functions.
 # Usage: p = XMLParser(); p.feed(data); ...; p.close().
@@ -87,6 +88,7 @@ xmlns = re.compile('xmlns(?::(?P<ncname>'+_NCName+'))?$')
 # parser by calling self.handle_data() with some data as argument (the
 # data may be split up in arbitrary chunks).
 
+
 class XMLParser:
     attributes = {}                     # default, to be overridden
     elements = {}                       # default, to be overridden
@@ -102,15 +104,18 @@ class XMLParser:
     def __init__(self, **kw):
         self.__fixed = 0
         if 'accept_unquoted_attributes' in kw:
-            self.__accept_unquoted_attributes = kw['accept_unquoted_attributes']
+            self.__accept_unquoted_attributes = kw[
+                'accept_unquoted_attributes']
         if 'accept_missing_endtag_name' in kw:
-            self.__accept_missing_endtag_name = kw['accept_missing_endtag_name']
+            self.__accept_missing_endtag_name = kw[
+                'accept_missing_endtag_name']
         if 'map_case' in kw:
             self.__map_case = kw['map_case']
         if 'accept_utf8' in kw:
             self.__accept_utf8 = kw['accept_utf8']
         if 'translate_attribute_references' in kw:
-            self.__translate_attribute_references = kw['translate_attribute_references']
+            self.__translate_attribute_references = kw[
+                'translate_attribute_references']
         self.reset()
 
     def __fixelements(self):
@@ -148,7 +153,7 @@ class XMLParser:
         self.__seen_doctype = None
         self.__seen_starttag = 0
         self.__use_namespaces = 0
-        self.__namespaces = {'xml':None}   # xml is implicitly declared
+        self.__namespaces = {'xml': None}   # xml is implicitly declared
         # backward compatibility hack: if elements not overridden,
         # fill it in ourselves
         if self.elements is XMLParser.elements:
@@ -179,11 +184,11 @@ class XMLParser:
             del self.elements
 
     # Interface -- translate references
-    def translate_references(self, data, all = 1):
+    def translate_references(self, data, all=1):
         if not self.__translate_attribute_references:
             return data
         i = 0
-        while 1:
+        while True:
             res = amp.search(data, i)
             if res is None:
                 return data
@@ -191,7 +196,7 @@ class XMLParser:
             res = ref.match(data, s)
             if res is None:
                 self.syntax_error("bogus `&'")
-                i = s+1
+                i = s + 1
                 continue
             i = res.end(0)
             str = res.group(1)
@@ -203,21 +208,23 @@ class XMLParser:
                     str = chr(int(str[1:]))
                 if data[i - 1] != ';':
                     self.syntax_error("`;' missing after char reference")
-                    i = i-1
+                    i = i - 1
             elif all:
                 if str in self.entitydefs:
                     str = self.entitydefs[str]
                     rescan = 1
                 elif data[i - 1] != ';':
                     self.syntax_error("bogus `&'")
-                    i = s + 1 # just past the &
+                    i = s + 1  # just past the &
                     continue
                 else:
-                    self.syntax_error("reference to unknown entity `&%s;'" % str)
+                    self.syntax_error(
+                        "reference to unknown entity `&%s;'" %
+                        str)
                     str = '&' + str + ';'
             elif data[i - 1] != ';':
                 self.syntax_error("bogus `&'")
-                i = s + 1 # just past the &
+                i = s + 1  # just past the &
                 continue
 
             # when we get here, str contains the translated text and i points
@@ -268,63 +275,72 @@ class XMLParser:
                 self.handle_data(data)
                 self.lineno = self.lineno + data.count('\n')
             i = j
-            if i == n: break
+            if i == n:
+                break
             if rawdata[i] == '<':
                 if starttagopen.match(rawdata, i):
                     if self.literal:
                         data = rawdata[i]
                         self.handle_data(data)
                         self.lineno = self.lineno + data.count('\n')
-                        i = i+1
+                        i = i + 1
                         continue
                     k = self.parse_starttag(i)
-                    if k < 0: break
+                    if k < 0:
+                        break
                     self.__seen_starttag = 1
                     self.lineno = self.lineno + rawdata[i:k].count('\n')
                     i = k
                     continue
                 if endtagopen.match(rawdata, i):
                     k = self.parse_endtag(i)
-                    if k < 0: break
+                    if k < 0:
+                        break
                     self.lineno = self.lineno + rawdata[i:k].count('\n')
-                    i =  k
+                    i = k
                     continue
                 if commentopen.match(rawdata, i):
                     if self.literal:
                         data = rawdata[i]
                         self.handle_data(data)
                         self.lineno = self.lineno + data.count('\n')
-                        i = i+1
+                        i = i + 1
                         continue
                     k = self.parse_comment(i)
-                    if k < 0: break
+                    if k < 0:
+                        break
                     self.lineno = self.lineno + rawdata[i:k].count('\n')
                     i = k
                     continue
                 if cdataopen.match(rawdata, i):
                     k = self.parse_cdata(i)
-                    if k < 0: break
+                    if k < 0:
+                        break
                     self.lineno = self.lineno + rawdata[i:k].count('\n')
                     i = k
                     continue
                 res = xmldecl.match(rawdata, i)
                 if res:
                     if not self.__at_start:
-                        self.syntax_error("<?xml?> declaration not at start of document")
+                        self.syntax_error(
+                            "<?xml?> declaration not at start of document")
                     version, encoding, standalone = res.group('version',
                                                               'encoding',
                                                               'standalone')
                     if version[1:-1] != '1.0':
                         raise Error('only XML version 1.0 supported')
-                    if encoding: encoding = encoding[1:-1]
-                    if standalone: standalone = standalone[1:-1]
+                    if encoding:
+                        encoding = encoding[1:-1]
+                    if standalone:
+                        standalone = standalone[1:-1]
                     self.handle_xml(encoding, standalone)
                     i = res.end(0)
                     continue
                 res = procopen.match(rawdata, i)
                 if res:
                     k = self.parse_proc(i)
-                    if k < 0: break
+                    if k < 0:
+                        break
                     self.lineno = self.lineno + rawdata[i:k].count('\n')
                     i = k
                     continue
@@ -334,14 +350,16 @@ class XMLParser:
                         data = rawdata[i]
                         self.handle_data(data)
                         self.lineno = self.lineno + data.count('\n')
-                        i = i+1
+                        i = i + 1
                         continue
                     if self.__seen_doctype:
                         self.syntax_error('multiple DOCTYPE elements')
                     if self.__seen_starttag:
-                        self.syntax_error('DOCTYPE not at beginning of document')
+                        self.syntax_error(
+                            'DOCTYPE not at beginning of document')
                     k = self.parse_doctype(res)
-                    if k < 0: break
+                    if k < 0:
+                        break
                     self.__seen_doctype = res.group('name')
                     if self.__map_case:
                         self.__seen_doctype = self.__seen_doctype.lower()
@@ -352,14 +370,14 @@ class XMLParser:
                 if self.literal:
                     data = rawdata[i]
                     self.handle_data(data)
-                    i = i+1
+                    i = i + 1
                     continue
                 res = charref.match(rawdata, i)
                 if res is not None:
                     i = res.end(0)
-                    if rawdata[i-1] != ';':
+                    if rawdata[i - 1] != ';':
                         self.syntax_error("`;' missing in charref")
-                        i = i-1
+                        i = i - 1
                     if not self.stack:
                         self.syntax_error('data not in content')
                     self.handle_charref(res.group('char')[:-1])
@@ -368,14 +386,15 @@ class XMLParser:
                 res = entityref.match(rawdata, i)
                 if res is not None:
                     i = res.end(0)
-                    if rawdata[i-1] != ';':
+                    if rawdata[i - 1] != ';':
                         self.syntax_error("`;' missing in entityref")
-                        i = i-1
+                        i = i - 1
                     name = res.group('name')
                     if self.__map_case:
                         name = name.lower()
                     if name in self.entitydefs:
-                        self.rawdata = rawdata = rawdata[:res.start(0)] + self.entitydefs[name] + rawdata[i:]
+                        self.rawdata = rawdata = rawdata[
+                            :res.start(0)] + self.entitydefs[name] + rawdata[i:]
                         n = len(rawdata)
                         i = res.start(0)
                     else:
@@ -386,14 +405,14 @@ class XMLParser:
                 if self.literal:
                     data = rawdata[i]
                     self.handle_data(data)
-                    i = i+1
+                    i = i + 1
                     continue
-                if n-i < 3:
+                if n - i < 3:
                     break
                 if cdataclose.match(rawdata, i):
                     self.syntax_error("bogus `]]>'")
                 self.handle_data(rawdata[i])
-                i = i+1
+                i = i + 1
                 continue
             else:
                 raise Error('neither < nor & ??')
@@ -410,7 +429,7 @@ class XMLParser:
                 self.syntax_error('illegal character in content')
             self.handle_data(data)
             self.lineno = self.lineno + data.count('\n')
-            self.rawdata = rawdata[i+1:]
+            self.rawdata = rawdata[i + 1:]
             return self.goahead(end)
         self.rawdata = rawdata[i:]
         if end:
@@ -424,19 +443,19 @@ class XMLParser:
     # Internal -- parse comment, return length or -1 if not terminated
     def parse_comment(self, i):
         rawdata = self.rawdata
-        if rawdata[i:i+4] != '<!--':
+        if rawdata[i:i + 4] != '<!--':
             raise Error('unexpected call to handle_comment')
-        res = commentclose.search(rawdata, i+4)
+        res = commentclose.search(rawdata, i + 4)
         if res is None:
             return -1
-        if doubledash.search(rawdata, i+4, res.start(0)):
+        if doubledash.search(rawdata, i + 4, res.start(0)):
             self.syntax_error("`--' inside comment")
-        if rawdata[res.start(0)-1] == '-':
+        if rawdata[res.start(0) - 1] == '-':
             self.syntax_error('comment cannot end in three dashes')
         if not self.__accept_utf8 and \
-           illegal.search(rawdata, i+4, res.start(0)):
+           illegal.search(rawdata, i + 4, res.start(0)):
             self.syntax_error('illegal character in comment')
-        self.handle_comment(rawdata[i+4: res.start(0)])
+        self.handle_comment(rawdata[i + 4: res.start(0)])
         return res.end(0)
 
     # Internal -- handle DOCTYPE tag, return length or -1 if not terminated
@@ -449,14 +468,15 @@ class XMLParser:
         pubid, syslit = res.group('pubid', 'syslit')
         if pubid is not None:
             pubid = pubid[1:-1]         # remove quotes
-            pubid = ' '.join(pubid.split()) # normalize
-        if syslit is not None: syslit = syslit[1:-1] # remove quotes
+            pubid = ' '.join(pubid.split())  # normalize
+        if syslit is not None:
+            syslit = syslit[1:-1]  # remove quotes
         j = k = res.end(0)
         if k >= n:
             return -1
         if rawdata[k] == '[':
             level = 0
-            k = k+1
+            k = k + 1
             dq = sq = 0
             while k < n:
                 c = rawdata[k]
@@ -467,10 +487,10 @@ class XMLParser:
                 elif sq or dq:
                     pass
                 elif level <= 0 and c == ']':
-                    res = endbracket.match(rawdata, k+1)
+                    res = endbracket.match(rawdata, k + 1)
                     if res is None:
                         return -1
-                    self.handle_doctype(name, pubid, syslit, rawdata[j+1:k])
+                    self.handle_doctype(name, pubid, syslit, rawdata[j + 1:k])
                     return res.end(0)
                 elif c == '<':
                     level = level + 1
@@ -478,7 +498,7 @@ class XMLParser:
                     level = level - 1
                     if level < 0:
                         self.syntax_error("bogus `>' in DOCTYPE")
-                k = k+1
+                k = k + 1
         res = endbracketfind.match(rawdata, k)
         if res is None:
             return -1
@@ -490,30 +510,31 @@ class XMLParser:
     # Internal -- handle CDATA tag, return length or -1 if not terminated
     def parse_cdata(self, i):
         rawdata = self.rawdata
-        if rawdata[i:i+9] != '<![CDATA[':
+        if rawdata[i:i + 9] != '<![CDATA[':
             raise Error('unexpected call to parse_cdata')
-        res = cdataclose.search(rawdata, i+9)
+        res = cdataclose.search(rawdata, i + 9)
         if res is None:
             return -1
         if not self.__accept_utf8 and \
-           illegal.search(rawdata, i+9, res.start(0)):
+           illegal.search(rawdata, i + 9, res.start(0)):
             self.syntax_error('illegal character in CDATA')
         if not self.stack:
             self.syntax_error('CDATA not in content')
-        self.handle_cdata(rawdata[i+9:res.start(0)])
+        self.handle_cdata(rawdata[i + 9:res.start(0)])
         return res.end(0)
 
-    __xml_namespace_attributes = {'ns':None, 'src':None, 'prefix':None}
+    __xml_namespace_attributes = {'ns': None, 'src': None, 'prefix': None}
     # Internal -- handle a processing instruction tag
+
     def parse_proc(self, i):
         rawdata = self.rawdata
         end = procclose.search(rawdata, i)
         if end is None:
             return -1
         j = end.start(0)
-        if not self.__accept_utf8 and illegal.search(rawdata, i+2, j):
+        if not self.__accept_utf8 and illegal.search(rawdata, i + 2, j):
             self.syntax_error('illegal character in processing instruction')
-        res = tagfind.match(rawdata, i+2)
+        res = tagfind.match(rawdata, i + 2)
         if res is None:
             raise Error('unexpected call to parse_proc')
         k = res.end(0)
@@ -527,13 +548,17 @@ class XMLParser:
             # this must come after the <?xml?> declaration (if any)
             # and before the <!DOCTYPE> (if any).
             if self.__seen_doctype or self.__seen_starttag:
-                self.syntax_error('xml:namespace declaration too late in document')
+                self.syntax_error(
+                    'xml:namespace declaration too late in document')
             attrdict, namespace, k = self.parse_attributes(name, k, j)
             if namespace:
-                self.syntax_error('namespace declaration inside namespace declaration')
+                self.syntax_error(
+                    'namespace declaration inside namespace declaration')
             for attrname in attrdict.keys():
                 if not attrname in self.__xml_namespace_attributes:
-                    self.syntax_error("unknown attribute `%s' in xml:namespace tag" % attrname)
+                    self.syntax_error(
+                        "unknown attribute `%s' in xml:namespace tag" %
+                        attrname)
             if not 'ns' in attrdict or not 'prefix' in attrdict:
                 self.syntax_error('xml:namespace without required attributes')
             prefix = attrdict.get('prefix')
@@ -563,10 +588,12 @@ class XMLParser:
                 attrname = attrname.lower()
             i = res.end(0)
             if attrvalue is None:
-                self.syntax_error("no value specified for attribute `%s'" % attrname)
+                self.syntax_error(
+                    "no value specified for attribute `%s'" %
+                    attrname)
                 attrvalue = attrname
             elif attrvalue[:1] == "'" == attrvalue[-1:] or \
-                 attrvalue[:1] == '"' == attrvalue[-1:]:
+                    attrvalue[:1] == '"' == attrvalue[-1:]:
                 attrvalue = attrvalue[1:-1]
             elif not self.__accept_unquoted_attributes:
                 self.syntax_error("attribute `%s' value not quoted" % attrname)
@@ -576,7 +603,7 @@ class XMLParser:
                 ncname = res.group('ncname')
                 namespace[ncname or ''] = attrvalue or None
                 if not self.__use_namespaces:
-                    self.__use_namespaces = len(self.stack)+1
+                    self.__use_namespaces = len(self.stack) + 1
                 continue
             if '<' in attrvalue:
                 self.syntax_error("`<' illegal in attribute value")
@@ -590,7 +617,7 @@ class XMLParser:
     def parse_starttag(self, i):
         rawdata = self.rawdata
         # i points to start of tag
-        end = endbracketfind.match(rawdata, i+1)
+        end = endbracketfind.match(rawdata, i + 1)
         if end is None:
             return -1
         tag = starttagmatch.match(rawdata, i)
@@ -625,10 +652,11 @@ class XMLParser:
             if ns is not None:
                 nstag = ns + ' ' + nstag
             elif prefix != '':
-                nstag = prefix + ':' + nstag # undo split
+                nstag = prefix + ':' + nstag  # undo split
             self.stack[-1] = tagname, nsdict, nstag
         # translate namespace of attributes
-        attrnamemap = {} # map from new name to old name (used for error reporting)
+        attrnamemap = {}
+            # map from new name to old name (used for error reporting)
         for key in attrdict.keys():
             attrnamemap[key] = key
         if self.__use_namespaces:
@@ -661,7 +689,9 @@ class XMLParser:
         if attributes is not None:
             for key in attrdict.keys():
                 if not key in attributes:
-                    self.syntax_error("unknown attribute `%s' in tag `%s'" % (attrnamemap[key], tagname))
+                    self.syntax_error(
+                        "unknown attribute `%s' in tag `%s'" %
+                        (attrnamemap[key], tagname))
             for key, val in attributes.items():
                 if val is not None and not key in attrdict:
                     attrdict[key] = val
@@ -674,18 +704,18 @@ class XMLParser:
     # Internal -- parse endtag
     def parse_endtag(self, i):
         rawdata = self.rawdata
-        end = endbracketfind.match(rawdata, i+1)
+        end = endbracketfind.match(rawdata, i + 1)
         if end is None:
             return -1
-        res = tagfind.match(rawdata, i+2)
+        res = tagfind.match(rawdata, i + 2)
         if res is None:
             if self.literal:
                 self.handle_data(rawdata[i])
-                return i+1
+                return i + 1
             if not self.__accept_missing_endtag_name:
                 self.syntax_error('no name specified in end tag')
             tag = self.stack[-1][0]
-            k = i+2
+            k = i + 2
         else:
             tag = res.group(0)
             if self.__map_case:
@@ -693,7 +723,7 @@ class XMLParser:
             if self.literal:
                 if not self.stack or tag != self.stack[-1][0]:
                     self.handle_data(rawdata[i])
-                    return i+1
+                    return i + 1
             k = res.end(0)
         if endbracket.match(rawdata, k) is None:
             self.syntax_error('garbage in end tag')
@@ -726,7 +756,9 @@ class XMLParser:
                 return
         while len(self.stack) > found:
             if found < len(self.stack) - 1:
-                self.syntax_error('missing close tag for %s' % self.stack[-1][2])
+                self.syntax_error(
+                    'missing close tag for %s' %
+                    self.stack[-1][2])
             nstag = self.stack[-1][2]
             method = self.elements.get(nstag, (None, None))[1]
             if method is not None:
@@ -798,8 +830,11 @@ class XMLParser:
 
     # To be overridden -- handlers for unknown objects
     def unknown_starttag(self, tag, attrs): pass
+
     def unknown_endtag(self, tag): pass
+
     def unknown_charref(self, ref): pass
+
     def unknown_entityref(self, name):
         self.syntax_error("reference to unknown entity `&%s;'" % name)
 
@@ -812,34 +847,34 @@ class TestXMLParser(XMLParser):
 
     def handle_xml(self, encoding, standalone):
         self.flush()
-        print 'xml: encoding =',encoding,'standalone =',standalone
+        print 'xml: encoding =', encoding, 'standalone =', standalone
 
     def handle_doctype(self, tag, pubid, syslit, data):
         self.flush()
-        print 'DOCTYPE:',tag, `data`
+        print 'DOCTYPE:', tag, repr(data)
 
     def handle_data(self, data):
         self.testdata = self.testdata + data
-        if len(`self.testdata`) >= 70:
+        if len(repr(self.testdata)) >= 70:
             self.flush()
 
     def flush(self):
         data = self.testdata
         if data:
             self.testdata = ""
-            print 'data:', `data`
+            print 'data:', repr(data)
 
     def handle_cdata(self, data):
         self.flush()
-        print 'cdata:', `data`
+        print 'cdata:', repr(data)
 
     def handle_proc(self, name, data):
         self.flush()
-        print 'processing:',name,`data`
+        print 'processing:', name, repr(data)
 
     def handle_comment(self, data):
         self.flush()
-        r = `data`
+        r = repr(data)
         if len(r) > 68:
             r = r[:32] + '...' + r[-32:]
         print 'comment:', r
@@ -873,8 +908,10 @@ class TestXMLParser(XMLParser):
         XMLParser.close(self)
         self.flush()
 
-def test(args = None):
-    import sys, getopt
+
+def test(args=None):
+    import sys
+    import getopt
     from time import time
 
     if not args:
@@ -899,7 +936,7 @@ def test(args = None):
     else:
         try:
             f = open(file, 'r')
-        except IOError, msg:
+        except IOError as msg:
             print file, ":", msg
             sys.exit(1)
 
@@ -917,15 +954,15 @@ def test(args = None):
             for c in data:
                 x.feed(c)
             x.close()
-    except Error, msg:
+    except Error as msg:
         t1 = time()
         print msg
         if do_time:
-            print 'total time: %g' % (t1-t0)
+            print 'total time: %g' % (t1 - t0)
         sys.exit(1)
     t1 = time()
     if do_time:
-        print 'total time: %g' % (t1-t0)
+        print 'total time: %g' % (t1 - t0)
 
 
 if __name__ == '__main__':
diff --git a/Packages/cdms2/Lib/convention.py b/Packages/cdms2/Lib/convention.py
index 0ed475877..43086d8e4 100644
--- a/Packages/cdms2/Lib/convention.py
+++ b/Packages/cdms2/Lib/convention.py
@@ -1,6 +1,6 @@
 """ metadata conventions """
 
-from error import CDMSError
+from .error import CDMSError
 from UserList import UserList
 
 # On in order to turn off some warnings
@@ -8,13 +8,18 @@ WITH_GRIDSPEC_SUPPORT = True
 
 MethodNotImplemented = "Method not yet implemented"
 
+
 class AliasList (UserList):
+
     def __init__(self, alist):
-        UserList.__init__(self,alist)
-    def __setitem__ (self, i, value):
+        UserList.__init__(self, alist)
+
+    def __setitem__(self, i, value):
         self.data[i] = value.lower()
+
     def __setslice(self, i, j, values):
         self.data[i:j] = map(lambda x: x.lower(), values)
+
     def append(self, value):
         self.data.append(value.lower())
 
@@ -24,16 +29,17 @@ latitude_aliases = AliasList([])
 time_aliases = AliasList([])
 forecast_aliases = AliasList([])
 
+
 class AbstractConvention:
 
     def getAxisIds(self, vardict):
-        raise CDMSError, MethodNotImplemented
+        raise CDMSError(MethodNotImplemented)
 
     def getAxisAuxIds(self, vardict, axiskeys):
-        raise CDMSError, MethodNotImplemented
+        raise CDMSError(MethodNotImplemented)
 
     def getDsetnodeAuxAxisIds(self, dsetnode):
-        raise CDMSError, MethodNotImplemented
+        raise CDMSError(MethodNotImplemented)
 
     def axisIsLatitude(self, axis):
         id = axis.id.lower()
@@ -49,7 +55,7 @@ class AbstractConvention:
 
         for obj in [d[0] for d in var.getDomain()]:
             if self.axisIsLatitude(obj):
-                if nlat==0:
+                if nlat == 0:
                     lat = obj
                 nlat += 1
         return (lat, nlat)
@@ -59,11 +65,12 @@ class AbstractConvention:
         nlon = 0
         for obj in [d[0] for d in var.getDomain()]:
             if self.axisIsLongitude(obj):
-                if nlon==0:
+                if nlon == 0:
                     lon = obj
                 nlon += 1
         return (lon, nlon)
 
+
 class NUGConvention(AbstractConvention):
 
     def __init__(self, version=None):
@@ -74,18 +81,20 @@ class NUGConvention(AbstractConvention):
         result = []
         for name in vardict.keys():
             dimensions = vardict[name].dimensions
-            if len(dimensions)==1 and (name in dimensions):
+            if len(dimensions) == 1 and (name in dimensions):
                 result.append(name)
         return result
 
     def getAxisAuxIds(self, vardict, axiskeys):
         return []
 
+
 class COARDSConvention(NUGConvention):
 
     def __init__(self, version=None):
         NUGConvention.__init__(self, version)
 
+
 class CFConvention(COARDSConvention):
 
     current = 'CF-1.0'
@@ -111,11 +120,11 @@ class CFConvention(COARDSConvention):
                 # Note: not everything referenced by .coordinates attribute is
                 # in fact a coordinate axis, e.g., scalar coordinates
                 if not WITH_GRIDSPEC_SUPPORT:
-                    print 'Warning: coordinate attribute points to non-existent variable: %s'%key
+                    print 'Warning: coordinate attribute points to non-existent variable: %s' % key
                 del coorddict[key]
                 continue
             # Omit scalar dimensions, and dimensions greater than 2-D
-            if len(coord.shape) not in [1,2]:
+            if len(coord.shape) not in [1, 2]:
                 del coorddict[key]
         return coorddict.keys()
 
@@ -129,12 +138,13 @@ class CFConvention(COARDSConvention):
                 coordnames = coordnames.split()
                 for item in coordnames:
                     # Don't include if already a 1D coordinate axis.
-                    if dsetdict.has_key(item) and dsetdict[item].tag=='axis':
+                    if item in dsetdict and dsetdict[item].tag == 'axis':
                         continue
                     # It's not an axis node, so must be a variable, so getDomain is defined.
-                    # Check the rank, don't include if not 1D or 2D (e.g., scalar coordinate)
+                    # Check the rank, don't include if not 1D or 2D (e.g.,
+                    # scalar coordinate)
                     domnode = dsetdict[item].getDomain()
-                    if domnode.getChildCount() not in [1,2]:
+                    if domnode.getChildCount() not in [1, 2]:
                         continue
                     coorddict[item] = 1
         return coorddict.keys()
@@ -155,14 +165,14 @@ class CFConvention(COARDSConvention):
                 # Note: not everything referenced by .coordinates attribute is
                 # in fact a coordinate axis, e.g., scalar coordinates
                 if coord is not None and hasattr(coord, 'isLatitude') and coord.isLatitude():
-                    if nlat==0:
+                    if nlat == 0:
                         lat = coord
                     nlat += 1
         if lat is None:
             lat, nlat = AbstractConvention.getVarLatId(self, var, vardict)
 
         return (lat, nlat)
-                
+
     def getVarLonId(self, var, vardict):
         lon = None
         nlon = 0
@@ -179,30 +189,30 @@ class CFConvention(COARDSConvention):
                 # Note: not everything referenced by .coordinates attribute is
                 # in fact a coordinate axis, e.g., scalar coordinates
                 if coord is not None and hasattr(coord, 'isLongitude') and coord.isLongitude():
-                    if nlon==0:
+                    if nlon == 0:
                         lon = coord
                     nlon += 1
         if lon is None:
             lon, nlon = AbstractConvention.getVarLonId(self, var, vardict)
 
         return (lon, nlon)
-                
+
     def axisIsLatitude(self, axis):
-        if (hasattr(axis,'axis') and axis.axis=='Y'):
+        if (hasattr(axis, 'axis') and axis.axis == 'Y'):
             return 1
         elif (hasattr(axis, 'units') and axis.units.lower() in ['degrees_north', 'degree_north', 'degree_n', 'degrees_n', 'degreen', 'degreesn']):
             return 1
-        elif (hasattr(axis, 'standard_name') and axis.standard_name.lower()=='latitude'):
+        elif (hasattr(axis, 'standard_name') and axis.standard_name.lower() == 'latitude'):
             return 1
         else:
             return AbstractConvention.axisIsLatitude(self, axis)
-        
+
     def axisIsLongitude(self, axis):
-        if (hasattr(axis,'axis') and axis.axis=='X'):
+        if (hasattr(axis, 'axis') and axis.axis == 'X'):
             return 1
         elif (hasattr(axis, 'units') and axis.units.lower() in ['degrees_east', 'degree_east', 'degree_e', 'degrees_e', 'degreee', 'degreese']):
             return 1
-        elif (hasattr(axis, 'standard_name') and axis.standard_name.lower()=='longitude'):
+        elif (hasattr(axis, 'standard_name') and axis.standard_name.lower() == 'longitude'):
             return 1
         else:
             return AbstractConvention.axisIsLongitude(self, axis)
@@ -211,10 +221,10 @@ class CFConvention(COARDSConvention):
         """Get the bounds variable for the variable, from a dataset or file."""
         if hasattr(var, 'bounds'):
             boundsid = var.bounds
-            if dset.variables.has_key(boundsid):
+            if boundsid in dset.variables:
                 result = dset[boundsid]
             else:
-                print 'Warning: bounds variable not found in %s: %s'%(dset.id, boundsid)
+                print 'Warning: bounds variable not found in %s: %s' % (dset.id, boundsid)
                 result = None
         else:
             result = None
@@ -225,7 +235,7 @@ NUG = NUGConvention()
 COARDS = COARDSConvention()
 CF1 = CFConvention('CF-1')
 
+
 def getDatasetConvention(dset):
     "Return an appropriate convention object. dset is a file or dataset object"
     return CF1
-
diff --git a/Packages/cdms2/Lib/coord.py b/Packages/cdms2/Lib/coord.py
index 8460485e6..8935220af 100644
--- a/Packages/cdms2/Lib/coord.py
+++ b/Packages/cdms2/Lib/coord.py
@@ -1,24 +1,25 @@
-## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by 
-## Further modified to be pure new numpy June 24th 2008
+# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
+# Further modified to be pure new numpy June 24th 2008
 
 """
 CDMS CoordinateAxis objects
 """
 import sys
-import cdmsNode
+from . import cdmsNode
 import cdtime
 import copy
 import numpy
-#import internattr
-from cdmsobj import CdmsObj
-from axis import createAxis, TransientVirtualAxis
-from error import CDMSError
-from convention import AliasList, level_aliases, longitude_aliases, latitude_aliases, time_aliases,\
-     forecast_aliases
-from fvariable import FileVariable
-from variable import DatasetVariable
-from tvariable import TransientVariable
-from avariable import AbstractVariable
+# import internattr
+from .cdmsobj import CdmsObj
+from .axis import createAxis, TransientVirtualAxis
+from .error import CDMSError
+from .convention import AliasList, level_aliases, longitude_aliases, latitude_aliases, time_aliases,\
+    forecast_aliases
+from .fvariable import FileVariable
+from .variable import DatasetVariable
+from .tvariable import TransientVariable
+from .avariable import AbstractVariable
+from functools import reduce
 
 MethodNotImplemented = "Method not yet implemented"
 NoSuchAxisOrGrid = "No such axis or grid: "
@@ -28,34 +29,38 @@ std_axis_attributes = ['name', 'units', 'length', 'values', 'bounds']
 
 # Map between cdtime calendar and CF tags
 calendarToTag = {
-    cdtime.MixedCalendar : 'gregorian',
-    cdtime.NoLeapCalendar : 'noleap',
-    cdtime.GregorianCalendar : 'proleptic_gregorian',
-    cdtime.JulianCalendar : 'julian',
-    cdtime.Calendar360 : '360_day'
-    }
+    cdtime.MixedCalendar: 'gregorian',
+    cdtime.NoLeapCalendar: 'noleap',
+    cdtime.GregorianCalendar: 'proleptic_gregorian',
+    cdtime.JulianCalendar: 'julian',
+    cdtime.Calendar360: '360_day'
+}
 
 tagToCalendar = {
-    'gregorian' : cdtime.MixedCalendar,
-    'standard' : cdtime.GregorianCalendar,
-    'noleap' : cdtime.NoLeapCalendar,
-    'julian' : cdtime.JulianCalendar,
-    'proleptic_gregorian' : cdtime.GregorianCalendar,
-    '360_day' : cdtime.Calendar360,
-    '360' : cdtime.Calendar360,
-    '365_day' : cdtime.NoLeapCalendar,
-    }
+    'gregorian': cdtime.MixedCalendar,
+    'standard': cdtime.GregorianCalendar,
+    'noleap': cdtime.NoLeapCalendar,
+    'julian': cdtime.JulianCalendar,
+    'proleptic_gregorian': cdtime.GregorianCalendar,
+    '360_day': cdtime.Calendar360,
+    '360': cdtime.Calendar360,
+    '365_day': cdtime.NoLeapCalendar,
+}
 
 # This is not an error message, it is used to detect which things have
 # been left as default indices or coordinates.
 unspecified = "No value specified."
 
 # Create a transient axis
+
+
 def createCoordinateAxis(data, bounds=None, id=None, copy=0):
     return TransientAxis(data, bounds, id, copy=copy)
 
 # AbstractCoordinateAxis defines the common interface
 # for coordinate variables/axes.
+
+
 class AbstractCoordinateAxis(CdmsObj):
 
     axis_count = 0                      # Transient axis count
@@ -63,15 +68,15 @@ class AbstractCoordinateAxis(CdmsObj):
     def __init__(self, parent=None, variableNode=None, bounds=None):
         CdmsObj.__init__(self, variableNode)
         self._bounds_ = bounds
-        
+
     def isAbstractCoordinate(self):
         return 1
 
-    def clone (self, copyData=1):
+    def clone(self, copyData=1):
         """clone (self, copyData=1)
         Return a copy of self as a transient axis.
         If copyData is 1, make a separate copy of the data."""
-        raise CDMSError, MethodNotImplemented
+        raise CDMSError(MethodNotImplemented)
 
     # Designate axis as a latitude axis.
     # If persistent is true, write metadata to the container.
@@ -115,17 +120,17 @@ class AbstractCoordinateAxis(CdmsObj):
     # or None. If the axis does not have a calendar attribute, return the global
     # calendar.
     def getCalendar(self):
-        if hasattr(self,'calendar'):
+        if hasattr(self, 'calendar'):
             calendar = self.calendar.lower()
         else:
             calendar = None
 
-        cdcal = tagToCalendar.get(calendar,None)
+        cdcal = tagToCalendar.get(calendar, None)
         return cdcal
 
     def getData(self):
-        raise CDMSError, MethodNotImplemented
- 
+        raise CDMSError(MethodNotImplemented)
+
     # Return None if not explicitly defined
     def getExplicitBounds(self):
         if self._bounds_ is not None:
@@ -135,7 +140,8 @@ class AbstractCoordinateAxis(CdmsObj):
 
     def info(self, flag=None, device=None):
         "Write info about axis; include dimension values and weights if flag"
-        if device is None: device = sys.stdout
+        if device is None:
+            device = sys.stdout
         device.write(str(self))
 
     # Return true iff the axis is a latitude axis
@@ -146,7 +152,8 @@ class AbstractCoordinateAxis(CdmsObj):
     # Return true iff the axis is a level axis
     def isLevel(self):
         id = self.id.lower()
-        if (hasattr(self,'axis') and self.axis=='Z'): return 1
+        if (hasattr(self, 'axis') and self.axis == 'Z'):
+            return 1
         return ((id[0:3] == 'lev') or (id[0:5] == 'depth') or (id in level_aliases))
 
     # Return true iff the axis is a longitude axis
@@ -157,24 +164,30 @@ class AbstractCoordinateAxis(CdmsObj):
     # Return true iff the axis is a time axis
     def isTime(self):
         id = self.id.lower()
-        if (hasattr(self,'axis') and self.axis=='T'): return 1
+        if (hasattr(self, 'axis') and self.axis == 'T'):
+            return 1
         return (id[0:4] == 'time') or (id in time_aliases)
 
     # Return true iff the axis is a forecast axis
     def isForecast(self):
         id = self.id.lower()
-        if (hasattr(self,'axis') and self.axis=='F'): return 1
+        if (hasattr(self, 'axis') and self.axis == 'F'):
+            return 1
         return (id[0:6] == 'fctau0') or (id in forecast_aliases)
 
-    def listall (self, all=None):
+    def listall(self, all=None):
         "Get list of info about this axis."
         aname = self.id
         result = []
         result.append('   id: ' + aname)
-        if self.isLatitude(): result.append('   Designated a latitude axis.')
-        if self.isLongitude(): result.append('   Designated a longitude axis.')
-        if self.isTime(): result.append('   Designated a time axis.')
-        if self.isLevel(): result.append('   Designated a level axis.')
+        if self.isLatitude():
+            result.append('   Designated a latitude axis.')
+        if self.isLongitude():
+            result.append('   Designated a longitude axis.')
+        if self.isTime():
+            result.append('   Designated a time axis.')
+        if self.isLevel():
+            result.append('   Designated a level axis.')
         try:
             units = self.units
             result.append('   units:  ' + units)
@@ -184,11 +197,12 @@ class AbstractCoordinateAxis(CdmsObj):
         result.append('   Shape: ' + str(d.shape))
         flag = 1
         for k in self.attributes.keys():
-            if k in std_axis_attributes: continue
+            if k in std_axis_attributes:
+                continue
             if flag:
                 result.append('   Other axis attributes:')
                 flag = 0
-            result.append('      '+k+': '+str(self.attributes[k]))
+            result.append('      ' + k + ': ' + str(self.attributes[k]))
         result.append('   Python id:  %s' % hex(id(self)))
 
         if all:
@@ -213,86 +227,106 @@ class AbstractCoordinateAxis(CdmsObj):
         if persistent:
             self.calendar = calendarToTag.get(calendar, None)
             if self.calendar is None:
-                raise CDMSError, InvalidCalendar + calendar
+                raise CDMSError(InvalidCalendar + calendar)
         else:
             self.__dict__['calendar'] = calendarToTag.get(calendar, None)
             if self.__dict__['calendar'] is None:
-                raise CDMSError, InvalidCalendar + calendar
+                raise CDMSError(InvalidCalendar + calendar)
 
-    def size (self, axis = None):
+    def size(self, axis=None):
         "Number of elements in array, or in a particular axis."
         s = self.shape
         if axis is None:
             if len(s) == 0:
                 return 1
             else:
-                return reduce(lambda x,y: x*y, s)
+                return reduce(lambda x, y: x * y, s)
         else:
             return s[axis]
-        
+
     def writeToFile(self, file):
 
         if self._bounds_ is not None:
-            if hasattr(self,"bounds"):
+            if hasattr(self, "bounds"):
                 boundsid = self.bounds
             else:
-                boundsid = "bounds_"+self.id
+                boundsid = "bounds_" + self.id
             self.bounds = boundsid
 
         fvar = file.write(self)
 
-        # Create the bounds variable 
-        if (self._bounds_ is not None) and not file.variables.has_key(boundsid):
+        # Create the bounds variable
+        if (self._bounds_ is not None) and boundsid not in file.variables:
             boundslen = self._bounds_.shape[-1]
             try:
                 boundid = self._bounds_.getAxis(-1).id
-                boundsaxis = file.getBoundsAxis(boundslen,boundid=boundid)
+                boundsaxis = file.getBoundsAxis(boundslen, boundid=boundid)
             except:
                 boundsaxis = file.getBoundsAxis(boundslen)
-            
+
             axislist = fvar.getAxisList()
             axislist.append(boundsaxis)
-            boundsvar = file.createVariable(boundsid, cdmsNode.NumericToCdType.get(self.dtype.char), axislist)
+            boundsvar = file.createVariable(
+                boundsid,
+                cdmsNode.NumericToCdType.get(self.dtype.char),
+                axislist)
             boundsvar[:] = self._bounds_.astype(boundsvar.dtype)
         return fvar
 
+
 class AbstractAxis2D(AbstractCoordinateAxis):
 
-    def __init__ (self, parent=None, variableNode=None, bounds=None):
-        AbstractCoordinateAxis.__init__(self, parent, variableNode, bounds=bounds)
+    def __init__(self, parent=None, variableNode=None, bounds=None):
+        AbstractCoordinateAxis.__init__(
+            self,
+            parent,
+            variableNode,
+            bounds=bounds)
 
-    def clone (self, copyData=1):
+    def clone(self, copyData=1):
         """clone (self, copyData=1)
         Return a copy of self as a transient axis.
         If copyData is 1, make a separate copy of the data."""
-        result = TransientAxis2D(self[:], copy=copyData, axes=self.getAxisList(), attributes=self.attributes, bounds=self.getBounds())
+        result = TransientAxis2D(
+            self[:],
+            copy=copyData,
+            axes=self.getAxisList(),
+            attributes=self.attributes,
+            bounds=self.getBounds())
         return result
 
     def setBounds(self, bounds):
         if bounds is not None:
-            if len(bounds.shape)!=3:
-                raise CDMSError, 'Bounds must have rank=3'
-            if bounds.shape[0:2]!=self.shape:
-                raise CDMSError, 'Bounds shape %s is inconsistent with axis shape %s'%(`bounds.shape`,`self.shape`)
+            if len(bounds.shape) != 3:
+                raise CDMSError('Bounds must have rank=3')
+            if bounds.shape[0:2] != self.shape:
+                raise CDMSError(
+                    'Bounds shape %s is inconsistent with axis shape %s' %
+                    (repr(bounds.shape), repr(self.shape)))
         AbstractCoordinateAxis.setBounds(self, bounds)
 
-    def subSlice (self, *specs, **keys):
+    def subSlice(self, *specs, **keys):
         # Take a subslice, returning a TransientAxis2D
         avar = AbstractVariable.subSlice(self, *specs, **keys)
         bounds = self.getBounds()
         if bounds is None:
             newbounds = None
         else:
-            newbounds = bounds[specs]   # bounds can be a numarray or DatasetVariable
+            newbounds = bounds[
+                specs]   # bounds can be a numarray or DatasetVariable
 
-        # Note: disable axis copy to preserve identity of grid and variable domains
-        result = TransientAxis2D(avar, bounds=newbounds, copyaxes=0)    
+        # Note: disable axis copy to preserve identity of grid and variable
+        # domains
+        result = TransientAxis2D(avar, bounds=newbounds, copyaxes=0)
         return result
 
 # Two-dimensional coordinate axis in a dataset.
+
+
 class DatasetAxis2D(AbstractAxis2D, DatasetVariable):
 
     # Note: node is a VariableNode
+
     def __init__(self, parent, id=None, variableNode=None, bounds=None):
         AbstractAxis2D.__init__(self, parent, variableNode, bounds=bounds)
         DatasetVariable.__init__(self, parent, id, variableNode)
@@ -300,13 +334,16 @@ class DatasetAxis2D(AbstractAxis2D, DatasetVariable):
 
     def __repr__(self):
         if self.parent is not None:
-            return "<DatasetAxis2D: %s, file: %s, shape: %s>"%(self.id, self.parent.id, `self.shape`)
+            return "<DatasetAxis2D: %s, file: %s, shape: %s>" % (self.id, self.parent.id, repr(self.shape))
         else:
-            return "<DatasetAxis2D: %s, file: **CLOSED**>"%self.id
+            return "<DatasetAxis2D: %s, file: **CLOSED**>" % self.id
 
-## internattr.initialize_internal_attributes(DatasetAxis2D) Copy internal attrs from parents
+# internattr.initialize_internal_attributes(DatasetAxis2D) Copy internal
+# attrs from parents
 
 # Two-dimensional coordinate axis in a file.
+
+
 class FileAxis2D(AbstractAxis2D, FileVariable):
 
     def __init__(self, parent, id, obj=None, bounds=None):
@@ -316,15 +353,18 @@ class FileAxis2D(AbstractAxis2D, FileVariable):
 
     def __repr__(self):
         if self.parent is not None:
-            return "<FileAxis2D: %s, file: %s, shape: %s>"%(self.id, self.parent.id, `self.shape`)
+            return "<FileAxis2D: %s, file: %s, shape: %s>" % (self.id, self.parent.id, repr(self.shape))
         else:
-            return "<FileAxis2D: %s, file: **CLOSED**>"%self.id
+            return "<FileAxis2D: %s, file: **CLOSED**>" % self.id
+
+# internattr.initialize_internal_attributes(FileAxis2D) # Copy internal
+# attrs from parents
 
-## internattr.initialize_internal_attributes(FileAxis2D) # Copy internal attrs from parents
 
 class TransientAxis2D(AbstractAxis2D, TransientVariable):
 
-    def __init__(self, data, typecode=None, copy=0, savespace=0, mask=None, fill_value=None,
+    def __init__(
+        self, data, typecode=None, copy=0, savespace=0, mask=None, fill_value=None,
                  axes=None, attributes=None, id=None, copyaxes=1, bounds=None):
         """Create a transient 2D axis.
         All arguments are as for TransientVariable.
@@ -332,11 +372,12 @@ class TransientAxis2D(AbstractAxis2D, TransientVariable):
           nvert is the max number of vertices per cell.
         """
         AbstractAxis2D.__init__(self, None, None, bounds=bounds)
-        TransientVariable.__init__(self, data, typecode=typecode, copy=copy, savespace=savespace,
+        TransientVariable.__init__(
+            self, data, typecode=typecode, copy=copy, savespace=savespace,
                                    mask=mask, fill_value=fill_value, axes=axes, attributes=attributes,
                                    id=id, copyaxes=copyaxes)
         if axes is not None:
             self.setBounds(bounds)
 
-## internattr.initialize_internal_attributes(TransientAxis2D) # Copy internal attrs from parents
-
+# internattr.initialize_internal_attributes(TransientAxis2D) # Copy
+# internal attrs from parents
diff --git a/Packages/cdms2/Lib/cudsinterface.py b/Packages/cdms2/Lib/cudsinterface.py
index 4232bdf44..04673c28e 100644
--- a/Packages/cdms2/Lib/cudsinterface.py
+++ b/Packages/cdms2/Lib/cudsinterface.py
@@ -1,42 +1,46 @@
-## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by 
-## Further modified to be pure new numpy June 24th 2008
+# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
+# Further modified to be pure new numpy June 24th 2008
 
 "Emulation of old cu package"
 import sys
-from error import CDMSError
-from dataset import openDataset, createDataset
-from tvariable import createVariable
+from .error import CDMSError
+from .dataset import openDataset, createDataset
+from .tvariable import createVariable
 import numpy
 
+
 class cuDataset():
+
     "A mixin class to support the old cu interface"
-    def __init__ (self):
+
+    def __init__(self):
         self.cleardefault()
 
-    def __call__ (self, id, *args, **kwargs):
+    def __call__(self, id, *args, **kwargs):
         """Call a variable object with the given id. Exception if not found.
            Call the variable with the other arguments.
         """
-# note defined here because this is the class all the dataset-type classes inherit
+# note defined here because this is the class all the dataset-type classes
+# inherit
         v = self.variables.get(id)
         if v is None:
             try:
-                if ( self.is_gridspec_grid_file() and
-                     ( id=='' or id=='grid' or id=='gridspec' ) and
-                     len(args)==0 and len(kwargs)==0
-                     ):
+                if (self.is_gridspec_grid_file() and
+                     (id == '' or id == 'grid' or id == 'gridspec') and
+                     len(args) == 0 and len(kwargs) == 0
+                    ):
                     return self.readg()
                 else:
-                    raise CDMSError, "No such variable or grid, " + id
-            except ( AttributeError, TypeError ):
-                raise CDMSError, "No such variable, " + id
+                    raise CDMSError("No such variable or grid, " + id)
+            except (AttributeError, TypeError):
+                raise CDMSError("No such variable, " + id)
         return v(*args, **kwargs)
 
     def __getitem__(self, key):
         """Implement f['varname'] for file/dataset f.
         """
         for d in [self.variables, self.axes, self.grids]:
-            if d.has_key(key):
+            if key in d:
                 result = d[key]
                 break
         else:
@@ -48,19 +52,19 @@ class cuDataset():
         try:
             v = self.variables[vname]
         except KeyError:
-            raise CDMSError, "No variable named " + vname + " in file " + \
-                  self.id
+            raise CDMSError("No variable named " + vname + " in file " +
+                  self.id)
         return v
 
-    def default_variable (self, vname):
+    def default_variable(self, vname):
         "Set the default variable name."
         self.__dict__['default_variable_name'] = vname
 
-    def cleardefault (self):
+    def cleardefault(self):
         "Clear the default variable name."
         self.default_variable("no_default_variable_name_specified")
-    
-    def listall (self, vname=None, all=None):
+
+    def listall(self, vname=None, all=None):
         """Get info about data from the file.
         :::
         Options:::
@@ -68,11 +72,12 @@ class cuDataset():
         all :: (None/True/False/int) (None) include axes information
         :::
         """
-        if vname is None: vname = self.default_variable_name
+        if vname is None:
+            vname = self.default_variable_name
         try:
             m = numpy.get_printoptions()['threshold']
             result = []
-            result.append('*** Description of slab %s in file %s***' % \
+            result.append('*** Description of slab %s in file %s***' %
                           (vname, self.id))
             result.append('Name: ' + vname)
             v = self._v(vname)
@@ -94,23 +99,24 @@ class cuDataset():
                 result.append('Last: ' + str(axis[-1]))
                 if all:
                     result.append(str(self.dimensionarray(axis.id, vname)))
-            result.append ('*** End of description of %s ***' %vname)
+            result.append('*** End of description of %s ***' % vname)
             return result
         finally:
-            numpy.set_printoptions (threshold=m)
-        
-    def listattribute (self, vname=None):
+            numpy.set_printoptions(threshold=m)
+
+    def listattribute(self, vname=None):
         """Get attributes of data from the file.
         :::
         Options:::
         vname :: (str/None) (None) variable name
         :::
         """
-        if vname is None: vname = self.default_variable_name
+        if vname is None:
+            vname = self.default_variable_name
         v = self._v(vname)
         return v.attributes.keys()
 
-    def listdimension (self, vname=None):
+    def listdimension(self, vname=None):
         """Return a list of the dimension names associated with a variable.
            If no argument, return the file.axes.keys()
         :::
@@ -118,20 +124,20 @@ class cuDataset():
         vname :: (str/None) (None) variable name
         :::
         """
-        if vname is None: 
+        if vname is None:
             return self.axes.keys()
         v = self._v(vname)
         d = v.getDomain()
         x = map(lambda n: n[0], d)
-        return map (lambda n: getattr(n, 'id'), x)
+        return map(lambda n: getattr(n, 'id'), x)
 
-    def listglobal (self):
+    def listglobal(self):
         """Returns a list of the global attributes in the file.
         :::
         """
         return self.attributes.keys()
 
-    def listvariable (self):
+    def listvariable(self):
         """Return a list of the variables in the file.
         :::
         """
@@ -139,35 +145,37 @@ class cuDataset():
 
     listvariables = listvariable
 
-    def showglobal (self, device=None):
+    def showglobal(self, device=None):
         """Show the global attributes in the file.
         :::
         Options:::
         device :: (None/file) (None) output device
         :::
         """
-        if device is None: device=sys.stdout
+        if device is None:
+            device = sys.stdout
         device.write("Global attributes in file ")
         device.write(self.id)
         device.write(":\n")
         device.write(str(self.listglobal()))
         device.write("\n")
 
-    def showvariable (self, device=None):
+    def showvariable(self, device=None):
         """Show the variables in the file.
         :::
         Options:::
         device :: (None/file) (None) output device
         :::
         """
-        if device is None: device=sys.stdout
+        if device is None:
+            device = sys.stdout
         device.write("Variables in file ")
         device.write(self.id)
         device.write(":\n")
         device.write(str(self.listvariable()))
         device.write("\n")
 
-    def showattribute (self, vname=None, device=None):
+    def showattribute(self, vname=None, device=None):
         """Show the attributes of vname.
         :::
         Options:::
@@ -175,8 +183,10 @@ class cuDataset():
         device :: (None/file) (None) output device
         :::
         """
-        if device is None: device=sys.stdout
-        if vname is None: vname = self.default_variable_name
+        if device is None:
+            device = sys.stdout
+        if vname is None:
+            vname = self.default_variable_name
         device.write("Attributes of ")
         device.write(vname)
         device.write(" in file ")
@@ -184,8 +194,8 @@ class cuDataset():
         device.write(":\n")
         device.write(str(self.listattribute(vname)))
         device.write("\n")
-        
-    def showdimension (self, vname=None, device=None):
+
+    def showdimension(self, vname=None, device=None):
         """Show the dimension names associated with a variable.
         :::
         Options:::
@@ -193,8 +203,10 @@ class cuDataset():
         device :: (None/file) (None) output device
         :::
         """
-        if device is None: device=sys.stdout
-        if vname is None: vname = self.default_variable_name
+        if device is None:
+            device = sys.stdout
+        if vname is None:
+            vname = self.default_variable_name
         device.write("Dimension names of ")
         device.write(vname)
         device.write(" in file ")
@@ -202,8 +214,8 @@ class cuDataset():
         device.write(":\n")
         device.write(str(self.listdimension(vname)))
         device.write("\n")
-        
-    def showall (self, vname=None, all=None, device=None):
+
+    def showall(self, vname=None, all=None, device=None):
         """Show a full description of the variable.
         :::
         Options:::
@@ -212,13 +224,15 @@ class cuDataset():
         device :: (None/file) (None) output device
         :::
         """
-        if device is None: device=sys.stdout
-        if vname is None: vname = self.default_variable_name
+        if device is None:
+            device = sys.stdout
+        if vname is None:
+            vname = self.default_variable_name
         alist = self.listall(vname, all=all)
         device.write("\n".join(alist))
         device.write("\n")
 
-    def dimensionobject (self, dname, vname=None):
+    def dimensionobject(self, dname, vname=None):
         """CDMS axis object for the dimension named dname.
         :::
         Options:::
@@ -231,12 +245,12 @@ class cuDataset():
         axis :: (cdms2.axis.FileAxis) (0) file axis whose id is vname
         :::
         """
-        if vname is None: 
+        if vname is None:
             try:
                 return self.axes[dname]
             except KeyError:
-                raise CDMSError, "No axis named " + dname + " in file " +\
-                                self.id + "."
+                raise CDMSError("No axis named " + dname + " in file " +
+                                self.id + ".")
         else:
             v = self._v(vname)
             d = v.getDomain()
@@ -244,10 +258,10 @@ class cuDataset():
                 if x[0].id == dname:
                     return x[0]
             else:
-                raise CDMSError, vname + " has no axis named " + dname + \
-                                " in file " + self.id + "."
-        
-    def dimensionarray (self, dname, vname=None):
+                raise CDMSError(vname + " has no axis named " + dname +
+                                " in file " + self.id + ".")
+
+    def dimensionarray(self, dname, vname=None):
         """Values of the dimension named dname.
         :::
         Options:::
@@ -261,8 +275,8 @@ class cuDataset():
         :::
         """
         return self.dimensionobject(dname, vname).getValue()
-    
-    def getdimensionunits (self, dname, vname=None):
+
+    def getdimensionunits(self, dname, vname=None):
         """Get the units for the given dimension.
         :::
         Options:::
@@ -278,7 +292,7 @@ class cuDataset():
         x = self.dimensionobject(dname, vname)
         return x.units
 
-    def getglobal (self, attribute):
+    def getglobal(self, attribute):
         """Get the value of the global attribute.
         :::
         Input:::
@@ -292,8 +306,8 @@ class cuDataset():
             return self.attributes[attribute]
         except KeyError:
             return None
-    
-    def getattribute (self, vname, attribute):
+
+    def getattribute(self, vname, attribute):
         """Get the value of attribute for variable vname
         :::
         Input:::
@@ -306,8 +320,8 @@ class cuDataset():
         """
         v = self._v(vname)
         return getattr(v, attribute)
-            
-    def getslab (self, vname, *args,**keys):
+
+    def getslab(self, vname, *args, **keys):
         """getslab('name', arg1, arg2, ....) returns a cdms variable
            containing the data.
 
@@ -337,40 +351,42 @@ class cuDataset():
         nargs = len(args)
         v = self._v(vname)
         if nargs == 0:
-           return v.subRegion()
+            return v.subRegion()
 # note CDMS treats None as a colon in getRegion and mapInterval
         ndims = v.rank()
-        cdms_args = [':'] * ndims 
+        cdms_args = [':'] * ndims
         i = 0
         idim = 0
         ne = 0
         while i < nargs:
             if not (idim < ndims):
-                raise CDMSError, "Too many arguments to getslab."
+                raise CDMSError("Too many arguments to getslab.")
             x = args[i]
-            if x == ':' or x == None:
+            if x == ':' or x is None:
                 i = i + 1
                 idim = idim + 1
                 continue
             elif x == Ellipsis:
-                if ne: raise CDMSError, "Only one ellipsis allowed."
+                if ne:
+                    raise CDMSError("Only one ellipsis allowed.")
                 idim = ndims - (nargs - i - 1)
                 i = i + 1
                 ne = 1
-            elif isinstance(x,tuple):
+            elif isinstance(x, tuple):
                 cdms_args[idim] = x
                 idim = idim + 1
                 i = i + 1
             else:
-                if not ((i+1) < nargs):
-                    raise CDMSError, "Arguments to getslab not paired properly."
+                if not ((i + 1) < nargs):
+                    raise CDMSError(
+                        "Arguments to getslab not paired properly.")
                 low = float(x)
-                high = float(args[i+1])
+                high = float(args[i + 1])
                 cdms_args[idim] = (low, high, 'cc')
                 idim = idim + 1
                 i = i + 2
         sq = keys.get('squeeze', 0)
-        result = apply(v.subRegion, tuple(cdms_args), {'squeeze':sq})
+        result = v.subRegion(*tuple(cdms_args), **{'squeeze': sq})
         result.parent = self
         result.id = vname
         return result
@@ -391,8 +407,8 @@ class cuDataset():
         grid :: (cdms2.hgrid.TransientCurveGrid/cdms2.gengrid.TransientGenericGrid) (0) variable requested
         :::
         """
-        
-        import hgrid, gengrid
+
+        from . import hgrid, gengrid
 
         # Grid file
         if 'grid_dims' in self.variables.keys():
@@ -400,7 +416,7 @@ class cuDataset():
             whichType = "grid"
 
         # Destination grid from mapping file
-        elif whichGrid=="destination":
+        elif whichGrid == "destination":
             dims = self('dst_grid_dims')
             whichType = "mapping"
 
@@ -409,16 +425,16 @@ class cuDataset():
             dims = self('src_grid_dims')
             whichType = "mapping"
 
-        if len(dims)==2:
+        if len(dims) == 2:
             result = hgrid.readScripCurveGrid(self, dims, whichType, whichGrid)
-        elif len(dims)==1:
-            result = gengrid.readScripGenericGrid(self, dims, whichType, whichGrid)
+        elif len(dims) == 1:
+            result = gengrid.readScripGenericGrid(
+                self, dims, whichType, whichGrid)
         else:
-            raise CDMSError, "Grid rank must be 1 or 2, found: %d"%len(dims)
+            raise CDMSError("Grid rank must be 1 or 2, found: %d" % len(dims))
 
-        if checkGrid==1:
+        if checkGrid == 1:
             nonConvexCells = result.checkConvex()
             result.fixCutCells(nonConvexCells)
 
         return result
-
diff --git a/Packages/cdms2/Lib/database.py b/Packages/cdms2/Lib/database.py
index ac8b0dc7a..682f14628 100644
--- a/Packages/cdms2/Lib/database.py
+++ b/Packages/cdms2/Lib/database.py
@@ -1,16 +1,16 @@
 """CDMS database objects"""
 
-from error import CDMSError
-import cdmsobj
-import cdurlparse
-## import internattr
+from .error import CDMSError
+from . import cdmsobj
+from . import cdurlparse
+# import internattr
 import copy
 import os
 import re
 import sys
-from CDMLParser import CDMLParser
-from cdmsobj import CdmsObj
-from dataset import Dataset
+from .CDMLParser import CDMLParser
+from .cdmsobj import CdmsObj
+from .dataset import Dataset
 
 try:
     import ldap
@@ -31,9 +31,11 @@ MethodNotImplemented = "Method not yet implemented"
 PermissionError = "No permission to access"
 SchemeNotSupported = "Scheme not supported"
 
-_Att = re.compile('([a-zA-Z_:][-a-zA-Z0-9._:]*)=(.*)',re.DOTALL)
+_Att = re.compile('([a-zA-Z_:][-a-zA-Z0-9._:]*)=(.*)', re.DOTALL)
 
 # Open a database connection
+
+
 def connect(uri=None, user="", password=""):
     """
     Method:
@@ -62,36 +64,48 @@ def connect(uri=None, user="", password=""):
         try:
             uri = os.environ['CDMSROOT']
         except KeyError:
-            raise CDMSError, ConnectError + '%s\nSet environment variable CDMSROOT to default database location'%uri
-    (scheme,netloc,path,parameters,query,fragment)=cdurlparse.urlparse(uri)
-
-    if scheme in ['','ldap']:
+            raise CDMSError(
+                ConnectError +
+                '%s\nSet environment variable CDMSROOT to default database location' %
+                uri)
+    (scheme, netloc, path, parameters, query,
+     fragment) = cdurlparse.urlparse(uri)
+
+    if scheme in ['', 'ldap']:
         try:
             ldapdb = ldap.open(netloc)
         except:
-            raise CDMSError, ConnectError +"%s\n%s"%(uri,sys.exc_value)
+            raise CDMSError(ConnectError + "%s\n%s" % (uri, sys.exc_info()[1]))
 
         try:
-            ldapdb.simple_bind_s(user,password)
+            ldapdb.simple_bind_s(user, password)
         except:
-            raise CDMSError, AuthenticationError + "%s\n%s"%(uri,sys.exc_value)
+            raise CDMSError(
+                AuthenticationError + "%s\n%s" %
+                (uri, sys.exc_info()[1]))
 
         try:
-            result = ldapdb.search_s(path[1:], ldap.SCOPE_SUBTREE, "objectclass=database")
+            result = ldapdb.search_s(
+                path[1:],
+                ldap.SCOPE_SUBTREE,
+                "objectclass=database")
         except:
-            raise CDMSError, DatabaseNotFound + "%s\n%s"%(uri,sys.exc_value)
+            raise CDMSError(
+                DatabaseNotFound + "%s\n%s" %
+                (uri, sys.exc_info()[1]))
 
         try:
             dn, attrs = result[0]
         except:
-            raise CDMSError, PermissionError + uri
-        newuri = "ldap://%s/%s"%(netloc,dn)
+            raise CDMSError(PermissionError + uri)
+        newuri = "ldap://%s/%s" % (netloc, dn)
         db = LDAPDatabase(newuri, ldapdb)
         db.setExternalDict(attrs)
         return db
 
     else:
-        raise CDMSError, SchemeNotSupported +  scheme
+        raise CDMSError(SchemeNotSupported + scheme)
+
 
 def loadString(text, uri, parent=None, datapath=None):
     """ Create a dataset from a text string. <text> is the string in CDML format.
@@ -99,59 +113,61 @@ def loadString(text, uri, parent=None, datapath=None):
         <parent> is the containing database object, if any.
         <datapath> is the location of data files relative to the parent database URL.
     """
-    p=CDMLParser()
+    p = CDMLParser()
     p.feed(text)
     p.close()
-    return Dataset(uri,'r',p.getRoot(),parent,datapath)
-    
+    return Dataset(uri, 'r', p.getRoot(), parent, datapath)
+
 
 class AbstractDatabase(CdmsObj):
-    """AbstractDatabase defines the common database interface. Concrete database classes are 
+
+    """AbstractDatabase defines the common database interface. Concrete database classes are
        derived from this class.
     """
 
     def __init__(self, uri, path):
-        CdmsObj.__init__(self,None)
+        CdmsObj.__init__(self, None)
         self.uri = uri
         self.path = path
         self._cache_ = {}
         self._cdmlcache_ = {}
-        self._datacache_ = None # datasetdn: obj # Remote file data cache
+        self._datacache_ = None  # datasetdn: obj # Remote file data cache
         self.lcBaseDN = None            # Logical Collection base distinguished name
         self.useReplica = None          # Use replica catalog if true (request manager transfers only)
         self.userid = None              # User ID for request manager transfers
 
     def close(self):
-        raise CDMSError, MethodNotImplemented
+        raise CDMSError(MethodNotImplemented)
 
     def cachecdml(self, name, cdml):
-        raise CDMSError, MethodNotImplemented
+        raise CDMSError(MethodNotImplemented)
 
     def getDataset(self, name):
-        raise CDMSError, MethodNotImplemented
+        raise CDMSError(MethodNotImplemented)
 
     def getObjFromDataset(self, name):
-        raise CDMSError, MethodNotImplemented
+        raise CDMSError(MethodNotImplemented)
 
     def openDataset(self, dsetid, mode='r'):
-        raise CDMSError, MethodNotImplemented
+        raise CDMSError(MethodNotImplemented)
 
-    def searchFilter(self, filter, classtag=None, relbase=None, scope=Subtree, attnames=[]):
-        raise CDMSError, MethodNotImplemented
+    def searchFilter(self, filter, classtag=None,
+                     relbase=None, scope=Subtree, attnames=[]):
+        raise CDMSError(MethodNotImplemented)
 
     def enableCache(self):
         if self._datacache_ is None:
-            import cache
+            from . import cache
             self._datacache_ = cache.Cache()
         return self._datacache_
 
     def disableCache(self):
-        if self._datacache_ != None:
+        if self._datacache_ is not None:
             self._datacache_.delete()
             self._datacache_ = None
 
-    def useRequestManager(self, lcBaseDN, useReplica=1, userid = "anonymous"):
-        import cache
+    def useRequestManager(self, lcBaseDN, useReplica=1, userid="anonymous"):
+        from . import cache
         self.enableCache()
         cache.useRequestManagerTransfer()
         self.lcBaseDN = lcBaseDN
@@ -159,20 +175,23 @@ class AbstractDatabase(CdmsObj):
         self.userid = userid
 
     def usingRequestManager(self):
-        import cache
-        return (cache._transferMethod==cache._requestManagerTransfer)
+        from . import cache
+        return (cache._transferMethod == cache._requestManagerTransfer)
 
     def __repr__(self):
-        return "<Database '%s'>"%(self.uri)
+        return "<Database '%s'>" % (self.uri)
 
-## internattr.add_internal_attribute(AbstractDatabase, 'uri', 'path')
+# internattr.add_internal_attribute(AbstractDatabase, 'uri', 'path')
 
 # Database implemented via LDAP (Lightweight Directory Access Protocol)
+
+
 class LDAPDatabase(AbstractDatabase):
 
     def __init__(self, uri, db):
-        (scheme,netloc,path,parameters,query,fragment)=cdurlparse.urlparse(uri)
-        AbstractDatabase.__init__(self,uri,path[1:])
+        (scheme, netloc, path, parameters, query,
+         fragment) = cdurlparse.urlparse(uri)
+        AbstractDatabase.__init__(self, uri, path[1:])
         self.netloc = netloc
         self.db = db
 
@@ -191,58 +210,64 @@ class LDAPDatabase(AbstractDatabase):
           None
 
         """
-        if self.db != None:
+        if self.db is not None:
             self.db.unbind()
         self.db = None
         self.disableCache()
-        
+
     def __del__(self):
         # if cdmsobj._debug==1:
         #    print 'Deleting object',self
         self.close()
-    
+
     def normalizedn(self, dn):
         explodeddn = ldap.explode_dn(dn)
         return ','.join(explodeddn)
 
     def cachecdml(self, name, cdml, datapath):
         normaldn = self.normalizedn(name)
-        self._cdmlcache_[normaldn] = (cdml,datapath)
+        self._cdmlcache_[normaldn] = (cdml, datapath)
 
     def getDataset(self, dn):
         normaldn = self.normalizedn(dn)
-        if self._cache_.has_key(normaldn):
+        if normaldn in self._cache_:
             dataset = self._cache_[normaldn]
-        elif self._cdmlcache_.has_key(normaldn):
-            (text,datapath) = self._cdmlcache_[normaldn]
-            uri = "ldap://%s/%s"%(self.netloc,normaldn)
-            if cdmsobj._debug==1:
-                print 'Loading %s from cached CDML'%uri
-            dataset = loadString(text,uri,self,datapath)
+        elif normaldn in self._cdmlcache_:
+            (text, datapath) = self._cdmlcache_[normaldn]
+            uri = "ldap://%s/%s" % (self.netloc, normaldn)
+            if cdmsobj._debug == 1:
+                print 'Loading %s from cached CDML' % uri
+            dataset = loadString(text, uri, self, datapath)
             self._cache_[normaldn] = dataset
         else:
-            if cdmsobj._debug==1:
-                print 'Search filter: (objectclass=dataset), scope: base, base: "%s", attributes=["cdml"]'%(dn,)
-            result = self.db.search_s(dn, ldap.SCOPE_BASE, "objectclass=dataset",["cdml","datapath"])
-            resultdn,attrs = result[0]
+            if cdmsobj._debug == 1:
+                print 'Search filter: (objectclass=dataset), scope: base, base: "%s", attributes=["cdml"]' % (dn,)
+            result = self.db.search_s(
+                dn,
+                ldap.SCOPE_BASE,
+                "objectclass=dataset",
+                ["cdml",
+                 "datapath"])
+            resultdn, attrs = result[0]
             text = attrs["cdml"][0]
-            uri = "ldap://%s/%s"%(self.netloc,normaldn)
+            uri = "ldap://%s/%s" % (self.netloc, normaldn)
             datapath = attrs.get("datapath")
-            if datapath: datapath = datapath[0]
-            dataset = loadString(text,uri,self,datapath)
+            if datapath:
+                datapath = datapath[0]
+            dataset = loadString(text, uri, self, datapath)
             self._cache_[normaldn] = dataset
         return dataset
- 
+
     def getObjFromDataset(self, dn):
 
         # Get the parent dataset
         explodeddn = ldap.explode_dn(dn)
-        dsetdn = ','.join(explodeddn[1:]) # Dataset node is parent of variable
+        dsetdn = ','.join(explodeddn[1:])  # Dataset node is parent of variable
         dset = self.getDataset(dsetdn)
         rdn = explodeddn[0]
         matchobj = _Att.match(rdn)
         if matchobj is None:
-            raise CDMSError, InvalidEntryName +  dn
+            raise CDMSError(InvalidEntryName + dn)
         tag, id = matchobj.groups()
 
         # Get the correct dictionary for this tag
@@ -273,7 +298,7 @@ class LDAPDatabase(AbstractDatabase):
 
           dset = db.openDataset('ncep_reanalysis_mo')
         """
-        dn = "dataset=%s,%s"%(dsetid,self.path)
+        dn = "dataset=%s,%s" % (dsetid, self.path)
         dset = self.getDataset(dn)
         return dset
 
@@ -285,23 +310,24 @@ class LDAPDatabase(AbstractDatabase):
     def setExternalDict(self, ldapattrs):
         for attname in ldapattrs.keys():
             attvals = ldapattrs[attname]
-            if attname=='objectclass':
+            if attname == 'objectclass':
                 continue
-            elif attname=='attr':       # Handle attr: name=value
+            elif attname == 'attr':       # Handle attr: name=value
                 for attval in attvals:
                     matchobj = _Att.match(attval)
                     if matchobj is not None:
-                        newname,newval = matchobj.groups()
+                        newname, newval = matchobj.groups()
                         self.attributes[newname] = newval
 
             # If the attribute value is a multi-valued list, keep it as a list
             # otherwise copy the single value from the list.
-            if len(attvals)==1:
+            if len(attvals) == 1:
                 self.attributes[attname] = attvals[0]
             else:
                 self.attributes[attname] = attvals
 
-    def searchFilter(self, filter=None, tag=None, relbase=None, scope=Subtree, attnames=None, timeout=None):
+    def searchFilter(self, filter=None, tag=None,
+                     relbase=None, scope=Subtree, attnames=None, timeout=None):
         """
         Method:
 
@@ -332,7 +358,7 @@ class LDAPDatabase(AbstractDatabase):
                              "<=" |     # lexicographically less than or equal to
                              ">="       # lexicographically greater than or equal to
               value      ::= string, may include '*' as a wild card
-                             
+
           tag: string class tag ("dataset" | "variable" | "database" | "axis" | "grid").
             Restricts the search to a class of objects
           relbase: string search base, relative to the database path
@@ -364,25 +390,26 @@ class LDAPDatabase(AbstractDatabase):
           result = db.searchFilter(relbase="dataset=ncep_reanalysis_mo"), scope=cdms.Onelevel)
 
         """
-        if tag is None: tag='*'
-        newfilter = "(objectclass=%s)"%tag
+        if tag is None:
+            tag = '*'
+        newfilter = "(objectclass=%s)" % tag
         if filter is not None:
-            if filter[0]!='(':
-                filter = "(%s)"%filter
-            newfilter = "(&%s%s)"%(newfilter,filter)
+            if filter[0] != '(':
+                filter = "(%s)" % filter
+            newfilter = "(&%s%s)" % (newfilter, filter)
 
         if relbase is None:
             base = self.path
         else:
-            base = "%s,%s"%(relbase,self.path)
+            base = "%s,%s" % (relbase, self.path)
 
         if attnames is None:
             atts = None
         else:
-            atts = ["objectclass","cdml","id"]+attnames
-            
-        if cdmsobj._debug==1:
-            print 'Search filter:%s, scope %s, base: "%s", attributes=%s'%(newfilter,`scope`,base,`atts`)
+            atts = ["objectclass", "cdml", "id"] + attnames
+
+        if cdmsobj._debug == 1:
+            print 'Search filter:%s, scope %s, base: "%s", attributes=%s' % (newfilter, repr(scope), base, repr(atts))
         if timeout is None:
             result = self.db.search_s(base, scope, newfilter, atts)
         else:
@@ -392,11 +419,12 @@ class LDAPDatabase(AbstractDatabase):
 
     def listDatasets(self):
         """ Return a list of the dataset IDs in this database."""
-        entries = self.searchFilter(tag='dataset', scope=Onelevel )
+        entries = self.searchFilter(tag='dataset', scope=Onelevel)
         result = map(lambda x: x.attributes['id'][0], entries)
         return result
 
-## internattr.add_internal_attribute(LDAPDatabase, 'netloc', 'db')
+# internattr.add_internal_attribute(LDAPDatabase, 'netloc', 'db')
+
 
 class AbstractSearchResult:
 
@@ -409,6 +437,7 @@ class AbstractSearchResult:
     def searchPredicate(self, predicate, tag=None):
         MethodNotImplemented = "Method not yet implemented"
 
+
 class LDAPSearchResult(AbstractSearchResult):
 
     def __init__(self, db, LDAPresult):
@@ -417,15 +446,15 @@ class LDAPSearchResult(AbstractSearchResult):
 
         # Scan the result for CDML attributes, cache them in the database
         for dn, attrs in self.result:
-            if attrs.has_key('cdml') and attrs.has_key('datapath'):
+            if 'cdml' in attrs and 'datapath' in attrs:
                 cdml = attrs['cdml'][0]
                 datapath = attrs['datapath'][0]
-                self.db.cachecdml(dn,cdml,datapath)
+                self.db.cachecdml(dn, cdml, datapath)
                 del attrs['cdml']
 
     def __getitem__(self, key):
-        if key>=len(self):
-            raise IndexError, 'index out of bounds'
+        if key >= len(self):
+            raise IndexError('index out of bounds')
 
         dn, attributes = self.result[key]
 
@@ -471,10 +500,10 @@ class LDAPSearchResult(AbstractSearchResult):
         resultlist = []
         for entry in self:
             obj = entry.getObject()
-            if tag is None or tag==entry.tag:
+            if tag is None or tag == entry.tag:
                 try:
-                    if apply(predicate,(obj,))==1:
-                        resultlist.append((entry.name,entry.attributes))
+                    if predicate(*(obj,)) == 1:
+                        resultlist.append((entry.name, entry.attributes))
                 except:
                     pass
 
@@ -483,6 +512,7 @@ class LDAPSearchResult(AbstractSearchResult):
     def __len__(self):
         return len(self.result)
 
+
 class AbstractResultEntry:
 
     def __init__(self, db):
@@ -504,15 +534,16 @@ class AbstractResultEntry:
 
         """
 
-        if self.tag=="database":
+        if self.tag == "database":
             obj = self.db
-        elif self.tag=="dataset":
+        elif self.tag == "dataset":
             obj = self.db.getDataset(self.name)
         else:
             obj = self.db.getObjFromDataset(self.name)
 
         return obj
 
+
 class LDAPResultEntry(AbstractResultEntry):
 
     def __init__(self, db, dn, attributes):
@@ -525,9 +556,6 @@ class LDAPResultEntry(AbstractResultEntry):
         rdn = explodeddn[0]
         matchobj = _Att.match(rdn)
         if matchobj is None:
-            raise IndexError, InvalidEntryName + dn
+            raise IndexError(InvalidEntryName + dn)
 
         self.tag = matchobj.group(1)
-
-
-
diff --git a/Packages/cdms2/Lib/dataset.py b/Packages/cdms2/Lib/dataset.py
index 6074615de..f9f9562ec 100644
--- a/Packages/cdms2/Lib/dataset.py
+++ b/Packages/cdms2/Lib/dataset.py
@@ -1,37 +1,38 @@
-## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by foo
-## Further modified to be pure new numpy June 24th 2008
+# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by foo
+# Further modified to be pure new numpy June 24th 2008
 
 """ CDMS dataset and file objects"""
-from error import CDMSError
+from .error import CDMSError
 import Cdunif
 import numpy
-import cdmsNode
-import os, sys
+from . import cdmsNode
+import os
+import sys
 import urllib
-import cdmsURLopener                    # Import after urllib, to handle errors
+from . import cdmsURLopener                    # Import after urllib, to handle errors
 import urlparse
-## import internattr
-import cdmsobj
+# import internattr
+from . import cdmsobj
 import re
-from CDMLParser import CDMLParser
-from cdmsobj import CdmsObj
-from axis import Axis, FileAxis, FileVirtualAxis, isOverlapVector
-from coord import FileAxis2D, DatasetAxis2D
-from auxcoord import FileAuxAxis1D, DatasetAuxAxis1D
-from grid import RectGrid, FileRectGrid
-from hgrid import FileCurveGrid, DatasetCurveGrid
-from gengrid import FileGenericGrid, DatasetGenericGrid
-from variable import DatasetVariable
-from fvariable import FileVariable
-from tvariable import asVariable
-from cdmsNode import CdDatatypes
-import convention
-import typeconv
+from .CDMLParser import CDMLParser
+from .cdmsobj import CdmsObj
+from .axis import Axis, FileAxis, FileVirtualAxis, isOverlapVector
+from .coord import FileAxis2D, DatasetAxis2D
+from .auxcoord import FileAuxAxis1D, DatasetAuxAxis1D
+from .grid import RectGrid, FileRectGrid
+from .hgrid import FileCurveGrid, DatasetCurveGrid
+from .gengrid import FileGenericGrid, DatasetGenericGrid
+from .variable import DatasetVariable
+from .fvariable import FileVariable
+from .tvariable import asVariable
+from .cdmsNode import CdDatatypes
+from . import convention
+from . import typeconv
 
 # Default is serial mode until setNetcdfUseParallelFlag(1) is called
 rk = 0
 sz = 1
-Cdunif.CdunifSetNCFLAGS("use_parallel",0)
+Cdunif.CdunifSetNCFLAGS("use_parallel", 0)
 CdMpi = False
 
 try:
@@ -42,17 +43,19 @@ except:
     rk = 0
 
 try:
-    import gsHost
+    from . import gsHost
     from pycf import libCFConfig as libcf
 except:
     libcf = None
 
 try:
-    import cache
+    from . import cache
 except ImportError:
     pass
 
 DuplicateAxis = "Axis already defined: "
+
+
 class DuplicateAxisError(CDMSError):
     pass
 DuplicateGrid = "Grid already defined: "
@@ -75,12 +78,37 @@ _IndexPat = r'(\d+|-)'
 _FilePath = r"([^\s\]\',]+)"
 # Two file map patterns, _IndexList4 is the original one, _IndexList5 supports
 # forecast data too...
-_IndexList4 = re.compile(_ListStartPat+_IndexPat+_ListSepPat+_IndexPat+_ListSepPat+_IndexPat+_ListSepPat+_IndexPat+_ListSepPat+_FilePath+_ListEndPat)
-_IndexList5 = re.compile(_ListStartPat+_IndexPat+_ListSepPat+_IndexPat+_ListSepPat+_IndexPat+_ListSepPat+_IndexPat+_ListSepPat+_IndexPat+_ListSepPat+_FilePath+_ListEndPat)
+_IndexList4 = re.compile(
+    _ListStartPat +
+    _IndexPat +
+    _ListSepPat +
+    _IndexPat +
+    _ListSepPat +
+    _IndexPat +
+    _ListSepPat +
+    _IndexPat +
+    _ListSepPat +
+    _FilePath +
+    _ListEndPat)
+_IndexList5 = re.compile(
+    _ListStartPat +
+    _IndexPat +
+    _ListSepPat +
+    _IndexPat +
+    _ListSepPat +
+    _IndexPat +
+    _ListSepPat +
+    _IndexPat +
+    _ListSepPat +
+    _IndexPat +
+    _ListSepPat +
+    _FilePath +
+    _ListEndPat)
 
 _NPRINT = 20
 _showCompressWarnings = True
 
+
 def setCompressionWarnings(value=None):
     """Turn on/off the warnings for compression
     Usage:
@@ -93,49 +121,57 @@ def setCompressionWarnings(value=None):
     global _showCompressWarnings
     if value is None:
         value = not _showCompressWarnings
-    if isinstance(value,str):
-        if not value.slower() in ['y','n','yes','no']:
-            raise CDMSError("setCompressionWarnings flags must be yes/no or 1/0, or None to invert it")
-        if value.lower()[0]=='y':
+    if isinstance(value, str):
+        if not value.slower() in ['y', 'n', 'yes', 'no']:
+            raise CDMSError(
+                "setCompressionWarnings flags must be yes/no or 1/0, or None to invert it")
+        if value.lower()[0] == 'y':
             value = 1
         else:
             value = 0
-    if not isinstance(value, (int,bool)):
-        raise CDMSError("setCompressionWarnings flags must be yes/no or 1/0, or None to invert it")
+    if not isinstance(value, (int, bool)):
+        raise CDMSError(
+            "setCompressionWarnings flags must be yes/no or 1/0, or None to invert it")
 
-    if value in [1,True]:
+    if value in [1, True]:
         _showCompressWarnings = True
-    elif value in [0,False]:
+    elif value in [0, False]:
         _showCompressWarnings = False
     else:
-        raise CDMSError("setCompressionWarnings flags must be yes\/no or 1\/0, or None to invert it")
+        raise CDMSError(
+            "setCompressionWarnings flags must be yes\/no or 1\/0, or None to invert it")
 
     return _showCompressWarnings
 
+
 def setNetcdfUseNCSwitchModeFlag(value):
     """ Tells cdms2 to switch constantly between netcdf define/write modes"""
 
-    if value not in [True,False,0,1]:
-        raise CDMSError("Error UseNCSwitchMode flag must be 1(can use)/0(do not use) or true/False")
-    if value in [0,False]:
-        Cdunif.CdunifSetNCFLAGS("use_define_mode",0)
+    if value not in [True, False, 0, 1]:
+        raise CDMSError(
+            "Error UseNCSwitchMode flag must be 1(can use)/0(do not use) or true/False")
+    if value in [0, False]:
+        Cdunif.CdunifSetNCFLAGS("use_define_mode", 0)
     else:
-        Cdunif.CdunifSetNCFLAGS("use_define_mode",1)
+        Cdunif.CdunifSetNCFLAGS("use_define_mode", 1)
+
 
 def setNetcdfUseParallelFlag(value):
     """ Sets NetCDF classic flag value"""
     global CdMpi
-    if value not in [True,False,0,1]:
-        raise CDMSError("Error UseParallel flag must be 1(can use)/0(do not use) or true/False")
-    if value in [0,False]:
-        Cdunif.CdunifSetNCFLAGS("use_parallel",0)
+    if value not in [True, False, 0, 1]:
+        raise CDMSError(
+            "Error UseParallel flag must be 1(can use)/0(do not use) or true/False")
+    if value in [0, False]:
+        Cdunif.CdunifSetNCFLAGS("use_parallel", 0)
     else:
-        Cdunif.CdunifSetNCFLAGS("use_parallel",1)
+        Cdunif.CdunifSetNCFLAGS("use_parallel", 1)
         CdMpi = True
         if not MPI.Is_initialized():
             MPI.Init()
         rk = MPI.COMM_WORLD.Get_rank()
 
+
 def getMpiRank():
     ''' Return number of processor available '''
     if CdMpi:
@@ -144,6 +180,7 @@ def getMpiRank():
     else:
         return 0
 
+
 def getMpiSize():
     if CdMpi:
         sz = MPI.COMM_WORLD.Get_size()
@@ -151,75 +188,90 @@ def getMpiSize():
     else:
         return 1
 
+
 def setNetcdf4Flag(value):
     """ Sets NetCDF classic flag value"""
-    if value not in [True,False,0,1]:
+    if value not in [True, False, 0, 1]:
         raise CDMSError("Error NetCDF4 flag must be 1/0 or true/False")
-    if value in [0,False]:
-        Cdunif.CdunifSetNCFLAGS("netcdf4",0)
+    if value in [0, False]:
+        Cdunif.CdunifSetNCFLAGS("netcdf4", 0)
     else:
-        Cdunif.CdunifSetNCFLAGS("netcdf4",1)
+        Cdunif.CdunifSetNCFLAGS("netcdf4", 1)
 
-def setNetcdfClassicFlag(value):        
+
+def setNetcdfClassicFlag(value):
     """ Sets NetCDF classic flag value"""
-    if value not in [True,False,0,1]:
+    if value not in [True, False, 0, 1]:
         raise CDMSError("Error NetCDF Classic flag must be 1/0 or true/False")
-    if value in [0,False]:
-        Cdunif.CdunifSetNCFLAGS("classic",0)
+    if value in [0, False]:
+        Cdunif.CdunifSetNCFLAGS("classic", 0)
     else:
-        Cdunif.CdunifSetNCFLAGS("classic",1)
+        Cdunif.CdunifSetNCFLAGS("classic", 1)
+
 
-def setNetcdfShuffleFlag(value):        
+def setNetcdfShuffleFlag(value):
     """ Sets NetCDF shuffle flag value"""
-    if value not in [True,False,0,1]:
+    if value not in [True, False, 0, 1]:
         raise CDMSError("Error NetCDF Shuffle flag must be 1/0 or true/False")
-    if value in [0,False]:
-        Cdunif.CdunifSetNCFLAGS("shuffle",0)
+    if value in [0, False]:
+        Cdunif.CdunifSetNCFLAGS("shuffle", 0)
     else:
-        Cdunif.CdunifSetNCFLAGS("shuffle",1)
+        Cdunif.CdunifSetNCFLAGS("shuffle", 1)
+
 
 def setNetcdfDeflateFlag(value):
     """ Sets NetCDF deflate flag value"""
-    if value not in [True,False,0,1]:
+    if value not in [True, False, 0, 1]:
         raise CDMSError("Error NetCDF deflate flag must be 1/0 or true/False")
-    if value in [0,False]:
-        Cdunif.CdunifSetNCFLAGS("deflate",0)
+    if value in [0, False]:
+        Cdunif.CdunifSetNCFLAGS("deflate", 0)
     else:
-        Cdunif.CdunifSetNCFLAGS("deflate",1)
-        
+        Cdunif.CdunifSetNCFLAGS("deflate", 1)
+
+
 def setNetcdfDeflateLevelFlag(value):
     """ Sets NetCDF deflate level flag value"""
-    if value not in [0,1,2,3,4,5,6,7,8,9]:
-        raise CDMSError("Error NetCDF deflate_level flag must be an integer < 10")
-    Cdunif.CdunifSetNCFLAGS("deflate_level",value)
+    if value not in [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]:
+        raise CDMSError(
+            "Error NetCDF deflate_level flag must be an integer < 10")
+    Cdunif.CdunifSetNCFLAGS("deflate_level", value)
+
 
 def getNetcdfUseNCSwitchModeFlag():
     """ Returns NetCDF UseParallel flag value"""
     return Cdunif.CdunifGetNCFLAGS("use_define_mode")
 
+
 def getNetcdfUseParallelFlag():
     """ Returns NetCDF UseParallel flag value"""
     return Cdunif.CdunifGetNCFLAGS("use_parallel")
 
+
 def getNetcdf4Flag():
     """ Returns NetCDF4 flag value"""
     return Cdunif.CdunifGetNCFLAGS("netcdf4")
 
+
 def getNetcdfClassicFlag():
     """ Returns NetCDF classic flag value"""
     return Cdunif.CdunifGetNCFLAGS("classic")
 
+
 def getNetcdfShuffleFlag():
     """ Returns NetCDF shuffle flag value"""
     return Cdunif.CdunifGetNCFLAGS("shuffle")
 
+
 def getNetcdfDeflateFlag():
     """ Returns NetCDF deflate flag value"""
     return Cdunif.CdunifGetNCFLAGS("deflate")
 
+
 def getNetcdfDeflateLevelFlag():
     """ Returns NetCDF deflate level flag value"""
     return Cdunif.CdunifGetNCFLAGS("deflate_level")
+
+
 def useNetcdf3():
     """ Turns off (0) NetCDF flags for shuffle/defalte/defaltelevel
     Output files are generated as NetCDF3 Classic after that
@@ -230,11 +282,13 @@ def useNetcdf3():
 
 # Create a tree from a file path.
 # Returns the parse tree root node.
+
+
 def load(path):
     fd = open(path)
     text = fd.read()
     fd.close()
-    p=CDMLParser()
+    p = CDMLParser()
     p.feed(text)
     p.close()
     return p.getRoot()
@@ -243,13 +297,16 @@ def load(path):
 # URI is of the form scheme://netloc/path;parameters?query#fragment
 # where fragment may be an XPointer.
 # Returns the parse tree root node.
+
+
 def loadURI(uri):
-    (scheme,netloc,path,parameters,query,fragment)=urlparse.urlparse(uri)
-    uripath = urlparse.urlunparse((scheme,netloc,path,'','',''))
+    (scheme, netloc, path, parameters,
+     query, fragment) = urlparse.urlparse(uri)
+    uripath = urlparse.urlunparse((scheme, netloc, path, '', '', ''))
     fd = urllib.urlopen(uripath)
     text = fd.read()
     fd.close()
-    p=CDMLParser()
+    p = CDMLParser()
     p.feed(text)
     p.close()
     return p.getRoot()
@@ -257,14 +314,19 @@ def loadURI(uri):
 # Create a dataset
 # 'path' is the XML file name, or netCDF filename for simple file create
 # 'template' is a string template for the datafile(s), for dataset creation
-def createDataset(path,template=None):
-    return openDataset(path,'w',template)
+
+
+def createDataset(path, template=None):
+    return openDataset(path, 'w', template)
 
 # Open an existing dataset
 # 'uri' is a Uniform Resource Identifier, referring to a cdunif file, XML file,
 #   or LDAP URL of a catalog dataset entry.
 # 'mode' is 'r', 'r+', 'a', or 'w'
-def openDataset(uri,mode='r',template=None,dods=1,dpath=None, hostObj=None):
+
+
+def openDataset(uri, mode='r', template=None,
+                dods=1, dpath=None, hostObj=None):
     """
     Options:::
 mode :: (str) ('r') mode to open the file in read/write/append
@@ -280,41 +342,45 @@ file :: (cdms2.dataset.CdmsFile) (0) file to read from
 :::
     """
     uri = uri.strip()
-    (scheme,netloc,path,parameters,query,fragment)=urlparse.urlparse(uri)
-    if scheme in ('','file'):
+    (scheme, netloc, path, parameters,
+     query, fragment) = urlparse.urlparse(uri)
+    if scheme in ('', 'file'):
         if netloc:
             # In case of relative path...
             path = netloc + path
         path = os.path.expanduser(path)
         path = os.path.normpath(os.path.join(os.getcwd(), path))
 
-        root,ext = os.path.splitext(path)
-        if ext in ['.xml','.cdml']:
-            if mode!='r': raise ModeNotSupported(mode)
+        root, ext = os.path.splitext(path)
+        if ext in ['.xml', '.cdml']:
+            if mode != 'r':
+                raise ModeNotSupported(mode)
             datanode = load(path)
         else:
             # If the doesn't exist allow it to be created
-            ##Ok mpi has issues with bellow we need to test this only with 1 rank
+            # Ok mpi has issues with bellow we need to test this only with 1
+            # rank
             if not os.path.exists(path):
-                return CdmsFile(path,mode,mpiBarrier=CdMpi)
-            elif mode=="w":
+                return CdmsFile(path, mode, mpiBarrier=CdMpi)
+            elif mode == "w":
                 try:
                     os.remove(path)
                 except:
                     pass
-                return CdmsFile(path,mode,mpiBarrier=CdMpi)
-            
+                return CdmsFile(path, mode, mpiBarrier=CdMpi)
+
             # The file exists
-            file1 = CdmsFile(path,"r")
+            file1 = CdmsFile(path, "r")
             if libcf is not None:
                 if hasattr(file1, libcf.CF_FILETYPE):
                     if getattr(file1, libcf.CF_FILETYPE) == libcf.CF_GLATT_FILETYPE_HOST:
                         file = gsHost.open(path, mode)
-                    elif mode=='r' and hostObj is None:
-                        # helps performance on machines where file open (in CdmsFile) is costly
+                    elif mode == 'r' and hostObj is None:
+                        # helps performance on machines where file open (in
+                        # CdmsFile) is costly
                         file = file1
                     else:
-                        file = CdmsFile(path, mode, hostObj = hostObj)
+                        file = CdmsFile(path, mode, hostObj=hostObj)
                     file1.close()
                 else:
                     file1.close()
@@ -324,17 +390,18 @@ file :: (cdms2.dataset.CdmsFile) (0) file to read from
                 file1.close()
                 return CdmsFile(path, mode)
     elif scheme in ['http', 'gridftp']:
-        
+
         if (dods):
-            if mode!='r': raise ModeNotSupported(mode)
+            if mode != 'r':
+                raise ModeNotSupported(mode)
             # DODS file?
             try:
-                file = CdmsFile(uri,mode)
+                file = CdmsFile(uri, mode)
                 return file
-            except Exception,err:
-                msg = "Error in DODS open of: "+uri
-                if os.path.exists(os.path.join(os.path.expanduser("~"),".dodsrc")):
-                  msg+="\nYou have a .dodsrc in your HOME directory, try to remove it"
+            except Exception as err:
+                msg = "Error in DODS open of: " + uri
+                if os.path.exists(os.path.join(os.path.expanduser("~"), ".dodsrc")):
+                    msg += "\nYou have a .dodsrc in your HOME directory, try to remove it"
                 raise CDMSError(msg)
         else:
             try:
@@ -342,8 +409,8 @@ file :: (cdms2.dataset.CdmsFile) (0) file to read from
                 return datanode
             except:
                 datanode = loadURI(uri)
-                raise CDMSError("Error in loadURI of: "+uri)
-            
+                raise CDMSError("Error in loadURI of: " + uri)
+
     else:
         raise SchemeNotSupported(scheme)
 
@@ -357,13 +424,13 @@ file :: (cdms2.dataset.CdmsFile) (0) file to read from
     # Note: In general, dset.datapath is relative to the URL of the
     #   enclosing database, but here the database is null, so the
     #   datapath should be absolute.
-    if dpath==None:
+    if dpath is None:
         direc = datanode.getExternalAttr('directory')
         head = os.path.dirname(path)
         if direc and os.path.isabs(direc):
             dpath = direc
         elif direc:
-            dpath = os.path.join(head,direc)
+            dpath = os.path.join(head, direc)
         else:
             dpath = head
 
@@ -371,6 +438,8 @@ file :: (cdms2.dataset.CdmsFile) (0) file to read from
     return dataset
 
 # Functions for parsing the file map.
+
+
 def parselist(text, f):
     """Parse a string of the form [A, A, ...].
     f is a function which parses A and returns (A, nconsumed)
@@ -379,13 +448,13 @@ def parselist(text, f):
     n = 0
     m = _ListStart.match(text)
     if m is None:
-        raise CDMSError("Parsing cdms_filemap near "+text[0:_NPRINT])
+        raise CDMSError("Parsing cdms_filemap near " + text[0:_NPRINT])
     result = []
     n += m.end()
     s, nconsume = f(text[n:])
     result.append(s)
     n += nconsume
-    while 1:
+    while True:
         m = _ListSep.match(text[n:])
         if m is None:
             break
@@ -396,10 +465,11 @@ def parselist(text, f):
         n += nconsume
     m = _ListEnd.match(text[n:])
     if m is None:
-        raise CDMSError("Parsing cdms_filemap near "+text[n:n+_NPRINT])
+        raise CDMSError("Parsing cdms_filemap near " + text[n:n + _NPRINT])
     n += m.end()
     return result, n
 
+
 def parseIndexList(text):
     """Parse a string of the form [i,j,k,l,...,path] where
     i,j,k,l,... are indices or '-', and path is a filename.
@@ -411,45 +481,48 @@ def parseIndexList(text):
         m = _IndexList5.match(text)
         nindices = 5
     if m is None:
-        raise CDMSError("Parsing cdms_filemap near "+text[0:_NPRINT])
-    result = [None]*(nindices+1)
+        raise CDMSError("Parsing cdms_filemap near " + text[0:_NPRINT])
+    result = [None] * (nindices + 1)
     for i in range(nindices):
-        s = m.group(i+1)
-        if s!='-':
+        s = m.group(i + 1)
+        if s != '-':
             result[i] = int(s)
-    result[nindices] = m.group(nindices+1)
+    result[nindices] = m.group(nindices + 1)
     return result, m.end()
 
+
 def parseName(text):
     m = _Name.match(text)
     if m is None:
-        raise CDMSError("Parsing cdms_filemap near "+text[0:_NPRINT])
+        raise CDMSError("Parsing cdms_filemap near " + text[0:_NPRINT])
     return m.group(), m.end()
 
+
 def parseVarMap(text):
     """Parse a string of the form [ namelist, slicelist ]"""
     n = 0
     m = _ListStart.match(text)
     if m is None:
-        raise CDMSError("Parsing cdms_filemap near "+text[0:_NPRINT])
+        raise CDMSError("Parsing cdms_filemap near " + text[0:_NPRINT])
     result = []
     n += m.end()
-    s, nconsume = parselist(text[n:],parseName)
+    s, nconsume = parselist(text[n:], parseName)
     result.append(s)
     n += nconsume
     m = _ListSep.match(text[n:])
     if m is None:
-        raise CDMSError("Parsing cdms_filemap near "+text[n:n+_NPRINT])
+        raise CDMSError("Parsing cdms_filemap near " + text[n:n + _NPRINT])
     n += m.end()
     s, nconsume = parselist(text[n:], parseIndexList)
     result.append(s)
     n += nconsume
     m = _ListEnd.match(text[n:])
     if m is None:
-        raise CDMSError("Parsing cdms_filemap near "+text[n:n+_NPRINT])
+        raise CDMSError("Parsing cdms_filemap near " + text[n:n + _NPRINT])
     n += m.end()
     return result, n
 
+
 def parseFileMap(text):
     """Parse a CDMS filemap. having the form:
     filemap :== [ varmap, varmap, ...]
@@ -459,38 +532,43 @@ def parseFileMap(text):
     indexlist :== [i,j,k,l,path]
     """
     result, n = parselist(text, parseVarMap)
-    if n<len(text):
-        raise CDMSError("Parsing cdms_filemap near "+text[n:n+_NPRINT])
+    if n < len(text):
+        raise CDMSError("Parsing cdms_filemap near " + text[n:n + _NPRINT])
     return result
 
 
 # A CDMS dataset consists of a CDML/XML file and one or more data files
-from cudsinterface import cuDataset
+from .cudsinterface import cuDataset
+
+
 class Dataset(CdmsObj, cuDataset):
-    def __init__(self, uri, mode, datasetNode=None, parent=None, datapath=None):
-        if datasetNode is not None and datasetNode.tag !='dataset':
+
+    def __init__(self, uri, mode,
+                 datasetNode=None, parent=None, datapath=None):
+        if datasetNode is not None and datasetNode.tag != 'dataset':
             raise CDMSError('Node is not a dataset node')
-        CdmsObj.__init__(self,datasetNode)
-        for v in [ 'datapath',
-                   'variables',
-                   'axes',
-                   'grids',
-                   'xlinks',
-                   'dictdict',
-                   'default_variable_name',
-                   'parent',
-                   'uri',
-                   'mode']:
+        CdmsObj.__init__(self, datasetNode)
+        for v in ['datapath',
+                  'variables',
+                  'axes',
+                  'grids',
+                  'xlinks',
+                  'dictdict',
+                  'default_variable_name',
+                  'parent',
+                  'uri',
+                  'mode']:
             if not v in self.__cdms_internals__:
-                val = self.__cdms_internals__+[v,]
+                val = self.__cdms_internals__ + [v, ]
                 self.___cdms_internals__ = val
-                
+
         cuDataset.__init__(self)
         self.parent = parent
         self.uri = uri
         self.mode = mode
             # Path of data files relative to parent db.
-            # Note: .directory is the location of data relative to the location of the XML file
+            # Note: .directory is the location of data relative to the location
+            # of the XML file
         self.datapath = datapath
         self.variables = {}
         self.axes = {}
@@ -498,19 +576,20 @@ class Dataset(CdmsObj, cuDataset):
         self.xlinks = {}
         self._gridmap_ = {}
             # Gridmap:(latname,lonname,order,maskname,gridclass) => grid
-        (scheme,netloc,xmlpath,parameters,query,fragment)=urlparse.urlparse(uri)
+        (scheme, netloc, xmlpath, parameters,
+         query, fragment) = urlparse.urlparse(uri)
         self._xmlpath_ = xmlpath
         # Dictionary of dictionaries, keyed on node tags
-        self.dictdict = {'variable':self.variables, 
-                         'axis':self.axes, 
-                         'rectGrid':self.grids, 
-                         'curveGrid':self.grids,
-                         'genericGrid':self.grids,
-                         'xlink':self.xlinks
-                        }
+        self.dictdict = {'variable': self.variables,
+                         'axis': self.axes,
+                         'rectGrid': self.grids,
+                         'curveGrid': self.grids,
+                         'genericGrid': self.grids,
+                         'xlink': self.xlinks
+                         }
         # Dataset IDs are external, so may not have been defined yet.
-        if not hasattr(self,'id'):
-            self.id='<None>'
+        if not hasattr(self, 'id'):
+            self.id = '<None>'
         self._status_ = 'open'
         self._convention_ = convention.getDatasetConvention(self)
 
@@ -519,7 +598,7 @@ class Dataset(CdmsObj, cuDataset):
             coordsaux = self._convention_.getDsetnodeAuxAxisIds(datasetNode)
 
             for node in datasetNode.getIdDict().values():
-                if node.tag=='variable':
+                if node.tag == 'variable':
                     if node.id in coordsaux:
                         if node.getDomain().getChildCount() == 1:
                             obj = DatasetAuxAxis1D(self, node.id, node)
@@ -527,22 +606,22 @@ class Dataset(CdmsObj, cuDataset):
                             obj = DatasetAxis2D(self, node.id, node)
                     else:
                         obj = DatasetVariable(self, node.id, node)
-                    self.variables[node.id]=obj
-                elif node.tag=='axis':
-                    obj = Axis(self,node)
-                    self.axes[node.id]=obj
-                elif node.tag=='rectGrid':
-                    obj = RectGrid(self,node)
-                    self.grids[node.id]=obj
-                elif node.tag=='xlink':
+                    self.variables[node.id] = obj
+                elif node.tag == 'axis':
+                    obj = Axis(self, node)
+                    self.axes[node.id] = obj
+                elif node.tag == 'rectGrid':
+                    obj = RectGrid(self, node)
+                    self.grids[node.id] = obj
+                elif node.tag == 'xlink':
                     obj = Xlink(node)
-                    self.xlinks[node.id]=obj
+                    self.xlinks[node.id] = obj
                 else:
                     dict = self.dictdict.get(node.tag)
                     if dict is not None:
-                        dict[node.id]=node
+                        dict[node.id] = node
                     else:
-                        self.dictdict[node.tag] = {node.id:node}
+                        self.dictdict[node.tag] = {node.id: node}
 
             # Initialize grid domains
             for grid in self.grids.values():
@@ -554,7 +633,11 @@ class Dataset(CdmsObj, cuDataset):
                     maskname = ""
                 else:
                     maskname = mask.id
-                self._gridmap_[(latname, lonname, grid.getOrder(), maskname)] = grid
+                self._gridmap_[(
+                               latname,
+                               lonname,
+                               grid.getOrder(),
+                               maskname)] = grid
 
             # Initialize variable domains.
             for var in self.variables.values():
@@ -564,40 +647,43 @@ class Dataset(CdmsObj, cuDataset):
 
                 # Get grid information for the variable. gridkey has the form
                 # (latname,lonname,order,maskname,abstract_class).
-                gridkey, lat, lon = var.generateGridkey(self._convention_, self.variables)
+                gridkey, lat, lon = var.generateGridkey(
+                    self._convention_, self.variables)
 
                 # If the variable is gridded, lookup the grid. If no such grid exists,
-                # create a unique gridname, create the grid, and add to the gridmap.
+                # create a unique gridname, create the grid, and add to the
+                # gridmap.
                 if gridkey is None:
                     grid = None
                 else:
                     grid = self._gridmap_.get(gridkey)
                     if grid is None:
-                        if hasattr(var,'grid_type'):
+                        if hasattr(var, 'grid_type'):
                             gridtype = var.grid_type
                         else:
                             gridtype = "generic"
 
                         candidateBasename = None
                         if gridkey[4] == 'rectGrid':
-                            gridshape = (len(lat),len(lon))
+                            gridshape = (len(lat), len(lon))
                         elif gridkey[4] == 'curveGrid':
                             gridshape = lat.shape
                         elif gridkey[4] == 'genericGrid':
                             gridshape = lat.shape
-                            candidateBasename = 'grid_%d'%gridshape
+                            candidateBasename = 'grid_%d' % gridshape
                         else:
-                            gridshape = (len(lat),len(lon))
+                            gridshape = (len(lat), len(lon))
 
                         if candidateBasename is None:
-                            candidateBasename = 'grid_%dx%d'%gridshape
-                        if not self.grids.has_key(candidateBasename):
+                            candidateBasename = 'grid_%dx%d' % gridshape
+                        if candidateBasename not in self.grids:
                             gridname = candidateBasename
                         else:
                             foundname = 0
-                            for i in range(97,123): # Lower-case letters
-                                candidateName = candidateBasename+'_'+chr(i)
-                                if not self.grids.has_key(candidateName):
+                            for i in range(97, 123):  # Lower-case letters
+                                candidateName = candidateBasename + \
+                                    '_' + chr(i)
+                                if candidateName not in self.grids:
                                     gridname = candidateName
                                     foundname = 1
                                     break
@@ -605,11 +691,16 @@ class Dataset(CdmsObj, cuDataset):
                             if not foundname:
                                 print 'Warning: cannot generate a grid for variable', var.id
                                 continue
-                            
+
                         # Create the grid
                         if gridkey[4] == 'rectGrid':
-                            node = cdmsNode.RectGridNode(gridname, lat.id, lon.id, gridtype, gridkey[2])
-                            grid = RectGrid(self,node)
+                            node = cdmsNode.RectGridNode(
+                                gridname,
+                                lat.id,
+                                lon.id,
+                                gridtype,
+                                gridkey[2])
+                            grid = RectGrid(self, node)
                             grid.initDomain(self.axes, self.variables)
                         elif gridkey[4] == 'curveGrid':
                             grid = DatasetCurveGrid(lat, lon, gridname, self)
@@ -650,34 +741,39 @@ class Dataset(CdmsObj, cuDataset):
                     # but now there _may_ be an additional item before path...
                     for varm1 in varmap:
                         tstart, tend, levstart, levend = varm1[0:4]
-                        if (len(varm1)>=6):
+                        if (len(varm1) >= 6):
                             forecast = varm1[4]
                         else:
                             forecast = None
                         path = varm1[-1]
-                        self._filemap_[(varname, tstart, levstart, forecast)] = path
+                        self._filemap_[(
+                                       varname,
+                                       tstart,
+                                       levstart,
+                                       forecast)] = path
                         if tstart is not None:
-                            timemap[(tstart, tend)] = 1 # Collect unique (tstart, tend) tuples
+                            timemap[
+                                (tstart, tend)] = 1  # Collect unique (tstart, tend) tuples
                         if levstart is not None:
                             levmap[(levstart, levend)] = 1
                         if forecast is not None:
-                            fcmap[(forecast,forecast)] = 1
+                            fcmap[(forecast, forecast)] = 1
                     tkeys = timemap.keys()
-                    if len(tkeys)>0:
+                    if len(tkeys) > 0:
                         tkeys.sort()
                         tpart = map(lambda x: list(x), tkeys)
                     else:
                         tpart = None
                     levkeys = levmap.keys()
-                    if len(levkeys)>0:
+                    if len(levkeys) > 0:
                         levkeys.sort()
                         levpart = map(lambda x: list(x), levkeys)
                     else:
                         levpart = None
                     fckeys = fcmap.keys()
-                    if len(fckeys)>0:
+                    if len(fckeys) > 0:
                         fckeys.sort()
-                    if self.variables.has_key(varname):
+                    if varname in self.variables:
                         self.variables[varname]._varpart_ = [tpart, levpart]
 
     def getConvention(self):
@@ -685,7 +781,7 @@ class Dataset(CdmsObj, cuDataset):
         return self._convention_
 
     # Get a dictionary of objects with the given tag
-    def getDictionary(self,tag):
+    def getDictionary(self, tag):
         return self.dictdict[tag]
 
     # Synchronize writes with data/metadata files
@@ -706,24 +802,24 @@ class Dataset(CdmsObj, cuDataset):
         self.parent = None
         self._status_ = 'closed'
 
-##  Note: Removed to allow garbage collection of reference cycles
-##     def __del__(self):
-##         if cdmsobj._debug==1:
-##             print 'Deleting dataset',self.id
-##         self.close()
-    
+# Note: Removed to allow garbage collection of reference cycles
+# def __del__(self):
+# if cdmsobj._debug==1:
+# print 'Deleting dataset',self.id
+# self.close()
+
     # Create an axis
     # 'name' is the string name of the Axis
     # 'ar' is the 1-D data array, or None for an unlimited axis
     # Return an axis object.
-    def createAxis(self,name,ar):
+    def createAxis(self, name, ar):
         pass
 
     # Create an implicit rectilinear grid. lat, lon, and mask are objects.
     # order and type are strings
-    def createRectGrid(self,id, lat, lon, order, type="generic", mask=None):
+    def createRectGrid(self, id, lat, lon, order, type="generic", mask=None):
         node = cdmsNode.RectGridNode(id, lat.id, lon.id, type, order, mask.id)
-        grid = RectGrid(self,node)
+        grid = RectGrid(self, node)
         grid.initDomain(self.axes, self.variables)
         self.grids[grid.id] = grid
 #        self._gridmap_[gridkey] = grid
@@ -733,31 +829,31 @@ class Dataset(CdmsObj, cuDataset):
     # 'datatype' is a CDMS datatype
     # 'axisnames' is a list of axes or grids
     # Return a variable object.
-    def createVariable(self,name,datatype,axisnames):
+    def createVariable(self, name, datatype, axisnames):
         pass
 
     # Search for a pattern in a string-valued attribute. If attribute is None,
     # search all string attributes. If tag is 'dataset', just check the dataset,
     # else check all nodes in the dataset of class type matching the tag. If tag
     # is None, search the dataset and all objects contained in it.
-    def searchPattern(self,pattern,attribute,tag):
+    def searchPattern(self, pattern, attribute, tag):
         resultlist = []
         if tag is not None:
             tag = tag.lower()
-        if tag in ('dataset',None):
-            if self.searchone(pattern,attribute)==1:
+        if tag in ('dataset', None):
+            if self.searchone(pattern, attribute) == 1:
                 resultlist = [self]
             else:
                 resultlist = []
         if tag is None:
             for dict in self.dictdict.values():
                 for obj in dict.values():
-                    if obj.searchone(pattern,attribute):
+                    if obj.searchone(pattern, attribute):
                         resultlist.append(obj)
-        elif tag!='dataset':
+        elif tag != 'dataset':
             dict = self.dictdict[tag]
             for obj in dict.values():
-                if obj.searchone(pattern,attribute):
+                if obj.searchone(pattern, attribute):
                     resultlist.append(obj)
         return resultlist
 
@@ -765,24 +861,24 @@ class Dataset(CdmsObj, cuDataset):
     # search all string attributes. If tag is 'dataset', just check the dataset,
     # else check all nodes in the dataset of class type matching the tag. If tag
     # is None, search the dataset and all objects contained in it.
-    def matchPattern(self,pattern,attribute,tag):
+    def matchPattern(self, pattern, attribute, tag):
         resultlist = []
         if tag is not None:
             tag = tag.lower()
-        if tag in ('dataset',None):
-            if self.matchone(pattern,attribute)==1:
+        if tag in ('dataset', None):
+            if self.matchone(pattern, attribute) == 1:
                 resultlist = [self]
             else:
                 resultlist = []
         if tag is None:
             for dict in self.dictdict.values():
                 for obj in dict.values():
-                    if obj.matchone(pattern,attribute):
+                    if obj.matchone(pattern, attribute):
                         resultlist.append(obj)
-        elif tag!='dataset':
+        elif tag != 'dataset':
             dict = self.dictdict[tag]
             for obj in dict.values():
-                if obj.matchone(pattern,attribute):
+                if obj.matchone(pattern, attribute):
                     resultlist.append(obj)
         return resultlist
 
@@ -793,13 +889,13 @@ class Dataset(CdmsObj, cuDataset):
     # If 'variable', 'axis', etc., it is applied only to that type of object
     # in the dataset. If None, it is applied to all objects, including
     # the dataset itself.
-    def searchPredicate(self,predicate,tag):
+    def searchPredicate(self, predicate, tag):
         resultlist = []
         if tag is not None:
             tag = tag.lower()
-        if tag in ('dataset',None):
+        if tag in ('dataset', None):
             try:
-                if apply(predicate,(self,))==1:
+                if predicate(*(self,)) == 1:
                     resultlist.append(self)
             except AttributeError:
                 pass
@@ -807,15 +903,15 @@ class Dataset(CdmsObj, cuDataset):
             for dict in self.dictdict.values():
                 for obj in dict.values():
                     try:
-                        if apply(predicate,(obj,))==1:
+                        if predicate(*(obj,)) == 1:
                             resultlist.append(obj)
                     except AttributeError:
                         pass
-        elif tag!="dataset":
+        elif tag != "dataset":
             dict = self.dictdict[tag]
             for obj in dict.values():
                 try:
-                    if apply(predicate,(obj,))==1:
+                    if predicate(*(obj,)) == 1:
                         resultlist.append(obj)
                 except:
                     pass
@@ -827,8 +923,7 @@ class Dataset(CdmsObj, cuDataset):
         for var in self.variables.values():
             for path, stuple in var.getPaths():
                 pathdict[path] = 1
-        result = pathdict.keys()
-        result.sort()
+        result = sorted(pathdict.keys())
         return result
 
     # Open a data file associated with this dataset.
@@ -838,33 +933,36 @@ class Dataset(CdmsObj, cuDataset):
 
         # Opened via a local XML file?
         if self.parent is None:
-            path = os.path.join(self.datapath,filename)
-            if cdmsobj._debug==1:
-                sys.stdout.write(path+'\n'); sys.stdout.flush()
-            f = Cdunif.CdunifFile(path,mode)
+            path = os.path.join(self.datapath, filename)
+            if cdmsobj._debug == 1:
+                sys.stdout.write(path + '\n')
+                sys.stdout.flush()
+            f = Cdunif.CdunifFile(path, mode)
             return f
 
         # Opened via a database
         else:
             dburls = self.parent.url
-            if type(dburls)!=type([]):
+            if not isinstance(dburls, type([])):
                 dburls = [dburls]
 
             # Try first to open as a local file
             for dburl in dburls:
                 if os.path.isabs(self.directory):
-                    fileurl = os.path.join(self.directory,filename)
+                    fileurl = os.path.join(self.directory, filename)
                 else:
                     try:
-                        fileurl = os.path.join(dburl,self.datapath,filename)
+                        fileurl = os.path.join(dburl, self.datapath, filename)
                     except:
-                        print 'Error joining',`dburl`,self.datapath,filename
+                        print 'Error joining', repr(dburl), self.datapath, filename
                         raise
-                (scheme,netloc,path,parameters,query,fragment)=urlparse.urlparse(fileurl)
-                if scheme in ['file',''] and os.path.isfile(path):
-                    if cdmsobj._debug==1:
-                        sys.stdout.write(fileurl+'\n'); sys.stdout.flush()
-                    f = Cdunif.CdunifFile(path,mode)
+                (scheme, netloc, path, parameters, query,
+                 fragment) = urlparse.urlparse(fileurl)
+                if scheme in ['file', ''] and os.path.isfile(path):
+                    if cdmsobj._debug == 1:
+                        sys.stdout.write(fileurl + '\n')
+                        sys.stdout.flush()
+                    f = Cdunif.CdunifFile(path, mode)
                     return f
 
             # See if request manager is being used for file transfer
@@ -874,32 +972,40 @@ class Dataset(CdmsObj, cuDataset):
                 lcbase = db.lcBaseDN
                 lcpath = self.getLogicalCollectionDN(lcbase)
 
-                # File location is logical collection path combined with relative filename
+                # File location is logical collection path combined with
+                # relative filename
                 fileDN = (self.uri, filename)
-                path = cache.getFile(filename, fileDN, lcpath=lcpath, userid=db.userid, useReplica=db.useReplica)
+                path = cache.getFile(
+                    filename,
+                    fileDN,
+                    lcpath=lcpath,
+                    userid=db.userid,
+                    useReplica=db.useReplica)
                 try:
-                    f = Cdunif.CdunifFile(path,mode)
+                    f = Cdunif.CdunifFile(path, mode)
                 except:
                     # Try again, in case another process clobbered this file
-                    path = cache.getFile(fileurl,fileDN)
-                    f = Cdunif.CdunifFile(path,mode)
+                    path = cache.getFile(fileurl, fileDN)
+                    f = Cdunif.CdunifFile(path, mode)
                 return f
 
             # Try to read via FTP:
 
             for dburl in dburls:
-                fileurl = os.path.join(dburl,self.datapath,filename)
-                (scheme,netloc,path,parameters,query,fragment)=urlparse.urlparse(fileurl)
-                if scheme=='ftp':
+                fileurl = os.path.join(dburl, self.datapath, filename)
+                (scheme, netloc, path, parameters, query,
+                 fragment) = urlparse.urlparse(fileurl)
+                if scheme == 'ftp':
                     cache = self.parent.enableCache()
-                    fileDN = (self.uri, filename) # Global file name
-                    path = cache.getFile(fileurl,fileDN)
+                    fileDN = (self.uri, filename)  # Global file name
+                    path = cache.getFile(fileurl, fileDN)
                     try:
-                        f = Cdunif.CdunifFile(path,mode)
+                        f = Cdunif.CdunifFile(path, mode)
                     except:
-                        # Try again, in case another process clobbered this file
-                        path = cache.getFile(fileurl,fileDN)
-                        f = Cdunif.CdunifFile(path,mode)
+                        # Try again, in case another process clobbered this
+                        # file
+                        path = cache.getFile(fileurl, fileDN)
+                        f = Cdunif.CdunifFile(path, mode)
                     return f
 
             # File not found
@@ -912,9 +1018,9 @@ class Dataset(CdmsObj, cuDataset):
         if hasattr(self, "lc"):
             dn = self.lc
         else:
-            dn = "lc=%s"%self.id
+            dn = "lc=%s" % self.id
         if base is not None:
-            dn = "%s,%s"%(dn,base)
+            dn = "%s,%s" % (dn, base)
         return dn
 
     def getVariable(self, id):
@@ -926,7 +1032,8 @@ class Dataset(CdmsObj, cuDataset):
         axes defined on latitude or longitude, excluding weights and bounds."""
         retval = self.variables.values()
         if spatial:
-            retval = filter(lambda x: x.id[0:7]!="bounds_" and x.id[0:8]!="weights_" and ((x.getLatitude() is not None) or (x.getLongitude() is not None) or (x.getLevel() is not None)), retval)
+            retval = filter(lambda x: x.id[0:7] != "bounds_" and x.id[0:8] != "weights_" and (
+                (x.getLatitude() is not None) or (x.getLongitude() is not None) or (x.getLevel() is not None)), retval)
         return retval
 
     def getAxis(self, id):
@@ -938,38 +1045,40 @@ class Dataset(CdmsObj, cuDataset):
         return self.grids.get(id)
 
     def __repr__(self):
-        return "<Dataset: '%s', URI: '%s', mode: '%s', status: %s>"%(self.id, self.uri, self.mode, self._status_)
-
-## internattr.add_internal_attribute (Dataset, 'datapath',
-##                                             'variables',
-##                                             'axes',
-##                                             'grids',
-##                                             'xlinks',
-##                                             'dictdict',
-##                                             'default_variable_name',
-##                                             'parent',
-##                                             'uri',
-##                                             'mode')
+        return "<Dataset: '%s', URI: '%s', mode: '%s', status: %s>" % (self.id, self.uri, self.mode, self._status_)
+
+# internattr.add_internal_attribute (Dataset, 'datapath',
+# 'variables',
+# 'axes',
+# 'grids',
+# 'xlinks',
+# 'dictdict',
+# 'default_variable_name',
+# 'parent',
+# 'uri',
+# 'mode')
+
 
 class CdmsFile(CdmsObj, cuDataset):
-    def __init__(self, path, mode, hostObj = None, mpiBarrier=False):
+
+    def __init__(self, path, mode, hostObj=None, mpiBarrier=False):
 
         if mpiBarrier:
             MPI.COMM_WORLD.Barrier()
 
         CdmsObj.__init__(self, None)
         cuDataset.__init__(self)
-        value = self.__cdms_internals__+['datapath',
-                                'variables',
-                                'axes',
-                                'grids',
-                                'xlinks',
-                                'dictdict',
-                                'default_variable_name',
-                                'id',
-                                'uri',
-                                'parent',
-                                'mode']
+        value = self.__cdms_internals__ + ['datapath',
+                                           'variables',
+                                           'axes',
+                                           'grids',
+                                           'xlinks',
+                                           'dictdict',
+                                           'default_variable_name',
+                                           'id',
+                                           'uri',
+                                           'parent',
+                                           'mode']
         self.___cdms_internals__ = value
         self.id = path
         if "://" in path:
@@ -978,14 +1087,14 @@ class CdmsFile(CdmsObj, cuDataset):
             self.uri = "file://" + os.path.abspath(os.path.expanduser(path))
         self._mode_ = mode
         try:
-            if mode[0].lower()=="w":
+            if mode[0].lower() == "w":
                 try:
                     os.remove(path)
                 except:
                     pass
-            _fileobj_ = Cdunif.CdunifFile (path, mode)
-        except Exception,err:
-            raise CDMSError('Cannot open file %s (%s)'%(path,err))
+            _fileobj_ = Cdunif.CdunifFile(path, mode)
+        except Exception as err:
+            raise CDMSError('Cannot open file %s (%s)' % (path, err))
         self._file_ = _fileobj_   # Cdunif file object
         self.variables = {}
         self.axes = {}
@@ -993,33 +1102,40 @@ class CdmsFile(CdmsObj, cuDataset):
         self.xlinks = {}
         self._gridmap_ = {}
 
-        # self.attributes returns the Cdunif file dictionary. 
-##         self.replace_external_attributes(self._file_.__dict__)
-        for att in  self._file_.__dict__.keys():
-            self.__dict__.__setitem__(att,self._file_.__dict__[att])
-            self.attributes[att]=self._file_.__dict__[att]
+        # self.attributes returns the Cdunif file dictionary.
+# self.replace_external_attributes(self._file_.__dict__)
+        for att in self._file_.__dict__.keys():
+            self.__dict__.__setitem__(att, self._file_.__dict__[att])
+            self.attributes[att] = self._file_.__dict__[att]
         self._boundAxis_ = None         # Boundary axis for cell vertices
-        if self._mode_=='w':
+        if self._mode_ == 'w':
             self.Conventions = convention.CFConvention.current
         self._status_ = 'open'
         self._convention_ = convention.getDatasetConvention(self)
 
         try:
-            
+
             # A mosaic variable with coordinates attached, but the coordinate variables reside in a
-            # different file. Add the coordinate variables to the mosaic variables list.
+            # different file. Add the coordinate variables to the mosaic
+            # variables list.
             if not hostObj is None:
                 for name in self._file_.variables.keys():
                     if 'coordinates' in dir(self._file_.variables[name]):
-                        coords = self._file_.variables[name].coordinates.split()
+                        coords = self._file_.variables[
+                            name].coordinates.split()
                         for coord in coords:
                             if not coord in self._file_.variables.keys():
-                                cdunifvar = Cdunif.CdunifFile(hostObj.gridVars[coord][0], mode)
-                                self._file_.variables[coord] = cdunifvar.variables[coord]
-                
+                                cdunifvar = Cdunif.CdunifFile(
+                                    hostObj.gridVars[coord][0],
+                                    mode)
+                                self._file_.variables[
+                                    coord] = cdunifvar.variables[
+                                        coord]
+
             # Get lists of 1D and auxiliary coordinate axes
             coords1d = self._convention_.getAxisIds(self._file_.variables)
-            coordsaux = self._convention_.getAxisAuxIds(self._file_.variables, coords1d)
+            coordsaux = self._convention_.getAxisAuxIds(
+                self._file_.variables, coords1d)
 
             # Build variable list
             for name in self._file_.variables.keys():
@@ -1028,12 +1144,15 @@ class CdmsFile(CdmsObj, cuDataset):
                     if name in coordsaux:
                         # Put auxiliary coordinate axes with variables, since there may be
                         # a dimension with the same name.
-                        if len(cdunifvar.shape)==2:
-                            self.variables[name] = FileAxis2D(self, name, cdunifvar)
+                        if len(cdunifvar.shape) == 2:
+                            self.variables[name] = FileAxis2D(
+                                self, name, cdunifvar)
                         else:
-                            self.variables[name] = FileAuxAxis1D(self, name, cdunifvar)
+                            self.variables[name] = FileAuxAxis1D(
+                                self, name, cdunifvar)
                     else:
-                        self.variables[name] = FileVariable(self,name,cdunifvar)
+                        self.variables[name] = FileVariable(
+                            self, name, cdunifvar)
 
             # Build axis list
             for name in self._file_.dimensions.keys():
@@ -1043,7 +1162,7 @@ class CdmsFile(CdmsObj, cuDataset):
                     cdunifvar = self._file_.variables[name]
                 else:
                     cdunifvar = None
-                self.axes[name] = FileAxis(self,name,cdunifvar)
+                self.axes[name] = FileAxis(self, name, cdunifvar)
 
             # Attach boundary variables
             for name in coordsaux:
@@ -1051,7 +1170,12 @@ class CdmsFile(CdmsObj, cuDataset):
                 bounds = self._convention_.getVariableBounds(self, var)
                 var.setBounds(bounds)
 
-            self.dictdict = {'variable':self.variables, 'axis':self.axes, 'rectGrid':self.grids, 'curveGrid':self.grids, 'genericGrid':self.grids}
+            self.dictdict = {
+                'variable': self.variables,
+                'axis': self.axes,
+                'rectGrid': self.grids,
+                'curveGrid': self.grids,
+                'genericGrid': self.grids}
 
             # Initialize variable domains
             for var in self.variables.values():
@@ -1061,41 +1185,44 @@ class CdmsFile(CdmsObj, cuDataset):
             for var in self.variables.values():
                 # Get grid information for the variable. gridkey has the form
                 # (latname,lonname,order,maskname, abstract_class).
-                gridkey, lat, lon = var.generateGridkey(self._convention_, self.variables)
+                gridkey, lat, lon = var.generateGridkey(
+                    self._convention_, self.variables)
 
                 # If the variable is gridded, lookup the grid. If no such grid exists,
-                # create a unique gridname, create the grid, and add to the gridmap.
+                # create a unique gridname, create the grid, and add to the
+                # gridmap.
                 if gridkey is None:
                     grid = None
                 else:
                     grid = self._gridmap_.get(gridkey)
                     if grid is None:
 
-                        if hasattr(var,'grid_type'):
+                        if hasattr(var, 'grid_type'):
                             gridtype = var.grid_type
                         else:
                             gridtype = "generic"
 
                         candidateBasename = None
                         if gridkey[4] == 'rectGrid':
-                            gridshape = (len(lat),len(lon))
+                            gridshape = (len(lat), len(lon))
                         elif gridkey[4] == 'curveGrid':
                             gridshape = lat.shape
                         elif gridkey[4] == 'genericGrid':
                             gridshape = lat.shape
-                            candidateBasename = 'grid_%d'%gridshape
+                            candidateBasename = 'grid_%d' % gridshape
                         else:
-                            gridshape = (len(lat),len(lon))
+                            gridshape = (len(lat), len(lon))
 
                         if candidateBasename is None:
-                            candidateBasename = 'grid_%dx%d'%gridshape
-                        if not self.grids.has_key(candidateBasename):
+                            candidateBasename = 'grid_%dx%d' % gridshape
+                        if candidateBasename not in self.grids:
                             gridname = candidateBasename
                         else:
                             foundname = 0
-                            for i in range(97,123): # Lower-case letters
-                                candidateName = candidateBasename+'_'+chr(i)
-                                if not self.grids.has_key(candidateName):
+                            for i in range(97, 123):  # Lower-case letters
+                                candidateName = candidateBasename + \
+                                    '_' + chr(i)
+                                if candidateName not in self.grids:
                                     gridname = candidateName
                                     foundname = 1
                                     break
@@ -1106,20 +1233,36 @@ class CdmsFile(CdmsObj, cuDataset):
 
                         # Create the grid
                         if gridkey[4] == 'rectGrid':
-                            grid = FileRectGrid(self, gridname, lat, lon, gridkey[2], gridtype)
+                            grid = FileRectGrid(
+                                self,
+                                gridname,
+                                lat,
+                                lon,
+                                gridkey[2],
+                                gridtype)
                         else:
-                            if gridkey[3]!='':
-                                if self.variables.has_key(gridkey[3]):
+                            if gridkey[3] != '':
+                                if gridkey[3] in self.variables:
                                     maskvar = self.variables[gridkey[3]]
                                 else:
-                                    print 'Warning: mask variable %s not found'%gridkey[3]
+                                    print 'Warning: mask variable %s not found' % gridkey[3]
                                     maskvar = None
                             else:
                                 maskvar = None
                             if gridkey[4] == 'curveGrid':
-                                grid = FileCurveGrid(lat, lon, gridname, parent=self, maskvar=maskvar)
+                                grid = FileCurveGrid(
+                                    lat,
+                                    lon,
+                                    gridname,
+                                    parent=self,
+                                    maskvar=maskvar)
                             else:
-                                grid = FileGenericGrid(lat, lon, gridname, parent=self, maskvar=maskvar)
+                                grid = FileGenericGrid(
+                                    lat,
+                                    lon,
+                                    gridname,
+                                    parent=self,
+                                    maskvar=maskvar)
                         self.grids[grid.id] = grid
                         self._gridmap_[gridkey] = grid
 
@@ -1130,45 +1273,45 @@ class CdmsFile(CdmsObj, cuDataset):
             raise
 
     # setattr writes external global attributes to the file
-    def __setattr__ (self, name, value):
-##         s = self.get_property_s(name)
-##         if s is not None:
-##             print '....handler'
-##             s(self, name, value)
-##             return
-        self.__dict__[name] =  value #attributes kept in sync w/file
-        if not name in self.__cdms_internals__ and name[0]!='_':
+    def __setattr__(self, name, value):
+# s = self.get_property_s(name)
+# if s is not None:
+# print '....handler'
+# s(self, name, value)
+# return
+        self.__dict__[name] = value  # attributes kept in sync w/file
+        if not name in self.__cdms_internals__ and name[0] != '_':
             setattr(self._file_, name, value)
-            self.attributes[name]=value
-
-##     # getattr reads external global attributes from the file
-##     def __getattr__ (self, name):
-## ##         g = self.get_property_g(name)
-## ##         if g is not None:
-## ##             return g(self, name)
-##         if name in self.__cdms_internals__:
-##             try:
-##                 return self.__dict__[name]
-##             except KeyError:
-##                 raise AttributeError("%s instance has no attribute %s." % \
-##                            (self.__class__.__name__, name))
-##         else:
-##             return getattr(self._file_,name)
+            self.attributes[name] = value
+
+# getattr reads external global attributes from the file
+# def __getattr__ (self, name):
+# g = self.get_property_g(name)
+# if g is not None:
+# return g(self, name)
+# if name in self.__cdms_internals__:
+# try:
+# return self.__dict__[name]
+# except KeyError:
+# raise AttributeError("%s instance has no attribute %s." % \
+# (self.__class__.__name__, name))
+# else:
+# return getattr(self._file_,name)
 
     # delattr deletes external global attributes in the file
     def __delattr__(self, name):
-##         d = self.get_property_d(name)
-##         if d is not None:
-##             d(self, name)
-##             return
+# d = self.get_property_d(name)
+# if d is not None:
+# d(self, name)
+# return
         try:
             del self.__dict__[name]
         except KeyError:
-            raise AttributeError("%s instance has no attribute %s." % \
-                  (self.__class__.__name__, name))
+            raise AttributeError("%s instance has no attribute %s." %
+                                 (self.__class__.__name__, name))
         if not name in self.__cdms_internals__:
             delattr(self._file_, name)
-            if( name in self.attributes.keys() ):
+            if(name in self.attributes.keys()):
                 del(self.attributes[name])
 
     def sync(self):
@@ -1178,12 +1321,12 @@ class CdmsFile(CdmsObj, cuDataset):
    None :: (None) (0) yep
    :::
    """
-        if self._status_=="closed":
+        if self._status_ == "closed":
             raise CDMSError(FileWasClosed + self.id)
         self._file_.sync()
 
     def close(self):
-        if self._status_=="closed":
+        if self._status_ == "closed":
             return
         if hasattr(self, 'dictdict'):
             for dict in self.dictdict.values():
@@ -1194,21 +1337,21 @@ class CdmsFile(CdmsObj, cuDataset):
         self._file_.close()
         self._status_ = 'closed'
 
-##  Note: Removed to allow garbage collection of reference cycles
-##     def __del__(self):
-##         if cdmsobj._debug==1:
-##             print 'Deleting file',self.id
-##         # If the object has been deallocated due to open error,
-##         # it will not have an attribute .dictdict
-##         if hasattr(self,"dictdict") and self.dictdict != {}:
-##             self.close()
+# Note: Removed to allow garbage collection of reference cycles
+# def __del__(self):
+# if cdmsobj._debug==1:
+# print 'Deleting file',self.id
+# If the object has been deallocated due to open error,
+# it will not have an attribute .dictdict
+# if hasattr(self,"dictdict") and self.dictdict != {}:
+# self.close()
 
     # Create an axis
     # 'name' is the string name of the Axis
     # 'ar' is the 1-D data array, or None for an unlimited axis
     # Set unlimited to true to designate the axis as unlimited
     # Return an axis object.
-    def createAxis(self,name,ar,unlimited=0):
+    def createAxis(self, name, ar, unlimited=0):
         """
         Create an axis
         'name' is the string name of the Axis
@@ -1227,36 +1370,36 @@ class CdmsFile(CdmsObj, cuDataset):
         axis :: (cdms2.axis.FileAxis) (0) file axis whose id is name
         :::
         """
-        if self._status_=="closed":
+        if self._status_ == "closed":
             raise CDMSError(FileWasClosed + self.id)
         cufile = self._file_
-        if ar is None or (unlimited==1 and getNetcdfUseParallelFlag()==0):
-            cufile.createDimension(name,None)
+        if ar is None or (unlimited == 1 and getNetcdfUseParallelFlag() == 0):
+            cufile.createDimension(name, None)
             if ar is None:
                 typecode = numpy.float
             else:
                 typecode = ar.dtype.char
         else:
-            cufile.createDimension(name,len(ar))
+            cufile.createDimension(name, len(ar))
             typecode = ar.dtype.char
 
         # Compatibility: revert to old typecode for cdunif
         typecode = typeconv.oldtypecodes[typecode]
-        cuvar = cufile.createVariable(name,typecode,(name,))
+        cuvar = cufile.createVariable(name, typecode, (name,))
 
         # Cdunif should really create this extra dimension info:
         #   (units,typecode,filename,varname_local,dimension_type,ncid)
-        cufile.dimensioninfo[name] = ('',typecode,name,'','global',-1)
+        cufile.dimensioninfo[name] = ('', typecode, name, '', 'global', -1)
 
         # Note: like netCDF-3, cdunif does not support 64-bit integers.
         # If ar has dtype int64 on a 64-bit machine, cuvar will be a 32-bit int,
         # and ar must be downcast.
         if ar is not None:
-            if ar.dtype.char!='l':
+            if ar.dtype.char != 'l':
                 cuvar[0:len(ar)] = numpy.ma.filled(ar)
             else:
                 cuvar[0:len(ar)] = numpy.ma.filled(ar).astype(cuvar.typecode())
-        axis = FileAxis(self,name,cuvar)
+        axis = FileAxis(self, name, cuvar)
         self.axes[name] = axis
         return axis
 
@@ -1273,23 +1416,24 @@ class CdmsFile(CdmsObj, cuDataset):
         :::
         Input:::
         name :: (str) (0) dimension name
-        axislen :: (int) (1) 
+        axislen :: (int) (1)
         :::
         Output:::
         axis :: (cdms2.axis.FileVirtualAxis) (0) file axis whose id is name
         :::
         """
-        if self._status_=="closed":
+        if self._status_ == "closed":
             raise CDMSError(FileWasClosed + self.id)
         cufile = self._file_
         cufile.createDimension(name, axislen)
-        cufile.dimensioninfo[name] = ('','f',name,'','global',-1)
+        cufile.dimensioninfo[name] = ('', 'f', name, '', 'global', -1)
         axis = FileVirtualAxis(self, name, axislen)
         self.axes[name] = axis
         return axis
 
     # Copy axis description and data from another axis
-    def copyAxis(self, axis, newname=None, unlimited=0, index=None, extbounds=None):
+    def copyAxis(self, axis, newname=None,
+                 unlimited=0, index=None, extbounds=None):
         """
         Copy axis description and data from another axis
         :::
@@ -1306,24 +1450,25 @@ class CdmsFile(CdmsObj, cuDataset):
         axis :: (cdms2.axis.FileAxis/cdms2.axis.FileVirtualAxis) (0) copy of input axis
         :::
         """
-        if newname is None: newname=axis.id
+        if newname is None:
+            newname = axis.id
 
         # If the axis already exists and has the same values, return existing
-        if self.axes.has_key(newname):
+        if newname in self.axes:
             newaxis = self.axes[newname]
             if newaxis.isVirtual():
-                if len(axis)!=len(newaxis):
-                    raise DuplicateAxisError(DuplicateAxis+newname)
-            elif unlimited==0 or (unlimited==1 and getNetcdfUseParallelFlag()!=0):
-                if len(axis)!=len(newaxis) or numpy.alltrue(numpy.less(numpy.absolute(newaxis[:]-axis[:]),1.e-5))==0:
-                    raise DuplicateAxisError(DuplicateAxis+newname)
+                if len(axis) != len(newaxis):
+                    raise DuplicateAxisError(DuplicateAxis + newname)
+            elif unlimited == 0 or (unlimited == 1 and getNetcdfUseParallelFlag() != 0):
+                if len(axis) != len(newaxis) or numpy.alltrue(numpy.less(numpy.absolute(newaxis[:] - axis[:]), 1.e-5)) == 0:
+                    raise DuplicateAxisError(DuplicateAxis + newname)
             else:
                 if index is None:
-                    isoverlap, index = isOverlapVector(axis[:],newaxis[:])
+                    isoverlap, index = isOverlapVector(axis[:], newaxis[:])
                 else:
                     isoverlap = 1
                 if isoverlap:
-                    newaxis[index:index+len(axis)] = axis[:]
+                    newaxis[index:index + len(axis)] = axis[:]
                     if extbounds is None:
                         axisBounds = axis.getBounds()
                     else:
@@ -1331,7 +1476,7 @@ class CdmsFile(CdmsObj, cuDataset):
                     if axisBounds is not None:
                         newaxis.setBounds(axisBounds)
                 else:
-                    raise DuplicateAxisError(DuplicateAxis+newname)
+                    raise DuplicateAxisError(DuplicateAxis + newname)
 
         elif axis.isVirtual():
             newaxis = self.createVirtualAxis(newname, len(axis))
@@ -1346,8 +1491,8 @@ class CdmsFile(CdmsObj, cuDataset):
                 else:
                     boundsid = None
                 newaxis.setBounds(bounds, persistent=1, boundsid=boundsid)
-            for attname,attval in axis.attributes.items():
-                if attname not in ["datatype", "id","length","isvar","name_in_file","partition"]:
+            for attname, attval in axis.attributes.items():
+                if attname not in ["datatype", "id", "length", "isvar", "name_in_file", "partition"]:
                     setattr(newaxis, attname, attval)
         return newaxis
 
@@ -1393,7 +1538,7 @@ class CdmsFile(CdmsObj, cuDataset):
         :::
         """
         if newname is None:
-            if hasattr(grid,'id'):
+            if hasattr(grid, 'id'):
                 newname = grid.id
             else:
                 newname = 'Grid'
@@ -1410,20 +1555,26 @@ class CdmsFile(CdmsObj, cuDataset):
         lon.designateLongitude(persistent=1)
 
         # If the grid name already exists, and is the same, just return it
-        if self.grids.has_key(newname):
+        if newname in self.grids:
             newgrid = self.grids[newname]
             newlat = newgrid.getLatitude()
             newlon = newgrid.getLongitude()
             if ((newlat is not lat) or
                 (newlon is not lon) or
                 (newgrid.getOrder() != grid.getOrder()) or
-                (newgrid.getType() != grid.getType())):
+                    (newgrid.getType() != grid.getType())):
                 raise DuplicateGrid(newname)
 
         # else create a new grid and copy metadata
         else:
             newmask = grid.getMask()    # Get the mask array
-            newgrid = self.createRectGrid(newname, lat, lon, grid.getOrder(), grid.getType(), None)
+            newgrid = self.createRectGrid(
+                newname,
+                lat,
+                lon,
+                grid.getOrder(),
+                grid.getType(),
+                None)
             newgrid.setMask(newmask)    # Set the mask array, non-persistently
             for attname in grid.attributes.keys():
                 setattr(newgrid, attname, getattr(grid, attname))
@@ -1436,7 +1587,7 @@ class CdmsFile(CdmsObj, cuDataset):
     # 'axesOrGrids' is a list of axes, grids. (Note: this should be
     #   generalized to allow subintervals of axes and/or grids)
     # Return a variable object.
-    def createVariable(self,name,datatype,axesOrGrids,fill_value=None):
+    def createVariable(self, name, datatype, axesOrGrids, fill_value=None):
         """
         Create a variable
         'name' is the string name of the Variable
@@ -1456,7 +1607,7 @@ class CdmsFile(CdmsObj, cuDataset):
         axis :: (cdms2.fvariable.FileVariable) (0) file variable
         :::
         """
-        if self._status_=="closed":
+        if self._status_ == "closed":
             raise CDMSError(FileWasClosed + self.id)
         cufile = self._file_
         if datatype in CdDatatypes:
@@ -1464,75 +1615,77 @@ class CdmsFile(CdmsObj, cuDataset):
         else:
             numericType = datatype
 
-        #dimensions = map(lambda x: x.id, axes)
+        # dimensions = map(lambda x: x.id, axes)
         # Make a list of names of axes for _Cdunif
         dimensions = []
         for obj in axesOrGrids:
             if isinstance(obj, FileAxis):
                 dimensions.append(obj.id)
             elif isinstance(obj, FileRectGrid):
-                dimensions = dimensions + [obj.getAxis(0).id, obj.getAxis(1).id]
+                dimensions = dimensions + \
+                    [obj.getAxis(0).id, obj.getAxis(1).id]
             else:
                 raise InvalidDomain
 
         try:
             # Compatibility: revert to old typecode for cdunif
             numericType = typeconv.oldtypecodes[numericType]
-            cuvar = cufile.createVariable(name,numericType,tuple(dimensions))
-        except Exception,err:
+            cuvar = cufile.createVariable(name, numericType, tuple(dimensions))
+        except Exception as err:
             print err
-            raise CDMSError("Creating variable "+name)
-        var = FileVariable(self,name,cuvar)
+            raise CDMSError("Creating variable " + name)
+        var = FileVariable(self, name, cuvar)
         var.initDomain(self.axes)
         self.variables[name] = var
-        if fill_value is not None: var.setMissing(fill_value)
+        if fill_value is not None:
+            var.setMissing(fill_value)
         return var
 
     # Create a variable from an existing variable, and copy the metadata
-##     def createVariableCopy(self, var, newname=None):
+# def createVariableCopy(self, var, newname=None):
 
-##         if newname is None: newname=var.id
-##         if self.variables.has_key(newname):
-##             raise DuplicateVariable(newname)
+# if newname is None: newname=var.id
+# if self.variables.has_key(newname):
+# raise DuplicateVariable(newname)
 
 
-##         # Create axes if necessary
-##         axislist = []
-##         for (axis,start,length,true_length) in var.getDomain():
-##             try:
-##                 newaxis = self.copyAxis(axis)
-##             except DuplicateAxisError:
+# Create axes if necessary
+# axislist = []
+# for (axis,start,length,true_length) in var.getDomain():
+# try:
+# newaxis = self.copyAxis(axis)
+# except DuplicateAxisError:
 
-##                 # Create a unique axis name
-##                 setit = 0
-##                 for i in range(97,123): # Lower-case letters
-##                     try:
-##                         newaxis = self.copyAxis(axis,axis.id+'_'+chr(i))
-##                         setit = 1
-##                         break
-##                     except DuplicateAxisError:
-##                         continue
+# Create a unique axis name
+# setit = 0
+# for i in range(97,123): # Lower-case letters
+# try:
+# newaxis = self.copyAxis(axis,axis.id+'_'+chr(i))
+# setit = 1
+# break
+# except DuplicateAxisError:
+# continue
 
-##                 if setit==0: raise DuplicateAxisError(DuplicateAxis+axis.id)
+# if setit==0: raise DuplicateAxisError(DuplicateAxis+axis.id)
 
-##             axislist.append(newaxis)
+# axislist.append(newaxis)
 
-##         # Create the new variable
-##         datatype = cdmsNode.NumericToCdType.get(var.dtype.char)
-##         newvar = self.createVariable(newname, datatype, axislist)
+# Create the new variable
+# datatype = cdmsNode.NumericToCdType.get(var.dtype.char)
+# newvar = self.createVariable(newname, datatype, axislist)
 
-##         # Copy variable metadata
-##         for attname in var.attributes.keys():
-##             if attname not in ["id", "datatype"]:
-##                 setattr(newvar, attname, getattr(var, attname))
+# Copy variable metadata
+# for attname in var.attributes.keys():
+# if attname not in ["id", "datatype"]:
+# setattr(newvar, attname, getattr(var, attname))
 
-##         return newvar
+# return newvar
 
     # Search for a pattern in a string-valued attribute. If attribute is None,
     # search all string attributes. If tag is 'cdmsFile', just check the dataset,
     # else check all nodes in the dataset of class type matching the tag. If tag
     # is None, search the dataset and all objects contained in it.
-    def searchPattern(self,pattern,attribute,tag):
+    def searchPattern(self, pattern, attribute, tag):
         """
         Search for a pattern in a string-valued attribute. If attribute is None, search all string attributes. If tag is not None, it must match the internal node tag.
         :::
@@ -1542,26 +1695,26 @@ class CdmsFile(CdmsObj, cuDataset):
         tag :: (str/None) (2) node tag
         :::
         Output:::
-        result :: (list) (0) 
+        result :: (list) (0)
         :::
         """
         resultlist = []
         if tag is not None:
             tag = tag.lower()
-        if tag in ('cdmsFile',None,'dataset'):
-            if self.searchone(pattern,attribute)==1:
+        if tag in ('cdmsFile', None, 'dataset'):
+            if self.searchone(pattern, attribute) == 1:
                 resultlist = [self]
             else:
                 resultlist = []
         if tag is None:
             for dict in self.dictdict.values():
                 for obj in dict.values():
-                    if obj.searchone(pattern,attribute):
+                    if obj.searchone(pattern, attribute):
                         resultlist.append(obj)
-        elif tag not in ('cdmsFile','dataset'):
+        elif tag not in ('cdmsFile', 'dataset'):
             dict = self.dictdict[tag]
             for obj in dict.values():
-                if obj.searchone(pattern,attribute):
+                if obj.searchone(pattern, attribute):
                     resultlist.append(obj)
         return resultlist
 
@@ -1569,7 +1722,7 @@ class CdmsFile(CdmsObj, cuDataset):
     # search all string attributes. If tag is 'cdmsFile', just check the dataset,
     # else check all nodes in the dataset of class type matching the tag. If tag
     # is None, search the dataset and all objects contained in it.
-    def matchPattern(self,pattern,attribute,tag):
+    def matchPattern(self, pattern, attribute, tag):
         """
         Match for a pattern in a string-valued attribute. If attribute is None, search all string attributes. If tag is not None, it must match the internal node tag.
         :::
@@ -1579,26 +1732,26 @@ class CdmsFile(CdmsObj, cuDataset):
         tag :: (str/None) (2) node tag
         :::
         Output:::
-        result :: (list) (0) 
+        result :: (list) (0)
         :::
         """
         resultlist = []
         if tag is not None:
             tag = tag.lower()
-        if tag in ('cdmsFile',None,'dataset'):
-            if self.matchone(pattern,attribute)==1:
+        if tag in ('cdmsFile', None, 'dataset'):
+            if self.matchone(pattern, attribute) == 1:
                 resultlist = [self]
             else:
                 resultlist = []
         if tag is None:
             for dict in self.dictdict.values():
                 for obj in dict.values():
-                    if obj.matchone(pattern,attribute):
+                    if obj.matchone(pattern, attribute):
                         resultlist.append(obj)
-        elif tag not in ('cdmsFile','dataset'):
+        elif tag not in ('cdmsFile', 'dataset'):
             dict = self.dictdict[tag]
             for obj in dict.values():
-                if obj.matchone(pattern,attribute):
+                if obj.matchone(pattern, attribute):
                     resultlist.append(obj)
         return resultlist
 
@@ -1609,7 +1762,7 @@ class CdmsFile(CdmsObj, cuDataset):
     # If 'variable', 'axis', etc., it is applied only to that type of object
     # in the dataset. If None, it is applied to all objects, including
     # the dataset itself.
-    def searchPredicate(self,predicate,tag):
+    def searchPredicate(self, predicate, tag):
         """
         Apply a truth-valued predicate. Return a list containing a single instance: [self] if the predicate is true and either tag is None or matches the object node tag. If the predicate returns false, return an empty list
         :::
@@ -1618,15 +1771,15 @@ class CdmsFile(CdmsObj, cuDataset):
         tag :: (str/None) (1) node tag
         :::
         Output:::
-        result :: (list) (0) 
+        result :: (list) (0)
         :::
         """
         resultlist = []
         if tag is not None:
             tag = tag.lower()
-        if tag in ('cdmsFile',None,'dataset'):
+        if tag in ('cdmsFile', None, 'dataset'):
             try:
-                if apply(predicate,(self,))==1:
+                if predicate(*(self,)) == 1:
                     resultlist.append(self)
             except AttributeError:
                 pass
@@ -1634,21 +1787,22 @@ class CdmsFile(CdmsObj, cuDataset):
             for dict in self.dictdict.values():
                 for obj in dict.values():
                     try:
-                        if apply(predicate,(obj,))==1:
+                        if predicate(*(obj,)) == 1:
                             resultlist.append(obj)
                     except AttributeError:
                         pass
-        elif tag not in ('dataset','cdmsFile'):
+        elif tag not in ('dataset', 'cdmsFile'):
             dict = self.dictdict[tag]
             for obj in dict.values():
                 try:
-                    if apply(predicate,(obj,))==1:
+                    if predicate(*(obj,)) == 1:
                         resultlist.append(obj)
                 except:
                     pass
         return resultlist
 
-    def createVariableCopy(self, var, id=None, attributes=None, axes=None, extbounds=None,
+    def createVariableCopy(
+        self, var, id=None, attributes=None, axes=None, extbounds=None,
                               extend=0, fill_value=None, index=None, newname=None, grid=None):
         """Define a new variable, with the same axes and attributes as in <var>.
         This does not copy the data itself.
@@ -1684,10 +1838,10 @@ class CdmsFile(CdmsObj, cuDataset):
         :::
         """
         if newname is None:
-            newname=var.id
+            newname = var.id
         if id is not None:
             newname = id
-        if self.variables.has_key(newname):
+        if newname in self.variables:
             raise DuplicateVariable(newname)
 
         # Determine the extended axis name if any
@@ -1696,12 +1850,12 @@ class CdmsFile(CdmsObj, cuDataset):
         else:
             sourceAxislist = axes
 
-        if var.rank()==0:      # scalars are not extensible
+        if var.rank() == 0:      # scalars are not extensible
             extend = 0
-            
-        if extend in (1,None):
+
+        if extend in (1, None):
             firstAxis = sourceAxislist[0]
-            if firstAxis is not None and (extend==1 or firstAxis.isTime()):
+            if firstAxis is not None and (extend == 1 or firstAxis.isTime()):
                 extendedAxis = firstAxis.id
             else:
                 extendedAxis = None
@@ -1711,24 +1865,31 @@ class CdmsFile(CdmsObj, cuDataset):
         # Create axes if necessary
         axislist = []
         for axis in sourceAxislist:
-            if extendedAxis is None or axis.id!=extendedAxis:
+            if extendedAxis is None or axis.id != extendedAxis:
                 try:
                     newaxis = self.copyAxis(axis)
                 except DuplicateAxisError:
 
                     # Create a unique axis name
                     setit = 0
-                    for i in range(97,123): # Lower-case letters
+                    for i in range(97, 123):  # Lower-case letters
                         try:
-                            newaxis = self.copyAxis(axis,axis.id+'_'+chr(i))
+                            newaxis = self.copyAxis(
+                                axis,
+                                axis.id + '_' + chr(i))
                             setit = 1
                             break
                         except DuplicateAxisError:
                             continue
 
-                    if setit==0: raise DuplicateAxisError(DuplicateAxis+axis.id)
+                    if setit == 0:
+                        raise DuplicateAxisError(DuplicateAxis + axis.id)
             else:
-                newaxis = self.copyAxis(axis, unlimited=1, index=index, extbounds=extbounds)
+                newaxis = self.copyAxis(
+                    axis,
+                    unlimited=1,
+                    index=index,
+                    extbounds=extbounds)
 
             axislist.append(newaxis)
 
@@ -1736,25 +1897,29 @@ class CdmsFile(CdmsObj, cuDataset):
         if attributes is None:
             attributes = var.attributes
             try:
-                attributes['missing_value']=var.missing_value
-            except Exception,err:
+                attributes['missing_value'] = var.missing_value
+            except Exception as err:
                 print err
                 pass
             try:
                 if fill_value is None:
-                    if( '_FillValue' in attributes.keys() ):
-                       attributes['_FillValue']=numpy.array(var._FillValue).astype(var.dtype)
-                       attributes['missing_value']=numpy.array(var._FillValue).astype(var.dtype)
-                    if( 'missing_value' in attributes.keys() ):
-                       attributes['_FillValue']=numpy.array(var.missing_value).astype(var.dtype)
-                       attributes['missing_value']=numpy.array(var.missing_value).astype(var.dtype)
+                    if('_FillValue' in attributes.keys()):
+                        attributes['_FillValue'] = numpy.array(
+                            var._FillValue).astype(var.dtype)
+                        attributes['missing_value'] = numpy.array(
+                            var._FillValue).astype(var.dtype)
+                    if('missing_value' in attributes.keys()):
+                        attributes['_FillValue'] = numpy.array(
+                            var.missing_value).astype(var.dtype)
+                        attributes['missing_value'] = numpy.array(
+                            var.missing_value).astype(var.dtype)
                 else:
-                    attributes['_FillValue']=fill_value
-                    attributes['missing_value']=fill_value
+                    attributes['_FillValue'] = fill_value
+                    attributes['missing_value'] = fill_value
             except:
                 pass
-            if attributes.has_key("name"):
-                if attributes['name']!=var.id:
+            if "name" in attributes:
+                if attributes['name'] != var.id:
                     del(attributes['name'])
 
         # Create grid as necessary
@@ -1763,7 +1928,7 @@ class CdmsFile(CdmsObj, cuDataset):
         if grid is not None:
             coords = grid.writeToFile(self)
             if coords is not None:
-                coordattr = "%s %s"%(coords[0].id, coords[1].id)
+                coordattr = "%s %s" % (coords[0].id, coords[1].id)
                 if attributes is None:
                     attributes = {'coordinates': coordattr}
                 else:
@@ -1772,19 +1937,19 @@ class CdmsFile(CdmsObj, cuDataset):
         # Create the new variable
         datatype = cdmsNode.NumericToCdType.get(var.typecode())
         newvar = self.createVariable(newname, datatype, axislist)
-        for attname,attval in attributes.items():
+        for attname, attval in attributes.items():
             if attname not in ["id", "datatype", "parent"]:
                 setattr(newvar, attname, attval)
                 if (attname == "_FillValue") or (attname == "missing_value"):
-                   setattr(newvar, "_FillValue", attval)
-                   setattr(newvar, "missing_value", attval)
+                    setattr(newvar, "_FillValue", attval)
+                    setattr(newvar, "missing_value", attval)
 
         if fill_value is not None:
             newvar.setMissing(fill_value)
 
         return newvar
 
-    def write(self, var, attributes=None, axes=None, extbounds=None, id=None, \
+    def write(self, var, attributes=None, axes=None, extbounds=None, id=None,
               extend=None, fill_value=None, index=None, typecode=None, dtype=None, pack=False):
         """Write var to the file. If the variable is not yet defined in the file,
         a definition is created. By default, the time dimension of the variable is defined as the
@@ -1825,15 +1990,17 @@ class CdmsFile(CdmsObj, cuDataset):
         :::
         """
         if _showCompressWarnings:
-            if  (Cdunif.CdunifGetNCFLAGS("shuffle")!=0) or (Cdunif.CdunifGetNCFLAGS("deflate")!=0) or (Cdunif.CdunifGetNCFLAGS("deflate_level")!=0):
+            if (Cdunif.CdunifGetNCFLAGS("shuffle") != 0) or (Cdunif.CdunifGetNCFLAGS("deflate") != 0) or (Cdunif.CdunifGetNCFLAGS("deflate_level") != 0):
                 import warnings
-                warnings.warn("Files are written with compression and shuffling\nYou can query different values of compression using the functions:\ncdms2.getNetcdfShuffleFlag() returning 1 if shuffling is enabled, 0 otherwise\ncdms2.getNetcdfDeflateFlag() returning 1 if deflate is used, 0 otherwise\ncdms2.getNetcdfDeflateLevelFlag() returning the level of compression for the deflate method\n\nIf you want to turn that off or set different values of compression use the functions:\nvalue = 0\ncdms2.setNetcdfShuffleFlag(value) ## where value is either 0 or 1\ncdms2.setNetcdfDeflateFlag(value) ## where value is either 0 or 1\ncdms2.setNetcdfDeflateLevelFlag(value) ## where value is a integer between 0 and 9 included\n\nTurning all values to 0 will produce NetCDF3 Classic files\nTo Force NetCDF4 output with classic format and no compressing use:\ncdms2.setNetcdf4Flag(1)\nNetCDF4 file with no shuffling or defalte and noclassic will be open for parallel i/o",Warning)
-                
+                warnings.warn(
+                    "Files are written with compression and shuffling\nYou can query different values of compression using the functions:\ncdms2.getNetcdfShuffleFlag() returning 1 if shuffling is enabled, 0 otherwise\ncdms2.getNetcdfDeflateFlag() returning 1 if deflate is used, 0 otherwise\ncdms2.getNetcdfDeflateLevelFlag() returning the level of compression for the deflate method\n\nIf you want to turn that off or set different values of compression use the functions:\nvalue = 0\ncdms2.setNetcdfShuffleFlag(value) ## where value is either 0 or 1\ncdms2.setNetcdfDeflateFlag(value) ## where value is either 0 or 1\ncdms2.setNetcdfDeflateLevelFlag(value) ## where value is a integer between 0 and 9 included\n\nTurning all values to 0 will produce NetCDF3 Classic files\nTo Force NetCDF4 output with classic format and no compressing use:\ncdms2.setNetcdf4Flag(1)\nNetCDF4 file with no shuffling or defalte and noclassic will be open for parallel i/o",
+                    Warning)
+
         # Make var an AbstractVariable
         if dtype is None and typecode is not None:
             dtype = typeconv.convtypecode2(typecode)
         typecode = dtype
-        if typecode is not None and var.dtype.char!=typecode:
+        if typecode is not None and var.dtype.char != typecode:
             var = var.astype(typecode)
         var = asVariable(var, writeable=0)
 
@@ -1842,25 +2009,26 @@ class CdmsFile(CdmsObj, cuDataset):
             varid = var.id
         else:
             varid = id
-        if self.variables.has_key(varid):
+        if varid in self.variables:
             if pack:
-              raise CDMSError("You cannot pack an existing variable %s " % varid)
+                raise CDMSError(
+                    "You cannot pack an existing variable %s " %
+                    varid)
             v = self.variables[varid]
         else:
-          if pack is not False:
-              typ = numpy.int16
-              n = 16
-          else:
-            typ = var.dtype
-          v = self.createVariableCopy(var.astype(typ), attributes=attributes, axes=axes, extbounds=extbounds,
-              id=varid, extend=extend, fill_value=fill_value, index=index)
-
-
+            if pack is not False:
+                typ = numpy.int16
+                n = 16
+            else:
+                typ = var.dtype
+            v = self.createVariableCopy(
+                var.astype(typ), attributes=attributes, axes=axes, extbounds=extbounds,
+                id=varid, extend=extend, fill_value=fill_value, index=index)
 
         # If var has typecode numpy.int, and v is created from var, then v will have
         # typecode numpy.int32. (This is a Cdunif 'feature'). This causes a downcast error
         # for numpy versions 23+, so make the downcast explicit.
-        if var.typecode()==numpy.int and v.typecode()==numpy.int32 and pack is False:
+        if var.typecode() == numpy.int and v.typecode() == numpy.int32 and pack is False:
             var = var.astype(numpy.int32)
 
         # Write
@@ -1870,21 +2038,22 @@ class CdmsFile(CdmsObj, cuDataset):
             sourceAxislist = axes
 
         vrank = var.rank()
-        if vrank==0:      # scalars are not extensible
+        if vrank == 0:      # scalars are not extensible
             extend = 0
         else:
             vec1 = sourceAxislist[0]
-            
-        if extend==0 or (extend is None and not vec1.isTime()):
-            if vrank>0:
+
+        if extend == 0 or (extend is None and not vec1.isTime()):
+            if vrank > 0:
                 if pack is not False:
-                  v[:] = numpy.zeros(var.shape,typ)
+                    v[:] = numpy.zeros(var.shape, typ)
                 else:
-                  v[:] = var.astype(v.dtype)
+                    v[:] = var.astype(v.dtype)
             else:
                 v.assignValue(var.getValue())
         else:
-            # Determine if the first dimension of var overlaps the first dimension of v
+            # Determine if the first dimension of var overlaps the first
+            # dimension of v
             vec2 = v.getAxis(0)
             if extbounds is None:
                 bounds1 = vec1.getBounds()
@@ -1894,47 +2063,51 @@ class CdmsFile(CdmsObj, cuDataset):
                 isoverlap, index = isOverlapVector(vec1[:], vec2[:])
             else:
                 isoverlap = 1
-            if isoverlap==1:
-                v[index:index+len(vec1)] = var.astype(v.dtype)
-                vec2[index:index+len(vec1)] = vec1[:].astype(vec2[:].dtype)
+            if isoverlap == 1:
+                v[index:index + len(vec1)] = var.astype(v.dtype)
+                vec2[index:index + len(vec1)] = vec1[:].astype(vec2[:].dtype)
                 if bounds1 is not None:
                     vec2.setBounds(bounds1, persistent=1, index=index)
             else:
-                raise CDMSError('Cannot write variable %s: the values of dimension %s=%s, do not overlap the extended dimension %s values: %s'%(varid, vec1.id,`vec1[:]`,vec2.id,`vec2[:]`))
+                raise CDMSError(
+                    'Cannot write variable %s: the values of dimension %s=%s, do not overlap the extended dimension %s values: %s' %
+                    (varid, vec1.id, repr(vec1[:]), vec2.id, repr(vec2[:])))
 
-        # pack implementation source: https://www.unidata.ucar.edu/software/netcdf/docs/BestPractices.html
+        # pack implementation source:
+        # https://www.unidata.ucar.edu/software/netcdf/docs/BestPractices.html
         if pack:
-          M = var.max()
-          m = var.min()
-          scale_factor = (M-m)/(pow(2,n)-2)
-          add_offset = (M+m)/2.
-          missing = -pow(2,n-1)
-          v.setMissing(-pow(2,n-1))
-          scale_factor = scale_factor.astype(var.dtype)
-          add_offset = add_offset.astype(var.dtype)
-          tmp = (var-add_offset)/scale_factor
-          tmp= numpy.round(tmp)
-          tmp=tmp.astype(typ)
-          v[:] = tmp.filled()
-          v.scale_factor = scale_factor.astype(var.dtype)
-          v.add_offset = add_offset.astype(var.dtype)
-          if not hasattr(var,"valid_min"):
-            v.valid_min = m.astype(var.dtype)
-          if not hasattr(var,"valid_max"):
-            v.valid_max = M.astype(var.dtype)
+            M = var.max()
+            m = var.min()
+            scale_factor = (M - m) / (pow(2, n) - 2)
+            add_offset = (M + m) / 2.
+            missing = -pow(2, n - 1)
+            v.setMissing(-pow(2, n - 1))
+            scale_factor = scale_factor.astype(var.dtype)
+            add_offset = add_offset.astype(var.dtype)
+            tmp = (var - add_offset) / scale_factor
+            tmp = numpy.round(tmp)
+            tmp = tmp.astype(typ)
+            v[:] = tmp.filled()
+            v.scale_factor = scale_factor.astype(var.dtype)
+            v.add_offset = add_offset.astype(var.dtype)
+            if not hasattr(var, "valid_min"):
+                v.valid_min = m.astype(var.dtype)
+            if not hasattr(var, "valid_max"):
+                v.valid_max = M.astype(var.dtype)
         return v
 
-    def write_it_yourself( self, obj ):
+    def write_it_yourself(self, obj):
         """Tell obj to write itself to self (already open for writing), using its
         writeg method (AbstractCurveGrid has such a method, for example).  If no
         such method be available, writeToFile will be used.  If that is not
         available, then self.write(obj) will be called to try to write obj as
         a variable."""
-        # This method was formerly called writeg and just wrote an AbstractCurveGrid.
-        if ( hasattr(obj,'writeg') and callable(getattr(obj,'writeg')) ):
-            obj.writeg( self )
-        elif ( hasattr(obj,'writeToFile') and callable(getattr(obj,'writeToFile')) ):
-            obj.writeToFile( self )
+        # This method was formerly called writeg and just wrote an
+        # AbstractCurveGrid.
+        if (hasattr(obj, 'writeg') and callable(getattr(obj, 'writeg'))):
+            obj.writeg(self)
+        elif (hasattr(obj, 'writeToFile') and callable(getattr(obj, 'writeToFile'))):
+            obj.writeToFile(self)
         else:
             self.write(obj)
 
@@ -1947,7 +2120,7 @@ class CdmsFile(CdmsObj, cuDataset):
         :::
         Output:::
         variable :: (cdms2.fvariable.FileVariable/None) (0) file variable
-        :::        
+        :::
         """
         return self.variables.get(id)
 
@@ -1960,11 +2133,12 @@ class CdmsFile(CdmsObj, cuDataset):
         :::
         Output:::
         variables :: ([cdms2.fvariable.FileVariable]) (0) file variables
-        :::        
+        :::
 """
         retval = self.variables.values()
         if spatial:
-            retval = filter(lambda x: x.id[0:7]!="bounds_" and x.id[0:8]!="weights_" and ((x.getLatitude() is not None) or (x.getLongitude() is not None) or (x.getLevel() is not None)), retval)
+            retval = filter(lambda x: x.id[0:7] != "bounds_" and x.id[0:8] != "weights_" and (
+                (x.getLatitude() is not None) or (x.getLongitude() is not None) or (x.getLevel() is not None)), retval)
         return retval
 
     def getAxis(self, id):
@@ -1975,7 +2149,7 @@ class CdmsFile(CdmsObj, cuDataset):
         :::
         Output:::
         axis :: (cdms2.axis.FileAxis/None) (0) file axis
-        :::        
+        :::
         """
         return self.axes.get(id)
 
@@ -1988,11 +2162,11 @@ class CdmsFile(CdmsObj, cuDataset):
         :::
         Output:::
         grid :: (cdms2.hgrid.FileCurveGrid/cdms2.gengrid.FileGenericGrid/cdms2.grid.FileRectGrid/None) (0) file axis
-        :::        
+        :::
         """
         return self.grids.get(id)
 
-    def getBoundsAxis(self, n,boundid=None):
+    def getBoundsAxis(self, n, boundid=None):
         """Get a bounds axis of length n. Create the bounds axis if necessary.
         :::
         Input:::
@@ -2003,30 +2177,31 @@ class CdmsFile(CdmsObj, cuDataset):
         :::
         """
         if boundid is None:
-            if n==2:
+            if n == 2:
                 boundid = "bound"
             else:
-                boundid = "bound_%d"%n
-            
-        if self.axes.has_key(boundid):
+                boundid = "bound_%d" % n
+
+        if boundid in self.axes:
             boundaxis = self.axes[boundid]
         else:
             boundaxis = self.createVirtualAxis(boundid, n)
         return boundaxis
 
     def __repr__(self):
-        filerep = `self._file_`
+        filerep = repr(self._file_)
         loc = filerep.find("file")
-        if loc==-1: loc=0
-        return "<CDMS "+filerep[loc:-1]+", status: %s>"%self._status_
-
-## internattr.add_internal_attribute (CdmsFile, 'datapath',
-##                                             'variables',
-##                                             'axes',
-##                                             'grids',
-##                                             'xlinks',
-##                                             'dictdict',
-##                                             'default_variable_name',
-##                                             'id',
-##                                             'parent',
-##                                             'mode')
+        if loc == -1:
+            loc = 0
+        return "<CDMS " + filerep[loc:-1] + ", status: %s>" % self._status_
+
+# internattr.add_internal_attribute (CdmsFile, 'datapath',
+# 'variables',
+# 'axes',
+# 'grids',
+# 'xlinks',
+# 'dictdict',
+# 'default_variable_name',
+# 'id',
+# 'parent',
+# 'mode')
diff --git a/Packages/cdms2/Lib/error.py b/Packages/cdms2/Lib/error.py
index df73aa688..a8e3091b7 100644
--- a/Packages/cdms2/Lib/error.py
+++ b/Packages/cdms2/Lib/error.py
@@ -1,5 +1,7 @@
 "Error object for cdms module"
 
+
 class CDMSError (Exception):
-    def __init__ (self, args="Unspecified error from package cdms"):
+
+    def __init__(self, args="Unspecified error from package cdms"):
         self.args = (args,)
diff --git a/Packages/cdms2/Lib/forecast.py b/Packages/cdms2/Lib/forecast.py
index 0c08ab922..f3a6a6cd6 100644
--- a/Packages/cdms2/Lib/forecast.py
+++ b/Packages/cdms2/Lib/forecast.py
@@ -7,54 +7,58 @@ import cdms2
 import copy
 from cdms2 import CDMSError
 
-def two_times_from_one( t ):
+
+def two_times_from_one(t):
     """Input is a time representation, either as the long int used in the cdscan
     script, or a string in the format "2010-08-25 15:26:00", or as a cdtime comptime
     (component time) object.
     Output is the same time, both as a long _and_ as a comptime."""
-    if t==0:
-        t = 0L
-    if isinstance(t,str):
+    if t == 0:
+        t = 0
+    if isinstance(t, str):
         t = cdtime.s2c(t)
-    if (isinstance(t,long) or isinstance(t,int)) and t>1000000000L :
+    if (isinstance(t, long) or isinstance(t, int)) and t > 1000000000:
         tl = t
-        year = tl / 1000000000L
-        rem =  tl % 1000000000L
-        month = rem / 10000000L
-        rem =   rem % 10000000L
-        day =     rem / 100000
+        year = tl / 1000000000
+        rem = tl % 1000000000
+        month = rem / 10000000
+        rem = rem % 10000000
+        day = rem / 100000
         allsecs = rem % 100000
-        sec =     allsecs%60
-        allmins = allsecs/60
-        min =  allmins%60
-        hour = allmins/60
-        tc = cdtime.comptime(year,month,day,hour,min,sec)
+        sec = allsecs % 60
+        allmins = allsecs / 60
+        min = allmins % 60
+        hour = allmins / 60
+        tc = cdtime.comptime(year, month, day, hour, min, sec)
     else:
         # I'd like to check that t is type comptime, but although Python
         # prints the type as <type 'comptime'> it won't recognize as a type
         # comptime or anything similar.  Note that cdtime.comptime is a C
         # function available from Python.
         tc = t
-        tl = tc.year * 1000000000L
-        tl += tc.month * 10000000L
-        tl += tc.day   * 100000
+        tl = tc.year * 1000000000
+        tl += tc.month * 10000000
+        tl += tc.day * 100000
         tl += tc.hour * 3600
-        tl += tc.minute *60
+        tl += tc.minute * 60
         tl += tc.second.__int__()
-    return tl,tc
+    return tl, tc
+
 
-def comptime( t ):
+def comptime(t):
     """Input is a time representation, either as the long int used in the cdscan
     script, or a string in the format "2010-08-25 15:26:00", or as a cdtime comptime
     (component time) object.
     Output is the same time a cdtime.comptime (component time)."""
-    tl,tc = two_times_from_one( t )
+    tl, tc = two_times_from_one(t)
     return tc
 
+
 class forecast():
+
     """represents a forecast starting at a single time"""
 
-    def __init__( self, tau0time, dataset_list, path="." ):
+    def __init__(self, tau0time, dataset_list, path="."):
         """tau0time is the first time of the forecast, i.e. the time at which tau=0.
         dataset_list is used to get the forecast file from the forecast time.
         Each list item should look like this example:
@@ -65,33 +69,33 @@ class forecast():
         N.B.  This is like a CdmsFile.  Creating a forecast means opening a file,
         so later on you should call forecast.close() to close it.
         """
-        self.fctl, self.fct = two_times_from_one( tau0time )
+        self.fctl, self.fct = two_times_from_one(tau0time)
 
-        filenames = [ l[5] for l in dataset_list if l[4]==self.fctl ]
-        if len(filenames)>0:
+        filenames = [l[5] for l in dataset_list if l[4] == self.fctl]
+        if len(filenames) > 0:
             filename = filenames[0]
         else:
-            raise CDMSError, "Cannot find filename for forecast %d"%self.fctl
+            raise CDMSError("Cannot find filename for forecast %d" % self.fctl)
         self.filename = path + '/' + filename
-        self.file = cdms2.open( self.filename )
+        self.file = cdms2.open(self.filename)
 
-    def close( self ):
+    def close(self):
         self.file.close()
 
-    def __call__( self, varname ):
+    def __call__(self, varname):
         """Reads the specified variable from this forecast's file."""
         return self.file(varname)
 
-    def __getitem__( self, varname ):
+    def __getitem__(self, varname):
         """Reads variable attributes from this forecast's file."""
         return self.file.__getitem__(varname)
 
     def __repr__(self):
-        return "<forecast from %s>"%(self.fct)
+        return "<forecast from %s>" % (self.fct)
     __str__ = __repr__
 
 
-def available_forecasts( dataset_file, path="." ):
+def available_forecasts(dataset_file, path="."):
     """Returns a list of forecasts (as their generating times) which are
     available through the specified cdscan-generated dataset xml file.
     The forecasts are given in 64-bit integer format, but can be converted
@@ -99,16 +103,18 @@ def available_forecasts( dataset_file, path="." ):
     This function may help in choosing the right arguments for initializing
     a "forecasts" (forecast set) object.
     """
-    dataset=cdms2.openDataset( dataset_file, dpath=path )
-    fm=cdms2.dataset.parseFileMap(dataset.cdms_filemap)
-    alltimesl =[ f[4] for f in fm[0][1] ]  # 64-bit (long) integers
+    dataset = cdms2.openDataset(dataset_file, dpath=path)
+    fm = cdms2.dataset.parseFileMap(dataset.cdms_filemap)
+    alltimesl = [f[4] for f in fm[0][1]]  # 64-bit (long) integers
     dataset.close()
     return alltimesl
 
+
 class forecasts():
+
     """represents a set of forecasts"""
 
-    def __init__( self, dataset_file, forecast_times, path="." ):
+    def __init__(self, dataset_file, forecast_times, path="."):
         """Creates a set of forecasts.  Normally you do it by something like
         f = forecasts( 'file.xml', (min_time, max_time) )
         or
@@ -117,9 +123,9 @@ class forecasts():
         f = forecasts( 'file.xml', [ time1, time2, time3, time4, time5 ] )
 
         where the two or three arguments are::
-        
+
         1. the name of a dataset xml file generated by "cdscan --forecast ..."
-        
+
         2. Times here are the times when the forecasts began (tau=0, aka reference time).
         (i) If you use a 2-item tuple, forecasts will be chosen which start at a time
         t between the min and max times, e.g. min_time <= t < max_time .
@@ -138,72 +144,78 @@ class forecasts():
         2006012300000 for the first second of January 23, 2006, or as
         component times (comptime) in the cdtime module, or as
         a string in the format "2010-08-25 15:26:00".
-        
+
         3. An optional path for the data files; use this if the xml file
         contains filenames without complete paths.
-         
+
         As for the forecast class, this opens files when initiated, so when you
         are finished with the forecasts, you should close the files by calling
         forecasts.close() .
         """
 
         # Create dataset_list to get a forecast file from each forecast time.
-        self.dataset=cdms2.openDataset( dataset_file, dpath=path )
-        fm=cdms2.dataset.parseFileMap(self.dataset.cdms_filemap)
-        self.alltimesl =[ f[4] for f in fm[0][1] ]  # 64-bit (long) integers
+        self.dataset = cdms2.openDataset(dataset_file, dpath=path)
+        fm = cdms2.dataset.parseFileMap(self.dataset.cdms_filemap)
+        self.alltimesl = [f[4] for f in fm[0][1]]  # 64-bit (long) integers
         dataset_list = fm[0][1]
         for f in fm[1:]:
             dataset_list.extend(f[1])
 
-        mytimesl = self.forecast_times_to_list( forecast_times )
+        mytimesl = self.forecast_times_to_list(forecast_times)
         if mytimesl == []:
-            raise CDMSError, "bad forecast_times argument to forecasts.__init__"
-        self.fcs = [ forecast( t, dataset_list, path ) for t in mytimesl ]
+            raise CDMSError(
+                "bad forecast_times argument to forecasts.__init__")
+        self.fcs = [forecast(t, dataset_list, path) for t in mytimesl]
 
-    def forecast_times_to_list( self, forecast_times ):
+    def forecast_times_to_list(self, forecast_times):
         """For internal list, translates a "forecast_times" argument of __init__ or
         other methods, into a list of times."""
-        if type(forecast_times) is tuple:
-            if len(forecast_times)<=2:
+        if isinstance(forecast_times, tuple):
+            if len(forecast_times) <= 2:
                 openclosed = 'co'
             else:
                 openclosed = forecast_times[2]
-            mytimesl = self.time_interval_to_list( forecast_times[0], forecast_times[1], openclosed )
+            mytimesl = self.time_interval_to_list(
+                forecast_times[
+                    0],
+                forecast_times[
+                    1],
+                openclosed)
             return mytimesl
-        elif type(forecast_times) is list:
+        elif isinstance(forecast_times, list):
             return forecast_times
         elif forecast_times == 'All':
             return self.alltimesl
         else:
             return []
 
-    def time_interval_to_list( self, tlo, thi, openclosed='co' ):
+    def time_interval_to_list(self, tlo, thi, openclosed='co'):
         """For internal use, translates a time interval to a list of times.
         """
-        if type(tlo) is not long:  # make tlo a long integer
-            tlo, tdummy = two_times_from_one( tlo )
-        if type(thi) is not long:  # make thi a long integer
-            thi, tdummy = two_times_from_one( thi )
+        if not isinstance(tlo, long):  # make tlo a long integer
+            tlo, tdummy = two_times_from_one(tlo)
+        if not isinstance(thi, long):  # make thi a long integer
+            thi, tdummy = two_times_from_one(thi)
         oclo = openclosed[0]
         ochi = openclosed[1]
-        if oclo=='c':
-            mytimesl = [ t for t in self.alltimesl if t>=tlo ]
+        if oclo == 'c':
+            mytimesl = [t for t in self.alltimesl if t >= tlo]
         else:
-            mytimesl = [ t for t in self.alltimesl if t>tlo ]
-        if ochi=='c':
-            mytimesl = [ t for t in mytimesl if t<=thi ]
+            mytimesl = [t for t in self.alltimesl if t > tlo]
+        if ochi == 'c':
+            mytimesl = [t for t in mytimesl if t <= thi]
         else:
-            mytimesl = [ t for t in mytimesl if t<thi ]
+            mytimesl = [t for t in mytimesl if t < thi]
         return mytimesl
 
-    def reduce_inplace( self, min_time, max_time, openclosed='co' ):
+    def reduce_inplace(self, min_time, max_time, openclosed='co'):
         """ For a forecasts object f, f( min_time, max_time ) will reduce the
         scope of f, to forecasts whose start time t has min_time<=t<max_time.
         This is done in place, i.e. any other forecasts in f will be discarded.
         If slice notation were possible for forecasts (it's not because we need
         too many bits to represent time), this function would do the same as
         f = f[min_time : max_time ]
-        
+
         The optional openclosed argument lets you specify the treatment of
         the endpoints min_time, max_time.  The first character should be 'c' if you want
         to include min_time in the new scope of f, or 'o' to exclude it.  Similarly,
@@ -215,15 +227,15 @@ class forecasts():
 
         Times can be the usual long integers, strings, or cdtime component times.
         """
-        mytimesl = self.time_interval_to_list( min_time, max_time, openclosed )
-        self.fcs = [ f for f in self.fcs if ( f.fctl in mytimesl ) ]
+        mytimesl = self.time_interval_to_list(min_time, max_time, openclosed)
+        self.fcs = [f for f in self.fcs if (f.fctl in mytimesl)]
 
-    def close( self ):
+    def close(self):
         self.dataset.close()
         for fc in self.fcs:
             fc.close()
 
-    def __call__( self, varname, forecast_times='All' ):
+    def __call__(self, varname, forecast_times='All'):
         """Reads the specified variable for all the specified forecasts.
         Creates and returns a new variable which is dimensioned by forecast
         as well as the original variable's dimensions.
@@ -247,55 +259,58 @@ class forecasts():
         if forecast_times == 'All':
             varfcs = self.fcs
         else:
-            mytimesl = self.forecast_times_to_list( forecast_times )
-            varfcs = [ f for f in self.fcs if ( f.fctl in mytimesl ) ]
-        vars = [ fc(varname) for fc in varfcs ]
+            mytimesl = self.forecast_times_to_list(forecast_times)
+            varfcs = [f for f in self.fcs if (f.fctl in mytimesl)]
+        vars = [fc(varname) for fc in varfcs]
 
         # Create the variable from the data, with mask:
         v0 = vars[0]
-        a = numpy.asarray([ v.data for v in vars ])
+        a = numpy.asarray([v.data for v in vars])
         if v0._mask == False:
             m = False
-            v = cdms2.tvariable.TransientVariable( a )
+            v = cdms2.tvariable.TransientVariable(a)
         else:
-            m = numpy.asarray([ v._mask for v in vars])
-            v = cdms2.tvariable.TransientVariable( a, mask=m, fill_value=v0._fill_value )
+            m = numpy.asarray([v._mask for v in vars])
+            v = cdms2.tvariable.TransientVariable(
+                a, mask=m, fill_value=v0._fill_value)
 
         # Domain-related attributes:
             # We get the tomain from __getitem__ to make sure that fcs[var] is consistent
             # with fcs(var)
-        fvd = self.__getitem__(varname,varfcs).domain
+        fvd = self.__getitem__(varname, varfcs).domain
         v._TransientVariable__domain = fvd
         # former domain code, not using __getitem:
         # ltvd = len(v0._TransientVariable__domain)
         # v._TransientVariable__domain[1:ltvd+1] = v0._TransientVariable__domain[0:ltvd]
-        # v._TransientVariable__domain[0] = self.forecast_axis( varname, varfcs )
-        if hasattr( v0, 'coordinates' ):
+        # v._TransientVariable__domain[0] = self.forecast_axis( varname, varfcs
+        # )
+        if hasattr(v0, 'coordinates'):
             v.coordinates = 'iforecast ' + v0.coordinates
 
         # Other attributes, all those for which I've seen nontrivial values in a
         # real example (btw, the _isfield one was wrong!) :
         # It would be better to do a list comprehension over v0.attribures.keys(),
-        # if I could be sure that that wouldn't transfer something inappropriate.
-        if hasattr( v0, 'id' ):
+        # if I could be sure that that wouldn't transfer something
+        # inappropriate.
+        if hasattr(v0, 'id'):
             v.id = v0.id
-        if hasattr( v0, 'long_name' ):
+        if hasattr(v0, 'long_name'):
             v.long_name = v0.long_name
-        if hasattr( v0, 'standard_name' ):
+        if hasattr(v0, 'standard_name'):
             v.standard_name = v0.standard_name
-        if hasattr( v0, 'base_name' ):
+        if hasattr(v0, 'base_name'):
             v.base_name = v0.base_name
-        if hasattr( v0, 'units' ):
+        if hasattr(v0, 'units'):
             v.units = v0.units
-        if hasattr( v0, '_isfield' ):
+        if hasattr(v0, '_isfield'):
             v._isfield = v0._isfield
         return v
 
-    def forecast_axis( self, varname, fcss=None ):
+    def forecast_axis(self, varname, fcss=None):
         """returns a tuple (axis,start,length,true_length) where axis is in the
         forecast direction.  If a list of forecasts be specified, the axis' data will
         be limited to them."""
-        if fcss==None:
+        if fcss is None:
             fcss = self.fcs
         axis = None
         domitem1 = None
@@ -304,7 +319,7 @@ class forecasts():
 
         var = self.dataset[varname]
         # ... var is a DatasetVariable, used here just for two of its domain's axes
-        dom = copy.deepcopy(getattr(var,'domain',[]))
+        dom = copy.deepcopy(getattr(var, 'domain', []))
         # ...this 'domain' attribute has an element with an axis, etc.
         # representing all forecasts; so we want to cut it down to match
         # those forecasts in fcss.
@@ -315,33 +330,33 @@ class forecasts():
             # axis is a axis.Axis and the rest of the tuple is int's.
             # I don't know what true_length is, but it doesn't seem to get used
             # anywhere, and is normally the same as length.
-            if getattr(domitem[0],'id',None)=='fctau0':
+            if getattr(domitem[0], 'id', None) == 'fctau0':
                 # Force the axis to match fcss :
                 # More precisely the long int times fcss[i].fctl should match
-                # the axis data. The axis partition and .length need changing too.
+                # the axis data. The axis partition and .length need changing
+                # too.
                 domitem1 = 0
                 domitem2 = len(fcss)
                 domitem3 = len(fcss)
                 axis = copy.copy(domitem[0])
-                axis._data_ = [ f.fctl for f in fcss ]
+                axis._data_ = [f.fctl for f in fcss]
                 axis.length = len(axis._data_)
                 axis.partition = axis.partition[0:axis.length]
                 axis.axis = 'F'
                 axis.standard_name = 'forecast_reference_time'
                 timeaxis = var.getTime()
-                if not hasattr(axis,'calendar') and timeaxis:
+                if not hasattr(axis, 'calendar') and timeaxis:
                     axis.calendar = timeaxis.calendar
-                
-        return ( axis, domitem1, domitem2, domitem3 )
 
+        return (axis, domitem1, domitem2, domitem3)
 
-    def __getitem__( self, varname, fccs=None ):
+    def __getitem__(self, varname, fccs=None):
         """returns whatever the forecast set has that matches the given
         attribute, normally a DatasetVariable.  The optional argument fccs
         is a list of forecasts to be passed on to forecast_axis().
         """
-        if type(varname) is not str :
-            raise CDMSError, "bad argument to forecasts[]"
+        if not isinstance(varname, str):
+            raise CDMSError("bad argument to forecasts[]")
 
         var = self.dataset[varname]
         # var is a DatasetVariable and consists of lots of attributes.
@@ -349,20 +364,19 @@ class forecasts():
         # The attribute which needs to be changed is 'domain' - it will normally
         # have an element with an axis, etc. representing all forecasts; so we
         # want to cut it down to match those forecasts in self.fcs.
-        dom = copy.deepcopy(getattr(var,'domain',[]))
+        dom = copy.deepcopy(getattr(var, 'domain', []))
         for i in range(len(dom)):
             domitem = dom[i]
-            if getattr(domitem[0],'id',None)=='fctau0':
-                dom[i] = self.forecast_axis(varname,fccs)
-        setattr(var,'domain',dom)
-                
+            if getattr(domitem[0], 'id', None) == 'fctau0':
+                dom[i] = self.forecast_axis(varname, fccs)
+        setattr(var, 'domain', dom)
+
         return var
 
     def __repr__(self):
         l = len(self.fcs)
-        if l==0:
+        if l == 0:
             return "<forecasts - None>"
         else:
-            return "<forecasts from %s,...,%s>"%(self.fcs[0].fct,self.fcs[l-1].fct)
+            return "<forecasts from %s,...,%s>" % (self.fcs[0].fct, self.fcs[l - 1].fct)
     __str__ = __repr__
-
diff --git a/Packages/cdms2/Lib/fvariable.py b/Packages/cdms2/Lib/fvariable.py
index 6ca32df15..2f41df8a6 100644
--- a/Packages/cdms2/Lib/fvariable.py
+++ b/Packages/cdms2/Lib/fvariable.py
@@ -1,32 +1,35 @@
-## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by 
-## Further modified to be pure new numpy June 24th 2008
+# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
+# Further modified to be pure new numpy June 24th 2008
 
 "CDMS File-based variables."
 import numpy
-import typeconv
+from . import typeconv
 import re
 
-from cdmsobj import Max32int
-from variable import DatasetVariable
-from error import CDMSError
-from sliceut import reverseSlice
-from avariable import AbstractVariable
+from .cdmsobj import Max32int
+from .variable import DatasetVariable
+from .error import CDMSError
+from .sliceut import reverseSlice
+from .avariable import AbstractVariable
 from cdms2 import Cdunif
 from Cdunif import CdunifError
 
 FileClosed = "Cannot read from closed file, variable: "
 FileClosedWrite = "Cannot write to a closed file, variable: "
 
+
 class FileVariable(DatasetVariable):
+
     "A variable in a single file."
-    def __init__(self,parent,varname,cdunifobj=None):
+
+    def __init__(self, parent, varname, cdunifobj=None):
         DatasetVariable.__init__(self, parent, varname)
         self._obj_ = cdunifobj
         if cdunifobj is not None:
             for attname, attval in cdunifobj.__dict__.items():
                 self.__dict__[attname] = attval
-                self.attributes[attname]=attval
-        val = self.__cdms_internals__+['name_in_file',]
+                self.attributes[attname] = attval
+        val = self.__cdms_internals__ + ['name_in_file', ]
         self.___cdms_internals__ = val
 
     # Initialize the domain
@@ -38,7 +41,7 @@ class FileVariable(DatasetVariable):
             start = 0
             length = len(axis)
             truelen = length
-            self.domain.append((axis,start,length,truelen))
+            self.domain.append((axis, start, length, truelen))
 
     def typecode(self):
         # Compatibility: convert to new typecode
@@ -46,43 +49,44 @@ class FileVariable(DatasetVariable):
         tc = typeconv.convtypecode2(tc).char
         return tc
 
-    def assignValue(self,data):
+    def assignValue(self, data):
         if self.parent is None:
-            raise CDMSError, FileClosedWrite+self.id
+            raise CDMSError(FileClosedWrite + self.id)
         if numpy.ma.isMaskedArray(data):
-          if data.mask is not numpy.ma.nomask and not numpy.ma.allclose(data.mask,0):
-            saveFill = data.fill_value
-            if self.getMissing() is None:
-                self.setMissing(saveFill)
-            else:
-                data.set_fill_value(self.getMissing())
+            if data.mask is not numpy.ma.nomask and not numpy.ma.allclose(data.mask, 0):
+                saveFill = data.fill_value
+                if self.getMissing() is None:
+                    self.setMissing(saveFill)
+                else:
+                    data.set_fill_value(self.getMissing())
         self._obj_.assignValue(numpy.ma.filled(data))
         if numpy.ma.isMaskedArray(data):
-          if data.mask is not numpy.ma.nomask and not numpy.ma.allclose(data.mask,0):
-            data.set_fill_value(saveFill)
+            if data.mask is not numpy.ma.nomask and not numpy.ma.allclose(data.mask, 0):
+                data.set_fill_value(saveFill)
 
-    def expertSlice (self, initslicelist):
+    def expertSlice(self, initslicelist):
         # Handle negative slices
-        revlist = []                    # Slices to apply to result if reversals needed
+        revlist = []
+            # Slices to apply to result if reversals needed
         slist = []                      # Slices with positive strides
         haveReversals = 0               # True iff result array needs reversing
-        i=0
+        i = 0
         for s in initslicelist:
-            if s.step<0:
+            if s.step < 0:
                 axislen = self.shape[i]
-                slist.append(reverseSlice(s,axislen))
-                revlist.append(slice(None,None,-1))
+                slist.append(reverseSlice(s, axislen))
+                revlist.append(slice(None, None, -1))
                 haveReversals = 1
             else:
                 slist.append(s)
-                revlist.append(slice(None,None,1))
+                revlist.append(slice(None, None, 1))
             i += 1
 
         if self.parent is None:
-            raise CDMSError, FileClosed+self.id
+            raise CDMSError(FileClosed + self.id)
         if self.rank() == 0:
             return self._obj_.getValue()
-        result = apply(self._obj_.getitem,slist)
+        result = self._obj_.getitem(*slist)
 
         # If slices with negative strides were input, apply the appropriate
         # reversals.
@@ -93,43 +97,43 @@ class FileVariable(DatasetVariable):
 
     def __setitem__(self, index, value):
         if self.parent is None:
-            raise CDMSError, FileClosedWrite+self.id
+            raise CDMSError(FileClosedWrite + self.id)
         if numpy.ma.isMaskedArray(value):
-          if value.mask is not numpy.ma.nomask and not numpy.ma.allclose(value.mask,0):
-            saveFill = value.fill_value
-            if self.getMissing() is None:
-                self.setMissing(saveFill)
-            else:
-                value.set_fill_value(self.getMissing())
-        apply(self._obj_.setitem,(index,numpy.ma.filled(value)))
+            if value.mask is not numpy.ma.nomask and not numpy.ma.allclose(value.mask, 0):
+                saveFill = value.fill_value
+                if self.getMissing() is None:
+                    self.setMissing(saveFill)
+                else:
+                    value.set_fill_value(self.getMissing())
+        self._obj_.setitem(*(index, numpy.ma.filled(value)))
         if numpy.ma.isMaskedArray(value):
-          if value.mask is not numpy.ma.nomask and not numpy.ma.allclose(value.mask,0):
-            value.set_fill_value(saveFill)
+            if value.mask is not numpy.ma.nomask and not numpy.ma.allclose(value.mask, 0):
+                value.set_fill_value(saveFill)
 
     def __setslice__(self, low, high, value):
         if self.parent is None:
-            raise CDMSError, FileClosedWrite+self.id
+            raise CDMSError(FileClosedWrite + self.id)
 
         # Hack to prevent netCDF overflow error on 64-bit architectures
         high = min(Max32int, high)
-        if high == Max32int and self.rank()==0:
-          high=1
-        
+        if high == Max32int and self.rank() == 0:
+            high = 1
+
         if numpy.ma.isMaskedArray(value):
-          if value.mask is not numpy.ma.nomask and not numpy.ma.allclose(value.mask,0):
-            saveFill = value.fill_value
-            if self.getMissing() is None:
-                self.setMissing(saveFill)
-            else:
-                value.set_fill_value(self.getMissing())
-        apply(self._obj_.setslice,(low,high,numpy.ma.filled(value)))
+            if value.mask is not numpy.ma.nomask and not numpy.ma.allclose(value.mask, 0):
+                saveFill = value.fill_value
+                if self.getMissing() is None:
+                    self.setMissing(saveFill)
+                else:
+                    value.set_fill_value(self.getMissing())
+        self._obj_.setslice(*(low, high, numpy.ma.filled(value)))
         if numpy.ma.isMaskedArray(value):
-          if value.mask is not numpy.ma.nomask and not numpy.ma.allclose(value.mask,0):
-            value.set_fill_value(saveFill)
+            if value.mask is not numpy.ma.nomask and not numpy.ma.allclose(value.mask, 0):
+                value.set_fill_value(saveFill)
 
-    def _getShape (self):
+    def _getShape(self):
         if self.parent is None:
-            raise CDMSError, FileClosed+self.id
+            raise CDMSError(FileClosed + self.id)
         return self._obj_.shape
 
     # Write external attributes to the file.
@@ -138,13 +142,15 @@ class FileVariable(DatasetVariable):
     # that the value is propagated to the external file.
     def __setattr__(self, name, value):
         if hasattr(self, "parent") and self.parent is None:
-            raise CDMSError, FileClosedWrite+self.id
+            raise CDMSError(FileClosedWrite + self.id)
         if (not name in self.__cdms_internals__) and (value is not None):
             try:
                 setattr(self._obj_, name, value)
             except CdunifError:
-                raise CDMSError, "Setting %s.%s=%s"%(self.id,name,`value`)
-            self.attributes[name]=value
+                raise CDMSError(
+                    "Setting %s.%s=%s" %
+                    (self.id, name, repr(value)))
+            self.attributes[name] = value
         self.__dict__[name] = value
 
     # Delete external file attributes.
@@ -156,23 +162,23 @@ class FileVariable(DatasetVariable):
             try:
                 delattr(self._obj_, name)
             except CdunifError:
-                raise CDMSError, "Deleting %s.%s"%(self.id,name)
+                raise CDMSError("Deleting %s.%s" % (self.id, name))
             del(self.attributes[name])
         del self.__dict__[name]
 
     def getValue(self, squeeze=1):
         """Return the entire set of values."""
         if self.parent is None:
-            raise CDMSError, FileClosed+self.id
-        if self.rank()>0:
+            raise CDMSError(FileClosed + self.id)
+        if self.rank() > 0:
             return self.getSlice(Ellipsis, squeeze=squeeze)
         else:
             return self._obj_.getValue()
-    
+
     def __len__(self):
         " Length of first dimension. "
         if self.parent is None:
-            raise CDMSError, FileClosed+self.id
+            raise CDMSError(FileClosed + self.id)
         return len(self._obj_)
 
 #    def __repr__(self):
@@ -181,5 +187,4 @@ class FileVariable(DatasetVariable):
 #        else:
 #            return "<Variable: %s, file: **CLOSED**>"%self.id
 
-
-    shape = property(_getShape,None)
+    shape = property(_getShape, None)
diff --git a/Packages/cdms2/Lib/gengrid.py b/Packages/cdms2/Lib/gengrid.py
index 95e6d1871..5fad339b7 100644
--- a/Packages/cdms2/Lib/gengrid.py
+++ b/Packages/cdms2/Lib/gengrid.py
@@ -1,15 +1,15 @@
-## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by 
-## Further modified to be pure new numpy June 24th 2008
+# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
+# Further modified to be pure new numpy June 24th 2008
 
 """CDMS Generic Grids"""
 
 import numpy
-## import PropertiedClasses
-import bindex
-from error import CDMSError
-from grid import LongitudeType, LatitudeType, VerticalType, TimeType, CoordTypeToLoc
-from hgrid import AbstractHorizontalGrid
-from axis import allclose
+# import PropertiedClasses
+from . import bindex
+from .error import CDMSError
+from .grid import LongitudeType, LatitudeType, VerticalType, TimeType, CoordTypeToLoc
+from .hgrid import AbstractHorizontalGrid
+from .axis import allclose
 
 MethodNotImplemented = "Method not yet implemented"
 
@@ -19,7 +19,7 @@ class AbstractGenericGrid(AbstractHorizontalGrid):
         """Create a generic grid.
         """
         if latAxis.shape != lonAxis.shape:
-            raise CDMSError, 'Latitude and longitude axes must have the same shape.'
+            raise CDMSError('Latitude and longitude axes must have the same shape.')
         AbstractHorizontalGrid.__init__(self, latAxis, lonAxis, id, maskvar, tempmask, node)
         self._index_ = None
 
@@ -35,17 +35,17 @@ class AbstractGenericGrid(AbstractHorizontalGrid):
     def getMesh(self, transpose=None):
         """Generate a mesh array for the meshfill graphics method.
         'transpose' is for compatibility with other grid types, is ignored."""
-        import MV2 as MV
+        from . import MV2 as MV
         if self._mesh_ is None:
-            LAT=0
-            LON=1
+            LAT = 0
+            LON = 1
             latbounds, lonbounds = self.getBounds()
             if latbounds is None or lonbounds is None:
-                raise CDMSError, 'No boundary data is available for grid %s'%self.id
+                raise CDMSError('No boundary data is available for grid %s'%self.id)
             nvert = latbounds.shape[-1]
-            mesh = numpy.zeros((self.size(),2,nvert),latbounds.dtype.char)
-            mesh[:,LAT,:] = MV.filled(latbounds)
-            mesh[:,LON,:] = MV.filled(lonbounds)
+            mesh = numpy.zeros((self.size(), 2, nvert), latbounds.dtype.char)
+            mesh[:, LAT,:] = MV.filled(latbounds)
+            mesh[:, LON,:] = MV.filled(lonbounds)
             self._mesh_ = mesh
         return self._mesh_
 
@@ -101,9 +101,9 @@ class AbstractGenericGrid(AbstractHorizontalGrid):
         gridcenterlon.units = "degrees"
         gridimask = cufile.createVariable("grid_imask", numpy.int, ("grid_size",))
         gridimask.units = "unitless"
-        gridcornerlat = cufile.createVariable("grid_corner_lat", numpy.float, ("grid_size","grid_corners"))
+        gridcornerlat = cufile.createVariable("grid_corner_lat", numpy.float, ("grid_size", "grid_corners"))
         gridcornerlat.units = "degrees"
-        gridcornerlon = cufile.createVariable("grid_corner_lon", numpy.float, ("grid_size","grid_corners"))
+        gridcornerlon = cufile.createVariable("grid_corner_lon", numpy.float, ("grid_size", "grid_corners"))
         gridcornerlon.units = "degrees"
 
         griddims[:] = numpy.array([ngrid], numpy.int32)
@@ -162,8 +162,8 @@ class AbstractGenericGrid(AbstractHorizontalGrid):
                 i = k
             k += 1
 
-        if i==-1:
-            raise RuntimeError, 'Grid lat/lon domains do not match variable domain'
+        if i == -1:
+            raise RuntimeError('Grid lat/lon domains do not match variable domain')
 
         return ((islice, ), (inewaxis, ))
 
@@ -193,10 +193,10 @@ class AbstractGenericGrid(AbstractHorizontalGrid):
         lonspec = spec[CoordTypeToLoc[LongitudeType]]
         latlin = numpy.ma.filled(self._lataxis_)
         lonlin = numpy.ma.filled(self._lonaxis_)
-        lonlin = numpy.ma.where(numpy.ma.greater_equal(lonlin,360.0), lonlin-360.0, lonlin)
+        lonlin = numpy.ma.where(numpy.ma.greater_equal(lonlin, 360.0), lonlin-360.0, lonlin)
         points = bindex.intersectHorizontalGrid(latspec, lonspec, latlin, lonlin, index)
-        if len(points)==0:
-            raise CDMSError, 'No data in the specified region, longitude=%s, latitude=%s'%(`lonspec`, `latspec`)
+        if len(points) == 0:
+            raise CDMSError('No data in the specified region, longitude=%s, latitude=%s'%(repr(lonspec), repr(latspec)))
 
         fullmask = numpy.ones(ncell)
         numpy.put(fullmask, points, 0)
@@ -205,7 +205,7 @@ class AbstractGenericGrid(AbstractHorizontalGrid):
         submask = fullmask[imin:imax]
 
         cellid = self.getAxis(0).id
-        indexspecs = {cellid:slice(imin,imax)}
+        indexspecs = {cellid:slice(imin, imax)}
 
         return submask, indexspecs
 
@@ -253,9 +253,9 @@ class AbstractGenericGrid(AbstractHorizontalGrid):
             result = self.clone()
             for i in missing:
                 for item in axes:
-                    if (len(selfaxes[i])==len(item)) and allclose(selfaxes[i], item):
-                        result._lataxis_.setAxis(i,item)
-                        result._lonaxis_.setAxis(i,item)
+                    if (len(selfaxes[i]) == len(item)) and allclose(selfaxes[i], item):
+                        result._lataxis_.setAxis(i, item)
+                        result._lonaxis_.setAxis(i, item)
                         break
                 else:
                     result = None
@@ -268,7 +268,7 @@ class AbstractGenericGrid(AbstractHorizontalGrid):
         having the same length as the number of cells in the grid, similarly
         for flatlon."""
         if self._flataxes_ is None:
-            import MV2 as MV
+            from . import MV2 as MV
             alat = MV.filled(self.getLatitude())
             alon = MV.filled(self.getLongitude())
             self._flataxes_ = (alat, alon)
@@ -280,11 +280,11 @@ class AbstractGenericGrid(AbstractHorizontalGrid):
         result = self.clone()
         result.id = gridid
         return result
-    shape = property(_getShape,None)
+    shape = property(_getShape, None)
     
-## PropertiedClasses.set_property (AbstractGenericGrid, 'shape', 
-##                                   AbstractGenericGrid._getShape, nowrite=1,
-##                                   nodelete=1)
+# PropertiedClasses.set_property (AbstractGenericGrid, 'shape',
+# AbstractGenericGrid._getShape, nowrite=1,
+# nodelete=1)
 
 class DatasetGenericGrid(AbstractGenericGrid):
 
@@ -295,7 +295,7 @@ class DatasetGenericGrid(AbstractGenericGrid):
         self.parent = parent
 
     def __repr__(self):
-        return "<DatasetGenericGrid, id: %s, shape: %s>"%(self.id, `self.shape`)
+        return "<DatasetGenericGrid, id: %s, shape: %s>"%(self.id, repr(self.shape))
 
 class FileGenericGrid(AbstractGenericGrid):
 
@@ -306,7 +306,7 @@ class FileGenericGrid(AbstractGenericGrid):
         self.parent = parent
 
     def __repr__(self):
-        return "<FileGenericGrid, id: %s, shape: %s>"%(self.id, `self.shape`)
+        return "<FileGenericGrid, id: %s, shape: %s>"%(self.id, repr(self.shape))
 
 class TransientGenericGrid(AbstractGenericGrid):
 
@@ -321,7 +321,7 @@ class TransientGenericGrid(AbstractGenericGrid):
         AbstractGenericGrid.__init__(self, latAxis, lonAxis, id, maskvar, tempmask)
 
     def __repr__(self):
-        return "<TransientGenericGrid, id: %s, shape: %s>"%(self.id, `self.shape`)
+        return "<TransientGenericGrid, id: %s, shape: %s>"%(self.id, repr(self.shape))
 
     def toGenericGrid(self, gridid=None):
         if gridid is None:
@@ -338,20 +338,20 @@ def readScripGenericGrid(fileobj, dims, whichType, whichGrid):
     whichType is the type of file, either "grid" or "mapping"
     if whichType is "mapping", whichGrid is the choice of grid, either "source" or "destination"
     """
-    from auxcoord import TransientAuxAxis1D
-    from coord import TransientVirtualAxis
+    from .auxcoord import TransientAuxAxis1D
+    from .coord import TransientVirtualAxis
 
     convention = 'SCRIP'
     if 'S' in fileobj.variables.keys():
         convention = 'NCAR'
-        if whichType=="grid":
+        if whichType == "grid":
             gridCornerLatName = 'grid_corner_lat'
             gridCornerLonName = 'grid_corner_lon'
             gridMaskName = 'grid_imask'
             gridCenterLatName = 'grid_center_lat'
             gridCenterLonName = 'grid_center_lon'
             titleName = 'title'
-        elif whichGrid=="destination":
+        elif whichGrid == "destination":
             gridCornerLatName = 'yv_b'
             gridCornerLonName = 'xv_b'
             gridMaskName = 'mask_b'
@@ -366,14 +366,14 @@ def readScripGenericGrid(fileobj, dims, whichType, whichGrid):
             gridCenterLonName = 'xc_a'
             titleName = 'source_grid'
     else:
-        if whichType=="grid":
+        if whichType == "grid":
             gridCornerLatName = 'grid_corner_lat'
             gridCornerLonName = 'grid_corner_lon'
             gridMaskName = 'grid_imask'
             gridCenterLatName = 'grid_center_lat'
             gridCenterLonName = 'grid_center_lon'
             titleName = 'title'
-        elif whichGrid=="destination":
+        elif whichGrid == "destination":
             gridCornerLatName = 'dst_grid_corner_lat'
             gridCornerLonName = 'dst_grid_corner_lon'
             gridMaskName = 'dst_grid_imask'
@@ -399,38 +399,38 @@ def readScripGenericGrid(fileobj, dims, whichType, whichGrid):
         ni = dims[0]
 
     boundsshape = (ni, ncorners)
-    if hasattr(cornerLat, 'units') and cornerLat.units.lower()[0:6]=='radian':
+    if hasattr(cornerLat, 'units') and cornerLat.units.lower()[0:6] == 'radian':
         cornerLat = (cornerLat*(180.0/numpy.pi)).reshape(boundsshape)
         cornerLon = (cornerLon*(180.0/numpy.pi)).reshape(boundsshape)
 
-    iaxis = TransientVirtualAxis("i",ni)
+    iaxis = TransientVirtualAxis("i", ni)
 
-    if vardict.has_key(gridMaskName):
+    if gridMaskName in vardict:
         # SCRIP convention: 0 for invalid data
         # numpy.ma convention: 1 for invalid data
         mask = 1 - fileobj(gridMaskName)
     else:
         mask = None
         
-    if vardict.has_key(gridCenterLatName):
+    if gridCenterLatName in vardict:
         centerLat = fileobj(gridCenterLatName)
-        if hasattr(centerLat, "units") and centerLat.units.lower()=='radians':
+        if hasattr(centerLat, "units") and centerLat.units.lower() == 'radians':
             centerLat *= (180.0/numpy.pi)
     else:
-        centerLat = cornerLat[:,:,0]
+        centerLat = cornerLat[:,:, 0]
 
-    if vardict.has_key(gridCenterLonName):
+    if gridCenterLonName in vardict:
         centerLon = fileobj(gridCenterLonName)
-        if hasattr(centerLon, "units") and centerLon.units.lower()=='radians':
+        if hasattr(centerLon, "units") and centerLon.units.lower() == 'radians':
             centerLon *= (180.0/numpy.pi)
     else:
-        centerLon = cornerLon[:,:,0]
+        centerLon = cornerLon[:,:, 0]
 
-    if hasattr(fileobj,titleName):
+    if hasattr(fileobj, titleName):
         gridid = getattr(fileobj, titleName)
-        gridid = sgridid.strip().replace(' ','_')
+        gridid = sgridid.strip().replace(' ', '_')
     else:
-        gridid="<None>"
+        gridid = "<None>"
 
     lataxis = TransientAuxAxis1D(centerLat, axes=(iaxis,), bounds=cornerLat,
                               attributes={'units':'degrees_north'}, id="latitude")
diff --git a/Packages/cdms2/Lib/grid.py b/Packages/cdms2/Lib/grid.py
index 05fdf9b7c..fef1505e7 100644
--- a/Packages/cdms2/Lib/grid.py
+++ b/Packages/cdms2/Lib/grid.py
@@ -1,14 +1,14 @@
-## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by 
-## Further modified to be pure new numpy June 24th 2008
+# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
+# Further modified to be pure new numpy June 24th 2008
 
 """CDMS Grid objects"""
 import re
-from error import CDMSError
+from .error import CDMSError
 import numpy #, PropertiedClasses, internattr
 # import regrid2._regrid
 import copy, string, sys
-from cdmsobj import CdmsObj
-from axis import TransientAxis, createAxis, createUniformLatitudeAxis, createUniformLongitudeAxis, getAutoBounds, createGaussianAxis, lookupArray, isSubsetVector
+from .cdmsobj import CdmsObj
+from .axis import TransientAxis, createAxis, createUniformLatitudeAxis, createUniformLongitudeAxis, getAutoBounds, createGaussianAxis, lookupArray, isSubsetVector
 import cdtime
 
 MethodNotImplemented = "Method not yet implemented"
@@ -20,10 +20,10 @@ _classifyGrids = 1                      # Determine the type of grid from the gr
 # (if any). If 'off', the value of .grid_type overrides the classification.
 def setClassifyGrids(mode):
     global _classifyGrids
-    if mode=='on':
-        _classifyGrids=1
-    elif mode=='off':
-        _classifyGrids=0
+    if mode == 'on':
+        _classifyGrids = 1
+    elif mode == 'off':
+        _classifyGrids = 0
 
 # Create a transient rectilinear grid
 def createRectGrid(lat, lon, order="yx", type="generic", mask=None):
@@ -33,7 +33,7 @@ def createRectGrid(lat, lon, order="yx", type="generic", mask=None):
 def createUniformGrid(startLat, nlat, deltaLat, startLon, nlon, deltaLon, order="yx", mask=None):
     lat = createUniformLatitudeAxis(startLat, nlat, deltaLat)
     lon = createUniformLongitudeAxis(startLon, nlon, deltaLon)
-    return createRectGrid(lat,lon,order,"uniform",mask)
+    return createRectGrid(lat, lon, order, "uniform", mask)
 
 # Generate a grid for calculating the global mean. The grid is a single
 # zone covering the range of the input grid
@@ -41,41 +41,41 @@ def createGlobalMeanGrid(grid):
     inlat = grid.getLatitude()
     inlatBounds, inlonBounds = grid.getBounds()
     outlatArray = numpy.array([(inlat[0] + inlat[-1])/2.0])
-    outlatBounds = numpy.array([[inlatBounds[0,0], inlatBounds[-1,1]]])
+    outlatBounds = numpy.array([[inlatBounds[0, 0], inlatBounds[-1, 1]]])
     outlat = createAxis(outlatArray, outlatBounds)
     outlat.units = inlat.units
 
     inlon = grid.getLongitude()
     outlonArray = numpy.array([(inlon[0] + inlon[-1])/2.0])
-    outlonBounds = numpy.array([[inlonBounds[0,0], inlonBounds[-1,1]]])
+    outlonBounds = numpy.array([[inlonBounds[0, 0], inlonBounds[-1, 1]]])
     outlon = createAxis(outlonArray, outlonBounds)
     outlon.units = inlon.units
 
-    return createRectGrid(outlat,outlon,grid.getOrder())
+    return createRectGrid(outlat, outlon, grid.getOrder())
 
 # Generate a grid for zonal averaging. The grid has the same latitudes
 # as the input grid, and a single longitude.
 def createZonalGrid(grid):
     inlat = grid.getLatitude()
     outlatBounds, inlonBounds = grid.getBounds()
-    outlat = createAxis(inlat[:],outlatBounds)
+    outlat = createAxis(inlat[:], outlatBounds)
     outlat.units = inlat.units
 
     inlon = grid.getLongitude()
     outlonArray = numpy.array([(inlon[0] + inlon[-1])/2.0])
-    outlonBounds = numpy.array([[inlonBounds[0,0], inlonBounds[-1,1]]])
+    outlonBounds = numpy.array([[inlonBounds[0, 0], inlonBounds[-1, 1]]])
     outlon = createAxis(outlonArray, outlonBounds)
     outlon.units = inlon.units
 
-    return createRectGrid(outlat,outlon,grid.getOrder())
+    return createRectGrid(outlat, outlon, grid.getOrder())
 
 # Generate a generic (untyped) grid from lat, lon vectors
 def createGenericGrid(latArray, lonArray, latBounds=None, lonBounds=None, order="yx", mask=None):
-    lat = createAxis(latArray,latBounds)
+    lat = createAxis(latArray, latBounds)
     lat.units = "degrees_north"
-    lon = createAxis(lonArray,lonBounds)
+    lon = createAxis(lonArray, lonBounds)
     lon.units = "degrees_east"
-    return createRectGrid(lat,lon,order,"generic",mask)
+    return createRectGrid(lat, lon, order, "generic", mask)
 
 def createGaussianGrid(nlats, xorigin=0.0, order="yx"):
     """ createGaussianGrid(nlats, xorigin=0.0)
@@ -96,7 +96,7 @@ TimeType = 'time'
 CoordinateTypes = [LongitudeType, LatitudeType, VerticalType, TimeType]
 
 # Note: no time dimensions in grids.
-CoordTypeToLoc = {LongitudeType:0, LatitudeType:1, VerticalType:2}
+CoordTypeToLoc = {LongitudeType: 0, LatitudeType: 1, VerticalType: 2}
 
 def defaultRegion():
     """Return a specification for a default (full) region."""
@@ -125,27 +125,27 @@ def setRegionSpecs(grid, coordSpec, coordType, resultSpec):
 
     Note that time coordinate types are not permitted.
     """
-    
-    if (coordSpec is None) or (coordSpec==':'):
+
+    if (coordSpec is None) or (coordSpec == ':'):
         canonSpec = None
     elif isinstance(coordSpec, tuple):
-        if len(coordSpec)==2:
-            canonSpec = (coordSpec[0],coordSpec[1],'cc',None)
-        elif len(coordSpec)==3:
-            canonSpec = (coordSpec[0],coordSpec[1],coordSpec[2],None)
-        elif len(coordSpec)!=4:
-            raise CDMSError, 'Invalid coordinate specification: %s'%`coordSpec`
+        if len(coordSpec) == 2:
+            canonSpec = (coordSpec[0], coordSpec[1], 'cc', None)
+        elif len(coordSpec) == 3:
+            canonSpec = (coordSpec[0], coordSpec[1], coordSpec[2], None)
+        elif len(coordSpec) != 4:
+            raise CDMSError('Invalid coordinate specification: %s'%repr(coordSpec))
     elif isinstance(coordSpec, (int, float)):
         canonSpec = (coordSpec, coordSpec, 'cc', None)
     else:
-        raise CDMSError, 'Invalid coordinate specification: %s'%`coordSpec`
+        raise CDMSError('Invalid coordinate specification: %s'%repr(coordSpec))
 
     coordLoc = CoordTypeToLoc[coordType]
     if coordLoc is None:
-        raise CDMSError, 'Invalid coordinate type: %s'%coordType
+        raise CDMSError('Invalid coordinate type: %s'%coordType)
 
     if resultSpec[coordLoc] is not None:
-        raise CDMSError, 'Multiple specifications for coordinate type %s'%coordType
+        raise CDMSError('Multiple specifications for coordinate type %s'%coordType)
     resultSpec[coordLoc] = canonSpec
 
 class AbstractGrid (CdmsObj):
@@ -153,13 +153,14 @@ class AbstractGrid (CdmsObj):
     def __init__ (self, node):
         CdmsObj.__init__ (self, node)
         self.id = '<None>' # String identifier
-        if node is not None and hasattr(node,'id'): self.id = node.id
+        if node is not None and hasattr(node, 'id'):
+            self.id = node.id
         self.parent = None #Dataset containing this grid
         self._flataxes_ = None
         self._mesh_ = None
 
     def listall (self, all=None):
-        result=[]
+        result = []
         result.append('Grid has Python id %s.' % hex(id(self)))
         return result
 
@@ -170,26 +171,27 @@ class AbstractGrid (CdmsObj):
 
     def info(self, flag=None, device=None):
         "Write info about slab; include dimension values and weights if flag"
-        if device is None: device = sys.stdout
+        if device is None:
+            device = sys.stdout
         device.write(str(self))
 
     def writeToFile(self, file):
         """Write self to a CdmsFile file, returning CF coordinates attribute, or None if not applicable"""
-        raise CDMSError, MethodNotImplemented
+        raise CDMSError(MethodNotImplemented)
 
     def subSlice(self, *specs, **keys):
         """Get a subgrid based on an argument list <specs> of slices."""
-        raise CDMSError, MethodNotImplemented
+        raise CDMSError(MethodNotImplemented)
 
     def hasCoordType(self, coordType):
         """Return 1 iff self has the coordinate type."""
         return 0
 
     def getAxisList(self):
-      axes =[]
-      for i in range(len(self._order_)):
-        axes.append(self.getAxis(i))
-      return axes
+        axes = []
+        for i in range(len(self._order_)):
+            axes.append(self.getAxis(i))
+        return axes
 
     def isClose(self, g):
         """Return 1 if g is 'close enough' to self to be considered equal, 0 if not."""
@@ -205,31 +207,31 @@ class AbstractGrid (CdmsObj):
 
     def clone(self, copyData=1):
         """Make a copy of self."""
-        raise CDMSError, MethodNotImplemented
+        raise CDMSError(MethodNotImplemented)
 
     def flatAxes(self):
         """Return (flatlat, flatlon) where flatlat is a raveled NumPy array
         having the same length as the number of cells in the grid, similarly
         for flatlon."""
-        raise CDMSError, MethodNotImplemented
+        raise CDMSError(MethodNotImplemented)
 
     def size(self):
         "Return number of cells in the grid"
-        raise CDMSError, MethodNotImplemented
+        raise CDMSError(MethodNotImplemented)
 
     def writeScrip(self, cdunifFile):
         "Write a grid to a SCRIP file"
-        raise CDMSError, MethodNotImplemented
+        raise CDMSError(MethodNotImplemented)
 
 class AbstractRectGrid(AbstractGrid):
     """AbstractRectGrid defines the interface for rectilinear grids:
        grids which can be decomposed into 1-D latitude and longitude axes
     """
-    gridtypes = ['gaussian','uniform','equalarea','generic']
+    gridtypes = ['gaussian', 'uniform', 'equalarea', 'generic']
 
     def __init__ (self, node):
         AbstractGrid.__init__ (self, node)
-        val = self.__cdms_internals__ + ['id',]
+        val = self.__cdms_internals__ + ['id', ]
         self.___cdms_internals__ = val
 
     def listall (self, all=None):
@@ -244,14 +246,14 @@ class AbstractRectGrid(AbstractGrid):
 
     def _getshape (self):
         if self._order_ == "yx":
-            return (len(self._lataxis_),len(self._lonaxis_))
+            return (len(self._lataxis_), len(self._lonaxis_))
         else:
-            return (len(self._lonaxis_),len(self._lataxis_))
+            return (len(self._lonaxis_), len(self._lataxis_))
 
     # Get the n-th axis. naxis is 0 or 1.
     def getAxis(self, naxis):
         ind = self._order_[naxis]
-        if ind=='x':
+        if ind == 'x':
             axis = self.getLongitude()
         else:
             axis = self.getLatitude()
@@ -259,7 +261,7 @@ class AbstractRectGrid(AbstractGrid):
 
     def getBounds(self):
         latbnds, lonbnds = (self._lataxis_.getExplicitBounds(), self._lonaxis_.getExplicitBounds())
-        if (latbnds is None or lonbnds is None) and getAutoBounds() in [1,2]:
+        if (latbnds is None or lonbnds is None) and getAutoBounds() in [1, 2]:
             nlatbnds, nlonbnds = self.genBounds()
             if latbnds is None:
                 latbnds = nlatbnds
@@ -275,10 +277,10 @@ class AbstractRectGrid(AbstractGrid):
         return self._lonaxis_
 
     def getMask(self):
-        raise CDMSError, MethodNotImplemented
+        raise CDMSError(MethodNotImplemented)
 
-    def setMask(self,mask,permanent=0):
-        raise CDMSError, MethodNotImplemented
+    def setMask(self, mask, permanent=0):
+        raise CDMSError(MethodNotImplemented)
 
     def getOrder(self):
         return self._order_
@@ -287,8 +289,10 @@ class AbstractRectGrid(AbstractGrid):
         return self._gridtype_
 
     def setType(self, gridtype):
-        if gridtype=='linear': gridtype='uniform'
-        if gridtype=='unknown': gridtype='generic'
+        if gridtype == 'linear':
+            gridtype = 'uniform'
+        if gridtype == 'unknown':
+            gridtype = 'generic'
         # assert gridtype in AbstractRectGrid.gridtypes, 'Grid type must be one of %s'%`AbstractRectGrid.gridtypes`
         self._gridtype_ = gridtype
 
@@ -300,22 +304,24 @@ class AbstractRectGrid(AbstractGrid):
 
         latBounds, lonBounds = self.getBounds()
         latBounds = (numpy.pi/180.0) * latBounds
-        latWeights = 0.5 * numpy.absolute(numpy.sin(latBounds[:,1]) - numpy.sin(latBounds[:,0]))
+        latWeights = 0.5 * numpy.absolute(numpy.sin(latBounds[:, 1]) - numpy.sin(latBounds[:, 0]))
 
-        lonWeights = numpy.absolute((lonBounds[:,1] - lonBounds[:,0]))/360.0
+        lonWeights = numpy.absolute((lonBounds[:, 1] - lonBounds[:, 0]))/360.0
 
         return latWeights, lonWeights
 
     # Create a transient grid for the index (tuple) intervals.
-    def subGrid(self,latinterval, loninterval):
-        if latinterval is None: latinterval = (0, len(self._lataxis_))
-        if loninterval is None: loninterval = (0, len(self._lonaxis_))
-            
-        latobj = self._lataxis_.subaxis(latinterval[0],latinterval[1])
-        lonobj = self._lonaxis_.subaxis(loninterval[0],loninterval[1])
+    def subGrid(self, latinterval, loninterval):
+        if latinterval is None:
+            latinterval = (0, len(self._lataxis_))
+        if loninterval is None:
+            loninterval = (0, len(self._lonaxis_))
+
+        latobj = self._lataxis_.subaxis(latinterval[0], latinterval[1])
+        lonobj = self._lonaxis_.subaxis(loninterval[0], loninterval[1])
         maskArray = self.getMask()
         if maskArray is not None:
-            if self._order_=="yx":
+            if self._order_ == "yx":
                 submask = maskArray[latinterval[0]:latinterval[1], loninterval[0]:loninterval[1]]
             else:
                 submask = maskArray[loninterval[0]:loninterval[1], latinterval[0]:latinterval[1]]
@@ -323,7 +329,7 @@ class AbstractRectGrid(AbstractGrid):
             submask = None
 
         return TransientRectGrid(latobj, lonobj, self._order_, self._gridtype_, submask)
-        
+
     # Same as subGrid, for coordinates
     def subGridRegion(self, latRegion, lonRegion):
         latInterval = self._lataxis_.mapInterval(latRegion)
@@ -332,7 +338,7 @@ class AbstractRectGrid(AbstractGrid):
 
     # Return a transient grid which is the transpose of this grid
     def transpose(self):
-        if self._order_=="yx":
+        if self._order_ == "yx":
             neworder = "xy"
         else:
             neworder = "yx"
@@ -358,65 +364,69 @@ class AbstractRectGrid(AbstractGrid):
 
         CLOSE_ENOUGH = 1.e-3
         lat = self.getLatitude()
-        if len(lat)==1:
-            return ('generic',1,0)
+        if len(lat) == 1:
+            return ('generic', 1, 0)
 
         latar = lat[:]
-        if lat[0]<lat[-1]:              # increasing?
-            hassouth = (abs(lat[0]+90.0)<1.e-2)
-            hasnorth = (abs(lat[-1]-90.0)<1.e-2)
-            if hassouth: latar = latar[1:]
-            if hasnorth: latar = latar[:-1]
+        if lat[0] < lat[-1]:              # increasing?
+            hassouth = (abs(lat[0]+90.0) < 1.e-2)
+            hasnorth = (abs(lat[-1]-90.0) < 1.e-2)
+            if hassouth:
+                latar = latar[1:]
+            if hasnorth:
+                latar = latar[:-1]
         else:                           # decreasing
-            hassouth = (abs(lat[-1]+90.0)<1.e-2)
-            hasnorth = (abs(lat[0]-90.0)<1.e-2)
-            if hassouth: latar = latar[:-1]
-            if hasnorth: latar = latar[1:]
+            hassouth = (abs(lat[-1]+90.0) < 1.e-2)
+            hasnorth = (abs(lat[0]-90.0) < 1.e-2)
+            if hassouth:
+                latar = latar[:-1]
+            if hasnorth:
+                latar = latar[1:]
         nlats = len(latar)
 
         # Get the related Gaussian latitude
-        gausslatns, wts, bnds = regrid2._regrid.gridattr(len(latar),'gaussian')
+        gausslatns, wts, bnds = regrid2._regrid.gridattr(len(latar), 'gaussian')
         gausslatsn = gausslatns[::-1]
         diffs = latar[1:]-latar[:-1]
-        equalareans, wts, bnds = regrid2._regrid.gridattr(len(latar),'equalarea')
+        equalareans, wts, bnds = regrid2._regrid.gridattr(len(latar), 'equalarea')
         equalareasn = equalareans[::-1]
 
         # Get the Gaussian lats for len+1, in case this is a boundary
-        dumlat, dumwt, bndsplusns = regrid2._regrid.gridattr(len(latar)+1,'gaussian')
+        dumlat, dumwt, bndsplusns = regrid2._regrid.gridattr(len(latar)+1, 'gaussian')
         bndsplussn = bndsplusns[::-1]
 
         # Look for N-S equality
         isoffset = 0
-        if numpy.alltrue(numpy.less(numpy.absolute(latar[:]-gausslatns),CLOSE_ENOUGH)):
+        if numpy.alltrue(numpy.less(numpy.absolute(latar[:]-gausslatns), CLOSE_ENOUGH)):
             actualType = 'gaussian'
 
-        elif numpy.alltrue(numpy.less(numpy.absolute(latar[:]-gausslatsn),CLOSE_ENOUGH)):
+        elif numpy.alltrue(numpy.less(numpy.absolute(latar[:]-gausslatsn), CLOSE_ENOUGH)):
             actualType = 'gaussian'
 
         # Check for zone (offset) variable
-        elif numpy.alltrue(numpy.less(numpy.absolute(latar[:]-bndsplusns[1:-1]),CLOSE_ENOUGH)):
+        elif numpy.alltrue(numpy.less(numpy.absolute(latar[:]-bndsplusns[1:-1]), CLOSE_ENOUGH)):
             actualType = 'gaussian'
             isoffset = 1
             nlats = nlats+1
 
-        elif numpy.alltrue(numpy.less(numpy.absolute(latar[:]-bndsplussn[1:-1]),CLOSE_ENOUGH)):
+        elif numpy.alltrue(numpy.less(numpy.absolute(latar[:]-bndsplussn[1:-1]), CLOSE_ENOUGH)):
             actualType = 'gaussian'
             isoffset = 1
             nlats = nlats+1
 
-        elif numpy.alltrue(numpy.less(numpy.absolute(diffs-diffs[0]),CLOSE_ENOUGH)):
+        elif numpy.alltrue(numpy.less(numpy.absolute(diffs-diffs[0]), CLOSE_ENOUGH)):
             actualType = 'uniform'
 
-        elif numpy.alltrue(numpy.less(numpy.absolute(latar[:]-equalareans),CLOSE_ENOUGH)):
+        elif numpy.alltrue(numpy.less(numpy.absolute(latar[:]-equalareans), CLOSE_ENOUGH)):
             actualType = 'equalarea'
 
-        elif numpy.alltrue(numpy.less(numpy.absolute(latar[:]-equalareasn),CLOSE_ENOUGH)):
+        elif numpy.alltrue(numpy.less(numpy.absolute(latar[:]-equalareasn), CLOSE_ENOUGH)):
             actualType = 'equalarea'
 
         else:
             actualType = 'generic'
 
-        return (actualType,nlats,isoffset)
+        return (actualType, nlats, isoffset)
 
     # Generate a best guess at grid info within a family of grids (list of grids)
     # Return a tuple (type,coverage,nlats,isoffset, basegrid, latindex) where:
@@ -436,21 +446,23 @@ class AbstractRectGrid(AbstractGrid):
         coverage = 'global'
         basegrid = None
         latindex = None
-        if gridtype=='generic':
+        if gridtype == 'generic':
             # Look for truncated grids: such that grid is a subset of grid2
             found = 0
             for grid2 in gridlist:
-                if self.id==grid2.id: continue
+                if self.id == grid2.id:
+                    continue
                 lat = self.getLatitude()
                 lon = self.getLongitude()
                 lat2 = grid2.getLatitude()
                 lon2 = grid2.getLongitude()
-                if len(lat)>len(lat2) or len(lon)>len(lon2): continue
-                latIsSubset, latindex = isSubsetVector(lat[:],lat2[:],1.e-2)
-                lonIsSubset, lonindex = isSubsetVector(lon[:],lon2[:],1.e-2)
+                if len(lat) > len(lat2) or len(lon) > len(lon2):
+                    continue
+                latIsSubset, latindex = isSubsetVector(lat[:], lat2[:], 1.e-2)
+                lonIsSubset, lonindex = isSubsetVector(lon[:], lon2[:], 1.e-2)
                 if latIsSubset and lonIsSubset:
                     found = 1
-                    if len(lat2)>nlats:
+                    if len(lat2) > nlats:
                         coverage = 'regional'
                     nlats = len(lat2)
                     basegrid = grid2.id
@@ -462,13 +474,13 @@ class AbstractRectGrid(AbstractGrid):
     def genBounds(self):
         import regrid2._regrid
 
-        if hasattr(self,"parent") and self.parent is not None:
+        if hasattr(self, "parent") and self.parent is not None:
             gridfamily = self.parent.grids.values()
         else:
             gridfamily = []
 
         gridtype, coverage, nlats, isoffset, basegrid, latindex = self.classifyInFamily(gridfamily)
-        if _classifyGrids==0:
+        if _classifyGrids == 0:
             gridtypenew = self.getType()
             if gridtypenew in AbstractRectGrid.gridtypes:
                 gridtype = gridtypenew
@@ -476,39 +488,41 @@ class AbstractRectGrid(AbstractGrid):
         # Get latitude bounds
         lat = self.getLatitude()
         ascending = (lat[0] < lat[-1])
-        if gridtype=='gaussian':
+        if gridtype == 'gaussian':
             pts, wts, bnds = regrid2._regrid.gridattr(nlats, 'gaussian')
-            if ascending: bnds = bnds[::-1]
-            latbnds = numpy.zeros((len(lat),2),numpy.float)
-            latbnds[:,0] = bnds[:-1]
-            latbnds[:,1] = bnds[1:]
-            latbnds[0,:] = numpy.maximum(-90.0, numpy.minimum(90.0,latbnds[0,:]))
-            latbnds[-1,:] = numpy.maximum(-90.0, numpy.minimum(90.0,latbnds[-1,:]))
-        elif gridtype=='equalarea':
+            if ascending:
+                bnds = bnds[::-1]
+            latbnds = numpy.zeros((len(lat), 2), numpy.float)
+            latbnds[:, 0] = bnds[:-1]
+            latbnds[:, 1] = bnds[1:]
+            latbnds[0,:] = numpy.maximum(-90.0, numpy.minimum(90.0, latbnds[0,:]))
+            latbnds[-1,:] = numpy.maximum(-90.0, numpy.minimum(90.0, latbnds[-1,:]))
+        elif gridtype == 'equalarea':
             pts, wts, bnds = regrid2._regrid.gridattr(nlats, 'equalarea')
-            if ascending: bnds = bnds[::-1]
-            latbnds = numpy.zeros((len(lat),2),numpy.float)
-            latbnds[:,0] = bnds[:-1]
-            latbnds[:,1] = bnds[1:]
-            latbnds[0,:] = numpy.maximum(-90.0, numpy.minimum(90.0,latbnds[0,:]))
-            latbnds[-1,:] = numpy.maximum(-90.0, numpy.minimum(90.0,latbnds[-1,:]))
+            if ascending:
+                bnds = bnds[::-1]
+            latbnds = numpy.zeros((len(lat), 2), numpy.float)
+            latbnds[:, 0] = bnds[:-1]
+            latbnds[:, 1] = bnds[1:]
+            latbnds[0,:] = numpy.maximum(-90.0, numpy.minimum(90.0, latbnds[0,:]))
+            latbnds[-1,:] = numpy.maximum(-90.0, numpy.minimum(90.0, latbnds[-1,:]))
         else:
             latbnds = lat.genGenericBounds()
 
         # Stretch latitude bounds to +/- 90.0
         if ascending:
-            latbnds[0,0] = min(latbnds[0,0],-90.0)
-            latbnds[-1,1] = max(latbnds[-1,1],90.0)
+            latbnds[0, 0] = min(latbnds[0, 0], -90.0)
+            latbnds[-1, 1] = max(latbnds[-1, 1], 90.0)
         else:
-            latbnds[0,0] = max(latbnds[0,0],+90.0)
-            latbnds[-1,1] = min(latbnds[-1,1],-90.0)
+            latbnds[0, 0] = max(latbnds[0, 0], +90.0)
+            latbnds[-1, 1] = min(latbnds[-1, 1], -90.0)
 
         # Get longitude bounds
         lon = self.getLongitude()
-        if len(lon)>1:
+        if len(lon) > 1:
             lonbnds = lon.genGenericBounds()
         else:
-            lonbnds = numpy.array([[lon[0]-180.0, lon[0]+180.0]],numpy.float)
+            lonbnds = numpy.array([[lon[0]-180.0, lon[0]+180.0]], numpy.float)
 
         return (latbnds, lonbnds)
 
@@ -518,27 +532,27 @@ class AbstractRectGrid(AbstractGrid):
     def getMesh(self):
         """Generate a mesh array for the meshfill graphics method."""
         if self._mesh_ is None:
-            LAT=0
-            LON=1
+            LAT = 0
+            LON = 1
             latbounds, lonbounds = self.getBounds()
             if latbounds is None or lonbounds is None:
-                raise CDMSError, 'No boundary data is available for grid %s'%self.id
+                raise CDMSError('No boundary data is available for grid %s'%self.id)
             ny = len(self._lataxis_)
             nx = len(self._lonaxis_)
             lenmesh = ny*nx
-            mesh = numpy.zeros((lenmesh,2,4),latbounds.dtype.char)
-            broadlat = numpy.repeat(latbounds[:,numpy.newaxis,:],nx,axis=1)
-            broadlat.shape = (lenmesh,2)
-            broadlon = numpy.repeat(lonbounds[numpy.newaxis,:,:],ny,axis=0)
-            broadlon.shape=(lenmesh,2)
-            mesh[:,LAT,0] = broadlat[:,0]
-            mesh[:,LAT,1] = broadlat[:,0]
-            mesh[:,LAT,2] = broadlat[:,1]
-            mesh[:,LAT,3] = broadlat[:,1]
-            mesh[:,LON,0] = broadlon[:,0]
-            mesh[:,LON,1] = broadlon[:,1]
-            mesh[:,LON,2] = broadlon[:,1]
-            mesh[:,LON,3] = broadlon[:,0]
+            mesh = numpy.zeros((lenmesh, 2, 4), latbounds.dtype.char)
+            broadlat = numpy.repeat(latbounds[:, numpy.newaxis,:], nx, axis=1)
+            broadlat.shape = (lenmesh, 2)
+            broadlon = numpy.repeat(lonbounds[numpy.newaxis,:,:], ny, axis=0)
+            broadlon.shape = (lenmesh, 2)
+            mesh[:, LAT, 0] = broadlat[:, 0]
+            mesh[:, LAT, 1] = broadlat[:, 0]
+            mesh[:, LAT, 2] = broadlat[:, 1]
+            mesh[:, LAT, 3] = broadlat[:, 1]
+            mesh[:, LON, 0] = broadlon[:, 0]
+            mesh[:, LON, 1] = broadlon[:, 1]
+            mesh[:, LON, 2] = broadlon[:, 1]
+            mesh[:, LON, 3] = broadlon[:, 0]
             self._mesh_ = mesh
         return self._mesh_
 
@@ -550,7 +564,7 @@ class AbstractRectGrid(AbstractGrid):
         if self._flataxes_ is None:
             alat = self.getLatitude()[:]
             alon = self.getLongitude()[:]
-            alatflat = numpy.repeat(alat[:,numpy.newaxis], len(alon), axis=1)
+            alatflat = numpy.repeat(alat[:, numpy.newaxis], len(alon), axis=1)
             alonflat = numpy.repeat(alon[numpy.newaxis,:], len(alat), axis=0)
             self._flataxes_ = (numpy.ravel(alatflat), numpy.ravel(alonflat))
         return self._flataxes_
@@ -572,8 +586,8 @@ class AbstractRectGrid(AbstractGrid):
         'gridid' is the string identifier of the resulting curvilinear grid object.
         """
 
-        from coord import TransientVirtualAxis, TransientAxis2D
-        from hgrid import TransientCurveGrid
+        from .coord import TransientVirtualAxis, TransientAxis2D
+        from .hgrid import TransientCurveGrid
 
         lat = self._lataxis_[:]
         lon = self._lonaxis_[:]
@@ -606,37 +620,37 @@ class AbstractRectGrid(AbstractGrid):
             ax, ay = lon, lat
             bx, by = blon, blat
             nx, ny = nlon, nlat
-            
+
         centerX = numpy.outer(numpy.ones(ny), ax)
         centerY = numpy.outer(ay, numpy.ones(nx))
 
         # Create corner latitudes (in yx order), ensuring counterclockwise direction
         cy = numpy.zeros((ny, 4), numpy.float)
-        if (by[0,0]<= by[0,1]):
+        if (by[0, 0] <= by[0, 1]):
             incr = 1
         else:
             incr = 0
-        cy[:,0] = by[:,1-incr]
-        cy[:,1] = by[:,1-incr]
-        cy[:,2] = by[:,incr]
-        cy[:,3] = by[:,incr]
-        cornerY = numpy.repeat(cy[:,numpy.newaxis,:], nx, axis=1)
-        
+        cy[:, 0] = by[:, 1-incr]
+        cy[:, 1] = by[:, 1-incr]
+        cy[:, 2] = by[:, incr]
+        cy[:, 3] = by[:, incr]
+        cornerY = numpy.repeat(cy[:, numpy.newaxis,:], nx, axis=1)
+
         # Create corner longitudes (in yx order), ensuring counterclockwise direction
         cx = numpy.zeros((nx, 4), numpy.float)
-        if (bx[0,0]<= bx[0,1]):
+        if (bx[0, 0] <= bx[0, 1]):
             incr = 1
         else:
             incr = 0
-        cx[:,0] = bx[:,1-incr]
-        cx[:,1] = bx[:,incr]
-        cx[:,2] = bx[:,incr]
-        cx[:,3] = bx[:,1-incr]
+        cx[:, 0] = bx[:, 1-incr]
+        cx[:, 1] = bx[:, incr]
+        cx[:, 2] = bx[:, incr]
+        cx[:, 3] = bx[:, 1-incr]
         cornerX = numpy.repeat(cx[numpy.newaxis,:,:], ny, axis=0)
 
-        iaxis = TransientVirtualAxis("i",ny) # First axis
-        jaxis = TransientVirtualAxis("j",nx) # Second axis
-        
+        iaxis = TransientVirtualAxis("i", ny) # First axis
+        jaxis = TransientVirtualAxis("j", nx) # Second axis
+
         centerLat = centerY
         centerLon = centerX
         cornerLat = cornerY
@@ -646,7 +660,7 @@ class AbstractRectGrid(AbstractGrid):
             centerLon = centerY
             cornerLat = cornerX
             cornerLon = cornerY
-            
+
 
         lataxis = TransientAxis2D(centerLat, axes=(iaxis, jaxis), bounds=cornerLat,
                                   attributes={'units':latunits}, id="latitude")
@@ -661,39 +675,40 @@ class AbstractRectGrid(AbstractGrid):
         gengrid = curvegrid.toGenericGrid(gridid=gridid)
         return gengrid
 
-    shape = property(_getshape,None)
-   
-## PropertiedClasses.set_property (AbstractRectGrid, 'shape', 
-##                                 AbstractRectGrid._getshape, 
-##                                 nowrite=1,
-##                                 nodelete=1)
+    shape = property(_getshape, None)
+
+# PropertiedClasses.set_property (AbstractRectGrid, 'shape',
+# AbstractRectGrid._getshape,
+# nowrite=1,
+# nodelete=1)
 
-## internattr.add_internal_attribute (AbstractRectGrid, 'id', 'parent')
+# internattr.add_internal_attribute (AbstractRectGrid, 'id', 'parent')
 
 class RectGrid(AbstractRectGrid):
 
     def __init__(self,parent,rectgridNode=None):
         if rectgridNode is not None and rectgridNode.tag != 'rectGrid':
-            raise CDMSError, 'Node is not a grid node'
-        AbstractRectGrid.__init__(self,rectgridNode)
+            raise CDMSError('Node is not a grid node')
+        AbstractRectGrid.__init__(self, rectgridNode)
         self.parent = parent
 
     # Set pointers to related structural elements: lon, lat axes, order, mask
     def initDomain(self, axisdict, vardict):
-        if not axisdict.has_key(self.latitude):
-            raise CDMSError, 'No such latitude: %s'%`self.latitude`
-        if not axisdict.has_key(self.longitude):
-            raise CDMSError, 'No such longitude: %s'%`self.longitude`
+        if self.latitude not in axisdict:
+            raise CDMSError('No such latitude: %s'%repr(self.latitude))
+        if self.longitude not in axisdict:
+            raise CDMSError('No such longitude: %s'%repr(self.longitude))
         self._lataxis_ = axisdict[self.latitude]
         self._lonaxis_ = axisdict[self.longitude]
         self._order_ = self.order
         self._gridtype_ = self.attributes.get('type')
-        if self._gridtype_ is None: self._gridtype_ = "generic"
-        if hasattr(self,"mask"):
+        if self._gridtype_ is None:
+            self._gridtype_ = "generic"
+        if hasattr(self, "mask"):
             self._maskVar_ = vardict.get(self.mask)
         else:
             self._maskVar_ = None
-    
+
     def getMask(self):
         if self._maskVar_ is None:
             # return numpy.ones(self.shape)
@@ -704,7 +719,7 @@ class RectGrid(AbstractRectGrid):
     def getMaskVar(self):
         return self._maskVar_
 
-## internattr.add_internal_attribute(RectGrid)
+# internattr.add_internal_attribute(RectGrid)
 
 class FileRectGrid(AbstractRectGrid):
 
@@ -714,8 +729,8 @@ class FileRectGrid(AbstractRectGrid):
         self.parent = parent
         self._lataxis_ = latobj
         self._lonaxis_ = lonobj
-        if not order in ["yx","xy"]:
-            raise CDMSError, 'Grid order must be "yx" or "xy"'
+        if not order in ["yx", "xy"]:
+            raise CDMSError('Grid order must be "yx" or "xy"')
         self._order_ = order
         self.setType(gridtype)
         self._maskVar_ = maskobj        # FileVariable of mask
@@ -739,24 +754,25 @@ class FileRectGrid(AbstractRectGrid):
     # Set the mask to array 'mask'. If persistent == 1, modify permanently
     # in the file, else set as a temporary mask.
     def setMask(self,mask,persistent=0):
-        if persistent!=0: raise CDMSError, MethodNotImplemented
+        if persistent != 0:
+            raise CDMSError(MethodNotImplemented)
         if mask is None:
             self._tempMask_ = None
         else:
-            assert type(mask)==numpy.ndarray, 'Mask must be a numpy array'
-            assert mask.shape==self.shape,'Mask must have shape %s'%`self.shape`
+            assert isinstance(mask, numpy.ndarray), 'Mask must be a numpy array'
+            assert mask.shape == self.shape, 'Mask must have shape %s'%repr(self.shape)
             self._tempMask_ = copy.copy(mask)
 
     def getMaskVar(self):
         return self._maskVar_
 
-## internattr.add_internal_attribute(FileRectGrid)
+# internattr.add_internal_attribute(FileRectGrid)
 
 # In-memory rectilinear grid
 class TransientRectGrid(AbstractRectGrid):
     "Grids that live in memory only."
     def __init__(self, latobj, lonobj, order, gridtype, maskarray=None):
-        AbstractRectGrid.__init__(self,None)
+        AbstractRectGrid.__init__(self, None)
         if latobj.__class__ != TransientAxis:
             latobj = TransientAxis(latobj[:], latobj.getBounds())
         if lonobj.__class__ != TransientAxis:
@@ -765,8 +781,8 @@ class TransientRectGrid(AbstractRectGrid):
         self._lataxis_.designateLatitude()
         self._lonaxis_ = lonobj
         self._lonaxis_.designateLongitude()
-        if not order in ["yx","xy"]:
-            raise CDMSError, 'Grid order must be "yx" or "xy"'
+        if not order in ["yx", "xy"]:
+            raise CDMSError('Grid order must be "yx" or "xy"')
         self._order_ = order
         self.setType(gridtype)
         self.setMask(maskarray)        # numpy mask array
@@ -782,17 +798,17 @@ class TransientRectGrid(AbstractRectGrid):
     # with persistent versions, is ignored.
     def setMask(self,mask, persistent=0):
         if mask is not None:
-            if type(mask)!=numpy.ndarray:
-               raise CDMSError, 'Mask must be a numpy array'
+            if not isinstance(mask, numpy.ndarray):
+                raise CDMSError('Mask must be a numpy array')
             if mask.shape != self.shape:
-               raise CDMSError, 'Mask must have shape %s'%`self.shape`
+                raise CDMSError('Mask must have shape %s'%repr(self.shape))
         self._maskArray_ = copy.copy(mask)
 
     def setBounds(self, latBounds, lonBounds):
         self._lataxis_.setBounds(latBounds)
         self._lonaxis_.setBounds(lonBounds)
 
-## internattr.add_internal_attribute(TransientRectGrid)
+# internattr.add_internal_attribute(TransientRectGrid)
 
 def isGrid(grid):
     """
@@ -808,9 +824,8 @@ def writeScripGrid(path, grid, gridTitle=None):
     grid is a CDMS grid object.
     gridTitle is a string ID for the grid.
     """
-    
+
     import Cdunif
-    f = Cdunif.CdunifFile(path,'w')
+    f = Cdunif.CdunifFile(path, 'w')
     grid.writeScrip(f, gridTitle)
     f.close()
-
diff --git a/Packages/cdms2/Lib/gsHost.py b/Packages/cdms2/Lib/gsHost.py
index 343a3c842..4933e7f49 100644
--- a/Packages/cdms2/Lib/gsHost.py
+++ b/Packages/cdms2/Lib/gsHost.py
@@ -5,7 +5,7 @@ A file-like object to access a host file, the single entry point
 to an entire gridspec data file layout.
 
 Dave Kindig and Alex Pletzer, Tech-X (2011)
-This code is provided with the hope that it will be useful. 
+This code is provided with the hope that it will be useful.
 No guarantee is provided whatsoever. Use at your own risk.
 """
 
@@ -24,7 +24,8 @@ except:
     # raise ImportError, 'Error: could not import pycf'
     print 'Error: could not import pycf'
 
-def open(hostfile, mode = 'r'):
+
+def open(hostfile, mode='r'):
     """
     Open host file
     @param hostfile host file
@@ -34,17 +35,19 @@ def open(hostfile, mode = 'r'):
     outHostFile = Host(hostfile, mode)
     return outHostFile
 
+
 class Host:
+
     """
     A LibCF/GRIDSPEC host file object. This acts as the single point of entry to
     a GRIDSPEC aggregation. Variables and grids can be requested solely through
-    the Host object, which is a hybrid between a variable and file object. 
+    the Host object, which is a hybrid between a variable and file object.
     Host relies on the libcf shared object. As such, if there is a problem
     consult http://www.unidata.ucar.edu/software/libcf/docs/libcf/ for details
     on building host files and all related GRIDSPEC files.
     """
 
-    def __init__(self, hostfile, mode = 'r'):
+    def __init__(self, hostfile, mode='r'):
         """
         Constructor
         @param hostfile path to the host
@@ -54,42 +57,41 @@ class Host:
         self.__initialize()
         self.uri = hostfile
         self.mode = mode
-        
+
         # Data dir based on location of hostfile
         if mode != 'r':
-            raise CDMSError, 'Only read mode is supported for host file'
+            raise CDMSError('Only read mode is supported for host file')
 
         for sosuffix in '.so', '.dylib', '.dll', '.a':
             self.libcfdll = CDLL(LIBCF + sosuffix)
             if self.libcfdll:
                 break
 
-        if self.libcfdll == None: 
-            raise CDMSError, 'libcf not installed or incorrect path\n  '
+        if self.libcfdll is None:
+            raise CDMSError('libcf not installed or incorrect path\n  ')
 
         libcfdll = self.libcfdll
 
         status = libcfdll.nccf_def_host_from_file(hostfile,
-                                               byref(self.hostId_ct))
+                                                  byref(self.hostId_ct))
         if status != 0:
-            raise CDMSError, \
-                "ERROR: not a valid host file %s (status=%d)" % \
-                (hostfile, status)
+            raise CDMSError("ERROR: not a valid host file %s (status=%d)" %
+                            (hostfile, status))
 
         # Attach global attrs
-        libcfdll.nccf_def_global_from_file( hostfile, \
-                                            byref(self.globalId_ct))
+        libcfdll.nccf_def_global_from_file(hostfile,
+                                           byref(self.globalId_ct))
 
         # get the global attributes from the file
         natts = c_int(-1)
-        attName_ct = c_char_p(" " * (libCFConfig.NC_MAX_NAME+1))
-        attValu_ct = c_char_p(" " * (libCFConfig.NC_MAX_NAME+1))
-        self.libcfdll.nccf_inq_global_natts( self.globalId_ct, byref(natts))
+        attName_ct = c_char_p(" " * (libCFConfig.NC_MAX_NAME + 1))
+        attValu_ct = c_char_p(" " * (libCFConfig.NC_MAX_NAME + 1))
+        self.libcfdll.nccf_inq_global_natts(self.globalId_ct, byref(natts))
         for i in range(natts.value):
-            self.libcfdll.nccf_inq_global_attval(self.globalId_ct, \
-                                                     i, attName_ct, \
-                                                     attValu_ct)
-            if not self.attributes.has_key( attName_ct.value ):
+            self.libcfdll.nccf_inq_global_attval(self.globalId_ct,
+                                                 i, attName_ct,
+                                                 attValu_ct)
+            if attName_ct.value not in self.attributes:
                 self.attributes[attName_ct.value] = attValu_ct.value
 
         self.id = hostfile
@@ -97,28 +99,28 @@ class Host:
         i_ct = c_int()
         status = libcfdll.nccf_inq_host_ngrids(self.hostId_ct, byref(i_ct))
         self.nGrids = i_ct.value
-        status = libcfdll.nccf_inq_host_nstatdatafiles(self.hostId_ct, \
-                                                           byref(i_ct))
+        status = libcfdll.nccf_inq_host_nstatdatafiles(self.hostId_ct,
+                                                       byref(i_ct))
         self.nStatDataFiles = i_ct.value
-        status = libcfdll.nccf_inq_host_ntimedatafiles(self.hostId_ct, \
-                                                           byref(i_ct))
+        status = libcfdll.nccf_inq_host_ntimedatafiles(self.hostId_ct,
+                                                       byref(i_ct))
 
         self.nTimeDataFiles = i_ct.value
-        status = libcfdll.nccf_inq_host_ntimeslices(self.hostId_ct, \
-                                                        byref(i_ct))
+        status = libcfdll.nccf_inq_host_ntimeslices(self.hostId_ct,
+                                                    byref(i_ct))
         self.nTimeSliceFiles = i_ct.value
 
-        fName_ct = c_char_p(" " * (libCFConfig.NC_MAX_NAME+1))
-        gName_ct = c_char_p(" " * (libCFConfig.NC_MAX_NAME+1))
+        fName_ct = c_char_p(" " * (libCFConfig.NC_MAX_NAME + 1))
+        gName_ct = c_char_p(" " * (libCFConfig.NC_MAX_NAME + 1))
 
-        self.dimensions = {"nGrids": self.nGrids, 
+        self.dimensions = {"nGrids": self.nGrids,
                            "nStatDataFiles": self.nStatDataFiles,
                            "nTimeDataFiles": self.nTimeDataFiles,
-                           "nTimeSliceFiles":self.nTimeSliceFiles }
+                           "nTimeSliceFiles": self.nTimeSliceFiles}
 
         # Mosaic filename (use getMosaic to return the connectivity)
         mosaicFilename = c_char_p(" " * (libCFConfig.NC_MAX_NAME + 1))
-        status = libcfdll.nccf_inq_host_mosaicfilename(self.hostId_ct, 
+        status = libcfdll.nccf_inq_host_mosaicfilename(self.hostId_ct,
                                                        mosaicFilename)
         self.mosaicFilename = mosaicFilename.value
 
@@ -131,9 +133,9 @@ class Host:
         # static data
         for vfindx in range(self.nStatDataFiles):
             for gfindx in range(self.nGrids):
-                status = libcfdll.nccf_inq_host_statfilename(self.hostId_ct, 
-                                                          vfindx, gfindx, 
-                                                          fName_ct)
+                status = libcfdll.nccf_inq_host_statfilename(self.hostId_ct,
+                                                             vfindx, gfindx,
+                                                             fName_ct)
                 statFilenames.append(fName_ct.value)
                 f = cdms2.open(fName_ct.value, 'r')
                 varNames = f.listvariable()
@@ -142,12 +144,12 @@ class Host:
                     # Add coordinate names a local list of coordinates
                     if 'coordinates' in dir(f[vn]):
                         for coord in f[vn].coordinates.split():
-                            if not coord in coordinates: 
+                            if not coord in coordinates:
                                 coordinates.append(coord)
-                    if not self.statVars.has_key(vn):
+                    if vn not in self.statVars:
                         # allocate
-                        self.statVars[vn] = ["" for ig in \
-                                                 range(self.nGrids)] 
+                        self.statVars[vn] = ["" for ig in
+                                             range(self.nGrids)]
 
                     # set file name
                     self.statVars[vn][gfindx] = fName_ct.value
@@ -158,11 +160,11 @@ class Host:
             for tfindx in range(self.nTimeSliceFiles):
                 for gfindx in range(self.nGrids):
                     status = \
-                        libcfdll.nccf_inq_host_timefilename(self.hostId_ct, 
-                                                            vfindx, \
-                                                                tfindx, \
-                                                                gfindx, \
-                                                              fName_ct)
+                        libcfdll.nccf_inq_host_timefilename(self.hostId_ct,
+                                                            vfindx,
+                                                            tfindx,
+                                                            gfindx,
+                                                            fName_ct)
                     timeFilenames.append(fName_ct.value)
                     f = cdms2.open(fName_ct.value, 'r')
                     varNames = f.listvariable()
@@ -170,13 +172,13 @@ class Host:
                         # Add coordinate names a local list of coordinates
                         if 'coordinates' in dir(f[vn]):
                             for coord in f[vn].coordinates.split():
-                                if not coord in coordinates: 
+                                if not coord in coordinates:
                                     coordinates.append(coord)
-                        if not self.timeVars.has_key(vn):
+                        if vn not in self.timeVars:
                             # allocate
                             self.timeVars[vn] = \
-                                [["" for it in range(self.nTimeSliceFiles)] \
-                                     for ig in range(self.nGrids)]
+                                [["" for it in range(self.nTimeSliceFiles)]
+                                 for ig in range(self.nGrids)]
                         # set file name
                         self.timeVars[vn][gfindx][tfindx] = fName_ct.value
                     f.close()
@@ -184,12 +186,12 @@ class Host:
         # Grid names and data. Must come after time and static file dictionaries
         # because they define the coordinates.
         for gfindx in range(self.nGrids):
-            status = libcfdll.nccf_inq_host_gridfilename(self.hostId_ct, 
-                                                      gfindx, 
-                                                      fName_ct)
-            status = libcfdll.nccf_inq_host_gridname(self.hostId_ct, 
-                                                      gfindx, 
-                                                      gName_ct)
+            status = libcfdll.nccf_inq_host_gridfilename(self.hostId_ct,
+                                                         gfindx,
+                                                         fName_ct)
+            status = libcfdll.nccf_inq_host_gridname(self.hostId_ct,
+                                                     gfindx,
+                                                     gName_ct)
 
             varNames = cdms2.open(fName_ct.value, 'r').listvariable()
             for vn in varNames:
@@ -204,23 +206,22 @@ class Host:
         # Populate the variables dictionary, avoid the grids
         self.variables = {}
         for item in self.statVars.keys():
-            self.variables[item] = StaticFileVariable(self, item) 
+            self.variables[item] = StaticFileVariable(self, item)
         for item in self.timeVars.keys():
             self.variables[item] = TimeFileVariable(self, item)
 
-
     def __initialize(self):
         """
-        private method to inititialze the hostObj and for use in reseting 
+        private method to inititialze the hostObj and for use in reseting
         the hostObj on close
         """
 
-        self.mode     = ''
+        self.mode = ''
         self.libcfdll = None
-        self.uri      = ''
-        self.id       = ''
+        self.uri = ''
+        self.id = ''
         self._status_ = ''
-        
+
         # ctypes variables
         self.hostId_ct = c_int(-1)
         self.globalId_ct = c_int(-1)
@@ -228,10 +229,10 @@ class Host:
         # number of grid files
         self.nGrids = 0
 
-        # number of static var files 
+        # number of static var files
         self.nStatDataFiles = 0
 
-        # number of time dependent var files 
+        # number of time dependent var files
         self.nTimeDataFiles = 0
 
         # number of time files
@@ -251,14 +252,14 @@ class Host:
         self.statVars = {}
 
         # global attributes
-        self.attributes = {}   
+        self.attributes = {}
 
     def getMosaic(self):
         """
         Get the mosaic filename
         @return mfn Mosaic filename
         """
-        from gsMosaic import Mosaic
+        from .gsMosaic import Mosaic
         mfn = Mosaic(self.mosaicFilename, "r")
 
         return mfn
@@ -282,10 +283,10 @@ class Host:
         """
         return self.gridName.values()
 
-    def getStatFilenames(self, varName = None):
+    def getStatFilenames(self, varName=None):
         """
         Return a list of static variable filenames
-        @param varName variable name (or None if all the static file names are to 
+        @param varName variable name (or None if all the static file names are to
                        be returned)
         @return list the file names corresponding to varName
         """
@@ -294,7 +295,7 @@ class Host:
         # return all the static var filenames
         return self.statVars.values()
 
-    def getTimeFilenames(self, varName = None):
+    def getTimeFilenames(self, varName=None):
         """
         Return a list of time dependent variable filenames
         @param varName variable name. None for all variables
@@ -311,7 +312,7 @@ class Host:
         @return list of coordinate names
         """
         return self.gridVars.keys()
-    
+
     def getNumGrids(self):
         """
         Get number of grids (tiles)
@@ -322,7 +323,7 @@ class Host:
 
     def getNumStatDataFiles(self):
         """
-        Get number of static data files 
+        Get number of static data files
         @return number static files
         """
         return self.nStatDataFiles
@@ -334,7 +335,7 @@ class Host:
         """
         return self.nTimeDataFiles
 
-    def listvariable(self, gstype = None):
+    def listvariable(self, gstype=None):
         """
         @param type Grid, Static, Time Dependent or None
         @return list of all variables, including static and time dependent, Default = None
@@ -356,9 +357,9 @@ class Host:
         # Raise error
         else:
             text = 'type must be "Static", "Time", None or empty'
-            raise CDMSError, text
+            raise CDMSError(text)
 
-    def listvariables(self, type = None):
+    def listvariables(self, type=None):
         """
         Synonymous to listvariable
         @param type Grid, Static, Time Dependent or None
@@ -373,9 +374,9 @@ class Host:
         @return attributes list
         """
         fName = ""
-        if self.statVars.has_key(varName):
+        if varName in self.statVars:
             fName = self.statVars[varName][0]
-        elif self.timeVars.has_key(varName):
+        elif varName in self.timeVars:
             fName = self.timeVars[varName][0][0]
         if fName:
             var = cdms2.open(fName, 'r')(varName)
@@ -397,12 +398,12 @@ class Host:
         @return [nGrids, (n0, n1, ...)]
         """
         return self.dimensions.keys()
-        
+
     def listglobal(self):
         """
         List global attributes of host file
         @return a list of the global attributes in the file
-        """ 
+        """
         return self.attributes.keys()
 
     def getglobal(self, attName):
@@ -410,10 +411,10 @@ class Host:
         Get the value of the global attribute
         @param [attName] - global attribute name
         @return attribute value
-        """        
+        """
         return self.attributes[attName]
 
-    def listall(self, varName = None, all = None):
+    def listall(self, varName=None, all=None):
         """
         Get info about data from the file.
         @param varName variable name
@@ -421,11 +422,12 @@ class Host:
         @return information about file.
         """
 
-        if varName is None: return None 
+        if varName is None:
+            return None
         var = self.getVariable(varName)
-        return var.listall(all = all)
+        return var.listall(all=all)
 
-    def showall(self, varName = None, all = None, device = None):
+    def showall(self, varName=None, all=None, device=None):
         """
         Get info about data from the file.
         @param varName variable name
@@ -433,9 +435,12 @@ class Host:
         @param device output device
         @return information about file.
         """
-        import sys, string
-        if device is None: device=sys.stdout
-        if varName is None: return None 
+        import sys
+        import string
+        if device is None:
+            device = sys.stdout
+        if varName is None:
+            return None
         var = self.getVariable(varName)
         alist = var.listall(all=all)
         device.write(string.join(alist, "\n"))
@@ -448,22 +453,22 @@ class Host:
         self.__initialize()
         self._status_ = 'closed'
 
-    def __repr__(self): 
+    def __repr__(self):
         """
         Python repr()
         @return res Print statement
         """
         res = "< '%s',  URI: '%s', MODE: '%s', STATUS: '%s',\n libcf: %s >" % \
-            ( self.__class__, self.uri, self.mode, 
+            (self.__class__, self.uri, self.mode,
               self._status_, self.libcfdll)
-        return res 
+        return res
 
     def __del__(self):
         """
         Free the host file from memory
         """
-        if self.hostId_ct.value >= 0: 
-            self.libcfdll.nccf_free_host( self.hostId_ct )
+        if self.hostId_ct.value >= 0:
+            self.libcfdll.nccf_free_host(self.hostId_ct)
         self.hostId_ct.value = -1
 
 # NOTE: There is no __call__ method for host files.
@@ -475,12 +480,12 @@ class Host:
         @return list of cdms2 file variables, one for each grid
         """
         # Static variables
-        if self.statVars.has_key(varName):
+        if varName in self.statVars:
             staticFV = StaticFileVariable(self, varName)
             return staticFV
 
         # Time variables
-        elif self.timeVars.has_key(varName):
+        elif varName in self.timeVars:
             timeVariables = TimeFileVariable(self, varName)
             return timeVariables
 
@@ -508,8 +513,9 @@ class Host:
         @return value
         """
         return self.attributes[name]
-    
-##############################################################################
+
+#
+
 
 def test():
     import sys
@@ -520,20 +526,20 @@ def test():
     from optparse import OptionParser
     parser = OptionParser()
     parser.add_option("-f", "--file", dest="hostFilename",
-                  help="host file name")
+                      help="host file name")
 
     options, args = parser.parse_args()
     if not options.hostFilename:
-        print """need to provide a host file, use -h 
+        print """need to provide a host file, use -h
 to get a full list of options"""
         sys.exit(1)
 
     print 'open file..., create grdspec file object...'
     gf = cdms2.open(options.hostFilename)
-    if gf._status_ == 'closed': 
+    if gf._status_ == 'closed':
         print "File not opened"
         sys.exit(1)
-    print 
+    print
     print "type=", type(gf)
     print 'listvariable...'
     print gf.listvariable()
@@ -552,15 +558,15 @@ to get a full list of options"""
     print 'acess time dependent data...', "V" in gf.listvariables()
     print gf['V'][0].size
 
-
     # Test the mosaic
     print 'getMosaic...', 'getMosaic' in dir(gf)
     mosaic = gf.getMosaic()
-    for c in mosaic.coordinate_names: 
+    for c in mosaic.coordinate_names:
         print c
-    for t in mosaic.tile_contacts: 
+    for t in mosaic.tile_contacts:
         print "%s -> %s" % (t, mosaic.tile_contacts[t])
 
-##############################################################################
+#
 
-if __name__ == "__main__": test()
+if __name__ == "__main__":
+    test()
diff --git a/Packages/cdms2/Lib/gsMosaic.py b/Packages/cdms2/Lib/gsMosaic.py
index 2592ada8c..983030222 100644
--- a/Packages/cdms2/Lib/gsMosaic.py
+++ b/Packages/cdms2/Lib/gsMosaic.py
@@ -3,7 +3,7 @@
 """
 A file-like object to access mosaic.
 Dave Kindig and Alex Pletzer, Tech-X (2011)
-This code is provided with the hope that it will be useful. 
+This code is provided with the hope that it will be useful.
 No guarantee is provided whatsoever. Use at your own risk.
 """
 
@@ -11,7 +11,7 @@ No guarantee is provided whatsoever. Use at your own risk.
 from re import search, sub
 from ctypes import c_char_p, c_int, CDLL, byref
 
-# numpy 
+# numpy
 from numpy import zeros, reshape
 
 # CDAT
@@ -24,12 +24,13 @@ from cdms2.error import CDMSError
 try:
     from pycf import libCFConfig, __path__
 except:
-    raise ImportError, 'Error: could not import pycf'
+    raise ImportError('Error: could not import pycf')
 
-LIBCFDIR  = __path__[0] + "/pylibcf"
-libCF  = libCFConfig
+LIBCFDIR = __path__[0] + "/pylibcf"
+libCF = libCFConfig
 
-def open(uri, mode = 'r'):
+
+def open(uri, mode='r'):
     """
     Open mosaic file
     @param mosaicfile mosaic file
@@ -40,6 +41,7 @@ def open(uri, mode = 'r'):
     outMosaicFile = Mosaic(uri, mode)
     return outMosaicFile
 
+
 def getSlab(strg):
     """
     From a string return a tuple of slice objects
@@ -58,26 +60,29 @@ def getSlab(strg):
             step = 1
             startIndex = int(m.group(1))
             endIndex = int(m.group(2))
-            if endIndex < startIndex: step = -1
+            if endIndex < startIndex:
+                step = -1
             slc = slice(startIndex, endIndex, step)
             res.append(slc)
     return tuple(res)
 
+
 class Mosaic:
+
     """
     Define a mosaic.
     """
 
-    def __init__(self, uri, mode = 'r'):
+    def __init__(self, uri, mode='r'):
         """
         Constructor
         @param uri Filename with path
         @param mode read/write. Currently only read is supported
         """
 
-        self.id      = uri
-        self.mode    = mode
-        self.uri     = uri
+        self.id = uri
+        self.mode = mode
+        self.uri = uri
         self._status = 'Open'
 
         self.mosaicId_ct = c_int(-1)
@@ -89,41 +94,44 @@ class Mosaic:
 
         libcfdll = self.lib
 
-        self.file_type           = ""
-        self.contact_map         = {}
-        self.tile_contacts       = {}
+        self.file_type = ""
+        self.contact_map = {}
+        self.tile_contacts = {}
         self.tile_contacts_compl = {}
-        self.coordinate_names    = []
-        self.tile_names          = []
+        self.coordinate_names = []
+        self.tile_names = []
 
-        status = libcfdll.nccf_def_mosaic_from_file(uri, "", 
+        status = libcfdll.nccf_def_mosaic_from_file(uri, "",
                                                     byref(self.mosaicId_ct))
 
         if status != 0:
-            raise CDMSError, "ERROR: %s is not a valid mosaic file (status = %d)" % \
-                (uri, status)
+            raise CDMSError("ERROR: %s is not a valid mosaic file (status = %d)" %
+                            (uri, status))
 
         # Get some sizes
-        nGrids         = c_int(-1)
-        ndims          = c_int(-1)
-        ncontacts      = c_int(-1)
+        nGrids = c_int(-1)
+        ndims = c_int(-1)
+        ncontacts = c_int(-1)
         libcfdll.nccf_inq_mosaic_ndims(self.mosaicId_ct, byref(ndims))
         libcfdll.nccf_inq_mosaic_ngrids(self.mosaicId_ct, byref(nGrids))
         libcfdll.nccf_inq_mosaic_ncontacts(self.mosaicId_ct, byref(ncontacts))
 
         # Build the character arrays
         separator_ct = libCF.CF_TILE_SEPARATOR
-        contact_map_ct  = c_char_p(" " * (libCF.NC_MAX_NAME+1))
-        tile_contact_ct = c_char_p(" " * (libCF.NC_MAX_NAME+1))
-        tile_name_ct    = c_char_p(" " * (libCF.NC_MAX_NAME+1))
+        contact_map_ct = c_char_p(" " * (libCF.NC_MAX_NAME + 1))
+        tile_contact_ct = c_char_p(" " * (libCF.NC_MAX_NAME + 1))
+        tile_name_ct = c_char_p(" " * (libCF.NC_MAX_NAME + 1))
         coord_ct = (c_char_p * ndims.value)()
 
         for iDim in range(ndims.value):
-            coord_ct[iDim] = " " * (libCF.NC_MAX_NAME+1)
+            coord_ct[iDim] = " " * (libCF.NC_MAX_NAME + 1)
 
         # Get the grid names
         for igrid in range(nGrids.value):
-            libcfdll.nccf_inq_mosaic_gridname(self.mosaicId_ct, igrid, tile_name_ct)
+            libcfdll.nccf_inq_mosaic_gridname(
+                self.mosaicId_ct,
+                igrid,
+                tile_name_ct)
             tname = str(tile_name_ct)
             self.tile_names.append(tname)
 
@@ -135,24 +143,24 @@ class Mosaic:
 
         # Get the contact map information
         for iContact in range(ncontacts.value):
-            status = libcfdll.nccf_inq_mosaic_contactmap(self.mosaicId_ct, \
-                                                       iContact, contact_map_ct)
-            status = libcfdll.nccf_inq_mosaic_tilecontact(self.mosaicId_ct, \
-                                                        iContact, tile_contact_ct)
+            status = libcfdll.nccf_inq_mosaic_contactmap(self.mosaicId_ct,
+                                                         iContact, contact_map_ct)
+            status = libcfdll.nccf_inq_mosaic_tilecontact(self.mosaicId_ct,
+                                                          iContact, tile_contact_ct)
 
-            tN1, tN2             = tile_contact_ct.value.split(separator_ct)
+            tN1, tN2 = tile_contact_ct.value.split(separator_ct)
             tileName1, tileName2 = tN1.strip(), tN2.strip()
-            s1, s2               = contact_map_ct.value.split(separator_ct)
+            s1, s2 = contact_map_ct.value.split(separator_ct)
 
             # slice objects
             slab1 = getSlab(s1.strip())
             slab2 = getSlab(s2.strip())
 
             # Create the tile contact dictionary. Non symmetric.
-            if not self.tile_contacts.has_key(tileName1):
+            if tileName1 not in self.tile_contacts:
                 self.tile_contacts[tileName1] = {}
             # The complement to tile_contacts
-            if not self.tile_contacts_compl.has_key(tileName2):
+            if tileName2 not in self.tile_contacts_compl:
                 self.tile_contacts_compl[tileName2] = {}
 
             # Attach the contact map (slab) between the tiles
@@ -184,13 +192,13 @@ class Mosaic:
             for sl in slab:
                 b = sl.start
                 e = sl.stop + 1
-                newsl = slice(max(b-1, 0), max(e-1, -1), sl.step)
+                newsl = slice(max(b - 1, 0), max(e - 1, -1), sl.step)
                 newslab.append(newsl)
             newslabs.append(tuple(newslab))
         slab1, slab2 = newslabs
-    
+
         return (slab1, slab2)
-    
+
     def getSeamGrids(self, coordData):
         """
         Retrieve the seem grids between two cell centered tiles
@@ -203,32 +211,33 @@ class Mosaic:
                 # Get the seam data
                 result.append(self.getSeamData(tn1, tn2, coordData))
 
-                # Get the triangle data. Need to find the three cells 
+                # Get the triangle data. Need to find the three cells
                 # comprising a corner.
                 if tn2 in self.tile_contacts.keys():
-                    t1n = self.tile_contacts[tn1].keys() 
-                    t2n = self.tile_contacts[tn2].keys() 
+                    t1n = self.tile_contacts[tn1].keys()
+                    t2n = self.tile_contacts[tn2].keys()
 
                     # Look for a tile in the main list. Now compare the adjacent
                     # tiles to 1 and 2 until there is match. Now we have tile 3
                     for tn3 in t1n:
                         if tn3 in t1n and tn3 in t2n:
                             cornerIndex = self.getCornerData(tn1, tn2, tn3)
+
                             def getCornerInfo(data, cornerindex):
                                 lon = data.getLongitude()
                                 lat = data.getLatitude()
                                 c1 = data[cornerindex]
                                 n1 = lon[cornerindex]
                                 t1 = lat[cornerindex]
-                                lonatts = {'units':lon.units, 
-                                           'standard_name':lon.standard_name}
-                                latatts = {'units':lat.units, 
-                                           'standard_name':lat.standard_name}
+                                lonatts = {'units': lon.units,
+                                           'standard_name': lon.standard_name}
+                                latatts = {'units': lat.units,
+                                           'standard_name': lat.standard_name}
 
                                 return c1, n1, t1, lonatts, latatts
 
                             def popCorner(d1, d2, d3, dtype):
-                                corner = zeros((2, 2), dtype = dtype)
+                                corner = zeros((2, 2), dtype=dtype)
                                 if 'data' in dir(d1):
                                     corner[0, 0] = d1.data
                                     corner[0, 1] = d2.data
@@ -242,7 +251,9 @@ class Mosaic:
                                 return corner
 
                             c1, n1, t1, lonAtts, latAtts = \
-                                        getCornerInfo(coordData[tn1], cornerIndex[0])
+                                getCornerInfo(
+                                    coordData[tn1],
+                                            cornerIndex[0])
                             c2, n2, t2, lonAtts, latAtts = \
                                 getCornerInfo(coordData[tn2], cornerIndex[1])
                             c3, n3, t3, lonAtts, latAtts = \
@@ -253,21 +264,27 @@ class Mosaic:
                             lon_dtype = coordData[tn1].getLongitude().dtype
                             lat_dtype = coordData[tn1].getLatitude().dtype
                             corner = popCorner(c1, c2, c3, dtype)
-                            lon    = popCorner(n1, n2, n3, lon_dtype)
-                            lat    = popCorner(t1, t2, t3, lat_dtype)
-                            gridid = 'corner_%d_%d_%d' % (coordData[tn1].gridIndex, \
-                                                           coordData[tn2].gridIndex, 
-                                                           coordData[tn3].gridIndex)
-                            gridAtts = {'lon':lonAtts, 'lat':latAtts, 'gridid':gridid}
-                            cornerGrid = self.createSeamGrid(lon, lat, gridAtts)
-
-                            cornerTV = cdms2.createVariable(corner, 
-                                             axes = cornerGrid.getAxisList(), 
-                                             grid = cornerGrid, 
-                                             attributes = coordData[tn1].attributes, 
-                                             id = gridid)
-                    
-                                
+                            lon = popCorner(n1, n2, n3, lon_dtype)
+                            lat = popCorner(t1, t2, t3, lat_dtype)
+                            gridid = 'corner_%d_%d_%d' % (coordData[tn1].gridIndex,
+                                                          coordData[
+                                tn2].gridIndex,
+                                coordData[tn3].gridIndex)
+                            gridAtts = {
+                                'lon': lonAtts,
+                                'lat': latAtts,
+                                'gridid': gridid}
+                            cornerGrid = self.createSeamGrid(
+                                lon, lat, gridAtts)
+
+                            cornerTV = cdms2.createVariable(corner,
+                                                            axes=cornerGrid.getAxisList(
+                                                            ),
+                                                            grid=cornerGrid,
+                                                            attributes=coordData[
+                                                            tn1].attributes,
+                                                            id=gridid)
+
         return (result, cornerTV)
 
     def getCornerData(self, tileName1, tileName2, tileName3):
@@ -276,9 +293,9 @@ class Mosaic:
         @tileName1 Tile name of first grid (tile)
         @tileName2 Tile name of second grid (tile)
         @tileName3 Tile name of third grid (tile)
-        @return tuple of data marking the corners of the corner grid        
+        @return tuple of data marking the corners of the corner grid
         """
-        
+
         # Get the slabs and account for cell centers
         s1, s2 = self.tile_contacts[tileName1][tileName2]
         s3, s4 = self.tile_contacts[tileName1][tileName3]
@@ -293,12 +310,18 @@ class Mosaic:
         c5, c6 = self.getContactCornerIndex(s5, s6)
 
         # Set the tuple containing the corner indices in j, i order.
-        if c1 == 0 and c3 == 1: pair1 = (s1[c1].start, s3[c3].start)
-        if c1 == 1 and c3 == 0: pair1 = (s3[c3].start, s1[c1].start)
-        if c2 == 0 and c5 == 1: pair2 = (s2[c2].start, s5[c5].start)
-        if c2 == 1 and c5 == 0: pair2 = (s5[c5].start, s2[c2].start)
-        if c4 == 0 and c6 == 1: pair3 = (s4[c4].start, s6[c6].start)
-        if c4 == 1 and c6 == 0: pair3 = (s6[c6].start, s4[c4].start)
+        if c1 == 0 and c3 == 1:
+            pair1 = (s1[c1].start, s3[c3].start)
+        if c1 == 1 and c3 == 0:
+            pair1 = (s3[c3].start, s1[c1].start)
+        if c2 == 0 and c5 == 1:
+            pair2 = (s2[c2].start, s5[c5].start)
+        if c2 == 1 and c5 == 0:
+            pair2 = (s5[c5].start, s2[c2].start)
+        if c4 == 0 and c6 == 1:
+            pair3 = (s4[c4].start, s6[c6].start)
+        if c4 == 1 and c6 == 0:
+            pair3 = (s6[c6].start, s4[c4].start)
 
         return (pair1, pair2, pair3)
 
@@ -326,7 +349,7 @@ class Mosaic:
         @return attrs Attributes for eash plus the gridid
         """
         pass
-        
+
     def createSeamGrid(self, x, y, attrs):
         """
         Return the coordinate data associated with variable.
@@ -337,34 +360,37 @@ class Mosaic:
         LONSTR = 'lon'
         LATSTR = 'lat'
 
-
         # Get the dimensions
         xdim = x.shape
         ydim = y.shape
 
-        if xdim != ydim: 
-            raise CDMSError, "Dimension of coordinates grids don't match"
+        if xdim != ydim:
+            raise CDMSError("Dimension of coordinates grids don't match")
 
         nj = xdim[0]
         ni = xdim[1]
 
         # Define the axes, verifying the lon and lat grids
-        jaxis = TransientVirtualAxis("j",nj)
-        iaxis = TransientVirtualAxis("i",ni)
-
-        if search(LONSTR, attrs['lon']['standard_name']): lon = x
-        if search(LONSTR, attrs['lat']['standard_name']): lon = y
-        if search(LATSTR, attrs['lon']['standard_name']): lat = x
-        if search(LATSTR, attrs['lat']['standard_name']): lat = y
-
-        lataxis = TransientAxis2D(lat, 
-                       axes=(jaxis, iaxis), 
-                       attributes=attrs['lat'], 
-                       id=attrs['lat']['standard_name'])
-        lonaxis = TransientAxis2D(lon, 
-                       axes=(jaxis, iaxis), 
-                       attributes=attrs['lon'], 
-                       id=attrs['lon']['standard_name'])
+        jaxis = TransientVirtualAxis("j", nj)
+        iaxis = TransientVirtualAxis("i", ni)
+
+        if search(LONSTR, attrs['lon']['standard_name']):
+            lon = x
+        if search(LONSTR, attrs['lat']['standard_name']):
+            lon = y
+        if search(LATSTR, attrs['lon']['standard_name']):
+            lat = x
+        if search(LATSTR, attrs['lat']['standard_name']):
+            lat = y
+
+        lataxis = TransientAxis2D(lat,
+                                  axes=(jaxis, iaxis),
+                                  attributes=attrs['lat'],
+                                  id=attrs['lat']['standard_name'])
+        lonaxis = TransientAxis2D(lon,
+                                  axes=(jaxis, iaxis),
+                                  attributes=attrs['lon'],
+                                  id=attrs['lon']['standard_name'])
 
         # Define the combined grid
         grid = TransientCurveGrid(lataxis, lonaxis, id=attrs['gridid'])
@@ -380,7 +406,7 @@ class Mosaic:
         """
 
         slab1, slab2 = self.tile_contacts[tileName][otherTileName]
-    
+
         # Convert to cell centered slabs
         slab1, slab2 = self.getCellCenteredSlab(slab1, slab2)
         d1 = inputData[tileName]
@@ -397,11 +423,12 @@ class Mosaic:
 
         data1, lon1, lat1 = createNewVar(inputData[tileName], slab1)
         data2, lon2, lat2 = createNewVar(inputData[otherTileName], slab2)
-        
+
         # Remove dimensions of size 1.
         shape = []
         for d in data1.shape:
-            if d != 1: shape.append(d)
+            if d != 1:
+                shape.append(d)
 
         newshape = tuple(shape + [2])
         shape = tuple(shape)
@@ -415,21 +442,22 @@ class Mosaic:
         newLat[:, 0] = reshape(lat1[:], shape)
         newLat[:, 1] = reshape(lat2, shape)
         gridid = 'seam_tile%d_tile%d' % (data1.gridIndex, data2.gridIndex)
-        gridAtts = {'lon':{'units':l1.units, 'standard_name':l1.standard_name}, \
-                    'lat':{'units':t1.units, 'standard_name':t1.standard_name}, \
-                    'gridid':gridid}
+        gridAtts = {
+            'lon': {'units': l1.units, 'standard_name': l1.standard_name},
+                    'lat':
+                        {'units': t1.units, 'standard_name': t1.standard_name},
+                    'gridid': gridid}
         seamGrid = self.createSeamGrid(newLon, newLat, gridAtts)
 
         dataAtts = {'gridid': gridid}
-        newData = cdms2.createVariable(newVar, 
-                         axes = seamGrid.getAxisList(), 
-                         grid = seamGrid, 
-                         attributes = d1.attributes, 
-                         id = dataAtts['gridid'])
+        newData = cdms2.createVariable(newVar,
+                                       axes=seamGrid.getAxisList(),
+                                       grid=seamGrid,
+                                       attributes=d1.attributes,
+                                       id=dataAtts['gridid'])
 
         return newData
 
-    
     def getCoordinateNames(self):
         """
         Get the coordinate names for a mosaic
@@ -439,7 +467,7 @@ class Mosaic:
 
     def __repr__(self):
         res = "<Mosaic: '%s',  URI: '%s', mode: '%s', status: '%s' >" % \
-            ( self.id, self.uri, self.mode, self._status)
+            (self.id, self.uri, self.mode, self._status)
         return res
 
     def __call__(self):
@@ -448,7 +476,8 @@ class Mosaic:
     def __del__(self):
         self.lib.nccf_free_mosaic(self.mosaicId_ct)
 
-#############################################################################
+#
+
 
 def test():
     import os.path
@@ -460,7 +489,7 @@ def test():
     """
     parser = OptionParser()
     parser.add_option("-f", "--file", dest="mfile",
-                  help="full path to mosaic file")
+                      help="full path to mosaic file")
 
     options, args = parser.parse_args()
     if not options.mfile:
@@ -474,12 +503,16 @@ def test():
     m = open(options.mfile)
 
     print "\nCoordinate Names"
-    for c in m.coordinate_names: print c
+    for c in m.coordinate_names:
+        print c
 
     print "\nTile Contacts"
-    for t in m.tile_contacts: print "%s -> %s" % (t, m.tile_contacts[t])
+    for t in m.tile_contacts:
+        print "%s -> %s" % (t, m.tile_contacts[t])
     print "\nTile Contacts Complement"
-    for t in m.tile_contacts_compl: print "%s -> %s" % (t, m.tile_contacts_compl[t])
+    for t in m.tile_contacts_compl:
+        print "%s -> %s" % (t, m.tile_contacts_compl[t])
     print
 
-if __name__ == "__main__": test()
+if __name__ == "__main__":
+    test()
diff --git a/Packages/cdms2/Lib/gsStaticVariable.py b/Packages/cdms2/Lib/gsStaticVariable.py
index fdd740c86..5a1910fe2 100644
--- a/Packages/cdms2/Lib/gsStaticVariable.py
+++ b/Packages/cdms2/Lib/gsStaticVariable.py
@@ -3,7 +3,7 @@
 """
 A variable-like object extending over multiple tiles
 Dave Kindig and Alex Pletzer, Tech-X Corp. (2011)
-This code is provided with the hope that it will be useful. 
+This code is provided with the hope that it will be useful.
 No guarantee is provided whatsoever. Use at your own risk.
 """
 
@@ -17,6 +17,7 @@ from cdms2.coord import FileAxis2D
 from cdms2.gengrid import FileGenericGrid
 from cdms2.fvariable import FileVariable
 from cdms2.axis import FileAxis
+from functools import reduce
 
 try:
     from pycf import libCFConfig as libcf
@@ -24,6 +25,7 @@ except:
 #    raise ImportError, 'Error: could not import pycf'
     pass
 
+
 def createTransientGrid(gFName, coordinates):
     """
     Return the coordinate data associated with variable.
@@ -35,7 +37,7 @@ def createTransientGrid(gFName, coordinates):
 
     fh = cdms2.open(gFName)
     gridid = None
-    if libcf.CF_GRIDNAME in fh.attributes.keys(): 
+    if libcf.CF_GRIDNAME in fh.attributes.keys():
         gridid = getattr(fh, libcf.CF_GRIDNAME)
     xn, yn = coordinates.split()
 
@@ -46,8 +48,8 @@ def createTransientGrid(gFName, coordinates):
     xdim = x.shape
     ydim = y.shape
 
-    if xdim != ydim: 
-        raise CDMSError, "Dimension of coordinates grids don't match"
+    if xdim != ydim:
+        raise CDMSError("Dimension of coordinates grids don't match")
 
     ni = xdim[1]
     nj = xdim[0]
@@ -55,32 +57,39 @@ def createTransientGrid(gFName, coordinates):
     lonstr = 'lon'
     latstr = 'lat'
 
-    if re.search(lonstr, x.standard_name): lon = x
-    if re.search(lonstr, y.standard_name): lon = y
-    if re.search(latstr, x.standard_name): lat = x
-    if re.search(latstr, y.standard_name): lat = y
+    if re.search(lonstr, x.standard_name):
+        lon = x
+    if re.search(lonstr, y.standard_name):
+        lon = y
+    if re.search(latstr, x.standard_name):
+        lat = x
+    if re.search(latstr, y.standard_name):
+        lat = y
 
     # Define the axes, verifying the lon and lat grids
     iaxis = TransientVirtualAxis("i", ni)
     jaxis = TransientVirtualAxis("j", nj)
 
-    lataxis = TransientAxis2D(lat, 
-                   axes=(iaxis, jaxis), 
-                   attributes={'units': lat.units}, 
-                   id=lat.standard_name)
-    lonaxis = TransientAxis2D(lon, 
-                   axes=(iaxis, jaxis), 
-                   attributes={'units': lon.units}, 
-                   id=lon.standard_name)
+    lataxis = TransientAxis2D(lat,
+                              axes=(iaxis, jaxis),
+                              attributes={'units': lat.units},
+                              id=lat.standard_name)
+    lonaxis = TransientAxis2D(lon,
+                              axes=(iaxis, jaxis),
+                              attributes={'units': lon.units},
+                              id=lon.standard_name)
 
     # Define the combined grid
     grid = TransientCurveGrid(lataxis, lonaxis, id=gridid)
     return grid
 
+
 class StaticVariable:
+
     """
     Constructor
     """
+
     def __init__(self, StaticVariable, hostObj, varName):
         """
         Constructor - Contains methods applicable to both file and transient static variables
@@ -88,12 +97,12 @@ class StaticVariable:
         @param hostObj The host file object
         @param varName for the id
         """
-        StaticVariable.id     = varName
+        StaticVariable.id = varName
         StaticVariable.nGrids = hostObj.nGrids
 
         StaticVariable.vars = []
         if StaticVariable.nGrids > 0:
-            StaticVariable.vars = [None]*StaticVariable.nGrids
+            StaticVariable.vars = [None] * StaticVariable.nGrids
 
     def __getitem__(self, gridIndex):
         """
@@ -151,10 +160,13 @@ class StaticVariable:
             return self.vars[0].typecode()
         return None
 
+
 class StaticFileVariable(StaticVariable):
+
     """
     Static variable extending over multiple grid files
     """
+
     def __init__(self, hostObj, varName):
         """
         Create a list of file variable with grid attached
@@ -173,8 +185,11 @@ class StaticFileVariable(StaticVariable):
             gn = gridFilenames[gridIndex]
 
             # Open the files
-            f = cdms2.open(fn, mode)   # Need f and u because they serve slightly different purposes
-            u = CdunifFile(fn, mode)   # f.axes exists while axes is not a part of u
+            f = cdms2.open(fn, mode)
+                           # Need f and u because they serve slightly different
+                           # purposes
+            u = CdunifFile(fn, mode)
+                           # f.axes exists while axes is not a part of u
 #            u.variables[varName].gridIndex = gridIndex
             g = CdunifFile(gn, mode)
 
@@ -187,20 +202,22 @@ class StaticFileVariable(StaticVariable):
             coordsaux = f._convention_.getAxisAuxIds(u.variables, coords1d)
 
             # Convert the variable into a FileVariable
-            f.variables[varName] = FileVariable(f, varName, u.variables[varName])
+            f.variables[varName] = FileVariable(
+                f, varName, u.variables[varName])
 
             # Add the coordinates to the file
             for coord in coords:
                 f.variables[coord] = g.variables[coord]
                 f.variables[coord] = FileAxis2D(f, coord, g.variables[coord])
-            
+
             # Build the axes
             for key in f.axes.keys():
                 f.axes[key] = FileAxis(f, key, None)
 
             # Set the boundaries
             for coord in coords:
-                bounds = f._convention_.getVariableBounds(f, f.variables[coord])
+                bounds = f._convention_.getVariableBounds(
+                    f, f.variables[coord])
                 f.variables[coord].setBounds(bounds)
 
             # Initialize the domain
@@ -208,26 +225,35 @@ class StaticFileVariable(StaticVariable):
                 var.initDomain(f.axes)
 
             # Add the grid
-            gridkey, lat, lon = f.variables[varName].generateGridkey(f._convention_, f.variables)
+            gridkey, lat, lon = f.variables[
+                varName].generateGridkey(f._convention_, f.variables)
             gridname = "grid_%dx%d" % lat.shape
-#            grid = FileGenericGrid(lat, lon, gridname, parent = f, maskvar = None)
-            grid = FileCurveGrid(lat, lon, gridname, parent = f, maskvar = None)
+# grid = FileGenericGrid(lat, lon, gridname, parent = f, maskvar = None)
+            grid = FileCurveGrid(
+                lat,
+                lon,
+                gridname,
+                parent=f,
+                maskvar=None)
             f.variables[varName]._grid_ = grid
             self.vars[gridIndex] = f.variables[varName]
         self._repr_string = "StaticFileVariable"
 
-    def listall(self, all = None):
+    def listall(self, all=None):
         """
         Gain access to cdms2 listall method. Requires a StaticFileVariable
         @param all
         @returns list
         """
-        return self[0].listall(all = all)
+        return self[0].listall(all=all)
+
 
 class StaticTransientVariable(StaticVariable):
+
     """
     Static variable extending over multiple grid files
     """
+
     def __init__(self, hostObj, varName):
         """
         Constructor
@@ -247,15 +273,17 @@ class StaticTransientVariable(StaticVariable):
             # name of the file containing coordinate data
             gFName = gridFilenames[gridIndex]
 
-            fh = cdms2.open(fName, hostObj = hostObj)
+            fh = cdms2.open(fName, hostObj=hostObj)
             gh = cdms2.open(gFName)
 
             vr = fh(varName)
-            vr.gridIndex    = gridIndex
+            vr.gridIndex = gridIndex
 
             grid = None
             if 'coordinates' in vr.attributes.keys():
-                grid = createTransientGrid(gFName, vr.attributes['coordinates'])
+                grid = createTransientGrid(
+                    gFName,
+                    vr.attributes['coordinates'])
             atts = dict(vr.attributes)
             atts.update(gh.attributes)
             if libcf.CF_GRIDNAME in fh.attributes.keys():
@@ -263,18 +291,19 @@ class StaticTransientVariable(StaticVariable):
 
             # Create the variable
             if grid:
-                var = cdms2.createVariable(vr, 
-                                axes = grid.getAxisList(), 
-                                grid = grid, 
-                                attributes = atts, 
-                                id = vr.standard_name)
-            else: 
+                var = cdms2.createVariable(vr,
+                                           axes=grid.getAxisList(),
+                                           grid=grid,
+                                           attributes=atts,
+                                           id=vr.standard_name)
+            else:
                 var = vr
             self.vars[gridIndex] = var
         self._repr_string = "StaticTransientVariable"
 
+
 def test():
     pass
 
-if __name__ == '__main__': test()
- 
+if __name__ == '__main__':
+    test()
diff --git a/Packages/cdms2/Lib/gsTimeVariable.py b/Packages/cdms2/Lib/gsTimeVariable.py
index 1f4268fb7..0a0c4d571 100644
--- a/Packages/cdms2/Lib/gsTimeVariable.py
+++ b/Packages/cdms2/Lib/gsTimeVariable.py
@@ -23,10 +23,13 @@ from cdms2.fvariable import FileVariable
 from cdms2.axis import FileAxis, TransientAxis
 from cdms2.axis import concatenate as axisConcatenate
 
+
 class TimeAggregatedFileVariable:
+
     """
     Constructor Class for aggregating a time dependant variable across files.
     """
+
     def __init__(self, gridIndex, listOfFVs, hostObj):
         """
         @param gridIndex Index of requested grid
@@ -36,10 +39,12 @@ class TimeAggregatedFileVariable:
         self.fvs = listOfFVs
         self.gridIndex = gridIndex
         self.hostObj = hostObj
-        self.nTimeStepFiles = hostObj.nTimeSliceFiles * hostObj.nTimeDataFiles * hostObj.nGrids
+        self.nTimeStepFiles = hostObj.nTimeSliceFiles * \
+            hostObj.nTimeDataFiles * hostObj.nGrids
         it = self.getTimeAxisIndex(self.fvs[0].getAxisList())
         self.nTimeStepsPerFile = (self.fvs[0].shape)[it]
-        self.nTimeStepsPerVariable = hostObj.nTimeSliceFiles * self.nTimeStepsPerFile
+        self.nTimeStepsPerVariable = hostObj.nTimeSliceFiles * \
+            self.nTimeStepsPerFile
 
     def __call__(self, *args, **kwargs):
         """
@@ -65,7 +70,7 @@ class TimeAggregatedFileVariable:
         @param slc Integer, slice or tuple of slices. If tuple 0 is time
         @return sliced variable
         """
-        
+
         if isinstance(slc, int):
             # return FileVariable
             return self.fvs[slc]
@@ -76,10 +81,12 @@ class TimeAggregatedFileVariable:
             axes = self.fvs[0].getAxisList()
             timeAxisIndex = self.getTimeAxisIndex(axes)
             if timeAxisIndex is None:
-                CDMSError, "No time axis in :\n"  + axes
+                CDMSError, "No time axis in :\n" + axes
             if isinstance(slc[timeAxisIndex], slice):
-                (fileInds, timeStepInds) = self.getTimeFileIndex(slc[timeAxisIndex])
-                tv = self.createTransientVariableFromIndices(fileInds, timeStepInds)
+                (fileInds, timeStepInds) = self.getTimeFileIndex(
+                    slc[timeAxisIndex])
+                tv = self.createTransientVariableFromIndices(
+                    fileInds, timeStepInds)
                 newslc = self.buildSlice(slc, tv.getAxisList())
                 return tv[newslc]
             elif isinstance(slc[timeAxisIndex], int):
@@ -87,13 +94,15 @@ class TimeAggregatedFileVariable:
                 timeIndex = slc[timeAxisIndex] % nTSF
 
                 # Get just the file needed for the index slice requested.
-                tv = self.createTransientVariableFromIndices(fileIndex, timeIndex)
+                tv = self.createTransientVariableFromIndices(
+                    fileIndex, timeIndex)
                 newslc = self.buildSlice(slc, axes)
                 return tv[newslc]
 
         elif isinstance(slc, slice):
             (fileInds, timeStepInds) = self.getTimeFileIndex(slc)
-            tv = self.createTransientVariableFromIndices(fileInds, timeStepInds)
+            tv = self.createTransientVariableFromIndices(
+                fileInds, timeStepInds)
             return tv
 
     def __len__(self):
@@ -115,8 +124,10 @@ class TimeAggregatedFileVariable:
         timI2 = []
         filI2 = []
 
-        if timeslc.step is None: step = 1
-        else: step = timeslc.step
+        if timeslc.step is None:
+            step = 1
+        else:
+            step = timeslc.step
         stop = timeslc.stop
         if timeslc.stop >= nTSV:
             stop = nTSV
@@ -128,7 +139,7 @@ class TimeAggregatedFileVariable:
                 timI1.append(tt[indx])
                 filI1.append(ii[indx])
             else:
-                if ii[indx] == ii[indx-1]:
+                if ii[indx] == ii[indx - 1]:
                     timI1.append(tt[indx])
                     filI1.append(ii[indx])
                 else:
@@ -152,7 +163,8 @@ class TimeAggregatedFileVariable:
         @return the index - None if time not found
         """
         for indx, axis in enumerate(inAxes):
-            if axis.isTime(): return indx
+            if axis.isTime():
+                return indx
             return None
 
     def buildSlice(self, inslc, inAxes):
@@ -168,8 +180,9 @@ class TimeAggregatedFileVariable:
         newslc = []
         for cslc, axis in zip(inslc, inAxes):
             if axis.isTime():
-                if type(cslc) is int:
-                    # Omit slice - the new variable has only the shape of the grid.
+                if isinstance(cslc, int):
+                    # Omit slice - the new variable has only the shape of the
+                    # grid.
                     continue
                 else:
                     newslc.append(slice(None, None, None))
@@ -213,13 +226,13 @@ class TimeAggregatedFileVariable:
         Aggregate a time file variable. Start and End Indices use slice notation.
         @param fileIndices the file indices to aggregate across
         @param timeIndices which time steps with in each file
-        @return aggregated time dep. variable. Has shape of full grid. 
+        @return aggregated time dep. variable. Has shape of full grid.
                 Subset the grid after exiting.
         """
         from numpy import reshape
         firsttime = True
         nTSF = self.nTimeStepsPerFile
-        if type(fileIndices) is not int:
+        if not isinstance(fileIndices, int):
             for files, times in zip(fileIndices, timeIndices):
                 for indx, file in enumerate(files):
                     # Should make these slices.
@@ -231,19 +244,21 @@ class TimeAggregatedFileVariable:
                     # Insert the new time axis.
                     axisTime = self.fvs[file].getTime()
                     timeAxis = TransientAxis([file * nTSF + times[indx]],
-                                              attributes = axisTime.attributes,
-                                              id = axisTime.id)
-                    axes = self.buildAxes(timeAxis, self.fvs[file].getAxisList())
+                                             attributes=axisTime.attributes,
+                                             id=axisTime.id)
+                    axes = self.buildAxes(
+                        timeAxis,
+                        self.fvs[file].getAxisList())
 
                     # shape --> tm1.shape = (1, :, :)
                     tm1 = reshape(cvar, tuple([1] + list(cvar.shape)))
 
                     # Attach needed items
                     var = cdms2.createVariable(tm1,
-                            axes = axes,
-                            grid = grid,
-                            attributes = atts,
-                            id = cvar.standard_name)
+                                               axes=axes,
+                                               grid=grid,
+                                               attributes=atts,
+                                               id=cvar.standard_name)
 
                     # Create cdms2 transient variable
                     if firsttime:
@@ -253,26 +268,31 @@ class TimeAggregatedFileVariable:
                         # insert the new time axis.
                         taA = new.getTime()
                         newTime = axisConcatenate((taA, timeAxis),
-                                                  attributes = axisTime.attributes,
-                                                  id = axisTime.id)
-                        axes = self.buildAxes(newTime, self.fvs[file].getAxisList())
+                                                  attributes=axisTime.attributes,
+                                                  id=axisTime.id)
+                        axes = self.buildAxes(
+                            newTime,
+                            self.fvs[file].getAxisList())
 
                         tmp = MV2concatenate((new, var))
                         new = cdms2.createVariable(tmp,
-                                axes = axes,
-                                grid = grid,
-                                attributes = atts,
-                                id = cvar.standard_name)
+                                                   axes=axes,
+                                                   grid=grid,
+                                                   attributes=atts,
+                                                   id=cvar.standard_name)
 
         else:
             new = self.fvs[fileIndices][timeIndices]
 
         return new
 
+
 class TimeFileVariable:
+
     """
     Construct an aggregated time dependant variable.
     """
+
     def __init__(self, hostObj, varName):
         """
         Create a list of file variable with grid attached
@@ -297,8 +317,12 @@ class TimeFileVariable:
 
                 # Open the files
                 fn = hostObj.timeVars[varName][gridIndex][timeFileIndex]
-                f = cdms2.open(fn, mode)   # Need f and u because they serve slightly different purposes
-                u = CdunifFile(fn, mode)   # f.axes exists while axes is not a part of u
+                f = cdms2.open(
+                    fn,
+                    mode)   # Need f and u because they serve slightly different purposes
+                u = CdunifFile(
+                    fn,
+                    mode)   # f.axes exists while axes is not a part of u
 #                u.variables[varName].gridIndex = gridIndex
 
                 # Turn the coordinates into a list
@@ -310,12 +334,14 @@ class TimeFileVariable:
                 coordsaux = f._convention_.getAxisAuxIds(u.variables, coords1d)
 
                 # Convert the variable into a FileVariable
-                f.variables[varName] = FileVariable(f, varName, u.variables[varName])
+                f.variables[varName] = FileVariable(
+                    f, varName, u.variables[varName])
 
                 # Add the coordinates to the file
                 for coord in coords:
                     f.variables[coord] = g.variables[coord]
-                    f.variables[coord] = FileAxis2D(f, coord, g.variables[coord])
+                    f.variables[coord] = FileAxis2D(
+                        f, coord, g.variables[coord])
 
                 # Build the axes
                 for key in f.axes.keys():
@@ -323,7 +349,8 @@ class TimeFileVariable:
 
                 # Set the boundaries
                 for coord in coords:
-                    bounds = f._convention_.getVariableBounds(f, f.variables[coord])
+                    bounds = f._convention_.getVariableBounds(
+                        f, f.variables[coord])
                     f.variables[coord].setBounds(bounds)
 
                 # Initialize the domain
@@ -331,10 +358,16 @@ class TimeFileVariable:
                     var.initDomain(f.axes)
 
                 # Add the grid
-                gridkey, lat, lon = f.variables[varName].generateGridkey(f._convention_, f.variables)
+                gridkey, lat, lon = f.variables[
+                    varName].generateGridkey(f._convention_, f.variables)
                 gridname = ("grid%d_" % gridIndex) + "%dx%d" % lat.shape
-#                grid = FileGenericGrid(lat, lon, gridname, parent = f, maskvar = None)
-                grid = FileCurveGrid(lat, lon, gridname, parent = f, maskvar = None)
+# grid = FileGenericGrid(lat, lon, gridname, parent = f, maskvar = None)
+                grid = FileCurveGrid(
+                    lat,
+                    lon,
+                    gridname,
+                    parent=f,
+                    maskvar=None)
                 f.variables[varName]._grid_ = grid
                 vars.append(f.variables[varName])
 
@@ -343,23 +376,23 @@ class TimeFileVariable:
 
         self._repr_string = "TimeFileVariable"
 
-    def listall(self, all = None):
+    def listall(self, all=None):
         """
         Gain access to cdms2 listall method. Requires a TimeFileVariable
         @param all
         @returns list
         """
-        return self[0][0].listall(all = all)
+        return self[0][0].listall(all=all)
 
-    def showall(self, all = None, device = None):
+    def showall(self, all=None, device=None):
         """
         Gain access to cdms2 showall method
         Requires a TimeFileVariable
         @param all
-        @param device 
+        @param device
         @returns list
         """
-        return self[0][0][:].showall(all = all, device = device)
+        return self[0][0][:].showall(all=all, device=device)
 
     def __getitem__(self, gridIndex):
         """
@@ -367,11 +400,13 @@ class TimeFileVariable:
         """
         return self.vars[gridIndex]
 
-###############################################################################
-############## DEPRECIATED - Testing required to fully remove #################
-###############################################################################
+#
+# DEPRECIATED - Testing required to fully remove #################
+#
+
 
 class TimeTransientVariable:
+
     def __init__(self, hostObj, varName, **slicekwargs):
         """
         Constructor
@@ -402,15 +437,18 @@ class TimeTransientVariable:
 
                 for timeFileIndex in range(hostObj.nTimeDataFiles):
 
-                    fName = hostObj.timeDepVars[varName][gridIndex][timeFileIndex]
+                    fName = hostObj.timeDepVars[
+                        varName][
+                            gridIndex][
+                                timeFileIndex]
                     fh = cdms2.open(fName, hostObj=hostObj)
 
                     # TransientVariable
                     var = fh(varName, **slicekwargs)
 
                     # Attach the grid to the variable
-                    grid = cdms2.gsStaticVariable.createTransientGrid(gFName, \
-                                         var.attributes['coordinates'])
+                    grid = cdms2.gsStaticVariable.createTransientGrid(gFName,
+                                                                      var.attributes['coordinates'])
                     axis0 = var.getAxis(0)
                     gridaxes = grid.getAxisList()
                     axes = [axis0] + list(gridaxes)
@@ -420,21 +458,21 @@ class TimeTransientVariable:
                     # Create cdms2 transient variable
                     if timeFileIndex == 0:
                         new = cdms2.createVariable(var,
-                                axes = axes,
-                                grid = grid,
-                                attributes = atts,
-                                id = var.standard_name)
+                                                   axes=axes,
+                                                   grid=grid,
+                                                   attributes=atts,
+                                                   id=var.standard_name)
                     else:
-                        tmp =MV2concatenate((new, var))
+                        tmp = MV2concatenate((new, var))
                         axis0 = tmp.getAxis(0)
                         gridaxes = grid.getAxisList()
                         axes = [axis0, gridaxes[0], gridaxes[1]]
 #                        new.append(tmp)
                         new = cdms2.createVariable(tmp,
-                                axes = axes,
-                                grid = grid,
-                                attributes = atts,
-                                id = var.standard_name)
+                                                   axes=axes,
+                                                   grid=grid,
+                                                   attributes=atts,
+                                                   id=var.standard_name)
                     fh.close()
 
                 # Add the variable to the index
@@ -443,10 +481,10 @@ class TimeTransientVariable:
         self._repr_string = "TimeTransientVariable"
 
 
-###################################################################
+#
 
 def test():
     pass
 
-if __name__ == '__main__': test()
-
+if __name__ == '__main__':
+    test()
diff --git a/Packages/cdms2/Lib/gui.py b/Packages/cdms2/Lib/gui.py
index 65e13cd8c..44fab4cb6 100644
--- a/Packages/cdms2/Lib/gui.py
+++ b/Packages/cdms2/Lib/gui.py
@@ -5,6 +5,7 @@ from cdms import cache
 
 _progressParent = None                  # Parent frame of progress gui
 
+
 def setProgressParent(parent):
     """
     Enable the FTP progress GUI, and set the parent frame.
@@ -12,7 +13,9 @@ def setProgressParent(parent):
     """
     global _progressParent
     _progressParent = parent
-    cache.useWindow()                   # Notify cache module that window dialogs should be used.
+    cache.useWindow()
+                    # Notify cache module that window dialogs should be used.
+
 
 def getProgressParent():
     """
@@ -21,6 +24,7 @@ def getProgressParent():
     """
     return _progressParent
 
+
 def updateProgressGui(blocknum, blocksize, size, prog):
     """
     Callback function for the FTP progress dialog.
@@ -31,25 +35,28 @@ def updateProgressGui(blocknum, blocksize, size, prog):
 
     Return: 0 to signal that a cancel has been received, 1 to continue reading.
     """
-    sizekb = size/1024L
-    percent = min(100,int(100.0*float(blocknum*blocksize)/float(size)))
-    if percent<100:
-        noInterrupt = prog.Update(percent,"Read: %3d%% of %dK"%(percent,sizekb))
+    sizekb = size / 1024
+    percent = min(100, int(100.0 * float(blocknum * blocksize) / float(size)))
+    if percent < 100:
+        noInterrupt = prog.Update(
+            percent, "Read: %3d%% of %dK" %
+            (percent, sizekb))
     else:
         noInterrupt = 1                    # Don't interrupt - finish up cleanly
         prog.Destroy()
-    if noInterrupt==0:
+    if noInterrupt == 0:
         prog.Destroy()
     return noInterrupt
 
+
 class CdProgressDialog(wxProgressDialog):
 
     # <frame> is the parent frame.
     # filename is the file being read.
-    def __init__(self, frame, filename):
-        wxProgressDialog.__init__(self,"FTP: %s"%filename,
-                         "Connecting ...",
-                         100,
-                         frame,
-                         wxPD_CAN_ABORT | wxPD_APP_MODAL | wxPD_REMAINING_TIME)
 
+    def __init__(self, frame, filename):
+        wxProgressDialog.__init__(self, "FTP: %s" % filename,
+                                  "Connecting ...",
+                                  100,
+                                  frame,
+                                  wxPD_CAN_ABORT | wxPD_APP_MODAL | wxPD_REMAINING_TIME)
diff --git a/Packages/cdms2/Lib/hgrid.py b/Packages/cdms2/Lib/hgrid.py
index 1f53d3702..aa09ca8c5 100644
--- a/Packages/cdms2/Lib/hgrid.py
+++ b/Packages/cdms2/Lib/hgrid.py
@@ -1,5 +1,5 @@
-## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by 
-## Further modified to be pure new numpy June 24th 2008
+# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
+# Further modified to be pure new numpy June 24th 2008
 
 """CDMS HorizontalGrid objects"""
 
@@ -7,19 +7,20 @@ import numpy
 import cdms2
 import os
 import os.path
-## import PropertiedClasses
-from error import CDMSError
-from grid import AbstractGrid, LongitudeType, LatitudeType, VerticalType, TimeType, CoordTypeToLoc
-from coord import TransientVirtualAxis
-from axis import getAutoBounds, allclose
-import bindex,_bindex
+# import PropertiedClasses
+from .error import CDMSError
+from .grid import AbstractGrid, LongitudeType, LatitudeType, VerticalType, TimeType, CoordTypeToLoc
+from .coord import TransientVirtualAxis
+from .axis import getAutoBounds, allclose
+import bindex, _bindex
+from functools import reduce
 
 MethodNotImplemented = "Method not yet implemented"
 
 def _flatten(boundsar):
     boundsshape = boundsar.shape
-    if len(boundsshape)>2:
-        newshape = (reduce((lambda x,y: x*y), boundsshape[:-1], 1), boundsshape[-1])
+    if len(boundsshape) > 2:
+        newshape = (reduce((lambda x, y: x*y), boundsshape[:-1], 1), boundsshape[-1])
         boundsar.shape = newshape
     return boundsar
 
@@ -40,17 +41,17 @@ class AbstractHorizontalGrid(AbstractGrid):
 
     # Generate default bounds
     def genBounds(self):
-        raise CDMSError, MethodNotImplemented
+        raise CDMSError(MethodNotImplemented)
 
     # Get the n-th axis. naxis is 0 or 1.
     def getAxis(self, naxis):
-        raise CDMSError, MethodNotImplemented
+        raise CDMSError(MethodNotImplemented)
 
     def getBounds(self):
         """Get the grid cell boundaries, as a tuple (latitudeBounds, longitudeBounds)
         """
         latbnds, lonbnds = (self._lataxis_.getExplicitBounds(), self._lonaxis_.getExplicitBounds())
-        if (latbnds is None or lonbnds is None) and getAutoBounds() in [1,2]:
+        if (latbnds is None or lonbnds is None) and getAutoBounds() in [1, 2]:
             nlatbnds, nlonbnds = self.genBounds()
             if latbnds is None:
                 latbnds = nlatbnds
@@ -76,27 +77,27 @@ class AbstractHorizontalGrid(AbstractGrid):
 
     def getMesh(self):
         """Get the mesh array used by the meshfill plot."""
-        raise CDMSError, MethodNotImplemented
+        raise CDMSError(MethodNotImplemented)
 
     def getWeightsArray(self):
         """Return normalized area weights, as an array of the same
         shape as the grid.
         """
-        raise CDMSError, MethodNotImplemented
+        raise CDMSError(MethodNotImplemented)
 
     def listall (self, all=None):
-        result=[]
+        result = []
         result.append('Grid has Python id %s.' % hex(id(self)))
         return result
 
-    def setMask(self,mask,permanent=0):
+    def setMask(self, mask, permanent=0):
         self._maskVar_ = mask
 
     def subGridRegion(self, latRegion, lonRegion):
-        raise CDMSError, MethodNotImplemented
+        raise CDMSError(MethodNotImplemented)
 
     def hasCoordType(self, coordType):
-        return ((coordType==LatitudeType) or (coordType==LongitudeType))
+        return ((coordType == LatitudeType) or (coordType == LongitudeType))
 
     def checkConvex(self):
         """Check that each cell of the grid is convex in lon-lat space, with nodes defined counter-clockwise.
@@ -116,10 +117,10 @@ class AbstractHorizontalGrid(AbstractGrid):
         for n0 in range(nnode):
             n1 = (n0+1)%nnode
             n2 = (n1+1)%nnode
-            vec0lon = lonb[:,n1] - lonb[:,n0]
-            vec0lat = latb[:,n1] - latb[:,n0]
-            vec1lon = lonb[:,n2] - lonb[:,n1]
-            vec1lat = latb[:,n2] - latb[:,n1]
+            vec0lon = lonb[:, n1] - lonb[:, n0]
+            vec0lat = latb[:, n1] - latb[:, n0]
+            vec1lon = lonb[:, n2] - lonb[:, n1]
+            vec1lat = latb[:, n2] - latb[:, n1]
             cross = vec0lon*vec1lat - vec0lat*vec1lon
 
             mask = where(less(cross, 0.0), 1, 0)
@@ -170,24 +171,24 @@ class AbstractHorizontalGrid(AbstractGrid):
             for node in range(2*nnode):
                 n0 = node%nnode
                 n1 = (n0+1)%nnode
-                vec0lon = lonb2[k,n1]-lonb2[k,n0]
-                if vec0lon>threshold:
-                    lonb2[k,n1] -= 360.0
-                elif vec0lon<-threshold:
-                    lonb2[k,n1] += 360.0
+                vec0lon = lonb2[k, n1]-lonb2[k, n0]
+                if vec0lon > threshold:
+                    lonb2[k, n1] -= 360.0
+                elif vec0lon < -threshold:
+                    lonb2[k, n1] += 360.0
 
             # If the cross-product test still fails, restore
             # the original values and add to the nonConvexCells list
             for n0 in range(nnode):
                 n1 = (n0+1)%nnode
                 n2 = (n1+1)%nnode
-                vec0lon = lonb2[k,n1] - lonb2[k,n0]
-                vec0lat = latb2[k,n1] - latb2[k,n0]
-                vec1lon = lonb2[k,n2] - lonb2[k,n1]
-                vec1lat = latb2[k,n2] - latb2[k,n1]
+                vec0lon = lonb2[k, n1] - lonb2[k, n0]
+                vec0lat = latb2[k, n1] - latb2[k, n0]
+                vec1lon = lonb2[k, n2] - lonb2[k, n1]
+                vec1lat = latb2[k, n2] - latb2[k, n1]
                 cross = vec0lon*vec1lat - vec0lat*vec1lon
 
-                if cross<0:
+                if cross < 0:
                     lonb2[k] = savelons
                     newbadcells.append(nonConvexCells[k])
                     break
@@ -207,7 +208,7 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
         """Create a curvilinear grid.
         """
         if latAxis.shape != lonAxis.shape:
-            raise CDMSError, 'Latitude and longitude axes must have the same shape.'
+            raise CDMSError('Latitude and longitude axes must have the same shape.')
         AbstractHorizontalGrid.__init__(self, latAxis, lonAxis, id, maskvar, tempmask, node)
         self._index_ = None
 
@@ -217,7 +218,7 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
         return TransientCurveGrid(newlat, newlon, id=self.id)
 
     def __repr__(self):
-        return "<CurveGrid, id: %s, shape: %s>"%(self.id, `self.shape`)
+        return "<CurveGrid, id: %s, shape: %s>"%(self.id, repr(self.shape))
     __str__ = __repr__
 
     def getMesh(self, transpose=None):
@@ -226,20 +227,20 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
         latbounds and lonbounds according to the tuple, (1,0,2) in this case.
         """
         if self._mesh_ is None:
-            LAT=0
-            LON=1
+            LAT = 0
+            LON = 1
             latbounds, lonbounds = self.getBounds()
-##             ## following work aronud a numpy.ma bug
-##             latbounds=latbounds.filled()
-##             lonbounds=lonbounds.filled()
+# following work aronud a numpy.ma bug
+# latbounds=latbounds.filled()
+# lonbounds=lonbounds.filled()
             if latbounds is None or lonbounds is None:
-                raise CDMSError, 'No boundary data is available for grid %s'%self.id
-            if (transpose is not None) and (transpose[1]==0):
-                latbounds = numpy.transpose(latbounds, (1,0,2))
-                lonbounds = numpy.transpose(lonbounds, (1,0,2))
-            mesh = numpy.zeros((self.size(),2,latbounds.shape[-1]),latbounds.dtype.char)
-            mesh[:,LAT,:] = numpy.reshape(latbounds,(self.size(),latbounds.shape[-1]))
-            mesh[:,LON,:]  = numpy.reshape(lonbounds,(self.size(),latbounds.shape[-1]))
+                raise CDMSError('No boundary data is available for grid %s'%self.id)
+            if (transpose is not None) and (transpose[1] == 0):
+                latbounds = numpy.transpose(latbounds, (1, 0, 2))
+                lonbounds = numpy.transpose(lonbounds, (1, 0, 2))
+            mesh = numpy.zeros((self.size(), 2, latbounds.shape[-1]), latbounds.dtype.char)
+            mesh[:, LAT,:] = numpy.reshape(latbounds, (self.size(), latbounds.shape[-1]))
+            mesh[:, LON,:]  = numpy.reshape(lonbounds, (self.size(), latbounds.shape[-1]))
             self._mesh_ = mesh
         return self._mesh_
 
@@ -291,9 +292,9 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
         mask.shape = (ngrid,)
 
         clat = numpy.ma.filled(copy.copy(blat))
-        clat.shape = (ngrid,4)
+        clat.shape = (ngrid, 4)
         clon = numpy.ma.filled(copy.copy(blon))
-        clon.shape = (ngrid,4)
+        clon.shape = (ngrid, 4)
 
         # Write the file
         if gridTitle is None:
@@ -309,12 +310,12 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
         gridcenterlon.units = "degrees"
         gridimask = cufile.createVariable("grid_imask", 'i', ("grid_size",))
         gridimask.units = "unitless"
-        gridcornerlat = cufile.createVariable("grid_corner_lat", 'd', ("grid_size","grid_corners"))
+        gridcornerlat = cufile.createVariable("grid_corner_lat", 'd', ("grid_size", "grid_corners"))
         gridcornerlat.units = "degrees"
-        gridcornerlon = cufile.createVariable("grid_corner_lon", 'd', ("grid_size","grid_corners"))
+        gridcornerlon = cufile.createVariable("grid_corner_lon", 'd', ("grid_size", "grid_corners"))
         gridcornerlon.units = "degrees"
 
-        griddims[:] = numpy.array([nj,ni], numpy.int32)
+        griddims[:] = numpy.array([nj, ni], numpy.int32)
         gridcenterlat[:] = centerLat
         gridcenterlon[:] = centerLon
         gridimask[:] = mask
@@ -324,9 +325,9 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
     def toGenericGrid(self, gridid=None):
 
         import copy
-        from auxcoord import TransientAuxAxis1D
-        from coord import TransientVirtualAxis
-        from gengrid import TransientGenericGrid
+        from .auxcoord import TransientAuxAxis1D
+        from .coord import TransientVirtualAxis
+        from .gengrid import TransientGenericGrid
 
         lat = numpy.ma.filled(self._lataxis_)
         latunits = self._lataxis_.units
@@ -345,11 +346,11 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
             mask.shape = (ngrid,)
 
         cornerLat = numpy.ma.filled(copy.copy(blat))
-        cornerLat.shape = (ngrid,4)
+        cornerLat.shape = (ngrid, 4)
         cornerLon = numpy.ma.filled(copy.copy(blon))
-        cornerLon.shape = (ngrid,4)
+        cornerLon.shape = (ngrid, 4)
 
-        iaxis = TransientVirtualAxis("cell",ngrid)
+        iaxis = TransientVirtualAxis("cell", ngrid)
 
         lataxis = TransientAuxAxis1D(centerLat, axes=(iaxis,), bounds=cornerLat,
                                   attributes={'units':latunits}, id="latitude")
@@ -381,21 +382,21 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
         The file, normally a CdmsFile, should already be open for writing
         and will be closed."""
         import time
-        from tvariable import TransientVariable
+        from .tvariable import TransientVariable
         
         # Set attributes
-        if ( hasattr(file,'Conventions') ):
-            if ( file.Conventions.find('Gridspec')<0 ):
+        if ( hasattr(file, 'Conventions') ):
+            if ( file.Conventions.find('Gridspec') < 0 ):
                 file.Conventions = file.Conventions + ' Gridspec-0.0'
         else:
             file.Conventions = 'Gridspec-0.0'
-        if ( hasattr(file,'gs_filetypes') ):
-            if ( file.gs_filetypes.find('Curvilinear_Tile')<0 ):
+        if ( hasattr(file, 'gs_filetypes') ):
+            if ( file.gs_filetypes.find('Curvilinear_Tile') < 0 ):
                 file.gs_filetypes = file.gs_filetypes + ' Curvilinear_Tile'
         else:
             file.gs_filetypes = 'Curvilinear_Tile'
-        t=time.time()
-        id=int((t-int(t))*1.0e9)
+        t = time.time()
+        id = int((t-int(t))*1.0e9)
         file.gs_id = id
         file.gs_originalfilename = os.path.basename( file.id )
 
@@ -411,19 +412,19 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
                        getattr( file, 'history', '' ) + newhistory
 
         # former tile variable and attributes
-        if ( hasattr(self,'long_name') and self.long_name!=None ):
+        if ( hasattr(self, 'long_name') and self.long_name != None ):
             file.long_name = self.long_name
         else:
             file.long_name = 'gridspec_tile'
         # gs_geometryType is no longer required of Gridspec files, but as yet
         # there is no other proposal for describing the geometry (July 2010)
-        if ( hasattr(self,'gs_geometryType') and self.gs_geometryType!=None):
+        if ( hasattr(self, 'gs_geometryType') and self.gs_geometryType != None):
             file.gs_geometryType = self.gs_geometryType
         else:
             file.gs_geometryType = 'spherical'
         # gs_discretizationType is no longer required of Gridspec files, but it's
         # harmless and may come in useful
-        if ( hasattr(self,'gs_discretizationType') and self.gs_discretizationType!=None ):
+        if ( hasattr(self, 'gs_discretizationType') and self.gs_discretizationType != None ):
             file.gs_discretizationType = self.gs_discretizationType
         else:
             file.gs_discretizationType = 'logically_rectangular'
@@ -434,11 +435,11 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
         # Set up and write variables.  When written, cdms writes not only the arrays
         # but also their coordinates, e.g. gs_nip.
         
-        x=self._lonaxis_
-        if ( not hasattr(x,'units') ):
+        x = self._lonaxis_
+        if ( not hasattr(x, 'units') ):
             print "Warning, no units found for longitude"
             x.units = 'degree_east'
-        if ( not hasattr(x,'standard_name') ):
+        if ( not hasattr(x, 'standard_name') ):
             print "Warning, no standard_name found for longitude axis"
             x.standard_name = 'longitude'
         if ( x.standard_name == 'geographic_longitude'):
@@ -448,11 +449,11 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
         # _lonaxis_ is a TransientAxis2D, hence a TransientVariable
         # But I don't know where the attribute _TransientVariable__domain comes from
         
-        y=self._lataxis_
-        if ( not hasattr(y,'units') ):
+        y = self._lataxis_
+        if ( not hasattr(y, 'units') ):
             print "Warning, no units found for latitude"
             y.units = 'degree_north'
-        if ( not hasattr(y,'standard_name') ):
+        if ( not hasattr(y, 'standard_name') ):
             print "Warning, no standard_name found for latitude axis"
             y.standard_name = 'latitude'
         if ( y.standard_name == 'geographic_latitude'):
@@ -460,18 +461,18 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
             y.standard_name = 'latitude'
         y.id = file.gs_latv
 
-        if( not hasattr(x,'_TransientVariable__domain') ):
+        if( not hasattr(x, '_TransientVariable__domain') ):
             # There probably doesn't exist enough information to write a correct
             # grid, but this will help.
             x._TransientVariable__domain = [ (x,), (y,) ]
-        x._TransientVariable__domain[0][0].id='gs_njp'
-        x._TransientVariable__domain[1][0].id='gs_nip'
-        if ( not hasattr(y,'_TransientVariable__domain') ) :
+        x._TransientVariable__domain[0][0].id = 'gs_njp'
+        x._TransientVariable__domain[1][0].id = 'gs_nip'
+        if ( not hasattr(y, '_TransientVariable__domain') ) :
             # There probably doesn't exist enough information to write a correct
             # grid, but this will help.
             y._TransientVariable__domain = [ (x,), (y,) ]
-        y._TransientVariable__domain[0][0].id='gs_njp'
-        y._TransientVariable__domain[1][0].id='gs_nip'
+        y._TransientVariable__domain[0][0].id = 'gs_njp'
+        y._TransientVariable__domain[1][0].id = 'gs_nip'
 
         file.write(x)
         file.write(y)
@@ -486,12 +487,12 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
         # The functionality (other than checking gsfile) is now done by the writeg
         # method above.
         if ( not hasattr( self, "gsfile" ) ):
-            self.gsfile=None
-            self.gspath=None
-        if ( self.gsfile!=None ):
+            self.gsfile = None
+            self.gspath = None
+        if ( self.gsfile != None ):
             return ( tcg.gsfile, tcg.gspath )
         else:
-            raise RuntimeError, 'The libCF/Gridspec API does not provide for writing CurveGrids<<<'
+            raise RuntimeError('The libCF/Gridspec API does not provide for writing CurveGrids<<<')
 
     def init_from_gridspec( self, filename ):
         """reads to grid from a Gridspec-compliant file.  The filename should be a
@@ -575,8 +576,8 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
                 j = k
             k += 1
 
-        if i==-1 or j==-1:
-            raise RuntimeError, 'Grid lat/lon domains do not match variable domain'
+        if i == -1 or j == -1:
+            raise RuntimeError('Grid lat/lon domains do not match variable domain')
 
         return ((islice, jslice), (inewaxis, jnewaxis))
 
@@ -584,14 +585,14 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
         """Get the grid index"""
         if self._index_ is None:
             # Trying to stick in Stephane Raynaud's patch for autodetection
-            nj,ni = self._lataxis_.shape
+            nj, ni = self._lataxis_.shape
             dlon = numpy.max(self._lonaxis_)-numpy.min(self._lonaxis_)
-            dx = max(dlon/ni,dlon/nj)
+            dx = max(dlon/ni, dlon/nj)
             dlat = numpy.max(self._lataxis_)-numpy.min(self._lataxis_)
-            dy = max(dlat/ni,dlat/nj)
+            dy = max(dlat/ni, dlat/nj)
             latlin = numpy.ravel(numpy.ma.filled(self._lataxis_))
             lonlin = numpy.ravel(numpy.ma.filled(self._lonaxis_))
-            _bindex.setDeltas(dx,dy)
+            _bindex.setDeltas(dx, dy)
             self._index_ = bindex.bindexHorizontalGrid(latlin, lonlin)
 
         return self._index_
@@ -614,12 +615,12 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
         latlin = numpy.ravel(numpy.ma.filled(self._lataxis_))
         lonlin = numpy.ravel(numpy.ma.filled(self._lonaxis_))
         points = bindex.intersectHorizontalGrid(latspec, lonspec, latlin, lonlin, index)
-        if len(points)==0:
-            raise CDMSError, 'No data in the specified region, longitude=%s, latitude=%s'%(`lonspec`, `latspec`)
+        if len(points) == 0:
+            raise CDMSError('No data in the specified region, longitude=%s, latitude=%s'%(repr(lonspec), repr(latspec)))
 
         fullmask = numpy.ones(ni*nj)
         numpy.put(fullmask, points, 0)
-        fullmask = numpy.reshape(fullmask, (ni,nj))
+        fullmask = numpy.reshape(fullmask, (ni, nj))
         
         iind = points/nj
         jind = points - iind*nj
@@ -628,7 +629,7 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
 
         yid = self.getAxis(0).id
         xid = self.getAxis(1).id
-        indexspecs = {yid:slice(imin,imax), xid:slice(jmin,jmax)}
+        indexspecs = {yid:slice(imin, imax), xid:slice(jmin, jmax)}
 
         return submask, indexspecs
 
@@ -677,9 +678,9 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
             used = []                   # axes already matched
             for i in missing:
                 for item in axes:
-                    if (item not in used) and len(selfaxes[i])==len(item) and allclose(selfaxes[i], item):
-                        result._lataxis_.setAxis(i,item)
-                        result._lonaxis_.setAxis(i,item)
+                    if (item not in used) and len(selfaxes[i]) == len(item) and allclose(selfaxes[i], item):
+                        result._lataxis_.setAxis(i, item)
+                        result._lonaxis_.setAxis(i, item)
                         used.append(item)
                         break
                 else:
@@ -693,18 +694,18 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
         having the same length as the number of cells in the grid, similarly
         for flatlon."""
         if self._flataxes_ is None:
-            import MV2 as MV
+            from . import MV2 as MV
             alat = MV.filled(self.getLatitude())
             alon = MV.filled(self.getLongitude())
             alatflat = numpy.ravel(alat)
             alonflat = numpy.ravel(alon)
             self._flataxes_ = (alatflat, alonflat)
         return self._flataxes_
-    shape = property(_getShape,None)
+    shape = property(_getShape, None)
     
-## PropertiedClasses.set_property (AbstractCurveGrid, 'shape', 
-##                                   AbstractCurveGrid._getShape, nowrite=1,
-##                                   nodelete=1)
+# PropertiedClasses.set_property (AbstractCurveGrid, 'shape',
+# AbstractCurveGrid._getShape, nowrite=1,
+# nodelete=1)
 
 class DatasetCurveGrid(AbstractCurveGrid):
 
@@ -715,7 +716,7 @@ class DatasetCurveGrid(AbstractCurveGrid):
         self.parent = parent
 
     def __repr__(self):
-        return "<DatasetCurveGrid, id: %s, shape: %s>"%(self.id, `self.shape`)
+        return "<DatasetCurveGrid, id: %s, shape: %s>"%(self.id, repr(self.shape))
 
 class FileCurveGrid(AbstractCurveGrid):
 
@@ -726,7 +727,7 @@ class FileCurveGrid(AbstractCurveGrid):
         self.parent = parent
 
     def __repr__(self):
-        return "<FileCurveGrid, id: %s, shape: %s>"%(self.id, `self.shape`)
+        return "<FileCurveGrid, id: %s, shape: %s>"%(self.id, repr(self.shape))
 
 class TransientCurveGrid(AbstractCurveGrid):
 
@@ -741,7 +742,7 @@ class TransientCurveGrid(AbstractCurveGrid):
         AbstractCurveGrid.__init__(self, latAxis, lonAxis, id, maskvar, tempmask)
 
     def __repr__(self):
-        return "<TransientCurveGrid, id: %s, shape: %s>"%(self.id, `self.shape`)
+        return "<TransientCurveGrid, id: %s, shape: %s>"%(self.id, repr(self.shape))
 
     def toCurveGrid(self, gridid=None):
         if gridid is None:
@@ -758,17 +759,17 @@ def readScripCurveGrid(fileobj, dims, whichType, whichGrid):
     whichType is the type of file, either "grid" or "mapping"
     if whichType is "mapping", whichGrid is the choice of grid, either "source" or "destination"
     """
-    from coord import TransientAxis2D
+    from .coord import TransientAxis2D
 
     if 'S' in fileobj.variables.keys():
-        if whichType=="grid":
+        if whichType == "grid":
             gridCornerLatName = 'grid_corner_lat'
             gridCornerLonName = 'grid_corner_lon'
             gridMaskName = 'grid_imask'
             gridCenterLatName = 'grid_center_lat'
             gridCenterLonName = 'grid_center_lon'
             titleName = 'title'
-        elif whichGrid=="destination":
+        elif whichGrid == "destination":
             gridCornerLatName = 'yv_b'
             gridCornerLonName = 'xv_b'
             gridMaskName = 'mask_b'
@@ -783,14 +784,14 @@ def readScripCurveGrid(fileobj, dims, whichType, whichGrid):
             gridCenterLonName = 'xc_a'
             titleName = 'source_grid'
     else:
-        if whichType=="grid":
+        if whichType == "grid":
             gridCornerLatName = 'grid_corner_lat'
             gridCornerLonName = 'grid_corner_lon'
             gridMaskName = 'grid_imask'
             gridCenterLatName = 'grid_center_lat'
             gridCenterLonName = 'grid_center_lon'
             titleName = 'title'
-        elif whichGrid=="destination":
+        elif whichGrid == "destination":
             gridCornerLatName = 'dst_grid_corner_lat'
             gridCornerLonName = 'dst_grid_corner_lon'
             gridMaskName = 'dst_grid_imask'
@@ -813,17 +814,17 @@ def readScripCurveGrid(fileobj, dims, whichType, whichGrid):
     nj = dims[0]
     gridshape = (ni, nj)
     boundsshape = (ni, nj, ncorners)
-    if hasattr(cornerLat, 'units') and cornerLat.units.lower()[0:6]=='radian':
+    if hasattr(cornerLat, 'units') and cornerLat.units.lower()[0:6] == 'radian':
         cornerLat = (cornerLat*(180.0/numpy.pi)).reshape(boundsshape)
         cornerLon = (cornerLon*(180.0/numpy.pi)).reshape(boundsshape)
     else:
         cornerLat = cornerLat.reshape(boundsshape)
         cornerLon = cornerLon.reshape(boundsshape)
 
-    iaxis = TransientVirtualAxis("i",ni)
-    jaxis = TransientVirtualAxis("j",nj)
+    iaxis = TransientVirtualAxis("i", ni)
+    jaxis = TransientVirtualAxis("j", nj)
 
-    if vardict.has_key(gridMaskName):
+    if gridMaskName in vardict:
         # SCRIP convention: 0 for invalid data
         # numpy.ma convention: 1 for invalid data
         mask = 1 - fileobj(gridMaskName)
@@ -831,27 +832,27 @@ def readScripCurveGrid(fileobj, dims, whichType, whichGrid):
     else:
         mask = None
         
-    if vardict.has_key(gridCenterLatName):
+    if gridCenterLatName in vardict:
         centerLat = fileobj(gridCenterLatName).reshape(gridshape)
         gclat = fileobj[gridCenterLatName]
-        if hasattr(gclat, "units") and gclat.units.lower()=='radians':
+        if hasattr(gclat, "units") and gclat.units.lower() == 'radians':
             centerLat *= (180.0/numpy.pi)
     else:
-        centerLat = cornerLat[:,:,0]
+        centerLat = cornerLat[:,:, 0]
 
-    if vardict.has_key(gridCenterLonName):
+    if gridCenterLonName in vardict:
         centerLon = fileobj(gridCenterLonName).reshape(gridshape)
         gclon = fileobj[gridCenterLonName]
-        if hasattr(gclon, "units") and gclon.units.lower()=='radians':
+        if hasattr(gclon, "units") and gclon.units.lower() == 'radians':
             centerLon *= (180.0/numpy.pi)
     else:
-        centerLon = cornerLon[:,:,0]
+        centerLon = cornerLon[:,:, 0]
 
-    if hasattr(fileobj,titleName):
+    if hasattr(fileobj, titleName):
         gridid = getattr(fileobj, titleName)
-        gridid = gridid.strip().replace(' ','_')
+        gridid = gridid.strip().replace(' ', '_')
     else:
-        gridid="<None>"
+        gridid = "<None>"
 
     lataxis = TransientAxis2D(centerLat, axes=(iaxis, jaxis), bounds=cornerLat,
                               attributes={'units':'degrees_north'}, id="latitude")
diff --git a/Packages/cdms2/Lib/mvBaseWriter.py b/Packages/cdms2/Lib/mvBaseWriter.py
index 5f099c704..db80b843e 100644
--- a/Packages/cdms2/Lib/mvBaseWriter.py
+++ b/Packages/cdms2/Lib/mvBaseWriter.py
@@ -3,13 +3,14 @@
 """
 Abstract class for writing data into file
 
-This code is provided with the hope that it will be useful. 
+This code is provided with the hope that it will be useful.
 No guarantee is provided whatsoever. Use at your own risk.
 
 Alex Pletzer, Tech-X Corp. (2011)
 """
 
-import mvSphereMesh
+from . import mvSphereMesh
+
 
 class BaseWriter:
 
@@ -17,7 +18,7 @@ class BaseWriter:
         """
         Constructor
         @param var a cdms2 variable
-        @param sphereRadius radius of the sphere upon which the grid will 
+        @param sphereRadius radius of the sphere upon which the grid will
                             be projected
         @param maxElev max elevation/depth normalized to the sphere radius
         """
@@ -26,12 +27,12 @@ class BaseWriter:
 
         self.shape = sphere_mesh.shape
 
-        # there is currently a bug in vizSchema which causes 
-        # visit to crash if the leading index is 1, this is 
+        # there is currently a bug in vizSchema which causes
+        # visit to crash if the leading index is 1, this is
         # a workaround the problem
         if self.shape[0] == 1:
-            self.shape = list(sphere_mesh.shape[1:]) + [1,]
-        
+            self.shape = list(sphere_mesh.shape[1:]) + [1, ]
+
         self.mesh = sphere_mesh.getXYZCoords(sphereRadius)
 
     def write(self, filename):
@@ -39,5 +40,5 @@ class BaseWriter:
         Write data to file. This method is overloaded.
         @param filename file name
         """
-        raise NotImplementedError, \
-            'write method not implemented in derived class'
+        raise NotImplementedError(
+            'write method not implemented in derived class')
diff --git a/Packages/cdms2/Lib/mvCdmsRegrid.py b/Packages/cdms2/Lib/mvCdmsRegrid.py
index 5a1f34361..24c169acf 100644
--- a/Packages/cdms2/Lib/mvCdmsRegrid.py
+++ b/Packages/cdms2/Lib/mvCdmsRegrid.py
@@ -9,8 +9,9 @@ import operator
 import re
 import numpy
 import cdms2
-from error import CDMSError
+from .error import CDMSError
 import regrid2
+from functools import reduce
 
 def _areCellsOk(cornerCoords, mask=None):
     """
@@ -43,8 +44,8 @@ def _areCellsOk(cornerCoords, mask=None):
     # compute area elements in Cartesian space
     lat0 = numpy.array(cornerCoords[0][ :-1,  :-1], numpy.float64)
     lat1 = numpy.array(cornerCoords[0][ :-1, 1:  ], numpy.float64)
-    lat2 = numpy.array(cornerCoords[0][1:  , 1:  ], numpy.float64)
-    lat3 = numpy.array(cornerCoords[0][1:  ,  :-1], numpy.float64)
+    lat2 = numpy.array(cornerCoords[0][1:, 1:  ], numpy.float64)
+    lat3 = numpy.array(cornerCoords[0][1:,  :-1], numpy.float64)
 
     the0 = lat0*numpy.pi/180.
     the1 = lat1*numpy.pi/180.
@@ -52,8 +53,8 @@ def _areCellsOk(cornerCoords, mask=None):
     the3 = lat3*numpy.pi/180.
     lam0 = numpy.array(cornerCoords[1][ :-1,  :-1], numpy.float64)*numpy.pi/180.
     lam1 = numpy.array(cornerCoords[1][ :-1, 1:  ], numpy.float64)*numpy.pi/180.
-    lam2 = numpy.array(cornerCoords[1][1:  , 1:  ], numpy.float64)*numpy.pi/180.
-    lam3 = numpy.array(cornerCoords[1][1:  ,  :-1], numpy.float64)*numpy.pi/180.
+    lam2 = numpy.array(cornerCoords[1][1:, 1:  ], numpy.float64)*numpy.pi/180.
+    lam3 = numpy.array(cornerCoords[1][1:,  :-1], numpy.float64)*numpy.pi/180.
     
     x0, y0, z0 = projectToSphere(the0, lam0)
     x1, y1, z1 = projectToSphere(the1, lam1)
@@ -128,7 +129,7 @@ def _areCellsOk(cornerCoords, mask=None):
     if len(inds[0]) > 0:
         # package the result
         badCellIndices = [(inds[0][i], inds[1][i]) for i in range(len(inds[0]))]
-        bcis1 = [(inds[0][i]  , inds[1][i]+1) for i in range(len(inds[0]))]
+        bcis1 = [(inds[0][i], inds[1][i]+1) for i in range(len(inds[0]))]
         bcis2 = [(inds[0][i]+1, inds[1][i]+1) for i in range(len(inds[0]))]
         bcis3 = [(inds[0][i]+1, inds[1][i]  ) for i in range(len(inds[0]))]
         badCellCoords = [[(cornerCoords[0][badCellIndices[i]], cornerCoords[1][badCellIndices[i]]),
@@ -159,10 +160,10 @@ def _buildBounds(bounds):
         bnd[:-1] = bounds[..., 0]
         bnd[ -1] = bounds[ -1, 1]
     elif len(bndShape) > 1:
-        bnd[:-1, :-1] = bounds[  :,  :, 0]
-        bnd[:-1,  -1] = bounds[  :, -1, 1]
+        bnd[:-1, :-1] = bounds[:,:, 0]
+        bnd[:-1,  -1] = bounds[:, -1, 1]
         bnd[ -1,  -1] = bounds[ -1, -1, 2]
-        bnd[ -1, :-1] = bounds[ -1,  :, 3]
+        bnd[ -1, :-1] = bounds[ -1,:, 3]
 
     return bnd
 
@@ -381,8 +382,9 @@ coordMin = %7.2f, boundMin = %7.2f, coordMax = %7.2f, boundMax = %7.2f
 
         # If LibCF handleCut is True, the bounds are needed to extend the grid
         # close the cut at the top
-        if re.search('LibCF', regridTool, re.I) and args.has_key('handleCut'):
-            if args['handleCut']: srcBounds = getBoundList(srcCoords)
+        if re.search('LibCF', regridTool, re.I) and 'handleCut' in args:
+            if args['handleCut']:
+                srcBounds = getBoundList(srcCoords)
 
         srcCoordsArrays = [numpy.array(sc) for sc in srcCoords]
         dstCoordsArrays = [numpy.array(dc) for dc in dstCoords]
@@ -439,7 +441,7 @@ coordMin = %7.2f, boundMin = %7.2f, coordMax = %7.2f, boundMax = %7.2f
                              **args)
 
         # fill in diagnostic data
-        if args.has_key('diag'):
+        if 'diag' in args:
             self.regridObj.fillInDiagnosticData(diag = args['diag'], rootPe = 0)
 
         # construct the axis list for dstVar
diff --git a/Packages/cdms2/Lib/mvSphereMesh.py b/Packages/cdms2/Lib/mvSphereMesh.py
index 7b95922e2..1a5469c9c 100644
--- a/Packages/cdms2/Lib/mvSphereMesh.py
+++ b/Packages/cdms2/Lib/mvSphereMesh.py
@@ -3,22 +3,24 @@
 """
 Class for representing grids on the sphere
 Alex Pletzer, Tech-X Corp. (2011)
-This code is provided with the hope that it will be useful. 
+This code is provided with the hope that it will be useful.
 No guarantee is provided whatsoever. Use at your own risk.
 """
 
 import numpy
+from functools import reduce
+
 
 class SphereMesh:
-    
+
     def __init__(self, var, sphereThickness=0.1):
         """
         Constructor
         @param var cdms2 variable
-        @param sphereThickness thickness of the shell in normalized 
+        @param sphereThickness thickness of the shell in normalized
                                sphere radius
         """
-       
+
         self.isRectilinear = True
         self.ndims = 0
         self.elvPositiveDown = False
@@ -40,7 +42,7 @@ class SphereMesh:
                 if getattr(elvs, 'positive') == 'down':
                     self.elvPositiveDown = True
 
-        # determine the dimensionality and 
+        # determine the dimensionality and
         # whether the grid is rectilinear
         for axis in lons, lats, elvs:
             if axis is not None:
@@ -53,25 +55,31 @@ class SphereMesh:
             self.shape = []
             for axis in lons, lats, elvs:
                 if axis is not None:
-                    self.shape.append( len(axis) )
+                    self.shape.append(len(axis))
             self.shape.reverse()
 
         while len(self.shape) < 3:
-            self.shape = [1,] + list(self.shape)
+            self.shape = [1, ] + list(self.shape)
 
         # store lon, lat, elv as a curvilinear grid
         if self.isRectilinear:
             # apply tensore product of axes to generat curvilinear coordinates
             if elvs is not None:
-                self.elvs = numpy.outer(numpy.outer( numpy.ones(self.shape[:0], numpy.float32), elvs),
-                                        numpy.ones(self.shape[0+1:], numpy.float32)).reshape(self.shape)
+                self.elvs = numpy.outer(
+                    numpy.outer(
+                        numpy.ones(self.shape[:0],
+                                   numpy.float32),
+                        elvs),
+                                        numpy.ones(self.shape[0 + 1:], numpy.float32)).reshape(self.shape)
             else:
-                self.elvs = numpy.zeros( self.shape, numpy.float32 )
-            self.lats = numpy.outer(numpy.outer( numpy.ones(self.shape[:1], numpy.float32), lats),
-                                    numpy.ones(self.shape[1+1:], numpy.float32)).reshape(self.shape)
-            self.lons = numpy.outer(numpy.outer( numpy.ones(self.shape[:2], numpy.float32), lons),
-                                    numpy.ones(self.shape[2+1:], numpy.float32)).reshape(self.shape)
-    
+                self.elvs = numpy.zeros(self.shape, numpy.float32)
+            self.lats = numpy.outer(
+                numpy.outer(numpy.ones(self.shape[:1], numpy.float32), lats),
+                                    numpy.ones(self.shape[1 + 1:], numpy.float32)).reshape(self.shape)
+            self.lons = numpy.outer(
+                numpy.outer(numpy.ones(self.shape[:2], numpy.float32), lons),
+                                    numpy.ones(self.shape[2 + 1:], numpy.float32)).reshape(self.shape)
+
         else:
             # already in curvilinear form
             self.lons = lons[:]
@@ -79,10 +87,10 @@ class SphereMesh:
             if elvs is not None:
                 self.elvs = elvs[:]
             else:
-                self.elvs = numpy.zeros( self.shape, numpy.float32 )
+                self.elvs = numpy.zeros(self.shape, numpy.float32)
 
         # reshape as flat arrays
-        sz = reduce(lambda x, y: x*y, self.shape)
+        sz = reduce(lambda x, y: x * y, self.shape)
         self.lons = numpy.reshape(self.lons, (sz,))
         self.lats = numpy.reshape(self.lats, (sz,))
         self.elvs = numpy.reshape(self.elvs, (sz,))
@@ -90,32 +98,33 @@ class SphereMesh:
     def getXYZCoords(self, sphereRadius=1.0):
         """
         Get the curvilinear cartesian coordinates
-        @param sphereRadius radius of sphere 
+        @param sphereRadius radius of sphere
         @return mesh
         """
-        sz = reduce(lambda x, y: x*y, self.shape)
-        rr = sphereRadius*(1.0 + self.elvs)
+        sz = reduce(lambda x, y: x * y, self.shape)
+        rr = sphereRadius * (1.0 + self.elvs)
         diffElv = self.maxElv - self.minElv
-        rr = sphereRadius*numpy.ones(self.lons.shape, numpy.float32 )
+        rr = sphereRadius * numpy.ones(self.lons.shape, numpy.float32)
         if diffElv != 0:
-            coeff = sphereRadius*self.sphereThickness/diffElv
+            coeff = sphereRadius * self.sphereThickness / diffElv
             if self.elvPositiveDown:
                 # depth
-                rr += coeff*(self.maxElv - self.elvs)
+                rr += coeff * (self.maxElv - self.elvs)
             else:
                 # height
-                rr += coeff*(self.elvs - self.minElv)
+                rr += coeff * (self.elvs - self.minElv)
 
-        mesh = numpy.zeros( (sz, 3), numpy.float32 )
-        cosLats = numpy.cos( self.lats*numpy.pi/180. )
-        mesh[:, 0] = rr*numpy.cos(self.lons*numpy.pi/180.)*cosLats
-        mesh[:, 1] = rr*numpy.sin(self.lons*numpy.pi/180.)*cosLats
-        mesh[:, 2] = rr*numpy.sin(self.lats*numpy.pi/180.)
+        mesh = numpy.zeros((sz, 3), numpy.float32)
+        cosLats = numpy.cos(self.lats * numpy.pi / 180.)
+        mesh[:, 0] = rr * numpy.cos(self.lons * numpy.pi / 180.) * cosLats
+        mesh[:, 1] = rr * numpy.sin(self.lons * numpy.pi / 180.) * cosLats
+        mesh[:, 2] = rr * numpy.sin(self.lats * numpy.pi / 180.)
         return mesh
 
-#####################################################################
+#
 # Tests
 
+
 def test2DRect():
     """
     Test data on 2D rectilinear grid
@@ -123,17 +132,18 @@ def test2DRect():
     import cdms2
     from numpy import pi, cos, sin
     nlat, nlon = 12, 15
-    grid = cdms2.createUniformGrid(-0.0, nlat, 60./(nlat-1), 
-                                    0., nlon, 30./nlon)
+    grid = cdms2.createUniformGrid(-0.0, nlat, 60. / (nlat - 1),
+                                   0., nlon, 30. / nlon)
     lons = grid.getLongitude()
     lats = grid.getLatitude()
-    data = numpy.outer(cos(3*pi*lats[:]/180.0), 
-                       sin(5*pi*lons[:]/180.0))
-    var = cdms2.createVariable(data, id='fake_data_2d_rect', 
+    data = numpy.outer(cos(3 * pi * lats[:] / 180.0),
+                       sin(5 * pi * lons[:] / 180.0))
+    var = cdms2.createVariable(data, id='fake_data_2d_rect',
                                axes=(lats, lons))
     sphere_mesh = SphereMesh(var, 0.1)
     print sphere_mesh.getXYZCoords()
 
+
 def test2D():
     """
     Test data on 2D curvilinear grid
@@ -143,33 +153,34 @@ def test2D():
     from cdms2.hgrid import TransientCurveGrid
     from numpy import pi, cos, sin
     nlat, nlon = 3, 4
-    dlon, dlat = 60.0/float(nlon - 1), 30.0/float(nlat - 1)
-    lons1D = numpy.array([0.0 + i*dlon for i in range(nlon)])
-    lats1D = numpy.array([0.0 + j*dlat for j in range(nlat)])
+    dlon, dlat = 60.0 / float(nlon - 1), 30.0 / float(nlat - 1)
+    lons1D = numpy.array([0.0 + i * dlon for i in range(nlon)])
+    lats1D = numpy.array([0.0 + j * dlat for j in range(nlat)])
     lons = numpy.outer(numpy.ones((nlat,)), lons1D)
     lats = numpy.outer(lats1D, numpy.ones((nlon,)))
-    data = cos(3*pi*lats/180.0) * sin(5*pi*lons/180.0)
+    data = cos(3 * pi * lats / 180.0) * sin(5 * pi * lons / 180.0)
     # create grid
     iaxis = TransientVirtualAxis("i", nlon)
     jaxis = TransientVirtualAxis("j", nlat)
-    lataxis = TransientAxis2D(lats, 
-                       axes=(jaxis, iaxis), 
-                       attributes={'units': 'degree_north'}, 
-                       id='lats')
-    lonaxis = TransientAxis2D(lons, 
-                       axes=(jaxis, iaxis), 
-                       attributes={'units': 'degree_east'}, 
-                       id='lons')
-    grid =  TransientCurveGrid(lataxis, lonaxis, id='lats_lons')
-
-    var = cdms2.createVariable(data, id='fake_data_2d', 
-                               axes = grid.getAxisList(),
-                               grid = grid,
-                               attributes = {'coordinates': 'lats lons'},
+    lataxis = TransientAxis2D(lats,
+                              axes=(jaxis, iaxis),
+                              attributes={'units': 'degree_north'},
+                              id='lats')
+    lonaxis = TransientAxis2D(lons,
+                              axes=(jaxis, iaxis),
+                              attributes={'units': 'degree_east'},
+                              id='lons')
+    grid = TransientCurveGrid(lataxis, lonaxis, id='lats_lons')
+
+    var = cdms2.createVariable(data, id='fake_data_2d',
+                               axes=grid.getAxisList(),
+                               grid=grid,
+                               attributes={'coordinates': 'lats lons'},
                                )
     sphere_mesh = SphereMesh(var)
     print sphere_mesh.getXYZCoords()
 
+
 def test3DRect():
     """
     Test data on 3d rectilinear grid
@@ -177,29 +188,30 @@ def test3DRect():
     import cdms2
     from numpy import pi, cos, sin, exp
     nelv, nlat, nlon = 3, 4, 5
-    delv, dlon, dlat = 90000./float(nelv-1), \
-        60.0/float(nlon-1), 30.0/float(nlat-1)
-    elvs1D = numpy.array([100000 - i*delv for i in range(nelv)])
-    lons1D = numpy.array([0.0 + i*dlon for i in range(nlon)])
-    lats1D = numpy.array([0.0 + i*dlat for i in range(nlat)])
+    delv, dlon, dlat = 90000. / float(nelv - 1), \
+        60.0 / float(nlon - 1), 30.0 / float(nlat - 1)
+    elvs1D = numpy.array([100000 - i * delv for i in range(nelv)])
+    lons1D = numpy.array([0.0 + i * dlon for i in range(nlon)])
+    lats1D = numpy.array([0.0 + i * dlat for i in range(nlat)])
     # any order should work
-    lons = numpy.zeros( (nlon, nlat, nelv), numpy.float32 )
-    lats = numpy.zeros( (nlon, nlat, nelv), numpy.float32 )
-    elvs = numpy.zeros( (nlon, nlat, nelv), numpy.float32 )
-    data = numpy.zeros( (nlon, nlat, nelv), numpy.float32 )
+    lons = numpy.zeros((nlon, nlat, nelv), numpy.float32)
+    lats = numpy.zeros((nlon, nlat, nelv), numpy.float32)
+    elvs = numpy.zeros((nlon, nlat, nelv), numpy.float32)
+    data = numpy.zeros((nlon, nlat, nelv), numpy.float32)
     for i in range(nlon):
         for j in range(nlat):
             for k in range(nelv):
                 elvs[i, j, k] = elvs1D[k]
                 lats[i, j, k] = lats1D[j]
                 lons[i, j, k] = lons1D[i]
-                data[i, j, k] = cos(3*pi*lats[i, j, k]/180.) * \
-                    sin(5*pi*lons[i, j, k]/180.) * exp(-elvs[i, j, k])
-    var = cdms2.createVariable(data, id='fake_data_3d_rect', 
+                data[i, j, k] = cos(3 * pi * lats[i, j, k] / 180.) * \
+                    sin(5 * pi * lons[i, j, k] / 180.) * exp(-elvs[i, j, k])
+    var = cdms2.createVariable(data, id='fake_data_3d_rect',
                                axes=(elvs, lats, lons))
     sphere_mesh = SphereMesh(var)
     print sphereMesh.getXYZCoords()
 
+
 def test3DposDown():
     """
     Test 3d data with elev positive down. Need to work with 1D axes.
@@ -208,31 +220,33 @@ def test3DposDown():
     import cdms2
     import numpy
     nlev, nlat, nlon = 4, 5, 6
-    dlev, dlat, dlon = 5000./float(nlev-1), 180./float(nlat-1), 360./float(nlon-1)
+    dlev, dlat, dlon = 5000. / \
+        float(nlev - 1), 180. / float(nlat - 1), 360. / float(nlon - 1)
     levs1d = numpy.arange(0., 5001., dlev)
-    lats1d = numpy.array([0. - i*dlat for i in range(nlat)])
-    lons1d = numpy.array([0. - i*dlon for i in range(nlon)])
+    lats1d = numpy.array([0. - i * dlat for i in range(nlat)])
+    lons1d = numpy.array([0. - i * dlon for i in range(nlon)])
     data = numpy.zeros((nlev, nlat, nlon), numpy.float32)
 
     for k in range(nlev):
         for j in range(nlat):
             for i in range(nlon):
-                data[k, j, i] = numpy.cos(3*numpy.pi*lats1d[j]/180.) * \
-                                numpy.sin(5*numpy.pi*lons1d[i]/180.) * \
+                data[k, j, i] = numpy.cos(3 * numpy.pi * lats1d[j] / 180.) * \
+                    numpy.sin(5 * numpy.pi * lons1d[i] / 180.) * \
                                 numpy.exp(-levs1d[k])
 
-    a1 = cdms2.axis.TransientAxis(levs1d, id = 'levels', 
-                                  attributes = {'positive':'down'})
-    a2 = cdms2.axis.TransientAxis(lats1d, id = 'latitude')
-    a3 = cdms2.axis.TransientAxis(lons1d, id = 'longitude')
-    var = cdms2.createVariable(data, id = 'pos_down_3d_data',
-                               axes = (a1, a2, a3))
+    a1 = cdms2.axis.TransientAxis(levs1d, id='levels',
+                                  attributes={'positive': 'down'})
+    a2 = cdms2.axis.TransientAxis(lats1d, id='latitude')
+    a3 = cdms2.axis.TransientAxis(lons1d, id='longitude')
+    var = cdms2.createVariable(data, id='pos_down_3d_data',
+                               axes=(a1, a2, a3))
     sphereMesh = SphereMesh(var)
     aa = sphereMesh.getXYZCoords()
     bb = aa.reshape((4, 5, 6, 3))
-    for i in range(nlev): print levs1d[i], bb[i, 0, 0, :]
+    for i in range(nlev):
+        print levs1d[i], bb[i, 0, 0, :]
 
-if __name__ == '__main__': 
+if __name__ == '__main__':
 #    test2DRect()
 #    test2D()
 #    test3DRect()
diff --git a/Packages/cdms2/Lib/mvVTKSGWriter.py b/Packages/cdms2/Lib/mvVTKSGWriter.py
index 353d8b19b..fd2327245 100644
--- a/Packages/cdms2/Lib/mvVTKSGWriter.py
+++ b/Packages/cdms2/Lib/mvVTKSGWriter.py
@@ -3,13 +3,14 @@
 """
 Write data to VTK file format using the structured grid format
 Alex Pletzer, Tech-X Corp. (2011)
-This code is provided with the hope that it will be useful. 
+This code is provided with the hope that it will be useful.
 No guarantee is provided whatsoever. Use at your own risk.
 """
 
 import numpy
 import time
-import mvBaseWriter
+from . import mvBaseWriter
+
 
 class VTKSGWriter(mvBaseWriter.BaseWriter):
 
@@ -29,10 +30,10 @@ class VTKSGWriter(mvBaseWriter.BaseWriter):
         npts = self.mesh.shape[0]
         print >> f, 'POINTS %d float' % npts
         for i in range(npts):
-            print >> f, '%f %f %f' % tuple(self.mesh[i,:])
+            print >> f, '%f %f %f' % tuple(self.mesh[i, :])
         n0, n1, n2 = self.shape
         # nodal data
-        print >> f, 'POINT_DATA %d' % (n0*n1*n2)
+        print >> f, 'POINT_DATA %d' % (n0 * n1 * n2)
         print >> f, 'SCALARS %s float' % (self.var.id)
         print >> f, 'LOOKUP_TABLE default'
         if n0 > 1:
@@ -43,34 +44,34 @@ class VTKSGWriter(mvBaseWriter.BaseWriter):
         else:
             for j in range(n1):
                 for i in range(n2):
-                    print >> f, '%f' % self.var[j, i]            
+                    print >> f, '%f' % self.var[j, i]
         f.close()
 
 
-######################################################################
+#
 
 def test2DRect():
     import cdms2
     from numpy import pi, cos, sin
     nlat, nlon = 6, 10
-    grid = cdms2.createUniformGrid(-0.0, nlat, 60./(nlat-1), 
-                                    0., nlon, 30./nlon)
+    grid = cdms2.createUniformGrid(-0.0, nlat, 60. / (nlat - 1),
+                                   0., nlon, 30. / nlon)
     lons = grid.getLongitude()
     lats = grid.getLatitude()
-    data = numpy.outer(cos(3*pi*lats[:]/180.0), 
-                       sin(5*pi*lons[:]/180.0))
-    var = cdms2.createVariable(data, id='fake_data_2d_rect', 
+    data = numpy.outer(cos(3 * pi * lats[:] / 180.0),
+                       sin(5 * pi * lons[:] / 180.0))
+    var = cdms2.createVariable(data, id='fake_data_2d_rect',
                                axes=(lats, lons))
     vw = VTKSGWriter(var)
     vw.write('test2DRect_SG.vtk')
 
+
 def test3D():
     import cdms2
     var = cdms2.open('sample_data/ta_ncep_87-6-88-4.nc', 'r')('ta')
-    vw = VTKSGWriter(var[0,0:10,0:20,0:30])
+    vw = VTKSGWriter(var[0, 0:10, 0:20, 0:30])
     vw.write('test3D_SG.vtk')
 
-if __name__ == '__main__': 
+if __name__ == '__main__':
     test2DRect()
     test3D()
-    
diff --git a/Packages/cdms2/Lib/mvVTKUGWriter.py b/Packages/cdms2/Lib/mvVTKUGWriter.py
index 50dcb1195..e712efaf7 100644
--- a/Packages/cdms2/Lib/mvVTKUGWriter.py
+++ b/Packages/cdms2/Lib/mvVTKUGWriter.py
@@ -3,13 +3,14 @@
 """
 Write data to VTK file format using the unstructured grid format
 Alex Pletzer, Tech-X Corp. (2011)
-This code is provided with the hope that it will be useful. 
+This code is provided with the hope that it will be useful.
 No guarantee is provided whatsoever. Use at your own risk.
 """
 
 import numpy
 import time
-import mvBaseWriter
+from . import mvBaseWriter
+
 
 class VTKUGWriter(mvBaseWriter.BaseWriter):
 
@@ -26,9 +27,9 @@ class VTKUGWriter(mvBaseWriter.BaseWriter):
         npts = self.mesh.shape[0]
         print >> f, 'POINTS %d float' % npts
         for i in range(npts):
-            print >> f, '%f %f %f' % tuple(self.mesh[i,:])
+            print >> f, '%f %f %f' % tuple(self.mesh[i, :])
         n0, n1, n2 = self.shape
-        ncells = (n0 - 1)*(n1 - 1)*(n2 - 1)
+        ncells = (n0 - 1) * (n1 - 1) * (n2 - 1)
         if ncells != 0:
             # 3d
             ntot = ncells * (8 + 1)
@@ -36,17 +37,17 @@ class VTKUGWriter(mvBaseWriter.BaseWriter):
             for k in range(n0 - 1):
                 for j in range(n1 - 1):
                     for i in range(n2 - 1):
-                        index = i + n2*(j + n1*k)
+                        index = i + n2 * (j + n1 * k)
                         print >> f, '8 %d %d %d %d %d %d %d %d' % \
-                            (index, index+1, index+1+n2, index+n2, 
-                             index+n1*n2, index+n1*n2+1, 
-                             index+n1*n2+1+n2, index+n1*n2+n2)
+                            (index, index + 1, index + 1 + n2, index + n2,
+                             index + n1 * n2, index + n1 * n2 + 1,
+                             index + n1 * n2 + 1 + n2, index + n1 * n2 + n2)
             print >> f, 'CELL_TYPES %d' % ncells
             for i in range(ncells):
                 # hexahedron
                 print >> f, 12
             # nodal data
-            print >> f, 'POINT_DATA %d' % (n0*n1*n2)
+            print >> f, 'POINT_DATA %d' % (n0 * n1 * n2)
             print >> f, 'SCALARS %s float' % (self.var.id)
             print >> f, 'LOOKUP_TABLE default'
             for k in range(n0):
@@ -55,52 +56,52 @@ class VTKUGWriter(mvBaseWriter.BaseWriter):
                         print >> f, '%f' % self.var[k, j, i]
         else:
             # 2d
-            ncells = (n1 - 1)*(n2 - 1)
+            ncells = (n1 - 1) * (n2 - 1)
             ntot = ncells * (4 + 1)
             print >> f, 'CELLS %d %d' % (ncells, ntot)
             for j in range(n1 - 1):
                 for i in range(n2 - 1):
-                    index = i + n2*j
+                    index = i + n2 * j
                     print >> f, '4 %d %d %d %d' % \
-                        (index, index+1, index+1+n2, index+n2)
+                        (index, index + 1, index + 1 + n2, index + n2)
             print >> f, 'CELL_TYPES %d' % ncells
             for i in range(ncells):
                 # quad
                 print >> f, 9
             # nodal data
-            print >> f, 'POINT_DATA %d' % (n0*n1*n2)
+            print >> f, 'POINT_DATA %d' % (n0 * n1 * n2)
             print >> f, 'SCALARS %s float' % (self.var.id)
             print >> f, 'LOOKUP_TABLE default'
             for j in range(n1):
                 for i in range(n2):
-                    print >> f, '%f' % self.var[j, i]   
+                    print >> f, '%f' % self.var[j, i]
         f.close()
 
 
-######################################################################
+#
 
 def test2DRect():
     import cdms2
     from numpy import pi, cos, sin
     nlat, nlon = 6, 10
-    grid = cdms2.createUniformGrid(-0.0, nlat, 60./(nlat-1), 
-                                    0., nlon, 30./nlon)
+    grid = cdms2.createUniformGrid(-0.0, nlat, 60. / (nlat - 1),
+                                   0., nlon, 30. / nlon)
     lons = grid.getLongitude()
     lats = grid.getLatitude()
-    data = numpy.outer(cos(3*pi*lats[:]/180.0), 
-                       sin(5*pi*lons[:]/180.0))
-    var = cdms2.createVariable(data, id='fake_data_2d_rect', 
+    data = numpy.outer(cos(3 * pi * lats[:] / 180.0),
+                       sin(5 * pi * lons[:] / 180.0))
+    var = cdms2.createVariable(data, id='fake_data_2d_rect',
                                axes=(lats, lons))
     vw = VTKUGWriter(var)
     vw.write('test2DRect.vtk')
 
+
 def test3D():
     import cdms2
     var = cdms2.open('sample_data/ta_ncep_87-6-88-4.nc', 'r')('ta')
-    vw = VTKUGWriter(var[0,0:10,0:20,0:30])
+    vw = VTKUGWriter(var[0, 0:10, 0:20, 0:30])
     vw.write('test3D.vtk')
 
-if __name__ == '__main__': 
+if __name__ == '__main__':
     test2DRect()
     test3D()
-    
diff --git a/Packages/cdms2/Lib/mvVsWriter.py b/Packages/cdms2/Lib/mvVsWriter.py
index aed81a79f..72bb31526 100644
--- a/Packages/cdms2/Lib/mvVsWriter.py
+++ b/Packages/cdms2/Lib/mvVsWriter.py
@@ -3,14 +3,15 @@
 """
 Write data to VizSchema compliant file
 Alex Pletzer, Tech-X Corp. (2011)
-This code is provided with the hope that it will be useful. 
+This code is provided with the hope that it will be useful.
 No guarantee is provided whatsoever. Use at your own risk.
 """
 
 import numpy
-import mvBaseWriter
+from . import mvBaseWriter
 import re
 
+
 class VsWriter(mvBaseWriter.BaseWriter):
 
     def write(self, filename):
@@ -21,58 +22,59 @@ class VsWriter(mvBaseWriter.BaseWriter):
         try:
             import tables
         except:
-            raise ImportError, 'You must have pytables installed'
-        
+            raise ImportError('You must have pytables installed')
+
         if filename.find('.vsh5') < 0 and filename.find('.h5') < 0:
-            filename += '.vsh5' # VizSchema hdf5 format
+            filename += '.vsh5'  # VizSchema hdf5 format
 
         # open file
         h5file = tables.openFile(filename, 'w')
         # put mesh
         meshid = 'mesh_' + self.var.id
-        mdata = numpy.reshape(self.mesh, self.shape + [3,])
+        mdata = numpy.reshape(self.mesh, self.shape + [3, ])
         mset = h5file.createArray("/", meshid, mdata)
         mset.attrs.vsType = "mesh"
         mset.attrs.vsKind = "structured"
         mset.attrs.vsIndexOrder = "compMinorC"
         # data
-        dset = h5file.createArray("/", self.var.id, 
+        dset = h5file.createArray("/", self.var.id,
                                   numpy.reshape(self.var, self.shape))
         dset.attrs.vsType = "variable"
         dset.attrs.vsMesh = meshid
         # additional attributes
         for a in self.var.attributes:
             # Skip mpi objects
-            if re.match('mpi',a.lower()):
+            if re.match('mpi', a.lower()):
                 continue
             setattr(dset.attrs, a, getattr(self.var, a))
         # close file
         h5file.close()
 
-######################################################################
+#
+
 
 def test2DRect():
     import cdms2
     from numpy import pi, cos, sin
     nlat, nlon = 3, 4
-    grid = cdms2.createUniformGrid(-0.0, nlat, 60./(nlat-1), 
-                                    0., nlon, 30./nlon)
+    grid = cdms2.createUniformGrid(-0.0, nlat, 60. / (nlat - 1),
+                                   0., nlon, 30. / nlon)
     lons = grid.getLongitude()
     lats = grid.getLatitude()
-    data = numpy.outer(cos(3*pi*lats[:]/180.0), 
-                       sin(5*pi*lons[:]/180.0))
-    var = cdms2.createVariable(data, id='fake_data_2d_rect', 
+    data = numpy.outer(cos(3 * pi * lats[:] / 180.0),
+                       sin(5 * pi * lons[:] / 180.0))
+    var = cdms2.createVariable(data, id='fake_data_2d_rect',
                                axes=(lats, lons))
     vw = VsWriter(var)
     vw.write('test2DRect.vsh5')
 
+
 def test3D():
     import cdms2
     var = cdms2.open('sample_data/ta_ncep_87-6-88-4.nc', 'r')('ta')
-    vw = VsWriter(var[0,0:10,0:20,0:30])
+    vw = VsWriter(var[0, 0:10, 0:20, 0:30])
     vw.write('test3D.vsh5')
 
-if __name__ == '__main__': 
+if __name__ == '__main__':
     test2DRect()
     test3D()
-    
diff --git a/Packages/cdms2/Lib/restApi.py b/Packages/cdms2/Lib/restApi.py
index 2b5ef1059..0ee17424d 100644
--- a/Packages/cdms2/Lib/restApi.py
+++ b/Packages/cdms2/Lib/restApi.py
@@ -6,116 +6,136 @@ try:
 except:
     pass
 import os
-#import bz2
+# import bz2
+
 
 class esgfConnectionException(Exception):
     pass
+
+
 class esgfDatasetException(Exception):
     pass
+
+
 class esgfFilesException(Exception):
     pass
-    ## def __init__(self,value):
-    ##     self.value=value
-    ## def __repr__(self):
-    ##     msg =  "rest API error: %s" % repr(value)
-    ##     print msg
-    ##     return msg
+    # def __init__(self,value):
+    # self.value=value
+    # def __repr__(self):
+    # msg =  "rest API error: %s" % repr(value)
+    # print msg
+    # return msg
+
 
 class FacetConnection(object):
-    def __init__(self,host='pcmdi9.llnl.gov'):
-        self.rqst="http://%s/esg-search/search?facets=*&type=Dataset&limit=1&latest=true" % host
-        self.rqst_count="http://%s/esg-search/search?facets=*&type=File&limit=0&latest=true" % host
+
+    def __init__(self, host='pcmdi9.llnl.gov'):
+        self.rqst = "http://%s/esg-search/search?facets=*&type=Dataset&limit=1&latest=true" % host
+        self.rqst_count = "http://%s/esg-search/search?facets=*&type=File&limit=0&latest=true" % host
         self.EsgfObjectException = esgfConnectionException
-    def get_xmlelement(self,facet_param=None):
+
+    def get_xmlelement(self, facet_param=None):
         try:
-            rqst=self.rqst
+            rqst = self.rqst
             if facet_param:
-                rqst=rqst+'&%s'%facet_param        
-            #print rqst
+                rqst = rqst + '&%s' % facet_param
+            # print rqst
             url = urllib2.urlopen(rqst)
-        except Exception,msg:
-             raise self.EsgfObjectException(msg)
+        except Exception as msg:
+            raise self.EsgfObjectException(msg)
         r = url.read()
         try:
             e = xml.etree.ElementTree.fromstring(r)
             return e
-        except Exception,err:
-            raise self.EsgfObjectException("Could not interpret server's results: %s" % err)
-    def make_facet_dict(self,xmlelement):
-        facet_dict={}
+        except Exception as err:
+            raise self.EsgfObjectException(
+                "Could not interpret server's results: %s" %
+                err)
+
+    def make_facet_dict(self, xmlelement):
+        facet_dict = {}
         for lst in xmlelement.findall('lst'):
-            if lst.get('name')=='facet_counts':
-                myelement=lst
+            if lst.get('name') == 'facet_counts':
+                myelement = lst
                 for node in myelement.findall('lst'):
-                    if node.get('name')=='facet_fields':
+                    if node.get('name') == 'facet_fields':
                         for child in node.getchildren():
-                            facet_name=child.get('name')
-                            facet_dict[facet_name]=[]
+                            facet_name = child.get('name')
+                            facet_dict[facet_name] = []
                             for grandchild in child.getchildren():
-                                facet_dict[facet_name].append("%s (%s)"%(str(grandchild.get('name')),str(grandchild.text)))
+                                facet_dict[facet_name].append(
+                                    "%s (%s)" %
+                                    (str(grandchild.get('name')), str(grandchild.text)))
         return facet_dict
-    def get_xmlelement_count(self,facet_param=None):
+
+    def get_xmlelement_count(self, facet_param=None):
         try:
-            rqst=self.rqst_count
+            rqst = self.rqst_count
             if facet_param:
-                rqst=rqst+'&%s'%facet_param        
-                #print rqst
+                rqst = rqst + '&%s' % facet_param
+                # print rqst
             url = urllib2.urlopen(rqst)
-        except Exception,msg:
-             raise self.EsgfObjectException(msg)
+        except Exception as msg:
+            raise self.EsgfObjectException(msg)
         r = url.read()
         try:
             e = xml.etree.ElementTree.fromstring(r)
             return e
-        except Exception,err:
-            raise self.EsgfObjectException("Could not interpret server's results: %s" % err)
+        except Exception as err:
+            raise self.EsgfObjectException(
+                "Could not interpret server's results: %s" %
+                err)
 
-    def make_facet_dict_count(self,xmlelement):
-        myelementlist=xmlelement.findall('result')
-        count=None
+    def make_facet_dict_count(self, xmlelement):
+        myelementlist = xmlelement.findall('result')
+        count = None
         if len(myelementlist) > 0:
-            myelement=myelementlist[0]
-            count=int(myelement.get('numFound'))
+            myelement = myelementlist[0]
+            count = int(myelement.get('numFound'))
         return count
 
-validSearchTypes =  ["Dataset","File"]#"ById","ByTimeStamp"]
+validSearchTypes = ["Dataset", "File"]  # "ById","ByTimeStamp"]
+
+
 class esgfConnection(object):
-    def __init__(self,host,port=80,timeout=15,limit=None,offset=0,mapping=None,datasetids=None,fileids=None,restPath=None):
-        self.port=port
-        url=str(host).replace("://","^^^---^^^")
-        sp= url.split("/")
-        host = sp[0].replace("^^^---^^^","://")
+
+    def __init__(self, host, port=80, timeout=15, limit=None, offset=0,
+                 mapping=None, datasetids=None, fileids=None, restPath=None):
+        self.port = port
+        url = str(host).replace("://", "^^^---^^^")
+        sp = url.split("/")
+        host = sp[0].replace("^^^---^^^", "://")
         if restPath is None:
             restPath = "/".join(sp[1:])
-            if len(restPath)==0:
-                self.restPath="/esg-search/search"
+            if len(restPath) == 0:
+                self.restPath = "/esg-search/search"
             else:
-                self.restPath=restPath
+                self.restPath = restPath
         else:
-            self.restPath=restPath
-        self.host=host
-        #self.host="esg-datanode.jpl.nasa.gov"
+            self.restPath = restPath
+        self.host = host
+        # self.host="esg-datanode.jpl.nasa.gov"
         self.defaultSearchType = "Dataset"
         self.EsgfObjectException = esgfConnectionException
-        self.validSearchTypes=validSearchTypes
-        self.validSearchTypes=["Dataset",]
-        all = self._search("facets=*",searchType=None)
-        ## Now figure out the facet fields
+        self.validSearchTypes = validSearchTypes
+        self.validSearchTypes = ["Dataset", ]
+        all = self._search("facets=*", searchType=None)
+        # Now figure out the facet fields
         self.serverOrder = []
         for e in all:
-            if e.tag=="lst" and "name" in e.keys() and e.get("name")=="responseHeader":
-                ## ok found the Header
+            if e.tag == "lst" and "name" in e.keys() and e.get("name") == "responseHeader":
+                # ok found the Header
                 for s in e:
-                    if s.get("name")=="params":
-                        params=s
+                    if s.get("name") == "params":
+                        params = s
                         break
-                self.params={"text":None,"limit":limit,"offset":offset}
-                self.searchableKeys=set(["text","limit","offset"])
+                self.params = {"text": None, "limit": limit, "offset": offset}
+                self.searchableKeys = set(["text", "limit", "offset"])
                 for p in params:
-                    if p.get("name")=="facet.field":
+                    if p.get("name") == "facet.field":
                         for f in p:
                             self.serverOrder.append(f.text)
-                            self.params[f.text]=None
+                            self.params[f.text] = None
                             self.searchableKeys.add(f.text)
 
         self.keys = self.params.keys
@@ -123,61 +143,68 @@ class esgfConnection(object):
         self.values = self.params.values
 
         if datasetids is not None:
-            self.datasetids=genutil.StringConstructor(datasetids)
+            self.datasetids = genutil.StringConstructor(datasetids)
         else:
-            self.datasetids=None
+            self.datasetids = None
         if fileids is not None:
-            self.fileids=genutil.StringConstructor(fileids)
+            self.fileids = genutil.StringConstructor(fileids)
             if datasetids is not None:
-                self.fileids.template=self.fileids.template.replace("%(datasetid)",self.datasetids.template)
+                self.fileids.template = self.fileids.template.replace(
+                    "%(datasetid)", self.datasetids.template)
         elif self.datasetids is not None:
-            self.fileids=genutil.StringConstructor("%s.%%(filename)" % self.datasetids.template)
+            self.fileids = genutil.StringConstructor(
+                "%s.%%(filename)" %
+                self.datasetids.template)
         else:
-            self.fileids=None
-        #self.setMapping(mapping)
-        self.mapping=mapping                    
-            
-    ## def setUserOrder(self,value):
-    ##     self.userOrder=value
-    ## def getUserOrder(self):
-    ##     return self.userOrder
-    ## order=property(getUserOrder,setUserOrder)
-    def __getitem__(self,key):
+            self.fileids = None
+        # self.setMapping(mapping)
+        self.mapping = mapping
+
+    # def setUserOrder(self,value):
+    # self.userOrder=value
+    # def getUserOrder(self):
+    # return self.userOrder
+    # order=property(getUserOrder,setUserOrder)
+    def __getitem__(self, key):
         try:
             val = self.params[key]
         except:
             raise self.EsgfObjectException("Invalid key: %s" % repr(key))
         return val
-    def __setitem__(self,key,value):
+
+    def __setitem__(self, key, value):
         if not key in self.params.keys():
-            raise self.EsgfObjectException("Invalid key: %s, valid keys are: %s" % (repr(key),repr(self.params.keys())))
-        self.params[key]=value
+            raise self.EsgfObjectException(
+                "Invalid key: %s, valid keys are: %s" %
+                (repr(key), repr(self.params.keys())))
+        self.params[key] = value
         return
 
-                            
-    def _search(self,search="",searchType=None,stringType=False):
+    def _search(self, search="", searchType=None, stringType=False):
         if searchType is None:
-            searchType=self.defaultSearchType
+            searchType = self.defaultSearchType
         if not searchType in self.validSearchTypes:
-            raise self.EsgfObjectException("Valid Search types are: %s" % repr(self.validSearchTypes))
-        while search[0]=="&":
-            search=search[1:]
-        rqst = "%s/?type=%s&%s" % (self.restPath,searchType,search)
-        #print "REQUEST: %s%s" % (self.host,rqst)
-        myhost=str(self.host)
-        myport=str(self.port)
-        if myhost.find("://")>-1:
-            urltype=""
+            raise self.EsgfObjectException(
+                "Valid Search types are: %s" %
+                repr(self.validSearchTypes))
+        while search[0] == "&":
+            search = search[1:]
+        rqst = "%s/?type=%s&%s" % (self.restPath, searchType, search)
+        # print "REQUEST: %s%s" % (self.host,rqst)
+        myhost = str(self.host)
+        myport = str(self.port)
+        if myhost.find("://") > -1:
+            urltype = ""
         else:
-            urltype="http://"
+            urltype = "http://"
         try:
-            rqst="%s%s:%s/%s" % (urltype,myhost,myport,rqst)
-            tmp=rqst[6:].replace("//","/")
-            rqst=rqst[:6]+tmp
-            #print "Request:%s"%rqst
+            rqst = "%s%s:%s/%s" % (urltype, myhost, myport, rqst)
+            tmp = rqst[6:].replace("//", "/")
+            rqst = rqst[:6] + tmp
+            # print "Request:%s"%rqst
             url = urllib2.urlopen(rqst)
-        except Exception,msg:
-             raise self.EsgfObjectException(msg)
+        except Exception as msg:
+            raise self.EsgfObjectException(msg)
         r = url.read()
         if stringType:
             return r
@@ -185,539 +212,591 @@ class esgfConnection(object):
             try:
                 e = xml.etree.ElementTree.fromstring(r)
                 return e
-            except Exception,err:
-                raise self.EsgfObjectException("Could not interpret server's results: %s" % err)
+            except Exception as err:
+                raise self.EsgfObjectException(
+                    "Could not interpret server's results: %s" %
+                    err)
 
-    def generateRequest(self,stringType=False,**keys):
+    def generateRequest(self, stringType=False, **keys):
         search = ""
-        params={"limit":self["limit"],"offset":self["offset"]}
+        params = {"limit": self["limit"], "offset": self["offset"]}
 
-        ## for k in self.keys():
-        ##     if self[k] is not None and k in self.searchableKeys and k!="type":
-        ##         params[k]=self[k]
+        # for k in self.keys():
+        # if self[k] is not None and k in self.searchableKeys and k!="type":
+        # params[k]=self[k]
 
-        
         for k in keys.keys():
             if k == "stringType":
-                stringType=keys[k]
+                stringType = keys[k]
                 continue
             elif k == "type":
                 continue
-            ## elif not k in self.searchableKeys:
-            ##     raise self.EsgfObjectException("Invalid key: %s, valid keys are: %s" % (repr(k),repr(self.params.keys())))
+            # elif not k in self.searchableKeys:
+            # raise self.EsgfObjectException("Invalid key: %s, valid keys are:
+            # %s" % (repr(k),repr(self.params.keys())))
             if keys[k] is not None:
-                params[k]=keys[k]
+                params[k] = keys[k]
 
         search = ""
         for k in params.keys():
-            if isinstance(params[k],list):
+            if isinstance(params[k], list):
                 for v in params[k]:
-                    if isinstance(v,str):
-                        v=v.strip()
-                    search+="&%s=%s" % (k,v)
+                    if isinstance(v, str):
+                        v = v.strip()
+                    search += "&%s=%s" % (k, v)
             else:
                 v = params[k]
-                if isinstance(v,str):
-                    v=v.strip()
-                search+="&%s=%s" % (k,v)
+                if isinstance(v, str):
+                    v = v.strip()
+                search += "&%s=%s" % (k, v)
 
-#        search = "&".join(map(lambda x : "%s=%s" % (x[0],x[1]), params.items()))
-        search=search.replace(" ","%20")
+# search = "&".join(map(lambda x : "%s=%s" % (x[0],x[1]), params.items()))
+        search = search.replace(" ", "%20")
         return search
-    
-    def request(self,**keys):
-        numFound=0
+
+    def request(self, **keys):
+        numFound = 0
         cont = True
-        r=[]
+        r = []
         limit = self["limit"]
         while cont:
-            #print "Continuing",limit
-            self["offset"]=numFound
-            if limit is None or limit>1000:
-                self["limit"]=1000
+            # print "Continuing",limit
+            self["offset"] = numFound
+            if limit is None or limit > 1000:
+                self["limit"] = 1000
             search = self.generateRequest(**keys)
-            stringType=keys.get("stringType",False)
-            r.append(self._search(search,stringType=stringType))
-            if numFound==0:
+            stringType = keys.get("stringType", False)
+            r.append(self._search(search, stringType=stringType))
+            if numFound == 0:
                 for s in r[0][:]:
-                    if s.tag=="result":
+                    if s.tag == "result":
                         n = int(s.get("numFound"))
-            numFound+=self["limit"]
+            numFound += self["limit"]
             if limit is None:
-                if numFound>=n:
+                if numFound >= n:
                     cont = False
             else:
-                if numFound>=limit:
-                    cont=False
-            #print "N is:",numFound,n
-        self["limit"]=limit
-        self["offset"]=0
+                if numFound >= limit:
+                    cont = False
+            # print "N is:",numFound,n
+        self["limit"] = limit
+        self["offset"] = 0
         return r
-    
-    def extractTag(self,f):
-        out=None
-        if f.tag=="str":
-            out=f.text
-        elif f.tag=="arr":
-            out=[]
+
+    def extractTag(self, f):
+        out = None
+        if f.tag == "str":
+            out = f.text
+        elif f.tag == "arr":
+            out = []
             for sub in f[:]:
                 out.append(self.extractTag(sub))
-            
-        elif f.tag=="float":
+
+        elif f.tag == "float":
             out = float(f.text)
-        elif f.tag=="int":
+        elif f.tag == "int":
             out = int(f.text)
-        elif f.tag=="date":
-            ## Convert to cdtime?
-            out =f.text
+        elif f.tag == "date":
+            # Convert to cdtime?
+            out = f.text
         else:
-            out=f
-        if isinstance(out,list) and len(out)==1:
-            out=out[0]
+            out = f
+        if isinstance(out, list) and len(out) == 1:
+            out = out[0]
         return out
-        
-    def searchDatasets(self,**keys):
+
+    def searchDatasets(self, **keys):
         resps = self.request(**keys)
-        stringType=keys.get("stringType",False)
+        stringType = keys.get("stringType", False)
         if stringType:
             return resp
         datasets = []
         for resp in resps:
             for r in resp[:]:
-                if r.tag=="result":
-                    ##Ok let's go thru these datasets
+                if r.tag == "result":
+                    # Ok let's go thru these datasets
                     for d in r[:]:
-                        #print "************************************************"
-                        tmpkeys={}
+                        # print
+                        # "************************************************"
+                        tmpkeys = {}
                         for f in d[:]:
                             k = f.get("name")
-                            tmpkeys[k]=self.extractTag(f)
-                        if tmpkeys["type"]=="Dataset":
+                            tmpkeys[k] = self.extractTag(f)
+                        if tmpkeys["type"] == "Dataset":
                             datasetid = tmpkeys["id"]
-                            #print datasetid,self.restPath
-                            #print "KEYS FOR DATASET",keys.keys()
-                            datasets.append(esgfDataset(host=self.host,port=self.port,limit=1000,offset=0,mapping=self.mapping,datasetids=self.datasetids,fileids=self.fileids,keys=tmpkeys,originalKeys=keys,restPath=self.restPath))
+                            # print datasetid,self.restPath
+                            # print "KEYS FOR DATASET",keys.keys()
+                            datasets.append(
+                                esgfDataset(host=self.host,
+                                            port=self.port,
+                                            limit=1000,
+                                            offset=0,
+                                            mapping=self.mapping,
+                                            datasetids=self.datasetids,
+                                            fileids=self.fileids,
+                                            keys=tmpkeys,
+                                            originalKeys=keys,
+                                            restPath=self.restPath))
         return datasets
 
+
 class esgfDataset(esgfConnection):
-    def __init__(self,host=None,port=80,limit=1000,offset=0,mapping=None,datasetids=None,fileids=None,_http=None,restPath=None,keys={},originalKeys={}):
+
+    def __init__(self, host=None, port=80, limit=1000, offset=0, mapping=None,
+                 datasetids=None, fileids=None, _http=None, restPath=None, keys={}, originalKeys={}):
         if host is None:
             raise esgfDatasetException("You need to pass url")
-        self.host=host
-        #self.host="esg-datanode.jpl.nasa.gov"
-        self.port=port
-        self.defaultSearchType="File"
+        self.host = host
+        # self.host="esg-datanode.jpl.nasa.gov"
+        self.port = port
+        self.defaultSearchType = "File"
         if restPath is None:
-            self.restPath="/esg-search/search"
+            self.restPath = "/esg-search/search"
         else:
-            self.restPath=restPath
+            self.restPath = restPath
         if datasetids is None:
             if "dataset_id_template_" in keys:
-                tmp=keys["dataset_id_template_"]
-                if tmp[:5]=="cmip5":
-                    tmp = tmp.replace("valid_institute","institute")
-                    tmp="%(project)"+tmp[5:]
-                self.datasetids = genutil.StringConstructor(tmp.replace(")s",")"))
-            elif "project" in keys and keys["project"]=="cmip5":
-                self.datasetids = genutil.StringConstructor("%(project).%(product).%(institute).%(model).%(experiment).%(time_frequency).%(realm).%(cmor_table).%(ensemble)")
+                tmp = keys["dataset_id_template_"]
+                if tmp[:5] == "cmip5":
+                    tmp = tmp.replace("valid_institute", "institute")
+                    tmp = "%(project)" + tmp[5:]
+                self.datasetids = genutil.StringConstructor(
+                    tmp.replace(")s", ")"))
+            elif "project" in keys and keys["project"] == "cmip5":
+                self.datasetids = genutil.StringConstructor(
+                    "%(project).%(product).%(institute).%(model).%(experiment).%(time_frequency).%(realm).%(cmor_table).%(ensemble)")
             else:
-                self.datasetids=None
-        if isinstance(datasetids,genutil.StringConstructor):
-            self.datasetids=datasetids
-        elif isinstance(datasetids,str):
-            self.datasetids=genutil.StringConstructor(datasetids)
+                self.datasetids = None
+        if isinstance(datasetids, genutil.StringConstructor):
+            self.datasetids = datasetids
+        elif isinstance(datasetids, str):
+            self.datasetids = genutil.StringConstructor(datasetids)
         if fileids is not None:
-            if isinstance(fileids,genutil.StringConstructor):
-                self.fileids=fileids
+            if isinstance(fileids, genutil.StringConstructor):
+                self.fileids = fileids
             else:
-                self.fileids=genutil.StringConstructor(fileids)
+                self.fileids = genutil.StringConstructor(fileids)
             if self.datasetids is not None:
-                self.fileids.template=self.fileids.template.replace("%(datasetid)",self.datasetids.template)
+                self.fileids.template = self.fileids.template.replace(
+                    "%(datasetid)", self.datasetids.template)
         elif self.datasetids is not None:
-            self.fileids=genutil.StringConstructor("%s.%%(filename)" % self.datasetids.template)
+            self.fileids = genutil.StringConstructor(
+                "%s.%%(filename)" %
+                self.datasetids.template)
         else:
-            self.fileids=None
-        self.originalKeys=originalKeys
-        self.validSearchTypes=validSearchTypes
-        self.validSearchTypes=["File",]
+            self.fileids = None
+        self.originalKeys = originalKeys
+        self.validSearchTypes = validSearchTypes
+        self.validSearchTypes = ["File", ]
         self.EsgfObjectException = esgfDatasetException
-        self.params=keys
+        self.params = keys
         self.keys = self.params.keys
         self.items = self.params.items
         self.values = self.params.values
-        #self.id=self["id"]
-        self.params["limit"]=limit
-        self.params["offset"]=offset
-        self.mapping=mapping
-        #print "SEARCHING DS:",originalKeys
-        self.resp=None
+        # self.id=self["id"]
+        self.params["limit"] = limit
+        self.params["offset"] = offset
+        self.mapping = mapping
+        # print "SEARCHING DS:",originalKeys
+        self.resp = None
         self.cacheTime = None
 #        self.search()
 #        self.remap()
-        
-        ## Ok now we need to "map" this according to the user wishes
-
-           
-
-    ## def mappedItems():
-    ##     mapped=[]
-    ##     mapppoint=self.mapped
-    ##     for k in self.mapping.keys():
-    ##         keys=[]
-    ##         level=[k,mappoint.keys()]
-    ##         mappoint
-    def _extractFiles(self,resp,**inKeys):
-        ## We need to stick in there the bit from Luca to fill in the matching key from facet for now it's empty
-        files=[]
-        skipped = ["type","title","timestamp","service","id","score","file_url","service_type"]
+
+        # Ok now we need to "map" this according to the user wishes
+
+    # def mappedItems():
+    # mapped=[]
+    # mapppoint=self.mapped
+    # for k in self.mapping.keys():
+    # keys=[]
+    # level=[k,mappoint.keys()]
+    # mappoint
+    def _extractFiles(self, resp, **inKeys):
+        # We need to stick in there the bit from Luca to fill in the matching
+        # key from facet for now it's empty
+        files = []
+        skipped = [
+            "type",
+            "title",
+            "timestamp",
+            "service",
+            "id",
+            "score",
+            "file_url",
+            "service_type"]
         for r in resp[:]:
-            if r.tag=="result":
+            if r.tag == "result":
                 for d in r[:][:]:
-                    keys={}
+                    keys = {}
                     for f in d[:]:
                         k = f.get("name")
-                        keys[k]=self.extractTag(f)
-                    if keys["type"]=="File":
-                        ## if self["id"]=="obs4MIPs.NASA-JPL.AIRS.mon":
-                        ##     verbose=True
-                        ## else:
-                        ##     verbose=False
-                        ## #verbose=True
-                        ## if verbose: print "OK",keys["variable"],keys["file_id"],self["id"]
-                        ## if verbose: print "FILEIDS:",self.fileids
-                        ## if verbose: print "Fileids:",self.fileids.template
-                        ## if verbose: print "keys:",keys
-                        ## if self.fileids is not None:
-                        ##     try:
-                        ##         if verbose: print "file:",keys["file_id"],self.fileids.template
-                        ##         k2 = self.fileids.reverse(keys["file_id"])
-                        ##         if verbose: print "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",k2
-                        ##         for k in k2.keys():
-                        ##             keys[k]=k2[k]
-                        ##     except:
-                        ##         if verbose: print "Failed:",ids[i].text,self.fileids.template
-                        ##         pass
-                        ## if verbose: print "KEYS FOR FILE:",keys.keys()
-                        ## if verbose: print "INKEYS:",inKeys.keys()
-                        ## matched = True
-                        ## matchWithKeys = {}
-                        ## for k in self.keys():
-                        ##     if k in self.originalKeys.keys():
-                        ##         matchWithKeys[k]=self.originalKeys[k]
-                        ##     else:
-                        ##         matchWithKeys[k]=self[k]
-                        ## for s in skipped:
-                        ##     try:
-                        ##         matchWithKeys.pop(s)
-                        ##     except:
-                        ##         pass
-                        ## for k in inKeys.keys():
-                        ##     matchWithKeys[k]=inKeys[k]
-                        ## if verbose: print "matching:",matchWithKeys.keys()
-                        ## for k in keys.keys():
-                        ##     if k in matchWithKeys.keys():
-                        ##         if verbose: print "Testing:",k,keys[k]
-                        ##         v = matchWithKeys[k]
-                        ##         if isinstance(v,(str,int,float)):
-                        ##             if verbose: print "\tComparing with:",v
-                        ##             if v != keys[k]:
-                        ##                 matched = False
-                        ##                 if verbose: print "\t\tNOPE"
-                        ##                 break
-                        ##         elif isinstance(v,list):
-                        ##             if verbose: print "\tComparing with (and %i more):%s"%(len(v),v[0]),v
-                        ##             if not keys[k] in v:
-                        ##                 matched = False
-                        ##                 if verbose: print "\t\tNOPE"
-                        ##                 break
-                        ##         else:
-                        ##             print "\twould compare %s with type: %s if I knew how to" % (str(v),type(v))
-                        ## if verbose: print keys["file_id"],matched
-                        ## if matched :
-                        ##     for k in self.keys():
-                        ##         if not k in keys.keys():
-                        ##             keys[k]=self[k]
-                        ##     print "KEYS:",keys
-                            files.append(esgfFile(**keys))
+                        keys[k] = self.extractTag(f)
+                    if keys["type"] == "File":
+                        # if self["id"]=="obs4MIPs.NASA-JPL.AIRS.mon":
+                        # verbose=True
+                        # else:
+                        # verbose=False
+                        # verbose=True
+                        # if verbose: print "OK",keys["variable"],keys["file_id"],self["id"]
+                        # if verbose: print "FILEIDS:",self.fileids
+                        # if verbose: print "Fileids:",self.fileids.template
+                        # if verbose: print "keys:",keys
+                        # if self.fileids is not None:
+                        # try:
+                        # if verbose: print "file:",keys["file_id"],self.fileids.template
+                        # k2 = self.fileids.reverse(keys["file_id"])
+                        # if verbose: print "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",k2
+                        # for k in k2.keys():
+                        # keys[k]=k2[k]
+                        # except:
+                        # if verbose: print "Failed:",ids[i].text,self.fileids.template
+                        # pass
+                        # if verbose: print "KEYS FOR FILE:",keys.keys()
+                        # if verbose: print "INKEYS:",inKeys.keys()
+                        # matched = True
+                        # matchWithKeys = {}
+                        # for k in self.keys():
+                        # if k in self.originalKeys.keys():
+                        # matchWithKeys[k]=self.originalKeys[k]
+                        # else:
+                        # matchWithKeys[k]=self[k]
+                        # for s in skipped:
+                        # try:
+                        # matchWithKeys.pop(s)
+                        # except:
+                        # pass
+                        # for k in inKeys.keys():
+                        # matchWithKeys[k]=inKeys[k]
+                        # if verbose: print "matching:",matchWithKeys.keys()
+                        # for k in keys.keys():
+                        # if k in matchWithKeys.keys():
+                        # if verbose: print "Testing:",k,keys[k]
+                        # v = matchWithKeys[k]
+                        # if isinstance(v,(str,int,float)):
+                        # if verbose: print "\tComparing with:",v
+                        # if v != keys[k]:
+                        # matched = False
+                        # if verbose: print "\t\tNOPE"
+                        # break
+                        # elif isinstance(v,list):
+                        # if verbose: print "\tComparing with (and %i more):%s"%(len(v),v[0]),v
+                        # if not keys[k] in v:
+                        # matched = False
+                        # if verbose: print "\t\tNOPE"
+                        # break
+                        # else:
+                        # print "\twould compare %s with type: %s if I knew how to" % (str(v),type(v))
+                        # if verbose: print keys["file_id"],matched
+                        # if matched :
+                        # for k in self.keys():
+                        # if not k in keys.keys():
+                        # keys[k]=self[k]
+                        # print "KEYS:",keys
+                        files.append(esgfFile(**keys))
         return files
-            
+
     def info(self):
         print self
 
     def __str__(self):
         st = "Dataset Information\nid: %s\nKeys:\n" % self.id
         for k in self.keys():
-            st+="\t%s : %s\n" % (k,self[k])
+            st += "\t%s : %s\n" % (k, self[k])
         return st
-        
+
     def clearWebCache(self):
         self.resp = None
 
-    def saveCache(self,target="."):
+    def saveCache(self, target="."):
         if self.resp is None:
             return
         if os.path.isdir(target):
-            target = os.path.join(target,"esgfDatasetsCache.pckl")
+            target = os.path.join(target, "esgfDatasetsCache.pckl")
         if os.path.exists(target):
-            f=open(source)
-            #dict=eval(bz2.decompress(f.read()))
-	    dict=eval(f.read())
+            f = open(source)
+            # dict=eval(bz2.decompress(f.read()))
+            dict = eval(f.read())
             f.close()
         else:
-            dict={}
-        dict[self.id]=[self["timestamp"],xml.etree.ElementTree.tostring(self.resp),self.originalKeys]
-        f=open(target,"w")
-        #f.write(bz2.compress(repr(self.cache)))
+            dict = {}
+        dict[self.id] = [self["timestamp"],
+                         xml.etree.ElementTree.tostring(
+                         self.resp),
+                         self.originalKeys]
+        f = open(target, "w")
+        # f.write(bz2.compress(repr(self.cache)))
         f.write(repr(self.cache))
         f.close()
-        
-    def loadCache(self,source):
-        if isinstance(source,dict):
-            dict=source
+
+    def loadCache(self, source):
+        if isinstance(source, dict):
+            dict = source
         else:
             if os.path.isdir(source):
-                source = os.path.join(source,"esgfDatasetsCache.pckl")
+                source = os.path.join(source, "esgfDatasetsCache.pckl")
             if os.path.exists(source):
-                f=open(source)
-                #dict=eval(bz2.decompress(f.read()))
-                dict=eval(f.read())
+                f = open(source)
+                # dict=eval(bz2.decompress(f.read()))
+                dict = eval(f.read())
                 f.close()
             else:
-                dict={}
-        vals = dict.get(self.id,["",None,{}])
+                dict = {}
+        vals = dict.get(self.id, ["", None, {}])
         if vals[1] is not None:
-            self.cacheTime=vals[0]
-            self.resp=xml.etree.ElementTree.fromstring(vals[0])
-            self.originalKeys=vals[1]
-        
+            self.cacheTime = vals[0]
+            self.resp = xml.etree.ElementTree.fromstring(vals[0])
+            self.originalKeys = vals[1]
+
     def clearOriginalQueryCache(self):
-        self.originalKeys={}
+        self.originalKeys = {}
 
     def clear(self):
         self.clearWebCache()
         self.clearOriginalQueryCache()
-    
-    def search(self,**keys):
-        #search = self.generateRequest(**keys)
-        stringType=keys.get("stringType",False)
+
+    def search(self, **keys):
+        # search = self.generateRequest(**keys)
+        stringType = keys.get("stringType", False)
         keys.update(self.originalKeys)
-        st=""
+        st = ""
         if not "limit" in keys:
-            keys["limit"]=[self["limit"]]
+            keys["limit"] = [self["limit"]]
         if not "offset" in keys:
-            keys["offset"]=[self["offset"]]
+            keys["offset"] = [self["offset"]]
         for k in keys:
-            if k in ["searchString","stringType",]:
+            if k in ["searchString", "stringType", ]:
                 continue
             for v in keys[k]:
-                st+="&%s=%s"%(k,v)    
-            #st+="&%s=%s" % (k,keys[k])
-        #if self.resp is None:
-            #self.resp = self._search("dataset_id=%s%s" % (self["id"],st),stringType=stringType)
-        self.resp = self._search(st,stringType=stringType)
+                st += "&%s=%s" % (k, v)
+            # st+="&%s=%s" % (k,keys[k])
+        # if self.resp is None:
+            # self.resp = self._search("dataset_id=%s%s" %
+            # (self["id"],st),stringType=stringType)
+        self.resp = self._search(st, stringType=stringType)
         if stringType:
             return self.resp
-        return esgfFiles(self._extractFiles(self.resp,**keys),self)
+        return esgfFiles(self._extractFiles(self.resp, **keys), self)
 
 
 class esgfFiles(object):
-    def __init__(self,files,parent,mapping=None,datasetids=None,fileids=None):
-        self._files=files
-        if not isinstance(parent,esgfDataset):
+
+    def __init__(self, files, parent,
+                 mapping=None, datasetids=None, fileids=None):
+        self._files = files
+        if not isinstance(parent, esgfDataset):
             raise esgfFilesException("parent must be an esgfDataset instance")
-        self.parent=parent
+        self.parent = parent
         self.EsgfObjectException = esgfFilesException
         if datasetids is None:
-            datasetids=parent.datasetids
-        if isinstance(datasetids,genutil.StringConstructor):
-            self.datasetids=datasetids
-        elif isinstance(datasetids,str):
-            self.datasetids=genutil.StringConstructor(datasetids)
+            datasetids = parent.datasetids
+        if isinstance(datasetids, genutil.StringConstructor):
+            self.datasetids = datasetids
+        elif isinstance(datasetids, str):
+            self.datasetids = genutil.StringConstructor(datasetids)
         else:
-            self.datasetids=None
+            self.datasetids = None
         if fileids is not None:
-            if isinstance(fileids,genutil.StringConstructor):
-                self.fileids=fileids
+            if isinstance(fileids, genutil.StringConstructor):
+                self.fileids = fileids
             else:
-                self.fileids=genutil.StringConstructor(fileids)
+                self.fileids = genutil.StringConstructor(fileids)
             if self.datasetids is not None:
-                self.fileids.template=self.fileids.template.replace("%(datasetid)",self.datasetids.template)
+                self.fileids.template = self.fileids.template.replace(
+                    "%(datasetid)", self.datasetids.template)
         elif self.datasetids is not None:
-            self.fileids=genutil.StringConstructor("%s.%%(filename)" % self.datasetids.template)
+            self.fileids = genutil.StringConstructor(
+                "%s.%%(filename)" %
+                self.datasetids.template)
         else:
-            self.fileids=parent.fileids
+            self.fileids = parent.fileids
         if mapping is None:
-            mapping=parent.mapping
+            mapping = parent.mapping
         self.setMapping(mapping)
         self.remap()
-        self.projects_dict = {"CMIP5": "%(project).%(product).%(institute).%(model).%(experiment).%(time_frequency).%(realm).%(cmor_table).%(ensemble)" }
-        
-    def __getitem__(self,item):
-        if isinstance(item,int):
+        self.projects_dict = {
+            "CMIP5": "%(project).%(product).%(institute).%(model).%(experiment).%(time_frequency).%(realm).%(cmor_table).%(ensemble)"}
+
+    def __getitem__(self, item):
+        if isinstance(item, int):
             return self._files[item]
-        elif isinstance(item,str):
+        elif isinstance(item, str):
             for f in self._files:
-                if f["id"]==item:
+                if f["id"] == item:
                     return f
-        elif isinstance(item,slice):
+        elif isinstance(item, slice):
             return self._files[item]
         else:
             raise esgfFilesException("unknown item type: %s" % type(item))
-    def __setitem__(self,item):
+
+    def __setitem__(self, item):
         raise esgfFilesException("You cannot set items")
+
     def __len__(self):
         return len(self._files)
+
     def getMapping(self):
-        if isinstance(self.mapping,genutil.StringConstructor):
+        if isinstance(self.mapping, genutil.StringConstructor):
             return self.mapping.template
         else:
             return self.mapping
+
     def getMappingKeys(self):
-        if isinstance(self.mapping,genutil.StringConstructor):
+        if isinstance(self.mapping, genutil.StringConstructor):
             return self.mapping.keys()
         else:
             return None
-    def setMapping(self,mapping):
+
+    def setMapping(self, mapping):
         if mapping is None:
-            self.mapping=""
+            self.mapping = ""
             if self.datasetids is not None:
-                self.mapping=self.datasetids
+                self.mapping = self.datasetids
             else:
                 for k in self.parent.keys():
-                    if not k in ["limit","offset","text"]:
-                        self.mapping+="%%(%s)" % k
+                    if not k in ["limit", "offset", "text"]:
+                        self.mapping += "%%(%s)" % k
         else:
-            self.mapping=mapping
-        #print "Stage 1 mapping:",self.mapping
-        if not isinstance(self.mapping,genutil.StringConstructor):
+            self.mapping = mapping
+        # print "Stage 1 mapping:",self.mapping
+        if not isinstance(self.mapping, genutil.StringConstructor):
             if self.datasetids is not None:
-                self.mapping=self.mapping.replace("%(datasetid)",self.datasetids.template)
+                self.mapping = self.mapping.replace(
+                    "%(datasetid)",
+                    self.datasetids.template)
             self.mapping = genutil.StringConstructor(self.mapping)
-        #print "Stage 2:",self.mapping.template
-
-        ## vk = self.parent.keys()
-        ## for k in self.mapping.keys():
-        ##     ok = False
-        ##     if self.datasetids is not None:
-        ##         vk += self.datasetids.keys()
-        ##         if k in self.datasetids.keys():
-        ##             ok = True
-        ##     if self.fileids is not None:
-        ##         vk+=self.fileids.keys()
-        ##         if k in self.fileids.keys():
-        ##             ok = True
-        ##     if k in self.parent.keys():
-        ##         ok=True
-        ##     ## Ok second to last hope... Matching to datasetids
-        ##     if isinstance(self.datasetids,genutil.StringConstructor) and ok is False:
-        ##         try:
-        ##             mapid = self.datasetids.reverse(self.parent.id)
-        ##             vk+=mapid.keys()
-        ##             if k in mapid.keys():
-        ##                 ok = True
-                        
-        ##         except:
-        ##             #print "Couldn't map: %s to %s" % (self.parent.id,self.datasetids.template)
-        ##             pass
-        ##     if ok is False:
-        ##         vk = set(vk)
-        ##         raise self.EsgfObjectException("Invalid mapping key: %s, valid keys are: %s" % (k,sorted(vk)))
-            
-    def remap(self,mapping=None,verbose=False):
+        # print "Stage 2:",self.mapping.template
+
+        # vk = self.parent.keys()
+        # for k in self.mapping.keys():
+        # ok = False
+        # if self.datasetids is not None:
+        # vk += self.datasetids.keys()
+        # if k in self.datasetids.keys():
+        # ok = True
+        # if self.fileids is not None:
+        # vk+=self.fileids.keys()
+        # if k in self.fileids.keys():
+        # ok = True
+        # if k in self.parent.keys():
+        # ok=True
+        # Ok second to last hope... Matching to datasetids
+        # if isinstance(self.datasetids,genutil.StringConstructor) and ok is False:
+        # try:
+        # mapid = self.datasetids.reverse(self.parent.id)
+        # vk+=mapid.keys()
+        # if k in mapid.keys():
+        # ok = True
+
+        # except:
+        # print "Couldn't map: %s to %s" % (self.parent.id,self.datasetids.template)
+        # pass
+        # if ok is False:
+        # vk = set(vk)
+        # raise self.EsgfObjectException("Invalid mapping key: %s, valid keys
+        # are: %s" % (k,sorted(vk)))
+
+    def remap(self, mapping=None, verbose=False):
         if mapping is None:
             thismapping = self.mapping
         else:
             thismapping = mapping
-        self.mapped={}
+        self.mapped = {}
         savedmapping = thismapping
-        #print "Remap:",self.mapping.template
-        ## if verbose: print "################ REMAPPING: %s: %s #############################" % (thismapping.template,repr(thismapping.keys()))
+        # print "Remap:",self.mapping.template
+        # if verbose: print "################ REMAPPING: %s: %s
+        # #############################" %
+        # (thismapping.template,repr(thismapping.keys()))
         for f in self._files:
-            mappoint=self.mapped
-            tabs=""
-            nok=0
+            mappoint = self.mapped
+            tabs = ""
+            nok = 0
             nlevels = len(thismapping.keys())
-            #print "This mapping",thismapping.template,nlevels
+            # print "This mapping",thismapping.template,nlevels
             if nlevels == 0:
-                ## ok no mapping, let's try to figure this one out
+                # ok no mapping, let's try to figure this one out
                 if 'dataset_id_template_' in f.keys():
-                    #print "We are good to go"
-                    ds = f['dataset_id_template_'].replace(")s",")")
+                    # print "We are good to go"
+                    ds = f['dataset_id_template_'].replace(")s", ")")
                     thismapping = genutil.StringConstructor(ds)
             for k in thismapping.keys():
-                ## if verbose: print tabs,"keys:",k,"File keys:",f.keys()
-                ## if k == self.mapping.keys()[0]:
-                ##     f.matched.keys()
-                ## else:
-                ##     ## if verbose: print
+                # if verbose: print tabs,"keys:",k,"File keys:",f.keys()
+                # if k == self.mapping.keys()[0]:
+                # f.matched.keys()
+                # else:
+                # if verbose: print
                 if k in f.keys():
-                    ## if verbose: print tabs,k,f[k]
-                    nok+=1
+                    # if verbose: print tabs,k,f[k]
+                    nok += 1
                     cont = f[k]
-                    if not isinstance(cont,(str,int,float)):
+                    if not isinstance(cont, (str, int, float)):
                         break
                     if not cont in mappoint.keys():
-                        mappoint[cont]={}
+                        mappoint[cont] = {}
                 elif k in self.parent.keys():
-                    ## if verbose: print tabs,k,f[k]
-                    nok+=1
+                    # if verbose: print tabs,k,f[k]
+                    nok += 1
                     cont = self[k]
                     if not cont in mappoint.keys():
-                        mappoint[cont]={}
-                elif isinstance(self.fileids,genutil.StringConstructor):
+                        mappoint[cont] = {}
+                elif isinstance(self.fileids, genutil.StringConstructor):
                     try:
                         mapid = self.fileids.reverse(self.parent.id)
-                        ## if verbose:
-                            ## print "MAPID:",k,mapid
+                        # if verbose:
+                        # print "MAPID:",k,mapid
                         if k in mapid.keys():
-                            ## if verbose: print tabs,k,mapid[k]
-                            nok+=1
+                        # if verbose: print tabs,k,mapid[k]
+                            nok += 1
                             cont = mapid[k]
                             if not cont in mappoint.keys():
-                                mappoint[cont]={}
+                                mappoint[cont] = {}
                     except:
                         break
                 else:
                     break
-                mappoint=mappoint[cont]
-                tabs+="\t"
-            tmp = mappoint.get("files",[])
+                mappoint = mappoint[cont]
+                tabs += "\t"
+            tmp = mappoint.get("files", [])
             tmp.append(f)
             mappoint["files"] = tmp
             thismapping = savedmapping
-        ## if verbose: print "################ REMAPPED: %s #############################" % (thismapping,)
+        # if verbose: print "################ REMAPPED: %s
+        # #############################" % (thismapping,)
+
 
 class esgfFile(object):
-    def __init__(self,**keys):
-        self.__items__=keys
+
+    def __init__(self, **keys):
+        self.__items__ = keys
         self.keys = self.__items__.keys
         self.items = self.__items__.items
         self.values = self.__items__.values
 
-        services=[]
-        #print "Keys:",self.keys()
-        #print self["url"]
-        S=self["url"]
-        if isinstance(S,str):
-            S=[S,]
+        services = []
+        # print "Keys:",self.keys()
+        # print self["url"]
+        S = self["url"]
+        if isinstance(S, str):
+            S = [S, ]
         for service in S:
-            url,s2,s1 = service.split("|")
-            setattr(self,s1,url)
+            url, s2, s1 = service.split("|")
+            setattr(self, s1, url)
             services.append(s1)
-        self.services=services
-        self.id=self["id"]
+        self.services = services
+        self.id = self["id"]
 
-    def __getitem__(self,key):
+    def __getitem__(self, key):
         val = self.__items__[key]
         return val
-    
-    def __setitem__(self,key,value):
-        self.__items__[key]=value
+
+    def __setitem__(self, key, value):
+        self.__items__[key] = value
         return
 
     def __str__(self):
-        st = "File Information\nid: %s\nParent Dataset: %s" % (self["id"],self["dataset_id"])
-        st+="Matched keys: %s\n" % (repr(self.__items__))
+        st = "File Information\nid: %s\nParent Dataset: %s" % (
+            self["id"], self["dataset_id"])
+        st += "Matched keys: %s\n" % (repr(self.__items__))
         for service in self.services:
-            st+="service: %s @ %s\n" % (service,getattr(self,service))
+            st += "service: %s @ %s\n" % (service, getattr(self, service))
         return st[:-1]
diff --git a/Packages/cdms2/Lib/selectors.py b/Packages/cdms2/Lib/selectors.py
index f22443976..2a35705d1 100644
--- a/Packages/cdms2/Lib/selectors.py
+++ b/Packages/cdms2/Lib/selectors.py
@@ -1,42 +1,48 @@
 
 """Classes to support easy selection of climate data"""
 import cdtime
-from axis import axisMatches
-from error import CDMSError
-from grid import AbstractRectGrid, defaultRegion, setRegionSpecs, LongitudeType, LatitudeType, TimeType, VerticalType
+from .axis import axisMatches
+from .error import CDMSError
+from .grid import AbstractRectGrid, defaultRegion, setRegionSpecs, LongitudeType, LatitudeType, TimeType, VerticalType
 
 _debug = 0
+
+
 class SelectorError (CDMSError):
+
     "The exception type for errors in the selector packages"
-    def __init__ (self, args):
+
+    def __init__(self, args):
         self.args = args
 
+
 class Selector:
+
     """Selector class"""
-    def __init__ (self, *args, **kwargs):
+
+    def __init__(self, *args, **kwargs):
         """Positional args are SelectorComponents or Selectors
          Keyword args and their value are passed to kwselect to create
-         selectors. All the selector components are put into the 
+         selectors. All the selector components are put into the
          components list of this Selector, along with all the components
          of any Selector arguments.
         """
         self.__components = []
         self.refine(*args, **kwargs)
         for a in args:
-            if isinstance(a,SelectorComponent):
+            if isinstance(a, SelectorComponent):
                 try:
-                    self.__str__=a.__str__
+                    self.__str__ = a.__str__
                 except:
                     pass
 
-
-    def components (self):
+    def components(self):
         "List of selector components, each an instance of SelectorComponent."
         return self.__components[:]
-    
-    def refine (self, *args, **kwargs):        
-        """Add components to this selector using the same syntax as the 
-         constructor. Ignores non-keyword arguments that are not 
+
+    def refine(self, *args, **kwargs):
+        """Add components to this selector using the same syntax as the
+         constructor. Ignores non-keyword arguments that are not
          SelectorComponents or Selectors.
         """
         for a in args:
@@ -46,27 +52,27 @@ class Selector:
                 self.__components.append(a)
             elif isinstance(a, Selector):
                 for x in a.components():
-                    self.refine(x)  
+                    self.refine(x)
             else:
                 self.refine(positionalComponent(a))
 
         for k, v in kwargs.items():
-               self.refine(kwselect(k, v))
- 
-    def __repr__ (self):
+            self.refine(kwselect(k, v))
+
+    def __repr__(self):
         s = 'Selector('
         sep = ''
         for c in self.__components:
             s = s + sep + repr(c)
             sep = ', '
         return s + ')'
-    
-    def __and__ (self, other):
-        """Implements the & operator, which returns 
+
+    def __and__(self, other):
+        """Implements the & operator, which returns
            self.clone() refined by other
         """
         if not isinstance(other, Selector):
-            raise SelectorError, 'Cannot combine Selector with non-selector'
+            raise SelectorError('Cannot combine Selector with non-selector')
         s = self.clone()
         s.refine(other)
         return s
@@ -75,7 +81,7 @@ class Selector:
         "Makes a copy of this Selector."
         return Selector(*self.__components)
 
-    def __call__ (self, *args, **kwargs):
+    def __call__(self, *args, **kwargs):
         """Return a new selector consisting of this one refined by the given arguments.
            Arguments are as per the constructor or method refine.
         """
@@ -92,31 +98,31 @@ class Selector:
            Options modify the result of the selection. The options and
            their default values are:
                -- raw = 0: if 1, return an numpy.ma only
-               -- squeeze = 0:  If 1, eliminate any dimensions of length 1 
+               -- squeeze = 0:  If 1, eliminate any dimensions of length 1
                                 from the result.
-               -- order = None: If given, is a string such as 
+               -- order = None: If given, is a string such as
                                 variable.getOrder()
                                 returns. Result is permuted into this order.
-               -- grid = None:  If given, is a grid object; result is 
+               -- grid = None:  If given, is a grid object; result is
                                 regridded onto this grid.
            Each of the components contributes arguments suitable for the
-           subRegion call in class cdms.AbstractVariable. If a component 
+           subRegion call in class cdms.AbstractVariable. If a component
            is to modify the same axis as a previous component, its application
            is postponed. subRegion is called and the result is then fed
-           to each of the components' "post" method. This returns a 
+           to each of the components' "post" method. This returns a
            possibly modified result, which becomes the input to the next
-           component's post method. 
+           component's post method.
 
            This procedure is repeated until no more components are postponed.
            Then the options are applied to the result in the order
-           listed above, and the result is returned. 
+           listed above, and the result is returned.
 
            Execption SelectorError is thrown if the selection is
            impossible.
 
            The result is a TransientVariable and id(variable) <> id(result)
            even if there are no components.
-        """  
+        """
         d = kwargs.copy()
         raw = d.setdefault('raw', 0)
         squeeze = d.setdefault('squeeze', 0)
@@ -125,13 +131,14 @@ class Selector:
         del d['squeeze'], d['grid'], d['order'], d['raw']
         # make the selector
         s = self(*args, **d)
-        return s.unmodified_select(variable, 
-                                   squeeze=squeeze, 
-                                   order=order, 
-                                   grid=grid, 
+        return s.unmodified_select(variable,
+                                   squeeze=squeeze,
+                                   order=order,
+                                   grid=grid,
                                    raw=raw)
 
-    def unmodified_select(self, variable, raw=0, squeeze=0, order=None, grid=None):
+    def unmodified_select(
+            self, variable, raw=0, squeeze=0, order=None, grid=None):
         "Select using this selector without further modification"
         result = variable
         components = self.components()
@@ -143,71 +150,80 @@ class Selector:
             newcomponents = []
             specs = defaultRegion()
             for c in components:
-                if c.specifyGrid(variable, vargrid, specs): # specs is modified
+                if c.specifyGrid(variable, vargrid, specs):  # specs is modified
                     newcomponents.append(c)
             components = newcomponents
             if specs != defaultRegion():
                 vgindices = result.getGridIndices()
                 mask, indexspecs = vargrid.intersect(specs)
                 result = result(**indexspecs)
-                result = result.setMaskFromGridMask(mask, vgindices) # Propagate the grid mask to result
+                result = result.setMaskFromGridMask(
+                    mask,
+                    vgindices)  # Propagate the grid mask to result
 
         # Now select on non-coordinate components.
         while(components):
             axes = result.getAxisList()
-            if _debug: print "Axes:", axes
-            specifications = [':']*len(axes)
-            confined_by = [None]*len(axes)
-            aux = {} # for extra state 
+            if _debug:
+                print "Axes:", axes
+            specifications = [':'] * len(axes)
+            confined_by = [None] * len(axes)
+            aux = {}  # for extra state
             overflow = []
-            if _debug: print "Component list:", components
+            if _debug:
+                print "Component list:", components
             for c in components:
                 if c.specify(result, axes, specifications, confined_by, aux):
-                    if _debug: print 'Defer ' + repr(c)
+                    if _debug:
+                        print 'Defer ' + repr(c)
                     overflow.append(c)
                 elif _debug:
                     print "After applying", c, ":"
-                    print  "specifications=", specifications
+                    print "specifications=", specifications
                     print "Confined_by", confined_by
                     print "aux", aux
                     print "-----------------"
-            if _debug: 
+            if _debug:
                 print 'About to call subRegion:', specifications
             fetched = result.subRegion(*specifications)
             axismap = range(len(axes))
             for c in components:
-                if c in overflow: continue
-                fetched = c.post(fetched, result, axes, specifications, 
+                if c in overflow:
+                    continue
+                fetched = c.post(fetched, result, axes, specifications,
                                  confined_by, aux, axismap)
             if not len(overflow) < len(components):
-                raise SelectorError, \
-                  'Internal selector error, infinite loop detected.'
+                raise SelectorError(
+                    'Internal selector error, infinite loop detected.')
             components = overflow
             result = fetched
 
         if squeeze != 0 or \
            order is not None or \
            grid is not None or \
-           raw !=0 or \
-           result is variable: 
+           raw != 0 or \
+           result is variable:
      # result is variable when there are no components, for example.
             return result.subRegion(squeeze=squeeze, order=order, grid=grid,
                                     raw=raw)
         else:
             return result
-             
+
+
 class SelectorComponent:
+
     """Base class representing selection for a given set of axes.
     """
-    def specify (self, slab, axes, specifications, confined_by, aux):
-        """Refine the specification suitable for slab.subRegion 
+
+    def specify(self, slab, axes, specifications, confined_by, aux):
+        """Refine the specification suitable for slab.subRegion
            Set confined_by to yourself for each axis you confine.
-           If you would normally confine an axis to ':', don't, 
+           If you would normally confine an axis to ':', don't,
            unless you *require* that axis not be confined by other
            components.
-           
+
            Returning:
-              Return 1 if you wish to skip your turn. You'll be called 
+              Return 1 if you wish to skip your turn. You'll be called
               later with the results of the other selectors.
 
               Raise a SelectorError exception if you can't do your job.
@@ -218,10 +234,10 @@ class SelectorComponent:
               Store any info you want in dictionary aux[id(self)]
         """
         return 0
-    
+
     def specifyGrid(self, var, grid, specs):
         """Refine the specification suitable for grid.intersect().
-        
+
         'var' is a variable.
         'grid' is the grid associated with the variable.
         'specs' is the result set of specifications, of the form defined in the grid module.
@@ -235,47 +251,53 @@ class SelectorComponent:
         """
         return 1
 
-    def post (self, fetched, slab, axes, specifications, confined_by, aux, axismap):
+    def post(self, fetched, slab, axes,
+             specifications, confined_by, aux, axismap):
         """Post-process fetched if desired, return new value.
-           Arguments slab, axes, specifications, confined_by, and aux are 
-           pre-subRegion call. 
-           
-           axismap gives the indices of fetched's axes in axes and should 
+           Arguments slab, axes, specifications, confined_by, and aux are
+           pre-subRegion call.
+
+           axismap gives the indices of fetched's axes in axes and should
            be modified as required by this method.  Set axismap[i] to None to
            indicate that you have eliminated an axis.
         """
         return fetched
-    
+
+
 class axisComponent (SelectorComponent):
+
     "A SelectorComponent that confines exactly one axis or coordinate dimension (e.g. latitude)."
-    def __init__ (self, id, spec):
+
+    def __init__(self, id, spec):
         self.id = id
         self.spec = spec
 
-    def specify (self, slab, axes, specifications, confined_by, aux):
+    def specify(self, slab, axes, specifications, confined_by, aux):
         "Do specification for axis self.id; skip if axis not present."
         for i in range(len(axes)):
             if axisMatches(axes[i], self.id):
-               if confined_by[i] is None:
-                   specifications[i] = self.spec
-                   confined_by[i] = self
-                   return 0
-               else:
-                   return 1
+                if confined_by[i] is None:
+                    specifications[i] = self.spec
+                    confined_by[i] = self
+                    return 0
+                else:
+                    return 1
         return 0
 
-    def __repr__ (self):
-        s = repr(self.__class__)+'("'+self.id+'", '+repr(self.spec) + ')'
+    def __repr__(self):
+        s = repr(self.__class__) + \
+            '("' + self.id + '", ' + repr(self.spec) + ')'
         return s
-        
+
+
 class coordinateComponent(axisComponent):
+
     "A SelectorComponent that confines exactly one coordinate dimension (e.g., latitude)"
 
     def __init__(self, id, spec):
         axisComponent.__init__(self, id, spec)
 
     def specifyGrid(self, var, grid, specs):
-
         "Determine if this component confines the grid, and if so set the specs and return 1"
         if grid.hasCoordType(self.id):
             setRegionSpecs(grid, self.spec, self.id, specs)
@@ -283,42 +305,52 @@ class coordinateComponent(axisComponent):
         else:
             return 1
 
+
 class requiredComponent (SelectorComponent):
+
     """Checks to see that a specific id axis must be present."""
-    def __init__ (self, ids):
+
+    def __init__(self, ids):
         """Checks to see that a specific axis or axes must be present.
            Initialize with a sequence of ids.
         """
         self.ids = ids
-        
-    def specify (self, slab, axes, specifications, confined_by, aux):
+
+    def specify(self, slab, axes, specifications, confined_by, aux):
         """Doesn't confine but checks for existance."""
         for id in self.ids:
             for i in range(len(axes)):
                 if axisMatches(axes[i], id):
                     break
             else:
-                raise SelectorError, \
-                      'Required axis %s not present in this variable.' % (id,)
+                raise SelectorError(
+                    'Required axis %s not present in this variable.' %
+                    (id,))
         return 0
 
+
 class indexComponent (axisComponent):
-    """An axisComponent that confines exactly one axis by 
-       specifying indices. 
+
+    """An axisComponent that confines exactly one axis by
+       specifying indices.
     """
-    def __init__ (self, id, start=None, stop=None, stride=None):
+
+    def __init__(self, id, start=None, stop=None, stride=None):
         self.id = id
-        self.spec = slice(start,stop, stride)
+        self.spec = slice(start, stop, stride)
+
 
 class indexedComponent (SelectorComponent):
-    """A SelectorComponent that confines exactly one axis  
-       whose index is given. 
+
+    """A SelectorComponent that confines exactly one axis
+       whose index is given.
     """
-    def __init__ (self, index, value):
+
+    def __init__(self, index, value):
         self.index = index
         self.spec = value
 
-    def specify (self, slab, axes, specifications, confined_by, aux):
+    def specify(self, slab, axes, specifications, confined_by, aux):
         "Do the specification for axis whose index is self.index."
         i = self.index
         if confined_by[i] is None:
@@ -328,13 +360,16 @@ class indexedComponent (SelectorComponent):
         else:
             return 1
 
+
 class positionalComponent (SelectorComponent):
+
     """A SelectorComponent that confines the next axis available.
     """
-    def __init__ (self, v):
+
+    def __init__(self, v):
         self.v = v
 
-    def specify (self, slab, axes, specifications, confined_by, aux):
+    def specify(self, slab, axes, specifications, confined_by, aux):
         "Find the next unconfined axis and confine it."
         n = 0
         for i in range(len(axes)):
@@ -344,51 +379,59 @@ class positionalComponent (SelectorComponent):
                 aux[id(self)] = i
                 return 0
         else:
-            raise SelectorError, \
-            'positional component cannot be applied, insufficent rank:' +\
-             repr(self)
+            raise SelectorError('positional component cannot be applied, insufficent rank:' +
+                                repr(self))
 
-    def __repr__ (self):
+    def __repr__(self):
         s = repr(self.__class__) + '(' + repr(self.v) + ')'
         return s
-    
-def longitude (*value):
+
+
+def longitude(*value):
     "Creates default selector corresponding to keyword longitude = value"
     if not value:
         return all
     if len(value) == 1:
         value = value[0]
-    if value == ':': return all
+    if value == ':':
+        return all
     return Selector(coordinateComponent(LongitudeType, value))
-    
-def latitude (*value):
+
+
+def latitude(*value):
     "Creates default selector corresponding to keyword latitude = value"
     if not value:
         return all
     if len(value) == 1:
         value = value[0]
-    if value == ':': return all
+    if value == ':':
+        return all
     return Selector(coordinateComponent(LatitudeType, value))
-    
-def time (*value):
+
+
+def time(*value):
     """Creates a default selector corresponding to keyword time=value
     """
     if not value:
         return all
     if len(value) == 1:
         value = value[0]
-    if value == ':': return all
+    if value == ':':
+        return all
     return Selector(coordinateComponent(TimeType, value))
 
-def level (*value):
+
+def level(*value):
     "Creates default selector corresponding to keyword level = value"
     if not value:
         return all
     if len(value) == 1:
         value = value[0]
-    if value == ':': return all
+    if value == ':':
+        return all
     return Selector(coordinateComponent(VerticalType, value))
 
+
 def required(values):
     """Creates a selector that requires a certain axis to be present."""
     if values is None:
@@ -397,12 +440,13 @@ def required(values):
         values = (values,)
     return Selector(requiredComponent(values))
 
-def kwselect (k, value):
+
+def kwselect(k, value):
     """Turn a keyword/value pair into a SelectorComponent
        The words latitude, longitude, time, and level are
        used to pass value to the routine of the same name.
        Otherise, axis is called using k as the id.
-    """ 
+    """
     kx = k[0:3].lower()
     if kx == 'lat':
         return latitude(value)
@@ -416,17 +460,25 @@ def kwselect (k, value):
         return required(value)
     else:
         return Selector(requiredComponent((k,)), axisComponent(k, value))
-    
+
 all = Selector()
 
-def timeslice (start=None,stop=None,stride=None):
+
+def timeslice(start=None, stop=None, stride=None):
     return Selector(indexComponent('time', start, stop, stride))
-def latitudeslice (start=None,stop=None,stride=None):
+
+
+def latitudeslice(start=None, stop=None, stride=None):
     return Selector(indexComponent('latitude', start, stop, stride))
-def longitudeslice (start=None,stop=None,stride=None):
+
+
+def longitudeslice(start=None, stop=None, stride=None):
     return Selector(indexComponent('longitude', start, stop, stride))
-def levelslice (start=None,stop=None,stride=None):
+
+
+def levelslice(start=None, stop=None, stride=None):
     return Selector(indexComponent('level', start, stop, stride))
-def setslice (id, start=None,stop=None,stride=None):
-    return Selector(indexComponent(id, start, stop, stride))
 
+
+def setslice(id, start=None, stop=None, stride=None):
+    return Selector(indexComponent(id, start, stop, stride))
diff --git a/Packages/cdms2/Lib/slabinterface.py b/Packages/cdms2/Lib/slabinterface.py
index 642aea131..f12738ee7 100644
--- a/Packages/cdms2/Lib/slabinterface.py
+++ b/Packages/cdms2/Lib/slabinterface.py
@@ -1,64 +1,67 @@
-## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by 
-## Further modified to be pure new numpy June 24th 2008
+# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
+# Further modified to be pure new numpy June 24th 2008
 
 "Read part of the old cu slab interface implemented over CDMS"
 import numpy
 import sys
-from error import CDMSError
-from axis import std_axis_attributes
+from .error import CDMSError
+from .axis import std_axis_attributes
 import cdms2 as cdms
 
+
 class Slab:
+
     """Slab is the cu api
        This is an abstract class to inherit in AbstractVariable
        About axes:
        weight and bounds attributes always set but may be None
-       if bounds are None, getdimattribute returns result of querying the 
+       if bounds are None, getdimattribute returns result of querying the
        axis.
     """
     std_slab_atts = ['filename',
-                'missing_value',
-                'comments',
-                'grid_name',
-                'grid_type',
-                'time_statistic',
-                'long_name',
-                'units']
-    def __init__ (self):
+                     'missing_value',
+                     'comments',
+                     'grid_name',
+                     'grid_type',
+                     'time_statistic',
+                     'long_name',
+                     'units']
+
+    def __init__(self):
         pass
 
-    def getattribute (self, name):
+    def getattribute(self, name):
         "Get the attribute name."
-        defaultdict = {'filename':'N/A',
-                       'comments':'',
-                       'grid_name':'N/A',
-                       'grid_type':'N/A',
-                       'time_statistic':'',
-                       'long_name':'',
-                       'units':''}
+        defaultdict = {'filename': 'N/A',
+                       'comments': '',
+                       'grid_name': 'N/A',
+                       'grid_type': 'N/A',
+                       'time_statistic': '',
+                       'long_name': '',
+                       'units': ''}
         result = None
-        if name in defaultdict.keys() and not hasattr(self,name):
-            if name=='filename':
-                if (not hasattr(self,'parent')) or self.parent is None:
+        if name in defaultdict.keys() and not hasattr(self, name):
+            if name == 'filename':
+                if (not hasattr(self, 'parent')) or self.parent is None:
                     result = ''
                 else:
                     result = self.parent.id
 
-            elif name=='grid_name':
+            elif name == 'grid_name':
                 grid = self.getGrid()
                 if grid is None:
                     result = defaultdict[name]
                 else:
                     result = grid.id
-            elif name=='grid_type':
+            elif name == 'grid_type':
                 grid = self.getGrid()
                 if grid is None:
                     result = defaultdict[name]
-                elif isinstance(grid,cdms.grid.TransientRectGrid):
+                elif isinstance(grid, cdms.grid.TransientRectGrid):
                     result = grid.getType()
-                elif isinstance(grid,cdms.gengrid.AbstractGenericGrid):
+                elif isinstance(grid, cdms.gengrid.AbstractGenericGrid):
                     result = 'GenericGrid'
-                elif isinstance(grid,cdms.hgrid.AbstractCurveGrid):
+                elif isinstance(grid, cdms.hgrid.AbstractCurveGrid):
                     result = 'CurvilinearGrid'
             else:
                 result = defaultdict[name]
@@ -67,23 +70,23 @@ class Slab:
                 result = getattr(self, name)
             except AttributeError:
                 result = None
-            
+
         return result
 
-    def setattribute (self, name, value):
+    def setattribute(self, name, value):
         "Set the attribute name to value."
         setattr(self, name, value)
 
-    def createattribute (self, name, value):
+    def createattribute(self, name, value):
         "Create an attribute and set its name to value."
         setattr(self, name, value)
 
-    def deleteattribute (self, name):
+    def deleteattribute(self, name):
         "Delete the named attribute."
         if hasattr(self, name):
             delattr(self, name)
 
-    def listattributes (self):
+    def listattributes(self):
         "Return a list of attribute names."
         return self.attributes.keys()
 
@@ -92,10 +95,11 @@ class Slab:
         a = self.getAxis(dim)
         result = []
         for x in std_axis_attributes + a.attributes.keys():
-            if not x in result: result.append(x)
+            if not x in result:
+                result.append(x)
         return result
 
-    def getdimattribute (self, dim, field):
+    def getdimattribute(self, dim, field):
         """Get the attribute named field from the dim'th dimension.
          For bounds returns the old cu one-dimensional version.
         """
@@ -121,38 +125,37 @@ class Slab:
                 return g.getWeights()[0]
             elif d.isLongitude():
                 return g.getWeights()[1]
-            else: #should be impossible, actually
+            else:  # should be impossible, actually
                 return numpy.ones(len(d))
 
         elif field == "bounds":
             b = d.getBounds()
             n = b.shape[0]
-            result = numpy.zeros(n+1, b.dtype.char)
-            result[0:-1] = b[:,0]
-            result[-1] = b[-1,1]
+            result = numpy.zeros(n + 1, b.dtype.char)
+            result[0:-1] = b[:, 0]
+            result[-1] = b[-1, 1]
             return result
-        elif d.attributes.has_key(field):
+        elif field in d.attributes:
             return d.attributes[field]
         else:
-            raise CDMSError, "No %s attribute on given axis." % field
-            
-          
+            raise CDMSError("No %s attribute on given axis." % field)
+
     def showdim(self):
-        "Show the dimension attributes and values." 
+        "Show the dimension attributes and values."
         result = []
         for nd in range(self.rank()):
-            result.append('** Dimension ' + str(nd+1) + ' **')
+            result.append('** Dimension ' + str(nd + 1) + ' **')
             result = result + self.getAxis(nd).listall(1)
         print '\n'.join(result)
 
     def listdimnames(self):
         "Return a list of the names of the dimensions."
-        result=[]
+        result = []
         for nd in range(self.rank()):
             result.append(self.getdimattribute(nd, 'name'))
         return result
 
-    def listall (self, all=None):
+    def listall(self, all=None):
         "Get list of info about this slab."
         vname = self.id
         result = []
@@ -162,8 +165,10 @@ class Slab:
         for x in Slab.std_slab_atts:
             result.append(x + ": " + str(self.getattribute(x)))
         for x in self.attributes.keys():
-            if x in Slab.std_slab_atts: continue
-            if x == 'name': continue
+            if x in Slab.std_slab_atts:
+                continue
+            if x == 'name':
+                continue
             result.append(x + ": " + str(self.attributes[x]))
         g = self.getGrid()
         if g is None:
@@ -171,29 +176,30 @@ class Slab:
         else:
             result = result + g.listall(all)
         for nd in range(self.rank()):
-            result.append('** Dimension ' + str(nd+1) + ' **')
+            result.append('** Dimension ' + str(nd + 1) + ' **')
             result = result + self.getAxis(nd).listall(all)
         result.append('*** End of description for %s ***' % vname)
         return result
 
     def info(self, flag=None, device=None):
         "Write info about slab; include dimension values and weights if flag"
-        if device is None: device = sys.stdout
+        if device is None:
+            device = sys.stdout
         device.write('\n'.join(self.listall(all=flag)))
         device.write("\n")
 
-def cdms_bounds2cu_bounds (b):
+
+def cdms_bounds2cu_bounds(b):
     "Bounds are  len(v) by 2 in cdms but len(v)+1 in cu"
-    cub = numpy.ma.zeros(len(b)+1, numpy.float32)
+    cub = numpy.ma.zeros(len(b) + 1, numpy.float32)
     b1 = b.astype(numpy.float32)
-    if len(b)>1:
-        if (b[0,0]<b[0,1]) == (b[0,0]<b[-1,0]):
-            cub[0] = b[0,0]
-            cub[1:] = b[:,1]
+    if len(b) > 1:
+        if (b[0, 0] < b[0, 1]) == (b[0, 0] < b[-1, 0]):
+            cub[0] = b[0, 0]
+            cub[1:] = b[:, 1]
         else:
-            cub[0] = b[0,1]
-            cub[1:] = b[:,0]
+            cub[0] = b[0, 1]
+            cub[1:] = b[:, 0]
     else:
         cub[:] = b[0]
-    return numpy.array( cub )
-    
+    return numpy.array(cub)
diff --git a/Packages/cdms2/Lib/sliceut.py b/Packages/cdms2/Lib/sliceut.py
index e69e83262..4b8b55821 100644
--- a/Packages/cdms2/Lib/sliceut.py
+++ b/Packages/cdms2/Lib/sliceut.py
@@ -6,41 +6,41 @@
 # Returns a slice, or None if the intersection is empty.
 
 
-def sliceIntersect(aSlice,interval):
-    p0,p1 = interval
+def sliceIntersect(aSlice, interval):
+    p0, p1 = interval
     i = aSlice.start
     j = aSlice.stop
     k = aSlice.step
     if k is None:
-        k=1
+        k = 1
 
     # If the slice has a negative step, generate the
     # equivalent slice with positive step
-    irev=0
-    if k<0:
+    irev = 0
+    if k < 0:
         k = -k
-        pk = ((j-i+k)/k)*k+i
-        j = i+1
+        pk = ((j - i + k) / k) * k + i
+        j = i + 1
         i = pk
         irev = 1
 
     # Calculate the intersection for an increasing slice
-    px = ((p0-i+k-1)/k)*k+i
-    a = max(px,i)
-    b = min(j,p1)
-    if a<b:
-        if k==1:
-            newSlice = slice(a,b)
+    px = ((p0 - i + k - 1) / k) * k + i
+    a = max(px, i)
+    b = min(j, p1)
+    if a < b:
+        if k == 1:
+            newSlice = slice(a, b)
         else:
-            newSlice = slice(a,b,k)
+            newSlice = slice(a, b, k)
     else:
         newSlice = None
 
     # Reverse the slice if necessary
-    if irev==1 and newSlice is not None:
-        px = -((-b+a+k)/k*k-a)
-        newSlice = slice(px,a-1,-k)
-    
+    if irev == 1 and newSlice is not None:
+        px = -((-b + a + k) / k * k - a)
+        newSlice = slice(px, a - 1, -k)
+
     return newSlice
 
 # Intersect a slice with a partition. The partition is a list of
@@ -50,21 +50,23 @@ def sliceIntersect(aSlice,interval):
 # in the same order as in the partition. If the intersection is empty,
 # the result is an empty list.
 
-def slicePartition(aSlice,partition):
+
+def slicePartition(aSlice, partition):
     result = []
     for interval in partition:
-        intslice = sliceIntersect(aSlice,interval)
+        intslice = sliceIntersect(aSlice, interval)
         if intslice is not None:
-            result.append((interval,intslice))
+            result.append((interval, intslice))
     return result
 
+
 def lenSlice(aSlice):
     "Return the number of values associated with a slice"
 
     step = aSlice.step
     if step is None:
         step = 1
-    if step>0:
+    if step > 0:
         start = aSlice.start
         stop = aSlice.stop
     else:
@@ -72,121 +74,131 @@ def lenSlice(aSlice):
         stop = aSlice.start
         step = -step
 
-    return ((stop-start-1)/step + 1)
+    return ((stop - start - 1) / step + 1)
+
 
-def reverseSlice(s,size):
+def reverseSlice(s, size):
     """For 'reversed' slices (slices with negative stride),
     return an equivalent slice with positive step. For positive
     strides, just return the slice unchanged.
     """
-    if s.step>0 or s.step is None:
+    if s.step > 0 or s.step is None:
         return s
 
     i = s.start
     j = s.stop
     k = s.step
     if i is None:
-        i=size-1
-    elif i<0:
-        i = i%size
+        i = size - 1
+    elif i < 0:
+        i = i % size
     if j is None:
-        j=-1
-    elif -size-1<j<0:
-        j = j%size
-    
-    if i<-size or j<-size-1:
-        raise 'Invalid slice',`s`
+        j = -1
+    elif -size - 1 < j < 0:
+        j = j % size
+
+    if i < -size or j < -size - 1:
+        raise 'Invalid slice', repr(s)
 
     k = -k
-    pk = ((j-i+k)/k)*k+i
-    j = i+1
-    i = pk%size
+    pk = ((j - i + k) / k) * k + i
+    j = i + 1
+    i = pk % size
 
-##     if j==size:
-##         j = None
+# if j==size:
+# j = None
 
-    return slice(i,j,k)
+    return slice(i, j, k)
 
 
-def splitSlice(s,size):
+def splitSlice(s, size):
     """For a 'wraparound' slice, return two equivalent slices
     within the range 0..size-1."""
-    i,j,k = s.start,s.stop,s.step
-    if k>0:
-        wrap1 = slice(i,size,k)
-        wrap2 = slice((i-size)%k, j-size, k)
+    i, j, k = s.start, s.stop, s.step
+    if k > 0:
+        wrap1 = slice(i, size, k)
+        wrap2 = slice((i - size) % k, j - size, k)
     else:
-        wrap1 = slice(i-size, None, k)
-        wrap2 = slice(size+(i-size)%k, j, k)
-    return (wrap1,wrap2)
+        wrap1 = slice(i - size, None, k)
+        wrap2 = slice(size + (i - size) % k, j, k)
+    return (wrap1, wrap2)
 
 
-def splitSliceExt(s,size):
+def splitSliceExt(s, size):
     """
     mf 20010330 --
     For a 'wraparound' slice, return N equivalent slices
     within the range 0...(N*size) N = anything"""
-    i,j,k = s.start,s.stop,s.step
+    i, j, k = s.start, s.stop, s.step
 
     # slice of form [i:] sets j to large int
-    if j>2000000000L:
+    if j > 2000000000:
         j = size
 
-    _debug=0
-    if(_debug): print "SSSS0: ",i,j,k
-
-    wrap=[]
-
-    if k>0:
-
-        iter=0
-        if(_debug): print "SSSS1: iter ",iter,j,size,k
-        while(j>0):
-            if(_debug): print " "
-            if(_debug): print "SSSS2: iter",iter,j,size,k
-            jo=size
-            if(iter>0): jo=size+1
-            if(_debug): print "SSSS3: iter",iter,j,jo
-            if(j<size): jo=j
-            if(_debug): print "SSSS4: iter",iter,j,jo
-            wrap.append(slice(i,jo,k))
-            j=j-size
-            i=0
-            iter=iter+1
-            
+    _debug = 0
+    if(_debug):
+        print "SSSS0: ", i, j, k
+
+    wrap = []
+
+    if k > 0:
+
+        iter = 0
+        if(_debug):
+            print "SSSS1: iter ", iter, j, size, k
+        while(j > 0):
+            if(_debug):
+                print " "
+            if(_debug):
+                print "SSSS2: iter", iter, j, size, k
+            jo = size
+            if(iter > 0):
+                jo = size + 1
+            if(_debug):
+                print "SSSS3: iter", iter, j, jo
+            if(j < size):
+                jo = j
+            if(_debug):
+                print "SSSS4: iter", iter, j, jo
+            wrap.append(slice(i, jo, k))
+            j = j - size
+            i = 0
+            iter = iter + 1
+
     else:
 
-        wraprev=[]
-        iter=0
-        if(_debug): print "SSSS1 neg: iter ",iter,i,j,size,k
-        while(i>=0):
-            if(_debug): print " "
-            if(_debug): print "SSSS2 neg: iter",iter,i,j,size,k
-            io=size-1
-            if(_debug): print "SSSS3 neg: iter",iter,i,j,io
-            if(i<size): io=i
-            if(_debug): print "SSSS4 neg: iter",iter,i,j,io
-            
-            # mf 20010405 python does not return nothing for slice(size-1,size-1,-1); force it
-            if( not ( io==size-1 and j==size-1 ) ):
-                wraprev.append(slice(io,j,k))
-            
-            i=i-size
-            j=None
-            iter=iter+1
+        wraprev = []
+        iter = 0
+        if(_debug):
+            print "SSSS1 neg: iter ", iter, i, j, size, k
+        while(i >= 0):
+            if(_debug):
+                print " "
+            if(_debug):
+                print "SSSS2 neg: iter", iter, i, j, size, k
+            io = size - 1
+            if(_debug):
+                print "SSSS3 neg: iter", iter, i, j, io
+            if(i < size):
+                io = i
+            if(_debug):
+                print "SSSS4 neg: iter", iter, i, j, io
+
+            # mf 20010405 python does not return nothing for
+            # slice(size-1,size-1,-1); force it
+            if(not (io == size - 1 and j == size - 1)):
+                wraprev.append(slice(io, j, k))
+
+            i = i - size
+            j = None
+            iter = iter + 1
         #
         # reverse
         #
-        for k in range(0,len(wraprev)):
-            kk=len(wraprev)-k-1
+        for k in range(0, len(wraprev)):
+            kk = len(wraprev) - k - 1
             wrap.append(wraprev[kk])
-            if(_debug): print "SSSS5 neg: ",kk,wraprev[kk]
+            if(_debug):
+                print "SSSS5 neg: ", kk, wraprev[kk]
 
     return (wrap)
-
-
-
-
-
-
-
diff --git a/Packages/cdms2/Lib/tvariable.py b/Packages/cdms2/Lib/tvariable.py
index 7d9db8b9d..9ebcca9c6 100644
--- a/Packages/cdms2/Lib/tvariable.py
+++ b/Packages/cdms2/Lib/tvariable.py
@@ -1,4 +1,4 @@
-# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by 
+# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
 # Further modified to be pure new numpy June 24th 2008
 
 """
@@ -8,18 +8,18 @@ Contains also the write part of the old cu interface.
 """
 import json
 import re
-import typeconv
+from . import typeconv
 import numpy
 from numpy import sctype2char
-from error import CDMSError
-from avariable import AbstractVariable
+from .error import CDMSError
+from .avariable import AbstractVariable
 
-from axis import createAxis, AbstractAxis
-from grid import createRectGrid, AbstractRectGrid
-from hgrid import AbstractCurveGrid
-from gengrid import AbstractGenericGrid
+from .axis import createAxis, AbstractAxis
+from .grid import createRectGrid, AbstractRectGrid
+from .hgrid import AbstractCurveGrid
+from .gengrid import AbstractGenericGrid
 
-# dist array support 
+# dist array support
 HAVE_MPI = False
 try:
     from mpi4py import MPI
@@ -30,38 +30,43 @@ except:
 
 id_builtin = id  # built_in gets clobbered by keyword
 
+
 def fromJSON(jsn):
     """ Recreate a TV from a dumped jsn object"""
     D = json.loads(jsn)
 
-    ## First recreates the axes
-    axes=[]
+    # First recreates the axes
+    axes = []
     for a in D["_axes"]:
-        ax = createAxis(numpy.array(a["_values"],dtype=a["_dtype"]),id=a["id"])
-        for k,v in a.iteritems():
-            if not k in ["_values","id","_dtype"]:
-                setattr(ax,k,v)
+        ax = createAxis(
+            numpy.array(a["_values"],
+                        dtype=a["_dtype"]),
+            id=a["id"])
+        for k, v in a.iteritems():
+            if not k in ["_values", "id", "_dtype"]:
+                setattr(ax, k, v)
         axes.append(ax)
-    ## Now prep the variable
-    V= createVariable(D["_values"],id=D["id"],typecode=D["_dtype"])
+    # Now prep the variable
+    V = createVariable(D["_values"], id=D["id"], typecode=D["_dtype"])
     V.setAxisList(axes)
-    for k,v in D.iteritems():
-        if not k in ["id","_values","_axes","_grid","_fill_value","_dtype",]:
-            setattr(V,k,v)
+    for k, v in D.iteritems():
+        if not k in ["id", "_values", "_axes", "_grid", "_fill_value", "_dtype", ]:
+            setattr(V, k, v)
     V.set_fill_value(D["_fill_value"])
     return V
 
 
-class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
+class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
+
     "An in-memory variable."
     variable_count = 0
     _missing = numpy.ma.MaskedArray.fill_value
 
-
     def _getShape(self):
         return self._data.shape
 
-    shape = property(_getShape,None)
+    shape = property(_getShape, None)
+
     def iscontiguous(self):
         return self.flags['CONTIGUOUS']
 
@@ -70,79 +75,84 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
         out = numpy.ascontiguousarray(d)
         m = numpy.ma.getmask(self)
         if m is not numpy.ma.nomask:
-            m= numpy.ascontiguousarray(m)
-        out = TransientVariable(out,mask=m,attributes=self.attributes)
+            m = numpy.ascontiguousarray(m)
+        out = TransientVariable(out, mask=m, attributes=self.attributes)
         out.setAxisList(self.getAxisList())
         out.setMissing(self.getMissing())
         return out
-    
+
     ascontiguous = ascontiguousarray
-    
+
     def asma(self):
-        return numpy.ma.array(self._data,mask=self._mask)
-    
-    def _update_from(self,obj):
-        numpy.ma.MaskedArray._update_from(self,obj)
-        if not hasattr(self,'___cdms_internals__'):
-            self.__dict__['___cdms_internals__']=['__cdms_internals__','___cdms_internals__','_node_','parent','attributes','shape']
-        if not hasattr(self,'attributes'):
-            self.attributes={}
-        self._grid_ = getattr(obj,'_grid_',None)
+        return numpy.ma.array(self._data, mask=self._mask)
+
+    def _update_from(self, obj):
+        numpy.ma.MaskedArray._update_from(self, obj)
+        if not hasattr(self, '___cdms_internals__'):
+            self.__dict__[
+                '___cdms_internals__'] = [
+                    '__cdms_internals__',
+                    '___cdms_internals__',
+                    '_node_',
+                    'parent',
+                    'attributes',
+                    'shape']
+        if not hasattr(self, 'attributes'):
+            self.attributes = {}
+        self._grid_ = getattr(obj, '_grid_', None)
         try:
-            for nm,val in obj.__dict__.items():
-                if nm[0]=='_':
-##                     print nm
+            for nm, val in obj.__dict__.items():
+                if nm[0] == '_':
+# print nm
                     pass
-##                     self.__dict__[nm]=val
+# self.__dict__[nm]=val
                 else:
-                    setattr(self,nm,val)
-        except Exception,err:
+                    setattr(self, nm, val)
+        except Exception as err:
             pass
-        id = getattr(self,'id',None)
+        id = getattr(self, 'id', None)
         if id is None:
-            TransientVariable.variable_count+=1
-            id = 'variable_'+str(TransientVariable.variable_count)
-            self.id=id
-        self.name = getattr(obj,'name',id)
-        if not hasattr(self,'__domain'):
+            TransientVariable.variable_count += 1
+            id = 'variable_' + str(TransientVariable.variable_count)
+            self.id = id
+        self.name = getattr(obj, 'name', id)
+        if not hasattr(self, '__domain'):
             self.initDomain(axes=None)
 
-
-    def __array_finalize__(self,obj):
-        numpy.ma.MaskedArray.__array_finalize__(self,obj)
+    def __array_finalize__(self, obj):
+        numpy.ma.MaskedArray.__array_finalize__(self, obj)
         return
 
-    
-    __mul__    = AbstractVariable.__mul__
-    __rmul__   = AbstractVariable.__rmul__
-    __imul__   = AbstractVariable.__imul__
-    __abs__    = AbstractVariable.__abs__
-    __neg__    = AbstractVariable.__neg__
-    __add__    = AbstractVariable.__add__
-    __iadd__   = AbstractVariable.__iadd__
-    __radd__   = AbstractVariable.__radd__
+    __mul__ = AbstractVariable.__mul__
+    __rmul__ = AbstractVariable.__rmul__
+    __imul__ = AbstractVariable.__imul__
+    __abs__ = AbstractVariable.__abs__
+    __neg__ = AbstractVariable.__neg__
+    __add__ = AbstractVariable.__add__
+    __iadd__ = AbstractVariable.__iadd__
+    __radd__ = AbstractVariable.__radd__
     __lshift__ = AbstractVariable.__lshift__
     __rshift__ = AbstractVariable.__rshift__
-    __sub__    = AbstractVariable.__sub__
-    __rsub__   = AbstractVariable.__rsub__    
-    __isub__   = AbstractVariable.__isub__    
-    __div__    = AbstractVariable.__div__
-    __rdiv__   = AbstractVariable.__rdiv__
-    __idiv__   = AbstractVariable.__idiv__
-    __pow__   = AbstractVariable.__pow__
-    __eq__    = AbstractVariable.__eq__
-    __ne__    = AbstractVariable.__ne__
-    __lt__    = AbstractVariable.__lt__
-    __le__    = AbstractVariable.__le__
-    __gt__    = AbstractVariable.__gt__
-    __ge__    = AbstractVariable.__ge__
-    __sqrt__    = AbstractVariable.__sqrt__
-
-    def __init__(self,data, typecode=None, copy=1, savespace=0, 
+    __sub__ = AbstractVariable.__sub__
+    __rsub__ = AbstractVariable.__rsub__
+    __isub__ = AbstractVariable.__isub__
+    __div__ = AbstractVariable.__div__
+    __rdiv__ = AbstractVariable.__rdiv__
+    __idiv__ = AbstractVariable.__idiv__
+    __pow__ = AbstractVariable.__pow__
+    __eq__ = AbstractVariable.__eq__
+    __ne__ = AbstractVariable.__ne__
+    __lt__ = AbstractVariable.__lt__
+    __le__ = AbstractVariable.__le__
+    __gt__ = AbstractVariable.__gt__
+    __ge__ = AbstractVariable.__ge__
+    __sqrt__ = AbstractVariable.__sqrt__
+
+    def __init__(self, data, typecode=None, copy=1, savespace=0,
                  mask=numpy.ma.nomask, fill_value=None, grid=None,
-                 axes=None, attributes=None, id=None, copyaxes=1, dtype=None, 
-                 order=False, no_update_from=False,**kargs):
-        """createVariable (self, data, typecode=None, copy=0, savespace=0, 
+                 axes=None, attributes=None, id=None, copyaxes=1, dtype=None,
+                 order=False, no_update_from=False, **kargs):
+        """createVariable (self, data, typecode=None, copy=0, savespace=0,
                  mask=None, fill_value=None, grid=None,
                  axes=None, attributes=None, id=None, dtype=None, order=False)
            The savespace argument is ignored, for backward compatibility only.
@@ -150,69 +160,70 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
         try:
             if data.fill_value is not None:
                 self._setmissing(data.fill_value)
-                fill_value=data.fill_value
+                fill_value = data.fill_value
         except:
             pass
         if fill_value is not None:
-           self._setmissing(fill_value)
-        if attributes is not None  and "_FillValue" in attributes.keys():
-           self._setmissing(attributes["_FillValue"])
+            self._setmissing(fill_value)
+        if attributes is not None and "_FillValue" in attributes.keys():
+            self._setmissing(attributes["_FillValue"])
 
-        # tile index, None means no mosaic 
+        # tile index, None means no mosaic
         self.tileIndex = None
-        
+
         # Compatibility: assuming old typecode, map to new
         if dtype is None and typecode is not None:
             dtype = typeconv.convtypecode2(typecode)
         typecode = sctype2char(dtype)
         if isinstance(data, tuple):
             data = list(data)
-        
-        AbstractVariable.__init__ (self)
+
+        AbstractVariable.__init__(self)
 
         if isinstance(data, AbstractVariable):
             if not isinstance(data, TransientVariable):
                 data = data.subSlice()
-##             if attributes is None: attributes = data.attributes
+# if attributes is None: attributes = data.attributes
             if axes is None and not no_update_from:
                 axes = map(lambda x: x[0], data.getDomain())
             if grid is None and not no_update_from:
                 grid = data.getGrid()
                 if (grid is not None) and (not isinstance(grid, AbstractRectGrid)) \
-                                      and (not grid.checkAxes(axes)):
-                    grid = grid.reconcile(axes) # Make sure grid and axes are consistent
-
-        ncopy = (copy!=0)
+                        and (not grid.checkAxes(axes)):
+                    grid = grid.reconcile(
+                        axes)  # Make sure grid and axes are consistent
 
+        ncopy = (copy != 0)
 
         # Initialize the geometry
         if grid is not None:
-            copyaxes=0                  # Otherwise grid axes won't match domain.
+            copyaxes = 0                  # Otherwise grid axes won't match domain.
         if axes is not None:
-            self.initDomain(axes, copyaxes=copyaxes)           # Note: clobbers the grid, so set the grid after.
+            self.initDomain(axes, copyaxes=copyaxes)
+                            # Note: clobbers the grid, so set the grid after.
         if grid is not None:
             self.setGrid(grid)
- 
+
         # Initialize the attributes
         if attributes is not None:
             for key, value in attributes.items():
-                if (key in ['shape','flat','imaginary','real'] or key[0]=='_') and key not in ['_FillValue']:
-                    raise CDMSError, 'Bad key in attributes: ' + key
+                if (key in ['shape', 'flat', 'imaginary', 'real'] or key[0] == '_') and key not in ['_FillValue']:
+                    raise CDMSError('Bad key in attributes: ' + key)
                 elif key == 'missing_value':
-                    #ignore if fill value given explicitly
+                    # ignore if fill value given explicitly
                     if fill_value is None:
                         self._setmissing(value)
-                elif key not in ['scale_factor','add_offset']:
+                elif key not in ['scale_factor', 'add_offset']:
                     setattr(self, key, value)
 
         # Sync up missing_value attribute and the fill value.
         self.missing_value = self._getmissing()
         self._FillValue = self._getmissing()
         if id is not None:
-            if not isinstance(id,(unicode,str)): 
-                raise CDMSError, 'id must be a string'
+            if not isinstance(id, (unicode, str)):
+                raise CDMSError('id must be a string')
             self.id = id
-        elif hasattr(data,'id'):
+        elif hasattr(data, 'id'):
             self.id = data.id
 
         if self.id is None:
@@ -227,22 +238,21 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
         self.__mpiWindows = {}
         self.__mpiType = self.__getMPIType()
 
-
     def _getmissing(self):
         return self._missing
 
-    def _setmissing(self,value):
-        self._missing=numpy.array(value).astype(self.dtype)
+    def _setmissing(self, value):
+        self._missing = numpy.array(value).astype(self.dtype)
 
-    missing       = property(_getmissing,_setmissing)
-    fill_value    = property(_getmissing,_setmissing)
-    _FillValue    = property(_getmissing,_setmissing)
-    missing_value = property(_getmissing,_setmissing)
+    missing = property(_getmissing, _setmissing)
+    fill_value = property(_getmissing, _setmissing)
+    _FillValue = property(_getmissing, _setmissing)
+    missing_value = property(_getmissing, _setmissing)
 
-    def __new__(cls, data, typecode=None, copy=0, savespace=0, 
-                 mask=numpy.ma.nomask, fill_value=None, grid=None,
-                 axes=None, attributes=None, id=None, copyaxes=1, dtype=None, order=False,**kargs):
-        """createVariable (self, data, typecode=None, copy=0, savespace=0, 
+    def __new__(cls, data, typecode=None, copy=0, savespace=0,
+                mask=numpy.ma.nomask, fill_value=None, grid=None,
+                axes=None, attributes=None, id=None, copyaxes=1, dtype=None, order=False, **kargs):
+        """createVariable (self, data, typecode=None, copy=0, savespace=0,
                  mask=None, fill_value=None, grid=None,
                  axes=None, attributes=None, id=None, dtype=None, order=False)
            The savespace argument is ignored, for backward compatibility only.
@@ -258,61 +268,60 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
                 data = data.subSlice()
         if isinstance(data, numpy.ma.MaskedArray):
             try:
-                if fill_value is None: fill_value = data.fill_value
+                if fill_value is None:
+                    fill_value = data.fill_value
             except:
                 pass
 
-        ncopy = (copy!=0)
+        ncopy = (copy != 0)
         if mask is None:
             try:
                 mask = data.mask
-            except Exception,err:
+            except Exception as err:
                 mask = numpy.ma.nomask
 
         # Handle the case where ar[i:j] returns a single masked value
         if data is numpy.ma.masked:
-            #shape = tuple(len(axes)*[1])
+            # shape = tuple(len(axes)*[1])
             data = numpy.ma.masked.data
-            #data.shape = shape
+            # data.shape = shape
             mask = numpy.ma.masked.mask
-            #mask.shape = shape
-##         if data.getattr('mask',None) is not numpy.ma.nomask:
-##             mask = data.mask
-##         print 'passing:',mask.shape,data.shape,numpy.shape(cls)
+            # mask.shape = shape
+# if data.getattr('mask',None) is not numpy.ma.nomask:
+# mask = data.mask
+# print 'passing:',mask.shape,data.shape,numpy.shape(cls)
         if fill_value is not None:
             fill_value = numpy.array(fill_value).astype(dtype)
         else:
             fill_value = numpy.ma.MaskedArray(1).astype(dtype).item()
 
+        self = numpy.ma.MaskedArray.__new__(cls, data, dtype=dtype,
+                                            copy=ncopy,
+                                            mask=mask,
+                                            fill_value=fill_value,
+                                            subok=False,
+                                            order=order)
 
-        self = numpy.ma.MaskedArray.__new__(cls, data, dtype = dtype,
-                                      copy = ncopy,
-                                      mask = mask,
-                                      fill_value = fill_value,
-                                      subok = False,
-                                      order = order)
-
-            
-        
         return self
 
     # typecode = numpy.ma.array.typecode
     def typecode(self):
         return self.dtype.char
 
-    def assignValue(self,data):
+    def assignValue(self, data):
         self[...] = data
 
     def getValue(self, squeeze=1):
         return self.filled()
 
-    def expertSlice (self, slicelist):
+    def expertSlice(self, slicelist):
         return numpy.ma.MaskedArray.__getitem__(self, slicelist)
 
-    def initDomain (self, axes, copyaxes=1):
-        # lazy evaluation via getAxis to avoid creating axes that aren't ever used.
+    def initDomain(self, axes, copyaxes=1):
+        # lazy evaluation via getAxis to avoid creating axes that aren't ever
+        # used.
         newgrid = None
-        self.__domain = [None]*self.rank()
+        self.__domain = [None] * self.rank()
         if axes is not None:
             flataxes = []
             try:
@@ -325,22 +334,25 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
                 elif isinstance(item, AbstractRectGrid) or isinstance(item, AbstractCurveGrid):
                     flataxes.append(item.getAxis(0))
                     flataxes.append(item.getAxis(1))
-                    copyaxes=0
+                    copyaxes = 0
                     newgrid = item
                 elif isinstance(item, AbstractGenericGrid):
                     flataxes.append(item.getAxis(0))
-                    copyaxes=0
+                    copyaxes = 0
                     newgrid = item
                 else:
-                    raise CDMSError, "Invalid item in axis list:\n"+`item`
+                    raise CDMSError(
+                        "Invalid item in axis list:\n" + repr(item))
             if len(flataxes) != self.rank():
-                raise CDMSError, "Wrong number of axes to initialize domain."
+                raise CDMSError("Wrong number of axes to initialize domain.")
             for i in range(len(flataxes)):
                 if flataxes[i] is not None:
-                    if (not flataxes[i].isVirtual()) and copyaxes==1:
+                    if (not flataxes[i].isVirtual()) and copyaxes == 1:
                         self.copyAxis(i, flataxes[i])
                     else:
-                        self.setAxis(i, flataxes[i]) # No sense copying a virtual axis.
+                        self.setAxis(
+                            i,
+                            flataxes[i])  # No sense copying a virtual axis.
             if newgrid is not None:     # Do this after setting the axes, so the grid is consistent
                 self.setGrid(newgrid)
 
@@ -350,25 +362,31 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
                 junk = self.getAxis(i)  # will force a fill in
         return self.__domain
 
-    def getAxis (self, n):
-        if n < 0: n = n + self.rank()
+    def getAxis(self, n):
+        if n < 0:
+            n = n + self.rank()
         if self.__domain[n] is None:
             length = numpy.ma.size(self, n)
-            # axis = createAxis(numpy.ma.arange(numpy.ma.size(self, n), typecode=numpy.Float))
-            axis = createAxis(numpy.ma.arange(numpy.ma.size(self, n), dtype=numpy.float_))
+            # axis = createAxis(numpy.ma.arange(numpy.ma.size(self, n),
+            # typecode=numpy.Float))
+            axis = createAxis(
+                numpy.ma.arange(numpy.ma.size(self, n), dtype=numpy.float_))
             axis.id = "axis_" + str(n)
             self.__domain[n] = (axis, 0, length, length)
         return self.__domain[n][0]
-        
-    def setAxis (self, n, axis, savegrid=0):
+
+    def setAxis(self, n, axis, savegrid=0):
         """Set n axis of self to a copy of axis. (0-based index)
         """
-        if n < 0: n = n + self.rank()
+        if n < 0:
+            n = n + self.rank()
         axislen = self.shape[n]
-        if len(axis)!=axislen:
-            raise CDMSError,"axis length %d does not match corresponding dimension %d"%(len(axis),axislen)
+        if len(axis) != axislen:
+            raise CDMSError(
+                "axis length %d does not match corresponding dimension %d" %
+                (len(axis), axislen))
         if not isinstance(axis, AbstractAxis):
-            raise CDMSError,"copydimension, other not a slab."
+            raise CDMSError("copydimension, other not a slab.")
         self.__domain[n] = (axis, 0, len(axis), len(axis))
 
     def setAxisList(self, axislist):
@@ -376,26 +394,27 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
         for i in range(len(axislist)):
             self.setAxis(i, axislist[i])
 
-    def copyAxis (self, n, axis):
+    def copyAxis(self, n, axis):
         """Set n axis of self to a copy of axis. (0-based index)
            Invalidates grid.
         """
-        if n < 0: n = n + self.rank()
+        if n < 0:
+            n = n + self.rank()
         if not isinstance(axis, AbstractAxis):
-            raise CDMSError,"copydimension, other not an axis."
+            raise CDMSError("copydimension, other not an axis.")
         b = axis.getBounds()
         mycopy = createAxis(axis[:], b)
         mycopy.id = axis.id
         for k, v in axis.attributes.items():
-           setattr(mycopy, k, v)
-        self.setAxis (n, mycopy)
-   
-    def copyDomain (self, other):
+            setattr(mycopy, k, v)
+        self.setAxis(n, mycopy)
+
+    def copyDomain(self, other):
         "Set the axes and grid by copying variable other."
         if not isinstance(other, AbstractVariable):
-            raise CDMSError,"copyDomain, other not a variable."
+            raise CDMSError("copyDomain, other not a variable.")
         if self.rank() != other.rank():
-            raise CDMSError, "copyDomain, ranks do not match."
+            raise CDMSError("copyDomain, ranks do not match.")
         for i in range(self.rank()):
             self.copyAxis(i, other.getAxis(i))
         self.setGrid(other.getGrid())
@@ -406,21 +425,23 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
             for i in range(self.rank()):
                 ax = self.getAxis(i)
                 if ax.isLatitude():
-                    order = order+'y'
+                    order = order + 'y'
                     lat = ax
                 elif ax.isLongitude():
-                    order = order+'x'
+                    order = order + 'x'
                     lon = ax
-                if len(order)==2: break
+                if len(order) == 2:
+                    break
 
-            if order in ['yx','xy']:
-                self._grid_ = createRectGrid(lat,lon,order)
+            if order in ['yx', 'xy']:
+                self._grid_ = createRectGrid(lat, lon, order)
         return self._grid_
 
-    def astype (self, tc):
+    def astype(self, tc):
         "return self as array of given type."
-        maresult = numpy.ma.MaskedArray.astype(self,tc)
-        return TransientVariable(maresult, copy=0, axes=self.getAxisList(), fill_value=self.fill_value,
+        maresult = numpy.ma.MaskedArray.astype(self, tc)
+        return TransientVariable(
+            maresult, copy=0, axes=self.getAxisList(), fill_value=self.fill_value,
                                  attributes=self.attributes, id=self.id, grid=self.getGrid())
 
     def setMaskFromGridMask(self, mask, gridindices):
@@ -437,18 +458,18 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
                 shapeprep.append(self.shape[i])
 
         # Broadcast mask
-        if tprep!=[]:
+        if tprep != []:
             newshape = tuple(shapeprep + list(mask.shape))
             bigmask = numpy.resize(mask, newshape)
 
             # Generate the tranpose vector
             t = tuple(tprep + list(gridindices))
-            tinv = [0]*len(t)
+            tinv = [0] * len(t)
             for i in range(len(t)):
                 tinv[t[i]] = i
 
             # And reshape to fit the variable
-            if tinv!=range(len(tinv)):
+            if tinv != range(len(tinv)):
                 bigmask = numpy.transpose(bigmask, tuple(tinv))
 
         else:
@@ -463,25 +484,25 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
         return result
 
 # Old cu interface
-    def copydimension (self, idim, other, jdim):
-        """Set idim dimension of self to variable other's jdim'th 
+    def copydimension(self, idim, other, jdim):
+        """Set idim dimension of self to variable other's jdim'th
            This is for old cu compatibility. Use copyAxis for new code.
         """
         if not isinstance(other, AbstractVariable):
-            raise CDMSError,"copydimension, other not a variable."
+            raise CDMSError("copydimension, other not a variable.")
         a = other.getAxis(jdim)
         self.copyAxis(idim, a)
 
     def setdimattribute(self, dim, field, value):
         "Set the attribute named field from the dim'th dimension."
         if dim < 0 or dim >= self.rank():
-            raise CDMSError, "setdimattribute, dim out of bounds."
+            raise CDMSError("setdimattribute, dim out of bounds.")
         d = self.getAxis(dim)
         if field == "name":
             if not isinstance(value, basestring):
-               raise CDMSError, "setdimattribute: name not a string"
+                raise CDMSError("setdimattribute: name not a string")
             d.id = value
-            
+
         elif field == "values":
             # note -- invalidates grid, may break old code.
             a = createAxis(numpy.ma.filled(value[:]))
@@ -492,28 +513,29 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
 
         elif field == "units":
             if not isinstance(value, basestring):
-               raise CDMSError, "setdimattribute: units not a string"
+                raise CDMSError("setdimattribute: units not a string")
             d.units = value
 
         elif field == "weights":
             # Well, you can't really do this without modifying the grid
-            raise CDMSError, "setdimattribute weights not implemented."
+            raise CDMSError("setdimattribute weights not implemented.")
 
         elif field == "bounds":
             if value is None:
-               d.setBounds(None)
+                d.setBounds(None)
             else:
-               b = numpy.ma.filled(value)
-               if numpy.ma.rank(b) == 2:
-                   d.setBounds(b)
-               elif numpy.ma.rank(b) == 1:
-                   b1 = numpy.zeros((len(b)-1,2), b.dtype.char)
-                   b1[:,0] = b[:-1]
-                   b1[:,1] = b[1:]
-                   d.setBounds(b1)
-               else:
-                   raise CDMSError, \
-                   "setdimattribute, bounds improper shape: " + b.shape
+                b = numpy.ma.filled(value)
+                if numpy.ma.rank(b) == 2:
+                    d.setBounds(b)
+                elif numpy.ma.rank(b) == 1:
+                    b1 = numpy.zeros((len(b) - 1, 2), b.dtype.char)
+                    b1[:, 0] = b[:-1]
+                    b1[:, 1] = b[1:]
+                    d.setBounds(b1)
+                else:
+                    raise CDMSError(
+                        "setdimattribute, bounds improper shape: " +
+                        b.shape)
         else:
             setattr(d, field, value)
 
@@ -524,57 +546,57 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
         result = createVariable(self, copy=copyData)
         return result
 
-    def dumps(self,*args,**kargs):
-        ## Probably need something for curv/gen grids
+    def dumps(self, *args, **kargs):
+        # Probably need something for curv/gen grids
         """ Dumps Variable to a jason object, args are passed directly to json.dump"""
-        J={}
-        for k,v in self.attributes.iteritems():
-            if k=="autoApiInfo":
+        J = {}
+        for k, v in self.attributes.iteritems():
+            if k == "autoApiInfo":
                 continue
-            J[k]=v
-        J['id']=self.id
-        axes=[]
+            J[k] = v
+        J['id'] = self.id
+        axes = []
         for a in self.getAxisList():
-            ax={}
-            for A,v in a.attributes.iteritems():
-                ax[A]=v
-            ax['id']=a.id
-            ax["_values"]=a[:].tolist()
-            ax["_dtype"]=a[:].dtype.char
+            ax = {}
+            for A, v in a.attributes.iteritems():
+                ax[A] = v
+            ax['id'] = a.id
+            ax["_values"] = a[:].tolist()
+            ax["_dtype"] = a[:].dtype.char
             axes.append(ax)
-        J["_axes"]=axes
-        J["_values"]=self[:].filled(self.fill_value).tolist()
-        J["_fill_value"]=float(self.fill_value)
-        J["_dtype"]=self.typecode()
-        J["_grid"]=None #self.getGrid()
-        return json.dumps(J,*args,**kargs)
+        J["_axes"] = axes
+        J["_values"] = self[:].filled(self.fill_value).tolist()
+        J["_fill_value"] = float(self.fill_value)
+        J["_dtype"] = self.typecode()
+        J["_grid"] = None  # self.getGrid()
+        return json.dumps(J, *args, **kargs)
 
     def isEncoded(self):
         "Transient variables are not encoded"
         return 0
 
-    def __len__ (self):
+    def __len__(self):
         "Length of first dimension"
-        if self.rank()>0:
-            (axis,start,length,true_length) = self.getDomain()[0]
+        if self.rank() > 0:
+            (axis, start, length, true_length) = self.getDomain()[0]
         else:
             length = 0
         return length
 
-    def __str__ (self):
+    def __str__(self):
         return numpy.ma.MaskedArray.__str__(self)
 
-    def __repr__ (self):
+    def __repr__(self):
         return self.id + '\n' + numpy.ma.MaskedArray.__repr__(self) + '\n'
 
     def set_fill_value(self, value):
         "Set missing value attribute and fill value"
         AbstractVariable.setMissing(self, value)
-        #self.__dict__['_fill_value'] = self.missing_value
-        ## Fix submitted by Ghislain Picard, this was broken with numpy 1.5
-        numpy.ma.MaskedArray.set_fill_value(self,value)
+        # self.__dict__['_fill_value'] = self.missing_value
+        # Fix submitted by Ghislain Picard, this was broken with numpy 1.5
+        numpy.ma.MaskedArray.set_fill_value(self, value)
 
-    def setMissing (self, value):
+    def setMissing(self, value):
         "Set missing value attribute and fill value"
         self.set_fill_value(value)
 
@@ -595,7 +617,7 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
         """
         return self.tileIndex
 
-    def toVisit(self, filename, format='Vs', sphereRadius=1.0, 
+    def toVisit(self, filename, format='Vs', sphereRadius=1.0,
                 maxElev=0.1):
         """
         Save data to file for postprocessing by the VisIt visualization tool
@@ -604,21 +626,21 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
         sphereRadius: radius of the earth
         maxElev: maximum elevation for representation on the sphere
         """
-        import mvSphereMesh
-        import mvVTKSGWriter
-        import mvVsWriter
+        from . import mvSphereMesh
+        from . import mvVTKSGWriter
+        from . import mvVsWriter
         try:
             # required by mvVsWriter
             import tables
         except:
-            # fall back 
+            # fall back
             format = 'VTK'
 
         def generateTimeFileName(filename, tIndex, tIndexMax, suffix):
-            ndigits = len('%d'%tIndexMax)
-            itdigits = len('%d'%tIndex)
-            tiStr = '0'*(ndigits-itdigits) + ('%d'%tIndex)
-            return re.sub(r'\.' + suffix, '_%s.%s' % (tiStr, suffix), 
+            ndigits = len('%d' % tIndexMax)
+            itdigits = len('%d' % tIndex)
+            tiStr = '0' * (ndigits - itdigits) + ('%d' % tIndex)
+            return re.sub(r'\.' + suffix, '_%s.%s' % (tiStr, suffix),
                           filename)
 
         # determine whether data are time dependent
@@ -632,46 +654,48 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
                 counter += 1
                 if axis == 'time':
                     timeIndex = counter
-        
-        if timeAxis == None or timeIndex == -1:
+
+        if timeAxis is None or timeIndex == -1:
             # static data
             if format == 'VTK':
                 vw = mvVTKSGWriter.VTKSGWriter(self, maxElev)
-                if filename.find('.vtk') == -1: 
+                if filename.find('.vtk') == -1:
                     filename += '.vtk'
                 vw.write(filename)
             else:
                 vw = mvVsWriter.VsWriter(self, maxElev)
-                if filename.find('.vsh5') == -1: 
+                if filename.find('.vsh5') == -1:
                     filename += '.vsh5'
                 vw.write(filename)
         else:
             # time dependent data
             tIndexMax = len(timeAxis)
             for tIndex in range(tIndexMax):
-                sliceOp = 'self[' + (':,'*timeIndex) + ('%d,'%tIndex) + '...]'
+                sliceOp = 'self[' + (
+                    ':,' * timeIndex) + ('%d,' %
+                                         tIndex) + '...]'
                 var = eval(sliceOp)
                 if format == 'VTK':
                     if filename.find('.vtk') == -1:
                         filename += '.vtk'
-                    tFilename = generateTimeFileName(filename, 
+                    tFilename = generateTimeFileName(filename,
                                                      tIndex, tIndexMax, 'vtk')
                     vw = mvVTKSGWriter.VTKSGWriter(var, maxElev)
                     vw.write(tFilename)
                 else:
                     if filename.find('.h5') == -1:
                         filename += '.h5'
-                    tFilename = generateTimeFileName(filename, 
+                    tFilename = generateTimeFileName(filename,
                                                      tIndex, tIndexMax, 'h5')
                     vw = mvVsWriter.VsWriter(var, maxElev)
                     vw.write(tFilename)
-       
-    # Following are distributed array methods, they require mpi4py 
+
+    # Following are distributed array methods, they require mpi4py
     # to be installed
 
     def setMPIComm(self, comm):
         """
-        Set the MPI communicator. This is a no-op if MPI 
+        Set the MPI communicator. This is a no-op if MPI
         is not available.
         """
         if HAVE_MPI:
@@ -698,7 +722,7 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
     def exposeHalo(self, ghostWidth=1):
         """
         Expose the halo to other processors. The halo is the region
-        within the local MPI data domain that is accessible to other 
+        within the local MPI data domain that is accessible to other
         processors. The halo encompasses the edge of the data region
         and has thickness ghostWidth.
 
@@ -715,9 +739,9 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
                     # given direction, a 1 represents a layer of
                     # thickness ghostWidth on the high index side,
                     # -1 on the low index side.
-                    winId = tuple( [0 for i in range(dim) ] \
-                                   + [drect] + \
-                                   [0 for i in range(dim+1, ndims) ] )
+                    winId = tuple([0 for i in range(dim)]
+                                  + [drect] +
+                                  [0 for i in range(dim + 1, ndims)])
 
                     slce = slice(0, ghostWidth)
                     if drect == 1:
@@ -726,19 +750,19 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
                     slab = self.__getSlab(dim, slce)
 
                     # create the MPI window
-                    dataSrc = numpy.zeros(self[slab].shape, self.dtype) 
-                    dataDst = numpy.zeros(self[slab].shape, self.dtype) 
+                    dataSrc = numpy.zeros(self[slab].shape, self.dtype)
+                    dataDst = numpy.zeros(self[slab].shape, self.dtype)
                     self.__mpiWindows[winId] = {
                         'slab': slab,
                         'dataSrc': dataSrc,
                         'dataDst': dataDst,
                         'window': MPI.Win.Create(dataSrc, comm=self.__mpiComm),
-                        }
-                
+                    }
+
     def getHaloEllipsis(self, side):
         """
-        Get the ellipsis for a given halo side. 
-        
+        Get the ellipsis for a given halo side.
+
         side - a tuple of zeros and one +1 or -1.  To access
                the "north" side for instance, set side=(1, 0),
                (-1, 0) to access the south side, (0, 1) the east
@@ -746,7 +770,7 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
 
         Return none if halo was not exposed (see exposeHalo)
         """
-        if HAVE_MPI and self.__mpiWindows.has_key(side):
+        if HAVE_MPI and side in self.__mpiWindows:
             return self.__mpiWindows[side]['slab']
         else:
             return None
@@ -754,20 +778,20 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
     def fetchHaloData(self, pe, side):
         """
         Fetch the halo data from another processor. The halo side
-        is a subdomain of the halo that is exposed to other 
+        is a subdomain of the halo that is exposed to other
         processors. It is an error to call this method when
         MPI is not enabled. This is a collective method (must
         be called by all processes), which involves synchronization
         of data among all processors.
 
         pe       -  processor owning the halo data. This is a no
-                    operation when pe is None. 
+                    operation when pe is None.
         side     -  a tuple of zeros and one +1 or -1.  To access
                     the "north" side for instance, set side=(1, 0),
                     (-1, 0) to access the south side, (0, 1) the east
-                    side, etc. 
+                    side, etc.
 
-        Note: collective, all procs must invoke this method. If some 
+        Note: collective, all procs must invoke this method. If some
         processors should not fetch then pass None for pe.
         """
         if HAVE_MPI:
@@ -780,37 +804,37 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
             dataSrc[...] = self[slab]
 
             win = iw['window']
-            win.Fence() # get the data ready
+            win.Fence()  # get the data ready
             if pe is not None:
-                win.Get( [dataDst, self.__mpiType], pe )
-            win.Fence() # make sure the communication completed
+                win.Get([dataDst, self.__mpiType], pe)
+            win.Fence()  # make sure the communication completed
             return dataDst
         else:
-            raise CDMSError, 'Must have MPI to invoke fetchHaloData'
+            raise CDMSError('Must have MPI to invoke fetchHaloData')
 
     def freeHalo(self):
         """
-        Free the MPI windows attached to the halo. This must be 
+        Free the MPI windows attached to the halo. This must be
         called before MPI_Finalize.
         """
         for iw in self.__mpiWindows:
-            self.__mpiWindows[iw]['window'].Free()        
+            self.__mpiWindows[iw]['window'].Free()
 
     def __getSlab(self, dim, slce):
         """
         Get slab. A slab is a multi-dimensional slice extending in
         all directions except along dim where slce applies
-        
+
         dim      - dimension (0=first index, 1=2nd index...)
         slce     - python slice object along dimension dim
-        
+
         return slab
         """
         ndims = len(self.shape)
-        
+
         slab = [ slice(0, None) for i in range(dim) ] \
-                    + [slce] + \
-                  [ slice(0, None) for i in range(dim+1, ndims) ]
+            + [slce] + \
+            [slice(0, None) for i in range(dim + 1, ndims)]
         return tuple(slab)
 
     def __getMPIType(self):
@@ -834,50 +858,54 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
             elif dtyp == numpy.int8:
                 typ = MPI.INT8_T
             else:
-                return None          
+                return None
         else:
             return typ
 
-## PropertiedClasses.set_property(TransientVariable, 'shape', 
-##                                nowrite=1, nodelete=1)
+# PropertiedClasses.set_property(TransientVariable, 'shape',
+# nowrite=1, nodelete=1)
+
 
-def createVariable(*args,**kargs):
-    if kargs.get("fromJSON",False):
+def createVariable(*args, **kargs):
+    if kargs.get("fromJSON", False):
         return fromJSON(*args)
     else:
-        return TransientVariable(*args,**kargs)
+        return TransientVariable(*args, **kargs)
 
-def isVariable (s):
+
+def isVariable(s):
     "Is s a variable?"
     return isinstance(s, AbstractVariable)
 
+
 def asVariable(s, writeable=1):
-    """Returns s if s is a Variable; if writeable is 1, return 
-       s if s is a TransientVariable. If s is not a variable of 
+    """Returns s if s is a Variable; if writeable is 1, return
+       s if s is a TransientVariable. If s is not a variable of
        the desired type, attempt to make it so and return that.
        If we fail raise CDMSError
     """
     target_class = AbstractVariable
-    if writeable: target_class = TransientVariable
+    if writeable:
+        target_class = TransientVariable
     if isinstance(s, target_class):
         return s
     elif isinstance(s, AbstractVariable):
         return s.subSlice()
-    
+
     try:
         result = createVariable(s)
     except CDMSError:
-        result =  None
-    
+        result = None
+
     # if result.dtype.char == numpy.ma.PyObject:
     if issubclass(result.dtype.type, numpy.object_):
         result = None
     if result is None:
-        raise CDMSError, "asVariable could not make a Variable from the input."
+        raise CDMSError("asVariable could not make a Variable from the input.")
     return result
 
 if __name__ == '__main__':
-    for s in [(20,), (4,5)]:
+    for s in [(20,), (4, 5)]:
         x = numpy.arange(20)
         x.shape = s
         t = createVariable(x)
@@ -886,21 +914,24 @@ if __name__ == '__main__':
         assert numpy.ma.allclose(x, t)
         assert t.dtype.char == numpy.int
         assert numpy.ma.size(t) == numpy.ma.size(x)
-        assert numpy.ma.size(t,0) == len(t)
-        assert numpy.ma.allclose(t.getAxis(0)[:], numpy.ma.arange(numpy.ma.size(t,0)))
+        assert numpy.ma.size(t, 0) == len(t)
+        assert numpy.ma.allclose(
+            t.getAxis(0)[:], numpy.ma.arange(numpy.ma.size(t, 0)))
         t.missing_value = -99
         assert t.missing_value == -99
         assert t.fill_value == -99
-    t = createVariable(numpy.ma.arange(5), mask=[0,0,0,1,0])
-    t.set_fill_value (1000)
+    t = createVariable(numpy.ma.arange(5), mask=[0, 0, 0, 1, 0])
+    t.set_fill_value(1000)
     assert t.fill_value == 1000
     assert t.missing_value == 1000
     t.missing_value = -99
     assert t[2] == 2
     t[3] = numpy.ma.masked
     assert t[3] is numpy.ma.masked
-    f = createVariable(numpy.ma.arange(5, typecode=numpy.float32), mask=[0,0,0,1,0])
-    f2 = createVariable(numpy.ma.arange(5, typecode=numpy.float32), mask=[0,0,0,1,0])
+    f = createVariable(
+        numpy.ma.arange(5, typecode=numpy.float32), mask=[0, 0, 0, 1, 0])
+    f2 = createVariable(
+        numpy.ma.arange(5, typecode=numpy.float32), mask=[0, 0, 0, 1, 0])
     f[3] = numpy.ma.masked
     assert f[3] is numpy.ma.masked
     assert numpy.ma.allclose(2.0, f[2])
@@ -910,6 +941,6 @@ if __name__ == '__main__':
     assert t.getdimattribute(0, 'name') == 'fudge'
     f2b = f2.getdimattribute(0, 'bounds')
     t.setdimattribute(0, 'bounds', f2b)
-    assert numpy.ma.allclose(f.getdimattribute(0,'bounds'), f2.getdimattribute(0,'bounds'))
+    assert numpy.ma.allclose(
+        f.getdimattribute(0, 'bounds'), f2.getdimattribute(0, 'bounds'))
     print "Transient Variable test passed ok."
-
diff --git a/Packages/cdms2/Lib/typeconv.py b/Packages/cdms2/Lib/typeconv.py
index 0f2bd2c18..541785877 100644
--- a/Packages/cdms2/Lib/typeconv.py
+++ b/Packages/cdms2/Lib/typeconv.py
@@ -4,21 +4,23 @@ import numpy as np
 
 oldtype2dtype = {'1': np.dtype(np.byte),
                  's': np.dtype(np.short),
-#                 'i': np.dtype(np.intc),
-#                 'l': np.dtype(int),
-#                 'b': np.dtype(np.ubyte),
+                 #                 'i': np.dtype(np.intc),
+                 #                 'l': np.dtype(int),
+                 #                 'b': np.dtype(np.ubyte),
                  'w': np.dtype(np.ushort),
                  'u': np.dtype(np.uintc),
-#                 'f': np.dtype(np.single),
-#                 'd': np.dtype(float),
-#                 'F': np.dtype(np.csingle),
-#                 'D': np.dtype(complex),
-#                 'O': np.dtype(object),
-#                 'c': np.dtype('c'),
+                 #                 'f': np.dtype(np.single),
+                 #                 'd': np.dtype(float),
+                 #                 'F': np.dtype(np.csingle),
+                 #                 'D': np.dtype(complex),
+                 #                 'O': np.dtype(object),
+                 #                 'c': np.dtype('c'),
                  None: np.dtype(int)
-    }
+                 }
 
 # converts typecode=None to int
+
+
 def convtypecode(typecode, dtype=None):
     if dtype is None:
         try:
@@ -28,8 +30,10 @@ def convtypecode(typecode, dtype=None):
     else:
         return dtype
 
-#if both typecode and dtype are None
+# if both typecode and dtype are None
 #  return None
+
+
 def convtypecode2(typecode, dtype=None):
     if dtype is None:
         if typecode is None:
@@ -45,10 +49,12 @@ def convtypecode2(typecode, dtype=None):
 _changedtypes = {'B': 'b',
                  'b': '1',
                  'h': 's',
-##                  'H': 'w',
+                 # 'H': 'w',
                  'I': 'u'}
 
+
 class _oldtypecodes(dict):
+
     def __getitem__(self, obj):
         char = np.dtype(obj).char
         try:
diff --git a/Packages/cdms2/Lib/variable.py b/Packages/cdms2/Lib/variable.py
index 23650e3d8..f271acc1d 100644
--- a/Packages/cdms2/Lib/variable.py
+++ b/Packages/cdms2/Lib/variable.py
@@ -1,20 +1,20 @@
-## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by 
+# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
 
 """
 DatasetVariable: Dataset-based variables
 """
 from cdms2 import Cdunif
 import numpy
-import cdmsNode
+from . import cdmsNode
 import cdtime
 import copy
 import os
 import sys
-import cdmsobj
-from cdmsobj import CdmsObj, getPathFromTemplate, Max32int
-from avariable import AbstractVariable
-from sliceut import *
-from error import CDMSError
+from . import cdmsobj
+from .cdmsobj import CdmsObj, getPathFromTemplate, Max32int
+from .avariable import AbstractVariable
+from .sliceut import *
+from .error import CDMSError
 
 InvalidGridElement = "Grid domain elements are not yet implemented: "
 InvalidRegion = "Invalid region: "
@@ -24,44 +24,47 @@ TooManyPartitions = "Variable has too many partitioned axes, max is two: "
 WriteNotImplemented = "Dataset write operation not implemented"
 FileClosed = "Cannot read from closed file or dataset, variable: "
 
+
 def timeindex(value, units, basetime, delta, delunits, calendar):
     """ Calculate (t - basetime)/delu
     where t = reltime(value, units)
     and delu is the time interval (delta, delunits) (e.g., 1 month).
     """
     tval = cdtime.reltime(value, units)
-    tounits = "%s since %s"%(delunits, basetime)
+    tounits = "%s since %s" % (delunits, basetime)
     newval = tval.torel(tounits, calendar)
-    return int(newval.value/delta)
+    return int(newval.value / delta)
+
 
 class DatasetVariable(AbstractVariable):
 
-    def __init__(self,parent,id, variableNode=None):
+    def __init__(self, parent, id, variableNode=None):
         """ "Variable (parent, variableNode=None)"
            variableNode is the variable tree node, if any.
            parent is the containing dataset instance.
         """
-        AbstractVariable.__init__ (self, parent, variableNode)
-        val = self.__cdms_internals__ + ['domain','name_in_file']
+        AbstractVariable.__init__(self, parent, variableNode)
+        val = self.__cdms_internals__ + ['domain', 'name_in_file']
         self.___cdms_internals__ = val
         self.id = id
         self.domain = []
         # Get self.name_in_file from the .xml file if present
         if not hasattr(self, 'name_in_file'):
             self.name_in_file = id
-            
+
         # if self.attributes.has_key('name_in_file'):
         #     self.name_in_file = self.attributes['name_in_file']
-        if variableNode is not None:          
-            self._numericType_ = cdmsNode.CdToNumericType.get(variableNode.datatype)
+        if variableNode is not None:
+            self._numericType_ = cdmsNode.CdToNumericType.get(
+                variableNode.datatype)
         else:
             self._numericType_ = numpy.float
         assert self.id is not None
-        
-    def __len__ (self):
+
+    def __len__(self):
         "Length of first dimension"
-        if len(self.domain)>0:
-            (axis,start,length,true_length) = self.domain[0]
+        if len(self.domain) > 0:
+            (axis, start, length, true_length) = self.domain[0]
         else:
             length = 0
 
@@ -72,33 +75,34 @@ class DatasetVariable(AbstractVariable):
 #            parentid = self.parent.id
 #        else:
 #            parentid = "**CLOSED**"
-#        return "<Variable: %s, dataset: %s, shape: %s>"%(self.id, parentid, `self.shape`)
+# return "<Variable: %s, dataset: %s, shape: %s>"%(self.id, parentid,
+# `self.shape`)
 
     def __getitem__(self, key):
         if self.parent is None:
-            raise CDMSError, FileClosed+str(self.id)
+            raise CDMSError(FileClosed + str(self.id))
         return AbstractVariable.__getitem__(self, key)
-        
+
     def getValue(self, squeeze=1):
         """Return the entire set of values."""
         if self.parent is None:
-            raise CDMSError, FileClosed+self.id
+            raise CDMSError(FileClosed + self.id)
         return self.getSlice(Ellipsis, squeeze=squeeze)
-    
+
     def __getslice__(self, low, high):
         if self.parent is None:
-            raise CDMSError, FileClosed+self.id
+            raise CDMSError(FileClosed + self.id)
 
         # Hack to prevent netCDF overflow error on 64-bit architectures
         high = min(Max32int, high)
-        
+
         return AbstractVariable.__getslice__(self, low, high)
 
     def __setitem__(self, index, value):
-        raise CDMSError, WriteNotImplemented
+        raise CDMSError(WriteNotImplemented)
 
     def __setslice__(self, low, high, value):
-        raise CDMSError, WriteNotImplemented
+        raise CDMSError(WriteNotImplemented)
 
     def _getShape(self):
         return self.getShape()
@@ -108,19 +112,19 @@ class DatasetVariable(AbstractVariable):
         return numpy.dtype(tc)
 
     def getShape(self):
-        shape=[]
-        for (axis,start,length,true_length) in self.domain:
+        shape = []
+        for (axis, start, length, true_length) in self.domain:
             shape.append(length)
         return tuple(shape)
 
-    def typecode (self):
-      return numpy.dtype(self._numericType_).char
+    def typecode(self):
+        return numpy.dtype(self._numericType_).char
 
     def size(self):
         "Number of elements."
         n = 1
         for k in self.shape:
-            n = k*n
+            n = k * n
         return n
 
     def initDomain(self, axisdict, griddict):
@@ -133,9 +137,9 @@ class DatasetVariable(AbstractVariable):
             if domelem is None:
                 domelem = griddict.get(dename)
                 if grid is None:
-                    raise CDMSError, NoSuchAxisOrGrid + dename
+                    raise CDMSError(NoSuchAxisOrGrid + dename)
                 else:
-                    raise CDMSError, InvalidGridElement + dename
+                    raise CDMSError(InvalidGridElement + dename)
             partlenstr = denode.getExternalAttr('partition_length')
             if partlenstr is not None:
                 truelen = int(partlenstr)
@@ -145,26 +149,27 @@ class DatasetVariable(AbstractVariable):
 
     # Get the template
     def getTemplate(self):
-        if hasattr(self,'template'):
+        if hasattr(self, 'template'):
             template = self.template
-        elif hasattr(self.parent,'template'): 
+        elif hasattr(self.parent, 'template'):
             template = self.parent.template
         else:
             template = None
         return template
 
-    def getAxis (self, n):
-        if n < 0: n = n + self.rank()
+    def getAxis(self, n):
+        if n < 0:
+            n = n + self.rank()
         return self.domain[n][0]
 
-    def getDomain (self):
+    def getDomain(self):
         return self.domain
 
     # Get the paths associated with the interval region specified
     # by 'intervals'. This incorporates most of the logic of __getitem__,
     # without actually reading the data.
-    # 
-    # 'specs' is a list of interval range specifications as defined 
+    #
+    # 'specs' is a list of interval range specifications as defined
     # for getSlice.
     #
     # The function returns a list of tuples of the form (path,slicelist),
@@ -176,11 +181,11 @@ class DatasetVariable(AbstractVariable):
     #   f = Cdunif.CdunifFile(path,'r')
     #   var = f.variables[self.name_in_file]
     #   data = apply(var.getitem,slicelist)
-    #   
+    #
     def getPaths(self, *specs, **keys):
 
         # Create an equivalent list of slices
-        speclist = self._process_specs (specs, keys)
+        speclist = self._process_specs(specs, keys)
         slicelist = self.specs2slices(speclist)
 
         # Generate the filelist
@@ -190,20 +195,20 @@ class DatasetVariable(AbstractVariable):
         result = []
         if partitionSlices is None:
             pass
-        elif npart==0:
+        elif npart == 0:
             filename, slicelist = partitionSlices
             if filename is not None:
                 result.append((filename, tuple(slicelist)))
-        elif npart==1:
+        elif npart == 1:
             for filename, slicelist in partitionSlices:
                 if filename is not None:
                     result.append((filename, tuple(slicelist)))
-        elif npart==2:
+        elif npart == 2:
             for filelist in partitionSlices:
                 for filename, slicelist in filelist:
                     if filename is not None:
                         result.append((filename, tuple(slicelist)))
-                
+
         return result
 
     def genMatch(self, axis, interval, matchnames):
@@ -217,34 +222,34 @@ class DatasetVariable(AbstractVariable):
         returns the modified matchnames tuple.
         """
         if axis.isTime():
-            if hasattr(self.parent,'cdms_filemap'):
+            if hasattr(self.parent, 'cdms_filemap'):
                 start = interval[0]
                 end = interval[1]
             else:                       # Use template method
                 time0 = axis[interval[0]]
-                time1 = axis[interval[1]-1]
-                isabs = (axis.units.find(" as ")!=-1)
+                time1 = axis[interval[1] - 1]
+                isabs = (axis.units.find(" as ") != -1)
                 if isabs:
-                    start = cdtime.abstime(time0,axis.units)
-                    end = cdtime.abstime(time1,axis.units)
+                    start = cdtime.abstime(time0, axis.units)
+                    end = cdtime.abstime(time1, axis.units)
                 else:
                     cal = axis.getCalendar()
-                    start = cdtime.reltime(time0,axis.units).tocomp(cal)
-                    end = cdtime.reltime(time1,axis.units).tocomp(cal)
+                    start = cdtime.reltime(time0, axis.units).tocomp(cal)
+                    end = cdtime.reltime(time1, axis.units).tocomp(cal)
             matchnames[1] = start
             matchnames[2] = end
         elif axis.isForecast():
             start = axis.getValue()[interval[0]]
-            end   = axis.getValue()[interval[1]-1]
+            end = axis.getValue()[interval[1] - 1]
             matchnames[5] = start
             matchnames[6] = end
         else:
-            if hasattr(self.parent,'cdms_filemap'):
+            if hasattr(self.parent, 'cdms_filemap'):
                 start = interval[0]
                 end = interval[1]
             else:
                 start = int(axis[interval[0]])
-                end = int(axis[interval[1]-1])
+                end = int(axis[interval[1] - 1])
             matchnames[3] = start
             matchnames[4] = end
 
@@ -254,12 +259,13 @@ class DatasetVariable(AbstractVariable):
         """Lookup or generate the file path, depending on whether a filemap
         or template is present.
         """
-        if hasattr(self.parent,'cdms_filemap'):
+        if hasattr(self.parent, 'cdms_filemap'):
             id, tstart, tend, levstart, levend, fcstart, fcend = matchnames
-            filename = self.parent._filemap_[(self.id, tstart, levstart, fcstart)]
+            filename = self.parent._filemap_[
+                (self.id, tstart, levstart, fcstart)]
             # ... filemap uses dataset IDs
         else:
-            filename = getPathFromTemplate(template,matchnames)
+            filename = getPathFromTemplate(template, matchnames)
         return filename
 
     def getPartition(self, axis):
@@ -268,7 +274,7 @@ class DatasetVariable(AbstractVariable):
         get the partition from the _varpart_ attribute, otherwise (for templating) use
         axis.partition.
         """
-        if hasattr(self.parent,'cdms_filemap'):
+        if hasattr(self.parent, 'cdms_filemap'):
             if axis.isTime():
                 partition = self._varpart_[0]
             elif axis.isForecast():
@@ -279,7 +285,7 @@ class DatasetVariable(AbstractVariable):
             partition = axis.partition
         return partition
 
-    def expertPaths (self, slist):
+    def expertPaths(self, slist):
         """ expertPaths(self, slicelist)
         takes a list of slices,
         returns a 3-tuple: (npart, dimensionlist, partitionSlices) where:
@@ -316,7 +322,7 @@ class DatasetVariable(AbstractVariable):
 
         # Handle rank-0 variables separately
         if self.rank() == 0:
-            matchnames = [realid,None,None,None,None,None,None]
+            matchnames = [realid, None, None, None, None, None, None]
             filename = self.getFilePath(matchnames, template)
 
             result = (0, (), (filename, []))
@@ -325,162 +331,164 @@ class DatasetVariable(AbstractVariable):
         # Find the number of partitioned axes
         npart = 0
         ndim = 0
-        for (axis,start,length,true_length) in self.domain:
-            if hasattr(axis,'partition'):
-                npart = npart+1
-                if npart==1:
+        for (axis, start, length, true_length) in self.domain:
+            if hasattr(axis, 'partition'):
+                npart = npart + 1
+                if npart == 1:
                     part1 = axis
                     npart1 = ndim
-                elif npart==2:
+                elif npart == 2:
                     part2 = axis
                     npart2 = ndim
                 else:
-                    raise CDMSError,  TooManyPartitions + variable.id
-            ndim = ndim+1
+                    raise CDMSError(TooManyPartitions + variable.id)
+            ndim = ndim + 1
 
         # If no partitioned axes, just read the data
-        if npart==0:
-            matchnames = [realid,None,None,None,None,None,None]
+        if npart == 0:
+            matchnames = [realid, None, None, None, None, None, None]
             filename = self.getFilePath(matchnames, template)
             result = (0, (), (filename, slicelist))
 
         # If one partitioned axes:
-        elif npart==1:
+        elif npart == 1:
 
             # intersect the slice and partition for that axis
             slice1 = slicelist[npart1]
-            (axis,startelem,length,true_length) = self.domain[npart1]
+            (axis, startelem, length, true_length) = self.domain[npart1]
             partition = slicePartition(slice1, self.getPartition(axis))
-            if partition==[]:
+            if partition == []:
                 return (1, (npart1,), None)
 
             # For each (interval, partslice) in the partition:
             resultlist = []
             (firstinterval, firstslice) = partition[0]
             prevhigh = firstinterval[0]
-            for (interval,partslice) in partition:
+            for (interval, partslice) in partition:
 
                 # If the previous interval high is less than
                 # the current interval low value, interpose
                 # missing data.
                 low = interval[0]
-                if prevhigh<low:
-                    missing_interval = (prevhigh,low)
+                if prevhigh < low:
+                    missing_interval = (prevhigh, low)
                     missing_slice = sliceIntersect(slice1, missing_interval)
 
                     # Note: if the slice has a stride>1, it might not intersect,
                     # so don't interpose missing data in this case.
                     if missing_slice is not None:
                         slicelist[npart1] = missing_slice
-                        resultlist.append((None,copy.copy(slicelist)))
+                        resultlist.append((None, copy.copy(slicelist)))
                 prevhigh = interval[1]
 
                 # generate the filename
-                matchnames = [realid, None, None, None, None,None,None]
+                matchnames = [realid, None, None, None, None, None, None]
                 matchnames = self.genMatch(axis, interval, matchnames)
                 filename = self.getFilePath(matchnames, template)
 
                 # adjust the partslice for the interval offset
                 # and replace in the slice list
-                filestart = partslice.start-interval[0]
-                filestop = partslice.stop-interval[0]
-                fileslice = slice(filestart,filestop,partslice.step)
+                filestart = partslice.start - interval[0]
+                filestop = partslice.stop - interval[0]
+                fileslice = slice(filestart, filestop, partslice.step)
                 slicelist[npart1] = fileslice
 
-                resultlist.append((filename,copy.copy(slicelist)))
+                resultlist.append((filename, copy.copy(slicelist)))
 
-            result = (1,(npart1,),resultlist)
+            result = (1, (npart1,), resultlist)
 
         # If two partitioned axes, 2-D version of previous case
-        if npart==2:
+        if npart == 2:
             slice1 = slicelist[npart1]
             slice2 = slicelist[npart2]
-            (axis1,startelem1,length1,true_length1) = self.domain[npart1]
-            (axis2,startelem2,length2,true_length2) = self.domain[npart2]
+            (axis1, startelem1, length1, true_length1) = self.domain[npart1]
+            (axis2, startelem2, length2, true_length2) = self.domain[npart2]
             partition1 = slicePartition(slice1, self.getPartition(axis1))
             partition2 = slicePartition(slice2, self.getPartition(axis2))
-            if partition1==[] or partition2==[]:
-                return (2, (npart1,npart2), None)
+            if partition1 == [] or partition2 == []:
+                return (2, (npart1, npart2), None)
 
             # For each (interval, partslice) in the partition:
             resultlist = []
             (firstinterval1, firstslice1) = partition1[0]
             prevhigh1 = firstinterval1[0]
-            for (interval1,partslice1) in partition1:
+            for (interval1, partslice1) in partition1:
 
                 # If the previous interval high is less than
                 # the current interval low value, interpose
                 # missing data.
                 low = interval1[0]
-                if prevhigh1<low:
-                    missing_interval = (prevhigh1,low)
+                if prevhigh1 < low:
+                    missing_interval = (prevhigh1, low)
                     missing_slice = sliceIntersect(slice1, missing_interval)
                     if missing_slice is not None:
                         slicelist[npart1] = missing_slice
-                        resultlist.append( [(None,copy.copy(slicelist))] )
+                        resultlist.append([(None, copy.copy(slicelist))])
                 prevhigh1 = interval1[1]
 
                 # generate matchnames
-                matchnames = [realid, None, None, None, None,None,None]
+                matchnames = [realid, None, None, None, None, None, None]
                 matchnames = self.genMatch(axis1, interval1, matchnames)
 
                 # adjust the partslice for the interval offset
                 # and replace in the slice list
-                filestart = partslice1.start-interval1[0]
-                filestop = partslice1.stop-interval1[0]
-                fileslice = slice(filestart,filestop,partslice1.step)
+                filestart = partslice1.start - interval1[0]
+                filestop = partslice1.stop - interval1[0]
+                fileslice = slice(filestart, filestop, partslice1.step)
                 slicelist[npart1] = fileslice
 
                 chunklist = []
                 (firstinterval2, firstslice2) = partition2[0]
                 prevhigh2 = firstinterval2[0]
-                for (interval2,partslice2) in partition2:
+                for (interval2, partslice2) in partition2:
 
                     # If the previous interval high is less than
                     # the current interval low value, interpose
                     # missing data.
                     low = interval2[0]
-                    if prevhigh2<low:
-                        missing_interval = (prevhigh2,low)
-                        missing_slice = sliceIntersect(slice1, missing_interval)
+                    if prevhigh2 < low:
+                        missing_interval = (prevhigh2, low)
+                        missing_slice = sliceIntersect(
+                            slice1, missing_interval)
                         if missing_slice is not None:
                             slicelist[npart2] = missing_slice
-                            chunklist.append((None,copy.copy(slicelist)))
+                            chunklist.append((None, copy.copy(slicelist)))
                     prevhigh2 = interval2[1]
 
                     # generate the filename
                     matchnames = self.genMatch(axis2, interval2, matchnames)
                     filename = self.getFilePath(matchnames, template)
 
-                    filestart = partslice2.start-interval2[0]
-                    filestop = partslice2.stop-interval2[0]
-                    fileslice = slice(filestart,filestop,partslice2.step)
+                    filestart = partslice2.start - interval2[0]
+                    filestop = partslice2.stop - interval2[0]
+                    fileslice = slice(filestart, filestop, partslice2.step)
                     slicelist[npart2] = fileslice
 
-                    chunklist.append((filename,copy.copy(slicelist)))
+                    chunklist.append((filename, copy.copy(slicelist)))
 
                 resultlist.append(chunklist)
 
-            result = (2,(npart1,npart2),resultlist)
+            result = (2, (npart1, npart2), resultlist)
 
         return result
 
-    def expertSlice (self, initslist):
+    def expertSlice(self, initslist):
 
         # Handle negative slices
-        revlist = []                    # Slices to apply to result if reversals needed
+        revlist = []
+            # Slices to apply to result if reversals needed
         slist = []                      # Slices with positive strides
         haveReversals = 0               # True iff result array needs reversing
-        i=0
+        i = 0
         for s in initslist:
-            if s.step<0:
+            if s.step < 0:
                 axislen = self.shape[i]
-                slist.append(reverseSlice(s,axislen))
-                revlist.append(slice(None,None,-1))
+                slist.append(reverseSlice(s, axislen))
+                revlist.append(slice(None, None, -1))
                 haveReversals = 1
             else:
                 slist.append(s)
-                revlist.append(slice(None,None,1))
+                revlist.append(slice(None, None, 1))
             i += 1
 
         # This does most of the work
@@ -497,13 +505,13 @@ class DatasetVariable(AbstractVariable):
 
         # If no intersection, return an 'empty' array.
         if partitionSlices is None:
-            return numpy.ma.zeros((0,),self._numericType_)
+            return numpy.ma.zeros((0,), self._numericType_)
 
         # Handle rank-0 variables separately
         if self.rank() == 0:
             filename, dumlist = partitionSlices
 
-            f = self.parent.openFile(filename,'r')
+            f = self.parent.openFile(filename, 'r')
             try:
                 var = f.variables[self.name_in_file]
                 result = var.getValue()
@@ -512,32 +520,36 @@ class DatasetVariable(AbstractVariable):
             return result
 
         # If no partitioned axes, just read the data
-        if npart==0:
+        if npart == 0:
             filename, slicelist = partitionSlices
 
-            f = self.parent.openFile(filename,'r')
+            f = self.parent.openFile(filename, 'r')
             try:
                 var = f.variables[self.name_in_file]
-                if fci==None:
-                    result = self._returnArray(apply(var.getitem,tuple(slicelist)),0)
+                if fci is None:
+                    result = self._returnArray(
+                        var.getitem(*tuple(slicelist)),
+                        0)
                 else:
                     # If there's a forecast axis, the file doesn't know about it so
                     # don't use it in slicing data out of the file.
-                    result = self._returnArray( apply( var.getitem, \
-                                   tuple( slicelist[0:fci]+slicelist[fci+1:] ) ), \
-                                                0 )
+                    result = self._returnArray(
+                        var.getitem(
+                            *tuple(slicelist[0:fci] + slicelist[fci + 1:])),
+                                                0)
                     # But the result still needs an index in the forecast direction,
-                    # which is simple to do because there is only one forecast per file:
-                    result.resize( map(lenSlice,slicelist) )
+                    # which is simple to do because there is only one forecast
+                    # per file:
+                    result.resize(map(lenSlice, slicelist))
 
             finally:
                 f.close()
             sh = result.shape
             if 0 in sh:
-                raise CDMSError, IndexError + 'Coordinates out of Domain'
+                raise CDMSError(IndexError + 'Coordinates out of Domain')
 
         # If one partitioned axes:
-        elif npart==1:
+        elif npart == 1:
 
             npart1 = idims[0]
             resultlist = []
@@ -546,44 +558,47 @@ class DatasetVariable(AbstractVariable):
                 # If the slice is missing, interpose missing data
                 if filename is None:
                     shapelist = map(lenSlice, slicelist)
-                    chunk = numpy.ma.zeros(tuple(shapelist),self._numericType_)
+                    chunk = numpy.ma.zeros(
+                        tuple(shapelist),
+                        self._numericType_)
                     chunk[...] = numpy.ma.masked
 
                 # else read the data and close the file
                 else:
-                    f = self.parent.openFile(filename,'r')
+                    f = self.parent.openFile(filename, 'r')
                     try:
                         var = f.variables[self.name_in_file]
-                        if fci==None:
-                            chunk = apply(var.getitem,tuple(slicelist))
+                        if fci is None:
+                            chunk = var.getitem(*tuple(slicelist))
                         else:
                             # If there's a forecast axis, the file doesn't know about it so
                             # don't use it in slicing data out of the file.
-                            chunk = apply( var.getitem, \
-                                           tuple( slicelist[0:fci]+slicelist[fci+1:] ) )
+                            chunk = var.getitem(
+                                *tuple(slicelist[0:fci] + slicelist[fci + 1:]))
                             # But the chunk still needs an index in the forecast direction,
-                            # which is simple to do because there is only one forecast per file:
-                            chunk.resize( map(lenSlice,slicelist) )
+                            # which is simple to do because there is only one
+                            # forecast per file:
+                            chunk.resize(map(lenSlice, slicelist))
 
                     finally:
                         f.close()
                     sh = chunk.shape
                     if 0 in sh:
-                        raise CDMSError, 'Coordinates out of Domain'
+                        raise CDMSError('Coordinates out of Domain')
 
-                resultlist.append(self._returnArray(chunk,0))
+                resultlist.append(self._returnArray(chunk, 0))
 
             # Combine the chunks into a single array
             # Note: This works because slicelist is the same length
             # as the domain, and var.getitem returns a chunk
             # with singleton dimensions included. This means that
             # npart1 corresponds to the correct dimension of chunk.
-            result = numpy.ma.concatenate(resultlist,axis=npart1)
+            result = numpy.ma.concatenate(resultlist, axis=npart1)
             for chunk in resultlist:
                 del(chunk)
 
         # If two partitioned axes, 2-D version of previous case
-        if npart==2:
+        if npart == 2:
             npart1, npart2 = idims
 
             resultlist = []
@@ -594,42 +609,45 @@ class DatasetVariable(AbstractVariable):
                     # If the slice is missing, interpose missing data
                     if filename is None:
                         shapelist = map(lenSlice, slicelist)
-                        chunk = numpy.ma.zeros(tuple(shapelist),self._numericType_)
+                        chunk = numpy.ma.zeros(
+                            tuple(shapelist),
+                            self._numericType_)
                         chunk[...] = numpy.ma.masked
 
                     # else read the data and close the file
                     else:
-                        f = self.parent.openFile(filename,'r')
+                        f = self.parent.openFile(filename, 'r')
                         try:
                             var = f.variables[self.name_in_file]
-                            if fci==None:
-                                chunk = apply(var.getitem,tuple(slicelist))
+                            if fci is None:
+                                chunk = var.getitem(*tuple(slicelist))
                             else:
                                 # If there's a forecast axis, the file doesn't know about it so
                                 # don't use it in slicing data out of the file.
-                                chunk = apply( var.getitem, \
-                                               tuple( slicelist[0:fci]+slicelist[fci+1:] ) )
+                                chunk = var.getitem(
+                                    *tuple(slicelist[0:fci] + slicelist[fci + 1:]))
                                 # But the chunk still needs an index in the forecast direction,
-                                # which is simple to do because there is only one forecast per file:
-                                chunk.resize( map(lenSlice,slicelist) )
+                                # which is simple to do because there is only
+                                # one forecast per file:
+                                chunk.resize(map(lenSlice, slicelist))
 
                         finally:
                             f.close()
                         sh = chunk.shape
                         if 0 in sh:
-                            raise CDMSError, 'Coordinates out of Domain'
-                    chunklist.append(self._returnArray(chunk,0))
+                            raise CDMSError('Coordinates out of Domain')
+                    chunklist.append(self._returnArray(chunk, 0))
 
                 # Note: This works because slicelist is the same length
                 # as the domain, and var.getitem returns a chunk
                 # with singleton dimensions included. This means that
                 # npart1 corresponds to the correct dimension of chunk.
-                bigchunk = numpy.ma.concatenate(chunklist,axis=npart2)
+                bigchunk = numpy.ma.concatenate(chunklist, axis=npart2)
                 for chunk in chunklist:
                     del(chunk)
                 resultlist.append(bigchunk)
 
-            result = numpy.ma.concatenate(resultlist,axis=npart1)
+            result = numpy.ma.concatenate(resultlist, axis=npart1)
             for bigchunk in resultlist:
                 del(bigchunk)
 
@@ -640,16 +658,15 @@ class DatasetVariable(AbstractVariable):
 
         return result
 
+    shape = property(_getShape, None)
+# shape = _getShape
+    dtype = property(_getdtype, None)
 
-    shape = property(_getShape,None)
-##     shape = _getShape
-    dtype = property(_getdtype,None)
-    
-## PropertiedClasses.set_property (DatasetVariable, 'shape', 
-##                                   DatasetVariable._getShape, nowrite=1,
-##                                   nodelete=1)
-## PropertiedClasses.set_property (DatasetVariable, 'dtype', 
-##                                   DatasetVariable._getdtype, nowrite=1,
-##                                   nodelete=1)
+# PropertiedClasses.set_property (DatasetVariable, 'shape',
+# DatasetVariable._getShape, nowrite=1,
+# nodelete=1)
+# PropertiedClasses.set_property (DatasetVariable, 'dtype',
+# DatasetVariable._getdtype, nowrite=1,
+# nodelete=1)
 
-## internattr.add_internal_attribute(DatasetVariable, 'domain')
+# internattr.add_internal_attribute(DatasetVariable, 'domain')
diff --git a/Packages/cdms2/Lib/xlink.py b/Packages/cdms2/Lib/xlink.py
index 870b5fafd..6270a7509 100644
--- a/Packages/cdms2/Lib/xlink.py
+++ b/Packages/cdms2/Lib/xlink.py
@@ -1,9 +1,11 @@
 """
 CDMS Xlink objects - pointers to other objects
 """
+
+
 class Xlink(CdmsObj):
-    def __init__(self,xlinkNode=None):
-        assert xlinkNode is None or xlinkNode.tag=='xlink',\
-               'Node is not a link node'
-        CdmsObj.__init__(self,xlinkNode)
 
+    def __init__(self, xlinkNode=None):
+        assert xlinkNode is None or xlinkNode.tag == 'xlink',\
+            'Node is not a link node'
+        CdmsObj.__init__(self, xlinkNode)
-- 
GitLab


From 751866f6a32228f8a32432cb65af03cf3427a791 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 27 Apr 2016 09:36:48 -0700
Subject: [PATCH 037/191] begining of adressing flake8 but giving up

---
 Packages/cdms2/Lib/restApi.py       | 126 ++++------------------------
 Packages/cdms2/Lib/selectors.py     |   4 +-
 Packages/cdms2/Lib/slabinterface.py |   3 +-
 Packages/cdms2/Lib/tvariable.py     |  26 +++---
 Packages/cdms2/Lib/typeconv.py      |   2 +-
 Packages/cdms2/Lib/variable.py      |  15 +---
 Packages/cdms2/Lib/xlink.py         |  11 ---
 7 files changed, 32 insertions(+), 155 deletions(-)
 delete mode 100644 Packages/cdms2/Lib/xlink.py

diff --git a/Packages/cdms2/Lib/restApi.py b/Packages/cdms2/Lib/restApi.py
index 0ee17424d..159d50112 100644
--- a/Packages/cdms2/Lib/restApi.py
+++ b/Packages/cdms2/Lib/restApi.py
@@ -1,4 +1,3 @@
-import cdms2
 import urllib2
 import xml.etree.ElementTree
 try:
@@ -173,7 +172,7 @@ class esgfConnection(object):
         return val
 
     def __setitem__(self, key, value):
-        if not key in self.params.keys():
+        if key not in self.params.keys():
             raise self.EsgfObjectException(
                 "Invalid key: %s, valid keys are: %s" %
                 (repr(key), repr(self.params.keys())))
@@ -183,7 +182,7 @@ class esgfConnection(object):
     def _search(self, search="", searchType=None, stringType=False):
         if searchType is None:
             searchType = self.defaultSearchType
-        if not searchType in self.validSearchTypes:
+        if searchType not in self.validSearchTypes:
             raise self.EsgfObjectException(
                 "Valid Search types are: %s" %
                 repr(self.validSearchTypes))
@@ -226,14 +225,8 @@ class esgfConnection(object):
         # params[k]=self[k]
 
         for k in keys.keys():
-            if k == "stringType":
-                stringType = keys[k]
+            if k in ["stringType", "type"]:
                 continue
-            elif k == "type":
-                continue
-            # elif not k in self.searchableKeys:
-            # raise self.EsgfObjectException("Invalid key: %s, valid keys are:
-            # %s" % (repr(k),repr(self.params.keys())))
             if keys[k] is not None:
                 params[k] = keys[k]
 
@@ -309,23 +302,18 @@ class esgfConnection(object):
         resps = self.request(**keys)
         stringType = keys.get("stringType", False)
         if stringType:
-            return resp
+            return resps
         datasets = []
         for resp in resps:
             for r in resp[:]:
                 if r.tag == "result":
                     # Ok let's go thru these datasets
                     for d in r[:]:
-                        # print
-                        # "************************************************"
                         tmpkeys = {}
                         for f in d[:]:
                             k = f.get("name")
                             tmpkeys[k] = self.extractTag(f)
                         if tmpkeys["type"] == "Dataset":
-                            datasetid = tmpkeys["id"]
-                            # print datasetid,self.restPath
-                            # print "KEYS FOR DATASET",keys.keys()
                             datasets.append(
                                 esgfDataset(host=self.host,
                                             port=self.port,
@@ -364,7 +352,7 @@ class esgfDataset(esgfConnection):
                     tmp.replace(")s", ")"))
             elif "project" in keys and keys["project"] == "cmip5":
                 self.datasetids = genutil.StringConstructor(
-                    "%(project).%(product).%(institute).%(model).%(experiment).%(time_frequency).%(realm).%(cmor_table).%(ensemble)")
+                    "%(project).%(product).%(institute).%(model).%(experiment).%(time_frequency).%(realm).%(cmor_table).%(ensemble)")  # noqa
             else:
                 self.datasetids = None
         if isinstance(datasetids, genutil.StringConstructor):
@@ -393,38 +381,16 @@ class esgfDataset(esgfConnection):
         self.keys = self.params.keys
         self.items = self.params.items
         self.values = self.params.values
-        # self.id=self["id"]
         self.params["limit"] = limit
         self.params["offset"] = offset
         self.mapping = mapping
-        # print "SEARCHING DS:",originalKeys
         self.resp = None
         self.cacheTime = None
-#        self.search()
-#        self.remap()
-
-        # Ok now we need to "map" this according to the user wishes
-
-    # def mappedItems():
-    # mapped=[]
-    # mapppoint=self.mapped
-    # for k in self.mapping.keys():
-    # keys=[]
-    # level=[k,mappoint.keys()]
-    # mappoint
+
     def _extractFiles(self, resp, **inKeys):
         # We need to stick in there the bit from Luca to fill in the matching
         # key from facet for now it's empty
         files = []
-        skipped = [
-            "type",
-            "title",
-            "timestamp",
-            "service",
-            "id",
-            "score",
-            "file_url",
-            "service_type"]
         for r in resp[:]:
             if r.tag == "result":
                 for d in r[:][:]:
@@ -433,66 +399,6 @@ class esgfDataset(esgfConnection):
                         k = f.get("name")
                         keys[k] = self.extractTag(f)
                     if keys["type"] == "File":
-                        # if self["id"]=="obs4MIPs.NASA-JPL.AIRS.mon":
-                        # verbose=True
-                        # else:
-                        # verbose=False
-                        # verbose=True
-                        # if verbose: print "OK",keys["variable"],keys["file_id"],self["id"]
-                        # if verbose: print "FILEIDS:",self.fileids
-                        # if verbose: print "Fileids:",self.fileids.template
-                        # if verbose: print "keys:",keys
-                        # if self.fileids is not None:
-                        # try:
-                        # if verbose: print "file:",keys["file_id"],self.fileids.template
-                        # k2 = self.fileids.reverse(keys["file_id"])
-                        # if verbose: print "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",k2
-                        # for k in k2.keys():
-                        # keys[k]=k2[k]
-                        # except:
-                        # if verbose: print "Failed:",ids[i].text,self.fileids.template
-                        # pass
-                        # if verbose: print "KEYS FOR FILE:",keys.keys()
-                        # if verbose: print "INKEYS:",inKeys.keys()
-                        # matched = True
-                        # matchWithKeys = {}
-                        # for k in self.keys():
-                        # if k in self.originalKeys.keys():
-                        # matchWithKeys[k]=self.originalKeys[k]
-                        # else:
-                        # matchWithKeys[k]=self[k]
-                        # for s in skipped:
-                        # try:
-                        # matchWithKeys.pop(s)
-                        # except:
-                        # pass
-                        # for k in inKeys.keys():
-                        # matchWithKeys[k]=inKeys[k]
-                        # if verbose: print "matching:",matchWithKeys.keys()
-                        # for k in keys.keys():
-                        # if k in matchWithKeys.keys():
-                        # if verbose: print "Testing:",k,keys[k]
-                        # v = matchWithKeys[k]
-                        # if isinstance(v,(str,int,float)):
-                        # if verbose: print "\tComparing with:",v
-                        # if v != keys[k]:
-                        # matched = False
-                        # if verbose: print "\t\tNOPE"
-                        # break
-                        # elif isinstance(v,list):
-                        # if verbose: print "\tComparing with (and %i more):%s"%(len(v),v[0]),v
-                        # if not keys[k] in v:
-                        # matched = False
-                        # if verbose: print "\t\tNOPE"
-                        # break
-                        # else:
-                        # print "\twould compare %s with type: %s if I knew how to" % (str(v),type(v))
-                        # if verbose: print keys["file_id"],matched
-                        # if matched :
-                        # for k in self.keys():
-                        # if not k in keys.keys():
-                        # keys[k]=self[k]
-                        # print "KEYS:",keys
                         files.append(esgfFile(**keys))
         return files
 
@@ -514,7 +420,7 @@ class esgfDataset(esgfConnection):
         if os.path.isdir(target):
             target = os.path.join(target, "esgfDatasetsCache.pckl")
         if os.path.exists(target):
-            f = open(source)
+            f = open(target)
             # dict=eval(bz2.decompress(f.read()))
             dict = eval(f.read())
             f.close()
@@ -560,9 +466,9 @@ class esgfDataset(esgfConnection):
         stringType = keys.get("stringType", False)
         keys.update(self.originalKeys)
         st = ""
-        if not "limit" in keys:
+        if "limit" not in keys:
             keys["limit"] = [self["limit"]]
-        if not "offset" in keys:
+        if "offset" not in keys:
             keys["offset"] = [self["offset"]]
         for k in keys:
             if k in ["searchString", "stringType", ]:
@@ -615,7 +521,8 @@ class esgfFiles(object):
         self.setMapping(mapping)
         self.remap()
         self.projects_dict = {
-            "CMIP5": "%(project).%(product).%(institute).%(model).%(experiment).%(time_frequency).%(realm).%(cmor_table).%(ensemble)"}
+            "CMIP5": "%(project).%(product).%(institute).%(model).%(experiment).%(time_frequency).%(realm).%(cmor_table).%(ensemble)"  # noqa
+            }
 
     def __getitem__(self, item):
         if isinstance(item, int):
@@ -654,7 +561,7 @@ class esgfFiles(object):
                 self.mapping = self.datasetids
             else:
                 for k in self.parent.keys():
-                    if not k in ["limit", "offset", "text"]:
+                    if k not in ["limit", "offset", "text"]:
                         self.mapping += "%%(%s)" % k
         else:
             self.mapping = mapping
@@ -731,24 +638,21 @@ class esgfFiles(object):
                     cont = f[k]
                     if not isinstance(cont, (str, int, float)):
                         break
-                    if not cont in mappoint.keys():
+                    if cont not in mappoint.keys():
                         mappoint[cont] = {}
                 elif k in self.parent.keys():
                     # if verbose: print tabs,k,f[k]
                     nok += 1
                     cont = self[k]
-                    if not cont in mappoint.keys():
+                    if cont not in mappoint.keys():
                         mappoint[cont] = {}
                 elif isinstance(self.fileids, genutil.StringConstructor):
                     try:
                         mapid = self.fileids.reverse(self.parent.id)
-                        # if verbose:
-                        # print "MAPID:",k,mapid
                         if k in mapid.keys():
-                        # if verbose: print tabs,k,mapid[k]
                             nok += 1
                             cont = mapid[k]
-                            if not cont in mappoint.keys():
+                            if cont not in mappoint.keys():
                                 mappoint[cont] = {}
                     except:
                         break
diff --git a/Packages/cdms2/Lib/selectors.py b/Packages/cdms2/Lib/selectors.py
index 2a35705d1..9ec6c6721 100644
--- a/Packages/cdms2/Lib/selectors.py
+++ b/Packages/cdms2/Lib/selectors.py
@@ -1,6 +1,5 @@
 
 """Classes to support easy selection of climate data"""
-import cdtime
 from .axis import axisMatches
 from .error import CDMSError
 from .grid import AbstractRectGrid, defaultRegion, setRegionSpecs, LongitudeType, LatitudeType, TimeType, VerticalType
@@ -203,7 +202,7 @@ class Selector:
            grid is not None or \
            raw != 0 or \
            result is variable:
-     # result is variable when there are no components, for example.
+            # result is variable when there are no components, for example.
             return result.subRegion(squeeze=squeeze, order=order, grid=grid,
                                     raw=raw)
         else:
@@ -371,7 +370,6 @@ class positionalComponent (SelectorComponent):
 
     def specify(self, slab, axes, specifications, confined_by, aux):
         "Find the next unconfined axis and confine it."
-        n = 0
         for i in range(len(axes)):
             if confined_by[i] is None:
                 specifications[i] = self.v
diff --git a/Packages/cdms2/Lib/slabinterface.py b/Packages/cdms2/Lib/slabinterface.py
index f12738ee7..a0fc8910e 100644
--- a/Packages/cdms2/Lib/slabinterface.py
+++ b/Packages/cdms2/Lib/slabinterface.py
@@ -95,7 +95,7 @@ class Slab:
         a = self.getAxis(dim)
         result = []
         for x in std_axis_attributes + a.attributes.keys():
-            if not x in result:
+            if x not in result:
                 result.append(x)
         return result
 
@@ -192,7 +192,6 @@ class Slab:
 def cdms_bounds2cu_bounds(b):
     "Bounds are  len(v) by 2 in cdms but len(v)+1 in cu"
     cub = numpy.ma.zeros(len(b) + 1, numpy.float32)
-    b1 = b.astype(numpy.float32)
     if len(b) > 1:
         if (b[0, 0] < b[0, 1]) == (b[0, 0] < b[-1, 0]):
             cub[0] = b[0, 0]
diff --git a/Packages/cdms2/Lib/tvariable.py b/Packages/cdms2/Lib/tvariable.py
index 9ebcca9c6..0a2b3cdd5 100644
--- a/Packages/cdms2/Lib/tvariable.py
+++ b/Packages/cdms2/Lib/tvariable.py
@@ -43,14 +43,14 @@ def fromJSON(jsn):
                         dtype=a["_dtype"]),
             id=a["id"])
         for k, v in a.iteritems():
-            if not k in ["_values", "id", "_dtype"]:
+            if k not in ["_values", "id", "_dtype"]:
                 setattr(ax, k, v)
         axes.append(ax)
     # Now prep the variable
     V = createVariable(D["_values"], id=D["id"], typecode=D["_dtype"])
     V.setAxisList(axes)
     for k, v in D.iteritems():
-        if not k in ["id", "_values", "_axes", "_grid", "_fill_value", "_dtype", ]:
+        if k not in ["id", "_values", "_axes", "_grid", "_fill_value", "_dtype", ]:
             setattr(V, k, v)
     V.set_fill_value(D["_fill_value"])
     return V
@@ -103,12 +103,10 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
         try:
             for nm, val in obj.__dict__.items():
                 if nm[0] == '_':
-# print nm
                     pass
-# self.__dict__[nm]=val
                 else:
                     setattr(self, nm, val)
-        except Exception as err:
+        except Exception:
             pass
         id = getattr(self, 'id', None)
         if id is None:
@@ -193,14 +191,12 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
                     grid = grid.reconcile(
                         axes)  # Make sure grid and axes are consistent
 
-        ncopy = (copy != 0)
-
         # Initialize the geometry
         if grid is not None:
             copyaxes = 0                  # Otherwise grid axes won't match domain.
         if axes is not None:
             self.initDomain(axes, copyaxes=copyaxes)
-                            # Note: clobbers the grid, so set the grid after.
+        # Note: clobbers the grid, so set the grid after.
         if grid is not None:
             self.setGrid(grid)
 
@@ -277,7 +273,7 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
         if mask is None:
             try:
                 mask = data.mask
-            except Exception as err:
+            except Exception:
                 mask = numpy.ma.nomask
 
         # Handle the case where ar[i:j] returns a single masked value
@@ -359,7 +355,7 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
     def getDomain(self):
         for i in range(self.rank()):
             if self.__domain[i] is None:
-                junk = self.getAxis(i)  # will force a fill in
+                self.getAxis(i)  # will force a fill in
         return self.__domain
 
     def getAxis(self, n):
@@ -442,7 +438,7 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
         maresult = numpy.ma.MaskedArray.astype(self, tc)
         return TransientVariable(
             maresult, copy=0, axes=self.getAxisList(), fill_value=self.fill_value,
-                                 attributes=self.attributes, id=self.id, grid=self.getGrid())
+            attributes=self.attributes, id=self.id, grid=self.getGrid())
 
     def setMaskFromGridMask(self, mask, gridindices):
         """Set the mask for self, given a grid mask and the variable domain
@@ -626,12 +622,11 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
         sphereRadius: radius of the earth
         maxElev: maximum elevation for representation on the sphere
         """
-        from . import mvSphereMesh
         from . import mvVTKSGWriter
         from . import mvVsWriter
         try:
             # required by mvVsWriter
-            import tables
+            import tables  # noqa
         except:
             # fall back
             format = 'VTK'
@@ -739,8 +734,7 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
                     # given direction, a 1 represents a layer of
                     # thickness ghostWidth on the high index side,
                     # -1 on the low index side.
-                    winId = tuple([0 for i in range(dim)]
-                                  + [drect] +
+                    winId = tuple([0 for i in range(dim)] + [drect] +
                                   [0 for i in range(dim + 1, ndims)])
 
                     slce = slice(0, ghostWidth)
@@ -832,7 +826,7 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
         """
         ndims = len(self.shape)
 
-        slab = [ slice(0, None) for i in range(dim) ] \
+        slab = [slice(0, None) for i in range(dim)] \
             + [slce] + \
             [slice(0, None) for i in range(dim + 1, ndims)]
         return tuple(slab)
diff --git a/Packages/cdms2/Lib/typeconv.py b/Packages/cdms2/Lib/typeconv.py
index 541785877..e63ad64d3 100644
--- a/Packages/cdms2/Lib/typeconv.py
+++ b/Packages/cdms2/Lib/typeconv.py
@@ -1,6 +1,6 @@
+import numpy as np
 __all__ = ['oldtype2dtype', 'convtypecode', 'convtypecode2', 'oldtypecodes']
 
-import numpy as np
 
 oldtype2dtype = {'1': np.dtype(np.byte),
                  's': np.dtype(np.short),
diff --git a/Packages/cdms2/Lib/variable.py b/Packages/cdms2/Lib/variable.py
index f271acc1d..c96dd5e21 100644
--- a/Packages/cdms2/Lib/variable.py
+++ b/Packages/cdms2/Lib/variable.py
@@ -3,17 +3,13 @@
 """
 DatasetVariable: Dataset-based variables
 """
-from cdms2 import Cdunif
 import numpy
 from . import cdmsNode
 import cdtime
 import copy
-import os
-import sys
-from . import cdmsobj
-from .cdmsobj import CdmsObj, getPathFromTemplate, Max32int
+from .cdmsobj import getPathFromTemplate, Max32int
 from .avariable import AbstractVariable
-from .sliceut import *
+from .sliceut import *  # noqa
 from .error import CDMSError
 
 InvalidGridElement = "Grid domain elements are not yet implemented: "
@@ -335,10 +331,8 @@ class DatasetVariable(AbstractVariable):
             if hasattr(axis, 'partition'):
                 npart = npart + 1
                 if npart == 1:
-                    part1 = axis
                     npart1 = ndim
                 elif npart == 2:
-                    part2 = axis
                     npart2 = ndim
                 else:
                     raise CDMSError(TooManyPartitions + variable.id)
@@ -476,7 +470,7 @@ class DatasetVariable(AbstractVariable):
 
         # Handle negative slices
         revlist = []
-            # Slices to apply to result if reversals needed
+        # Slices to apply to result if reversals needed
         slist = []                      # Slices with positive strides
         haveReversals = 0               # True iff result array needs reversing
         i = 0
@@ -500,7 +494,6 @@ class DatasetVariable(AbstractVariable):
         for i in range(len(self.domain)):
             if self.domain[i][0].isForecast():
                 fci = i
-                fcv = initslist[i].start
                 break
 
         # If no intersection, return an 'empty' array.
@@ -536,7 +529,7 @@ class DatasetVariable(AbstractVariable):
                     result = self._returnArray(
                         var.getitem(
                             *tuple(slicelist[0:fci] + slicelist[fci + 1:])),
-                                                0)
+                        0)
                     # But the result still needs an index in the forecast direction,
                     # which is simple to do because there is only one forecast
                     # per file:
diff --git a/Packages/cdms2/Lib/xlink.py b/Packages/cdms2/Lib/xlink.py
deleted file mode 100644
index 6270a7509..000000000
--- a/Packages/cdms2/Lib/xlink.py
+++ /dev/null
@@ -1,11 +0,0 @@
-"""
-CDMS Xlink objects - pointers to other objects
-"""
-
-
-class Xlink(CdmsObj):
-
-    def __init__(self, xlinkNode=None):
-        assert xlinkNode is None or xlinkNode.tag == 'xlink',\
-            'Node is not a link node'
-        CdmsObj.__init__(self, xlinkNode)
-- 
GitLab


From 995fa79e87d50986eb3bc5a976d0c47d3186239a Mon Sep 17 00:00:00 2001
From: Sam Fries <samuelbfries@gmail.com>
Date: Thu, 28 Apr 2016 10:08:15 -0700
Subject: [PATCH 038/191] Update VTKPlots.py

---
 Packages/vcs/vcs/VTKPlots.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Packages/vcs/vcs/VTKPlots.py b/Packages/vcs/vcs/VTKPlots.py
index 4d870cd15..8cfe83a28 100644
--- a/Packages/vcs/vcs/VTKPlots.py
+++ b/Packages/vcs/vcs/VTKPlots.py
@@ -755,7 +755,10 @@ class VTKVCSBackend(object):
                 plot.onClosing(cell)
 
     def plotContinents(self, wc, projection, wrap, vp, priority, **kargs):
-        contData = vcs2vtk.prepContinents(self.canvas._continentspath())
+        continents_path = self.canvas._continentspath()
+        if continents_path is None:
+            return (None, 1, 1)
+        contData = vcs2vtk.prepContinents(continents_path)
         contMapper = vtk.vtkPolyDataMapper()
         contMapper.SetInputData(contData)
         contActor = vtk.vtkActor()
-- 
GitLab


From 6ad67a3f9dcfa3b10cb1579b9a17087a1fbf55fe Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Thu, 28 Apr 2016 14:14:37 -0700
Subject: [PATCH 039/191] Added test

---
 testing/vcs/CMakeLists.txt            |  8 +++++-
 testing/vcs/test_vcs_no_continents.py | 38 +++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 testing/vcs/test_vcs_no_continents.py

diff --git a/testing/vcs/CMakeLists.txt b/testing/vcs/CMakeLists.txt
index a5faf6e24..7024dd66a 100644
--- a/testing/vcs/CMakeLists.txt
+++ b/testing/vcs/CMakeLists.txt
@@ -1016,13 +1016,19 @@ cdat_add_test(test_vcs_init_open_sizing
   "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_init_open_sizing.py
 )
-# Rename baseline
+## Rename baseline
 cdat_add_test(test_vcs_matplotlib_colormap
   "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_matplotlib_colormap.py
   ${BASELINE_DIR}/test_vcs_matplotlib_colormap.png
 )
 
+cdat_add_test(test_vcs_no_continents
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_no_continents.py
+  ${BASELINE_DIR}/test_vcs_no_continents.png
+)
+
 
 add_subdirectory(vtk_ui)
 add_subdirectory(editors)
diff --git a/testing/vcs/test_vcs_no_continents.py b/testing/vcs/test_vcs_no_continents.py
new file mode 100644
index 000000000..03630d457
--- /dev/null
+++ b/testing/vcs/test_vcs_no_continents.py
@@ -0,0 +1,38 @@
+import cdms2
+import os
+import sys
+import vcs
+
+# Load the clt data:
+dataFile = cdms2.open(os.path.join(vcs.sample_data, "clt.nc"))
+clt = dataFile("clt")
+clt = clt(latitude=(-90.0, 90.0), longitude=(-180., 175.), squeeze=1,
+          time=('1979-1-1 0:0:0.0', '1988-12-1 0:0:0.0'))
+
+# Initialize canvas:
+canvas = vcs.init()
+canvas.setantialiasing(0)
+canvas.setbgoutputdimensions(1200,1091,units="pixels")
+canvas.drawlogooff()
+
+t1 = vcs.createtemplate()
+t1.scale(.5, "y")
+t1.move(-.15, "y")
+t2 = vcs.createtemplate(source=t1.name)
+t2.move(.5, 'y')
+
+canvas.plot(clt, t1, continents=0, bg=True)
+canvas.plot(clt, t2, continents=1, bg=True)
+
+# Load the image testing module:
+testingDir = os.path.join(os.path.dirname(__file__), "..")
+sys.path.append(testingDir)
+import checkimage
+
+# Create the test image and compare:
+baseline = sys.argv[1]
+testFile = "test_vcs_no_continents.png"
+canvas.png(testFile)
+ret = checkimage.check_result_image(testFile, baseline,
+                                    checkimage.defaultThreshold)
+sys.exit(ret)
-- 
GitLab


From 9e3f9eeed01503090890e4ee9f3b9a3e52768a4d Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Mon, 9 May 2016 15:42:19 -0700
Subject: [PATCH 040/191] Fixed failing baselines

---
 Packages/vcs/vcs/boxfill.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Packages/vcs/vcs/boxfill.py b/Packages/vcs/vcs/boxfill.py
index e17145437..4003606c9 100755
--- a/Packages/vcs/vcs/boxfill.py
+++ b/Packages/vcs/vcs/boxfill.py
@@ -767,8 +767,8 @@ class Gfb(object):
         if dx == 0:
             high_end += .00001
             return [low_end, high_end]
-
-        contourLevels = numpy.arange(low_end, high_end + dx, dx)
+        float_epsilon = numpy.finfo(numpy.float32).eps
+        contourLevels = numpy.arange(low_end, high_end + float_epsilon, dx)
 
         return contourLevels
 
@@ -788,9 +788,10 @@ class Gfb(object):
                 return vcs.mklabels(scale)
             else:
                 # Create our own scale
-                dx = (self.level_2 - self.level_1) / float(len(scale))
+                dx = (self.level_2 - self.level_1) / float(len(scale) - 1)
                 real_values = [self.level_1, self.level_2]
-                levels = numpy.arange(levels[0], levels[-1] + dx, dx)
+                float_epsilon = numpy.finfo(numpy.float32).eps
+                levels = numpy.arange(levels[0], levels[-1] + float_epsilon, dx)
         else:
             real_values = levels
 
-- 
GitLab


From 08d3eba0f2ae9230343f4838ec8db1ab09a67c4b Mon Sep 17 00:00:00 2001
From: Dan Lipsa <dan.lipsa@kitware.com>
Date: Fri, 22 Apr 2016 11:52:46 -0400
Subject: [PATCH 041/191] ENH #1881: Add plot_based_dual_grid option to plot().

Traditionally, we created a point or cell dataset based on the plot requested.
For isofill, isoline and vector we created point datasets, for boxfill and meshfill we
created cell datasets. We keep this behavior for backward compatibility but we
add a parameter plot_based_dual_grid to plot(). If this parameter is missing or it is
True, we have the traditional behavior. If this parameter is False, we create the
dataset that is specified in the file, regardless of the plot requested.
---
 Packages/cdms2/Lib/avariable.py             |  15 +-
 Packages/cdms2/Lib/axis.py                  |  97 +++++--
 Packages/cdms2/Lib/tvariable.py             |   5 +-
 Packages/vcs/vcs/Canvas.py                  |   6 +-
 Packages/vcs/vcs/vcs2vtk.py                 | 274 +++++++-------------
 Packages/vcs/vcs/vcsvtk/boxfillpipeline.py  |   6 +-
 Packages/vcs/vcs/vcsvtk/isofillpipeline.py  |  27 +-
 Packages/vcs/vcs/vcsvtk/isolinepipeline.py  |  32 +--
 Packages/vcs/vcs/vcsvtk/meshfillpipeline.py |  11 +-
 Packages/vcs/vcs/vcsvtk/pipeline2d.py       |  55 +++-
 Packages/vcs/vcs/vcsvtk/vectorpipeline.py   |  33 ++-
 11 files changed, 260 insertions(+), 301 deletions(-)

diff --git a/Packages/cdms2/Lib/avariable.py b/Packages/cdms2/Lib/avariable.py
index dd2a2792d..f15d7a069 100644
--- a/Packages/cdms2/Lib/avariable.py
+++ b/Packages/cdms2/Lib/avariable.py
@@ -363,6 +363,16 @@ class AbstractVariable(CdmsObj, Slab):
             if axisMatches(self.getAxis(i), axis_spec):
                 return i
         return -1
+    
+    def hasCellData(self):
+        '''
+        If any of the variable's axis has explicit bounds, we have cell data
+        otherwise we have point data.
+        '''
+        for axis in self.getAxisList():
+            if (axis.getExplicitBounds() is not None):
+                return True
+        return False
 
     def getAxisListIndex (self, axes=None, omit=None, order=None):
         """Return a list of indices of axis objects;
@@ -511,7 +521,6 @@ class AbstractVariable(CdmsObj, Slab):
                 
         return result
 
-
     # Get an order string, such as "tzyx"
     def getOrder(self, ids=0):
         """getOrder(ids=0) returns the order string, such as tzyx.
@@ -915,7 +924,9 @@ class AbstractVariable(CdmsObj, Slab):
                 else:
                     delta_beg_wrap_dimvalue = ncyclesrev*cycle
 
-                axis.setBounds(axis.getBounds() - delta_beg_wrap_dimvalue)
+                isGeneric = [False]
+                b = axis.getBounds(isGeneric) - delta_beg_wrap_dimvalue
+                axis.setBounds(b, isGeneric=isGeneric[0])
                 
                 axis[:]= (axis[:] - delta_beg_wrap_dimvalue).astype(axis.typecode())
 
diff --git a/Packages/cdms2/Lib/axis.py b/Packages/cdms2/Lib/axis.py
index 703c0e938..209fbda42 100644
--- a/Packages/cdms2/Lib/axis.py
+++ b/Packages/cdms2/Lib/axis.py
@@ -105,8 +105,8 @@ def getAutoBounds():
     return _autobounds
 
 # Create a transient axis
-def createAxis(data, bounds=None, id=None, copy=0):
-    return TransientAxis(data, bounds, id, copy=copy)
+def createAxis(data, bounds=None, id=None, copy=0, genericBounds=False):
+    return TransientAxis(data, bounds=bounds, id=id, copy=copy, genericBounds=genericBounds)
 
 # Generate a Gaussian latitude axis, north-to-south
 def createGaussianAxis(nlat):
@@ -959,13 +959,41 @@ class AbstractAxis(CdmsObj):
     def isLinear(self):
         raise CDMSError, MethodNotImplemented
 
-    def getBounds(self):
+    def getBounds(self, isGeneric=None):
+        '''
+        isGeneric is a list with one boolean which says if the bounds
+        are read from file (False) or generated (True)
+        '''
         raise CDMSError, MethodNotImplemented
 
-    # Return None if not explicitly defined
     def getExplicitBounds(self):
+        '''
+        Return None if not explicitly defined
+        This is a way to determine if attributes are defined at cell
+        or at point level. If this function returns None attributes are
+        defined at points, otherwise they are defined at cells
+        '''
         raise CDMSError, MethodNotImplemented
 
+    def getBoundsForDualGrid(self, dualGrid):
+        '''
+        dualGrid changes the type of dataset from the current type to the dual.
+        So, if we have a point dataset we switch to a cell dataset and viceversa.
+        '''
+        explicitBounds = self.getExplicitBounds()
+        if (explicitBounds is None):
+            # point data
+            if (dualGrid):
+                return self.getBounds()
+            else:
+                return None
+        else:
+            # cell data
+            if (dualGrid):
+                return None
+            else:
+                return explicitBounds
+
     def setBounds(self, bounds):
         raise CDMSError, MethodNotImplemented
 
@@ -1279,7 +1307,8 @@ class AbstractAxis(CdmsObj):
         The stride k can be positive or negative. Wraparound is
         supported for longitude dimensions or those with a modulus attribute.
         """
-        fullBounds = self.getBounds()
+        isGeneric = [False]
+        fullBounds = self.getBounds(isGeneric)
         _debug=0
         _debugprefix="SS__XX subaxis "
         
@@ -1359,7 +1388,7 @@ class AbstractAxis(CdmsObj):
             else:
                 bounds = None
         
-        newaxis = TransientAxis(data, bounds, id=self.id, copy=1)
+        newaxis = TransientAxis(data, bounds, id=self.id, copy=1, genericBounds=isGeneric[0])
 
         if self.isLatitude(): newaxis.designateLatitude()
         if self.isLongitude(): newaxis.designateLongitude()
@@ -1440,17 +1469,18 @@ class AbstractAxis(CdmsObj):
         """clone (self, copyData=1)
         Return a copy of self as a transient axis.
         If copyData is 1, make a separate copy of the data."""
-        b = self.getBounds()
+        isGeneric = [False]
+        b = self.getBounds(isGeneric)
         if copyData==1:
             mycopy = createAxis(copy.copy(self[:]))
         else:
             mycopy = createAxis(self[:])
         mycopy.id = self.id
         try:
-            mycopy.setBounds(b)
+            mycopy.setBounds(b, isGeneric=isGeneric[0])
         except CDMSError:
             b = mycopy.genGenericBounds()
-            mycopy.setBounds(b)
+            mycopy.setBounds(b, isGeneric=False)
         for k, v in self.attributes.items():
            setattr(mycopy, k, v)
         return mycopy
@@ -1570,7 +1600,13 @@ class Axis(AbstractAxis):
         return self._node_.dataRepresent==cdmsNode.CdLinear
 
     # Return the bounds array, or generate a default if autoBounds mode is on
-    def getBounds(self):
+    def getBounds(self, isGeneric=None):
+        '''
+        If isGeneric is a list with one element, we set its element to True if the
+        bounds were generated and False if bounds were read from the file.
+        '''
+        if (isGeneric):
+            isGeneric[0] = False
         boundsArray = self.getExplicitBounds()
         try:
             self.validateBounds(boundsArray)
@@ -1578,6 +1614,8 @@ class Axis(AbstractAxis):
             boundsArray = None
         abopt = getAutoBounds()
         if boundsArray is None and (abopt==1 or (abopt==2 and (self.isLatitude() or self.isLongitude()))) :
+            if (isGeneric):
+                isGeneric[0] = True
             boundsArray = self.genGenericBounds()
             
         return boundsArray
@@ -1609,7 +1647,10 @@ class Axis(AbstractAxis):
 # In-memory coordinate axis
 class TransientAxis(AbstractAxis):
     axis_count = 0
-    def __init__(self, data, bounds=None, id=None, attributes=None, copy=0):
+    def __init__(self, data, bounds=None, id=None, attributes=None, copy=0, genericBounds=False):
+        '''
+        genericBounds specify if bounds were generated (True) or read from a file (False)
+        '''
         AbstractAxis.__init__(self, None, None)
         if id is None:
             TransientAxis.axis_count = TransientAxis.axis_count + 1
@@ -1646,7 +1687,8 @@ class TransientAxis(AbstractAxis):
             self._data_ = numpy.array(data)
 
         self._doubledata_ = None
-        self.setBounds(bounds)
+        self._genericBounds_ = genericBounds
+        self.setBounds(bounds, isGeneric=genericBounds)
 
     def __getitem__(self, key):
         return self._data_[key]
@@ -1663,10 +1705,15 @@ class TransientAxis(AbstractAxis):
     def __len__(self):
         return len(self._data_)
 
-    def getBounds(self):
+    def getBounds(self, isGeneric=None):
+        if (isGeneric):
+            isGeneric[0] = self._genericBounds_
         if self._bounds_ is not None:
             return copy.copy(self._bounds_)
         elif (getAutoBounds()==1 or (getAutoBounds()==2 and (self.isLatitude() or self.isLongitude()))):
+            if (isGeneric):
+                isGeneric[0] = True
+            self._genericBounds_ = True
             return self.genGenericBounds()
         else:
             return None
@@ -1675,14 +1722,17 @@ class TransientAxis(AbstractAxis):
         return self._data_
 
     def getExplicitBounds(self):
-        return copy.copy(self._bounds_)
+        if (self._genericBounds_):
+            return None
+        else:
+            return copy.copy(self._bounds_)
 
     # Set bounds. The persistent argument is for compatibility with
     # persistent versions, is ignored. Same for boundsid and index.
     #
     # mf 20010308 - add validate key word, by default do not validate
-    #
-    def setBounds(self, bounds, persistent=0, validate=0, index=None, boundsid=None):
+    # isGeneric is False if bounds were generated, True if they were read from a file
+    def setBounds(self, bounds, persistent=0, validate=0, index=None, boundsid=None, isGeneric=False):
         if bounds is not None:
             if isinstance(bounds, numpy.ma.MaskedArray):
                 bounds = numpy.ma.filled(bounds)
@@ -1700,9 +1750,11 @@ class TransientAxis(AbstractAxis):
                     bounds2[:,1]=bounds[1::]
                     bounds=bounds2
             self._bounds_ = copy.copy(bounds)
+            self._genericBounds_ = isGeneric
         else:
             if (getAutoBounds()==1 or (getAutoBounds()==2 and (self.isLatitude() or self.isLongitude()))):
                 self._bounds_ = self.genGenericBounds()
+                self._genericBounds_ = True
             else:
                 self._bounds_ = None
 
@@ -1745,7 +1797,7 @@ class TransientVirtualAxis(TransientAxis):
         "Return true iff coordinate values are implicitly defined."
         return 1
 
-    def setBounds(self, bounds):
+    def setBounds(self, bounds, isGeneric=False):
         "No boundaries on virtual axes"
         self._bounds_ = None
 
@@ -1953,13 +2005,19 @@ class FileAxis(AbstractAxis):
         return 0                        # All file axes are vector representation
 
     # Return the bounds array, or generate a default if autobounds mode is set
-    def getBounds(self):
+    # If isGeneric is a list with one element, we set its element to True if the
+    # bounds were generated and False if bounds were read from the file.
+    def getBounds(self, isGeneric=None):
+        if (isGeneric):
+            isGeneric[0] = False
         boundsArray = self.getExplicitBounds()
         try:
             boundsArray = self.validateBounds(boundsArray)
         except Exception,err:
             boundsArray = None
         if boundsArray is None and (getAutoBounds()==1 or (getAutoBounds()==2 and (self.isLatitude() or self.isLongitude()))):
+            if (isGeneric):
+                isGeneric[0] = True
             boundsArray = self.genGenericBounds()
             
         return boundsArray
@@ -1989,7 +2047,8 @@ class FileAxis(AbstractAxis):
     # index in the extended dimension (default is index=0).
     # If the bounds variable is new, use the name boundsid, or 'bounds_<varid>'
     # if unspecified.
-    def setBounds(self, bounds, persistent=0, validate=0, index=None, boundsid=None):
+    # isGeneric is only used for TransientAxis
+    def setBounds(self, bounds, persistent=0, validate=0, index=None, boundsid=None, isGeneric=False):
         if persistent:
             if index is None:
                 if validate:
diff --git a/Packages/cdms2/Lib/tvariable.py b/Packages/cdms2/Lib/tvariable.py
index 27cab8156..152875adf 100644
--- a/Packages/cdms2/Lib/tvariable.py
+++ b/Packages/cdms2/Lib/tvariable.py
@@ -384,8 +384,9 @@ class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
         if n < 0: n = n + self.rank()
         if not isinstance(axis, AbstractAxis):
             raise CDMSError,"copydimension, other not an axis."
-        b = axis.getBounds()
-        mycopy = createAxis(axis[:], b)
+        isGeneric = [False]
+        b = axis.getBounds(isGeneric)
+        mycopy = createAxis(axis[:], b, genericBounds=isGeneric[0])
         mycopy.id = axis.id
         for k, v in axis.attributes.items():
            setattr(mycopy, k, v)
diff --git a/Packages/vcs/vcs/Canvas.py b/Packages/vcs/vcs/Canvas.py
index d98270c55..cee91f99d 100644
--- a/Packages/vcs/vcs/Canvas.py
+++ b/Packages/vcs/vcs/Canvas.py
@@ -2333,7 +2333,11 @@ Options:::
                                                     # bunch of plots in a row)
         display_name = "__display_123"                # VCS Display plot name (used to prevent duplicate display plots)
         ratio = 1.5|"autot"|"auto"                   # Ratio of height/width for the plot; autot and auto will choose a
-                                                    # "good" ratio for you.
+                                                     # "good" ratio for you.
+        plot_based_dual_grid = True | False          # Plot the actual grid or the dual grid based on what is
+                                                     # needed by the plot: isofill, isoline, vector need
+                                                     # point attributes, boxfill and meshfill need cell attributes
+                                                     # The default is True (if the parameter is not specified).
     Graphics Output in Background Mode:
        bg                 = 0|1   # if ==1, create images in the background
                                                              (Don't display the VCS Canvas)
diff --git a/Packages/vcs/vcs/vcs2vtk.py b/Packages/vcs/vcs/vcs2vtk.py
index d6c449b05..86cfcfd0a 100644
--- a/Packages/vcs/vcs/vcs2vtk.py
+++ b/Packages/vcs/vcs/vcs2vtk.py
@@ -180,142 +180,48 @@ def handleProjectionEdgeCases(projection, data):
     return data
 
 
-def genGridOnPoints(data1, gm, deep=True, grid=None, geo=None,
-                    data2=None):
-    continents = False
-    projection = vcs.elements["projection"][gm.projection]
-    xm, xM, ym, yM = None, None, None, None
-    useStructuredGrid = True
-
-    data1 = handleProjectionEdgeCases(projection, data1)
-    if data2 is not None:
-        data2 = handleProjectionEdgeCases(projection, data2)
-
-    try:
-        g = data1.getGrid()
-        if grid is None:
-            x = g.getLongitude()[:]
-            y = g.getLatitude()[:]
-            xm = x[0]
-            xM = x[-1]
-            ym = y[0]
-            yM = y[-1]
-        continents = True
-        wrap = [0, 360]
-        # Ok need unstrctured grid
-        if isinstance(g, cdms2.gengrid.AbstractGenericGrid):
-            useStructuredGrid = False
-    except:
-        # hum no grid that's much easier
-        wrap = None
-        if grid is None:
-            x = data1.getAxis(-1)[:]
-            y = data1.getAxis(-2)[:]
-            xm = x[0]
-            xM = x[-1]
-            ym = y[0]
-            yM = y[-1]
-
-    if grid is None:
-        if x.ndim == 1:
-            y = y[:, numpy.newaxis] * numpy.ones(x.shape)[numpy.newaxis, :]
-            x = x[numpy.newaxis, :] * numpy.ones(y.shape)
-        x = x.flatten()
-        y = y.flatten()
-        sh = list(x.shape)
-        sh.append(1)
-        x = numpy.reshape(x, sh)
-        y = numpy.reshape(y, sh)
-        # Ok we have our points in 2D let's create unstructured points grid
-        if xm is None:
-            xm = x.min()
-        if xM is None:
-            xM = x.max()
-        if ym is None:
-            ym = y.min()
-        if yM is None:
-            yM = y.max()
-        z = numpy.zeros(x.shape)
-        m3 = numpy.concatenate((x, y), axis=1)
-        m3 = numpy.concatenate((m3, z), axis=1)
-        deep = True
-        pts = vtk.vtkPoints()
-        # Convert nupmy array to vtk ones
-        ppV = numpy_to_vtk_wrapper(m3, deep=deep)
-        pts.SetData(ppV)
-        xm, xM, ym, yM, tmp, tmp2 = pts.GetBounds()
-    else:
-        xm, xM, ym, yM, tmp, tmp2 = grid.GetPoints().GetBounds()
-        vg = grid
-    oldpts = pts
-    if geo is None:
-        bounds = pts.GetBounds()
-        xm, xM, ym, yM = [bounds[0], bounds[1], bounds[2], bounds[3]]
-        # We use zooming feature (gm.datawc) for linear and polar projections.
-        # We use wrapped coordinates for doing the projection
-        # such that parameters like the central meridian are set correctly.
-        if (gm.g_name == 'Gfm'):
-            # axes are not lon/lat for meshfill
-            wc = [gm.datawc_x1, gm.datawc_x2, gm.datawc_y1, gm.datawc_y2]
-        else:
-            wc = vcs.utils.getworldcoordinates(gm,
-                                               data1.getAxis(-1),
-                                               data1.getAxis(-2))
-        geo, geopts = project(pts, projection, getWrappedBounds(
-            wc, [xm, xM, ym, yM], wrap))
-        pts = geopts
-    # Sets the vertices into the grid
-    if grid is None:
-        if useStructuredGrid:
-            vg = vtk.vtkStructuredGrid()
-            vg.SetDimensions(data1.shape[1], data1.shape[0], 1)
-        else:
-            vg = vtk.vtkUnstructuredGrid()
-        vg.SetPoints(oldpts)
-        vg.SetPoints(pts)
-    else:
-        vg = grid
-    scalar = numpy_to_vtk_wrapper(data1.filled(0.).flat,
-                                  deep=False)
-    scalar.SetName("scalar")
-    vg.GetPointData().SetScalars(scalar)
-    out = {"vtk_backend_grid": vg,
-           "xm": xm,
-           "xM": xM,
-           "ym": ym,
-           "yM": yM,
-           "continents": continents,
-           "wrap": wrap,
-           "geo": geo,
-           "data": data1,
-           "data2": data2
-           }
-    return out
-
-
-# Returns the bounds list for 'axis'. If axis has n elements the
-# bounds list will have n+1 elements
-def getBoundsList(axis):
-    bounds = numpy.zeros(len(axis) + 1)
-    try:
-        axisBounds = axis.getBounds()
+def getBoundsList(axis, hasCellData, dualGrid):
+    '''
+    Returns the bounds list for 'axis'. If axis has n elements the
+    bounds list will have n+1 elements
+    If there are not explicit bounds in the file we return None
+    '''
+    needsCellData = (hasCellData != dualGrid)
+    axisBounds = axis.getBoundsForDualGrid(dualGrid)
+    # we still have to generate bounds for non lon-lat axes, because
+    # the default in axis.py is 2 (generate bounds only for lat/lon axis)
+    # this is used for non lon-lat plots - by default numpy arrays are POINT data
+    if (not axis.isLatitude() and not axis.isLongitude() and needsCellData):
+        axisBounds = axis.genGenericBounds()
+    if (axisBounds is not None):
+        bounds = numpy.zeros(len(axis) + 1)
         if (axis[0] < axis[-1]):
             # axis is increasing
-            bounds[:len(axis)] = axisBounds[:, 0]
-            bounds[len(axis)] = axisBounds[-1, 1]
+            if (axisBounds[0][0] < axisBounds[0][1]):
+                # interval is increasing
+                bounds[:len(axis)] = axisBounds[:, 0]
+                bounds[len(axis)] = axisBounds[-1, 1]
+            else:
+                # interval is decreasing
+                bounds[:len(axis)] = axisBounds[:, 1]
+                bounds[len(axis)] = axisBounds[-1, 0]
         else:
             # axis is decreasing
-            bounds[:len(axis)] = axisBounds[:, 1]
-            bounds[len(axis)] = axisBounds[-1, 0]
-    except Exception:
-        # No luck we have to generate bounds ourselves
-        bounds[1:-1] = (axis[:-1] + axis[1:]) / 2.
-        bounds[0] = axis[0] - (axis[1] - axis[0]) / 2.
-        bounds[-1] = axis[-1] + (axis[-1] - axis[-2]) / 2.
-    return bounds
+            if (axisBounds[0][0] < axisBounds[0][1]):
+                # interval is increasing
+                bounds[:len(axis)] = axisBounds[:, 1]
+                bounds[len(axis)] = axisBounds[-1, 0]
+            else:
+                # interval is decreasing
+                bounds[:len(axis)] = axisBounds[:, 0]
+                bounds[len(axis)] = axisBounds[-1, 1]
+        return bounds
+    else:
+        return None
 
 
-def genGrid(data1, data2, gm, deep=True, grid=None, geo=None):
+def genGrid(data1, data2, gm, deep=True, grid=None, geo=None, genVectors=False,
+            dualGrid=False):
     continents = False
     wrap = None
     m3 = None
@@ -325,6 +231,8 @@ def genGrid(data1, data2, gm, deep=True, grid=None, geo=None):
     projection = vcs.elements["projection"][gm.projection]
 
     data1 = handleProjectionEdgeCases(projection, data1)
+    if data2 is not None:
+        data2 = handleProjectionEdgeCases(projection, data2)
 
     try:  # First try to see if we can get a mesh out of this
         g = data1.getGrid()
@@ -388,6 +296,7 @@ def genGrid(data1, data2, gm, deep=True, grid=None, geo=None):
         # Ok a simple structured grid is enough
         if grid is None:
             vg = vtk.vtkStructuredGrid()
+        hasCellData = data1.hasCellData()
         if g is not None:
             # Ok we have grid
             continents = True
@@ -406,38 +315,49 @@ def genGrid(data1, data2, gm, deep=True, grid=None, geo=None):
                 lon = data1.getAxis(-1)
                 lat = data1.getAxis(-2)
                 # Ok let's try to get the bounds
-                lon2 = getBoundsList(lon)
-                lat2 = getBoundsList(lat)
+                lon2 = getBoundsList(lon, hasCellData, dualGrid)
+                lat2 = getBoundsList(lat, hasCellData, dualGrid)
+                if (lon2 is not None and lat2 is not None):
+                    lon3 = lon2
+                    lat3 = lat2
+                else:
+                    lon3 = lon
+                    lat3 = lat
+                    cellData = False
                 # Note that m,M is min,max for an increasing list
                 # and max,min for a decreasing list
-                xm = lon2[0]
-                xM = lon2[-1]
-                ym = lat2[0]
-                yM = lat2[-1]
-
-                lat = lat2[:, numpy.newaxis] * \
-                    numpy.ones(lon2.shape)[numpy.newaxis, :]
-                lon = lon2[numpy.newaxis,
-                           :] * numpy.ones(lat2.shape)[:,
-                                                       numpy.newaxis]
+                xm = lon3[0]
+                xM = lon3[-1]
+                ym = lat3[0]
+                yM = lat3[-1]
+
+                lat = lat3[:, numpy.newaxis] * numpy.ones(lon3.shape)[numpy.newaxis, :]
+                lon = lon3[numpy.newaxis, :] * numpy.ones(lat3.shape)[:, numpy.newaxis]
         elif grid is None:
             # No grid info from data, making one up
             data1 = cdms2.asVariable(data1)
             lon = data1.getAxis(-1)
             lat = data1.getAxis(-2)
             # Ok let's try to get the bounds
-            lon2 = getBoundsList(lon)
-            lat2 = getBoundsList(lat)
+            lon2 = getBoundsList(lon, hasCellData, dualGrid)
+            lat2 = getBoundsList(lat, hasCellData, dualGrid)
+            if (lon2 is not None and lat2 is not None):
+                lon3 = lon2
+                lat3 = lat2
+            else:
+                lon3 = lon
+                lat3 = lat
+                cellData = False
             # Note that m,M is min,max for an increasing list
             # and max,min for a decreasing list
-            xm = lon2[0]
-            xM = lon2[-1]
-            ym = lat2[0]
-            yM = lat2[-1]
-            lat = lat2[:, numpy.newaxis] * \
-                numpy.ones(lon2.shape)[numpy.newaxis, :]
-            lon = lon2[numpy.newaxis, :] * \
-                numpy.ones(lat2.shape)[:, numpy.newaxis]
+            xm = lon3[0]
+            xM = lon3[-1]
+            ym = lat3[0]
+            yM = lat3[-1]
+            lat = lat3[:, numpy.newaxis] * \
+                numpy.ones(lon3.shape)[numpy.newaxis, :]
+            lon = lon3[numpy.newaxis, :] * \
+                numpy.ones(lat3.shape)[:, numpy.newaxis]
         if grid is None:
             vg.SetDimensions(lat.shape[1], lat.shape[0], 1)
             lon = numpy.ma.ravel(lon)
@@ -461,15 +381,23 @@ def genGrid(data1, data2, gm, deep=True, grid=None, geo=None):
                     ym = lat.min()
                     yM = lat.max()
 
-    # scalar data
-    scalar = numpy_to_vtk_wrapper(data1.filled(0.).flat,
-                                  deep=False)
-    scalar.SetName("scalar")
-    gridForScalar = grid if grid else vg
+    # attribute data
+    gridForAttribute = grid if grid else vg
+    if genVectors:
+        attribute = generateVectorArray(data1, data2, gridForAttribute)
+    else:
+        attribute = numpy_to_vtk_wrapper(data1.filled(0.).flat,
+                                         deep=False)
+        attribute.SetName("scalar")
     if cellData:
-        gridForScalar.GetCellData().SetScalars(scalar)
+        attributes = gridForAttribute.GetCellData()
+    else:
+        attributes = gridForAttribute.GetPointData()
+    if genVectors:
+        attributes.SetVectors(attribute)
     else:
-        gridForScalar.GetPointData().SetScalars(scalar)
+        attributes.SetScalars(attribute)
+
     if grid is None:
         # First create the points/vertices (in vcs terms)
         pts = vtk.vtkPoints()
@@ -489,8 +417,8 @@ def genGrid(data1, data2, gm, deep=True, grid=None, geo=None):
             # wrapping
             pedigreeId = vtk.vtkIntArray()
             pedigreeId.SetName("PedigreeIds")
-            pedigreeId.SetNumberOfTuples(scalar.GetNumberOfTuples())
-            for i in range(0, scalar.GetNumberOfTuples()):
+            pedigreeId.SetNumberOfTuples(attribute.GetNumberOfTuples())
+            for i in range(0, attribute.GetNumberOfTuples()):
                 pedigreeId.SetValue(i, i)
             if cellData:
                 vg.GetCellData().SetPedigreeIds(pedigreeId)
@@ -533,7 +461,8 @@ def genGrid(data1, data2, gm, deep=True, grid=None, geo=None):
            "wrap": wrap,
            "geo": geo,
            "cellData": cellData,
-           "data": data1
+           "data": data1,
+           "data2": data2
            }
     return out
 
@@ -1853,27 +1782,8 @@ def generateVectorArray(data1, data2, vtk_grid):
     w = numpy.concatenate((u, v), axis=1)
     w = numpy.concatenate((w, z), axis=1)
 
-    # HACK The grid returned by vtk2vcs.genGrid is not the same size as the
-    # data array. I'm not sure where the issue is...for now let's just zero-pad
-    # data array so that we can at least test rendering until Charles gets
-    # back from vacation:
-    wLen = len(w)
-    numPts = vtk_grid.GetNumberOfPoints()
-    if wLen != numPts:
-        warnings.warn("!!! Warning during vector plotting: "
-                      "Number of points does not "
-                      "match the number of vectors to be "
-                      "glyphed (%s points vs %s "
-                      "vectors). The vectors will be "
-                      "padded/truncated to match for "
-                      "rendering purposes, but the resulting "
-                      "image should not be "
-                      "trusted." % (numPts, wLen))
-        newShape = (numPts,) + w.shape[1:]
-        w = numpy.ma.resize(w, newShape)
-
     w = numpy_to_vtk_wrapper(w, deep=False)
-    w.SetName("vectors")
+    w.SetName("vector")
     return w
 
 
diff --git a/Packages/vcs/vcs/vcsvtk/boxfillpipeline.py b/Packages/vcs/vcs/vcsvtk/boxfillpipeline.py
index 772652172..1eb39085c 100644
--- a/Packages/vcs/vcs/vcsvtk/boxfillpipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/boxfillpipeline.py
@@ -24,6 +24,7 @@ class BoxfillPipeline(Pipeline2D):
         self._contourLabels = None
         self._mappers = None
         self._customBoxfillArgs = {}
+        self._needsCellData = True
 
     def _updateScalarData(self):
         """Overrides baseclass implementation."""
@@ -93,11 +94,6 @@ class BoxfillPipeline(Pipeline2D):
         # Use consecutive colors:
         self._contourColors = range(self._gm.color_1, self._gm.color_2 + 1)
 
-    def _createPolyDataFilter(self):
-        """Overrides baseclass implementation."""
-        self._vtkPolyDataFilter = vtk.vtkDataSetSurfaceFilter()
-        self._vtkPolyDataFilter.SetInputData(self._vtkDataSet)
-
     def _plotInternal(self):
         """Overrides baseclass implementation."""
         # Special case for custom boxfills:
diff --git a/Packages/vcs/vcs/vcsvtk/isofillpipeline.py b/Packages/vcs/vcs/vcsvtk/isofillpipeline.py
index e2ee5360e..8f46aa5bd 100644
--- a/Packages/vcs/vcs/vcsvtk/isofillpipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/isofillpipeline.py
@@ -13,36 +13,11 @@ class IsofillPipeline(Pipeline2D):
 
     def __init__(self, gm, context_):
         super(IsofillPipeline, self).__init__(gm, context_)
-
-    def _updateVTKDataSet(self):
-        """Overrides baseclass implementation."""
-        # Force point data for isoline/isofill
-        genGridDict = vcs2vtk.genGridOnPoints(self._data1, self._gm,
-                                              deep=False,
-                                              grid=self._vtkDataSet,
-                                              geo=self._vtkGeoTransform)
-        genGridDict["cellData"] = False
-        self._data1 = genGridDict["data"]
-        self._updateFromGenGridDict(genGridDict)
+        self._needsCellData = False
 
     def _updateContourLevelsAndColors(self):
         self._updateContourLevelsAndColorsGeneric()
 
-    def _createPolyDataFilter(self):
-        """Overrides baseclass implementation."""
-        self._vtkPolyDataFilter = vtk.vtkDataSetSurfaceFilter()
-        if self._useCellScalars:
-            # Sets data to point instead of just cells
-            c2p = vtk.vtkCellDataToPointData()
-            c2p.SetInputData(self._vtkDataSet)
-            c2p.Update()
-            # For contouring duplicate points seem to confuse it
-            self._vtkPolyDataFilter.SetInputConnection(c2p.GetOutputPort())
-        else:
-            self._vtkPolyDataFilter.SetInputData(self._vtkDataSet)
-        self._vtkPolyDataFilter.Update()
-        self._resultDict["vtk_backend_filter"] = self._vtkPolyDataFilter
-
     def _plotInternal(self):
         """Overrides baseclass implementation."""
 
diff --git a/Packages/vcs/vcs/vcsvtk/isolinepipeline.py b/Packages/vcs/vcs/vcsvtk/isolinepipeline.py
index af79a45b8..2d9b66472 100644
--- a/Packages/vcs/vcs/vcsvtk/isolinepipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/isolinepipeline.py
@@ -12,21 +12,7 @@ class IsolinePipeline(Pipeline2D):
 
     def __init__(self, gm, context_):
         super(IsolinePipeline, self).__init__(gm, context_)
-
-    def _updateVTKDataSet(self):
-        """Overrides baseclass implementation."""
-        # Force point data for isoline/isofill
-        genGridDict = vcs2vtk.genGridOnPoints(self._data1, self._gm,
-                                              deep=False,
-                                              grid=self._vtkDataSet,
-                                              geo=self._vtkGeoTransform)
-        genGridDict["cellData"] = False
-        self._data1 = genGridDict["data"]
-        self._updateFromGenGridDict(genGridDict)
-
-        data = vcs2vtk.numpy_to_vtk_wrapper(self._data1.filled(0.).flat,
-                                            deep=False)
-        self._vtkDataSet.GetPointData().SetScalars(data)
+        self._needsCellData = False
 
     def _updateContourLevelsAndColors(self):
         """Overrides baseclass implementation."""
@@ -49,20 +35,6 @@ class IsolinePipeline(Pipeline2D):
         # Contour colors:
         self._contourColors = self._gm.linecolors
 
-    def _createPolyDataFilter(self):
-        """Overrides baseclass implementation."""
-        self._vtkPolyDataFilter = vtk.vtkDataSetSurfaceFilter()
-        if self._useCellScalars:
-            # Sets data to point instead of just cells
-            c2p = vtk.vtkCellDataToPointData()
-            c2p.SetInputData(self._vtkDataSet)
-            c2p.Update()
-            # For contouring duplicate points seem to confuse it
-            self._vtkPolyDataFilter.SetInputConnection(c2p.GetOutputPort())
-        else:
-            self._vtkPolyDataFilter.SetInputData(self._vtkDataSet)
-        self._resultDict["vtk_backend_filter"] = self._vtkPolyDataFilter
-
     def _plotInternal(self):
         """Overrides baseclass implementation."""
         tmpLevels = []
@@ -164,7 +136,7 @@ class IsolinePipeline(Pipeline2D):
             numLevels = len(l)
 
             cot = vtk.vtkContourFilter()
-            if self._useCellScalars:
+            if self._hasCellData:
                 cot.SetInputConnection(self._vtkPolyDataFilter.GetOutputPort())
             else:
                 cot.SetInputData(self._vtkDataSet)
diff --git a/Packages/vcs/vcs/vcsvtk/meshfillpipeline.py b/Packages/vcs/vcs/vcsvtk/meshfillpipeline.py
index 90c06718d..7101a4729 100644
--- a/Packages/vcs/vcs/vcsvtk/meshfillpipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/meshfillpipeline.py
@@ -15,6 +15,7 @@ class MeshfillPipeline(Pipeline2D):
         super(MeshfillPipeline, self).__init__(gm, context_)
 
         self._patternActors = []
+        self._needsCellData = True
 
     def _updateScalarData(self):
         """Overrides baseclass implementation."""
@@ -25,16 +26,6 @@ class MeshfillPipeline(Pipeline2D):
     def _updateContourLevelsAndColors(self):
         self._updateContourLevelsAndColorsGeneric()
 
-    def _createPolyDataFilter(self):
-        """Overrides baseclass implementation."""
-        self._vtkPolyDataFilter = vtk.vtkDataSetSurfaceFilter()
-        if self._useCellScalars:
-            self._vtkPolyDataFilter.SetInputData(self._vtkDataSet)
-        else:
-            p2c = vtk.vtkPointDataToCellData()
-            p2c.SetInputData(self._vtkDataSet)
-            self._vtkPolyDataFilter.SetInputConnection(p2c.GetOutputPort())
-
     def _plotInternal(self):
 
         prepedContours = self._prepContours()
diff --git a/Packages/vcs/vcs/vcsvtk/pipeline2d.py b/Packages/vcs/vcs/vcsvtk/pipeline2d.py
index 4d370db8a..baa2f8915 100644
--- a/Packages/vcs/vcs/vcsvtk/pipeline2d.py
+++ b/Packages/vcs/vcs/vcsvtk/pipeline2d.py
@@ -1,9 +1,10 @@
 from .pipeline import Pipeline
 from .. import vcs2vtk
 
-import vcs
-import numpy
 import fillareautils
+import numpy
+import vcs
+import vtk
 import warnings
 
 
@@ -45,8 +46,10 @@ class IPipeline2D(Pipeline):
         - _useContinents: Whether or not to plot continents.
         - _dataWrapModulo: Wrap modulo as [YMax, XMax], in degrees. 0 means
             'no wrapping'.
-        - _useCellScalars: True if data is applied to cell, false if data is
+        - _hasCellData: True if data is applied to cell, false if data is
             applied to points.
+        - _needsCellData: True if the plot needs cell scalars, false if
+            the plot needs point scalars
         - _scalarRange: The range of _data1 as tuple(float min, float max)
         - _maskedDataMapper: The mapper used to render masked data.
     """
@@ -74,7 +77,8 @@ class IPipeline2D(Pipeline):
         self._colorMap = None
         self._useContinents = None
         self._dataWrapModulo = None
-        self._useCellScalars = None
+        self._hasCellData = None
+        self._needsCellData = None
         self._scalarRange = None
         self._maskedDataMapper = None
 
@@ -82,7 +86,7 @@ class IPipeline2D(Pipeline):
         """Create _data1 and _data2 from _originalData1 and _originalData2."""
         raise NotImplementedError("Missing override.")
 
-    def _updateVTKDataSet(self):
+    def _updateVTKDataSet(self, plotBasedDualGrid):
         """Apply the vcs data to _vtkDataSet, creating it if necessary."""
         raise NotImplementedError("Missing override.")
 
@@ -275,7 +279,8 @@ class Pipeline2D(IPipeline2D):
         self._scalarRange = vcs.minmax(self._data1)
 
         # Create/update the VTK dataset.
-        self._updateVTKDataSet()
+        plotBasedDualGrid = kargs.get('plot_based_dual_grid', True)
+        self._updateVTKDataSet(plotBasedDualGrid)
 
         # Update the results:
         self._resultDict["vtk_backend_grid"] = self._vtkDataSet
@@ -311,16 +316,40 @@ class Pipeline2D(IPipeline2D):
         self._min = self._data1.min()
         self._max = self._data1.max()
 
-    def _updateVTKDataSet(self):
-        """Overrides baseclass implementation."""
+    def _updateVTKDataSet(self, plotBasedDualGrid):
+        """
+        """
+        if (plotBasedDualGrid):
+            hasCellData = self._data1.hasCellData()
+            dualGrid = (hasCellData != self._needsCellData)
+        else:
+            dualGrid = False
         genGridDict = vcs2vtk.genGrid(self._data1, self._data2, self._gm,
                                       deep=False,
                                       grid=self._vtkDataSet,
-                                      geo=self._vtkGeoTransform)
-
+                                      geo=self._vtkGeoTransform, dualGrid=dualGrid)
         self._data1 = genGridDict["data"]
         self._updateFromGenGridDict(genGridDict)
 
+    def _createPolyDataFilter(self):
+        """This is only used when we use the grid stored in the file for all plots."""
+        self._vtkPolyDataFilter = vtk.vtkDataSetSurfaceFilter()
+        if self._hasCellData == self._needsCellData:
+            self._vtkPolyDataFilter.SetInputData(self._vtkDataSet)
+        elif self._hasCellData:
+            # use cells but needs points
+            c2p = vtk.vtkCellDataToPointData()
+            c2p.SetInputData(self._vtkDataSet)
+            self._vtkPolyDataFilter.SetInputConnection(c2p.GetOutputPort())
+        else:
+            # use points but needs cells
+            p2c = vtk.vtkPointDataToCellData()
+            p2c.SetInputData(self._vtkDataSet)
+            # For contouring duplicate points seem to confuse it
+            self._vtkPolyDataFilter.SetInputConnection(p2c.GetOutputPort())
+        self._vtkPolyDataFilter.Update()
+        self._resultDict["vtk_backend_filter"] = self._vtkPolyDataFilter
+
     def _updateFromGenGridDict(self, genGridDict):
         """Overrides baseclass implementation."""
         self._vtkDataSet = genGridDict['vtk_backend_grid']
@@ -329,7 +358,7 @@ class Pipeline2D(IPipeline2D):
         self._useContinents = genGridDict['continents']
         self._dataWrapModulo = genGridDict['wrap']
         self._vtkGeoTransform = genGridDict['geo']
-        self._useCellScalars = genGridDict['cellData']
+        self._hasCellData = genGridDict['cellData']
 
     def _createMaskedDataMapper(self):
         """Overrides baseclass implementation."""
@@ -338,11 +367,11 @@ class Pipeline2D(IPipeline2D):
         if color is not None:
             color = self.getColorIndexOrRGBA(_colorMap, color)
         self._maskedDataMapper = vcs2vtk.putMaskOnVTKGrid(
-            self._data1, self._vtkDataSet, color, self._useCellScalars,
+            self._data1, self._vtkDataSet, color, self._hasCellData,
             deep=False)
 
         self._resultDict["vtk_backend_missing_mapper"] = (
-            self._maskedDataMapper, color, self._useCellScalars)
+            self._maskedDataMapper, color, self._hasCellData)
 
     def getPlottingBounds(self):
         """gm.datawc if it is set or dataset_bounds if there is not geographic projection
diff --git a/Packages/vcs/vcs/vcsvtk/vectorpipeline.py b/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
index b8c4eaead..bc34e3c9e 100644
--- a/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
@@ -33,14 +33,21 @@ class VectorPipeline(Pipeline):
         lon = None
 
         latAccessor = data1.getLatitude()
-        lonAccesrsor = data1.getLongitude()
+        lonAccessor = data1.getLongitude()
         if latAccessor:
             lat = latAccessor[:]
-        if lonAccesrsor:
-            lon = lonAccesrsor[:]
+        if lonAccessor:
+            lon = lonAccessor[:]
 
-        gridGenDict = vcs2vtk.genGridOnPoints(data1, self._gm, deep=False, grid=grid,
-                                              geo=transform, data2=data2)
+        plotBasedDualGrid = kargs.get('plot_based_dual_grid', True)
+        if (plotBasedDualGrid):
+            hasCellData = data1.hasCellData()
+            dualGrid = hasCellData
+        else:
+            dualGrid = False
+        gridGenDict = vcs2vtk.genGrid(data1, data2, self._gm, deep=False, grid=grid,
+                                      geo=transform, genVectors=True,
+                                      dualGrid=dualGrid)
 
         data1 = gridGenDict["data"]
         data2 = gridGenDict["data2"]
@@ -54,6 +61,7 @@ class VectorPipeline(Pipeline):
         continents = gridGenDict['continents']
         self._dataWrapModulo = gridGenDict['wrap']
         geo = gridGenDict['geo']
+        cellData = gridGenDict['cellData']
 
         if geo is not None:
             newv = vtk.vtkDoubleArray()
@@ -83,16 +91,19 @@ class VectorPipeline(Pipeline):
 
         returned["vtk_backend_grid"] = grid
         returned["vtk_backend_geo"] = geo
-        missingMapper = vcs2vtk.putMaskOnVTKGrid(data1, grid, None, False,
-                                                 deep=False)
+        missingMapper = vcs2vtk.putMaskOnVTKGrid(data1, grid, actorColor=None,
+                                                 cellData=cellData, deep=False)
 
         # None/False are for color and cellData
         # (sent to vcs2vtk.putMaskOnVTKGrid)
         returned["vtk_backend_missing_mapper"] = (missingMapper, None, False)
 
-        w = vcs2vtk.generateVectorArray(data1, data2, grid)
-
-        grid.GetPointData().AddArray(w)
+        # convert to point data
+        if cellData:
+            c2p = vtk.vtkCellDataToPointData()
+            c2p.SetInputData(grid)
+            c2p.Update()
+            grid = c2p.GetOutput()
 
         # Vector attempt
         l = self._gm.line
@@ -119,7 +130,7 @@ class VectorPipeline(Pipeline):
 
         glyphFilter = vtk.vtkGlyph2D()
         glyphFilter.SetInputData(grid)
-        glyphFilter.SetInputArrayToProcess(1, 0, 0, 0, "vectors")
+        glyphFilter.SetInputArrayToProcess(1, 0, 0, 0, "vector")
         glyphFilter.SetSourceConnection(arrow.GetOutputPort())
         glyphFilter.SetVectorModeToUseVector()
 
-- 
GitLab


From 0d6bfec7174d847b46038d1c86a7ca06beceb3db Mon Sep 17 00:00:00 2001
From: Dan Lipsa <dan.lipsa@kitware.com>
Date: Wed, 4 May 2016 16:24:18 -0400
Subject: [PATCH 042/191] BUG: Fix mean computation for point datasets.

With the new flag TransientAxis._genericBounds_ TransientAxis.getExplicitBounds
returns None if the bounds were not read from a NetCDF file but were autogenerated.
This creates a problem in cdutil.averager as bound axis are artificially extended to -90, 90
So, for a latbnds=[[90, 88], [88, 84], ..., [4, 0]] we extended it to
[[90, 88], [88,84], ..., [4, -90]]. We remove the code that did this.

This fix also improves the baseline for testEsmfRegridRegion.
---
 Packages/cdms2/Lib/grid.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Packages/cdms2/Lib/grid.py b/Packages/cdms2/Lib/grid.py
index f11ca1764..9930f263a 100644
--- a/Packages/cdms2/Lib/grid.py
+++ b/Packages/cdms2/Lib/grid.py
@@ -496,14 +496,6 @@ class AbstractRectGrid(AbstractGrid):
         else:
             latbnds = lat.genGenericBounds()
 
-        # Stretch latitude bounds to +/- 90.0
-        if ascending:
-            latbnds[0,0] = min(latbnds[0,0],-90.0)
-            latbnds[-1,1] = max(latbnds[-1,1],90.0)
-        else:
-            latbnds[0,0] = max(latbnds[0,0],+90.0)
-            latbnds[-1,1] = min(latbnds[-1,1],-90.0)
-
         # Get longitude bounds
         lon = self.getLongitude()
         if len(lon)>1:
-- 
GitLab


From 2acc77cdf88741f93b8ff79c357d623b993197ea Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Wed, 11 May 2016 09:12:41 -0700
Subject: [PATCH 043/191] Made flake8 pass, removed extra line, unwrapped some
 wrapped lines

---
 Packages/vcs/vcs/boxfill.py  |  7 ++-----
 Packages/vcs/vcs/template.py | 23 +++++++++++++++++------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/Packages/vcs/vcs/boxfill.py b/Packages/vcs/vcs/boxfill.py
index 4003606c9..b403895fc 100755
--- a/Packages/vcs/vcs/boxfill.py
+++ b/Packages/vcs/vcs/boxfill.py
@@ -742,8 +742,7 @@ class Gfb(object):
         nlev = float(self.color_2 - self.color_1 + 1)
         autolevels = False
 
-        if numpy.allclose(self.level_1, 1.e20) or \
-           numpy.allclose(self.level_2, 1.e20):
+        if numpy.allclose(self.level_1, 1.e20) or numpy.allclose(self.level_2, 1.e20):
             autolevels = True
             low_end = varmin
             high_end = varmax
@@ -755,7 +754,6 @@ class Gfb(object):
             low_end = numpy.ma.log10(low_end)
             high_end = numpy.ma.log10(high_end)
 
-
         if autolevels:
             # Use nice values for the scale
             scale = vcs.mkscale(low_end, high_end)
@@ -776,8 +774,7 @@ class Gfb(object):
         if self.legend:
             return self.legend
 
-        if numpy.allclose(self.level_1, 1.e20) or \
-           numpy.allclose(self.level_2, 1.e20):
+        if numpy.allclose(self.level_1, 1.e20) or numpy.allclose(self.level_2, 1.e20):
             autolevels = True
         else:
             autolevels = False
diff --git a/Packages/vcs/vcs/template.py b/Packages/vcs/vcs/template.py
index 3eaac046b..fd2ee2f0c 100644
--- a/Packages/vcs/vcs/template.py
+++ b/Packages/vcs/vcs/template.py
@@ -56,6 +56,18 @@ def _setgen(self, name, cls, value):
     setattr(self, "_%s" % name, value)
 
 
+def epsilon_gte(a, b):
+    """a >= b, using floating point epsilon value."""
+    float_epsilon = numpy.finfo(numpy.float32).eps
+    return -float_epsilon < a - b
+
+
+def epsilon_lte(a, b):
+    """a <= b, using floating point epsilon value."""
+    float_epsilon = numpy.finfo(numpy.float32).eps
+    return float_epsilon > a - b
+
+
 # read .scr file
 def process_src(nm, code):
     """Takes VCS script code (string) as input and generates boxfill gm from it"""
@@ -1874,15 +1886,14 @@ class P(object):
             if legend is None:
                 legend = vcs.mklabels(levels)
             # We'll use the less precise float epsilon since this is just for labels
-            float_epsilon = numpy.finfo(numpy.float32).eps
             if levels[0] < levels[1]:
-                # <=
-                comparison = lambda a, b: float_epsilon > a - b
+                comparison = epsilon_lte
             else:
-                # >=
-                comparison = lambda a, b: -float_epsilon < a - b
+                comparison = epsilon_gte
+
+            def in_bounds(x):
+                return comparison(levels[0], x) and comparison(x, levels[-1])
 
-            in_bounds = lambda x: comparison(levels[0], x) and comparison(x, levels[-1])
             dlong = dD / (len(levels) - 1)
 
             for l in legend.keys():
-- 
GitLab


From 60d644963a9cdf7a0b4a8467ae9563d1db002166 Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Thu, 12 May 2016 13:36:33 -0700
Subject: [PATCH 044/191] Harden histogram a bit

---
 Packages/vcsaddons/Lib/core.py       | 20 +++++-----
 Packages/vcsaddons/Lib/histograms.py | 58 ++++++++++++++++++++++------
 2 files changed, 56 insertions(+), 22 deletions(-)

diff --git a/Packages/vcsaddons/Lib/core.py b/Packages/vcsaddons/Lib/core.py
index 8421e247c..d1b49bf11 100644
--- a/Packages/vcsaddons/Lib/core.py
+++ b/Packages/vcsaddons/Lib/core.py
@@ -20,7 +20,7 @@ class VCSaddon(object):
             self.x=vcs.init()
         else:
             self.x=x
-            
+
         if template is None:
             self.template = self.x.gettemplate()
         elif isinstance(template,str):
@@ -39,10 +39,10 @@ class VCSaddon(object):
             self.datawc_y1=1.e20
             self.datawc_y2=1.e20
             self.colormap="default"
-            self.xmtics1='*'
-            self.xmtics2='*'
-            self.ymtics1='*'
-            self.ymtics2='*'
+            self.xmtics1=''
+            self.xmtics2=''
+            self.ymtics1=''
+            self.ymtics2=''
             self.xticlabels1='*'
             self.xticlabels2='*'
             self.yticlabels1='*'
@@ -60,7 +60,7 @@ class VCSaddon(object):
             self.datawc_x1=gm.datawc_x1
             self.datawc_x2=gm.datawc_x2
             self.datawc_y1=gm.datawc_y1
-            self.datawc_y2=gm.datawc_x2
+            self.datawc_y2=gm.datawc_y2
             self.colormap=gm.colormap
             self.xmtics1=gm.xmtics1
             self.xmtics2=gm.xmtics2
@@ -78,7 +78,7 @@ class VCSaddon(object):
             self.projection=gm.projection
         self.name = name
         vcsaddons.gms[self.g_type][name]=self
-        
+
 
     def list(self):
         print 'graphics method = ',self.g_name
@@ -103,9 +103,9 @@ class VCSaddon(object):
         raise "Plot function not implemented for graphic method type: %s" % self.g_name
 
     def prep_plot(self,xmn,xmx,ymn,ymx):
-        
+
         self.save()
-        
+
         if self.datawc_x1!=1.e20:
             xmn = self.datawc_x1
         if self.datawc_x2!=1.e20:
@@ -180,4 +180,4 @@ class VCSaddon(object):
 
     def creategm(self,name,source='default'):
         return self.__init__(name,source=source,x=self.x,template=self.template)
-        
+
diff --git a/Packages/vcsaddons/Lib/histograms.py b/Packages/vcsaddons/Lib/histograms.py
index 60f866492..452ac671e 100644
--- a/Packages/vcsaddons/Lib/histograms.py
+++ b/Packages/vcsaddons/Lib/histograms.py
@@ -60,31 +60,48 @@ class Ghg(VCSaddon):
                 try:
                     data_name = data.id + data.units
                 except AttributeError:
-                    data_name = data.id
+                    try:
+                        data_name = data.id
+                    except AttributeError:
+                        data_name = "array"
 
         # We'll just flatten the data... if they want to be more precise, should pass in more precise data
-        data = data.flatten().asma()
+        if isinstance(data, cdms2.avariable.AbstractVariable):
+            data = data.asma()
+        data = data.flatten()
 
         # ok now we have a good x and a good data
         if not self.bins:
             self.bins = vcs.utils.mkscale(*vcs.minmax(data))
 
+        # Sort the bins
+        self.bins.sort()
+
+        # Prune duplicates
+        pruned_bins = []
+        for bin in self.bins:
+            if pruned_bins and numpy.allclose(bin, pruned_bins[-1]):
+                continue
+            pruned_bins.append(bin)
+        self.bins = pruned_bins
         data_bins = numpy.digitize(data, self.bins) - 1
         binned = [data[data_bins==i] for i in range(len(self.bins))]
-
         means = []
         stds = []
 
         max_possible_deviance = 0
 
         for ind, databin in enumerate(binned):
-            means.append(databin.mean())
-            stds.append(databin.std())
+            if len(databin) > 0:
+                means.append(databin.mean())
+                stds.append(databin.std())
+            else:
+                means.append(0)
+                stds.append(0)
             if len(self.bins) > ind + 1:
                 max_possible_deviance = max(means[ind] - self.bins[ind], self.bins[ind + 1] - means[ind], max_possible_deviance)
             else:
                 max_possible_deviance = max(means[ind] - self.bins[ind], max_possible_deviance)
-
         color_values = [std / max_possible_deviance for std in stds]
         y_values = [len(databin) for databin in binned]
         nbars = len(self.bins) - 1
@@ -97,11 +114,27 @@ class Ghg(VCSaddon):
         line.viewport = [
             template.data.x1, template.data.x2, template.data.y1, template.data.y2]
 
-        xmn, xmx = vcs.minmax(self.bins)
-        # Make the y scale be slightly larger than the largest bar
-        ymn, ymx = 0, max(y_values) * 1.25
+        vcs_min_max = vcs.minmax(self.bins)
+        if numpy.allclose(self.datawc_x1, 1e20):
+            xmn = vcs_min_max[0]
+        else:
+            xmn = self.datawc_x1
+
+        if numpy.allclose(self.datawc_x2, 1e20):
+            xmx = vcs_min_max[1]
+        else:
+            xmx = self.datawc_x2
+
+        if numpy.allclose(self.datawc_y2, 1e20):
+            # Make the y scale be slightly larger than the largest bar
+            ymx = max(y_values) * 1.25
+        else:
+            ymx = self.datawc_y2
 
-        #xmn, xmx, ymn, ymx = self.prep_plot(xmn, xmx, ymn, ymx)
+        if numpy.allclose(self.datawc_y1, 1e20):
+            ymn = 0
+        else:
+            ymn = self.datawc_y1
 
         fill.worldcoordinate = [xmn, xmx, ymn, ymx]
         line.worldcoordinate = [xmn, xmx, ymn, ymx]
@@ -166,7 +199,8 @@ class Ghg(VCSaddon):
                     else:
                         # Shouldn't ever get here since level 0 is 0
                         assert False
-
+            else:
+                assert False
             styles.append(self.fillareastyles[lev_ind])
             cols.append(self.fillareacolors[lev_ind])
             indices.append(self.fillareaindices[lev_ind])
@@ -192,7 +226,7 @@ class Ghg(VCSaddon):
         displays = []
 
         x_axis = cdms2.createAxis(self.bins, id=data_name)
-        y_axis = cdms2.createAxis(vcs.mkscale(0, ymx), id="bin_size")
+        y_axis = cdms2.createAxis(vcs.mkscale(ymn, ymx), id="bin_size")
 
         displays.append(x.plot(fill, bg=bg, render=False))
         arr = MV2.masked_array(y_values)
-- 
GitLab


From 5dd0a949f1b5b26c51cbb4513fd165f519031573 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Sat, 30 Apr 2016 21:49:57 -0400
Subject: [PATCH 045/191] Using common module for regression testing

---
 Packages/testing/__init__.py                  |  0
 .../testing/regression.py                     | 23 +++++++++-
 Packages/testing/setup.py                     | 14 ++++++
 testing/vcs/test_vcs_1D_datawc.py             | 21 +++------
 testing/vcs/test_vcs_1D_datawc_missing.py     | 29 ++----------
 testing/vcs/test_vcs_1D_with_manyDs.py        | 30 ++----------
 testing/vcs/test_vcs_1d_in_boxfill.py         | 27 ++---------
 ...cs_1d_marker_not_shown_if_xaxis_flipped.py | 33 ++-----------
 testing/vcs/test_vcs_1d_missing.py            | 26 ++---------
 testing/vcs/test_vcs_animate_boxfill.py       | 15 ++----
 testing/vcs/test_vcs_animate_isofill.py       | 23 ++++------
 testing/vcs/test_vcs_animate_isoline.py       | 27 ++++-------
 .../vcs/test_vcs_animate_isoline_colored.py   | 20 +++-----
 .../test_vcs_animate_isoline_text_labels.py   | 11 ++---
 ...vcs_animate_isoline_text_labels_colored.py | 10 ++--
 testing/vcs/test_vcs_animate_meshfill.py      | 10 +---
 testing/vcs/test_vcs_antialiasing.py          |  1 -
 testing/vcs/test_vcs_aspect_ratio.py          | 35 +++++---------
 testing/vcs/test_vcs_auto_time_labels.py      | 23 +++-------
 testing/vcs/test_vcs_autot_axis_titles.py     | 22 ++-------
 testing/vcs/test_vcs_bad_time_units.py        | 12 ++---
 testing/vcs/test_vcs_basic_gms.py             | 19 ++------
 testing/vcs/test_vcs_basic_text.py            | 17 ++-----
 testing/vcs/test_vcs_basic_vectors.py         | 19 ++------
 ...st_vcs_box_custom_as_def_vistrails_exts.py | 42 +++++------------
 .../test_vcs_boxfill_10x10_masked_numpy.py    | 28 +++--------
 testing/vcs/test_vcs_boxfill_10x10_numpy.py   | 27 +++--------
 testing/vcs/test_vcs_boxfill_custom.py        | 21 ++-------
 testing/vcs/test_vcs_boxfill_custom_ext1.py   | 22 ++-------
 .../vcs/test_vcs_boxfill_custom_ext1_ext2.py  | 22 ++-------
 testing/vcs/test_vcs_boxfill_custom_ext2.py   | 20 ++------
 ...t_vcs_boxfill_custom_non_default_levels.py | 24 ++--------
 .../test_vcs_boxfill_decreasing_latitude.py   | 27 ++---------
 testing/vcs/test_vcs_boxfill_lambert_crash.py | 17 ++-----
 testing/vcs/test_vcs_boxfill_lev1_lev2.py     | 35 ++++----------
 .../vcs/test_vcs_boxfill_lev1_lev2_ext1.py    | 37 +++++----------
 .../test_vcs_boxfill_lev1_lev2_ext1_ext2.py   | 39 +++++-----------
 .../vcs/test_vcs_boxfill_lev1_lev2_ext2.py    | 37 +++++----------
 .../test_vcs_boxfill_lev1_lev2_ta_missing.py  | 39 +++++-----------
 testing/vcs/test_vcs_boxfill_polar.py         | 31 +++----------
 testing/vcs/test_vcs_boxfill_robinson_wrap.py | 15 +-----
 testing/vcs/test_vcs_canvas_background.py     | 19 ++------
 .../vcs/test_vcs_canvas_background_update.py  | 20 ++------
 testing/vcs/test_vcs_click_info.py            | 20 ++------
 testing/vcs/test_vcs_close.py                 |  6 ---
 testing/vcs/test_vcs_colormaps_source.py      | 24 ++--------
 .../vcs/test_vcs_colorpicker_appearance.py    |  7 +--
 testing/vcs/test_vcs_configurator_resize.py   |  8 ++--
 testing/vcs/test_vcs_continents.py            | 25 ++--------
 testing/vcs/test_vcs_create_get.py            |  1 -
 testing/vcs/test_vcs_draw_logo_on.py          | 16 ++-----
 testing/vcs/test_vcs_fillarea_transparency.py | 17 ++-----
 testing/vcs/test_vcs_first_png_blank.py       | 19 ++------
 testing/vcs/test_vcs_flipNone.py              | 26 ++---------
 testing/vcs/test_vcs_flipX.py                 | 26 ++---------
 testing/vcs/test_vcs_flipXY.py                | 25 ++--------
 testing/vcs/test_vcs_flipY.py                 | 24 ++--------
 testing/vcs/test_vcs_gen_meshfill.py          | 29 ++----------
 .../test_vcs_gms_animate_projected_plots.py   | 23 ++--------
 testing/vcs/test_vcs_gms_patterns_hatches.py  | 16 ++-----
 testing/vcs/test_vcs_hatches_patterns.py      | 24 ++--------
 testing/vcs/test_vcs_import.py                |  1 -
 testing/vcs/test_vcs_infinity.py              | 20 ++------
 testing/vcs/test_vcs_iso_celine_part1.py      | 21 +++------
 testing/vcs/test_vcs_iso_celine_part2.py      | 25 +++-------
 ...st_vcs_isofill_data_read_north_to_south.py | 22 ++-------
 .../vcs/test_vcs_isofill_isoline_labels.py    | 29 ++----------
 .../vcs/test_vcs_isofill_mask_cell_shift.py   | 29 +++---------
 testing/vcs/test_vcs_isoline_labels.py        | 34 +++-----------
 .../vcs/test_vcs_isoline_labels_background.py | 26 ++---------
 ..._isoline_labels_multi_label_input_types.py | 46 +++++++------------
 .../vcs/test_vcs_isoline_labelskipdistance.py | 26 ++---------
 testing/vcs/test_vcs_isoline_numpy.py         | 22 +++------
 testing/vcs/test_vcs_isoline_width_stipple.py | 27 ++---------
 testing/vcs/test_vcs_issue_960_labels.py      | 26 ++++-------
 testing/vcs/test_vcs_lambert.py               | 23 ++--------
 testing/vcs/test_vcs_large_pattern_hatch.py   | 27 ++---------
 testing/vcs/test_vcs_legend.py                | 17 ++-----
 testing/vcs/test_vcs_lon_axes_freak_out.py    | 31 +++----------
 testing/vcs/test_vcs_markers.py               | 26 +++--------
 testing/vcs/test_vcs_matplotlib_colormap.py   | 26 ++---------
 testing/vcs/test_vcs_mercator_edge.py         | 23 ++--------
 testing/vcs/test_vcs_meshfill_draw_mesh.py    | 28 ++++-------
 testing/vcs/test_vcs_meshfill_no_wrapping.py  | 26 ++---------
 testing/vcs/test_vcs_meshfill_regular_grid.py | 23 ++--------
 testing/vcs/test_vcs_meshfill_vertices.py     | 21 ++-------
 testing/vcs/test_vcs_meshfill_zoom.py         | 27 +++--------
 testing/vcs/test_vcs_mintics.py               | 20 ++------
 testing/vcs/test_vcs_missing_colorname.py     | 24 ++--------
 ..._vcs_monotonic_decreasing_yxvsx_default.py | 29 ++++--------
 testing/vcs/test_vcs_oned_level_axis.py       | 27 +++--------
 testing/vcs/test_vcs_patterns.py              | 22 ++-------
 testing/vcs/test_vcs_plot_file_var.py         | 14 +++---
 .../test_vcs_plot_unstructured_via_boxfill.py | 20 ++------
 testing/vcs/test_vcs_png_to_base64.py         |  2 +-
 testing/vcs/test_vcs_png_window_resize.py     | 17 ++-----
 .../vcs/test_vcs_polar_set_opt_param_polar.py | 30 +++---------
 testing/vcs/test_vcs_remove_marker_none_1d.py | 24 ++--------
 testing/vcs/test_vcs_setcolormap.py           | 26 ++---------
 .../vcs/test_vcs_settings_color_name_rgba.py  | 27 +++--------
 .../test_vcs_settings_color_name_rgba_1d.py   | 22 ++-------
 ...st_vcs_settings_color_name_rgba_boxfill.py | 23 ++--------
 ...st_vcs_settings_color_name_rgba_isoline.py | 23 ++--------
 ...t_vcs_settings_color_name_rgba_meshfill.py | 23 ++--------
 testing/vcs/test_vcs_star_triangle_markers.py | 17 ++-----
 testing/vcs/test_vcs_taylor_2quads.py         | 33 ++-----------
 testing/vcs/test_vcs_taylor_template_ctl.py   | 29 ++----------
 testing/vcs/test_vcs_user_passed_date.py      | 17 ++-----
 .../test_vcs_user_passed_date_as_string.py    | 17 ++-----
 testing/vcs/test_vcs_vectors_missing.py       | 27 +++--------
 testing/vcs/test_vcs_vectors_robinson.py      | 16 ++-----
 testing/vcs/test_vcs_vectors_robinson_wrap.py | 16 ++-----
 testing/vcs/test_vcs_verify_boxfill_basics.py | 13 +++---
 testing/vcs/test_vcs_wmo_marker.py            | 17 ++-----
 testing/vcs/test_vcs_wmo_markers.py           | 25 +++-------
 testing/vcs/vtk_ui/vtk_ui_test.py             | 14 ++----
 .../vcsaddons/test_12_plot_one_leg_per_row.py | 15 ++----
 .../test_12_plot_one_leg_per_row_right.py     | 16 ++-----
 ...test_EzTemplate_12_plots_legd_direction.py | 17 ++-----
 ...t_EzTemplate_12_plots_margins_thickness.py | 15 ++----
 .../test_EzTemplate_12_plots_mix_glb_local.py | 14 +-----
 .../test_EzTemplate_12_plots_spacing.py       | 16 ++-----
 .../test_vcs_addons_EzTemplate_2x2.py         | 24 +++-------
 .../vcsaddons/test_vcsaddons_preview_2x2.py   | 16 ++-----
 124 files changed, 589 insertions(+), 2135 deletions(-)
 create mode 100644 Packages/testing/__init__.py
 rename testing/checkimage.py => Packages/testing/regression.py (84%)
 create mode 100755 Packages/testing/setup.py

diff --git a/Packages/testing/__init__.py b/Packages/testing/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/testing/checkimage.py b/Packages/testing/regression.py
similarity index 84%
rename from testing/checkimage.py
rename to Packages/testing/regression.py
index 9871f3557..68f381ce4 100644
--- a/testing/checkimage.py
+++ b/Packages/testing/regression.py
@@ -12,9 +12,28 @@ import os.path
 import re
 import sys
 import logging
+import vcs
 
 defaultThreshold=10.0
 
+def init():
+    testingDir = os.path.join(os.path.dirname(__file__), "..")
+    sys.path.append(testingDir)
+
+    vcsinst = vcs.init()
+    vcsinst.setantialiasing(0)
+    vcsinst.drawlogooff()
+    vcsinst.setbgoutputdimensions(1200,1091,units="pixels")
+    return vcsinst
+
+def run(vcsinst, fname, baseline=sys.argv[1], threshold=defaultThreshold):
+    vcsinst.png(fname)
+    sys.exit(check_result_image(fname, baseline, threshold))
+
+def run_wo_terminate(vcsinst, fname, baseline=sys.argv[1], threshold=defaultThreshold):
+    vcsinst.png(fname)
+    return check_result_image(fname, baseline, threshold)
+
 def image_compare(testImage, baselineImage):
     imageDiff = vtk.vtkImageDifference()
     imageDiff.SetInputData(testImage)
@@ -53,8 +72,8 @@ def find_alternates(fname):
             results.append(os.path.join(dirname, i))
     return results
 
-def check_result_image(fname, baselinefname, threshold = defaultThreshold,
-                       baseline = True, cleanup=True):
+def check_result_image(fname, baselinefname=sys.argv[1], threshold=defaultThreshold,
+                       baseline=True, cleanup=True):
     testImage = image_from_file(fname)
     if testImage is None:
         print "Testing image missing, test failed."
diff --git a/Packages/testing/setup.py b/Packages/testing/setup.py
new file mode 100755
index 000000000..70f790d7b
--- /dev/null
+++ b/Packages/testing/setup.py
@@ -0,0 +1,14 @@
+import os, sys
+from distutils.core import setup
+import cdat_info
+
+sys.path.append(os.environ.get('BUILD_DIR',"build"))
+
+setup(name="testing",
+      version=cdat_info.Version,
+      description="Testing infrastructure for cdat",
+      url="http://uvcdat.llnl.gov",
+      packages=['testing'],
+      package_dir={'testing': 'testing',},
+      install_requires=['numpy','vcs', 'vtk'],
+)
diff --git a/testing/vcs/test_vcs_1D_datawc.py b/testing/vcs/test_vcs_1D_datawc.py
index 1595a6cd7..8e671bb93 100644
--- a/testing/vcs/test_vcs_1D_datawc.py
+++ b/testing/vcs/test_vcs_1D_datawc.py
@@ -4,15 +4,13 @@ import vcs,numpy,cdms2,MV2,os,sys
 src=sys.argv[1]
 pth = os.path.join(os.path.dirname(__file__),"..")
 sys.path.append(pth)
-import checkimage
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
 
-x.setbgoutputdimensions(1200,1091,units="pixels")
+import testing.regression as regression
+
+x = regression.init()
 yx =x.createyxvsx()
 
-data = """-11.14902417  -9.17390922  -7.29515002  
+data = """-11.14902417  -9.17390922  -7.29515002
 -7.51774549  -8.63608171
   -10.4827395   -9.93859485  -7.3394366   -5.39241468  -5.74825567
      -6.74967902  -7.09622319  -5.93836983  -4.04592997  -2.65591499
@@ -30,14 +28,9 @@ data = numpy.array(data,dtype=numpy.float)
 data = MV2.array(data)
 yx.datawc_x1 = 0
 yx.datawc_x2 = 80
-yx.datawc_y1 =-12 
-yx.datawc_y2 = 12 
+yx.datawc_y1 =-12
+yx.datawc_y2 = 12
 
 
 x.plot(data,yx,bg=1)
-fnm = "test_vcs_1D_datawc.png"
-x.png(fnm)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, "test_vcs_1D_datawc.png", src)
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_1D_datawc_missing.py b/testing/vcs/test_vcs_1D_datawc_missing.py
index 07e6f560a..d6caabc8e 100644
--- a/testing/vcs/test_vcs_1D_datawc_missing.py
+++ b/testing/vcs/test_vcs_1D_datawc_missing.py
@@ -1,19 +1,11 @@
 
-import vcs,numpy,cdms2,MV2,os,sys
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import vcs, numpy, cdms2, MV2, os, sys, testing.regression as regression
 
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
-
-yx =x.createyxvsx()
+x = regression.init()
+yx = x.createyxvsx()
 
 data = """
--999. -999. -999. -999. -999. -999. -999. -999. -999. -999. -999. -999. -999. -999. -999. -999. -999. 
+-999. -999. -999. -999. -999. -999. -999. -999. -999. -999. -999. -999. -999. -999. -999. -999. -999.
 0.059503571833625334
 0.059503571833625334 0.05664014775641405 0.05193557222118004
 0.04777129850801233 0.0407139313814465 0.029382624830271705
@@ -42,16 +34,5 @@ data = """
 """.split()
 data = numpy.array(data,dtype=numpy.float)
 data = MV2.masked_less(data,-900)
-#yx.datawc_x1 = 0
-#yx.datawc_x2 = 80
-##yx.datawc_y1 =-12 
-#yx.datawc_y2 = 12 
-
-
 x.plot(data,yx,bg=1)
-fnm = "test_vcs_1D_datawc_missing.png"
-x.png(fnm)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, "test_vcs_1D_datawc_missing.png")
diff --git a/testing/vcs/test_vcs_1D_with_manyDs.py b/testing/vcs/test_vcs_1D_with_manyDs.py
index 1caba446e..28a6a7a8b 100644
--- a/testing/vcs/test_vcs_1D_with_manyDs.py
+++ b/testing/vcs/test_vcs_1D_with_manyDs.py
@@ -1,31 +1,9 @@
 
-import vcs,numpy,os,sys
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
+import vcs, numpy, cdms2, MV2, os, sys, testing.regression as regression
 
+x = regression.init()
 d = numpy.sin(numpy.arange(100))
-d=numpy.reshape(d,(10,10))
-
-
+d = numpy.reshape(d,(10,10))
 one = x.create1d()
-
 x.plot(d,one,bg=1)
-
-
-fnm = "test_1D_with_manyDs.png"
-x.png(fnm)
-
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
-
-
-
+regression.run(x, "test_1D_with_manyDs.png", sys.argv[1])
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_1d_in_boxfill.py b/testing/vcs/test_vcs_1d_in_boxfill.py
index 292fe98a3..1da574394 100644
--- a/testing/vcs/test_vcs_1d_in_boxfill.py
+++ b/testing/vcs/test_vcs_1d_in_boxfill.py
@@ -1,29 +1,8 @@
 
-import vcs,numpy,os,sys
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
+import vcs, numpy, cdms2, MV2, os, sys, testing.regression as regression
 
+x = regression.init()
 d = numpy.sin(numpy.arange(100))
-
 b = x.createboxfill()
-
 x.plot(d,b,bg=1)
-
-
-fnm = "test_1d_in_boxfill.png"
-x.png(fnm)
-
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
-
-
-
+regression.run(x, "test_1d_in_boxfill.png", sys.argv[1])
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_1d_marker_not_shown_if_xaxis_flipped.py b/testing/vcs/test_vcs_1d_marker_not_shown_if_xaxis_flipped.py
index c350e4c59..f850f977e 100644
--- a/testing/vcs/test_vcs_1d_marker_not_shown_if_xaxis_flipped.py
+++ b/testing/vcs/test_vcs_1d_marker_not_shown_if_xaxis_flipped.py
@@ -1,42 +1,15 @@
-import vcs
-import numpy
-import MV2
-import cdms2
-import sys
-import os
 
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
+import vcs, numpy, cdms2, MV2, os, sys, testing.regression as regression
 
+x = regression.init()
 data = MV2.array([4,5,6,7,1,3,7,9,])+230.
-
 p = cdms2.createAxis([2,5,100,200,500,800,850,1000])
-
 data.setAxis(0,p)
-
 data.id="jim"
-
 gm=x.create1d()
-
 gm.linewidth=0
 gm.datawc_x1=1000
 gm.datawc_x2=0
-
 gm.markersize=30
-
 x.plot(data,gm,bg=1)
-
-fnm = "test_1d_marker_not_shown_if_xaxis_flipped.png"
-x.png(fnm)
-
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, "test_1d_marker_not_shown_if_xaxis_flipped.png", sys.argv[1])
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_1d_missing.py b/testing/vcs/test_vcs_1d_missing.py
index 3a6880bdd..8c124e09c 100644
--- a/testing/vcs/test_vcs_1d_missing.py
+++ b/testing/vcs/test_vcs_1d_missing.py
@@ -3,15 +3,11 @@ import vcs,numpy,cdms2,MV2,os,sys
 src=sys.argv[1]
 pth = os.path.join(os.path.dirname(__file__),"..")
 sys.path.append(pth)
-import checkimage
+import testing.regression as regression
 
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
+x = regression.init()
 yx =x.createyxvsx()
-
-data = """-11.14902417  -9.17390922  -7.29515002  
+data = """-11.14902417  -9.17390922  -7.29515002
 -7.51774549  -8.63608171
   -10.4827395   -9.93859485  -7.3394366   -5.39241468  -5.74825567
      -6.74967902  -7.09622319  -5.93836983  -4.04592997  -2.65591499
@@ -30,17 +26,5 @@ data = MV2.array(data)
 
 data=MV2.masked_where(MV2.logical_and(data>-4,data<-2),data)
 
-#yx.datawc_x1 = 0
-#yx.datawc_x2 = 80
-##yx.datawc_y1 =-12 
-#yx.datawc_y2 = 12 
-
-
-x.plot(data,yx,bg=1)
-fnm = "test_vcs_1d_missing.png"
-x.png(fnm)
-
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+x.plot(data, yx, bg=1)
+regression.run(x, "test_vcs_1d_missing.png", src)
diff --git a/testing/vcs/test_vcs_animate_boxfill.py b/testing/vcs/test_vcs_animate_boxfill.py
index 2bbd53c26..641b59edb 100644
--- a/testing/vcs/test_vcs_animate_boxfill.py
+++ b/testing/vcs/test_vcs_animate_boxfill.py
@@ -1,20 +1,14 @@
-import vcs
-import cdms2
-import os
-import sys
-import time
+import vcs, numpy, cdms2, MV2, os, sys, time, testing.regression as regression
+
 pth = os.path.join(os.path.dirname(__file__),"..")
 sys.path.append(pth)
-import checkimage
-
 f=cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
 s=f("clt",slice(0,12)) # read only 12 times steps to speed up things
 
-x=vcs.init()
+x = regression.init()
 x.setantialiasing(0)
 x.drawlogooff()
 x.setbgoutputdimensions(1200,1091,units="pixels")
-
 gm=x.createboxfill()
 x.plot(s,gm,bg=1)
 x.animate.create()
@@ -26,8 +20,7 @@ src_pth = sys.argv[1]
 pth = os.path.join(src_pth,prefix)
 ret = 0
 for p in pngs:
-  print "Checking:",p
-  ret += checkimage.check_result_image(p,os.path.join(pth,os.path.split(p)[1]),checkimage.defaultThreshold)
+  ret += regression.check_result_image(p,os.path.join(pth,os.path.split(p)[1]))
 if ret == 0:
     os.removedirs(os.path.split(p)[0])
     os.remove("%s.mp4" % prefix)
diff --git a/testing/vcs/test_vcs_animate_isofill.py b/testing/vcs/test_vcs_animate_isofill.py
index ba5ea0e8d..591d66362 100644
--- a/testing/vcs/test_vcs_animate_isofill.py
+++ b/testing/vcs/test_vcs_animate_isofill.py
@@ -1,20 +1,13 @@
-import vcs
-import cdms2
-import os
-import sys
-import time
+
+import vcs, numpy, cdms2, MV2, os, sys, time, testing.regression as regression
+
 pth = os.path.join(os.path.dirname(__file__),"..")
 sys.path.append(pth)
-import checkimage
-
-f=cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
-s=f("clt",slice(0,12)) # read only 12 times steps to speed up things
 
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
+f = cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
+s = f("clt",slice(0,12)) # read only 12 times steps to speed up things
 
+x = regression.init()
 gm=x.createisofill()
 x.plot(s,gm,bg=1)
 x.animate.create()
@@ -26,8 +19,8 @@ src_pth = sys.argv[1]
 pth = os.path.join(src_pth,prefix)
 ret = 0
 for p in pngs:
-  print "Checking:",p
-  ret += checkimage.check_result_image(p,os.path.join(pth,os.path.split(p)[1]),checkimage.defaultThreshold)
+  ret += regression.check_result_image(p,os.path.join(pth,os.path.split(p)[1]),
+         regression.defaultThreshold)
 if ret == 0:
     os.removedirs(os.path.split(p)[0])
     os.remove("%s.mp4" % prefix)
diff --git a/testing/vcs/test_vcs_animate_isoline.py b/testing/vcs/test_vcs_animate_isoline.py
index 41e0c7318..cea333d3b 100644
--- a/testing/vcs/test_vcs_animate_isoline.py
+++ b/testing/vcs/test_vcs_animate_isoline.py
@@ -1,33 +1,24 @@
-import vcs
-import cdms2
-import os
-import sys
-import time
+import vcs, numpy, cdms2, MV2, os, sys, time, testing.regression as regression
+
 pth = os.path.join(os.path.dirname(__file__),"..")
 sys.path.append(pth)
-import checkimage
-
-f=cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
-s=f("clt",slice(0,12)) # read only 12 times steps to speed up things
 
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
+f = cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
+s = f("clt",slice(0,12)) # read only 12 times steps to speed up things
 
-iso=x.createisoline()
-x.plot(s,iso,bg=1)
+x = regression.init()
+iso = x.createisoline()
+x.plot(s,iso, bg=1)
 x.animate.create()
 print "Saving now"
 prefix= os.path.split(__file__)[1][:-3]
 x.animate.save("%s.mp4"%prefix)
-pngs = x.animate.close(preserve_pngs = True) # so we can look at them again
+pngs = x.animate.close(preserve_pngs=True) # so we can look at them again
 src_pth = sys.argv[1]
 pth = os.path.join(src_pth,prefix)
 ret = 0
 for p in pngs:
-  print "Checking:",p
-  ret += checkimage.check_result_image(p,os.path.join(pth,os.path.split(p)[1]),checkimage.defaultThreshold)
+  ret += regression.check_result_image(p,os.path.join(pth,os.path.split(p)[1]))
 if ret == 0:
     os.removedirs(os.path.split(p)[0])
     os.remove("%s.mp4" % prefix)
diff --git a/testing/vcs/test_vcs_animate_isoline_colored.py b/testing/vcs/test_vcs_animate_isoline_colored.py
index 4fed45c86..4519ac16c 100644
--- a/testing/vcs/test_vcs_animate_isoline_colored.py
+++ b/testing/vcs/test_vcs_animate_isoline_colored.py
@@ -1,19 +1,12 @@
-import vcs
-import cdms2
-import os
-import sys
-import time
+import vcs, numpy, cdms2, MV2, os, sys, time, testing.regression as regression
+
 pth = os.path.join(os.path.dirname(__file__),"..")
 sys.path.append(pth)
-import checkimage
 
-f=cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
-s=f("clt",slice(0,12)) # read only 12 times steps to speed up things
+f = cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
+s = f("clt",slice(0,12)) # read only 12 times steps to speed up things
 
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
+x = regression.init()
 
 iso=x.createisoline()
 levs = range(0,101,10)
@@ -34,8 +27,7 @@ src_pth = sys.argv[1]
 pth = os.path.join(src_pth,prefix)
 ret = 0
 for p in pngs:
-  print "Checking:",p
-  ret += checkimage.check_result_image(p,os.path.join(pth,os.path.split(p)[1]),checkimage.defaultThreshold)
+  ret += regression.check_result_image(p,os.path.join(pth,os.path.split(p)[1]))
 if ret == 0:
     os.removedirs(os.path.split(p)[0])
     os.remove("%s.mp4" % prefix)
diff --git a/testing/vcs/test_vcs_animate_isoline_text_labels.py b/testing/vcs/test_vcs_animate_isoline_text_labels.py
index 7a3be1fc5..0e83c02c6 100644
--- a/testing/vcs/test_vcs_animate_isoline_text_labels.py
+++ b/testing/vcs/test_vcs_animate_isoline_text_labels.py
@@ -1,11 +1,7 @@
-import vcs
-import cdms2
-import os
-import sys
-import time
+import vcs, numpy, cdms2, MV2, os, sys, time, testing.regression as regression
+
 pth = os.path.join(os.path.dirname(__file__),"..")
 sys.path.append(pth)
-import checkimage
 
 f=cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
 s=f("clt",slice(0,12)) # read only 12 times steps to speed up things
@@ -27,8 +23,7 @@ src_pth = sys.argv[1]
 pth = os.path.join(src_pth,prefix)
 ret = 0
 for p in pngs:
-  print "Checking:",p
-  ret += checkimage.check_result_image(p,os.path.join(pth,os.path.split(p)[1]),checkimage.defaultThreshold)
+  ret += regression.check_result_image(p,os.path.join(pth,os.path.split(p)[1]))
 if ret == 0:
     os.removedirs(os.path.split(p)[0])
     os.remove("%s.mp4" % prefix)
diff --git a/testing/vcs/test_vcs_animate_isoline_text_labels_colored.py b/testing/vcs/test_vcs_animate_isoline_text_labels_colored.py
index cf009e4a8..02711e219 100644
--- a/testing/vcs/test_vcs_animate_isoline_text_labels_colored.py
+++ b/testing/vcs/test_vcs_animate_isoline_text_labels_colored.py
@@ -1,11 +1,7 @@
-import vcs
-import cdms2
-import os
-import sys
-import time
+import vcs, numpy, cdms2, MV2, os, sys, time, testing.regression as regression
+
 pth = os.path.join(os.path.dirname(__file__),"..")
 sys.path.append(pth)
-import checkimage
 
 f=cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
 s=f("clt",slice(0,12)) # read only 12 times steps to speed up things
@@ -36,7 +32,7 @@ pth = os.path.join(src_pth,prefix)
 ret = 0
 for p in pngs:
   print "Checking:",p
-  ret += checkimage.check_result_image(p,os.path.join(pth,os.path.split(p)[1]),checkimage.defaultThreshold)
+  ret += regression.check_result_image(p,os.path.join(pth,os.path.split(p)[1]))
 if ret == 0:
     os.removedirs(os.path.split(p)[0])
     os.remove("%s.mp4" % prefix)
diff --git a/testing/vcs/test_vcs_animate_meshfill.py b/testing/vcs/test_vcs_animate_meshfill.py
index 78d6b1551..aa89a8639 100644
--- a/testing/vcs/test_vcs_animate_meshfill.py
+++ b/testing/vcs/test_vcs_animate_meshfill.py
@@ -1,12 +1,7 @@
-import vcs
-import cdms2
-import os
-import sys
-import MV2
+import vcs, numpy, cdms2, MV2, os, sys, testing.regression as regression
 
 pth = os.path.join(os.path.dirname(__file__),"..")
 sys.path.append(pth)
-import checkimage
 
 f=cdms2.open(os.path.join(vcs.sample_data,"sampleCurveGrid4.nc"))
 s=f("sample")
@@ -38,8 +33,7 @@ src_pth = sys.argv[1]
 pth = os.path.join(src_pth,prefix)
 ret = 0
 for p in pngs:
-  print "Checking:",p
-  ret += checkimage.check_result_image(p,os.path.join(pth,os.path.split(p)[1]),checkimage.defaultThreshold)
+  ret += regression.check_result_image(p,os.path.join(pth,os.path.split(p)[1]))
 if ret == 0:
     os.removedirs(os.path.split(p)[0])
     os.remove("%s.mp4" % prefix)
diff --git a/testing/vcs/test_vcs_antialiasing.py b/testing/vcs/test_vcs_antialiasing.py
index 34f43e040..f744d3e04 100644
--- a/testing/vcs/test_vcs_antialiasing.py
+++ b/testing/vcs/test_vcs_antialiasing.py
@@ -1,4 +1,3 @@
-
 import vcs
 x=vcs.init()
 x.drawlogooff()
diff --git a/testing/vcs/test_vcs_aspect_ratio.py b/testing/vcs/test_vcs_aspect_ratio.py
index 1e59304a3..9e3cb3767 100644
--- a/testing/vcs/test_vcs_aspect_ratio.py
+++ b/testing/vcs/test_vcs_aspect_ratio.py
@@ -1,27 +1,20 @@
-
-import vcs
-import cdms2
-import sys
-import os
-import MV2
-import vcs,numpy,cdms2,MV2,os,sys
-src=sys.argv[1]
+import vcs, numpy, cdms2, MV2, os, sys, testing.regression as regression
+src = sys.argv[1]
 pth0 = os.path.dirname(_file__)
 pth = os.path.join(pth0,"..")
 sys.path.append(pth)
-import checkimage
 
-f=cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
-s=f("clt",time=slice(0,1),squeeze=1)
-gm=vcs.createisofill()
+f = cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
+s = f("clt",time=slice(0,1),squeeze=1)
+gm = vcs.createisofill()
 
 def plot_a_ratio(s,gm,ratio):
     ret = 0
-    x=vcs.init()
-x.drawlogooff()
+    x = regression.init()
+    x.drawlogooff()
     x.open()
     x.geometry(400,800)
-    y=vcs.init()
+    y = regression.init()
     y.open()
     y.geometry(800,400)
     for X in [x,y]:
@@ -32,19 +25,13 @@ x.drawlogooff()
             orient = "port"
         fnm = "aspect_ratio_%s_%s.png" % (orient,ratio)
         X.png(fnm)
-        print "fnm:",fnm
         src = os.path.join(pth0,fnm)
-        print "src:",src
-        ret += checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
+        ret += regression.check_result_image(fnm, src)
     return ret
 
-ret = 0 
+ret = 0
 for ratio in ["1t","2t",".5t","autot"]:
     ret  += plot_a_ratio(s,gm,ratio)
 
 
-sys.exit(ret)
-
-
-
-
+sys.exit(ret)
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_auto_time_labels.py b/testing/vcs/test_vcs_auto_time_labels.py
index 2dfa661a9..e5422b29c 100644
--- a/testing/vcs/test_vcs_auto_time_labels.py
+++ b/testing/vcs/test_vcs_auto_time_labels.py
@@ -1,18 +1,7 @@
-import vcs,cdms2,os,sys
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-f=cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
-s=f("clt",longitude=slice(34,35),squeeze=1)
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
+import vcs, cdms2, os, sys, testing.regression as regression
+
+f = cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
+s = f("clt",longitude=slice(34,35),squeeze=1)
+x = regression.init()
 x.plot(s,bg=1)
-fnm = "test_vcs_auto_time_labels.png"
-x.png(fnm)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, "test_vcs_auto_time_labels.png", sys.argv[1])
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_autot_axis_titles.py b/testing/vcs/test_vcs_autot_axis_titles.py
index ec485ccc0..dcc0f00b1 100644
--- a/testing/vcs/test_vcs_autot_axis_titles.py
+++ b/testing/vcs/test_vcs_autot_axis_titles.py
@@ -1,7 +1,4 @@
-import vcs
-import cdms2
-import os
-import sys
+import vcs, cdms2, os, sys, testing.regression as regression
 
 testConfig = {'a_boxfill': ('clt.nc', 'clt'),
               'a_mollweide_boxfill': ('clt.nc', 'clt'),
@@ -11,10 +8,6 @@ testConfig = {'a_boxfill': ('clt.nc', 'clt'),
               'a_robinson_isoline': ('clt.nc', 'clt')}
 
 # Tests if ratio=autot works correctly for background and foreground plots
-src = sys.argv[1]
-bg = 1
-if (sys.argv[2] == 'foreground'):
-    bg = 0
 plot = sys.argv[3]
 x_over_y = sys.argv[4]
 if (x_over_y == '0.5'):
@@ -26,12 +19,9 @@ else:
 pth = os.path.join(os.path.dirname(__file__), "..")
 sys.path.append(pth)
 
-import checkimage
-
 f = cdms2.open(vcs.sample_data + "/" + testConfig[plot][0])
 s = f(testConfig[plot][1])
-
-x = vcs.init(bg=bg, geometry=(xSize, ySize))
+x = regression.init(bg=bg, geometry=(xSize, ySize))
 
 # graphics method
 if (plot.find('boxfill') != -1):
@@ -50,10 +40,4 @@ x.setantialiasing(0)
 x.drawlogooff()
 x.plot(s, gm, ratio="autot")
 name = "test_autot_axis_titles_" + plot[2:] + "_" + x_over_y + "_" + str(bg) + ".png"
-x.png(name)
-
-print "name:", name
-print "src:", src
-
-ret = checkimage.check_result_image(name, src, checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, name, sys.argv[1])
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_bad_time_units.py b/testing/vcs/test_vcs_bad_time_units.py
index b89c2f7a7..0bdcd16c2 100644
--- a/testing/vcs/test_vcs_bad_time_units.py
+++ b/testing/vcs/test_vcs_bad_time_units.py
@@ -1,8 +1,8 @@
-import cdms2,vcs
-import os,sys
+import cdms2, vcs
+import os, sys
 
-f=cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
-s=f("clt",slice(0,1))
+f = cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
+s = f("clt",slice(0,1))
 s.getTime().units="XXX-))rvv"
-x=vcs.init()
-x.plot(s,bg=1)
+x = vcs.init()
+x.plot(s, bg=1)
diff --git a/testing/vcs/test_vcs_basic_gms.py b/testing/vcs/test_vcs_basic_gms.py
index daa144d9d..2cffb86e6 100644
--- a/testing/vcs/test_vcs_basic_gms.py
+++ b/testing/vcs/test_vcs_basic_gms.py
@@ -1,6 +1,4 @@
-
-import sys,os
-import argparse
+import argparse, os, sys, cdms2, MV2, testing.regression as regression, vcs, vtk
 
 p = argparse.ArgumentParser(description="Basic gm testing code for vcs")
 p.add_argument("--source", dest="src", help="source image file")
@@ -25,20 +23,9 @@ args = p.parse_args(sys.argv[1:])
 
 gm_type= args.gm
 src = args.src
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-
-import vcs
-import sys
-import cdms2
-import vtk
-import os
-import MV2
-
 bg = not args.show
 
-x=vcs.init()
+x = vcs.init()
 x.setantialiasing(0)
 x.drawlogooff()
 if bg:
@@ -143,7 +130,7 @@ print "fnm:",fnm
 print "src:",src
 if args.show:
     raw_input("Press Enter")
-ret = checkimage.check_result_image(fnm+'.png',src,20., cleanup=not args.keep)
+ret = regression.check_result_image(fnm+'.png',src,20., cleanup=not args.keep)
 if args.show:
     raw_input("Press Enter")
 sys.exit(ret)
diff --git a/testing/vcs/test_vcs_basic_text.py b/testing/vcs/test_vcs_basic_text.py
index d46bd4f48..d69f37ce0 100644
--- a/testing/vcs/test_vcs_basic_text.py
+++ b/testing/vcs/test_vcs_basic_text.py
@@ -1,11 +1,6 @@
 
-import vcs,numpy,cdms2,MV2,os,sys
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-
-x=vcs.init()
+import vcs, numpy, cdms2, MV2, os, sys, testing.regression as regression
+x = regression.init()
 x.drawlogooff()
 x.setbgoutputdimensions(1200,1091,units="pixels")
 txt=x.createtext()
@@ -16,10 +11,4 @@ txt.halign = "center"
 txt.valign="base"
 txt.angle=45
 x.plot(txt,bg=1)
-fnm = "test_basic_text.png"
-x.png(fnm)
-
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, "test_basic_text.png", sys.argv[1])
diff --git a/testing/vcs/test_vcs_basic_vectors.py b/testing/vcs/test_vcs_basic_vectors.py
index 561f7f2d8..37626e670 100644
--- a/testing/vcs/test_vcs_basic_vectors.py
+++ b/testing/vcs/test_vcs_basic_vectors.py
@@ -1,6 +1,5 @@
+import argparse, os, sys, numpy, cdms2, MV2, vcs, vtk
 
-import sys,os
-import argparse
 
 p = argparse.ArgumentParser(description="Basic gm testing code for vcs")
 p.add_argument("--source", dest="src", help="source image file")
@@ -18,21 +17,11 @@ args = p.parse_args(sys.argv[1:])
 
 if not args.show:
   src = args.src
-  pth = os.path.join(os.path.dirname(__file__),"..")
-  sys.path.append(pth)
-  import checkimage
-
-import vcs
-import sys
-import cdms2
-import vtk
-import os
-import MV2
-import numpy
+  import testing.regression as regression
 
 bg = not args.show
 
-x=vcs.init()
+x = vcs.init()
 x.setantialiasing(0)
 x.drawlogooff()
 if bg:
@@ -95,7 +84,7 @@ else:
   x.png(fnm)
   print "fnm:",fnm
   print "src:",src
-  ret = checkimage.check_result_image(fnm+'.png',src,checkimage.defaultThreshold, cleanup=not args.keep)
+  ret = regression.check_result_image(fnm+'.png',src, regression.defaultThreshold, cleanup=not args.keep)
 if args.show:
     raw_input("Press Enter")
 sys.exit(ret)
diff --git a/testing/vcs/test_vcs_box_custom_as_def_vistrails_exts.py b/testing/vcs/test_vcs_box_custom_as_def_vistrails_exts.py
index c012c09ca..7d81b8981 100644
--- a/testing/vcs/test_vcs_box_custom_as_def_vistrails_exts.py
+++ b/testing/vcs/test_vcs_box_custom_as_def_vistrails_exts.py
@@ -1,30 +1,12 @@
-import vcs
-import cdms2
-import os
-import sys
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-
-f=cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
-s=f("clt",slice(0,1),squeeze=1)
-
-x=vcs.init()
-x.drawlogooff()
-x.setantialiasing(0)
-x.setbgoutputdimensions(1200,1091,units="pixels")
-
-gm=x.createboxfill()
-gm.boxfill_type="custom"
-gm.levels=[1.e20,1.e20]
-gm.ext_1="y"
-gm.ext_2="y"
-
-x.plot(s,gm,bg=1)
-fnm = "test_box_custom_as_def_vistrails_exts.png"
-src =sys.argv[1]
-x.png(fnm)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+import os, sys, cdms2, vcs, testing.regression as regression
+
+f = cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
+s = f("clt",slice(0,1),squeeze=1)
+x = regression.init()
+gm = x.createboxfill()
+gm.boxfill_type = "custom"
+gm.levels = [1.e20,1.e20]
+gm.ext_1 = "y"
+gm.ext_2 = "y"
+x.plot(s, gm, bg=1)
+regression.run(x, "test_box_custom_as_def_vistrails_exts.png", sys.argv[1])
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_boxfill_10x10_masked_numpy.py b/testing/vcs/test_vcs_boxfill_10x10_masked_numpy.py
index b2cdf8319..2444cc8a8 100644
--- a/testing/vcs/test_vcs_boxfill_10x10_masked_numpy.py
+++ b/testing/vcs/test_vcs_boxfill_10x10_masked_numpy.py
@@ -1,23 +1,9 @@
+import vcs, numpy, os, sys, testing.regression as regression
 
-import vcs,numpy,os,sys
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+s = numpy.sin(numpy.arange(100))
+s = numpy.reshape(s,(10,10))
+s = numpy.ma.masked_greater(s,.5)
 
-s= numpy.sin(numpy.arange(100))
-s=numpy.reshape(s,(10,10))
-s=numpy.ma.masked_greater(s,.5)
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
-x.plot(s,bg=1)
-fnm= "test_vcs_boxfill_10x10_masked_numpy.png"
-
-x.png(fnm)
-
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+x = regression.init()
+x.plot(s, bg=1)
+regression.run(x, "test_vcs_boxfill_10x10_masked_numpy.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_boxfill_10x10_numpy.py b/testing/vcs/test_vcs_boxfill_10x10_numpy.py
index 079105198..a45aa5889 100644
--- a/testing/vcs/test_vcs_boxfill_10x10_numpy.py
+++ b/testing/vcs/test_vcs_boxfill_10x10_numpy.py
@@ -1,22 +1,7 @@
+import vcs, numpy, os, sys, testing.regression as regression
 
-import vcs,numpy,os,sys
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-
-s= numpy.sin(numpy.arange(100))
-s=numpy.reshape(s,(10,10))
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
-x.plot(s,bg=1)
-fnm= "test_vcs_boxfill_10x10_numpy.png"
-
-x.png(fnm)
-
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+s = numpy.sin(numpy.arange(100))
+s = numpy.reshape(s,(10,10))
+x = regression.init()
+x.plot(s)
+regression.run(x, "test_vcs_boxfill_10x10_numpy.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_boxfill_custom.py b/testing/vcs/test_vcs_boxfill_custom.py
index 16685d971..5330a1103 100644
--- a/testing/vcs/test_vcs_boxfill_custom.py
+++ b/testing/vcs/test_vcs_boxfill_custom.py
@@ -1,7 +1,4 @@
-import cdms2
-import os
-import sys
-import vcs
+import cdms2, os, sys, vcs, testing.regression as regression
 
 # Load the clt data:
 dataFile = cdms2.open(os.path.join(vcs.sample_data, "clt.nc"))
@@ -10,10 +7,7 @@ clt = clt(latitude=(-90.0, 90.0), longitude=(-180., 175.), squeeze=1,
           time=('1979-1-1 0:0:0.0', '1988-12-1 0:0:0.0'))
 
 # Initialize canvas:
-canvas = vcs.init()
-canvas.setantialiasing(0)
-canvas.setbgoutputdimensions(1200,1091,units="pixels")
-canvas.drawlogooff()
+canvas = regression.init()
 
 # Create and plot quick boxfill with default settings:
 boxfill=canvas.createboxfill()
@@ -24,14 +18,5 @@ boxfill.boxfill_type = 'custom'
 canvas.plot(clt, boxfill, bg=1)
 
 # Load the image testing module:
-testingDir = os.path.join(os.path.dirname(__file__), "..")
-sys.path.append(testingDir)
-import checkimage
-
 # Create the test image and compare:
-baseline = sys.argv[1]
-testFile = "test_boxfill_custom.png"
-canvas.png(testFile)
-ret = checkimage.check_result_image(testFile, baseline,
-                                    checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(canvas, "test_boxfill_custom.png")
diff --git a/testing/vcs/test_vcs_boxfill_custom_ext1.py b/testing/vcs/test_vcs_boxfill_custom_ext1.py
index dd16ab837..7a5e2005e 100644
--- a/testing/vcs/test_vcs_boxfill_custom_ext1.py
+++ b/testing/vcs/test_vcs_boxfill_custom_ext1.py
@@ -1,7 +1,4 @@
-import cdms2
-import os
-import sys
-import vcs
+import cdms2, os, sys, vcs, testing.regression as regression
 
 # Load the clt data:
 dataFile = cdms2.open(os.path.join(vcs.sample_data, "clt.nc"))
@@ -10,10 +7,7 @@ clt = clt(latitude=(-90.0, 90.0), longitude=(-180., 175.), squeeze=1,
           time=('1979-1-1 0:0:0.0', '1988-12-1 0:0:0.0'))
 
 # Initialize canvas:
-canvas = vcs.init()
-canvas.setantialiasing(0)
-canvas.setbgoutputdimensions(1200,1091,units="pixels")
-canvas.drawlogooff()
+canvas = regression.init()
 
 # Create and plot quick boxfill with default settings:
 boxfill=canvas.createboxfill()
@@ -28,14 +22,4 @@ boxfill.fillareacolors=vcs.getcolors(boxfill.levels)
 canvas.plot(clt, boxfill, bg=1)
 
 # Load the image testing module:
-testingDir = os.path.join(os.path.dirname(__file__), "..")
-sys.path.append(testingDir)
-import checkimage
-
-# Create the test image and compare:
-baseline = sys.argv[1]
-testFile = "test_boxfill_custom_ext1.png"
-canvas.png(testFile)
-ret = checkimage.check_result_image(testFile, baseline,
-                                    checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(canvas, "test_boxfill_custom_ext1.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_boxfill_custom_ext1_ext2.py b/testing/vcs/test_vcs_boxfill_custom_ext1_ext2.py
index 68b5a9a41..744071671 100644
--- a/testing/vcs/test_vcs_boxfill_custom_ext1_ext2.py
+++ b/testing/vcs/test_vcs_boxfill_custom_ext1_ext2.py
@@ -1,7 +1,4 @@
-import cdms2
-import os
-import sys
-import vcs
+import os, sys, cdms2, vcs, testing.regression as regression
 
 # Load the clt data:
 dataFile = cdms2.open(os.path.join(vcs.sample_data, "clt.nc"))
@@ -10,10 +7,7 @@ clt = clt(latitude=(-90.0, 90.0), longitude=(-180., 175.), squeeze=1,
           time=('1979-1-1 0:0:0.0', '1988-12-1 0:0:0.0'))
 
 # Initialize canvas:
-canvas = vcs.init()
-canvas.setantialiasing(0)
-canvas.setbgoutputdimensions(1200,1091,units="pixels")
-canvas.drawlogooff()
+canvas = regression.init()
 
 # Create and plot quick boxfill with default settings:
 boxfill=canvas.createboxfill()
@@ -29,14 +23,4 @@ boxfill.fillareacolors=vcs.getcolors(boxfill.levels)
 canvas.plot(clt, boxfill, bg=1)
 
 # Load the image testing module:
-testingDir = os.path.join(os.path.dirname(__file__), "..")
-sys.path.append(testingDir)
-import checkimage
-
-# Create the test image and compare:
-baseline = sys.argv[1]
-testFile = "test_boxfill_custom_ext1_ext2.png"
-canvas.png(testFile)
-ret = checkimage.check_result_image(testFile, baseline,
-                                    checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(canvas, "test_boxfill_custom_ext1_ext2.png")
diff --git a/testing/vcs/test_vcs_boxfill_custom_ext2.py b/testing/vcs/test_vcs_boxfill_custom_ext2.py
index 959fc2c6c..d45950bdb 100644
--- a/testing/vcs/test_vcs_boxfill_custom_ext2.py
+++ b/testing/vcs/test_vcs_boxfill_custom_ext2.py
@@ -3,6 +3,8 @@ import os
 import sys
 import vcs
 
+import testing.regression as regression
+
 # Load the clt data:
 dataFile = cdms2.open(os.path.join(vcs.sample_data, "clt.nc"))
 clt = dataFile("clt")
@@ -10,10 +12,7 @@ clt = clt(latitude=(-90.0, 90.0), longitude=(-180., 175.), squeeze=1,
           time=('1979-1-1 0:0:0.0', '1988-12-1 0:0:0.0'))
 
 # Initialize canvas:
-canvas = vcs.init()
-canvas.setantialiasing(0)
-canvas.setbgoutputdimensions(1200,1091,units="pixels")
-canvas.drawlogooff()
+canvas = regression.init()
 
 # Create and plot quick boxfill with default settings:
 boxfill=canvas.createboxfill()
@@ -27,15 +26,4 @@ boxfill.fillareacolors=vcs.getcolors(boxfill.levels)
 
 canvas.plot(clt, boxfill, bg=1)
 
-# Load the image testing module:
-testingDir = os.path.join(os.path.dirname(__file__), "..")
-sys.path.append(testingDir)
-import checkimage
-
-# Create the test image and compare:
-baseline = sys.argv[1]
-testFile = "test_boxfill_custom_ext2.png"
-canvas.png(testFile)
-ret = checkimage.check_result_image(testFile, baseline,
-                                    checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(canvas, "test_boxfill_custom_ext2.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_boxfill_custom_non_default_levels.py b/testing/vcs/test_vcs_boxfill_custom_non_default_levels.py
index 7363d2250..b84db2bb5 100644
--- a/testing/vcs/test_vcs_boxfill_custom_non_default_levels.py
+++ b/testing/vcs/test_vcs_boxfill_custom_non_default_levels.py
@@ -1,7 +1,4 @@
-import cdms2
-import os
-import sys
-import vcs
+import cdms2, os, sys, vcs, testing.regression as regression
 
 # Load the clt data:
 dataFile = cdms2.open(os.path.join(vcs.sample_data, "clt.nc"))
@@ -10,10 +7,7 @@ clt = clt(latitude=(-90.0, 90.0), longitude=(-180., 175.), squeeze=1,
           time=('1979-1-1 0:0:0.0', '1988-12-1 0:0:0.0'))
 
 # Initialize canvas:
-canvas = vcs.init()
-canvas.setantialiasing(0)
-canvas.setbgoutputdimensions(1200,1091,units="pixels")
-canvas.drawlogooff()
+canvas = regression.init()
 
 # Create and plot quick boxfill with default settings:
 boxfill=canvas.createboxfill()
@@ -25,16 +19,4 @@ boxfill.levels=levels
 boxfill.fillareacolors=vcs.getcolors(levels)
 
 canvas.plot(clt, boxfill, bg=1)
-
-# Load the image testing module:
-testingDir = os.path.join(os.path.dirname(__file__), "..")
-sys.path.append(testingDir)
-import checkimage
-
-# Create the test image and compare:
-baseline = sys.argv[1]
-testFile = "test_boxfill_custom_no_default_levels.png"
-canvas.png(testFile)
-ret = checkimage.check_result_image(testFile, baseline,
-                                    checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(canvas, "test_boxfill_custom_no_default_levels.png")
diff --git a/testing/vcs/test_vcs_boxfill_decreasing_latitude.py b/testing/vcs/test_vcs_boxfill_decreasing_latitude.py
index 009b947a9..1f727e3b5 100755
--- a/testing/vcs/test_vcs_boxfill_decreasing_latitude.py
+++ b/testing/vcs/test_vcs_boxfill_decreasing_latitude.py
@@ -1,23 +1,10 @@
 #!/usr/bin/env python
-import cdms2
-import cdutil
-import os
-import sys
-import vcs
-
-pth = os.path.join(os.path.dirname(__file__), "..")
-sys.path.append(pth)
-import checkimage
+import cdms2, cdutil, os, sys, vcs, testing.regression as regression
 
 f = cdms2.open(sys.argv[2])
 ice = f("variable_6")
-x = vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200, 900, units="pixels")
+x = regression.init()
 
-#gm = x.createisofill()
-#gm.label = "y"
 gm = x.createboxfill()
 gm.boxfill_type = "custom"
 
@@ -44,12 +31,8 @@ tmpl.legend.y1 = .03
 tmpl.legend.y2 = .055
 tmpl.max.priority = 1
 
-#tmpl.crdate.priority=1
-#tmpl.crdate.x=.8
-#tmpl.crdate.y=.95
 txt = x.createtext()
 txt.height = 20
-#txt.color=242
 txt.valign = "half"
 txt.halign = "center"
 
@@ -69,8 +52,4 @@ gm.datawc_y2 = 30
 gm.datawc_y1 = 90
 
 x.plot(ice, gm, tmpl, bg = 1)
-fnm = "test_boxfill_decreasing_latitude.png"
-x.png(fnm)
-ret = checkimage.check_result_image(fnm, sys.argv[1], checkimage.defaultThreshold)
-sys.exit(ret)
-
+regression.run(x, "test_boxfill_decreasing_latitude.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_boxfill_lambert_crash.py b/testing/vcs/test_vcs_boxfill_lambert_crash.py
index f1827882f..f445ba555 100644
--- a/testing/vcs/test_vcs_boxfill_lambert_crash.py
+++ b/testing/vcs/test_vcs_boxfill_lambert_crash.py
@@ -1,17 +1,10 @@
 #!/usr/bin/env python
-import cdms2
-import os
-import sys
-import vcs
-
-pth = os.path.join(os.path.dirname(__file__), "..")
-sys.path.append(pth)
-import checkimage
+import cdms2, os, sys, vcs, testing.regression as regression
 
 f = cdms2.open(sys.argv[2])
-a=f("Z3")
+a = f("Z3")
 
-x=vcs.init()
+x = regression.init()
 x.setantialiasing(0)
 x.drawlogooff()
 x.setbgoutputdimensions(1200, 900, units="pixels")
@@ -24,6 +17,4 @@ x.plot(a(latitude=(20,60),longitude=(-160,-120)),b, bg=1)
 fileName = os.path.basename(__file__)
 fileName = os.path.splitext(fileName)[0]
 fileName += '.png'
-x.png(fileName)
-ret = checkimage.check_result_image(fileName, sys.argv[1], checkimage.defaultThreshold)
-sys.exit(ret)
+ret = regression.run(x, fileName)
diff --git a/testing/vcs/test_vcs_boxfill_lev1_lev2.py b/testing/vcs/test_vcs_boxfill_lev1_lev2.py
index 5c69d7af3..c5b5cbcbe 100644
--- a/testing/vcs/test_vcs_boxfill_lev1_lev2.py
+++ b/testing/vcs/test_vcs_boxfill_lev1_lev2.py
@@ -1,25 +1,10 @@
-
-import cdms2,sys,vcs,sys,os
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-f=cdms2.open(vcs.sample_data+"/clt.nc")
-s=f("clt",slice(0,1),squeeze=1)
-b=x.createboxfill()
-b.level_1=.5
-b.level_2=14.5
-x.plot(s,b,bg=1)
-
-fnm= "test_boxfill_lev1_lev2.png"
-
-x.png(fnm)
-
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
-
+import os, sys, cdms2, vcs, testing.regression as regression
+
+x = regression.init()
+f = cdms2.open(vcs.sample_data+"/clt.nc")
+s = f("clt",slice(0,1),squeeze=1)
+b = x.createboxfill()
+b.level_1 = .5
+b.level_2 = 14.5
+x.plot(s, b, bg=1)
+regression.run(x, "test_boxfill_lev1_lev2.png")
diff --git a/testing/vcs/test_vcs_boxfill_lev1_lev2_ext1.py b/testing/vcs/test_vcs_boxfill_lev1_lev2_ext1.py
index 594949238..67f87029e 100644
--- a/testing/vcs/test_vcs_boxfill_lev1_lev2_ext1.py
+++ b/testing/vcs/test_vcs_boxfill_lev1_lev2_ext1.py
@@ -1,26 +1,11 @@
-
-import cdms2,sys,vcs,sys,os
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-f=cdms2.open(vcs.sample_data+"/clt.nc")
-s=f("clt",slice(0,1),squeeze=1)
-b=x.createboxfill()
-b.level_1=20
-b.level_2=80
-b.ext_1="y"
-x.plot(s,b,bg=1)
-
-fnm= "test_boxfill_lev1_lev2_ext1.png"
-
-x.png(fnm)
-
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
-
+import os, sys, cdms2, vcs, testing.regression as regression
+
+x = regression.init()
+f = cdms2.open(vcs.sample_data+"/clt.nc")
+s = f("clt",slice(0,1),squeeze=1)
+b = x.createboxfill()
+b.level_1 = 20
+b.level_2 = 80
+b.ext_1 = "y"
+x.plot(s, b, bg=1)
+regression.run(x, "test_boxfill_lev1_lev2_ext1.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_boxfill_lev1_lev2_ext1_ext2.py b/testing/vcs/test_vcs_boxfill_lev1_lev2_ext1_ext2.py
index 9e355d1e1..dc7958c59 100644
--- a/testing/vcs/test_vcs_boxfill_lev1_lev2_ext1_ext2.py
+++ b/testing/vcs/test_vcs_boxfill_lev1_lev2_ext1_ext2.py
@@ -1,27 +1,12 @@
-
-import cdms2,sys,vcs,sys,os
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-f=cdms2.open(vcs.sample_data+"/clt.nc")
-s=f("clt",slice(0,1),squeeze=1)
-b=x.createboxfill()
-b.level_1=20
-b.level_2=80
-b.ext_1="y"
-b.ext_2="y"
-x.plot(s,b,bg=1)
-
-fnm= "test_boxfill_lev1_lev2_ext1_ext2.png"
-
-x.png(fnm)
-
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
-
+import os, sys, cdms2, vcs, testing.regression as regression
+
+x = regression.init()
+f = cdms2.open(vcs.sample_data+"/clt.nc")
+s = f("clt", slice(0,1), squeeze=1)
+b = x.createboxfill()
+b.level_1 = 20
+b.level_2 = 80
+b.ext_1 = "y"
+b.ext_2 = "y"
+x.plot(s, b, bg=1)
+regression.run(x, "test_boxfill_lev1_lev2_ext1_ext2.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_boxfill_lev1_lev2_ext2.py b/testing/vcs/test_vcs_boxfill_lev1_lev2_ext2.py
index 375c93d8a..398325eab 100644
--- a/testing/vcs/test_vcs_boxfill_lev1_lev2_ext2.py
+++ b/testing/vcs/test_vcs_boxfill_lev1_lev2_ext2.py
@@ -1,26 +1,11 @@
-
-import cdms2,sys,vcs,sys,os
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-f=cdms2.open(vcs.sample_data+"/clt.nc")
-s=f("clt",slice(0,1),squeeze=1)
-b=x.createboxfill()
-b.level_1=20
-b.level_2=80
-b.ext_2="y"
-x.plot(s,b,bg=1)
-
-fnm= "test_boxfill_lev1_lev2_ext2.png"
-
-x.png(fnm)
-
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
-
+import os, sys, cdms2, vcs, testing.regression as regression
+
+x = regression.init()
+f = cdms2.open(vcs.sample_data+"/clt.nc")
+s = f("clt",slice(0,1),squeeze=1)
+b = x.createboxfill()
+b.level_1 = 20
+b.level_2 = 80
+b.ext_2 = "y"
+x.plot(s, b, bg=1)
+regression.run(x, "test_boxfill_lev1_lev2_ext2.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_boxfill_lev1_lev2_ta_missing.py b/testing/vcs/test_vcs_boxfill_lev1_lev2_ta_missing.py
index 984179e5c..d2a39a1ba 100644
--- a/testing/vcs/test_vcs_boxfill_lev1_lev2_ta_missing.py
+++ b/testing/vcs/test_vcs_boxfill_lev1_lev2_ta_missing.py
@@ -1,28 +1,11 @@
-
-import cdms2,sys,vcs,sys,os
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
-f=cdms2.open(vcs.sample_data+"/ta_ncep_87-6-88-4.nc")
-s=f("ta",slice(0,1),longitude=slice(34,35),squeeze=1)-273.15
-s=cdms2.MV2.masked_less(s,-45.)
-b=x.createboxfill()
-b.level_1=-40
-b.level_2=40
-x.plot(s,b,bg=1)
-
-fnm= "test_boxfill_lev1_lev2_ta_missing.png"
-
-x.png(fnm)
-
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
-raw_input()
-
+import os, sys, cdms2, vcs, testing.regression as regression
+
+x = regression.init()
+f = cdms2.open(vcs.sample_data+"/ta_ncep_87-6-88-4.nc")
+s = f("ta",slice(0,1),longitude=slice(34,35),squeeze=1)-273.15
+s = cdms2.MV2.masked_less(s,-45.)
+b = x.createboxfill()
+b.level_1 = -40
+b.level_2 = 40
+x.plot(s, b, bg=1)
+regression.run(x, "test_boxfill_lev1_lev2_ta_missing.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_boxfill_polar.py b/testing/vcs/test_vcs_boxfill_polar.py
index e4f534c9d..869d09802 100644
--- a/testing/vcs/test_vcs_boxfill_polar.py
+++ b/testing/vcs/test_vcs_boxfill_polar.py
@@ -1,33 +1,16 @@
-#!/usr/bin/env python
-import cdms2
-import os
-import sys
-import vcs
+import os, sys, cdms2, vcs, testing.regression as regression
 
-pth = os.path.join(os.path.dirname(__file__), "..")
-sys.path.append(pth)
-import checkimage
 
 f = cdms2.open(vcs.sample_data + "/clt.nc")
-a=f("clt")
+a = f("clt")
 
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200, 900, units="pixels")
-
-p=x.getprojection("polar")
-b=x.createboxfill()
-b.projection=p
-#b.datawc_y1 = 90
-#b.datawc_y2 = -90
-
-x.setbgoutputdimensions(1200,1091,units="pixels")
+x = regression.init()
+p = x.getprojection("polar")
+b = x.createboxfill()
+b.projection = p
 x.plot(a(latitude=(90,-90)), b, bg=1)
 
 fileName = os.path.basename(__file__)
 fileName = os.path.splitext(fileName)[0]
 fileName += '.png'
-x.png(fileName)
-ret = checkimage.check_result_image(fileName, sys.argv[1], checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, fileName)
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_boxfill_robinson_wrap.py b/testing/vcs/test_vcs_boxfill_robinson_wrap.py
index 81b3206bd..de66e516c 100644
--- a/testing/vcs/test_vcs_boxfill_robinson_wrap.py
+++ b/testing/vcs/test_vcs_boxfill_robinson_wrap.py
@@ -1,15 +1,7 @@
-#!/usr/bin/env python
-import cdms2, cdutil, genutil
-import vcs,os
-import sys
+import os, sys, cdms2, cdutil, genutil, vcs, testing.regression as regression
 
 # This tests if extending the longitude to more than 360 decrees is handled correctly by
 # proj4. See https://github.com/UV-CDAT/uvcdat/issues/1728 for more information.
-pth = os.path.join(os.path.dirname(__file__), "..")
-sys.path.append(pth)
-import checkimage
-
-
 cdmsfile = cdms2.open(os.path.join(vcs.sample_data, "clt.nc"))
 clt2 = cdmsfile('clt')
 clt3 = clt2(latitude=(-90.0, 90.0),squeeze=1,longitude=(-180, 200.0),time=('1979-01', '1988-12'),)
@@ -19,7 +11,4 @@ kwargs = {}
 kwargs[ 'cdmsfile' ] = cdmsfile.id
 kwargs['bg'] = 1
 canvas.plot(clt3, gmBoxfill, **kwargs)
-fnm = "test_robinson_wrap.png"
-canvas.png(fnm)
-ret = checkimage.check_result_image(fnm, sys.argv[1], checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(canvas, "test_robinson_wrap.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_canvas_background.py b/testing/vcs/test_vcs_canvas_background.py
index 1d39b330d..2c72b51f3 100644
--- a/testing/vcs/test_vcs_canvas_background.py
+++ b/testing/vcs/test_vcs_canvas_background.py
@@ -1,19 +1,6 @@
-import vcs, cdms2, os, sys
-
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-
-x = vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(500,500,units="pixels")
+import os, sys, cdms2, vcs, testing.regression as regression
 
+x = regression.init()
 x.backgroundcolor = (255, 255, 255)
 x.open()
-fnm = "test_backgroundcolor_white.png"
-x.png(fnm)
-
-src=sys.argv[1]
-ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, "test_backgroundcolor_white.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_canvas_background_update.py b/testing/vcs/test_vcs_canvas_background_update.py
index 454f0ef09..a28c08713 100644
--- a/testing/vcs/test_vcs_canvas_background_update.py
+++ b/testing/vcs/test_vcs_canvas_background_update.py
@@ -1,22 +1,8 @@
-import vcs, cdms2, os, sys
-
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-
-x = vcs.init()
-
-x.drawlogooff()
-x.setbgoutputdimensions(500,500, units="pixels")
+import os, sys, cdms2, vcs, testing.regression as regression
 
+x = regression.init()
 x.backgroundcolor = (255, 255, 255)
 x.open()
 x.backgroundcolor = (255, 255, 0)
 x.update()
-fnm = "test_backgroundcolor_yellow.png"
-x.png(fnm)
-
-src=sys.argv[1]
-ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold)
-
-sys.exit(ret)
+regression.run(x, "test_backgroundcolor_yellow.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_click_info.py b/testing/vcs/test_vcs_click_info.py
index 0fe587792..c16a6c0d4 100644
--- a/testing/vcs/test_vcs_click_info.py
+++ b/testing/vcs/test_vcs_click_info.py
@@ -1,7 +1,4 @@
-import cdms2
-import sys
-import vcs
-import os
+import os, sys, cdms2, vcs, testing.regression as regression
 
 testConfig = {'a_boxfill': ('clt.nc', 'clt', (200, 200)),
               'a_mollweide_boxfill': ('clt.nc', 'clt', (222, 322)),
@@ -11,15 +8,7 @@ testConfig = {'a_boxfill': ('clt.nc', 'clt', (200, 200)),
 # Tests if the info produced when clicking on a map is correct.
 src = sys.argv[1]
 plot = sys.argv[2]
-pth = os.path.join(os.path.dirname(__file__), "..")
-sys.path.append(pth)
-import checkimage
-x = vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-# Needs to set the size of window so it is consistent accross
-# test platforms
-x.open(814, 606)
+x = regression.init()
 
 # data
 f = cdms2.open(vcs.sample_data + "/" + testConfig[plot][0])
@@ -47,7 +36,4 @@ fileName = os.path.basename(src)
 fileName = os.path.splitext(fileName)[0]
 fileName += '.png'
 
-x.png(fileName, width=814, height= 606)
-
-ret = checkimage.check_result_image(fileName, src, checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, fileName)
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_close.py b/testing/vcs/test_vcs_close.py
index 7bf007224..3457a648e 100644
--- a/testing/vcs/test_vcs_close.py
+++ b/testing/vcs/test_vcs_close.py
@@ -1,7 +1,5 @@
 import os, sys, vcs, cdms2
-#import checkimage
 
-#src=sys.argv[1]
 pth = os.path.join(os.path.dirname(__file__),"..")
 sys.path.append(pth)
 cdmsfile = cdms2.open(vcs.sample_data+"/clt.nc")
@@ -9,8 +7,4 @@ data = cdmsfile('clt')
 x = vcs.init()
 x.plot(data, bg=1)
 x.close()
-#x.plot(data[4][1:89], bg=1)
-#fnm = "test_vcs_close.png"
-#x.png(fnm)
-#ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold)
 sys.exit(0)
diff --git a/testing/vcs/test_vcs_colormaps_source.py b/testing/vcs/test_vcs_colormaps_source.py
index 1dcc7d880..2cfc02721 100644
--- a/testing/vcs/test_vcs_colormaps_source.py
+++ b/testing/vcs/test_vcs_colormaps_source.py
@@ -1,27 +1,12 @@
-import vcs
-import argparse
-import cdms2
-import  os
-import sys
-
-
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import argparse, os, sys, cdms2, vcs, testing.regression as regression
 
 parser = argparse.ArgumentParser()
-
 parser.add_argument("-g",dest="gm",default="boxfill",choices = ["boxfill","isofill","meshfill","isoline","vector","1d"])
 parser.add_argument("-s",dest="src",default="vcs",choices=["vcs","canvas","gm"])
 parser.add_argument("-b",dest="baseline")
-
-
 args = parser.parse_args()
 
-x=vcs.init()
-x.setantialiasing(0)
-x.setbgoutputdimensions(1200, 1091, units="pixels")
-x.drawlogooff()
+x = regression.init()
 
 exec("gm = x.create%s()" % args.gm)
 
@@ -55,7 +40,4 @@ else:
 fnm = "test_vcs_colormaps_source_%s_%s.png" % (args.gm,args.src)
 x.png(fnm)
 baselineImage = args.baseline
-ret = checkimage.check_result_image(fnm, baselineImage,
-                                    checkimage.defaultThreshold)
-
-sys.exit(ret)
+ret = regression.run(x, fnm, baselineImage)
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_colorpicker_appearance.py b/testing/vcs/test_vcs_colorpicker_appearance.py
index c92534071..4ccba61fd 100644
--- a/testing/vcs/test_vcs_colorpicker_appearance.py
+++ b/testing/vcs/test_vcs_colorpicker_appearance.py
@@ -1,7 +1,6 @@
 import vcs, vtk
 
 picker = vcs.colorpicker.ColorPicker(500, 250, None, 0)
-
 win = picker.render_window
 
 win.Render()
@@ -16,8 +15,6 @@ png_writer.Write()
 
 import sys, os
 if len(sys.argv) > 1:
-    src = sys.argv[1]
-    sys.path.append(os.path.join(os.path.dirname(__file__), ".."))
-    import checkimage
-    ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold)
+    import testing.regression as regression
+    ret = regression.check_result_image(fnm, sys.argv[1])
     sys.exit(ret)
diff --git a/testing/vcs/test_vcs_configurator_resize.py b/testing/vcs/test_vcs_configurator_resize.py
index b6179626d..7692e6218 100644
--- a/testing/vcs/test_vcs_configurator_resize.py
+++ b/testing/vcs/test_vcs_configurator_resize.py
@@ -20,9 +20,7 @@ png_writer.Write()
 
 import sys, os
 if len(sys.argv) > 1:
-    pth = os.path.join(os.path.dirname(__file__), "..")
-    sys.path.append(pth)
-    import checkimage
+    import testing.regression as regression
     src = sys.argv[1]
-    ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold)
-    sys.exit(ret)
+    ret = regression.check_result_image(fnm, src)
+    sys.exit(ret)
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_continents.py b/testing/vcs/test_vcs_continents.py
index 9ae3d62de..c102df9de 100644
--- a/testing/vcs/test_vcs_continents.py
+++ b/testing/vcs/test_vcs_continents.py
@@ -1,22 +1,14 @@
-import cdms2
-import os
-import sys
-import vcs
-import EzTemplate
+import os, sys, EzTemplate, cdms2, vcs, testing.regression as regression
 
 # Load the clt data:
 dataFile = cdms2.open(os.path.join(vcs.sample_data, "clt.nc"))
 clt = dataFile("clt", time="1979-1-1", squeeze=1)
 
-
 # Zero out the array so we can see the continents clearly
 clt[:] = 0
 
 # Initialize canvas:
-canvas = vcs.init()
-canvas.setantialiasing(0)
-canvas.setbgoutputdimensions(1200, 1091, units="pixels")
-canvas.drawlogooff()
+canvas = regression.init()
 
 # Create and plot quick boxfill with default settings:
 boxfill = canvas.createboxfill()
@@ -64,15 +56,4 @@ for i in range(12):
         canvas.plot(clt, template, boxfill, continents=7, continents_line=cont_line, bg=1)
         os.environ["UVCDAT_DIR"] = current_dotdir
 
-# Load the image testing module:
-testingDir = os.path.join(os.path.dirname(__file__), "..")
-sys.path.append(testingDir)
-import checkimage
-
-# Create the test image and compare:
-baseline = sys.argv[1]
-testFile = "test_continents.png"
-canvas.png(testFile)
-ret = checkimage.check_result_image(testFile, baseline,
-                                    25)
-sys.exit(ret)
+regression.run(canvas, "test_continents.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_create_get.py b/testing/vcs/test_vcs_create_get.py
index ec525d1b4..adb879d64 100644
--- a/testing/vcs/test_vcs_create_get.py
+++ b/testing/vcs/test_vcs_create_get.py
@@ -1,4 +1,3 @@
-
 import vcs
 x=vcs.init()
 x.drawlogooff()
diff --git a/testing/vcs/test_vcs_draw_logo_on.py b/testing/vcs/test_vcs_draw_logo_on.py
index 65271eb15..4a0c28d2c 100644
--- a/testing/vcs/test_vcs_draw_logo_on.py
+++ b/testing/vcs/test_vcs_draw_logo_on.py
@@ -1,19 +1,9 @@
-import vcs,numpy,cdms2,MV2,os,sys
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import vcs, numpy, cdms2, MV2, os, sys, testing.regression as regression
 
-x=vcs.init()
-x.setantialiasing(0)
-x.setbgoutputdimensions(1200,1091,units="pixels")
+x = vcs.init()
 a=numpy.arange(100)
 a.shape=(10,10)
 x.plot(a,bg=1)
 fnm = "test_vcs_draw_logo_on.png"
 x.png(fnm)
-
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.check_result_image(fnm, sys.argv[1])
diff --git a/testing/vcs/test_vcs_fillarea_transparency.py b/testing/vcs/test_vcs_fillarea_transparency.py
index dc3a8bf4b..831b3e029 100644
--- a/testing/vcs/test_vcs_fillarea_transparency.py
+++ b/testing/vcs/test_vcs_fillarea_transparency.py
@@ -1,13 +1,6 @@
-import vcs
-import sys,os
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import vcs, sys, os, testing.regression as regression
 
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1090,units="pixels")
+x = regression.init()
 
 fa1 = x.createfillarea()
 
@@ -29,8 +22,4 @@ x.plot(fa1,bg=True)
 x.plot(fa2,bg=True)
 
 fnm = os.path.split(__file__[:-2]+"png")[-1]
-x.png(fnm)
-src = sys.argv[1]
-
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, fnm)
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_first_png_blank.py b/testing/vcs/test_vcs_first_png_blank.py
index d11c59e6d..1e0bd8e28 100644
--- a/testing/vcs/test_vcs_first_png_blank.py
+++ b/testing/vcs/test_vcs_first_png_blank.py
@@ -1,20 +1,7 @@
+import vcs, numpy, cdms2, MV2, os, sys, testing.regression as regression
 
-import vcs,numpy,cdms2,MV2,os,sys
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
 f=cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
 T=f('clt')
-v = vcs.init()
-v.setantialiasing(0)
-v.setbgoutputdimensions(1200,1091,units="pixels")
+v = regression.init()
 v.plot(T,bg=1)
-# This will write a blank plot to a file:
-fnm = "first_png_blank.png"
-v.png(fnm)
-
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(v, 'first_png_blank.png')
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_flipNone.py b/testing/vcs/test_vcs_flipNone.py
index a76e271f1..79b69ffdd 100644
--- a/testing/vcs/test_vcs_flipNone.py
+++ b/testing/vcs/test_vcs_flipNone.py
@@ -1,26 +1,8 @@
+import vcs, numpy, cdms2, MV2, os, sys, testing.regression as regression
 
-import vcs,numpy,cdms2,MV2,os,sys
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-
-x.setbgoutputdimensions(1200,1091,units="pixels")
-
-f=cdms2.open(os.path.join(vcs.sample_data,"ta_ncep_87-6-88-4.nc"))
-
-
+x = regression.init()
+f = cdms2.open(os.path.join(vcs.sample_data,"ta_ncep_87-6-88-4.nc"))
 vr = "ta"
 s=f(vr,slice(0,1),longitude=slice(90,91),squeeze=1,level=(0,10000))
 x.plot(s,bg=1)
-fnm = "test_vcs_flipNone.png"
-x.png(fnm)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
-
-
+regression.run(x, 'test_vcs_flipNone.png')
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_flipX.py b/testing/vcs/test_vcs_flipX.py
index 0de7001aa..e211bf16a 100644
--- a/testing/vcs/test_vcs_flipX.py
+++ b/testing/vcs/test_vcs_flipX.py
@@ -1,26 +1,8 @@
+import vcs, numpy, cdms2, MV2, os, sys, testing.regression as regression
 
-import vcs,numpy,cdms2,MV2,os,sys
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-
-x.setbgoutputdimensions(1200,1091,units="pixels")
-
-f=cdms2.open(os.path.join(vcs.sample_data,"ta_ncep_87-6-88-4.nc"))
-
-
+x = regression.init()
+f = cdms2.open(os.path.join(vcs.sample_data,"ta_ncep_87-6-88-4.nc"))
 vr = "ta"
 s=f(vr,slice(0,1),longitude=slice(90,91),squeeze=1,latitude=(90,-90),level=(0,10000))
 x.plot(s,bg=1)
-fnm = "test_vcs_flipX.png"
-x.png(fnm)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
-
-
+regression.run(x, 'test_vcs_flipX.png')
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_flipXY.py b/testing/vcs/test_vcs_flipXY.py
index 8dd0f8d89..779a0fe7e 100644
--- a/testing/vcs/test_vcs_flipXY.py
+++ b/testing/vcs/test_vcs_flipXY.py
@@ -1,26 +1,9 @@
+import vcs, numpy, cdms2, MV2, os, sys, testing.regression as regression
 
-import vcs,numpy,cdms2,MV2,os,sys
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-
-x.setbgoutputdimensions(1200,1091,units="pixels")
-
-f=cdms2.open(os.path.join(vcs.sample_data,"ta_ncep_87-6-88-4.nc"))
-
+x = regression.init()
+f = cdms2.open(os.path.join(vcs.sample_data,"ta_ncep_87-6-88-4.nc"))
 
 vr = "ta"
 s=f(vr,slice(0,1),longitude=slice(90,91),squeeze=1,latitude=(90,-90))
 x.plot(s,bg=1)
-fnm = "test_vcs_flipXY.png"
-x.png(fnm)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
-
-
+regression.run(x, 'test_vcs_flipXY.png')
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_flipY.py b/testing/vcs/test_vcs_flipY.py
index 7194f3f30..5efa57745 100644
--- a/testing/vcs/test_vcs_flipY.py
+++ b/testing/vcs/test_vcs_flipY.py
@@ -1,26 +1,8 @@
+import vcs, numpy, cdms2, MV2, os, sys, testing.regression as regression
 
-import vcs,numpy,cdms2,MV2,os,sys
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-
-x.setbgoutputdimensions(1200,1091,units="pixels")
-
+x = regression.init()
 f=cdms2.open(os.path.join(vcs.sample_data,"ta_ncep_87-6-88-4.nc"))
-
-
 vr = "ta"
 s=f(vr,slice(0,1),longitude=slice(90,91),squeeze=1)
 x.plot(s,bg=1)
-fnm = "test_vcs_flipY.png"
-x.png(fnm)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
-
-
+regression.run(x, 'test_vcs_flipY.png')
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_gen_meshfill.py b/testing/vcs/test_vcs_gen_meshfill.py
index b726a20a6..e59940554 100644
--- a/testing/vcs/test_vcs_gen_meshfill.py
+++ b/testing/vcs/test_vcs_gen_meshfill.py
@@ -1,39 +1,16 @@
+import os, sys, numpy, vcs, testing.regression as regression
 
-import vcs,numpy,os,sys
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
-
+x = regression.init()
 
 data = numpy.array([1,2,3,4])
-
 blon = numpy.array([-1,1,1,0,-1])
 blat = numpy.array([0,0,1,2,1])
-
 acell=numpy.array([blat,blon])
 bcell = numpy.array([blat,blon+2.5])
 ccell = numpy.array([blat+2.5,blon+2.5])
 dcell = numpy.array([blat+2.5,blon])
-
 mesh = numpy.array([acell,bcell,ccell,dcell])
-
 m=x.createmeshfill()
 
 x.plot(data,mesh,m,bg=1)
-
-
-fnm = "test_vcs_gen_meshfill.png"
-x.png(fnm)
-
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
-
-
+regression.run(x, "test_vcs_gen_meshfill.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_gms_animate_projected_plots.py b/testing/vcs/test_vcs_gms_animate_projected_plots.py
index 2e521cd4a..3de234e41 100644
--- a/testing/vcs/test_vcs_gms_animate_projected_plots.py
+++ b/testing/vcs/test_vcs_gms_animate_projected_plots.py
@@ -1,15 +1,5 @@
 # Test animation of projected plots
-
-import argparse
-import cdms2
-import MV2
-import os
-import sys
-import vcs
-
-pth = os.path.join(os.path.dirname(__file__), "..")
-sys.path.append(pth)
-import checkimage  # noqa
+import argparse, os, sys, cdms2, MV2, vcs, testing.regression as regression
 
 p = argparse.ArgumentParser(description="Testing animation of projected plots")
 p.add_argument("--gm_type", dest="gm", help="gm to test")
@@ -19,18 +9,13 @@ p.add_argument("--source", dest="src", help="path to baseline image")
 p.add_argument("--keep", dest="keep", action="store_true", default=False,
                help="Save images, even if baseline matches.")
 p.add_argument("--threshold", dest="threshold", type=int,
-               default=checkimage.defaultThreshold,
+               default=regression.defaultThreshold,
                help="Threshold value for image differnces")
 
 args = p.parse_args(sys.argv[1:])
 
 gm_type = args.gm
-
-x = vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200, 1091, units="pixels")
-
+x = regression.init()
 s = None
 
 if gm_type == "meshfill":
@@ -72,7 +57,7 @@ pngs = x.animate.close(preserve_pngs=True)  # so we can look at them again
 ret = 0
 pdir = os.path.split(pngs[0])[0]
 p = pdir + os.sep + "anim_0.png"
-ret = checkimage.check_result_image(p, args.src, args.threshold)
+ret = regression.check_result_image(p, args.src, args.threshold)
 if ret == 0 and not args.keep:
     for f in pngs:
         if os.path.isfile(f):
diff --git a/testing/vcs/test_vcs_gms_patterns_hatches.py b/testing/vcs/test_vcs_gms_patterns_hatches.py
index 4030429a0..a7681a420 100644
--- a/testing/vcs/test_vcs_gms_patterns_hatches.py
+++ b/testing/vcs/test_vcs_gms_patterns_hatches.py
@@ -1,14 +1,4 @@
-# Test the use of patterns/hatches for plots
-
-import argparse
-import cdms2
-import os
-import sys
-import vcs
-
-pth = os.path.join(os.path.dirname(__file__), "..")
-sys.path.append(pth)
-import checkimage  # noqa
+import argparse, os, sys, cdms2, vcs, testing.regression as regression
 
 p = argparse.ArgumentParser(description="Patterns/hatches testing code for vcs gms")
 p.add_argument("--source", dest="src", help="source image file")
@@ -22,7 +12,7 @@ p.add_argument("--lat2", dest="lat2", default=90, type=float, help="Last latitud
 p.add_argument("--lon1", dest="lon1", default=-180, type=float, help="First Longitude")
 p.add_argument("--lon2", dest="lon2", default=180, type=float, help="Last Longitude")
 p.add_argument("--keep", dest="keep", action="store_true", help="Save image, even if baseline matches.")
-p.add_argument("--threshold", dest="threshold", type=int, default=checkimage.defaultThreshold,
+p.add_argument("--threshold", dest="threshold", type=int, default=regression.defaultThreshold,
         help="Default threshold")
 p.add_argument("--non-contiguous", dest="contig", default=True, action="store_false", help="use non contiguous levels")
 
@@ -98,7 +88,7 @@ fnm += nm_xtra
 x.png(fnm)
 print "fnm:", fnm
 print "src:", src
-ret = checkimage.check_result_image(fnm+'.png', src,
+ret = regression.check_result_image(fnm+'.png', src,
                                     args.threshold,
                                     cleanup=not args.keep)
 if args.show:
diff --git a/testing/vcs/test_vcs_hatches_patterns.py b/testing/vcs/test_vcs_hatches_patterns.py
index 8cd1766f0..8a467259c 100644
--- a/testing/vcs/test_vcs_hatches_patterns.py
+++ b/testing/vcs/test_vcs_hatches_patterns.py
@@ -1,17 +1,6 @@
-import os
-import sys
-import vcs
+import os, sys, vcs, testing.regression as regression
 
-pth = os.path.join(os.path.dirname(__file__), "..")
-sys.path.append(pth)
-import checkimage
-
-baselineImage = sys.argv[1]
-
-# Initialize the graphics canvas
-x = vcs.init()
-x.setantialiasing(0)
-x.setbgoutputdimensions(1200, 1091, units="pixels")
+x = regression.init()
 
 # Create a test plot for listing all the hatches and patterns
 style_list = []
@@ -77,11 +66,4 @@ plot_title.y = [.9]
 x.plot(plot_title, bg=1)
 x.plot(fill_test, bg=1)
 x.plot(fill_info, bg=1)
-
-testImage = os.path.abspath("test_vcs_hatches_patterns.png")
-x.png(testImage)
-
-ret = checkimage.check_result_image(testImage, baselineImage,
-                                    checkimage.defaultThreshold)
-
-sys.exit(ret)
+regression.run(x, "test_vcs_hatches_patterns.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_import.py b/testing/vcs/test_vcs_import.py
index c12242125..01c3d0447 100644
--- a/testing/vcs/test_vcs_import.py
+++ b/testing/vcs/test_vcs_import.py
@@ -1,3 +1,2 @@
-
 import vcs
 
diff --git a/testing/vcs/test_vcs_infinity.py b/testing/vcs/test_vcs_infinity.py
index 235f551eb..daf406016 100644
--- a/testing/vcs/test_vcs_infinity.py
+++ b/testing/vcs/test_vcs_infinity.py
@@ -1,28 +1,16 @@
-
-import vcs,numpy,cdms2,MV2,os,sys
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-import numpy
+import os, sys, numpy, MV2, cdms2, testing.regression as regression
 
 s= numpy.sin(numpy.arange(100))
-s=numpy.reshape(s,(10,10))
+s = numpy.reshape(s,(10,10))
 
 s[4,6] = numpy.inf
 s[7,9] = numpy.NINF
 s[9,2] = numpy.nan
 
-x=vcs.init()
+x = regression.init()
 x.setantialiasing(0)
 x.drawlogooff()
 x.setbgoutputdimensions(1200,1091,units="pixels")
 x.plot(s,bg=1)
 fnm = "infinity.png"
-x.png(fnm)
-
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
-
+regression.run(x, fnm)
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_iso_celine_part1.py b/testing/vcs/test_vcs_iso_celine_part1.py
index 586918d36..a8fcc5ae7 100644
--- a/testing/vcs/test_vcs_iso_celine_part1.py
+++ b/testing/vcs/test_vcs_iso_celine_part1.py
@@ -1,22 +1,13 @@
+import os,sys, MV2, numpy, vcs, cdms2, testing.regression as regression
 
-import vcs,numpy,cdms2,MV2,os,sys
 src=sys.argv[1]
 pth0 = os.path.dirname(__file__)
-pth = os.path.join(pth0,"..")
-sys.path.append(pth)
-import checkimage
-f=cdms2.open(os.path.join(pth0,"celine.nc"))
-s=f("data")
-x=vcs.init()
+f = cdms2.open(os.path.join(pth0,"celine.nc"))
+s = f("data")
+x = regression.init()
 x.setantialiasing(0)
-x.drawlogooff()
 x.scriptrun(os.path.join(pth0,"celine.json"))
-i=x.getisofill("celine")
+i = x.getisofill("celine")
 x.plot(s,i,bg=1)
 fnm = "test_celine_iso.png"
-x.png(fnm)
-
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, fnm)
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_iso_celine_part2.py b/testing/vcs/test_vcs_iso_celine_part2.py
index f99f821da..c1c1df5b1 100644
--- a/testing/vcs/test_vcs_iso_celine_part2.py
+++ b/testing/vcs/test_vcs_iso_celine_part2.py
@@ -1,26 +1,15 @@
+import os, sys, MV2, numpy, vcs, cdms2, testing.regression as regression
 
-import vcs,numpy,cdms2,MV2,os,sys
-src=sys.argv[1]
 pth0 = os.path.dirname(__file__)
-pth = os.path.join(pth0,"..")
-sys.path.append(pth)
-import checkimage
-f=cdms2.open(os.path.join(pth0,"celine.nc"))
-s=f("data")
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
+f = cdms2.open(os.path.join(pth0,"celine.nc"))
+s = f("data")
+x = regression.init()
 x.scriptrun(os.path.join(pth0,"celine.json"))
-i=x.getisofill("celine")
-b=vcs.createboxfill()
+i = x.getisofill("celine")
+b = vcs.createboxfill()
 b.levels=i.levels
 b.fillareacolors=i.fillareacolors
 b.boxfill_type="custom"
 x.plot(s,b,bg=1)
 fnm = "test_celine_iso_2.png"
-x.png(fnm)
-
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, fnm)
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_isofill_data_read_north_to_south.py b/testing/vcs/test_vcs_isofill_data_read_north_to_south.py
index 5f12f65b0..8d1cc949c 100644
--- a/testing/vcs/test_vcs_isofill_data_read_north_to_south.py
+++ b/testing/vcs/test_vcs_isofill_data_read_north_to_south.py
@@ -1,24 +1,10 @@
-import cdms2
-import vcs
-import sys
-import os
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import os, sys, cdms2, vcs, testing.regression as regression
+
 f = cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
 clt = f("clt",latitude=(80.0, 38.0),squeeze=1,longitude=(-180.0, 180.0),time=slice(0,1))
-x = vcs.init()
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
-x.setantialiasing(0)
+x = regression.init()
 gm = vcs.createisofill()
 gm.projection="polar"
 x.plot( clt,gm,bg=1)
 fnm = os.path.split(__file__)[-1][:-2]+"png"
-src= sys.argv[1]
-x.png(fnm)
-
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, fnm)
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_isofill_isoline_labels.py b/testing/vcs/test_vcs_isofill_isoline_labels.py
index d230fc8fc..192ffc4bf 100644
--- a/testing/vcs/test_vcs_isofill_isoline_labels.py
+++ b/testing/vcs/test_vcs_isofill_isoline_labels.py
@@ -1,24 +1,10 @@
-import vcs,cdms2,sys,os
-
-baselineImage = sys.argv[1]
-
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import os, sys, cdms2, vcs, testing.regression as regression
 
 dataset = cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
 data = dataset("clt")
-
-canvas = vcs.init()
-canvas.setantialiasing(0)
-canvas.setbgoutputdimensions(1200, 1091, units="pixels")
-canvas.drawlogooff()
-
+canvas = regression.init()
 isofill = canvas.createisofill()
-
-# First plot the isofill
 canvas.plot(data, isofill, bg=1)
-
 isoline = canvas.createisoline()
 isoline.label="y"
 texts=[]
@@ -35,13 +21,6 @@ for i in range(10):
 isoline.text = texts
 isoline.linecolors = colors
 
-# Next plot the isolines with labels
+# Plot the isolines with labels
 canvas.plot(data, isoline, bg=1)
-
-testImage = os.path.abspath("test_isofill_isoline_labels.png")
-canvas.png(testImage)
-
-ret = checkimage.check_result_image(testImage, baselineImage,
-                                    checkimage.defaultThreshold)
-
-sys.exit(ret)
+regression.run(canvas, "test_isofill_isoline_labels.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_isofill_mask_cell_shift.py b/testing/vcs/test_vcs_isofill_mask_cell_shift.py
index 9bc867113..199b1586d 100644
--- a/testing/vcs/test_vcs_isofill_mask_cell_shift.py
+++ b/testing/vcs/test_vcs_isofill_mask_cell_shift.py
@@ -1,25 +1,8 @@
-import os,sys
-import MV2
-import vcs
-import cdms2
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-
-x.setbgoutputdimensions(1200,1091,units="pixels")
-
-f=cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
-s=f("clt",slice(0,1),latitude=(30,70),longitude=(-130,-60))
-s2=MV2.masked_greater(s,65.)
+import os, sys, MV2, cdms2, vcs, testing.regression as regression
 
+x = regression.init()
+f = cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
+s = f("clt",slice(0,1),latitude=(30, 70),longitude=(-130, -60))
+s2 = MV2.masked_greater(s, 65.)
 x.plot(s2,"default","isofill",bg=1)
-fnm = "test_vcs_isofill_mask_cell_shift.png"
-x.png(fnm)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, "test_vcs_isofill_mask_cell_shift.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_isoline_labels.py b/testing/vcs/test_vcs_isoline_labels.py
index 77033f2c8..460235431 100644
--- a/testing/vcs/test_vcs_isoline_labels.py
+++ b/testing/vcs/test_vcs_isoline_labels.py
@@ -1,20 +1,8 @@
-import vcs,cdms2,sys,os
-
-# ('/path/to/filename', '.extension')
-baseline = os.path.splitext(sys.argv[1])
-
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import os, sys, cdms2, vcs, testing.regression as regression
 
 dataset = cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
 data = dataset("clt")
-
-canvas = vcs.init()
-canvas.setantialiasing(0)
-canvas.setbgoutputdimensions(1200, 1091, units="pixels")
-canvas.drawlogooff()
-
+canvas = regression.init()
 isoline = canvas.createisoline()
 isoline.label="y"
 texts=[]
@@ -33,24 +21,17 @@ isoline.text = texts
 # First test using isoline.text[...].color
 canvas.plot(data, isoline, bg=1)
 
+baseline = os.path.splitext(sys.argv[1])
 baselineImage = "%s%s"%baseline
-testImage = os.path.abspath("test_isoline_labels.png")
-canvas.png(testImage)
-
-ret = checkimage.check_result_image(testImage, baselineImage,
-                                    checkimage.defaultThreshold)
+ret = regression.run_wo_terminate(canvas, "test_isoline_labels.png", baselineImage)
 
 # Now set isoline.linecolors and test again.
 canvas.clear()
 isoline.linecolors = colors
 canvas.plot(data, isoline, bg=1)
-
 baselineImage = "%s%d%s"%(baseline[0], 2, baseline[1])
 testImage = os.path.abspath("test_isoline_labels2.png")
-canvas.png(testImage)
-
-ret += checkimage.check_result_image(testImage, baselineImage,
-                                     checkimage.defaultThreshold)
+ret += regression.run_wo_terminate(canvas, testImage, baselineImage)
 
 # Now set isoline.textcolors and test again.
 canvas.clear()
@@ -59,9 +40,6 @@ canvas.plot(data, isoline, bg=1)
 
 baselineImage = "%s%d%s"%(baseline[0], 3, baseline[1])
 testImage = os.path.abspath("test_isoline_labels3.png")
-canvas.png(testImage)
-
-ret += checkimage.check_result_image(testImage, baselineImage,
-                                     checkimage.defaultThreshold)
+ret += regression.run_wo_terminate(canvas, testImage, baselineImage)
 
 sys.exit(ret)
diff --git a/testing/vcs/test_vcs_isoline_labels_background.py b/testing/vcs/test_vcs_isoline_labels_background.py
index da1d1e6ac..08088836a 100644
--- a/testing/vcs/test_vcs_isoline_labels_background.py
+++ b/testing/vcs/test_vcs_isoline_labels_background.py
@@ -1,26 +1,13 @@
-import cdms2
-import os
-import sys
-import vcs
+import os, sys, cdms2, vcs, testing.regression as regression
 import random
 
-# ('/path/to/filename', '.extension')
-baseline = os.path.splitext(sys.argv[1])
-
-pth = os.path.join(os.path.dirname(__file__), "..")
-sys.path.append(pth)
-import checkimage
-
 (latmin, latmax, lonmin, lonmax) = (-90, 90, -180, 180)
 dataset = cdms2.open(os.path.join(vcs.sample_data, "tas_cru_1979.nc"))
 data = dataset("tas", time=slice(0, 1), latitude=(latmin, latmax),
                longitude=(lonmin, lonmax, 'co'), squeeze=1)
 dataset.close()
 
-canvas = vcs.init()
-canvas.setantialiasing(0)
-canvas.setbgoutputdimensions(1200, 1091, units="pixels")
-canvas.drawlogooff()
+canvas = regression.init()
 canvas.backgroundcolor = [100, 105, 105]
 
 isoline = canvas.createisoline()
@@ -50,11 +37,6 @@ isoline.labelskipdistance = 15.0
 
 # First test using isoline.text[...].color
 canvas.plot(data, isoline, bg=1)
-
+baseline = os.path.splitext(sys.argv[1])
 baselineImage = "%s%s" % baseline
-testImage = os.path.abspath("test_isoline_labels_background.png")
-canvas.png(testImage)
-
-ret = checkimage.check_result_image(testImage, baselineImage,
-                                    checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(canvas, baselineImage)
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_isoline_labels_multi_label_input_types.py b/testing/vcs/test_vcs_isoline_labels_multi_label_input_types.py
index da5e5d3c3..8c6e13a7e 100644
--- a/testing/vcs/test_vcs_isoline_labels_multi_label_input_types.py
+++ b/testing/vcs/test_vcs_isoline_labels_multi_label_input_types.py
@@ -1,30 +1,18 @@
-import vcs
-import cdms2
-import os,sys
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-f=cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
-s=f("clt")
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
-iso=x.createisoline()
-t=x.createtext()
-t.color=243
-t.height=25
-to=x.createtextorientation()
-to.height = 55
-tt=x.createtexttable()
-tt.color=245
-iso.textcolors=[None,None,None,242,244]
-iso.text=[t,tt,to]
-iso.label="y"
-x.plot(s,iso,bg=1)
-x.png("test_vcs_isoline_labels_multi_label_input_types.png")
-
-src=sys.argv[1]
+import os, sys, cdms2, vcs, testing.regression as regression
 
-ret = checkimage.check_result_image('test_vcs_isoline_labels_multi_label_input_types.png',src,checkimage.defaultThreshold)
-sys.exit(ret)
+f = cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
+s = f("clt")
+x = regression.init()
+iso = x.createisoline()
+t = x.createtext()
+t.color = 243
+t.height = 25
+to = x.createtextorientation()
+to.height = 55
+tt = x.createtexttable()
+tt.color = 245
+iso.textcolors = [None,None,None,242,244]
+iso.text = [t,tt,to]
+iso.label = "y"
+x.plot(s, iso, bg=1)
+regression.run(x, "test_vcs_isoline_labels_multi_label_input_types.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_isoline_labelskipdistance.py b/testing/vcs/test_vcs_isoline_labelskipdistance.py
index 04ecdfabb..4b119e0bc 100644
--- a/testing/vcs/test_vcs_isoline_labelskipdistance.py
+++ b/testing/vcs/test_vcs_isoline_labelskipdistance.py
@@ -1,21 +1,8 @@
-import cdms2
-import os
-import sys
-import vcs
-
-baselineImage = sys.argv[1]
-
-pth = os.path.join(os.path.dirname(__file__), "..")
-sys.path.append(pth)
-import checkimage
+import os, sys, cdms2, vcs, testing.regression as regression
 
 dataset = cdms2.open(os.path.join(vcs.sample_data, "clt.nc"))
 data = dataset("clt")
-
-canvas = vcs.init()
-canvas.setantialiasing(0)
-canvas.setbgoutputdimensions(1200, 1091, units="pixels")
-canvas.drawlogooff()
+canvas = regression.init()
 
 isoline = canvas.createisoline()
 isoline.label = "y"
@@ -36,11 +23,4 @@ isoline.linecolors = colors
 
 # Next plot the isolines with labels
 canvas.plot(data, isoline, bg=1)
-
-testImage = os.path.abspath("test_isoline_labelskipdistance.png")
-canvas.png(testImage)
-
-ret = checkimage.check_result_image(testImage, baselineImage,
-                                    checkimage.defaultThreshold)
-
-sys.exit(ret)
+regression.run(canvas, "test_isoline_labelskipdistance.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_isoline_numpy.py b/testing/vcs/test_vcs_isoline_numpy.py
index ced140e77..147f2f499 100644
--- a/testing/vcs/test_vcs_isoline_numpy.py
+++ b/testing/vcs/test_vcs_isoline_numpy.py
@@ -1,21 +1,13 @@
-import vcs,cdms2,sys,os
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-x=vcs.init()
+import os, sys, cdms2, vcs, testing.regression as regression
+
+x = regression.init()
 x.setantialiasing(0)
 x.setbgoutputdimensions(1200,1091,units="pixels")
 x.drawlogooff()
 fnm = os.path.join(vcs.sample_data,'clt.nc')
-f=cdms2.open(fnm)
-
-s=f("clt")
-gm=x.createisofill()
+f = cdms2.open(fnm)
+s = f("clt")
+gm = x.createisofill()
 x.plot(s.filled(),gm,bg=1)
 fnm = "test_vcs_isoline_numpy.png"
-x.png(fnm)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, fnm)
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_isoline_width_stipple.py b/testing/vcs/test_vcs_isoline_width_stipple.py
index b563436c2..5da8f91f4 100644
--- a/testing/vcs/test_vcs_isoline_width_stipple.py
+++ b/testing/vcs/test_vcs_isoline_width_stipple.py
@@ -1,22 +1,8 @@
-import cdms2
-import os
-import sys
-import vcs
-
-baselineImage = sys.argv[1]
-
-pth = os.path.join(os.path.dirname(__file__), "..")
-sys.path.append(pth)
-import checkimage  # noqa
+import os, sys, cdms2, vcs, testing.regression as regression
 
 dataset = cdms2.open(os.path.join(vcs.sample_data, "clt.nc"))
 data = dataset("clt")
-
-canvas = vcs.init()
-canvas.setantialiasing(0)
-canvas.setbgoutputdimensions(1200, 1091, units="pixels")
-canvas.drawlogooff()
-
+canvas = regression.init()
 isoline = canvas.createisoline()
 isoline.label = "y"
 texts = []
@@ -35,15 +21,8 @@ for i in range(7):
 isoline.levels = levels
 isoline.text = texts
 isoline.linecolors = colors
-
 isoline.linewidths = (1, 2, 3, 4, 1)
 isoline.line = ('dot', 'dash', 'solid', 'dash-dot', 'long-dash', 'dot', 'dash')
-
 # Next plot the isolines with labels
 canvas.plot(data, isoline, bg=1)
-
-testImage = os.path.abspath("test_isoline_width_stipple.png")
-canvas.png(testImage)
-
-ret = checkimage.check_result_image(testImage, baselineImage, 30)
-sys.exit(ret)
+regression.run(canvas, "test_isoline_width_stipple.png")
diff --git a/testing/vcs/test_vcs_issue_960_labels.py b/testing/vcs/test_vcs_issue_960_labels.py
index ee45216cd..7da2104ff 100644
--- a/testing/vcs/test_vcs_issue_960_labels.py
+++ b/testing/vcs/test_vcs_issue_960_labels.py
@@ -1,29 +1,19 @@
-import sys,os,cdms2,vcs
-import vcs
-src1=sys.argv[1]
-src2=sys.argv[2]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
+import os, sys, cdms2, vcs, testing.regression as regression
+
+src1 = sys.argv[1]
+src2 = sys.argv[2]
+x = regression.init()
 f=cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
 s=f("clt",time=slice(0,1),latitude=(-7,5),squeeze=1)
 x.plot(s,bg=1)
 fnm = "test_vcs_issue_960_labels_1.png"
 x.png(fnm)
-print "fnm:",fnm
-print "src:",src1
-ret = checkimage.check_result_image(fnm,src1,checkimage.defaultThreshold)
+ret = regression.check_result_image(fnm, src1)
 b=x.createboxfill()
 b.datawc_y1=-7
 b.datawc_y2=5
 x.plot(s,b,bg=1)
 fnm = "test_vcs_issue_960_labels_2.png"
 x.png(fnm)
-print "fnm:",fnm
-print "src:",src2
-ret += checkimage.check_result_image(fnm,src2,checkimage.defaultThreshold)
-sys.exit(ret)
+ret += regression.check_result_image(fnm, src2)
+sys.exit(ret)
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_lambert.py b/testing/vcs/test_vcs_lambert.py
index 17a50209f..c78e71e9b 100644
--- a/testing/vcs/test_vcs_lambert.py
+++ b/testing/vcs/test_vcs_lambert.py
@@ -1,27 +1,10 @@
-import vcs,cdms2
-import os,sys
+import os, sys, cdms2, vcs, testing.regression as regression
 f = cdms2.open(os.path.join(vcs.sample_data, "clt.nc"))
 s = f("clt")
-x = vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1090,units="pixels")
+x = regression.init()
 iso = x.createisofill()
 p=x.createprojection()
 p.type="lambert"
-
 iso.projection = p
 x.plot(s(latitude=(20, 60),longitude=(-140,-20)), iso, bg=True)
-
-# Load the image testing module:
-testingDir = os.path.join(os.path.dirname(__file__), "..")
-sys.path.append(testingDir)
-import checkimage
-
-# Create the test image and compare:
-baseline = sys.argv[1]
-testFile = "test_vcs_lambert.png"
-x.png(testFile)
-ret = checkimage.check_result_image(testFile, baseline,
-                                    checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, "test_vcs_lambert.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_large_pattern_hatch.py b/testing/vcs/test_vcs_large_pattern_hatch.py
index 3bcf0827d..782cfb14b 100644
--- a/testing/vcs/test_vcs_large_pattern_hatch.py
+++ b/testing/vcs/test_vcs_large_pattern_hatch.py
@@ -1,31 +1,12 @@
-import vcs
-import sys
-import os
-
-baseline = sys.argv[1]
-
-pth = os.path.join(os.path.dirname(__file__), "..")
-sys.path.append(pth)
-import checkimage
-
-canvas = vcs.init()
-canvas.setantialiasing(0)
-canvas.setbgoutputdimensions(1200,1090, units="pixels")
-canvas.drawlogooff()
+import os, sys, vcs, testing.regression as regression
 
+canvas = regression.init()
 fillarea = vcs.createfillarea()
 fillarea.x = [[0, .33, .33, 0], [.33, .67, .67, .33], [.67, 1, 1, .67]]
 fillarea.y = [[0, 0, 1, 1]] * 3
 fillarea.style = ["solid", "pattern", "hatch"]
 fillarea.index = [1, 5, 5]
 fillarea.color = [50, 50, 50]
-
 canvas.plot(fillarea, bg=True)
-
-testImage = os.path.abspath("test_vcs_large_pattern_hatch.png")
-canvas.png(testImage)
-
-ret = checkimage.check_result_image(testImage, baseline,
-                                    checkimage.defaultThreshold)
-
-sys.exit(ret)
+fnm = os.path.abspath("test_vcs_large_pattern_hatch.png")
+regression.run(canvas, fnm)
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_legend.py b/testing/vcs/test_vcs_legend.py
index 26beec7e5..a352bc080 100644
--- a/testing/vcs/test_vcs_legend.py
+++ b/testing/vcs/test_vcs_legend.py
@@ -1,5 +1,4 @@
-import sys,os
-import argparse
+import os, sys, argparse, cdms2, MV2, vcs, testing.regression as regression
 
 p = argparse.ArgumentParser(description="Basic gm testing code for vcs")
 p.add_argument("--source", dest="src", help="source image file")
@@ -14,20 +13,10 @@ args = p.parse_args(sys.argv[1:])
 
 gm_type= args.gm
 src = args.src
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-
-import vcs
-import sys
-import cdms2
-import vtk
-import os
-import MV2
 
 bg = not args.show
 
-x=vcs.init()
+x = vcs.init()
 x.setantialiasing(0)
 x.drawlogooff()
 if bg:
@@ -81,7 +70,7 @@ fnm = "test_vcs_legend_%s_%s_ext1_%s_ext2_%s" % (gm_type.lower(),args.orientatio
 x.png(fnm)
 print "fnm:",fnm
 print "src:",src
-ret = checkimage.check_result_image(fnm+'.png',src,checkimage.defaultThreshold, cleanup=not args.keep)
+ret = regression.check_result_image(fnm+'.png', src,regression.defaultThreshold, cleanup=not args.keep)
 if args.show:
     raw_input("Press Enter")
 sys.exit(ret)
diff --git a/testing/vcs/test_vcs_lon_axes_freak_out.py b/testing/vcs/test_vcs_lon_axes_freak_out.py
index ecb63f2a5..f18328f58 100644
--- a/testing/vcs/test_vcs_lon_axes_freak_out.py
+++ b/testing/vcs/test_vcs_lon_axes_freak_out.py
@@ -1,30 +1,11 @@
-import os,sys,vcs,cdms2
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import os, sys, cdms2, vcs, testing.regression as regression
 
+f = cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
+s = f("clt")
+s3 = f("clt",longitude=(0,360))
 
-f=cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
-s=f("clt")
-s3=f("clt",longitude=(0,360))
-
-print s.shape,s3.shape
-
-
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
-
+x = regression.init()
 x.plot(s,bg=1)
 x.clear()
 x.plot(s3,bg=1)
-
-fnm = "test_lon_axes_freak_out.png"
-
-x.png(fnm)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, "test_lon_axes_freak_out.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_markers.py b/testing/vcs/test_vcs_markers.py
index 50f4f00d1..21b7a671b 100644
--- a/testing/vcs/test_vcs_markers.py
+++ b/testing/vcs/test_vcs_markers.py
@@ -1,28 +1,14 @@
+import os, sys, numpy, cdms2, MV2, vcs, testing.regression as regression
 
-import vcs,numpy,cdms2,MV2,os,sys
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-
-x=vcs.init()
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
-
+x = regression.init()
 m = x.createmarker()
-m.x=[[0.,],[5,],[10.,],[15.]]
-m.y=[[0.,],[5,],[10.,],[15.]]
+m.x = [[0.,],[5,],[10.,],[15.]]
+m.y = [[0.,],[5,],[10.,],[15.]]
 m.worldcoordinate=[-5,20,-5,20]
+
 #m.worldcoordinate=[-10,10,0,10]
 m.type=['plus','diamond','square_fill',"hurricane"]
 m.color=[242,243,244,242]
 m.size=[20,20,20,5]
 x.plot(m,bg=1)
-fnm= "test_markers.png"
-
-x.png(fnm)
-
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, "test_markers.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_matplotlib_colormap.py b/testing/vcs/test_vcs_matplotlib_colormap.py
index 06b9f49b9..baf0e1bb0 100644
--- a/testing/vcs/test_vcs_matplotlib_colormap.py
+++ b/testing/vcs/test_vcs_matplotlib_colormap.py
@@ -1,7 +1,4 @@
-import cdms2
-import os
-import sys
-import vcs
+import os, sys, cdms2, vcs, testing.regression as regression
 
 # Load the clt data:
 dataFile = cdms2.open(os.path.join(vcs.sample_data, "clt.nc"))
@@ -10,24 +7,7 @@ clt = clt(latitude=(-90.0, 90.0), longitude=(-180., 175.), squeeze=1,
           time=('1979-1-1 0:0:0.0', '1988-12-1 0:0:0.0'))
 
 # Initialize canvas:
-canvas = vcs.init()
-canvas.setantialiasing(0)
-canvas.setbgoutputdimensions(1200,1091,units="pixels")
-canvas.drawlogooff()
-
+canvas = regression.init()
 canvas.setcolormap(vcs.matplotlib2vcs("viridis"))
-
 canvas.plot(clt, bg=1)
-
-# Load the image testing module:
-testingDir = os.path.join(os.path.dirname(__file__), "..")
-sys.path.append(testingDir)
-import checkimage
-
-# Create the test image and compare:
-baseline = sys.argv[1]
-testFile = "test_matplotlib_colormap.png"
-canvas.png(testFile)
-ret = checkimage.check_result_image(testFile, baseline,
-                                    checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(canvas, "test_matplotlib_colormap.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_mercator_edge.py b/testing/vcs/test_vcs_mercator_edge.py
index eb6d79cdb..31f6cb83b 100644
--- a/testing/vcs/test_vcs_mercator_edge.py
+++ b/testing/vcs/test_vcs_mercator_edge.py
@@ -1,24 +1,9 @@
-import vcs,cdms2
-import os,sys
+import os, sys, cdms2, vcs, testing.regression as regression
+
 f = cdms2.open(os.path.join(vcs.sample_data, "clt.nc"))
 s = f("clt")
-x = vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
+x = regression.init()
 iso = x.createisofill()
 iso.projection = "mercator"
 x.plot(s(latitude=(-90, 90)), iso, bg=1)
-
-# Load the image testing module:
-testingDir = os.path.join(os.path.dirname(__file__), "..")
-sys.path.append(testingDir)
-import checkimage
-
-# Create the test image and compare:
-baseline = sys.argv[1]
-testFile = "test_vcs_mercator_edge.png"
-x.png(testFile)
-ret = checkimage.check_result_image(testFile, baseline,
-                                    checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, "test_vcs_mercator_edge.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_meshfill_draw_mesh.py b/testing/vcs/test_vcs_meshfill_draw_mesh.py
index ef214e648..08801d7a6 100644
--- a/testing/vcs/test_vcs_meshfill_draw_mesh.py
+++ b/testing/vcs/test_vcs_meshfill_draw_mesh.py
@@ -1,23 +1,11 @@
-import vcs,cdms2,sys,os
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-x=vcs.init()
-x.setantialiasing(0)
-x.setbgoutputdimensions(1200,1091,units="pixels")
-x.drawlogooff()
-fnmcurv = os.path.join(vcs.sample_data,'sampleCurveGrid4.nc')
-f=cdms2.open(fnmcurv)
+import os, sys, cdms2, vcs, testing.regression as regression
 
-s=f("sample")
-m=x.createmeshfill()
-m.mesh=True
+x = regression.init()
+fnmcurv = os.path.join(vcs.sample_data,'sampleCurveGrid4.nc')
+f = cdms2.open(fnmcurv)
+s = f("sample")
+m = x.createmeshfill()
+m.mesh = True
 
 x.plot(s,m,bg=1)
-fnm = "test_meshfill_draw_mesh.png"
-x.png(fnm)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, "test_meshfill_draw_mesh.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_meshfill_no_wrapping.py b/testing/vcs/test_vcs_meshfill_no_wrapping.py
index 967758c78..9ee4a99f1 100755
--- a/testing/vcs/test_vcs_meshfill_no_wrapping.py
+++ b/testing/vcs/test_vcs_meshfill_no_wrapping.py
@@ -1,23 +1,7 @@
-#!/usr/bin/env python
-import cdms2 
-import os 
-import sys
-import vcs
-
-pth = os.path.join(os.path.dirname(__file__), "..")
-sys.path.append(pth)
-import checkimage
-
-
-f=cdms2.open(sys.argv[2])
-h=f("heat")
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200, 900, units="pixels")
+import os, sys, cdms2, vcs, testing.regression as regression
 
+f = cdms2.open(sys.argv[2])
+h = f("heat")
+x = regression.init()
 x.plot(h, bg=1)
-fnm = "vcs_test_meshfill_no_wrapping.png"
-x.png(fnm)
-ret = checkimage.check_result_image(fnm, sys.argv[1], checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, "vcs_test_meshfill_no_wrapping.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_meshfill_regular_grid.py b/testing/vcs/test_vcs_meshfill_regular_grid.py
index 9a955f9ff..77a390b22 100644
--- a/testing/vcs/test_vcs_meshfill_regular_grid.py
+++ b/testing/vcs/test_vcs_meshfill_regular_grid.py
@@ -1,22 +1,7 @@
-import vcs, cdms2, os, sys
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
+import os, sys, cdms2, vcs, testing.regression as regression
 
-x.setbgoutputdimensions(1200,1091,units="pixels")
-x = vcs.init()
-x.setantialiasing(0)
+x = regression.init()
 f = cdms2.open(os.path.join(vcs.sample_data, "clt.nc"))
 s = f("clt")
-x.meshfill(s,bg=1)
-fnm = "test_meshfill_regular_grid.png"
-x.png(fnm)
-
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+x.meshfill(s, bg=1)
+regression.run(x, "test_meshfill_regular_grid.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_meshfill_vertices.py b/testing/vcs/test_vcs_meshfill_vertices.py
index 6317ef071..103e68109 100644
--- a/testing/vcs/test_vcs_meshfill_vertices.py
+++ b/testing/vcs/test_vcs_meshfill_vertices.py
@@ -1,19 +1,8 @@
-import numpy
-import vcs
-import sys
-import os
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import os, sys, numpy, vcs, testing.regression as regression
 
-x=vcs.init()
-
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200, 1090, units="pixels")
+x = regression.init()
 
 data_values = [ 25, 45, 55.]
-
 data_lon = [ 5., 10., 15.]
 data_lat = [ 5., 10., 15.]
 
@@ -50,8 +39,4 @@ m.levels = [20,30,50,70,80]
 m.mesh = True
 
 x.plot(numpy.array(data_values,),mesh,m,bg=True)
-x.png("test_vcs_meshfill_vertices_issue.png")
-src = sys.argv[1]
-ret = checkimage.check_result_image("test_vcs_meshfill_vertices_issue.png",
-                                    src, checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, "test_vcs_meshfill_vertices_issue.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_meshfill_zoom.py b/testing/vcs/test_vcs_meshfill_zoom.py
index 1026f0ff0..c366d8010 100644
--- a/testing/vcs/test_vcs_meshfill_zoom.py
+++ b/testing/vcs/test_vcs_meshfill_zoom.py
@@ -1,14 +1,4 @@
-#!/usr/bin/env python
-import cdms2
-import os
-import sys
-import vcs
-
-# We test if gm.datawc zooms in correctly into the plot. This works only for
-# data using a linear projection. It does not work for geographic projections.
-pth = os.path.join(os.path.dirname(__file__), "..")
-sys.path.append(pth)
-import checkimage
+import os, sys, cdms2, vcs, testing.regression as regression
 
 flip = False
 if (len(sys.argv) == 3):
@@ -19,12 +9,10 @@ fileName = os.path.splitext(fileName)[0]
 if (flip):
     fileName = fileName + '_flip'
 fileName = fileName + '.png'
-f=cdms2.open(os.path.join(vcs.sample_data, "sampleCurveGrid4.nc"))
-s=f("sample")
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-m=x.createmeshfill()
+f = cdms2.open(os.path.join(vcs.sample_data, "sampleCurveGrid4.nc"))
+s = f("sample")
+x = regression.init()
+m = x.createmeshfill()
 # m.mesh = True
 m.datawc_x1 = -20
 m.datawc_x2 = 20
@@ -33,7 +21,4 @@ if (flip):
 m.datawc_y1 = -20
 m.datawc_y2 = 20
 x.plot(s,m, bg=1)
-x.png(fileName)
-ret = checkimage.check_result_image(fileName, sys.argv[1], checkimage.defaultThreshold)
-sys.exit(ret)
-
+regression.run(x, fileName)
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_mintics.py b/testing/vcs/test_vcs_mintics.py
index 01f65848b..302c22fd4 100644
--- a/testing/vcs/test_vcs_mintics.py
+++ b/testing/vcs/test_vcs_mintics.py
@@ -1,16 +1,10 @@
-import vcs,numpy,cdms2,MV2,os,sys
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import os, sys, numpy, cdms2, MV2, vcs, testing.regression as regression
 
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
+x = regression.init()
 f = cdms2.open(os.path.join(vcs.sample_data, "clt.nc"))
 s = f("clt")
 box = x.createboxfill()
+
 # Should ignore the string here
 box.xmtics1 = {i:"Test" for i in range(-180, 180, 15) if i % 30 != 0}
 box.ymtics1 = {i:"Test" for i in range(-90, 90, 5) if i % 10 != 0}
@@ -23,10 +17,4 @@ template.xmintic2.priority = 1
 template.xmintic2.y2 += template.xmintic1.y1 - template.xmintic1.y2
 template.ymintic2.priority = 1
 x.plot(s, template, box, bg=1)
-fnm = "test_vcs_mintics.png"
-x.png(fnm)
-
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, "test_vcs_mintics.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_missing_colorname.py b/testing/vcs/test_vcs_missing_colorname.py
index 1ed68b475..9b3db7545 100644
--- a/testing/vcs/test_vcs_missing_colorname.py
+++ b/testing/vcs/test_vcs_missing_colorname.py
@@ -1,7 +1,4 @@
-import cdms2
-import os
-import sys
-import vcs
+import os, sys, cdms2, vcs, testing.regression as regression
 
 # Load the clt data:
 dataFile = cdms2.open(os.path.join(vcs.sample_data, "clt.nc"))
@@ -11,10 +8,7 @@ height, width = clt.shape
 clt.mask = [[True if i % 2 else False for i in range(width)] for _ in range(height)]
 
 # Initialize canvas:
-canvas = vcs.init()
-canvas.setantialiasing(0)
-canvas.setbgoutputdimensions(1200,1091,units="pixels")
-canvas.drawlogooff()
+canvas = regression.init()
 
 # Create and plot quick boxfill with default settings:
 # Only have to test boxfill because all 2D methods use the same code
@@ -25,16 +19,4 @@ boxfill = canvas.createboxfill()
 boxfill.missing = "Medium Aquamarine"
 
 canvas.plot(clt, boxfill, bg=1)
-
-# Load the image testing module:
-testingDir = os.path.join(os.path.dirname(__file__), "..")
-sys.path.append(testingDir)
-import checkimage
-
-# Create the test image and compare:
-baseline = sys.argv[1]
-testFile = "test_vcs_missing_colorname.png"
-canvas.png(testFile)
-ret = checkimage.check_result_image(testFile, baseline,
-                                    checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(canvas, "test_vcs_missing_colorname.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_monotonic_decreasing_yxvsx_default.py b/testing/vcs/test_vcs_monotonic_decreasing_yxvsx_default.py
index 9f30f40ae..4dcd059a0 100644
--- a/testing/vcs/test_vcs_monotonic_decreasing_yxvsx_default.py
+++ b/testing/vcs/test_vcs_monotonic_decreasing_yxvsx_default.py
@@ -1,27 +1,14 @@
-import vcs,numpy,cdms2,MV2,os,sys
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-x=vcs.init()
-x.setantialiasing(0)
+import os, sys, numpy, cdms2, MV2, vcs, testing.regression as regression
 
-x.setbgoutputdimensions(1200,1091,units="pixels")
-
-t=cdms2.createAxis(numpy.arange(120))
+x = regression.init()
+t = cdms2.createAxis(numpy.arange(120))
 t.designateTime()
-t.id="time"
-t.units="months since 2014"
+t.id = "time"
+t.units = "months since 2014"
 data = MV2.arange(120,0,-1)
-data.id="data"
+data.id = "data"
 data.setAxis(0,t)
-x=vcs.init()
-x.setantialiasing(0)
+x = regression.init()
 x.plot(data,bg=1)
 fnm = 'test_vcs_monotonic_decreasing_yxvsx_default.png'
-
-x.png(fnm)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, fnm)
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_oned_level_axis.py b/testing/vcs/test_vcs_oned_level_axis.py
index 25479a56b..ecb708c77 100644
--- a/testing/vcs/test_vcs_oned_level_axis.py
+++ b/testing/vcs/test_vcs_oned_level_axis.py
@@ -1,24 +1,9 @@
+import os, sys, vcs, cdms2, cdutil, testing.regression as regression
 
-import sys,cdutil
-import vcs
-import os
-import cdms2
-src = sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-
-f=cdms2.open(os.path.join(vcs.sample_data,"ta_ncep_87-6-88-4.nc"))
-ta=f("ta",time=slice(0,1),squeeze=1)
-ta=cdutil.averager(ta,axis="yx")
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
+f = cdms2.open(os.path.join(vcs.sample_data,"ta_ncep_87-6-88-4.nc"))
+ta = f("ta",time=slice(0,1),squeeze=1)
+ta = cdutil.averager(ta,axis="yx")
+x = regression.init()
 x.plot(ta,bg=1)
 fnm = "test_oned_level_axis.png"
-x.png(fnm)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, fnm)
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_patterns.py b/testing/vcs/test_vcs_patterns.py
index fed4f41a8..c407f7cfe 100644
--- a/testing/vcs/test_vcs_patterns.py
+++ b/testing/vcs/test_vcs_patterns.py
@@ -1,19 +1,8 @@
-import cdms2
-import os
-import sys
-import vcs
-
-src = sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__), "..")
-sys.path.append(pth)
-import checkimage
+import os, sys, vcs, cdms2, testing.regression as regression
 
 f = cdms2.open(vcs.sample_data+"/clt.nc")
 s = f("clt", time=slice(0, 1), squeeze=1)
-x = vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200, 1090, units="pixels")
+x = regression.init()
 iso = vcs.createisofill("isoleg")
 iso.levels = [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100]
 iso.fillareastyle = "pattern"
@@ -21,9 +10,4 @@ iso.fillareacolors = vcs.getcolors([0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100])
 iso.fillareaindices = [1, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20]
 x.plot(s, iso, bg=1)
 fnm = "test_vcs_patterns.png"
-x.png(fnm)
-
-print "fnm:", fnm
-print "src:", src
-ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold+5.)
-sys.exit(ret)
+regression.run(x, fnm, threshold=regression.defaultThreshold+5.)
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_plot_file_var.py b/testing/vcs/test_vcs_plot_file_var.py
index e20f947a6..0dd68945d 100644
--- a/testing/vcs/test_vcs_plot_file_var.py
+++ b/testing/vcs/test_vcs_plot_file_var.py
@@ -1,8 +1,6 @@
-import vcs
-import os
-import sys
-import cdms2
-f=cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
-V=f("clt")
-x=vcs.init()
-x.plot(V,bg=1)
+import os, sys, vcs, cdms2
+
+f = cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
+V = f("clt")
+x = vcs.init()
+x.plot(V, bg=1)
diff --git a/testing/vcs/test_vcs_plot_unstructured_via_boxfill.py b/testing/vcs/test_vcs_plot_unstructured_via_boxfill.py
index 4aa1d24eb..535ff432e 100644
--- a/testing/vcs/test_vcs_plot_unstructured_via_boxfill.py
+++ b/testing/vcs/test_vcs_plot_unstructured_via_boxfill.py
@@ -1,21 +1,7 @@
-import vcs
-import os,sys
-import cdms2
-
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-
-import checkimage
+import vcs, os, sys, cdms2, testing.regression as regression
 
 f = cdms2.open(os.path.join(vcs.sample_data,"sampleCurveGrid4.nc"))
 s = f("sample")
-x = vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
+x = regression.init()
 x.plot(s,bg=1)
-fnm = "test_plot_unstructured_via_boxfill.png"
-src = sys.argv[1]
-x.png(fnm)
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, "test_plot_unstructured_via_boxfill.png")
diff --git a/testing/vcs/test_vcs_png_to_base64.py b/testing/vcs/test_vcs_png_to_base64.py
index 6b88b3511..f6d78e2fa 100644
--- a/testing/vcs/test_vcs_png_to_base64.py
+++ b/testing/vcs/test_vcs_png_to_base64.py
@@ -1,4 +1,4 @@
-import vcs,numpy,cdms2,MV2,os,sys
+import vcs, numpy, cdms2, MV2, os, sys
 
 x = vcs.init()
 x.drawlogooff()
diff --git a/testing/vcs/test_vcs_png_window_resize.py b/testing/vcs/test_vcs_png_window_resize.py
index 0adeeb66b..a6346ca28 100644
--- a/testing/vcs/test_vcs_png_window_resize.py
+++ b/testing/vcs/test_vcs_png_window_resize.py
@@ -1,20 +1,9 @@
-import vcs
-import sys
-import os
+import vcs, sys, os, testing.regression as regression
 
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-x=vcs.init()
+x = regression.init()
 x.setantialiasing(0)
 x.drawlogooff()
 x.open(814,628)
 x.plot([1,2,3,4,5,6,7])
 fnm = __file__[:-3]+".png"
-x.png(fnm)
-
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, fnm)
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_polar_set_opt_param_polar.py b/testing/vcs/test_vcs_polar_set_opt_param_polar.py
index 8c508ca3c..4e777fb2b 100644
--- a/testing/vcs/test_vcs_polar_set_opt_param_polar.py
+++ b/testing/vcs/test_vcs_polar_set_opt_param_polar.py
@@ -1,29 +1,13 @@
+import vcs, cdms2, sys, os, testing.regression as regression
 
-import vcs
-import cdms2
-import sys
-import os
-
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-
-f=cdms2.open(os.path.join(vcs.sample_data,'clt.nc'))
-s=f("clt",slice(0,1),squeeze=1)
-x=vcs.init()
+f = cdms2.open(os.path.join(vcs.sample_data,'clt.nc'))
+s = f("clt",slice(0,1),squeeze=1)
+x = regression.init()
 x.setantialiasing(0)
 x.drawlogooff()
 x.setbgoutputdimensions(1200,1091,units="pixels")
-i=x.createisofill()
-p=x.getprojection("polar")
+i = x.createisofill()
+p = x.getprojection("polar")
 i.projection=p
 x.plot(s,i,bg=1)
-fnm= "test_polar_set_opt_param_polar.png"
-x.png(fnm)
-
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
-
+regression.run(x, "test_polar_set_opt_param_polar.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_remove_marker_none_1d.py b/testing/vcs/test_vcs_remove_marker_none_1d.py
index f868361b0..e112f86bc 100644
--- a/testing/vcs/test_vcs_remove_marker_none_1d.py
+++ b/testing/vcs/test_vcs_remove_marker_none_1d.py
@@ -3,31 +3,13 @@
 #
 # J-Y Peterschmitt - LSCE - 03/2015
 
-import vcs,numpy,cdms2,MV2,os,sys
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import vcs, numpy, cdms2, MV2, os, sys, testing.regression as regression
 
 dummy_data = numpy.arange(50, dtype=numpy.float32)
-
-x = vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
-
+x = regression.init()
 gm = x.createyxvsx('test_yxvsx')
 
-
-# Remove the marker
 gm.marker = None
-
 x.plot(gm, dummy_data,bg=1)
-
 fnm = "test_remove_marker_none_1d.png"
-x.png(fnm)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
-# The end
+regression.run(x, fnm)
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_setcolormap.py b/testing/vcs/test_vcs_setcolormap.py
index c3e639660..78d7fad81 100644
--- a/testing/vcs/test_vcs_setcolormap.py
+++ b/testing/vcs/test_vcs_setcolormap.py
@@ -1,32 +1,12 @@
 
-import cdms2
-import os
-import sys
-import vcs
-
-baselineFilename = sys.argv[1]
-checkImagePath = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(checkImagePath)
-import checkimage
+import cdms2, os, sys, vcs, testing.regression as regression
 
 cdmsfile = cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
 data = cdmsfile('clt')
-
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
-
+x = regression.init()
 t=x.gettemplate('default')
 x.plot(data, t, bg=True)
 
 # This should force the image to update
 x.setcolormap('bl_to_drkorang')
-
-testFilename = "test_vcs_setcolormap.png"
-x.png(testFilename)
-
-ret = checkimage.check_result_image(testFilename,
-                                    baselineFilename,
-                                    checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, "test_vcs_setcolormap.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_settings_color_name_rgba.py b/testing/vcs/test_vcs_settings_color_name_rgba.py
index 0b6aeef22..0fa6ec288 100644
--- a/testing/vcs/test_vcs_settings_color_name_rgba.py
+++ b/testing/vcs/test_vcs_settings_color_name_rgba.py
@@ -1,28 +1,13 @@
-import vcs
-import numpy
-import os
-import sys
-import cdms2
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import vcs, numpy, os, sys, cdms2, testing.regression as regression
 
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1090,units="pixels")
+x = regression.init()
 
-f=cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
-data=f("clt",slice(0,1,))
+f = cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
+data = f("clt",slice(0,1,))
 gm = x.createisofill()
 gm.levels = range(0,110,10)
 gm.fillareacolors = ["green","red","blue","bisque","yellow","grey",
         [100,0,0,50], [0,100,0],"salmon",[0,0,100,75]]
 x.plot(data,gm,bg=True)
-fnm = 'test_vcs_settings_color_name_rgba_isofill.png'
-src = sys.argv[1]
-x.png(fnm)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+fnm = "test_vcs_settings_color_name_rgba_isofill.png"
+regression.run(x, fnm)
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_settings_color_name_rgba_1d.py b/testing/vcs/test_vcs_settings_color_name_rgba_1d.py
index 0fe844c20..8bca782a6 100644
--- a/testing/vcs/test_vcs_settings_color_name_rgba_1d.py
+++ b/testing/vcs/test_vcs_settings_color_name_rgba_1d.py
@@ -1,16 +1,6 @@
-import vcs
-import numpy
-import os
-import sys
-import cdms2
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import vcs, numpy, os, sys, cdms2, testing.regression as regression
 
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1090,units="pixels")
+x = regression.init()
 
 f=cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
 data=f("clt")[:,5,8]
@@ -18,10 +8,4 @@ gm = x.create1d()
 gm.linecolor="salmon"
 gm.markercolor = [0,0,100]
 x.plot(data,gm,bg=True)
-fnm = 'test_vcs_settings_color_name_rgba_1d.png'
-src = sys.argv[1]
-x.png(fnm)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, 'test_vcs_settings_color_name_rgba_1d.png')
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_settings_color_name_rgba_boxfill.py b/testing/vcs/test_vcs_settings_color_name_rgba_boxfill.py
index 043d331c8..34228513e 100644
--- a/testing/vcs/test_vcs_settings_color_name_rgba_boxfill.py
+++ b/testing/vcs/test_vcs_settings_color_name_rgba_boxfill.py
@@ -1,17 +1,6 @@
-import vcs
-import numpy
-import os
-import sys
-import cdms2
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1090,units="pixels")
+import vcs, numpy, os, sys, cdms2, testing.regression as regression
 
+x = regression.init()
 f=cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
 data=f("clt",slice(0,1,))
 gm = x.createboxfill()
@@ -20,10 +9,4 @@ gm.levels = range(0,110,10)
 gm.fillareacolors = ["green","red","blue","bisque","yellow","grey",
         [100,0,0,50], [0,100,0],"salmon",[0,0,100,75]]
 x.plot(data,gm,bg=True)
-fnm = 'test_vcs_settings_color_name_rgba_boxfill.png'
-src = sys.argv[1]
-x.png(fnm)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, 'test_vcs_settings_color_name_rgba_boxfill.png')
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_settings_color_name_rgba_isoline.py b/testing/vcs/test_vcs_settings_color_name_rgba_isoline.py
index 200293dbe..c23edc2a6 100644
--- a/testing/vcs/test_vcs_settings_color_name_rgba_isoline.py
+++ b/testing/vcs/test_vcs_settings_color_name_rgba_isoline.py
@@ -1,17 +1,6 @@
-import vcs
-import numpy
-import os
-import sys
-import cdms2
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1090,units="pixels")
+import vcs, numpy, os, sys, cdms2, testing.regression as regression
 
+x=regression.init()
 f=cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
 data=f("clt",slice(0,1,))
 gm = x.createisoline()
@@ -19,10 +8,4 @@ gm.levels = range(0,110,10)
 gm.linecolors = ["green","red","blue","bisque","yellow","grey",
         [100,0,0,50], [0,100,0],"salmon",[0,0,100,75]]
 x.plot(data,gm,bg=True)
-fnm = 'test_vcs_settings_color_name_rgba_isoline.png'
-src = sys.argv[1]
-x.png(fnm)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, 'test_vcs_settings_color_name_rgba_isoline.png')
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_settings_color_name_rgba_meshfill.py b/testing/vcs/test_vcs_settings_color_name_rgba_meshfill.py
index 4a0858d1d..0b3ffc871 100644
--- a/testing/vcs/test_vcs_settings_color_name_rgba_meshfill.py
+++ b/testing/vcs/test_vcs_settings_color_name_rgba_meshfill.py
@@ -1,17 +1,6 @@
-import vcs
-import numpy
-import os
-import sys
-import cdms2
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1090,units="pixels")
+import vcs, numpy, os, sys, cdms2, testing.regression as regression
 
+x = regression.init()
 f=cdms2.open(os.path.join(vcs.sample_data,"sampleCurveGrid4.nc"))
 data=f("sample")
 gm = x.createmeshfill()
@@ -19,10 +8,4 @@ gm.levels = range(0,1501,150)
 gm.fillareacolors = ["green","red","blue","bisque","yellow","grey",
         [100,0,0,50], [0,100,0],"salmon",[0,0,100,75]]
 x.plot(data,gm,bg=True)
-fnm = 'test_vcs_settings_color_name_rgba_meshfill.png'
-src = sys.argv[1]
-x.png(fnm)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+ret = regression.run(x, 'test_vcs_settings_color_name_rgba_meshfill.png')
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_star_triangle_markers.py b/testing/vcs/test_vcs_star_triangle_markers.py
index 4564e4059..2d75e05d0 100644
--- a/testing/vcs/test_vcs_star_triangle_markers.py
+++ b/testing/vcs/test_vcs_star_triangle_markers.py
@@ -1,9 +1,5 @@
 
-import vcs,numpy,cdms2,MV2,os,sys
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import vcs, numpy, cdms2, MV2, os, sys, testing.regression as regression
 
 x=vcs.init()
 x.drawlogooff()
@@ -16,12 +12,5 @@ m.x = [[.1], [.3], [.5], [.7], [.9]]
 m.y = [[.1], [.3], [.5], [.7], [.9]]
 m.color = [200, 150, 160, 175, 125]
 m.size = [50, 50, 50, 50, 50]
-x.plot(m,bg=1)
-fnm = "test_star_triangle_markers.png"
-x.png(fnm)
-
-print "fnm:",fnm
-print "src:",src
-
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+x.plot(m, bg=1)
+regression.run(x, "test_star_triangle_markers.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_taylor_2quads.py b/testing/vcs/test_vcs_taylor_2quads.py
index 3458acb91..84f102615 100644
--- a/testing/vcs/test_vcs_taylor_2quads.py
+++ b/testing/vcs/test_vcs_taylor_2quads.py
@@ -1,17 +1,6 @@
 
-import sys,os
-src = sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-import vcs, MV2
+import sys, os, vcs, MV2, testing.regression as regression
 
-
-bg=True
-
-#
-# First create some sample data
-#
 data = MV2.array([[-0.50428531,-0.8505522 ,],
  [ 0.70056821,-0.27235352,],
  [ 0.05106154, 0.23012322,],
@@ -19,20 +8,8 @@ data = MV2.array([[-0.50428531,-0.8505522 ,],
  [ 0.85760801,-0.08336641,],
  [ 1.14083397,-0.78326507,]])
 
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-
-if bg:
-  x.setbgoutputdimensions(1200,1091,units="pixels")
-
-td=x.createtaylordiagram('new')
-
+x = regression.init()
+td = x.createtaylordiagram('new')
 td.quadrans = 2
-x.plot(data,td,skill = td.defaultSkillFunction,bg=bg)
-fnm = "test_vcs_taylor_2quads.png"
-x.png(fnm)
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-if not bg:
-    raw_input("Press Enter")
-sys.exit(ret)
+x.plot(data, td, skill = td.defaultSkillFunction, bg=1)
+regression.run(x, "test_vcs_taylor_2quads.png")
diff --git a/testing/vcs/test_vcs_taylor_template_ctl.py b/testing/vcs/test_vcs_taylor_template_ctl.py
index 40b78f0dc..b6f610c7d 100644
--- a/testing/vcs/test_vcs_taylor_template_ctl.py
+++ b/testing/vcs/test_vcs_taylor_template_ctl.py
@@ -1,20 +1,8 @@
 
-import sys,os
-src = sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-import vcs,MV2
+import sys, os, vcs, MV2
+import testing.regression as regression
 
-bg=True
-
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-if bg:
-  x.setbgoutputdimensions(1200,1091,units="pixels")
-if not bg:
-    x.open()
+x = regression.init()
 
 ## Create a template from the default taylor diagram
 t=x.createtemplate('mytaylor','deftaylor')
@@ -61,12 +49,5 @@ t.xmintic2.priority=1
 # Create some dummy data for display purposes
 data=MV2.array([[1.52,.52,],[.83,.84]])
 
-x.plot(data,t,td,bg=bg)
-fnm="test_vcs_taylor_template_ctl.png"
-x.png(fnm)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-if not bg:
-    raw_input("Press Enter")
-sys.exit(ret)
+x.plot(data, t, td, bg=1)
+regression.run(x, "test_vcs_taylor_template_ctl.png")
diff --git a/testing/vcs/test_vcs_user_passed_date.py b/testing/vcs/test_vcs_user_passed_date.py
index 643d2019c..bb5b18a0d 100644
--- a/testing/vcs/test_vcs_user_passed_date.py
+++ b/testing/vcs/test_vcs_user_passed_date.py
@@ -1,18 +1,9 @@
 import vcs,cdms2,os,sys,cdtime
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import testing.regression as regression
+
 f=cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
 s=f("clt",squeeze=1)
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
+x=regression.init()
 x.plot(s,bg=1,time=cdtime.comptime(2015))
 fnm = os.path.split(__file__)[1][:-3]+".png"
-x.png(fnm)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, fnm)
diff --git a/testing/vcs/test_vcs_user_passed_date_as_string.py b/testing/vcs/test_vcs_user_passed_date_as_string.py
index cd5d777f3..e9bdf83e6 100644
--- a/testing/vcs/test_vcs_user_passed_date_as_string.py
+++ b/testing/vcs/test_vcs_user_passed_date_as_string.py
@@ -1,18 +1,11 @@
 import vcs,cdms2,os,sys,cdtime
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import testing.regression as regression
+
+x = regression.init()
+
 f=cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
 s=f("clt",squeeze=1)
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
 x.plot(s,bg=1,time='2015-02-23')
 fnm = os.path.split(__file__)[1][:-3]+".png"
 x.png(fnm)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, fnm)
diff --git a/testing/vcs/test_vcs_vectors_missing.py b/testing/vcs/test_vcs_vectors_missing.py
index fd53c97e1..5e8b08e5b 100644
--- a/testing/vcs/test_vcs_vectors_missing.py
+++ b/testing/vcs/test_vcs_vectors_missing.py
@@ -1,6 +1,6 @@
 
-import sys,os
-import argparse
+import sys, os, argparse
+import vcs, cdms2, vtk, MV2, numpy, testing.regression as regression
 
 p = argparse.ArgumentParser(description="Basic gm testing code for vcs")
 p.add_argument("--source", dest="src", help="source image file")
@@ -14,28 +14,17 @@ if not args.show:
   src = args.src
   pth = os.path.join(os.path.dirname(__file__),"..")
   sys.path.append(pth)
-  import checkimage
-
-import vcs
-import sys
-import cdms2
-import vtk
-import os
-import MV2
-import numpy
-
 
 bg = not args.show
-
-x=vcs.init()
+x = vcs.init()
 x.setantialiasing(0)
 x.drawlogooff()
 if bg:
   x.setbgoutputdimensions(1200,1091,units="pixels")
 x.setcolormap("rainbow")
-gm=vcs.createvector()
+gm = vcs.createvector()
 gm.scale = args.scale
-nm_xtra=""
+nm_xtra = ""
 xtra = {}
 import cdms2
 import os
@@ -52,14 +41,12 @@ if args.show:
   pass
   #x.interact()
 else:
-  fnm = "test_vcs_vectors_missing" 
+  fnm = "test_vcs_vectors_missing"
   if args.scale!=1.:
     fnm+="_%.1g" % args.scale
   fnm+=nm_xtra
   x.png(fnm)
-  print "fnm:",fnm
-  print "src:",src
-  ret = checkimage.check_result_image(fnm+'.png',src,checkimage.defaultThreshold, cleanup=not args.keep)
+  ret = regression.check_result_image(fnm+'.png', src, regression.defaultThreshold, cleanup=not args.keep)
 if args.show:
     raw_input("Press Enter")
 sys.exit(ret)
diff --git a/testing/vcs/test_vcs_vectors_robinson.py b/testing/vcs/test_vcs_vectors_robinson.py
index 49052c679..5cde92c82 100644
--- a/testing/vcs/test_vcs_vectors_robinson.py
+++ b/testing/vcs/test_vcs_vectors_robinson.py
@@ -1,13 +1,7 @@
 import vcs, cdms2, numpy, os, sys
-src = sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import testing.regression as regression
 
-x = vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200, 1091, units="pixels")
+x = regression.init()
 f = cdms2.open(os.path.join(vcs.sample_data, "clt.nc"))
 u = f("u")
 v = f("v")
@@ -16,8 +10,4 @@ p = x.createprojection()
 p.type = "robinson"
 V.projection = p
 x.plot(u,v,V, bg=1)
-
-fnm = "test_vcs_vectors_robinson.png"
-x.png(fnm)
-ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, "test_vcs_vectors_robinson.png")
diff --git a/testing/vcs/test_vcs_vectors_robinson_wrap.py b/testing/vcs/test_vcs_vectors_robinson_wrap.py
index 86491cc2f..3cb30f06f 100644
--- a/testing/vcs/test_vcs_vectors_robinson_wrap.py
+++ b/testing/vcs/test_vcs_vectors_robinson_wrap.py
@@ -1,13 +1,7 @@
 import vcs, cdms2, numpy, os, sys
-src = sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import testing.regression as regression
 
-x = vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200, 1091, units="pixels")
+x = regression.init()
 f = cdms2.open(os.path.join(vcs.sample_data, "clt.nc"))
 lon1 = -180
 u = f("clt")
@@ -19,8 +13,4 @@ p = x.createprojection()
 p.type = "robinson"
 V.projection = p
 x.plot(u,v,V, bg=1)
-
-fnm = "test_vcs_vectors_robinson_wrap.png"
-x.png(fnm)
-ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, "test_vcs_vectors_robinson_wrap.png")
diff --git a/testing/vcs/test_vcs_verify_boxfill_basics.py b/testing/vcs/test_vcs_verify_boxfill_basics.py
index 7d08a2b75..0d7c4c2d0 100644
--- a/testing/vcs/test_vcs_verify_boxfill_basics.py
+++ b/testing/vcs/test_vcs_verify_boxfill_basics.py
@@ -1,4 +1,3 @@
-
 import vcs
 import numpy
 import cdtime
@@ -12,12 +11,12 @@ b=x.createboxfill()
 assert(b.projection == "linear")
 assert(b.xticlabels1 == "*")
 assert(b.xticlabels2 == "*")
-assert(b.xmtics1 == "") 
+assert(b.xmtics1 == "")
 assert(b.xmtics2 == "")
 assert(b.yticlabels1 == "*")
 assert(b.yticlabels2 == "*")
-assert(b.ymtics1 == "")  
-assert(b.ymtics2 == "")  
+assert(b.ymtics1 == "")
+assert(b.ymtics2 == "")
 assert(numpy.allclose(b.datawc_x1, 1e+20))
 assert(numpy.allclose(b.datawc_x2, 1e+20))
 assert(numpy.allclose(b.datawc_y1, 1e+20))
@@ -71,12 +70,12 @@ assert(b.name == "test_b_ok")
 assert(b.projection == "test_bfill")
 assert(b.xticlabels1 == {23:"Hi"})
 assert(b.xticlabels2 == {23:"Hi"})
-assert(b.xmtics1 == {23:"Hi"}) 
+assert(b.xmtics1 == {23:"Hi"})
 assert(b.xmtics2 == {23:"Hi"})
 assert(b.yticlabels1 == {23:"Hi"})
 assert(b.yticlabels2 == {23:"Hi"})
-assert(b.ymtics1 == {23:"Hi"})  
-assert(b.ymtics2 == {23:"Hi"})  
+assert(b.ymtics1 == {23:"Hi"})
+assert(b.ymtics2 == {23:"Hi"})
 assert(numpy.allclose(b.datawc_x1, 56.7))
 assert(numpy.allclose(b.datawc_x2, 56.7))
 assert(numpy.allclose(b.datawc_y1, 56.7))
diff --git a/testing/vcs/test_vcs_wmo_marker.py b/testing/vcs/test_vcs_wmo_marker.py
index b4478372f..854e4a9be 100644
--- a/testing/vcs/test_vcs_wmo_marker.py
+++ b/testing/vcs/test_vcs_wmo_marker.py
@@ -1,14 +1,10 @@
 
 import vcs,numpy,cdms2,MV2,os,sys
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
 
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
+
+import testing.regression as regression
+x = regression.init()
+
 
 m = x.createmarker()
 M=1
@@ -22,8 +18,5 @@ x.plot(m,bg=1)
 fnm = 'wmo_marker.png'
 x.png(fnm)
 
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(x, "wmo_marker.png")
 
diff --git a/testing/vcs/test_vcs_wmo_markers.py b/testing/vcs/test_vcs_wmo_markers.py
index 5785e0925..5162eeeee 100644
--- a/testing/vcs/test_vcs_wmo_markers.py
+++ b/testing/vcs/test_vcs_wmo_markers.py
@@ -1,26 +1,20 @@
 
 import vcs,numpy,cdms2,MV2,os,sys
-src=sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import testing.regression as regression
 
 wmo = ['w00', 'w01', 'w02', 'w03', 'w04', 'w05', 'w06', 'w07', 'w08', 'w09',
        'w10', 'w11', 'w12', 'w13', 'w14', 'w15', 'w16', 'w17', 'w18', 'w19',
-       'w20', 'w21', 'w22', 'w23', 'w24', 'w25', 'w26', 'w27', 'w28', 'w29', 
+       'w20', 'w21', 'w22', 'w23', 'w24', 'w25', 'w26', 'w27', 'w28', 'w29',
        'w30', 'w31', 'w32', 'w33', 'w34', 'w35', 'w36', 'w37', 'w38', 'w39',
        'w40', 'w41', 'w42', 'w43', 'w44', 'w45', 'w46', 'w47', 'w48', 'w49',
        'w50', 'w51', 'w52', 'w53', 'w54', 'w55', 'w56', 'w57', 'w58', 'w59',
-       'w60', 'w61', 'w62', 'w63', 'w64', 'w65', 'w66', 'w67', 'w68', 'w69', 
+       'w60', 'w61', 'w62', 'w63', 'w64', 'w65', 'w66', 'w67', 'w68', 'w69',
        'w70', 'w71', 'w72', 'w73', 'w74', 'w75', 'w76', 'w77', 'w78', 'w79',
        'w80', 'w81', 'w82', 'w83', 'w84', 'w85', 'w86', 'w87', 'w88', 'w89',
        'w90', 'w91', 'w92', 'w93', 'w94', 'w95', 'w96', 'w97', 'w98', 'w99',
        'w100', 'w101', 'w102']
 
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
+x = regression.init()
 
 m = x.createmarker()
 M=7
@@ -37,13 +31,6 @@ for Y in range(7):
 m.x = xs
 m.y = ys
 m.list()
-x.plot(m,bg=1)
-fnm = "wmo_markers.png"
-x.png(fnm)
-
-
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
-sys.exit(ret)
+x.plot(m, bg=1)
+regression.run(x, "wmo_markers.png");
 
diff --git a/testing/vcs/vtk_ui/vtk_ui_test.py b/testing/vcs/vtk_ui/vtk_ui_test.py
index facfd7f45..40bbeaef1 100644
--- a/testing/vcs/vtk_ui/vtk_ui_test.py
+++ b/testing/vcs/vtk_ui/vtk_ui_test.py
@@ -1,8 +1,4 @@
-import vtk
-import vcs.vtk_ui
-import os
-import sys
-import time
+import, os, sys, time, vcs.vtk_ui, vtk
 
 
 def init():
@@ -101,15 +97,13 @@ class vtk_ui_test(object):
     def check_image(self, compare_against):
         """
         Checks the current render window's output against the image specified in the argument,
-        returns the result of checkimage.check_result_image
+        returns the result of regression.check_result_image
         """
         generate_png(self.win, self.test_file)
         pth = os.path.join(os.path.dirname(__file__), "../..")
         sys.path.append(pth)
-        import checkimage
-        print "fnm:", self.test_file
-        print "src:", compare_against
-        return checkimage.check_result_image(self.test_file, compare_against, checkimage.defaultThreshold)
+        import regression
+        return regression.check_result_image(self.test_file, compare_against)
 
     def test(self):
         self.do_test()
diff --git a/testing/vcsaddons/test_12_plot_one_leg_per_row.py b/testing/vcsaddons/test_12_plot_one_leg_per_row.py
index b3cfa0fba..0c0298527 100644
--- a/testing/vcsaddons/test_12_plot_one_leg_per_row.py
+++ b/testing/vcsaddons/test_12_plot_one_leg_per_row.py
@@ -1,14 +1,7 @@
-
-import sys,os
-src = sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-import EzTemplate,vcs
-## 12 plot one legend per row
+import os, sys, EzTemplate, vcs, testing.regression as regression
 
 ## Initialize VCS
-x=vcs.init()
+x = vcs.init()
 x.drawlogooff()
 
 bg = True
@@ -20,9 +13,7 @@ for i in range(12):
     t.legend.priority=0 # Turn off legend
 fnm = "test_12_plot_one_leg_per_row.png"
 M.preview(fnm,bg=bg)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
+ret = regression.check_result_image(fnm, sys.argv[1])
 if not bg:
     raw_input("Press Enter")
 sys.exit(ret)
diff --git a/testing/vcsaddons/test_12_plot_one_leg_per_row_right.py b/testing/vcsaddons/test_12_plot_one_leg_per_row_right.py
index 42e0f64e4..b57b76724 100644
--- a/testing/vcsaddons/test_12_plot_one_leg_per_row_right.py
+++ b/testing/vcsaddons/test_12_plot_one_leg_per_row_right.py
@@ -1,17 +1,13 @@
+import os, sys, testing.regression as regression
 
-import sys,os
-src = sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
 import EzTemplate,vcs
 import cdms,EzTemplate,vcs,sys
 ## 12 plots 1 legend per row on the right
 ## Initialize VCS
-x=vcs.init()
+x = vcs.init()
 x.drawlogooff()
-bg=True
-M=EzTemplate.Multi(rows=4,columns=3)
+bg = True
+M = EzTemplate.Multi(rows=4,columns=3)
 M.legend.direction='vertical'
 for i in range(12):
     t=M.get(legend='local')
@@ -19,9 +15,7 @@ for i in range(12):
         t.legend.priority=0 # Turn off legend
 fnm = "test_12_plot_one_leg_per_row_right.png"
 M.preview(fnm,bg=bg)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
+ret = regression.check_result_image(fnm, sys.argv[1])
 if not bg:
     raw_input("Press Enter")
 sys.exit(ret)
diff --git a/testing/vcsaddons/test_EzTemplate_12_plots_legd_direction.py b/testing/vcsaddons/test_EzTemplate_12_plots_legd_direction.py
index b6ca9eb34..d46e7b9ac 100644
--- a/testing/vcsaddons/test_EzTemplate_12_plots_legd_direction.py
+++ b/testing/vcsaddons/test_EzTemplate_12_plots_legd_direction.py
@@ -1,14 +1,7 @@
-
-import sys,os
-src = sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-import EzTemplate,vcs
-## 12 plot one legend per row
+import os, sys, EzTemplate, vcs, testing.regression as regression
 
 ## Initialize VCS
-x=vcs.init()
+x = vcs.init()
 x.drawlogooff()
 
 bg = True
@@ -26,10 +19,8 @@ for i in range(12):
       t=M.get()
 
 fnm = "test_EzTemplate_12_plots_legd_direction.png"
-M.preview(fnm,bg=bg)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
+M.preview(fnm, bg=bg)
+ret = regression.check_result_image(fnm, sys.argv[1])
 if not bg:
     raw_input("Press Enter")
 sys.exit(ret)
diff --git a/testing/vcsaddons/test_EzTemplate_12_plots_margins_thickness.py b/testing/vcsaddons/test_EzTemplate_12_plots_margins_thickness.py
index 40899f264..73b7c8dbf 100644
--- a/testing/vcsaddons/test_EzTemplate_12_plots_margins_thickness.py
+++ b/testing/vcsaddons/test_EzTemplate_12_plots_margins_thickness.py
@@ -1,14 +1,7 @@
-
-import sys,os
-src = sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-import EzTemplate,vcs
-## 12 plot one legend per row
+import os, sys, EzTemplate, vcs, testing.regression as regression
 
 ## Initialize VCS
-x=vcs.init()
+x = vcs.init()
 x.drawlogooff()
 
 bg = True
@@ -25,9 +18,7 @@ for i in range(12):
       t=M.get()
 fnm = "test_EzTemplate_12_plots_margins_thickness.png"
 M.preview(fnm,bg=bg)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
+ret = regression.check_result_image(fnm, sys.argv[1])
 if not bg:
     raw_input("Press Enter")
 sys.exit(ret)
diff --git a/testing/vcsaddons/test_EzTemplate_12_plots_mix_glb_local.py b/testing/vcsaddons/test_EzTemplate_12_plots_mix_glb_local.py
index 043e03de4..6e9398fe8 100644
--- a/testing/vcsaddons/test_EzTemplate_12_plots_mix_glb_local.py
+++ b/testing/vcsaddons/test_EzTemplate_12_plots_mix_glb_local.py
@@ -1,12 +1,4 @@
-
-import sys,os
-src = sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-import EzTemplate,vcs
-## 12 plot one legend per row
-
+import os, sys, EzTemplate, vcs, testing.regression as regression
 ## Initialize VCS
 x=vcs.init()
 x.drawlogooff()
@@ -24,9 +16,7 @@ for i in range(12):
 
 fnm = "test_EzTemplate_12_plots_mix_glb_local.png"
 M.preview(fnm,bg=bg)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
+ret = regression.check_result_image(fnm, sys.argv[1])
 if not bg:
     raw_input("Press Enter")
 sys.exit(ret)
diff --git a/testing/vcsaddons/test_EzTemplate_12_plots_spacing.py b/testing/vcsaddons/test_EzTemplate_12_plots_spacing.py
index d17eb1a69..5d4cd293b 100644
--- a/testing/vcsaddons/test_EzTemplate_12_plots_spacing.py
+++ b/testing/vcsaddons/test_EzTemplate_12_plots_spacing.py
@@ -1,14 +1,6 @@
-
-import sys,os
-src = sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-import EzTemplate,vcs
-## 12 plot one legend per row
-
+import os, sys, EzTemplate, vcs, testing.regression as regression
 ## Initialize VCS
-x=vcs.init()
+x = vcs.init()
 x.drawlogooff()
 
 bg = True
@@ -18,9 +10,7 @@ M.spacing.vertical=.1
 
 fnm = "test_EzTemplate_12_plots_spacing.png"
 M.preview(fnm,bg=bg)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
+ret = regression.check_result_image(fnm, sys.argv[1])
 if not bg:
     raw_input("Press Enter")
 sys.exit(ret)
diff --git a/testing/vcsaddons/test_vcs_addons_EzTemplate_2x2.py b/testing/vcsaddons/test_vcs_addons_EzTemplate_2x2.py
index 2619fe5ef..ee645d16c 100644
--- a/testing/vcsaddons/test_vcs_addons_EzTemplate_2x2.py
+++ b/testing/vcsaddons/test_vcs_addons_EzTemplate_2x2.py
@@ -1,21 +1,11 @@
+import os, sys, cdms2, testing.regression as regression, vcs, vcsaddons
 
-import sys,os
-src = sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-
-import vcs
-import vcsaddons
-import cdms2
-
-f=cdms2.open(os.path.join(vcs.sample_data,'clt.nc'))
-s=f("clt",time=slice(0,1),squeeze=1)
+f = cdms2.open(os.path.join(vcs.sample_data,'clt.nc'))
+s = f("clt",time=slice(0,1),squeeze=1)
 
 bg = True
-
-M=vcsaddons.EzTemplate.Multi(rows=2,columns=2)
-x=vcs.init()
+M = vcsaddons.EzTemplate.Multi(rows=2,columns=2)
+x = vcs.init()
 x.setantialiasing(0)
 x.drawlogooff()
 if bg:
@@ -25,9 +15,7 @@ for i in range(4):
 
 fnm = "test_vcs_addons_EzTemplate_2x2.png"
 x.png(fnm)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
+ret = regression.check_result_image(fnm, sys.argv[1])
 if not bg:
     raw_input("Press Enter")
 sys.exit(ret)
diff --git a/testing/vcsaddons/test_vcsaddons_preview_2x2.py b/testing/vcsaddons/test_vcsaddons_preview_2x2.py
index 754aa5cea..a0318f25a 100644
--- a/testing/vcsaddons/test_vcsaddons_preview_2x2.py
+++ b/testing/vcsaddons/test_vcsaddons_preview_2x2.py
@@ -1,22 +1,12 @@
-
-import sys,os
-src = sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
-
-import vcsaddons
+import os, sys, testing.regression as regression, vcsaddons
 
 bg = True
-
-M=vcsaddons.EzTemplate.Multi(rows=2,columns=2)
+M = vcsaddons.EzTemplate.Multi(rows=2,columns=2)
 if bg:
   M.x.setbgoutputdimensions(1200,1091,units="pixels")
 fnm = "test_vcsaddons_preview_2x2.png"
 M.preview(out=fnm,bg=bg)
-print "fnm:",fnm
-print "src:",src
-ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
+ret = regression.check_result_image(fnm, sys.argv[1])
 if not bg:
     raw_input("Press Enter")
 sys.exit(ret)
-- 
GitLab


From 569843aec62da106d9a7452983f49c999adcf4aa Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Fri, 13 May 2016 07:34:01 -0400
Subject: [PATCH 046/191] Updated to current master

---
 testing/vcs/test_fewer_colors_than_levels.py | 20 +++--------------
 testing/vcs/test_vcs_no_continents.py        | 23 +++-----------------
 2 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/testing/vcs/test_fewer_colors_than_levels.py b/testing/vcs/test_fewer_colors_than_levels.py
index 2779d4b6d..c500cf19e 100644
--- a/testing/vcs/test_fewer_colors_than_levels.py
+++ b/testing/vcs/test_fewer_colors_than_levels.py
@@ -1,18 +1,9 @@
-import vcs,cdms2,sys,os
-
-baselineImage = sys.argv[1]
-
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import os, sys, cdms2, vcs, testing.regression as regression
 
 dataset = cdms2.open(os.path.join(vcs.sample_data,"clt.nc"))
 data = dataset("clt")
 
-canvas = vcs.init()
-canvas.setantialiasing(0)
-canvas.setbgoutputdimensions(1200, 1091, units="pixels")
-canvas.drawlogooff()
+canvas = regression.init()
 
 boxfill = canvas.createboxfill()
 
@@ -21,9 +12,4 @@ boxfill.color_2 = 250
 
 canvas.plot(data, boxfill, bg=1)
 
-testImage = os.path.abspath("test_fewer_colors_than_levels.png")
-canvas.png(testImage)
-
-ret = checkimage.check_result_image(testImage, baselineImage, checkimage.defaultThreshold)
-
-sys.exit(ret)
+regression.run(canvas, "test_fewer_colors_than_levels.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_no_continents.py b/testing/vcs/test_vcs_no_continents.py
index 03630d457..a5c3e8d04 100644
--- a/testing/vcs/test_vcs_no_continents.py
+++ b/testing/vcs/test_vcs_no_continents.py
@@ -1,7 +1,4 @@
-import cdms2
-import os
-import sys
-import vcs
+import os, sys, cdms2, vcs, testing.regression as regression
 
 # Load the clt data:
 dataFile = cdms2.open(os.path.join(vcs.sample_data, "clt.nc"))
@@ -10,10 +7,7 @@ clt = clt(latitude=(-90.0, 90.0), longitude=(-180., 175.), squeeze=1,
           time=('1979-1-1 0:0:0.0', '1988-12-1 0:0:0.0'))
 
 # Initialize canvas:
-canvas = vcs.init()
-canvas.setantialiasing(0)
-canvas.setbgoutputdimensions(1200,1091,units="pixels")
-canvas.drawlogooff()
+canvas = regression.init()
 
 t1 = vcs.createtemplate()
 t1.scale(.5, "y")
@@ -24,15 +18,4 @@ t2.move(.5, 'y')
 canvas.plot(clt, t1, continents=0, bg=True)
 canvas.plot(clt, t2, continents=1, bg=True)
 
-# Load the image testing module:
-testingDir = os.path.join(os.path.dirname(__file__), "..")
-sys.path.append(testingDir)
-import checkimage
-
-# Create the test image and compare:
-baseline = sys.argv[1]
-testFile = "test_vcs_no_continents.png"
-canvas.png(testFile)
-ret = checkimage.check_result_image(testFile, baseline,
-                                    checkimage.defaultThreshold)
-sys.exit(ret)
+regression.run(canvas, "test_vcs_no_continents.png")
\ No newline at end of file
-- 
GitLab


From 9990b92bbd4c29b95800d8a9feb3f14060158074 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Fri, 13 May 2016 07:36:49 -0400
Subject: [PATCH 047/191] Ported common code to testing common

---
 Packages/testing/common.py                    | 22 +++++++++++++++++++
 Packages/testing/regression.py                |  1 +
 .../vcs/test_vcs_fillarea_basics_no_plot.py   |  8 ++-----
 testing/vcs/test_vcs_verify_boxfill_basics.py |  7 ++----
 testing/vcs/test_vcs_verify_proj_basics.py    |  8 ++-----
 5 files changed, 29 insertions(+), 17 deletions(-)
 create mode 100644 Packages/testing/common.py

diff --git a/Packages/testing/common.py b/Packages/testing/common.py
new file mode 100644
index 000000000..7a32bcec5
--- /dev/null
+++ b/Packages/testing/common.py
@@ -0,0 +1,22 @@
+def test_values_setting(gm,attributes,good_values=[],bad_values=[]):
+  if isinstance(attributes,str):
+    attributes=[attributes,]
+  for att in attributes:
+    for val in good_values:
+      setattr(gm,att,val)
+    for val in bad_values:
+      try:
+        setattr(gm,att,val)
+        success = True
+      except:
+        success = False
+      else:
+        if success:
+          if hasattr(gm,"g_name"):
+            nm = gm.g_name
+          elif hasattr(gm,"s_name"):
+            nm = gm.s_name
+          else:
+            nm=gm.p_name
+          raise Exception,"Should not be able to set %s attribute '%s' to %s" % (nm,att,repr(val))
+          sys.exit(1)
diff --git a/Packages/testing/regression.py b/Packages/testing/regression.py
index 68f381ce4..bcc088202 100644
--- a/Packages/testing/regression.py
+++ b/Packages/testing/regression.py
@@ -138,6 +138,7 @@ def check_result_image(fname, baselinefname=sys.argv[1], threshold=defaultThresh
     printDart("ValidImage", "image/png", os.path.abspath(bestFilename), "File")
     return -1
 
+
 def main():
     if len(sys.argv) != 4:
         print "Error:"
diff --git a/testing/vcs/test_vcs_fillarea_basics_no_plot.py b/testing/vcs/test_vcs_fillarea_basics_no_plot.py
index 870aae9be..9a8e38ce7 100644
--- a/testing/vcs/test_vcs_fillarea_basics_no_plot.py
+++ b/testing/vcs/test_vcs_fillarea_basics_no_plot.py
@@ -1,9 +1,5 @@
-
-import vcs
-import numpy
-import cdtime
-
-from vcs_test_common import *
+import numpy, cdtime, vcs
+from testing.common import test_values_setting
 
 x=vcs.init()
 x.drawlogooff()
diff --git a/testing/vcs/test_vcs_verify_boxfill_basics.py b/testing/vcs/test_vcs_verify_boxfill_basics.py
index 0d7c4c2d0..0768ff9f9 100644
--- a/testing/vcs/test_vcs_verify_boxfill_basics.py
+++ b/testing/vcs/test_vcs_verify_boxfill_basics.py
@@ -1,8 +1,5 @@
-import vcs
-import numpy
-import cdtime
-
-from vcs_test_common import *
+import numpy, cdtime, vcs
+from testing.common import test_values_setting
 
 x=vcs.init()
 x.drawlogooff()
diff --git a/testing/vcs/test_vcs_verify_proj_basics.py b/testing/vcs/test_vcs_verify_proj_basics.py
index f1e1fa0a9..822a6fc0b 100644
--- a/testing/vcs/test_vcs_verify_proj_basics.py
+++ b/testing/vcs/test_vcs_verify_proj_basics.py
@@ -1,9 +1,5 @@
-
-import vcs
-import numpy
-import cdtime
-
-from vcs_test_common import *
+import numpy, cdtime, vcs
+from testing.common import test_values_setting
 
 x=vcs.init()
 x.drawlogooff()
-- 
GitLab


From a2ce6ac2f478aae2a184d4f618bbd3542325a1e1 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Fri, 13 May 2016 08:01:52 -0400
Subject: [PATCH 048/191] Added testing to the modules to be built

---
 Packages/testing/regression.py |  2 ++
 Packages/testing/setup.py      |  3 +--
 installation/control.py        | 11 ++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Packages/testing/regression.py b/Packages/testing/regression.py
index bcc088202..b272d592f 100644
--- a/Packages/testing/regression.py
+++ b/Packages/testing/regression.py
@@ -27,10 +27,12 @@ def init():
     return vcsinst
 
 def run(vcsinst, fname, baseline=sys.argv[1], threshold=defaultThreshold):
+    """Export plot to a png and exit after comparsion."""
     vcsinst.png(fname)
     sys.exit(check_result_image(fname, baseline, threshold))
 
 def run_wo_terminate(vcsinst, fname, baseline=sys.argv[1], threshold=defaultThreshold):
+    """Export plot to a png and return comparison with baseline."""
     vcsinst.png(fname)
     return check_result_image(fname, baseline, threshold)
 
diff --git a/Packages/testing/setup.py b/Packages/testing/setup.py
index 70f790d7b..85c270ed8 100755
--- a/Packages/testing/setup.py
+++ b/Packages/testing/setup.py
@@ -9,6 +9,5 @@ setup(name="testing",
       description="Testing infrastructure for cdat",
       url="http://uvcdat.llnl.gov",
       packages=['testing'],
-      package_dir={'testing': 'testing',},
-      install_requires=['numpy','vcs', 'vtk'],
+      package_dir = {'testing': '', }
 )
diff --git a/installation/control.py b/installation/control.py
index 7a3a52091..49ed5d9af 100644
--- a/installation/control.py
+++ b/installation/control.py
@@ -1,7 +1,7 @@
 # This file is used to control the behavior of install.py.
 
 # The search path is used if the X11 directories aren't configured.
-x11search = ['/usr/X11R6', '/usr/X11R6.5.1', 
+x11search = ['/usr/X11R6', '/usr/X11R6.5.1',
              '/usr/X11R6.4','/usr','/usr/openwin','/opt']
 # Here is where they are on OSF1 and perhaps similar systems
 x11OSF1lib = ['/usr/lib/X11', '/usr/lib']
@@ -48,14 +48,14 @@ else:
     make_code = 'make'
 
 # List of packages to be built
-packages = [ 
+packages = [
     "Packages/pydebug",
     "Packages/cdtime",
     "Packages/demo",
     "Packages/help",
     "Packages/regrid2",
-    "Packages/cdms2", 
-    "Packages/esg", 
+    "Packages/cdms2",
+    "Packages/esg",
     "Packages/ncml",
     "Packages/DV3D",
     "Packages/vcs",
@@ -63,9 +63,10 @@ packages = [
     "Packages/cdutil",
     "Packages/unidata",
     "Packages/xmgrace",
-    "Packages/genutil", 
+    "Packages/genutil",
     "Packages/Thermo",
     "Packages/WK",
     "Packages/gui_support",
     "Packages/distarray",
+    "Packages/testing",
     ]
-- 
GitLab


From 477e09750e554da288341d72ffd1d0cf39bce308 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Fri, 13 May 2016 14:21:05 -0400
Subject: [PATCH 049/191] Marked export to gs as no longer supported

---
 Packages/vcs/vcs/Canvas.py | 63 ++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 34 deletions(-)

diff --git a/Packages/vcs/vcs/Canvas.py b/Packages/vcs/vcs/Canvas.py
index d98270c55..8de655fbc 100644
--- a/Packages/vcs/vcs/Canvas.py
+++ b/Packages/vcs/vcs/Canvas.py
@@ -5309,47 +5309,42 @@ Options:::
     def gs(self, filename='noname.gs', device='png256',
            orientation=None, resolution='792x612'):
         """
- Function: gs
+        Function: gs
 
- Description of Function:
-    This routine allows the user to save the VCS canvas in one of the many
-    GhostScript (gs) file types (also known as devices). To view other
-    GhostScript devices, issue the command "gs --help" at the terminal
-    prompt. Device names include: bmp256, epswrite, jpeg, jpeggray,
-    pdfwrite, png256, png16m, sgirgb, tiffpack, and tifflzw. By default
-    the device = 'png256'.
-
-    If no path/file name is given and no previously created gs file has been
-    designated, then file
+        Description of Function:
+        This routine allows the user to save the VCS canvas in one of the many
+        GhostScript (gs) file types (also known as devices). To view other
+        GhostScript devices, issue the command "gs --help" at the terminal
+        prompt. Device names include: bmp256, epswrite, jpeg, jpeggray,
+        pdfwrite, png256, png16m, sgirgb, tiffpack, and tifflzw. By default
+        the device = 'png256'.
+
+        If no path/file name is given and no previously created gs file has been
+        designated, then file
 
         /$HOME/%s/default.gs
 
-    will be used for storing gs images. However, if a previously created gs
-    file exist, then this output file will be used for storage.
+        will be used for storing gs images. However, if a previously created gs
+        file exist, then this output file will be used for storage.
 
-    By default, the page orientation is the canvas' orientation.
-    To translate the page orientation to portrait mode (p), set the parameter orientation = 'p'.
-    To translate the page orientation to landscape mode (l), set the parameter orientation = 'l'.
+        By default, the page orientation is the canvas' orientation.
+        To translate the page orientation to portrait mode (p), set the parameter orientation = 'p'.
+        To translate the page orientation to landscape mode (l), set the parameter orientation = 'l'.
 
-    The gs command is used to create a single gs file at this point. The user
-    can use other tools to append separate image files.
+        The gs command is used to create a single gs file at this point. The user
+        can use other tools to append separate image files.
 
- Example of Use:
-    a=vcs.init()
-    a.plot(array)
-    a.gs('example') #defaults: device='png256', orientation='l' and resolution='792x612'
-    a.gs(filename='example.tif', device='tiffpack', orientation='l', resolution='800x600')
-    a.gs(filename='example.pdf', device='pdfwrite', orientation='l', resolution='200x200')
-    a.gs(filename='example.jpg', device='jpeg', orientation='p', resolution='1000x1000')
-""" % (self._dotdir)
-        if orientation is None:
-            orientation = self.orientation()[0]
-        r = resolution.split('x')
-        f1 = f1 = float(r[0]) / 1100.0 * 100.0
-        f2 = f2 = float(r[1]) / 849.85 * 100.0
-        resolution = "%4.1fx%4.1f" % (f2, f1)
-        nargs = (filename, device, orientation, resolution)
-        return self.canvas.gs(*nargs)
+        Example of Use:
+        a=vcs.init()
+        a.plot(array)
+        a.gs('example') #defaults: device='png256', orientation='l' and resolution='792x612'
+        a.gs(filename='example.tif', device='tiffpack', orientation='l', resolution='800x600')
+        a.gs(filename='example.pdf', device='pdfwrite', orientation='l', resolution='200x200')
+        a.gs(filename='example.jpg', device='jpeg', orientation='p', resolution='1000x1000')
+
+        NOTE: This method is marked as deprecated
+        """ % (self._dotdir)
+        warnings.warn("Export to GhostScript is no longer supported", Warning)
 
     ##########################################################################
     #                                                                           #
-- 
GitLab


From 3ef4b77b6e8bc3f21b44acb7cad9cfcd3351bfc5 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Fri, 13 May 2016 15:15:07 -0400
Subject: [PATCH 050/191] Cleaned docs

---
 docs/Legal.htm => LEGAL.htm |   0
 docs/Legal.txt => LEGAL.txt |   0
 TODO.txt                    |   5 -
 docs/ChangeLog.txt          |  20 ----
 docs/Changes_3.3_to_4.0.sxc | Bin 12334 -> 0 bytes
 docs/Changes_3.3_to_4.csv   | 133 ---------------------
 docs/Changes_3.3_to_4.pdf   | Bin 26249 -> 0 bytes
 docs/Changes_3.3_to_4.xls   | Bin 45056 -> 0 bytes
 docs/DeveloperHowTo.html    |   6 -
 docs/HELP.html              |   6 -
 docs/README.txt             |   2 -
 docs/ReleaseNotes.txt       | 226 ------------------------------------
 12 files changed, 398 deletions(-)
 rename docs/Legal.htm => LEGAL.htm (100%)
 rename docs/Legal.txt => LEGAL.txt (100%)
 delete mode 100644 TODO.txt
 delete mode 100644 docs/ChangeLog.txt
 delete mode 100644 docs/Changes_3.3_to_4.0.sxc
 delete mode 100644 docs/Changes_3.3_to_4.csv
 delete mode 100644 docs/Changes_3.3_to_4.pdf
 delete mode 100644 docs/Changes_3.3_to_4.xls
 delete mode 100644 docs/DeveloperHowTo.html
 delete mode 100644 docs/HELP.html
 delete mode 100644 docs/README.txt
 delete mode 100644 docs/ReleaseNotes.txt

diff --git a/docs/Legal.htm b/LEGAL.htm
similarity index 100%
rename from docs/Legal.htm
rename to LEGAL.htm
diff --git a/docs/Legal.txt b/LEGAL.txt
similarity index 100%
rename from docs/Legal.txt
rename to LEGAL.txt
diff --git a/TODO.txt b/TODO.txt
deleted file mode 100644
index fb03af1f8..000000000
--- a/TODO.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-- Fix ESMF build
-- Verify individual packages
-- Verify if we can build using system
-- Consistent install and build directories
-- Install headers and lib under their own package name
diff --git a/docs/ChangeLog.txt b/docs/ChangeLog.txt
deleted file mode 100644
index 5f7d49505..000000000
--- a/docs/ChangeLog.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-2011-06-22 : recap (probably forgot many things):
- 		- grib2 support
-		- restAPI support
-		- GUI code moved to uv-cdat repo
-		- forecast support
-		- gridspec support
-2010-06-17 : got Qt to build automatically, (or use the binaries) 
-2010-06-17 : got --enable-vistrails to work and build SIP and PyQt
-2010-06-15 : got the right LDFLAGS going to compile Fortran extensions under mac
-2010-04-08 : build system fetches sources, no more gz in repository!
-2010-04-08 : preliminary merge with Qt branch. You should be able to build against Qt (which needs to be pre-installed independently for now)
-2010-02-11 : added netcdf 4.1
-2010-02-02 : added correct link calls for icc under linux
-2010-01-28 : fixed tiny-tiny leak in cdms2 and cdtime (setting dictionary item
-w/o decref tmp pyobject for int/string)
-2010-01-28 : latest netcdf4 daily from Ed, fixes a LOT of memory leaks.
-2010-01-13 : change default cdms2 compress value to no shuffle/deflate 1/defalteLevel 1
-2010-01-13 : newer NetCDF4, daily snapshot that has better chunking parameter, etc..
-2010-01-13 : latest Scientific Python  (SP)
-2010-01-13 : got vtk to build in framework mode under Mac
diff --git a/docs/Changes_3.3_to_4.0.sxc b/docs/Changes_3.3_to_4.0.sxc
deleted file mode 100644
index e811c67769e89d740d242f887021e5ac6dfc5dac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12334
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

diff --git a/docs/Changes_3.3_to_4.csv b/docs/Changes_3.3_to_4.csv
deleted file mode 100644
index 762b7014b..000000000
--- a/docs/Changes_3.3_to_4.csv
+++ /dev/null
@@ -1,133 +0,0 @@
-"Impact";"Package";"Section";"Change"
-1;"Cdms";"Axis";"Time dimension does not generate bounds automatically anymore – use cdms.setAutoBounds('on') -"
-1;"Cdms";"Curvilinear grids";"CurveGrids can be supplied in the axis list."
-1;"Cdms";"Curvilinear grids";"Added conversion routines: rect => curve => generic"
-1;"Cdms";"Curvilinear grids";"MV works with curvilinear grids"
-1;"Cdms";"Curvilinear grids";"Can read grids from scrip remap files"
-1;"Cdms";"Curvilinear grids";"getMesh returns a transposed mesh grid if requested."
-1;"Cdms";"Curvilinear grids";"On reading grids from files, check for cell convexity. Where that fails by default fix cells that straddle the 0 / 2pi boundary."
-1;"Cdms";"Curvilinear grids";"Added routines to write grids to external files in scrip format"
-1;"Cdms";"I/O";"Trapped seg faults on closed file objects."
-1;"Cdms";;"Fixed memory leaks."
-1;"Doc";"Tutorials";"New tutorials"
-1;"Exsrc";"DODS";"Now builds by default under Linux, updated to Version 3.4"
-1;"Vcdat";"DV";"A number reflecting selection/operation order appears next to selected variable"
-1;"Vcdat";"DV";"Templates and Graphic Method Listbox available (on/off) in Variables and Calculator area"
-1;"Vcdat";"Editors";"Template editor accessible from VCDAT (click and drag technology)"
-1;"Vcdat";"Editors";"Graphic Method Editors updated, preview/reset option added"
-1;"Vcdat";"General";"4 mode: 1-user defined layout; 2- Browse Variable; 3- Data Manipulation; 4- Graphics Display"
-1;"Vcdat";"GUI";"Layout changed, now has mode for plot edititng, letting you copy/paste and edit existing template and method"
-1;"Vcdat";"Plot";"Annotation pop-up available, with preview/reset/apply/cancel"
-1;"Vcdat";"Plot";"Page Layout Table to control what is displayed on the VCS Canvas, can turn on/off plots with one click"
-1;"Vcs";"Animations";" update to handle two or more on a page"
-1;"Vcs";"Animations";"Can read from a file"
-1;"Vcs";"Animations";"Can save to a file"
-1;"Vcs";"Curvilinear grids";"Handled automatically"
-1;"Vcs";"Projection";"Added gctp package to vcs, 28 new types of projection avalaible"
-1;"Vcs";"Templates";"Template editor by clicking"
-2;"Cdms";"I/O";"Added writeScripGrid, readScripGrid can read from a SCRIP mapping file"
-2;"Cdms";"Libcdms";"Removed spurious calendar error"
-2;"Cdms";"Time axis";"TransientAxis getCalendar returns DefaultCalendar if none specified. This is consistent with FileAxis.getCalendar()"
-2;"Doc ";"Tutorials";"Data can now be anywhere on user's space"
-2;"Genutil";"Arrayindexing";"New module, allows array indexing, e.g:C=genutil.arrayindexing.get(A,B)"
-2;"Genutil";"Filters";"Added filters module, so far only “running average”, 121 and custom"
-2;"Genutil";"Statistics";"fixed a bug in linear regression when trend is 0, probability are not set to missing"
-2;"Install";"All";"Updated external Packages to their latest versions, see README files"
-2;"Install";"CDAT";"Mac OS X “offically” supported"
-2;"Install";"Cdms";"Fix CDMS build for FreeBSD"
-2;"Install";"Cdms";"Added --cdms-only option to express_install."
-2;"Install";"Exsrc";"Now can build indiviudal package or exclude some"
-2;"Install";"Exsrc";"--list option added"
-2;"Install";"Exsrc";"--help option in install_script "
-2;"Vcdat";"0D (numbers)";"if no dimensions are present, then show the single vaule in the Defined Variables window"
-2;"Vcdat";"1D plot";"Overlay applies, use page layout for other types"
-2;"Vcdat";"DV";"Different mode of variable selection single/multiple"
-2;"Vcdat";"GUI";"Remove the 1-Plot, 2-Plot, 3-Plot, 4-Plot per page"
-2;"Vcdat";"I/O";"Simple binary file reader added"
-2;"Vcdat";"I/O";"Can read column arranged ascii files"
-2;"Vcdat";"I/O";"Save netcdf now has browser to go between directories"
-2;"Vcdat";"I/O";"Simple ascii file reader added"
-2;"Vcdat";"Menu";"New interface to user menu, more robust and intuitive"
-2;"Vcdat";"Scripting";"Added limited recordings of the functions (not available on beta)"
-2;"Vcs";"Boxfill";"Now can specify levels just like in isofill"
-2;"Vcs";"Isofill";"Now has legend otpion (i.e can specifiy where to  put values)"
-2;"Vcs";;"Linewidth option added where line are controlled"
-2;"Vcs";;"User can click on the plot and get worldcoordinate/index values, and actual value"
-3;"Cdms";"I/O";"picker selector, let you pick non contiguous values"
-3;"Cdutil";"Times";"Yearly and xDaily Time Bounds setting, plus accept either slab or axis"
-3;"Contrib";"F2py";"Added F2PY, fortran wrapper"
-3;"Install";"HDF";"--HDF= option let user point to HDF libraries"
-3;"Install";"Scrip";"Source code distributed but not installed"
-3;"Vcdat";"DV";"Replacing the eval call for the exec call. Now the user can enter any command"
-3;"Vcdat";"DV";"Fix for the automatic Numeric and MA conversion to MV. The user now has a choice to convert Numeric and MA to MV. That is, the user will need to select the ""Automatic Conversion to MV"" toggle in the ""Preferences"" menu to turn this feature on or off"
-3;"Vcs";"Plot";"Very High Resolution Continent Files generated via GMT are available on the web"
-3;"Vcs";"Templates";"Scaling, now can scale fonts"
-3;"Vcs";"Text";"Bg option works"
-4;"Cdms";"I/O";"Implemented isClose()."
-4;"Contrib";"Install";"Automatically built"
-4;"Exsrc";"VTK";"VTK (beta version) added to distrib, not built by default this is experimental"
-4;"Genutil";"Xmgrace";"Now can pass arguments at init time"
-4;"Vcdat";"General";"Retains user settings"
-4;"Vcdat";"General";"Predefined Region"
-4;"Vcdat";"General";"Can define colors using intensiy"
-4;"Vcdat";"Taylordiagram";"GUI updated"
-4;"Vcs";"Primitives";"Projection accessible"
-4;"Vcs";"Taylordiagram";"standard dev added to xaxis"
-4;"Vcs";"Taylordiagram";"taylor control the xtic/ytic/cticks"
-4;"Vcs";"Yxvsx, Xyvsy";"Auto now works again (no more blank canvas)"
-4;"Vcs";;"Improved thread support"
-5;"Cdms";"Cdscan";"Added –nofiles, --execfile option"
-5;"Cdms";"Cdscan";"Added --notrim-lat option"
-5;"Cdms";"Cdscan";"Added --filesxml option"
-5;"Cdms";"Curvilinear grids";"Raise error if nonrectangular grid has no bounds associated"
-5;"Cdms";"I/O";"Added gridftp protocol"
-5;"Cdutil";"Times";"fixed times.setTimesBoundsMonthly for end of month storage"
-5;"Cdutil";"Vertical";"Vertical Interpolation Tools (sigma2pressure)"
-5;"Contrib";"IaGraph";"Package of interactive graphing tools. IaGraph will create line plots, scatter plots, and contour plots"
-5;"Exsrc";"R";"Added R (statistical package) sources to distrib, not built by default"
-5;"Genutil";"Xmgrace";"safe/nosafe problem solved, version controled before passing the argument"
-5;"Ncml";;"New Package"
-5;"Scrip";;"New module, interface to scrip regridder"
-5;"Vcdat";"DV";"Icons tools added"
-5;"Vcdat";"General";"Keep (or not) Windows in front of main window"
-6;"Cdms";"Axis";"Align isLatitude, isLongitude test with CF convention"
-6;"Contrib";"ComparisonStatistics";"fixed a bug for TimeComponent 18, the seasonal weights used in computing the annual means were slightly off"
-6;"Contrib";"Rpy";"Added Rpy package, works if you have R on your system"
-6;"Exsrc";"Pbm";"Pbmplus replaced with netpbm on Linux and Mac systems"
-6;"Genutil";"Statistics";"Geometric Mean, Median and Rank functions added"
-6;"Vcdat";"1D plot";"Fixed multiplier annotation for 1D plots."
-6;"Vcdat";"DV";"Support for chemistry attributes"
-6;"Vcdat";"General";"Exit Popup to retain settings (can be turned off)"
-6;"Vcdat";"Menu";"Option pull down from main menu was changed to “Preferences”"
-6;"Vcs";"Animations";"bug fix for pan and zoom"
-6;"Vcs";"Templates";"Ratio options now supported, let user definean y/x ratio or if lat/lon let vcs find a good one"
-7;"Contrib";"ComparisonStatistics";"Handles fortran NaN"
-7;"Vcdat";"Annotations";"Changed annotation so a blank text field will print nothing in on the Canvas"
-7;"Vcs";"boxfill/isofill";"Extension bug fix, if levels set after ext_1"
-7;"Vcs";"Taylordiagram";"Taylordiags single precision ok now"
-8;"Cdms";"Cdscan";"Fixed bug when file has 'bounds' dimension."
-8;"Contrib";"ComparisonStatistics";"Updated doc"
-8;"Vcs";"Markers";"0 means no marker"
-8;"Vcs";"Taylordiagram";"fixed taylordiagrams.script and also listelements('taylordiagram') now works (x.show returns None)"
-9;"Cdms";"Drs";"Fixed the cycle process for DRS files. Must close DRS files before you open them again."
-9;"Cdutil";;"Removed Propertied Class dependencies, replaced with standard python (object/property)"
-9;"Contrib";"ComparisonStatistics";"Bug fixing"
-9;"Contrib";"Pyfort";"New version 8.4"
-9;"Vcdat";"General";"User can defined the name of its default template/graphic methods"
-9;"Vcs";"1D plots";"Bug fixes for graphics methods. That is, if the data only has 1 dimensions and 2 or more dimensions are required, then use Yxvsx to plot the data"
-9;"Vcs";"Printer";"lanscape/portrait argument bug fix"
-9;"Vcs";"Taylordiagram";"Skill drawing, bug fix"
-9;"Vcs";;"Major changes to the VCS graphics methods"
-9;"Vcs";;"Fixed attribute settings for missing attributes"
-10;"Cdms";"I/O";"Fixed bug in dataset.write when time axis is a float. This shows up with Numeric V23.1"
-10;"Cdms";;"Added xmllib to ditrib since it'll be abandoned in future python"
-10;"Cdutil";"VariableMatcher";"Added comment keyword"
-10;"Genutil";;"Removed Propertied Class dependencies, replaced with standard python (object/property)"
-10;"Vcs";"Colormap";"Added the NCAR Color Map to the initial.attribute file."
-10;"Vcs";"Colormap";"Cleanedup"
-10;"Vcs";"Templates";"fixed JYP comments about ""inconsistency"" on comment#1 of UL1of4 template"
-10;"Vcs";;"Removed Propertied Class dependencies, replaced with standard python (object/property)"
-11;"Cdms";"Curvilinear grids";"auxcoord, gengrid modules"
-11;"Esg";;"New Package"
-11;"Install";"CDAT";"Building GNU tar on older systems..."
-11;"Install";"CDAT";"--psql option added"
diff --git a/docs/Changes_3.3_to_4.pdf b/docs/Changes_3.3_to_4.pdf
deleted file mode 100644
index 408ca428a82faabccf24180853af8b797fb397aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26249
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
Gc)0+ud-?VN

diff --git a/docs/Changes_3.3_to_4.xls b/docs/Changes_3.3_to_4.xls
deleted file mode 100644
index aabf7d192034c44d1ff0f6151d443b30e2aba7ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 45056
zcmca`Uhu)fjZzO8(10BSGsD0CoD6J8;*1Oo3?K{^5@28mhVuXY|NkE>#=yYve-sR<
z5cvE5|Nk%s1_ovZ1_l-e1_o9J25_9SGcYi4FfcH1GB7Z3F)%Q2GcYjlFfcIiGB7ak
zF)%RjGcYg+FfcF(GB7X*F)%O)GcYiSFfcHPGB7ZRF)%QQGcYhnFfcGkGB7YmF)%Pl
zGcYj7FfcI4GB7a6F)%R5GcYhHFfcGEGB7YGF)%PFGcYiyFfcHvGB7ZxF)%QwGcYh{
zFfcG^GB7Y`F)%P_GcYjdFfcIaGB7acF)%RbGcYh1FfcF}GB7Y0F)%O~GcYiiFfcHf
zGB7ZhF)%QgGcYh%FfcG!GB7Y$F)%P#GcYjNFfcIKGB7aMF)%RLGcYhXFfcGUGB7YW
zF)%PVGcYi?FfcH<GB7Z>F)%Q=GcYiCFfcH9GB7ZBF)%QAGcYjtFfcIqGB7asF)%Rr
zGcYg&FfcF#GB7X%F)%QI@&E{jBC&@;LI67+mU+pbnHX5%d7cRrryL-Xf#CqeEKpEF
zSPTpd4dn*Qng1MR3;~IN5*z~qLpVb|LlHwZLlQ$iLq0<`NQNXV#K6P|O1H4ECPp*J
zg|8MsRI)MzGn6vqGUPHOG88dXGI%oNF{FXr1QID>$YjW8$b%@wN@_4LF@nlOkas|C
zz^Vv~U<61LIKR0t<TE6L-H^(V$529|dn_237(w>JFczyYgg|Bb1E?q`hX4Zu8!LmN
z=^1u`21W)pW(J0b3``6gSPn9P!s!tM149f$0Vtn4XCxNoq!uf<<d>EdWhRzZD9{i%
zf!&bE2y%lhBNGE7!yE=C20jK!u&ac?q%fFV4_31WOxiLCF+5;QVfYaw;0nt9p!zC;
z$pNgc7fdRFNj?UUiQB<?Zh=J%86+7_fa<UM380u^V#wrV@F}gxR0vMYD>h^hMV4e>
z$Yf=3EXqvGAxA=z;R6FB!~gm{Ag`g@19Ail0}lhp5scU+ZLvwpvB)s6f(l(F6(waI
zWo3hSP3ss97$-(kjzy7y4O9TbgyJ==qk~dYVo?<-F|dP5XqX~B15|VL3=BX<sWWhZ
z%4}3sXr@7xnlosDisyKcQ?wLdE`xGoG{6Een$}POC0(U>5XT{2Q;tQCK@(K^$7>+#
z(^5dzq@{qO!=6D0RMtZc1Dg%;0aOI473?%5EA8zOmYOkWgQ^s`r7-<)dtsWvRwHyi
z09Sqt3}63)Dm7@{VmP1x5(lLxu=p3^#6jr-n|fU0AXBlaAI{>8;Kl>Uhae0KXKhIM
ze*lSrFicz%hqw+7aV@OkpeE55P(v3j9zn$^HgQG<PORpDT*e4$Jb~IzAPzL0fS8P+
z##DunAO{Nv3j@nsF;MzJhznv77hqthP{blG#K2G>q=>^D?BWG5do}p6+lwr&z`&3J
za}T;W%st5B$nHcIM|LNgc!eO;oyg)~bFhem&4GqPw*+?gBa4I0K~rzYzzAxz*1+74
ztR8GW)Lt}kxI2->!RBLE4-e;U+}PcTEDkmY>P}>FWcQ$n!`*`{4mJns9%ON_IZ*Sp
zd9k|(SsZK*cJ=V|hO8dhe0d!HMHWXkA6Xo14%Gc<;&A^Wi-XO<t{!W?6JTH{fW<pn
zdV`B2=SO7q$o7KVi7j6sizC!?g31B7`3P}vIZyyI2Q6K})gy~5Ffb&*)FZneB#zBr
z$nHUoFJyl~#6ev`uzM<$gdpV!uOKL$V2aO>#xA~<54*S>8+P%DGT6mMgh1l(@(><A
z$mto`{m9}%3=9>5j2tW+3=AyD;Ra48Sj3UT2P590=?YmKtR5;32{(v4!R~>JPiA6a
z5NKfj526Jpuz_iz2`pe*cmg|^7MZ{arbQ=kfN6#a3}9NUf%X3+hDYFTEqI`X0aO{;
zz6Nz^|1&)M&%p2>B=Y}1Lj%a_bs(aFp`n3+AzOJ01Bh|pzyXGah6aY2GtV&0G)`mq
z|Njibng9P8(iqYh{?ANfU`RW|aOMoi)CRCw;9(uGc?}RVL56|snE4;9@67)*4FCV9
zG0Z&kpW*+^GYn^D{%81qW+sDi+J6S)GiMlPo?&4455hAU82+ajGt5jo!!T{yGzJFa
zGzMdkeZ~w7#>NZ`Gr>5GL0S0@gR!wOLyQ0)ct8T;OOQVjz+He=20n%*pdLK~8$)nL
zYHEpL4+9GWBLgGDK}HUSgNzIe8`d&1{9#Z~c*)4X@E6>*XAEITWyobHV8~%eWGG=s
zWl&&9Wk_MjWGDgm@)Q`77%CYQ7?K%s7%~}>8L}BN8S)s?8FUyF!2Li_j|^1@NTz_H
zh#{XLiy@UEnE}>E#8j2aP{NSRpr)V)8gZz|O)pAJPE|<EDN0RDsZ=N}P|#6GDlJh+
zPRvtCN>wOIEyyfLO;ISxS4hh*%2i0r%P+}DEm9~>F3Kz@QD$K9OD$I@NlXGMNY2kI
zDay}LD9Fh#QAo_o%P&bR$;`_yW@lh<%P%S^O3brhU??svD9A4=0hy+do(2(CNK8pd
zO;O0qE6G;~s00ZrB<7_kB$a07q$m^=<tL{W7qc=jn3*JHmMAeWWaed-WG3b)K#Wo-
zNy{%%0Lv-lCMIWO=A{;EAruuPCTAz6r-JQE%giZBEy~PGS4d7QNKDGi$t=lC1)1!b
zpIDG-&%h82b{xb+u$YcQW}ZSxMk>@TAXgPsmSp7TDdgs-l;)&@yq%Z~a-TwGiCzQ)
zLr7|FK~7>xYBAUc?nQ|O8JWonzNsY{`6&uMnZ+eZ`4tL@Wr>+NiAg!B3L5!&`uS;T
znjmY!5{oiHf)K6Fi8;xoIf*6tMGA>Usfp|i46Z4eCHY0gjtEN>Qo%wB5Eo>E3`{G^
z&s7L>c5w_*&`8e7OwI<oBc&)YU7;j3IU_GWCqKPX(~5xs&1q1>6-o<I5=&B3bQB7T
zQp++^%k_&=i&IM!@(W5b^Yb9_#LmFro|>0hl$aC4z+eIjh*T>DL*3Hi)FOqH)U?dJ
z)D(rB#LE2A5^Dt`T?MD2{PN;d1(@%w6^wNiToOwX6?_x(G7CUn%*@ZTRxr_3fI6vI
z!6mb}ASbbsnSsGQ)H8>H!3S)bLUKl8UOLEadHLlE8HvSUtHBWqPH~{X$SlcA*HOqx
zEhz!Ta%Fz0LUMjVrG7zTaY-sTBtVK3QY$ix!3s*Cu?3dO1xFGK14BSgeu)hOgCjHr
z=jSOD<QM3c79iqHN1;5kBm*^!^b-pTaw_$c6Z4W&bJ7?X0zjz_>hcg!yn@mSEQ^$9
zB$g;-7AvGce43h~kPk^`Va~w{&WU+tiN!kLELc)nl&1hmBnlv37DH^#&r4MRM=vu2
zLs)V#7s$1lxrv}iDpqG;fJP(8#*D<g6i_-X&sWGVQpn9ON(EV!s8EoYo+`q?;GCGJ
z0Lu9a;DnQ?kd~Q~Dg+TOPAr3@Z?K>!1A_<Hs1$|7(vp0TUCD_#Ih9-t3;{*?S*gh&
zyX_em9Kl&RJ-MVn0haYj@)gRGi**!?EEMuUrA1{yYOz9o8YpK&^?^b*ClQo@IT5M5
zSdM|gGZ$1?B<7VUID;d<7~~13(sTv4%!<@vH<)$hMVTe3!Js0^y(lw92kav_7aWer
zehhXF@(fVOO)Mw?B@&R2*%=soGLw>1a*O2|7=luB^UG3G6p9N<i!$>|ixrX+b5iqC
z5{nd4i;D7##26Sn^NLFnb8^7Jt>7N&3CS1S3=HlW`NbuWqEU>2!7smDArqn$T)HWw
zRumT{t1vL6B$gzCauu|UEiO+iNKMgE09mV`14^-(sVM~v44}YDEJ`oUP0cF-MOtot
zafw1&X&yMJtrT(-E8+{1OX71gi;F=X(MU;6ODxSPu{AU>P}S5?$W1KHR>&_cQ7B3+
zF3l-X$V^ixNG<^dJWNMsv4WjKNk(FxLRn%?X=)WB?7?A{lnQoIicT>o1X6TB?n^1j
zS4dRI$xnuOJ~1apAra)b<Wx{mSzMBum;$mPH8D9uAvGrz>~yFC1r4w{U}L}ps7`_U
zrdZRMfuSt9*r=cqTD3sJ6cieHWvN9a#h@evl`00MYe+FH4hf~?{G9xv+{6Nfq)Jc`
z1PTQ{28NKt%AEY7l+48RqQu-{9R>#1vecqVg~Z~5WKfZorU1%N3eYT>lbWJXmYJvk
zD-x6$7>ZKUQj1dal2gIPD<qbb6lErrmZX9!o}$#^;?xut1_qEJstgS9OrfBZmzkWZ
zq>z)Cl$uivE}lv<b5j)(D^iQu7#NaMN=q_xSQ!{Vg2l!R48^G>A(^?UN%^IDDaDbg
ziA6b;ItoxhC$M0IM}8?tG_@od5-J=F44^Q{Ois+vVqnP0PY0J@IhlE>iAA7VG_|N8
zADTKrMJ2qtVPRkZxk8qKp(H;j6{Mmp6=XL&Q9+DXW?(4DFD?dUM^H$E%Yjr-GRnzM
z1l7_CWyvXtCF~3g;i*Z*nI);_a2BXY1KF6IpIeZVT9TSmsZf+!mY54}L1Yw_f<inm
z72?FS#N<>H1_qbRG;k=FKuYucG=(x~J*ZHengc0T6hP@aCsjYUG^Zr9AScxbmPx@?
zv!O1iz}8VPg3`uN+5}816r>h`3p;rRhTu$)vlNmt^Ad|H!KE6wq)07-_*(^1?tzPn
z<ouk{+&qQEq9SmeqmWpfoS6yMQf$h=5DY3B^HNKaQ_>Vb{smP=N#J^}2oz%J`3gy?
zCFQB9c?v0+MXAXp`9+zjpyCYb0EA&E_OmcB_@?HSnnD^?nRz9tMW8?enFy|2b5rw5
zL8U}dszOnIQfYAsINCGwN=h?JGRsmq85n{=MIfkVbA*+QIhnbcC8;S2MXAZ4tdN%u
zE_p#M8dyP6te}wxYOlfDB>A9*UrC}SI|GALennblPL4LDECUr+#RaL!nQ4^@IjLo!
z)SU%#MNVcmC{7hJi}OLM*%=r-AuL;nK2Yf7q^76lr6}Z=6oA?h8ku^j;35WMTxO+0
zc}8jxxVBL!C@p~$N5z^3pkg^MwLCMWBm<=h0#y!5@u1cbQXURuU<d^@L_lr@SCF8B
z6Xab`HU)=QdTNP6d45q&N^(9pL=sC<^)vHQQY)ag>VQ=xCYO{Z=0JoLKq)6ZFEcGO
z8COkY%)n5PnVb!37=sgSei678q5x`vfFu<1^7Fv1%uFu@RVm=|7E~NK!-@k?J_J>0
zkP-mwh6<O&%$!OEkc<MPBmk8Qpy<_6D99--2DkePN)%EvAx-j}#3WGlm{^esYH~Y+
zTH~2XEDQ{8Mg^79ums^|6cDKcDwRO(afR}t#Dap<B4!2#4;MFG1_oVS4;MFESXk$z
zmMDNzUO|3lUI{22dbqeL<YXolC4v$(D>T7LF);WhX5|-Qt)tn%m3U$@sJsY(w8hyO
z7=j@gn~i}1Qm?ZxFgT~=7PBxgI96m9$1yO5Fk~|1g1beaP7#Qe$50HN_EKO-VaR7l
zWhiD)V8~<0XDDG%U`S^GO;e>Z6v4YwpsBl3hCGH8u)0KsQgGJ_Hhq@NkjRk3kOS^y
zB{JkOR5Ij(J6@oUn6QEZLn%Ws*!E<G6oy=eVg@}hzl6aNYK{{_J_F2j4F+}abeuYa
zCW8WlE_hO^w5Ti-lsprQ6w-?_Q$V$kb7@goDyV$|YEgjl7`PtE$%M2GKxq^da|$_`
z#U*;iu;@z82UUN?piEPgUs?j{+*pA!bBThjokB9mL=Yn#)E>`FmS<q_4Fe_aY-lqP
zqyWVksz^l~*j<ozAGpb)P?QR)LP71JViN|2^wbjH)Zz?<qEt{Dv{)fg0hD5j3-XIo
zQxtMRG9Uv$t%{=5!qU{@lGGHv1_lOyNP800AOXo2Lo5Irs-uvck(!(hN_+~*sW~~I
z3{jR^ky%oyrw|Uw|Da}ZT4H8SF;Y#gkd|2iR$mNitCT1dmlP$YfZMbgsR{-P`U*w`
znF`?QGqI>r58ecY1s5pUg4>6XhyZa@D@sy}@)C0(<vFPD1qlF94>z%dnSsGm-(QP?
zAq1Q`QWT0)(-puit71@LlAHq$0g#Ur@{>Rf*kV0l1_n@r6cjGG`9+}8F)_PXkC}nN
zB|jO|qAdm00Es!pypW>31jc7&U~mPs30W8zT>M>vEg|J4xZjHs0;PE=sYMDtnR%rZ
zI?%Q~xJw?ES_DoS#(E~KppHOFVhIxigG-n{1B0VNUTJPpYLP-wY8tp2%}YmAsQUQ@
zsYQ?$Tz(PAXizDTSX8W#ms$bN=a8xw)Fgsd#?lN7#U+WLR&a_!N@^LT!UTn71t`%f
zGcc5Z8(W|#1&;xMl5<5#X0m=Ih)6EUOwKOmVPJ@?C@ZeeQHZE4E3VXLU~nug$p=@U
z<@rU~#R`e(iJ5tz>Il+LNy<sg%LY{wWr@X_;^1<m2;4F+$pF{Ukp6#(A_Ieaem*!n
zyg`*Qq(njODS!%^l;Y&XJVgdZM}`!J6!2(^0)wyur~pZ0$YjU?7bu`n6kP^ghE#?M
z@F)sQMu8!pp#VOnA_>c#y1IG!B}JLJx;daWF1U{@j*tT-k>ZNn9B6TB&A<?pm|2_(
z=|+GuPF{W<sCAH-mtL9!EhxbK+Pr*7dM;K-EH2JZ&II+y#bD-wa#b3rcU6>MlAoNP
zW5vLbmRSKBqRGrnE!Km!9E%|phHrjeNk&d3ILm?S-!z3>kdQ)gNq$jcdMXD4Ls)82
z38*Ehi(o2vg4!PNHe^VCeonE1Msa3(ZlX~EsNq{$lnQDdcqW3o?CGG+E@YG?KMm5j
zOH2l}NEFh+;~#nH3MC*T^c0{P6v{I}xxXkiu_RRiR7!%{g(by03dPBZB_*KtT24NQ
z3mR?#HP7=)iy$f(85n}#oxUIijbhLUQ!&{2u->MoLUDd+QF1D{laP{G3~ICMD1cfx
zplnrwRIYe3Fcc@IrRwM9gD6mMG$|)FSD`pRrz|x^N1+Uww?Gak$_I51l2X$^-RFWt
zNPi2I#9`et76t~t<lG!?NdAV_a~cp{E_kE})ICCK&_N2EqEt|9rlb}LGB9{1=jVYO
z4GL@Uc$h8&gLi6bfr3VU5y<_T3gMY~Df#8apz<oMC?C`(OjF1O<(P7?1gIL$%)?O)
zn=&vs=47VlDP$J=B$i~Bl%{|>Y{fqLdFfz|LP=_I31n=+*$tG7%Tn_|J$g{-1?jzH
z78iqy#Ju9n)VvZ<HLZ}ITH*}r8^fvz7f2@*E}jW$A?KwkKwEmLDS8Sa8JWePo&w0j
znZ+fb-Ys}I#Vs=@6=bd+lDQh1pt3PPSwVw=0X%91YS@8tc@k(mrxMa^%+CWiQ`CzU
ziVG5xQy~LXpl%i~1A}8xQDP;yeV3V+?v5HGi8(o-@B}sTD-~dBbQDtc(yg3r(^K<6
zM(BZMVUi%HX*lXQfl|L4cr>xt8MQ=#lo+59-6C+q1JtZYVJHQcFQC$;m?0lLh6`HP
zqX2F;KpG)33Ps=sMILmdSAijsp^O32paC^*WEDWV4H=9W3>iRjpoR@-d>GVF0gV~w
zg4V+Y!}3FM2&_~{R7fgK2PGL$K1&2u2kD?33~Er6XQbvSloWx=h0J0F1JIaXeiCF@
zv=ZE`2IU&iI7Lam0(8g#)V7C=XfT5kRE`S+Lnvg#Pyt@4LQ_8|Era@JnMDfV0nrjz
zjsoTL)KrBaS4S6LS4b5MYW}%6hDd>{Q3Yog-(cu~D`;rfttd6sDcD5^RsibiCa2^U
z>*nX>R6<KuP(74d0WO*1p#v^@29UZGlw3d=AJlJ6$t=q(O-amw6&0Yya%x3#PH9T2
zLUDd>sxYYi3u=DBj0I;y1(0Y)YEA)6G&2u2suK^+#U%<n3=9S?3L20Kw^%cRfdQQA
z6;d*DQ}aL-bTK$MK@LpKE71XkN}fV-Mt(Vn1?}7_lqHttfV)wka>WHYjtUz!1-0iu
znV+43!O%qk)R!?}VDK+XEy_u(Q~(V;W~LVFfHDENs|y`|1(*7e;rbHLm|GGoO+e~u
z*uaP$)EA)AHZi9-AKU_kj@=Y%sG}%W*F>tWH7fMLo`7Y2zx=#ZO;Dq!s5l%Plb}i|
zBUK@}GC3y|RK9}8$w5)-5)=%Hcs&JQP!AH^rc!{5DnLtGQ12<f0F+2GQgb1#1HCX<
z-#<kmpa|5ADFHR0opTb4ixpB*3sUn^QuC6*p;44tkdv64ngS`+iear6$iR_;2Bht#
zUjQ+rQj?8=0W$Z%4=E&I<-diVi6c^{5;npOilw~7+*HtLS7r&wZg3M3K7OPRsr!-@
zAj8VV9PpScp2)xe8o~tC+K}-fsM2DXT2K)Q9v{{LwGu!!fkq4!z$qTonKnd8S$Qc6
zMxdk&9@|Ara-gPpW>IPiG|iP3rz(J(V4xfWN=4uV2r`@<G>i)#a!_Jm$VtpAPEIUH
z)dvl}7A0nuD8TADaAA^`Ss}*25S$IF#8ZkA%QN%RL32jwpoY38tS^|H0U9`g6#@#N
zacy*O>cbKV(#RTQ<Q@_%&@u-x@KziK(*Z5hKrSy%EzyIt?;+(GthNHxFo_CjIr)ht
zpzzEr2Ish9&<q#2w(%>?O)bhyRtPgP)-!Z~6)qLIIXRi&*{qaIP}2dFJCjotGE3BR
zazOK8iAjlhDfyr&j?6rTw9=B&qErP)isENrfaO--#FFHU)FM%sp~?BV;DONW)XMVw
zq7)7W250Dir8!IqD3bl09fK6WG77$l1)wMbi9%<)^bmmrYFFxUGB7yjq$cL2rj!<F
zGB5;#8$Ali`6;QONd=J8OF`p4ps74iF%B&jQ&W6F`3ICSKs_{&`Ke`zIiMl#90gF$
z1dCLpCWA%v6hK4RAR+K50H`cY1+@$n67wn*K%Pp>OZfqg61ZN(Feog1LB)!%Bcw?I
z>8+IHEBJ<i;v^MRVu2brkm;O6h2)I<%w+H|5TxH*qJU-!Tq`ttz}*IJQRbzBN}POX
zKL?z)l|WsL+{BX1WCdqLR~l@Ll0r#-dOD)aRSJL)_!cWEfCk&ZQ2?5NDFL-u(oz$_
z(Vd?M%5C{+Y5w3AbESeuW_pG~P-=00PARC#1hNR!QO_$;0JUg}6~Mi7P#YdR!0hfD
z0<I0<qq3k*CCDG;sYx=R5tYOoaE1akazG&t9yC`-%g-wT4UdGRR+R8FFgT^dY9nyZ
zNd{Eem4GLiu=RdGQx>3+Pf#KRjW!fJgZi)<nxK9wJbXZtIpA6s)Bz3)@%Ce22n+F6
z&`3%xNrYA1nuvZM-lnwzIKVQC6;dk-Qj0*fU`b*QI|D-mWVSgK<lJ&l&rSi<n1+`w
z#h|$aP<mGY4UX$5fZOG{pd?*Tln-v4XM$#!Q%XUldQv5Ny8=`cS3qn46-B8jqM)>1
zl9-uS3`uCk(9%T^RM@4$O7fu8bWm#uGBN@YQ~;0ogLHv%38+}iE6%LsMVnIK2G38z
z`s3h<FwkggW?5>nD98rbtQdHl4l<tZ0jq+&A_KrVC^fI7SRpY9G)<$FnP<bWoSgyQ
zEKaUe0;LU5MoY~rQ8onmFVx2{Kg|SQ%SeJI9xA{inL40!2I@|L2GUD&Qj3`x7+j0f
zRX~+ZW=;yoBkq2o3MGj}AVc$WK;8c0%HopL++saFP)g9%EhsL8bygt}EzH2+o0zQN
zAFL3e03NN%F9H=R3=Gbd>E)Su3QDDU`DtmH$(f+UqlBacG=5Z?sgRor84dvj3uG<{
zG8|-P;tMWgjZDpalaRV(><l2^g9<M;28NJ~)S}#cT}0;+(i|(vSAf-AMY;JYm3fJ|
znaK(Yu+|Ja0|PV-c!3&j(9T^xxNi<_yMRW*)AKT`Qd7W%R#HA_Y#AIHppq&twLG;5
zmfS%B4mFIGfgu$%Qd5XXx{ziiXeJgm(Fv}gA-y$lP6Ey9!h1f+@Mb5t`q9;e>Vh_8
zixhNqK@$0;B`_Ii76%OzgNL_@BN!MU3{Za%6y2afoK&<4Sy15&Y6|Emq*f%S7C=^7
zfaZEYeLnEGat^%HhiEO>GBEg;mVo*Q&`vw7;R4R3pt2|fH0J?U03MIm2Q?}6!TAI<
zD$UNoP?}PjmswJ*hKR6|e1(+M#2iQi3@nLM4HO$OFyw+}G$FlLaNL0HNJN`ghs>yh
z7NwNr=P`q)2|>d-;7M{&I!n#ZO)V*^1Uob-733IL`w`T3%*;#I2c;L#usJAbN-{F@
z(&HHzz{6h(&>9(%+7+PvL2zYP0;)zzAW1C|)OjsY0Bgxp&;ZqwIf*6uIiQsR;I%HG
zVJuKtos_BoD$r6>G(|vld~QKvQD$*|9->>84a@(KZW+iV(D1%<er`d29;hR1XaR1j
zDHNwB7UzS8D9ckb(=$pyMG>gv22CR57J$Zq)4|nSVqP9-nj$wfF|Sym95jVeoC8u1
z>Kdh`F*7g(6;y({{@_XZpn^(R8q|S~5@)7?rzpVT9t0{EDnVl{kYa(EfgvC%*Az^G
zryEck)Oo2T1xdLeJ>YRkaLNJ|77)$F`k+-J;Ftlge@V>KQSePo$xO@xD+~gS?4`jb
ze<8uI32sS%2A3hze3_tmIm8+aP*_3xKE-;VDVb8lLZal1)ZENsP$Gc0l8OyMW2>1Z
z3IX{ArQpU?Q7Wh^0HqI5S}0b~fW{bTcpJ0;BP~tShJn!^X`D}ip#a=-&tZT}Ig~Tx
zf&1>DRaUtS3gF#2pmkXw7HImRltF=^oFNh1?@wmPU;s@lfcow!3<}`M2L%Qhg#d;k
zhE#?$aL*p3CmB5MD61gBzyNC0g2uW*J}rO-R8@X{ZX9Ufup~1dRvv(}3Uu%@H3c%!
z1WvP%$}2HXp;EsBl3GD6mCQ6yMF~!=pb4F_<YI-i%)AtZM1^$FuxWlCsN)M++W~HO
zgNFGP{1W}R8IYF16#KxYYEs}!yYllCib1OZAmg+pprPZm%+wrEhbt#Xp`ZvfX9QX<
z2C8~8L91B6NfxrYg&$OufhQOBq0@$-`T2?xNPijD%>eg*pi_;Yfr!L3(CA=lMM=D&
zGIC{H3~Hu>nsNn2smYn39=Ae%HYk|1VQC5!w&4B&sPPOQWL1Y0rRs>jlpZ%?G$SQH
znVo^bH?b%?wWwH-fx$o_7o5lP@)dHyg8vzQv2ZZl=K<|M-2Xp^kAYz(BV#_R00V;&
zGXq1KAOpi>76$u#AqIvyto#3e5@ukKXW#$-fd~TwF9+kiwW16Rw>TIW{)jO!XmT+y
zSV}N3q;WGa1WGb6)bTJdJeOo(5aDHDh>&JrXyx1g|FjGP!w>!m3=?G;81@M;&YLI4
zz;IfSfnlvY1H&z${r_1M85j&j7^>Wr7#K=K8Io5hGca5gTfn$ig@NIf`2PPjY77i3
zB^el=sxvSMNi#6$X)-WGgIbN+3=GwB`~Mf|Ffh!QXJGKs1?`{R|KCcFfx($^Lh){W
z28JU{3=D3D3=IA(jQQn83=9pd3=B#p3=G<!od=**kc|8PPrteU|MXi73``9B|4%aj
z?fPP1&^*tyQtl6f<@*i$|4%LeDP*wcwE@Y4)G;s!!1kn|=x3Z4#IXPWWbj&1hRUBU
z?1rbVf%VpbjbPdTfBFq}L!JkWWgHBQ1=15HW+_+f|3CQv0|SfP#4P0=ko^AtlP`eX
zQ~Bc!V;Sp;{r@L_V9ZPa8v`OR^-p0yGEZdx|0x3d|L-`!SdwrD<X#XTq>rKU*BXfV
zQ)V$R2*iLko$miXWy1ddQvyKxnYed7n3$yu(jNe_59B_^0_hq1|4&I^U|@D&sQi@z
zHV3prIWqwiR-g@ujG%?3j0FO7K=y$)oPx|`u;=^0m~|ln#AY{S1Z@JF#3VSkgfVa7
zjs5?pYyg?h#5ng1)IDJTf%HT5fXroBz{nyofgz@5|Nki;K#Nu<FvNhwRY1#iLGED8
zTa+=ObkdRi|EC%-<}GU2|9|>ji2mt!Ku!e37f2n5z5oC8dkhQ=?2!0@#Ww>3gg@1w
zfkFN`(@OcA1_qVZ{r{&Xs4yux?f*XoWFN=~P#ojaKLKP1LlqZv|D(D9LtOy_DDD{N
z1u^aaKNTd;w*UXMhWh{i|L^}lbwPXU<jG9j+cQA){{K@Cpu3NOf$<<{voIulra6Gr
zF$o@?0iyT+pT+>9nFQ;h`lmU7!t;>#!Kom}?*Bi{0ogo|7y|=CD<r<B-+;>B0+|ho
zk7=Myy9|tdpiMUnAiv%wH#|Xh?f<_6lvr7q1ie;(H)DbV2bzBW{|9e|jsyuYFfeq3
zHbC1qFfi=@-w4{+%m9@KIfRh`w1t`hBsZ^N|NnUbY?<buO-PIkj7-cdtZeKYoLt;I
zyr6y4AX^cbNzn0w3zL!t$e*xqVJ!U!+6WC*1loHI*`q0dvPYAf$pWf^fkB&*fgv)I
zfk7{sf#F*Y14C081A|Hf1H-XS1_px(3=BV}FfbgL$-vMtkAWd(0ca05X!j!z0~13E
z13!2tq#$??qyPg4!=IHOFZm_~*vEs#wZP)qV6q7;(g5BS4zXI53AFQ;g|U%=iQyot
z2!kqUSD>1+nvzpyNpVS0YGSTJSZYxscnhUYP%3!tO-apBltBx$y_=9i@Ul*|fM&4e
zEnrfOfdjNY+}POor9Eg9qA?h}wAWzZU^pn2b5JbjgS{pL2SXYde6aUrxFRdeU}F!O
z8ibBA+A10987L{F<|XHYdTO>xp&@R%7E1PZTsDd>{>~wh0j>%K;GyY&P$wTxX9Xo)
zeSOD*f}B(ZP}{MzB(+Fi-zCIFA;8BoI7Gov&p=<_)lW%5DWjyMz)D}gyu4fwG)$bT
zmz<vqQdq1H9X+iCElSok)HBdaDM?YX<FbKRgW@hbE}N9h<PtkBPMhr1O1tFzT&Q8-
zI$jSHByOPfcO`lOz8?8SnN|6DC5bsfsl_(>AoX0FFzwj&gC>VlOZ1XK^MUzAFg=_$
zpt-xebUQTbGV{`N6Y~<&Q;Tf$p(?mI@fw_2l9~&i20|DOp4749;^ag)4Tl+oJqI$R
zC^a$1&e*`fMjy-q8I0FS$vL1&G`M>>N%JfYr$WOqH$TNCu_P7QaL}4=J0k-FQ(Z$N
zT?2~{BSR}wb1MVOC>wpS6hZfbCR$V7auU;#O$CjMq^B0y8QAE<m>`2}^r4A`(?%Z_
z&Tuip3CO<)6g1$)2{6lsOY*_uHBjP#1)d>lIF2SD@)A&RGI#`axFsGmZ-EjHxU4Z8
z^kt5Lsjh)(h>?+%sil>%;b1ItU~6E8VU>l&Yw)BqT46z&0F+f&un<Pepu?ro!r?u5
zA{s4!KtVxr5-KiD3du~)PA$<ZNGwP#iqFhT%a4b&;E1caP#UI=DWH}3sVN}Apw#3N
zm=Q?LTdXZFh=mwUZxWlM_>9JEd~@2sT7{s1gS8bwY*1$bt+kKZxxnd7kZvSXIXP{>
zb)$hEN{gI;u(5%ug&w%?1|>|9t5%q1BNNnSK2jrv6XXnRo`3~2daIwra3;0g&uIg0
z-4kl~<85eSYx#59z?!URO@B^!JD(FdSP-IEQwk{2!uyYiC@x4X8WBku-JhUDge5KO
znqy6lIE0Ojj7;?mkN{TAMkZ*6B6@72X&I4fNlMEFsYRZ7Y595qz5$?u-7hg0(G`cc
z3Gik)^nnmurG#EVu3kWXaS3GC7xHKbUgIe*k@0yElzO4VGI@!*pq<#L12rIdY7~)p
zJWqZxX{>8tu4`ZzVrXt<VrgY;hSFET8>sk;NsOL7ytzPT(hAK>q)&~HCz!F8<<Odr
znrRG=UqOipOHoN$wQp{0f~}r6H8(>M9vVd>p1w8(>6c2?Jfhq{j#KpdZ`c)*_&kdv
z1?w7Gpd>zMdlrYVxjFU}Y>6s7nu1e7!_}ZMYH}N@uoPTSkTMb~cwF8DrCMku9~!LS
zlM33jh0^}OUj<{#evr|^!EXcR90;N>G^i_iX#MFJ;0fK^iRj5g1Khws&&U8du<_Ny
z1x1-<i6yB%`N`P`gVGXnic|GLLtpr`g4XvT^gu1g?43h%1Y|4&$yxB$Gd?>oy$PH2
zL-!><Q?Pi_2JT0E8j-ySvl!Ed>8X&;DY_S7KD5yXPnp_r`7%_24x(pfU|`f?1f2@b
z!2Ovs;s4hETX|-2u4YbW)nNVuo-p<RpW)5Gbc0C)q=5mnD1?!LnHh9iGh_XK@X=wA
zxoj|*!NDNO2wDIEIh!0ThDj`BP-0+YNC9hRVrXK}Vbo!SjAOjChtZ4-p$tq6Tnx3~
zL(>@;ZnJ?V+8LTae9(Dixf~#V6Ih;!fr-IW7{rIjGczzVsFZ>D5P22`2F6L;AU;FW
z1n`0B92^{=jSZ!_c?ym&h7*k8%*en5S!n=T7XUfcor4K-<{=A%1L!o`t_DVN29Owt
z!@|JA$iVQR6D9^aW)>pGzyK2ig%?Cj0InB2_Yc-PT^6PebR-}|9YPGWKmsCW0M`pz
z&;$`vfZG8&Z5|@_p}T=m+yUf1(CPCKu?cX!pcN4iF;<Y?29P??>GTjWgquO9)kDPe
za$)9yPOpcErKZEgKw$+DdjPisbh<r6>@qvdZ=eu_h#~9%oqi7y`vBJqIt?EpmIDtL
z(CPT-VxZIVAz}g`|AONKbb3BSOd8}juo&nxeTbL?NF6v_K&R_N#0o%SV0EBHDG;#@
z#V|L6PTz-!A>0f)jUOV02p7=l{17pQ9$2`5PV0w=9e~>bI=vqvmJfFy=rn(b7{U(F
z>Hd(kme31w%U{r*N$@H9ptIlifindogEts5Gk|14DN%v}bb3C7$H*WFUQ`3&F)>Io
zgfoDS^y6Y+WMF2HVu)a1V5no_0_Sp&&p+6MRD#yE1T)Npssv@MVDL=<5IJTBJMiI&
zAbp?|Edjpi03^rE0J0CX)Ca-?*%t*h1(Y477^0!}fl@s}AL#HwNd}lc76y<$&|)=^
zDJ)=j#zFOgat1;lD~f%rDEe5z`jVmgK)DB@j}1j18;U+Qus+aoCXoNw!S^qKbc5W&
zj-rnpMISp@Uo6x<P%cE+$AO}c14SPPSYIMkA1J3H^l_r-<3!QN3Dy@6)d$MW2z{W~
zMT93Pb|o2L;mHNomju-Z%JGPJ=SH!Q8*Cq_tOxm>8>}xCst;5uAoTIT^)WKBF@RP?
zNrF=&4_HqcR1c`sK<MEG>q&>E4qmWb8E_sbZDvCCfl3yHK0dI%ET~G*3G|ZS`wl>E
z1RZxN#gGHl2P%CK`uM^6ra|?AssTxO3g>5FX0T(p1l0#Bp%D567#JCX!K<}EHV7~<
zF$9Beu7L1B`ap38N-LmJ453dDY+o+aKG4cAN$?E_Abo=1aLI?-2P)|h`h-yQflla0
z=o13#1I0DSK2T|h&?k(d4|Jx#B>1)wkbS~neW36M=>wIR2z??b`b5C-07?}geIj6e
zptuI<1C^=>eWED(M8Wz%F$K~m3f2b-e~>;<$&1h@hN4dltPd38AbnzBeV}jz=>wI{
z2z}xx`ozKdKp_XxCl1yJ3J;JzkRA|*lw}eq`Xo^FNr3f%!ULoaRLUdtNrLr({0y=I
zbYFrb_(m2850pMZ?gQxq)dYyVCxxO<3Tz)J1VH+v!1jUc0O<qO76^UPDEg#P^htyD
zf!qhu2dYsJ`eab_$$<62^12LIAIN<meV|$gp-&b?pDb7($VDJ`%7XQQ>;dTm)lAax
zGG2~>kwFH0KMhEw90L=B3<Jny2#=WoR5L+p7*Ory1HPpOR8z?_Ff#anAv42u1{Veo
zP6mb?COHNRtk49jD7soun+3Ee8(MF|+YX@Ha3Erc_891P9EcdAepLqF)&pv{A=+c0
zMWYaPh_)B#HXU>^(Cs=9F+_U|blVO@4AC9~-M#}6L$t?0xA8#45bZJ0?K}`MM0*T$
zTMtAG;bu@f9U_KkcYtp5frug6W1!o8AYzF280fYih!~<hW&jTZgdL#UfFSA+?J*;`
zIz)R6bXyQa9YPFrdk{nn(H;ZcCIk^fw8ucV3qiyX?J>}8Ll7}UdknNb7b1pekAcoE
zhKM2D47!~NB8CVT&}~H!F+_U|bbAp*4AC9~9sLXuL$t?0w;Msk5O#oWJA#No+GC*H
z0ZM<M^v~b`$^i-tj0_I&mW%=e6N4)QXlXh`j+w!Y;V!h)2c=P2aC;6Ur^vv_AP3i{
z$iT!P5AJ0_<d_*0z&AaC>;t7^gg#Ig3ZV~lD~mk%N(YcWB?gc_kUb!MptO$Ar;K8s
zG6NHX9C&FqNS`tTGlL>S57eEY{DAPE3fO;Fp|zR{0~3P-18BPgNS_J=GlMO|b*Mg2
zo<Z2B3bwBos!tVcAFQ@l1>4sL)d$K~2z_c`ef>~<YG8e!o+ZdWHL$*kP<^1hhtQ{v
zqE8*HZxYlLb+Eq4P<^2MiO>h?-^ww-?9%}2n*!CR0oDgva1RPkP##8vizYZ+VEQz{
z;c^73PZJz2pq4pEA1I$A?9&3f6V@sLtrM4Hm=4va1-5Sn)SaNR0AZgtiayZFayfWw
zMjNc}GE^U^yg=yF0lO1spAOiauy(!<*qxyC1#%~-OhLF)7sWnZaJazQ>$+h3W<%`*
zl{*N1dMNtzQ1t16_059n1C>n(eflW+^uhXIZ9aXlzIjl6pz;f$&j3ZA0g65Yu)eua
zeV{T9p$~Lrg&YGcTnth48G`lAf$9U5g9v>_VEbULJR`8a`Ox??0_y{95CMfJsH{Zj
zGe*&84A!?0s?Qj#ZxPf!P<e{bXM&>71gsBquNEjjn1J<x%0`fVpfVQ`@222*hq==f
z9PhAJmnk^jL01=o^nuD{gnecx_L+h0gXuE^+XpIlLHa;tH$tB|iav9&K3Gq}9IOvi
z4ukZ8%6Ei53lx18DEchG`aoqhNFT_b2>)54=(9x8X9?B^D$hasK<-7@XN98A3Pqn4
zSRbek0qFzL2>Yy2^jU-Tfoca(JXnMEfi~EH^nv_|&}W09&jzf|5gP9{V11xl^g#MR
z{zT}r1?z*gMs30RKzHqd?6U>y1Kqj@(g*S<LZ2OqK0B~J(A|6>eW1H36~VXkf%Jh~
zkI-iiPA@R~?7`^;*4nlQrx#H92WrPPfZK8CEi=;ipmrQ6ydZTe1H2sv3K@tPq8$ec
zABY&DUIv8(L=4f61BC}f4AG7Q`5avgbhREt4AG7Q-C774cR{q{K(`n|)FIk&p71si
zq8$gi<q)C{(T?+mt3$XMbPFOx9iqJgx)l*3hG@ruZb^iQA=+`ETN5E-h;|(47Db2{
z!Vb`_iV!hGI}UWqB18<)W(x+p4|L@qLJZW7hp0oe<3Qs|5HUnM4zy(pB8F(kfyS61
zVu*GeXru`uhG@ruY7mGR!p)%ZA{GV-Mg|6OxFmqm258g>5+8_m9H@^2(Tixufks~-
zVu*GeXygbYhOh%PY61~MwBtbO50U;IP|`o><~s)lSo(JWr~jwW@)?vy5&9fa^f{vB
z8%MA{P&);b-$3aYq0b3LAL!OT2L_PIpnU2C)(2{*fb@aVIzpc_iauwseV`TwNS`xU
zAE?~`(g(^92z@Rn`dm=-xq$V7+6^Fmpge;pFJ0l~323Cp6<nTx>~aN{L7;pC(gVs<
zO7OO=8v`SQGPuVG(&NU!#Gniw9dZK=(1T|dKqi3n`hxEX1@#u)85kLS!H^j|J_*Ww
zs^A+_L25l17#Y;ytz{1eCI&TlYuST=nL!<V*C@y(pd1QniE@Bj=bj9V49?&?PeG=5
zGB7bXgKs~D@R%7~K$q5m?E~dvgg!5@eV|+nQt1V@50rl)Jdk~$oC~rKqz0kS8>|nM
zgF!02!TLaX7s3PS1LazfK9Fe$eLi4!!djC)V0Xe=uRaVQcd|oMAIM%rxcH*z^9Abz
zwO2s)`GWO<S|K3&KyE_V=LgmYYyJ3v^?^oOLHhi_`amO~AblX$BlP*B=<^5by9KSy
z{K5KeL){7TCqiEUioO7_KF~-q$i4uuKG66u$UaaBhR_!X4o{dn1Hs`5QUTHz2#$A9
z=?2mVq7nLnQ1k_X^?}MfkiH<Wz8z3^f<zJeg2DP=t)^hGK3Hojn1Pu=gJBm`AE>lM
z=nFy77lNWM1Z>|<s6J4MiqIDd4i}hxps6osc&QT#4j0g@63Bm`QWv2w46F}UTZe(e
z6V!eO`7aEt57a6L=>wI_2z}uw`oh8bV5M9*SRZH$G)Nz)^hW550Q(PSUj*2HFntkV
z|LunQ4^+Y<^hGi-G6aH40+7oh8JHLX;bTXU49pBc411vZK(&A-JikXVFfwSt^+ho-
zF=#RDg{HG824)6rhJ8>TsHX5^*w4Vg04hbI85kM-zz|Z3fa(k#c!<U@Ff!=EOOY4`
zCI(%2DH6lL%%BIpeHY|=P`!fC7Yo)0%0VDs#Dev~(qt@HA7~>tNFS)~LFkJE>x1=T
z;=uY2LERk()^`}{dr<uZDt`sQrB*xxBZEJ@PYT*m?9Tw}lg2YJGX#KddIq({T+rHL
zCJZJFxJKB}TWBzKp!yax`vIvR5p6Nh3<X3C(G~;EB0$6tbt`Db1tNxMi-B7H5HUns
z3^bE~E(V$@fQTX5VxSoUh!~<R1{yhlh#}fypxFY57@{o(3TucMqAivUZtH-?{19#i
z%@{!17vMGrcy17s3n6+DZ81>ZhlnBCVxUoch!~<R20HlxB8IS|5N<D`Emi~<L$te!
zv51wx#Sm?=Qn(nREmj5>L$t-p;bMrkSOr`R(H5(Oiy_=x1s6kvOEp{!(H5(Liy_)#
zwQw;+TdWQ)hOna^E{14}fzlr${U?C)4Xidy0OuRn*h&I8-yDVJ8&DcW=t~6W8(7Xv
zWME?O2j7nl%C(8$d;=QW0_9UsI!5SA0_y|CKS*T~SRZTzKMAZ4)JF#C1EqC@zGSdF
zVfvE6?u5;VB!k@vIurw>50oDe<pO94gf0V2UkZx86tKSIQ2&AQ3_@QjihZdl`clFA
zjzRT-@)g3JX(;;A!1_)?%b_%|zEe<rpuC6Bmk!nkEA`XC`c6ajrGxdIf$9V0PlUb<
z6nz<BeK7kn!1_S>1r#ozJdDtniJ~tPMPDXZA1F_O^nvm@LSGh&zAUglP)-BIW)@f<
zD35{kfyx4Xczuw~z{p?#u4O>&)NBSO1_N+AHJgE%!H@xz2SFx)$_h^gQ0@cOFgXm2
z44z;JsbN5|Xat`p%4J|=aEI40xeQDU?hK&u9FRG=49pB344_dOkV`-%3qoHW10#bm
zTwfjo6N51WC~t%G<uNcbm@t5HD@Y%x^Z~W-M8GvgK8n746n*(%eW20+qz@G02z>=8
z`U+6=6@c}DN(_)bP>3V+6{6@X1nUFUu^@LAg7tw)5Rg7l_#^yRgrctqtPhkYK>CWn
z`aq=&NFOMs5c-P2`ao@Lkji4PK2XaU!UKg1s3ZdE1H~3XUkQr760kl{`2^Be0=5rS
zGJ*7g;uYb)Qm{T)O<xMu2P&^X`bxq2K*#=o^nqdrp|1=a?=XF3;CR0e%_(Kzcn94Z
z57GyU4}`vQuzjG^46>mdY+oZ(Upd&mCTI==#Ro!P1=v1V30VQQ4^~1}fb9dd!9ezb
z(hWjiCD=ZgzDlrtFnyI^`<kKlf#MON543E|n4tx9qze-pLlsyb$i-D)J)mP}Kz4!R
z5TU0UY!|3~4a!~Ba6Q#vJ#A2XK=FsrQv=om%2OcIYruLyIR(N4#dkYYA1F2v`f5@1
z)q?fGO5$3ueH~DJpm;~5lR9uXK7xjL9XK2x!+D_m`UI*ElnPAY`MjP1v``IJGS)LN
zF@(ZPm3jtdhA_|#?BH3?D6|$Daw`mfTMg8fgQy0z&_L-9(qcih&_F2#(&|98&_L-0
zB8I4OL2(KZL$uI9aS0Jaw9r8Dh%N?-Cx{rLg$9ZPh!~=U1`1z@7@~#N39so9EwnDU
z7@~y+IwA<77vW~mY!pNc(Gmg8CPBmyEi}+95=0EqLIb65h!~=U2AV^Hh#~9%%_Kp@
z5G^!NuNxwUXrX~-j?l$G?Qw`0qJ;*UDT0V0T4<ow2t*9gLIchBK*SI&G|;RML=4eF
z1I^Pw#1L)<&7MHS5a9xviGheAT4<oz3y2t^g$9}lfruemXrNgYh#0~S(0m3&4AMda
z<vvjQ^I`zSD5w@}U|?kM0z*hG2ug`&44`!fAhnGQj11=R+6;8ckvRjXe+Q9cX0TuY
zr2<fi0ZOe1eNA9}uu>FsZjw2}GiYvXVgTuT4$Y0A6phf=jG_;8@R2#g3#h(ku)dd2
zeV|m2(ANUi2P=I+M<tmvyn^a$0qc7W)d$KM2z{+!eV|kZ@=+@T6N5Rtf7S}t_XesD
zlzTvJM+tCk-NwMk;0W*6wJ|U;I5OOT+SkUw%;3au6RHoC!w~khgYAQritS+gU~@<9
zVEf)e^?`CBLSF}pz7DWHSZUe;*7pvo4-~HmeVr)!I>Gv2rD-Qv-+QP&P&^{^b)o3%
z0_y|KGJry<3#<=xxECniK{+0wuN$lnR+@H$^}*WT-C%tmq4t4F1%$pH6n#BleV`Ff
zkbOO1eV?HEKqZG6cx4Jmt{1Eimd<*?`e5m-7p(6yR3E5xLFnrP>x0EZA6VZPX#Dko
z^?ilv1EmdwzJ9PinE(30`o2N+^@H_&hw1~BQV4w$Q1ndz>w~qUCxG?+fa(L4WM-gK
z#K7&>iC}%8kr<F~CxZ2X+A9zqC?EZV>I0Q_2z`^l`e5NQ39JtmE|b9a{etQPm52y^
zlfn96{+kTe_Z#ZJ$zXkdp!z_iCPLp76n#^``e6Q>0@k+}st;7Mnt?|>Kz^7C)(7+7
zRIt7!Q2VBW^(}?!1C_oAebd1DK&?qoi)0#DAIQ9EU_HyAdO)Q!LeF%t9$1)62kTi5
zwQD+9ALsx)P?`pn;0S#)!1`cmWd>LuEDz0KU}msqxB|5gRLUdt%|y{R6Gh)luzf3`
z`am@SLf<T~K3E*g0_$4^b>}RwzSU5DpxOeVZ#Ig)*<gKZp!#Nm^{s{K1Jx)9eRELs
z%>nC!#oZjRKF~etpl|`zItYDp;rc*vFc+*36bEy`de%ej0@X?gJ@ZiX%!BKh2iCIz
zss~hSnK8iTLgs_@z|zQkupU^CV?J2lMg|6?78-0c4ASDlPol0>1GUpYEi}-)Kcv<~
zw9r7MG(-&1LIch7L&Oj@E-0Nt#1JhsP>P0#AzEmlbd4?sO1BU(L<<d+LLp*^78)p>
zLc|a)G*DWCh#^{Npi~19L$uI9X$K;Pa5E^CK*SI&5l~uzh#^{NpmYEcL$uI9@eC0|
zw9r8D$PC^Wfv^J<M-VYY3vCkv0|P`1(L&pdMQjUP4ADZ{3Kv7P(6+(F5G}Ora4|#+
z4K!l_u@})o1C8oK#1L)<%@9Du5a9wE9fyb^T4<n=Z-^M8g$5eqhKM0rXrPg9h#0~S
z(0DgQ4AMda<ug$FL!|!&@bnMLXA8jTAC%7)fYUxG3_*H8=@X%6Ay^Nnd<3an2-X7%
zSqKkQZ-BxSqz{ya5&9N^^?~X<kX?(w`apUXf$ajNPmmr^8b|0^4AuiHuNH&#fMN%v
zZ!uUOC|*GNK=}ZnZwZRNB`Erqfc1gm4x|s1R}lJ^qUc)+)(2}VECuU33oS=L?nUTZ
z2G<Aj+cK~|kQ<kQ^?=lZ>;mOCGX~I{3rKD`SP!i1Sq|0%8zor|)^`qS7bs66^sNBv
zI}hz;uK?=<nYRM02h;`y*#*k82t6yodO-CYNaaef9#D+};eq1p0@N;0zP5zBaTNn2
zgB5)J(<%lg1}pe_vQ-Ss4Au-6p>ryryl=w*f=u8!7Erzi@jz=?Kz#vFo=4_`@;fpg
zl-H5@pnQ(Z2jy`X9~8!*v}psj36%C=G9a5ksSlYCN-xNKP>Mn3gHi%AAC!ZU`Jmj3
z%m?LMWIia@BJ)8x7MTyqt;l>(PDSQ}aw&`tnypb{1Fe7t)gB-Ws$)Pj2wN}+pg=AZ
z9<m&$rU4yU49We7ng%oj1rbBkG@!XAh!~>e0L?f-#1J(NXaoo%hNx*kBkbs6pwVTB
z7^0>DjZ{O#5H$^G)Egp(sA)iL1Be)+rU8vQL&Oj@4QPBBB8G4?Xp|WuhA2@%xfLRY
zsA)jC3L=K6X+XINB8I4GKsf>;hOh&a+96_yng+B#1R{p0X+Wzi(ZxV5IfxjdrU9*(
zg@_?)8qm5~h!~=#0j-{eh#_hkP@fPYhNx*kJwu2X!p)$WcZe7wTtM^h5HUne16q#^
z5ku58pjF8bF+@!Rn)`)_A?yH+VnW0qH4P{qg3=!>U4!_bw1><Gr8{IkD9s`BLFo;d
z4@zsud{8<==7Z80G9Q$_kolmrh0F(~D`Y+>O(F9^=?R$+N=wLmP&z{9gVGQ(AC!KO
z`Jl9e%m<|#WIia(AoD@#1(^>@E699MIzi@x(g-pils=I8ptOO^2c-*SJ}6Bf^FiqW
znGZ?}$b3*bK<0ze0E`bR#~N5b<rs3QL^>N(j)BI+A!!Ryj)7LCLc|c|7-)PJB8Etp
zpix?g7@`~ljnzWL5ak$X)fT!Ks80(KLzH8nktK*2q8tN_Awk3t<rrur2_l9l$3SC7
z5HUnK1{yhnh#}kz8Wn<wA@VC|<OU*!D91pfG7vFDIR+YWfruf>G0<oVL=0gEXru%p
zhA78CqaYA5L^%c;;XoGyjb%W@5ak$XL<1s*D91o!7Z5Q-IR+ZRfQTW=G0^A)L<~`m
zfkqx6VhA^bMin4ph;RXoA3($q<rrub0V0Md$Ns`w>WFgeA6yJ!$A7pOq8tOIKUlg3
zm1Cf^hs+11J7hj6%^~wa=?$3=N^8h`P&z~AgVGo>AC$h3`Jl9g%m<|_WIiZOA@f1$
z37HQ{OUQgsIzr}y(hxEqlzx!;ptOU`2c;WiJ}Au~^FiqanGZ@U$b3*bLFR+f2r?g(
zK9KpKw1LbAr3+*}C`};qLFoaR4@wKjd{8<-=7Z7zj8DyS40J>SBwZrPF-AsMFBMUa
zF~P+U>5>^PhA78CYgHiTA<8jUxH^Ow8(a)gj<LhV5ak#LTntf;al*wA<ro)S3{j48
z!^IG8=7EbL@+&V~3{j5p!Nm~e7(ZMLQH}|~#SnG~!o?8fm=IhHQH}{?5fg!nA<8jP
zxEP`w6N8H($}w@c7@`~ltxbl+2cjI4gsVfiSqd(O2p4I%7@{1Lfr}x^F<H16q8yWh
ziy`cghl?S~F;M!0rE5?*21<L#d{DYW=7Z84G9Q%QkolmrhRg@0Gh{v}jUn?v=?j?;
zN?XW$P`X0qgVGc-AC#Vu`Jl9f%m<|-WIiYjA@f1$2bm8_JIH)cx<TfH(hM>mlwOee
zptOR_2c;8aJ}8YK^FiqYnGZ@E$b3+`K<0ze1Tr6#9+3H<w1CV9r2}L>C=I~))GWso
z;Asm{jw!;$5apN>Tnv#emEmHDa!ds-hA6XCv52X`#SrC~I$R7<j%mQf5apOATntf;
zX~D%H<rpYWfcypvGY}u-FJwN*Psn_be~|egzaaBL{y^q~{D8~{xgVJiayv2~<Zfg>
z$jvbRbp|Ph9!3U+6Ie$9?3jcYwy}X`EkQdNV8`s7;NWC9!NCANw}3&GfuDgHG!w$W
zz{oI_VJZVN^HT;R1~!Hq@L37W3=IsR`CQNnY><9t26^yqQ)UKt2GFW}W`=0+xgE^l
z75yL;qZmB|K)X9ZYqLRN2wJ-iT0Q^o|NsA>b^4&QKtN|ifcT)36+krT#<5X6d_v&g
ze+C9-P{oFpFhJ?zLF@caKm9WVR!`($&{p4k6SQL$l>b5Ve;|3#S}su9f#pHatTreO
zfo2dv=?FC94cdPJ8Yu;(C(yVfC{2OJJwWLS)b9YD2?A=rgVGnM9Sl0N15^)#&inw?
zXP~n&KxH1t9szX*@Z2}ZZiWvt3_#~QP{IbS{CCbsEXqkOR&dELEh)-OEUjQz@Csxu
zC_fmQG8ll$rUnP&kD&c0V7BznXG^~xW(2dp7}Ny3hOimL4@`9Vc9;>Q4=pJ1a`A;f
z)77(A=jcfbOrFlcpsn+B9Vq-kVF?ODkiS8Di$G_2fcB_>!Vk390kp>zv<ev%ZlKky
zp!El!HItz51jQF9d_k)gVBraJFC!y2_{0^ELqX<XqvZrZWiSH+C?10|Qd3I|8F&OB
z*9(Gz3#2VPzbLyHBvs4+HWg$HLCnbT??33&CQy!20Bz)BU;yu4U|?Wy1FggH%}g%J
zFV0UZQE;tDPR&t(TfzV;jV#<eoj|D(ET;!{mmX+eE<tNY6+lA(w683mA(x?m!Ji?C
z0aP19C5WUz=lp=;4u*-*2FmlGv`UOxV${Iw2GPW*r?wi9y)aB|vxzYeW;ci?Mm@3`
E0QNBs1ONa4

diff --git a/docs/DeveloperHowTo.html b/docs/DeveloperHowTo.html
deleted file mode 100644
index 209b85738..000000000
--- a/docs/DeveloperHowTo.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-
-<head>
-<meta http-equiv="refresh" content="0; url=http://github.com/UV-CDAT/uvcdat/wiki/Development"/>
-</head>
-</html>
diff --git a/docs/HELP.html b/docs/HELP.html
deleted file mode 100644
index 7430ec110..000000000
--- a/docs/HELP.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-
-<head>
-<meta http-equiv="refresh" content="0; url=http://github.com/UV-CDAT/uvcdat/wiki/Building-UVCDAT"/>
-</head>
-</html>
diff --git a/docs/README.txt b/docs/README.txt
deleted file mode 100644
index 99bf6afef..000000000
--- a/docs/README.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-The documentation of UV-CDAT has moved to github. Please visit
-this page for the latest documentation:  https://github.com/UV-CDAT/uvcdat/wiki
diff --git a/docs/ReleaseNotes.txt b/docs/ReleaseNotes.txt
deleted file mode 100644
index ca81f7443..000000000
--- a/docs/ReleaseNotes.txt
+++ /dev/null
@@ -1,226 +0,0 @@
-********************* Changes in the next release  ****
-********************* Release 4.3 *************************************
-New build system, CDAT is now installed under CDAT/VERSION/bin 
-New Fonts system: most ttf fonts work now!
-New direct postscript output
-Hatch/pattern output working (see known bug though)
-Improved VCDAT
-New Package: Thermo
-EZTemplate
-genutil.filters
-going away from pyfort, using f2py instead
-pydebug included
-mpeg output
-generalized grid support
-improved web documentation
-
-!!!!!!!!!!!!!!! WARNING !!!!!!!!!!!!!!!!!
-There is a known bug in cairo (the postscript rendering library) that will
-cause the output to be wrong if you are using both
-pattern/hatches and dashed lines
-
-
-********************* Release 4.0 *************************************
-
-----------------------------
-MAJOR CHANGES TO THE RELEASE
-----------------------------
-
-*- Support for Generalized Grids, regridding possible using the SCRIP regridder
-(source code provided but not installed)
-
-*- Template Editor, let you resize, drag, drop object on your VCS Canvas
-
-*- Major Overhaull of the VCDAT GUI, with template and graphic methods
-editors. Various mode of use (variable browsing, computation mode, graphics
-mode). 
-
-*- Page Layout Editor available in VCDAT
-
-*- More projection available (GCTP package), total of 28 new types of
-projection, each with full parameters control
-
-*- Improved install process
-
-*- New packages: filter, vertical interpolation, IaGraph, f2py, R/Rpy, VTK
-(Linux only, and not supported), thermo (thermodynamic diagrams)
-
-*- Full list of Changes available in files Changes_3.3_to_4.* (Open Office, csv and
-pdf formats)
-
--------------------------
-KNOWN BUGS
--------------------------
-
-*- There is apparently a bug on the Mac X server, this forces the user to move
-the VCS canvas window in order for the threads to start. If not the 
-application might hang.
-
-*- Beta version does not have support for inline scripting from VCDAT, final
-version and some future beta wiull have full support.
-
-
-********************* Release 3.3 *************************************
-01. vcs plotting now as at-plotting-time overwritting capabilities, i.e, you can change a graphic method or template attribute as you plot by passing it to the plot command
-02. vcs text function let you know draw string on the fly, also accepts colors argument passed a colornames
-03 vcs canvas object have a new function "match_color" which allows the user to get the color in the colormap (in use or passed) that is closest from its desirted color
-04. rank function now available in genutil.statstics
-
-********************* Release 3.3 (10/01/2002)  ************************
-01. Meshfill support is now complete (for graphical output)
-       all is done at the C level, projection are authorized as well as
-       axes transformations. MUCH faster than the old python based support
-02. CompasrisonsStatistics contrib package added (PCMDI's compall)
-03. VariablesMatcher, VariableConditioner objects added, allows easy regrid/masking 
-       of datasets for comparison, module: cdutil
-04. Build changes have removed the need for users to set LD_LIBRARY_PATH.
-05. Now available on AIX.
-06. genutil.statistics now has percentiles and median functions
-07. genutil now has grower function (add dimensions to MV so they have matching shapes)
-08. genutil.statistics: fixed a bug when input datasets had different masks 
-       (now uses the union of both masks)
-09. pyclimate package added to the contrib, which is a Python package designed
-       to accomplish some usual tasks during the analysis of climate variability
-       using Python. It provides functions to perform some simple IO operations,
-       operations with COARDS-compliant netCDF files, EOF analysis, SVD and CCA
-       analysis of coupled data sets, some linear digital filters, kernel based
-       probabilitydensity function estimation and access to DCDFLIB.C library from
-       Python.
-10. Fixed the Read Script File file browser dialog "File of type". The
-       text said "Search for netCDF" and "Search for GrADS". This has
-       been replaced with "Search fo VCS file" and "Search for Python files".
-11. Sync'ed the continents to work with the Page Editor. In the process,
-       I fixed the canvas update to work with threads
-12. Ran Insure++ on code to clean up memory leaks in XGKS and VCS.
-13. Fixed "open" bug. That is, fixed bug for when x.open() called. It no
-       longer exists out of python from the command line.
-14. Can now print a VCS Canvas plot, produced in background mode,
-       to an output file (i.e., postscript, cgm, gif, or eps.).
-15. Reordered the include files to find the VCS include files first.
-       This solves the problem of VCS not compiling on Solaris 2.8
-       platforms. Solaris 2.8 platforms have a project.h file located in
-       the /usr/lib directory. project.h is also an include file for VCS.
-       In any case, forcing the VCS include files to be seen first, solves
-       this problem and should have no effect on other platforms.
-16. Bug fixes for the DEC platform. The low-level primative attribute settings
-       now work for the DEC platform.
-17. Fixed the legend label to be positioned at the bottom right corner of
-       the plot. It will also move with the legend when the legend is
-       altered by the user.
-18. Now the user does not have to specify the DISPLAY variable in order to run
-       VCS or VCDAT. That is the user can now run the VCS module from the
-       command-line, script, background mode, or from VCDAT without specifying
-       the environment variable DISPLAY. That is, XOpenDisplay is now set
-       to ":0.0" or "localhost:0.0" for VCS and for Tkinter.
-19. This function displays graphics segments, which are currently stored in
-       the frame buffer, on the VCS Canvas. That is, if the plot function
-       was called with the option bg = 1 (i.e., background mode), then the
-       plot is produced in the frame buffer and not visible to the user.
-       In order to view  the graphics segments, this function will copy
-       the contents of the frame buffer to the VCS Canvas, where the
-       graphics can be viewed by the user.
-20. Added outfill and outline to the browser interface. They are now part of the
-       graphics method pulldown selection. Also add a graphics method attribute
-       settings interface for the two graphics method so the user can
-       change their attributes.
-21. Added the capability for low-level primatives to accept Numeric arrays for
-       their list of x and y axis point values.
-22. Bug fix for generating more than 140 plots. That is, commented out
-        Py_DECREF(dict);
----
-       This DECREF causes memory problems for Python if the
-       user chooses to generate more than 140 plots in a Python loop.
-       That is, needed memory is removed then overwritten, which causes
-       Python to give the undefined global name error for "range", "len",
-       or some other globally defined Python key word.
-23. vcdat_teaching_script_file.py now work with appropriate graphics methods.
-       That is, you can now run "python vcdat_teaching_script_file.py" to replay
-       what was done in the VCDAT session.
-
-       Note: vcdat_recording_script_file.py worked because it did not rely on the
-               ASD.scr file.
-24. Show the index values for 1D axis variables
-25. Updated the "Alter Plot" GUI to reflect the minor ticks settings and the
-       axis type (i.e., Linear or Log10). Currently, the user can only view the
-       axis representation. Later when time permits, I will change the "View"
-       text input window to an "Edit" text input window. This will let the user
-       specify (via a Python dictionary) the location of the axis label and the
-       label text string. For example, { -90: "south pole", 0: "equator",
-       90: "north pole"}.
-26. Modified the VCDAT module to track user directory, file, and variable requests.
-       It also logs the user's wall clock and cpu time. Examples: "vcdat -u",
-       "vcdat -h".
-27. Updated the VCS initial.attributes file to Mike Wehner's initial.attibutes file.
-28. The Boxfill legend labels can be set with a list or a dictionary. For
-       example: [0, 10, 20, 30, 40] or {40:'some text', 50:'some more text'}.
-29. boxfill.legend={.5:'hi'} will now work if the legend is vertical
-       or horizontal.
-30. Colormap bug fix. The default colormap can now be changed,
-       then saved as a new colormap.
-31. VCDAT option menu: -h, print out help menu; -n, turn splash screen off, -u, turn
-       user tracking mode on. See item 17.
-32. Corrected the legend when plotting log based boxfill plots.
-33. Updated the X and Y axes, so that the user can modify and
-       change the axes values.
-34. The graphics method's data world coordinates (i.e., datawc_x1, datawc_x2,
-       datawc_y1, and datawc_y2) will override the incoming variable's coordinates.
-35. VCDAT has a new icon to bookmark files, works just like the directories
-36. Beta DODS support on Linux, build using --dods=/path/to/DODS/directory
-37. gplot now builds automatically
-38. various utilies necessary to produce GIF output are also now provided as part
-       of the install process.
-39. VCS template object now have scale, reset, move and moveto associated function
-40. added cddump utility (ncdump like utility that works on any type of file that
-       cdms can open) 
-41. VCDAT has new icon functions: grower, mask, getmask, less, greater, equal, not, standard deviation
-
-********************* Release 3.2 (4/15/2002)  ************************
-1. Revised build system allows for installation into an existing Python.
-   Please see README.txt to learn the new installation system.
-   (Paul Dubois). DRS and QL support are not built by default, unless you
-   use the --PCMDI option.
-2. In genutil.statistics, the linearegression now can return std error
-   and probabilities for regression constant (in addition of the regression coef).
-   Power users that used this capability should be aware that the syntax slightly
-   changed, see the doc string. (Charles Doutriaux)
-3. Contributed package shgrid, cssgrid, dsgrid  added (Clyde Dease)
-   See "INTRODUCTION TO NGMATH" below for descriptions.
-   After installation, go to the Test subdirectory of each and run python shgridtest.py;
-   a documentation file will be produced as a byproduct.
-4. Updated averager so it now takes integer for single axis operation.
-   Updated averager so the weights options are now "unweighted" and "weighted" instead of 
-   "equal" and "generate"; old options still work.
-   Updated averager so the weights keyword now works.
-   Updated the doc strings of averager so they reflect the previous 2 changes.
-   Updated genutil.statistics so weights options are now compatible with cdutil.averager.
-
-5. Solution to the high CPU usage problem when displaying a VCS Canvas. 
-   Modification to the VCS Canvas event mainloop was done to avoid high CPU 
-   usage while the VCS Canvas sat idle. This modification has no other 
-   effects on the graphics or the VCS Canvas behavior.
-
-6. Extensive improvements to the VCDAT browser. These are detailed at:
-   http://esg.llnl.gov/cdat/GUI_Modifications.html
-
-   INTRODUCTION TO NGMATH
-
-        The ngmath library is a collection of interpolators and approximators
-for one-dimensional, two-dimensional and three-dimensional data. The packages, 
-which were obtained from NCAR, are:
-
-  natgrid -- a two-dimensional random data interpolation package based on 
-              Dave Watson's nngridr. NOT built by default in CDAT due to 
-             compile problems on some platforms. Works on linux.
-
-  dsgrid --  a three-dimensional random data interpolator based on a
-             simple inverse distance weighting algorithm.
-
-  fitgrid -- an interpolation package for one-dimensional and two-dimensional 
-             gridded data based on Alan Cline's Fitpack. Fitpack uses splines 
-             under tension to interpolate in one and two dimensions.  
-             NOT IN CDAT.
-
-  csagrid -- an approximation package for one-dimensional, two-dimensional and 
-             three-dimensional random data based on David Fulker's Splpack. 
-             csagrid uses cubic splines to calculate its approximation function.
-
-- 
GitLab


From c3ffa3a3423fe8dfab5cce289ca82712217add08 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Fri, 13 May 2016 15:23:36 -0400
Subject: [PATCH 051/191] Initial VCS documentation

---
 docs/index.rst      |  60 ++++++++++++++++++++++++++
 docs/user-guide.rst | 103 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 163 insertions(+)
 create mode 100644 docs/index.rst
 create mode 100644 docs/user-guide.rst

diff --git a/docs/index.rst b/docs/index.rst
new file mode 100644
index 000000000..99c91e62a
--- /dev/null
+++ b/docs/index.rst
@@ -0,0 +1,60 @@
+VCS: Visualization Control System
+==================================
+
+What is VCS?
+---------------
+
+The PCMDI Visualization Control System (VCS) is expressly designed to meet the needs of scientific community. VCS allows wide-ranging changes to be made to the data display, provides for hardcopy output, and includes a means for recovery of a previous display.
+
+In the VCS model, the data display is defined by a trio of named object sets, designated the “primary objects” (or “primary elements”). These include:
+
+* **Data Ingestion**: The data, which drives the visualization is ingested into the system via cdms2 or numeric modules such as numpy;.
+
+* **Graphics Method**: The graphics method, which specifies the display technique.
+
+* **Template**: The picture template, which determines the appearance of each segment of the display. Tables for manipulating these primary objects are stored in VCS for later recall and possible use.
+
+In addition, detailed specification of the primary objects’ attributes is provided by eight “secondary objects” (or secondary elements”):
+
+* **colormap**: Specification of combinations of 256 available colors
+* **fill area**: Style, style index, and color index
+* **format**: Specifications for converting numbers to display strings
+* **line**: Line type, width and color index
+* **list**: A sequence of pairs of numerical and character values
+* **marker**: Marker type, size, and color index
+* **text**: Text font type, character spacing, expansion and color index
+* **text orientation**: Character height, angle, path, and horizontal/vertical alignment
+
+By combining primary and secondary objects in various ways (either at the command line or in a program), the VCS user can comprehensively diagnose and intercompare climate model simulations. VCS provides capabilities to:
+
+- View, select and modify attributes of data variables and of their dimensions
+- Create and modify existing template attributes and graphics methods
+- Save the state-of-the-system as a script to be run interactively or in a program
+- Save a display as a Computer Graphics Metafile (CGM), GIF, Postscript, Sun Raster, or Encapsulated Postscript file
+- Perform grid transformations and compute new data variables
+- Create and modify color maps
+- Zoom into a specified portion of a display
+- Change the orientation (portrait vs. landscape) or size (partial vs. full-screen) of a display
+- Animate a single data variable or more than one data variable simultaneously
+- Display data in various geospatial projections
+
+For an overview of the concepts present in VCS, we recommend checking out the :doc:`user-guide`.
+
+VCS is published under the Apache 2.0 License. Its source code can be found at
+https://github.com/UV-CDAT/uvcdat/Packages/vcs
+
+Table of contents
+-----------------
+.. toctree::
+   :maxdepth: 2
+
+   admin-docs
+   user-docs
+   developer-docs
+   plugins
+
+API index
+---------
+
+* :ref:`genindex`
+* :ref:`modindex`VCS
\ No newline at end of file
diff --git a/docs/user-guide.rst b/docs/user-guide.rst
new file mode 100644
index 000000000..77f300f32
--- /dev/null
+++ b/docs/user-guide.rst
@@ -0,0 +1,103 @@
+User Guide
+**********
+
+Document Conventions
+====================
+
+This User Guide is written for end-users of vcs, rather than developers. If you
+have suggestions or questions about this documentation, feel free to contact us
+`on UV-CDAT <https://github.com/UV-CDAT/uvcdat>`_,
+`the mailing list <>`_.
+
+vcs specific entities will be ``formatted like this``.
+
+.. _concepts:
+
+Concepts
+========
+
+The VCS module can accept data from the CDMS module, the CU module, or the Numeric module. For use on
+how to use either of the mentioned modules, see their respective documentation. For examples on the
+direct use of these modules, see the VCS API Examples chapter and the examples located throughout this texts.
+
+VCS Model
+---------
+
+The VCS model is defined by a trio of named attribute sets, designated the “Primary Objects” (also known as “Primary Elements”).
+These include: the data, which specifies what is to be displayed and are obtained from the cdms2 or Numeric modules;
+the graphics method, which specifies the display technique; and the picture template, which determines the appearance of
+each segment of the display.
+
+VCS Primary Objects (or Primary Elements)
+-----------------------------------------
+
+A description of each primary object is warranted before showing their use and usefulness in VCS. See descriptions below.
+
+**Graphics Method Objects**
+
+A graphics method simply defines how data is to be displayed on the screen. Currently, there are eleven different graphics methods with more on the way. Each graphics method has its own unique set of attributes (or members) and functions. They also have a set of core attributes that are common in all graphics methods. The descriptions of the current set of graphics methods are as follows:
+
+* **boxfillobject** - The boxfill graphics method draws color grid cells to represent the data on the VCS - Canvas. Its class symbol or alias is “Gfb”.
+* **continentsobject** - The continents graphics method draws a predefined, generic set of continental -outlines in a longitude by latitude space. To draw continental outlines, no external data set is required. Its class symbol or alias is “Gcon”.
+* **isofillobject** - The isofill graphics method fills the area between selected isolevels (levels of constant value) of a two-dimensional array with a user-specified color. Its class symbol or alias is “Gfi”.
+* **isolineobject** - The isoline graphics method draws lines of constant value at specified levels in order to graphically represent a two-dimensional array. It also labels the values of these isolines on the VCS Canvas. Its class symbol or alias is “Gi”.
+* **outfillobject** - The outfill graphics method fills a set of integer values in any data array. Its primary purpose is to display continents by filling their area as defined by a surface type array that indicates land, ocean, and sea-ice points. Its class symbol or alias is “Gfo”.
+* **outlineobject** - The Outline graphics method outlines a set of integer values in any data array. Its primary purpose is to display continental outlines as defined by a surface type array that indicates land, ocean, and sea-ice points. Its class symbol or alias is “Go”.
+* **scatterobject** - The scatter graphics method displays a scatter plot of two 4-dimensional data arrays, e.g. A(x,y,z,t) and B(x,y,z,t). Its class symbol or alias is “GSp”.
+* **vectorobject** - The Vector graphics method displays a vector plot of a 2D vector field. Vectors are located at the coordinate locations and point in the direction of the data vector field. Vector magnitudes are the product of data vector field lengths and a scaling factor. Its class symbol or alias is “Gv”.
+* **xvsyobject** - The XvsY graphics method displays a line plot from two 1D data arrays, that is X(t) and Y(t), where ‘t’ represents the 1D coordinate values. Its class symbol or alias is “GXY”.
+* **xyvsyobject** - The Xyvsy graphics method displays a line plot from a 1D data array, i.e. a plot of X(y) where ‘y’ represents the 1D coordinate values. Its class symbol or alias is “GXy”.
+* **Yxvsxobject** - The Yxvsx graphics method displays a line plot from a 1D data array, i.e. a plot of Y(x) where ‘x’ represents the 1D coordinate values. Its class symbol or alias is “GYx”.
+* **3dscalarobject** - The 3dscalar graphics method displays an interactive 3D plot of a 4-dimensional (x,y,z,t) data array. Its class symbol or alias is “3d_scalar”.
+* **3dvectorobject** - The 3dvector graphics method displays an interactive 3D plot of a 4-dimensional (x,y,z,t) vector field. Its class symbol or alias is “3d_vector”.
+
+**Picture Template Object**
+
+A picture template determines the location of each picture segment, the space to be allocated to it, and related properties relevant to its display. The description of the picture template is as follows:
+
+* **templateobject** - Picture Template attributes describe where and how segments of a picture will be displayed. The segments are graphical representations of: textual identification of the data formatted values of single-valued dimensions and mean, maximum, and minimum data values axes, tick marks, labels, boxes, lines, and a legend that is graphics-method specific the data. Picture templates describe where to display all segments including the data. Its class symbol or alias is “P”.
+
+**Data Object**
+
+Array data attribute sets and their associated dimensions are to be modified outside of VCS. See the CDMS2 and Numeric module documentation for data extraction, creation and manipulation.
+
+VCS Secondary Objects (or Secondary Elements)
+---------------------------------------------
+A description of each secondary object is warranted before showing their use and usefulness in VCS. It is these secondary objects that defines the detailed specification of the primary objects’ attributes. Currently, there are five secondary objects with more to follow.
+
+**Colormap Object**
+
+The colormap object is used to specify, create, and modify colormaps. There are 256 colors and color indices, but only the first 240 color indices can be modified (indices 240 through 255 are reserved for VCS internal use). The description of the colormap object is as follows:
+
+*colormapobject* - A colormap contains 240 user-definable colors that are used for graphical displays. The color mixtures are defined in terms of percentages of red, green, and blue colors (0 to 100% for each). The resulting color depends on the specified mixtures of red, green, and blue. Its class symbol or alias is “Cp”.
+Note: VCS colormaps are objects, but they are not referenced like other secondary objects.
+
+**Fillarea Object**
+
+The fillarea objects allows the user to edit fillarea attributes, including fillarea interior style, style index, and color index. The description of the fillarea object is as follows:
+
+*fillareaobject* - The fill area attributes are used to display regions defined by closed polygons, which can be filled with a uniform color, a pattern, or a hatch style. Attributes specify the style, color, position, and dimensions of the fill area. Its class symbol or alias is “Tf”.
+Line Object
+
+**Line Object**
+
+The line object allows the editing of line type, width, and color index. The description of the line object is as follows:
+
+*lineobject* - The line attributes specify the type, width, and color of the line to be drawn for a graphical display. Its class symbol or alias is “Tl”.
+Marker Object
+
+The marker object allows the editing of the marker type, width, and color index. The description of the marker object is as follows:
+
+**Marker Object**
+
+*markerobject* - The marker attribute specifies graphical symbols, symbol sizes, and colors used in appropriate graphics methods. Its class symbol or alias is “Tm”.
+
+**Text Objects**
+
+Graphical displays often contain textual inscriptions, which provide further information. The text-table object attributes allow the generation of character strings on the VCS Canvas by defining the character font, precision, expansion, spacing, and color. The text-orientation object attributes allow the appearance of text character strings to be changed by defining the character height, up-angle, path, and horizontal and vertical alignment. The text-combined object is a combination of both text-table and text-orientation objects. The description of the text objects are as follows:
+
+*textcombinedobject* - The text-combined attributes combine the text-table attributes and a text-orientation attributes together. From combining the two classes, the user is able to set attributes for both classes at once (i.e., define the font, spacing, expansion, color index, height, angle, path, vertical alignment, and horizontal alignment). Its class symbol or alias is “Tc”.
+
+*textorientationobject* - The text-orientation attributes set names that define the height, angel, path, horizontal alignment and vertical alignment. Its class symbol or alias is “To”.
+
+*texttableobject* - The text-table attributes set names that define the font, spacing, expansion, and color index. Its class symbol or alias is “Tt”.
-- 
GitLab


From eb6017fdb3dc17f4a5287f4c9f45f9bc2eaa66aa Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Fri, 13 May 2016 21:28:46 -0400
Subject: [PATCH 052/191] Added vcs plotting section

---
 docs/user-guide.rst | 72 +++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 67 insertions(+), 5 deletions(-)

diff --git a/docs/user-guide.rst b/docs/user-guide.rst
index 77f300f32..acf80e490 100644
--- a/docs/user-guide.rst
+++ b/docs/user-guide.rst
@@ -65,21 +65,24 @@ VCS Secondary Objects (or Secondary Elements)
 ---------------------------------------------
 A description of each secondary object is warranted before showing their use and usefulness in VCS. It is these secondary objects that defines the detailed specification of the primary objects’ attributes. Currently, there are five secondary objects with more to follow.
 
-**Colormap Object**
+Colormap Object
+^^^^^^^^^^^^^^^
 
 The colormap object is used to specify, create, and modify colormaps. There are 256 colors and color indices, but only the first 240 color indices can be modified (indices 240 through 255 are reserved for VCS internal use). The description of the colormap object is as follows:
 
 *colormapobject* - A colormap contains 240 user-definable colors that are used for graphical displays. The color mixtures are defined in terms of percentages of red, green, and blue colors (0 to 100% for each). The resulting color depends on the specified mixtures of red, green, and blue. Its class symbol or alias is “Cp”.
 Note: VCS colormaps are objects, but they are not referenced like other secondary objects.
 
-**Fillarea Object**
+Fillarea Object
+^^^^^^^^^^^^^^^
 
 The fillarea objects allows the user to edit fillarea attributes, including fillarea interior style, style index, and color index. The description of the fillarea object is as follows:
 
 *fillareaobject* - The fill area attributes are used to display regions defined by closed polygons, which can be filled with a uniform color, a pattern, or a hatch style. Attributes specify the style, color, position, and dimensions of the fill area. Its class symbol or alias is “Tf”.
 Line Object
 
-**Line Object**
+Line Object
+^^^^^^^^^^^
 
 The line object allows the editing of line type, width, and color index. The description of the line object is as follows:
 
@@ -88,11 +91,13 @@ Marker Object
 
 The marker object allows the editing of the marker type, width, and color index. The description of the marker object is as follows:
 
-**Marker Object**
+Marker Object
+^^^^^^^^^^^^^
 
 *markerobject* - The marker attribute specifies graphical symbols, symbol sizes, and colors used in appropriate graphics methods. Its class symbol or alias is “Tm”.
 
-**Text Objects**
+Text Objects
+^^^^^^^^^^^^
 
 Graphical displays often contain textual inscriptions, which provide further information. The text-table object attributes allow the generation of character strings on the VCS Canvas by defining the character font, precision, expansion, spacing, and color. The text-orientation object attributes allow the appearance of text character strings to be changed by defining the character height, up-angle, path, and horizontal and vertical alignment. The text-combined object is a combination of both text-table and text-orientation objects. The description of the text objects are as follows:
 
@@ -101,3 +106,60 @@ Graphical displays often contain textual inscriptions, which provide further inf
 *textorientationobject* - The text-orientation attributes set names that define the height, angel, path, horizontal alignment and vertical alignment. Its class symbol or alias is “To”.
 
 *texttableobject* - The text-table attributes set names that define the font, spacing, expansion, and color index. Its class symbol or alias is “Tt”.
+
+
+Getting Started with VCS
+------------------------
+
+Import VCS
+^^^^^^^^^^
+
+In Python, before one can start using a module they must first load it.
+To load the VCS module, like all other Python modules, either type:
+
+``from vcs import``
+
+or
+
+``import vcs``
+
+If you use ``import vcs``, then you must prepend "vcs" to certain calls
+(e.g., ``vcs.help()``). If you use ``from vcs import *``, then you must
+be aware of possible name clashes. That is, if two packages are imported
+using the form ``from name import *`` and both have a "help" function,
+then Python doesn't know which ``help`` function to call. For such
+cases, and indeed as an unspoken rule, it is best to use "import name"
+to avoid name clashing between packages.
+
+Create Canvas Object
+^^^^^^^^^^^^^^^^^^^^
+
+To construct a VCS Canvas object type the following:
+
+``a = vcs.init()``
+
+There can only be at most 8 VCS Canvas objects initialized at any given
+time.
+
+Plotting in VCS
+^^^^^^^^^^^^^^^
+There are several different ways to display data on the VCS Canvas. The
+most basic way is to use the plot() function. The simple plot() function
+command: plot(array1,[array2], [template object], [graphics\_method
+object]). The examples below are showing how to plot a simple array
+using default values for everything else.::
+
+    # Import vcs and io (cdms) modules
+    import vcs
+    import cdms2
+
+    # Open sample NetCDF data file
+    data = cdms2.open('clt.nc')
+
+    # Initialize vcs and then plot the variable
+    canvas = vcs.init()
+    clt = data['clt']
+    canvas.plot(clt)
+
+    # Close the canvas context
+    canvas.close()
\ No newline at end of file
-- 
GitLab


From 5543360ec377d82cde87172c3c6882f472dff238 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Fri, 13 May 2016 21:39:43 -0400
Subject: [PATCH 053/191] Fixed link to user-guide

---
 docs/index.rst | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index 99c91e62a..0bb30b293 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -48,10 +48,8 @@ Table of contents
 .. toctree::
    :maxdepth: 2
 
-   admin-docs
-   user-docs
+   user-guide
    developer-docs
-   plugins
 
 API index
 ---------
-- 
GitLab


From e8300df1a48e3b870bbe7ff96fb4adcc3b2cfeb2 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Fri, 13 May 2016 21:46:12 -0400
Subject: [PATCH 054/191] Added vcs plotting example

---
 docs/user-guide.rst | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/user-guide.rst b/docs/user-guide.rst
index acf80e490..e04e8e9e3 100644
--- a/docs/user-guide.rst
+++ b/docs/user-guide.rst
@@ -6,8 +6,8 @@ Document Conventions
 
 This User Guide is written for end-users of vcs, rather than developers. If you
 have suggestions or questions about this documentation, feel free to contact us
-`on UV-CDAT <https://github.com/UV-CDAT/uvcdat>`_,
-`the mailing list <>`_.
+on `UV-CDAT <https://github.com/UV-CDAT/uvcdat>`_,
+`mailing list <uvcdat-users@lists.llnl.gov>`_.
 
 vcs specific entities will be ``formatted like this``.
 
@@ -33,7 +33,8 @@ VCS Primary Objects (or Primary Elements)
 
 A description of each primary object is warranted before showing their use and usefulness in VCS. See descriptions below.
 
-**Graphics Method Objects**
+Graphics Method Objects
+^^^^^^^^^^^^^^^^^^^^^^^
 
 A graphics method simply defines how data is to be displayed on the screen. Currently, there are eleven different graphics methods with more on the way. Each graphics method has its own unique set of attributes (or members) and functions. They also have a set of core attributes that are common in all graphics methods. The descriptions of the current set of graphics methods are as follows:
 
@@ -147,7 +148,9 @@ There are several different ways to display data on the VCS Canvas. The
 most basic way is to use the plot() function. The simple plot() function
 command: plot(array1,[array2], [template object], [graphics\_method
 object]). The examples below are showing how to plot a simple array
-using default values for everything else.::
+using default values for everything else.
+
+.. code-block:: python
 
     # Import vcs and io (cdms) modules
     import vcs
-- 
GitLab


From 0a2c266c6f97f8b75ba572df4e9ebed837fd042a Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Fri, 13 May 2016 21:52:07 -0400
Subject: [PATCH 055/191] Removed references to Numeric module

---
 docs/user-guide.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/user-guide.rst b/docs/user-guide.rst
index e04e8e9e3..7e2c74437 100644
--- a/docs/user-guide.rst
+++ b/docs/user-guide.rst
@@ -16,7 +16,7 @@ vcs specific entities will be ``formatted like this``.
 Concepts
 ========
 
-The VCS module can accept data from the CDMS module, the CU module, or the Numeric module. For use on
+The VCS module can accept data from the CDMS module or can use the numpy array. For use on
 how to use either of the mentioned modules, see their respective documentation. For examples on the
 direct use of these modules, see the VCS API Examples chapter and the examples located throughout this texts.
 
@@ -24,7 +24,7 @@ VCS Model
 ---------
 
 The VCS model is defined by a trio of named attribute sets, designated the “Primary Objects” (also known as “Primary Elements”).
-These include: the data, which specifies what is to be displayed and are obtained from the cdms2 or Numeric modules;
+These include: the data, which specifies what is to be displayed and are obtained from the cdms2 or numpy array;
 the graphics method, which specifies the display technique; and the picture template, which determines the appearance of
 each segment of the display.
 
@@ -60,7 +60,7 @@ A picture template determines the location of each picture segment, the space to
 
 **Data Object**
 
-Array data attribute sets and their associated dimensions are to be modified outside of VCS. See the CDMS2 and Numeric module documentation for data extraction, creation and manipulation.
+Array data attribute sets and their associated dimensions are to be modified outside of VCS. See the CDMS2 module documentation for data extraction, creation and manipulation.
 
 VCS Secondary Objects (or Secondary Elements)
 ---------------------------------------------
-- 
GitLab


From 58eba47ec284ab8638f5ebeadf0935ded32225e3 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Fri, 13 May 2016 23:59:55 -0400
Subject: [PATCH 056/191] Added some more examples for plotting

---
 docs/user-guide.rst | 69 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 68 insertions(+), 1 deletion(-)

diff --git a/docs/user-guide.rst b/docs/user-guide.rst
index 7e2c74437..d894308a1 100644
--- a/docs/user-guide.rst
+++ b/docs/user-guide.rst
@@ -13,6 +13,17 @@ vcs specific entities will be ``formatted like this``.
 
 .. _concepts:
 
+Installation
+============
+While there are many ways a user can install vcs, installation using conda is
+preferred for the end user. Currently, to install vcs, you need to install entire uvcdat
+pacakge. ::
+
+    conda install -c uvcdat
+
+It is assumed that conda is installed on user's system and is available on the shell.
+
+
 Concepts
 ========
 
@@ -165,4 +176,60 @@ using default values for everything else.
     canvas.plot(clt)
 
     # Close the canvas context
-    canvas.close()
\ No newline at end of file
+    canvas.close()
+
+As mentioned earlier, vcs can use numpy array directly. The example below shows how to plot numpy array data.
+
+.. code-block:: python
+
+    # Import necessary modules
+    import vcs
+    import cdms2
+    import numpy
+
+    # Manually create data
+    data = numpy.sin(numpy.arrange(100))
+
+    # Reshape to make it useful for vcs
+    data = numpy.reshape(data, (10, 10))
+
+    # Initialize vcs and then plot the data
+    canvas = vcs.init()
+    canvas.plot(data)
+
+    # Close the canvas context
+    canvas.close()
+
+It should be noted that plot can take multiple arguments. For example, plot can take ``bg=1`` option to draw visualization in the background. Below is the plotting climate data example with few new options to plot method.
+
+.. code-block:: python
+
+    # Import vcs and io (cdms) modules
+    import vcs
+    import cdms2
+
+    # Open sample NetCDF data file
+    data = cdms2.open('clt.nc')
+
+    # Initialize vcs and then plot the variable
+    canvas = vcs.init()
+
+    # Create isofill graphics method
+    iso = canvas.createisofill()
+
+    # Create default template
+    template = canvas.createtemplate()
+
+    # Scale visualization by factor of 2
+    template.scale(2)
+
+    clt = data['clt']
+
+    # Plot isofill with continents outline and default template
+    canvas.plot(template, iso, clt, continents=1)
+
+    # Close the canvas context
+    canvas.close()
+
+
+.. note:: When using the plot() function, keep in mind that all keyword arguments must be last. Note that the order of the objects is not restrictive, just as long as they are before any keyword argument.
\ No newline at end of file
-- 
GitLab


From 11990623d5935de7a1e6bd426e63b33f26899117 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Sat, 14 May 2016 00:35:59 -0400
Subject: [PATCH 057/191] Moved vcs documentation to vcs directory

---
 {docs => Packages/vcs/docs}/index.rst      | 0
 {docs => Packages/vcs/docs}/user-guide.rst | 6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename {docs => Packages/vcs/docs}/index.rst (100%)
 rename {docs => Packages/vcs/docs}/user-guide.rst (99%)

diff --git a/docs/index.rst b/Packages/vcs/docs/index.rst
similarity index 100%
rename from docs/index.rst
rename to Packages/vcs/docs/index.rst
diff --git a/docs/user-guide.rst b/Packages/vcs/docs/user-guide.rst
similarity index 99%
rename from docs/user-guide.rst
rename to Packages/vcs/docs/user-guide.rst
index d894308a1..476295e3c 100644
--- a/docs/user-guide.rst
+++ b/Packages/vcs/docs/user-guide.rst
@@ -220,12 +220,12 @@ It should be noted that plot can take multiple arguments. For example, plot can
     # Create default template
     template = canvas.createtemplate()
 
-    # Scale visualization by factor of 2
-    template.scale(2)
+    # Scale down visualization space
+    template.scale(0.8)
 
     clt = data['clt']
 
-    # Plot isofill with continents outline and default template
+    # Plot isofill with continents outline and custom template
     canvas.plot(template, iso, clt, continents=1)
 
     # Close the canvas context
-- 
GitLab


From 4b51eff646d7c12a37158a724ac59ef332c3e365 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Sat, 14 May 2016 07:51:59 -0400
Subject: [PATCH 058/191] Added list of create and get methods

---
 Packages/vcs/docs/user-guide.rst | 191 ++++++++++++++++++++++++++++++-
 1 file changed, 190 insertions(+), 1 deletion(-)

diff --git a/Packages/vcs/docs/user-guide.rst b/Packages/vcs/docs/user-guide.rst
index 476295e3c..de96d5e7f 100644
--- a/Packages/vcs/docs/user-guide.rst
+++ b/Packages/vcs/docs/user-guide.rst
@@ -232,4 +232,193 @@ It should be noted that plot can take multiple arguments. For example, plot can
     canvas.close()
 
 
-.. note:: When using the plot() function, keep in mind that all keyword arguments must be last. Note that the order of the objects is not restrictive, just as long as they are before any keyword argument.
\ No newline at end of file
+.. note:: When using the plot() function, keep in mind that all keyword arguments must be last. The order of the arguments is not restrictive, just as long as they are before any keyword argument.
+
+
+Other Plotting functions in VCS
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+There are other ways to plot data in VCS. These additional plotting
+routines utilizes the same parameter format as the plot() function. What
+makes these plotting functions unique are their direct association with
+the graphics methods. That is, each graphics method has its own plot
+function. For example, if the user wishes to plot data using the isofill
+graphics method, then the function isofill() can be used instead of the
+plot() function. If the isofill object is not specified then the default
+isofill graphics method will be used. The user can also pass down the
+name of the graphics method to be used. In some ways, the graphics
+method plot functions can be thought of as short cuts to plotting data.
+
+Note, if a different graphics method object is specified and passed down
+to one of these alternate plot functions, then the alternate plot
+function will behave as the plot() function and plot the data in the
+specified graphics method format.
+
+See table below for additional plot functions.
+
++--------------------+--------------------------------------------------+
+| Plot Function      | Description                                      |
++====================+==================================================+
+| ``boxfill()``      | plot data using the boxfill graphics method      |
++--------------------+--------------------------------------------------+
+| ``continents()``   | plot to the screen continental graphics method   |
++--------------------+--------------------------------------------------+
+| ``isofill()``      | plot data using the isofill graphics method      |
++--------------------+--------------------------------------------------+
+| ``isoline()``      | plot data using the isoline graphics method      |
++--------------------+--------------------------------------------------+
+| ``outfill()``      | plot data using the outfill graphics method      |
++--------------------+--------------------------------------------------+
+| ``outline()``      | plot data using the outline graphics method      |
++--------------------+--------------------------------------------------+
+| ``scatter()``      | plot data using the scatter graphics method      |
++--------------------+--------------------------------------------------+
+| ``vector()``       | plot data using the vector graphics method       |
++--------------------+--------------------------------------------------+
+| ``xvsy()``         | plot data using the xvsy graphics method         |
++--------------------+--------------------------------------------------+
+| ``xyvsy()``        | plot data using the xyvsy graphics method        |
++--------------------+--------------------------------------------------+
+| ``yxvsy()``        | plot data using the yxvsy graphics method        |
++--------------------+--------------------------------------------------+
+| ``scalar3D()``     | plot data using the 3d\_scalar graphics method   |
++--------------------+--------------------------------------------------+
+| ``vector3D()``     | plot data using the 3d\_vector graphics method   |
++--------------------+--------------------------------------------------+
+
+
+Creating VCS Objects
+^^^^^^^^^^^^^^^^^^^^
+
+The create functions enables the user to create VCS objects which can be
+modified directly to produce the desired results. Since the VCS
+"default" objects do allow modifications, it is best to either create a
+new VCS object or get an existing one. When a VCS object is created, it
+is stored in an internal table for later use and/or recall.
+
+Create the following VCS objects:
+
++-------------------------------+---------------------------------------------------+
+| Create Function               | Description                                       |
++===============================+===================================================+
+| ``createboxfill()``           | creates a new boxfill graphics method object      |
++-------------------------------+---------------------------------------------------+
+| ``createcontinents()``        | creates a new continents graphics method object   |
++-------------------------------+---------------------------------------------------+
+| ``createfillarea()``          | creates a new fillarea secondary object           |
++-------------------------------+---------------------------------------------------+
+| ``createisofill()``           | creates a new isofill graphics method object      |
++-------------------------------+---------------------------------------------------+
+| ``createisoline()``           | creates a new isoline graphics method object      |
++-------------------------------+---------------------------------------------------+
+| ``createline()``              | creates a new line secondary object               |
++-------------------------------+---------------------------------------------------+
+| ``createmarker()``            | creates a new marker secondary object             |
++-------------------------------+---------------------------------------------------+
+| ``createoutfill()``           | creates a new outfill graphics method object      |
++-------------------------------+---------------------------------------------------+
+| ``createoutline()``           | creates a new outline graphics method object      |
++-------------------------------+---------------------------------------------------+
+| ``createscatter()``           | creates a new scatter graphics method object      |
++-------------------------------+---------------------------------------------------+
+| ``createtextcombined()``      | creates a new text-combined secondary object      |
++-------------------------------+---------------------------------------------------+
+| ``createtextorientation()``   | creates a new text-orientation secondary object   |
++-------------------------------+---------------------------------------------------+
+| ``createtexttable()``         | creates a new text-table secondary object         |
++-------------------------------+---------------------------------------------------+
+| ``createvector()``            | creates a new vector graphics method object       |
++-------------------------------+---------------------------------------------------+
+| ``createxvsy()``              | creates a new xvsy graphics method object         |
++-------------------------------+---------------------------------------------------+
+| ``createxyvsy()``             | creates a new xyvsy graphics method object        |
++-------------------------------+---------------------------------------------------+
+| ``createyxvsx()``             | creates a new xyvsy graphics method object        |
++-------------------------------+---------------------------------------------------+
+| ``create3d_scalar()``         | creates a new 3d\_scalar graphics method object   |
++-------------------------------+---------------------------------------------------+
+| ``create3d_vector()``         | creates a new 3d\_vector graphics method object   |
++-------------------------------+---------------------------------------------------+
+
+
+Get Existing VCS Objects
+''''''''''''''''''''''''
+
+The get functions are used to obtain VCS objects that exist in the
+object memory tables. The get function directly manipulates the object's
+attributes in memory. If the object is used to display data on a plot
+and is manipulated by the user, then the plot will be automatically
+updated.
+
+Get the following VCS objects:
+
++----------------------------+--------------------------------------------------------------------------------------+
+| Get Function               | Description                                                                          |
++============================+======================================================================================+
+| ``getboxfill()``           | get specified boxfill graphics method and create boxfill object                      |
++----------------------------+--------------------------------------------------------------------------------------+
+| ``getcontinents()``        | get specified continents graphics method and create continents object                |
++----------------------------+--------------------------------------------------------------------------------------+
+| ``getfillarea()``          | get specified fillarea secondary object and create fillarea object                   |
++----------------------------+--------------------------------------------------------------------------------------+
+| ``getisofill()``           | get specified isofill graphics method and create fillarea object                     |
++----------------------------+--------------------------------------------------------------------------------------+
+| ``getisoline()``           | get specified isoline graphics method and create isoline object                      |
++----------------------------+--------------------------------------------------------------------------------------+
+| ``getline()``              | get specified line secondary object and create line object                           |
++----------------------------+--------------------------------------------------------------------------------------+
+| ``getmarker()``            | get specified marker secondary object and create marker object                       |
++----------------------------+--------------------------------------------------------------------------------------+
+| ``getoutfill()``           | get specified outfill graphics method and create outfill object                      |
++----------------------------+--------------------------------------------------------------------------------------+
+| ``getoutline()``           | get specifed outline graphics method and create outline object                       |
++----------------------------+--------------------------------------------------------------------------------------+
+| ``getscatter()``           | get specified scatter graphics method and create scatter object                      |
++----------------------------+--------------------------------------------------------------------------------------+
+| ``gettextcombined()``      | get specified text-combined secondary object and create text-combined object         |
++----------------------------+--------------------------------------------------------------------------------------+
+| ``gettextorientation()``   | get specified text-orientation secondary object and create text-orientation object   |
++----------------------------+--------------------------------------------------------------------------------------+
+| ``gettexttable()``         | get specified text-table secondary object and create text-table object               |
++----------------------------+--------------------------------------------------------------------------------------+
+| ``getvector()``            | get specified vector graphics method and create vector object                        |
++----------------------------+--------------------------------------------------------------------------------------+
+| ``getxvsy()``              | get specified xvsy graphics method and create xvsy object                            |
++----------------------------+--------------------------------------------------------------------------------------+
+| ``getxyvsy()``             | get specified xyvsy graphics method and create xyvsy object                          |
++----------------------------+--------------------------------------------------------------------------------------+
+| ``getyxvsx()``             | get specified yxvsx graphics method and create yxvsx                                 |
++----------------------------+--------------------------------------------------------------------------------------+
+| ``get3d_scalar()``         | get specified 3d\_scalar graphics method and create 3d\_scalar                       |
++----------------------------+--------------------------------------------------------------------------------------+
+| ``get3d_vector()``         | get specified 3d\_vector graphics method and create 3d\_vector                       |
++----------------------------+--------------------------------------------------------------------------------------+
+
+
+Removing VCS Objects
+^^^^^^^^^^^^^^^^^^^^
+
+Unwanted VCS objects can be removed from internal memory with the use of
+the remove function. The remove function will identify the VCS object
+type and remove it from the appropriate object table.
+
+Remove VCS objects:
+
++----------------------+----------------------------------------------------------------------+
+| Remove               | Description                                                          |
++======================+======================================================================+
+| ``removeobject()``   | allows the user to remove objects from the appropriate object list   |
++----------------------+----------------------------------------------------------------------+
+
+Show VCS Object List
+^^^^^^^^^^^^^^^^^^^^
+
+The show function is handy to list VCS objects tables.
+
+The show function is used to list the VCS objects in memory:
+
++-----------------+----------------------------------------------------------+
+| Show Function   | Description                                              |
++=================+==========================================================+
+| ``show()``      | list VCS primary and secondary class objects in memory   |
++-----------------+----------------------------------------------------------+
-- 
GitLab


From 917e581050bf6a70e04b3a17afaf474cdbba2f21 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Sat, 14 May 2016 14:39:13 -0400
Subject: [PATCH 059/191] Added reference documentation

---
 Packages/vcs/docs/user-guide.rst | 131 +++++++++++++++++++++++++++++++
 1 file changed, 131 insertions(+)

diff --git a/Packages/vcs/docs/user-guide.rst b/Packages/vcs/docs/user-guide.rst
index de96d5e7f..9a9ae40fc 100644
--- a/Packages/vcs/docs/user-guide.rst
+++ b/Packages/vcs/docs/user-guide.rst
@@ -422,3 +422,134 @@ The show function is used to list the VCS objects in memory:
 +=================+==========================================================+
 | ``show()``      | list VCS primary and secondary class objects in memory   |
 +-----------------+----------------------------------------------------------+
+
+
+VCS Reference Guide
+-------------------
+
+``init``
+^^^^^^^^
+* Initialize, Construct a VCS Canvas Object
+
+.. code-block:: python
+
+    import vcs,cdms2
+
+    file = cdms2.open('clt.nc')
+
+    slab = file.getslab('clt')
+
+    a = vcs.init()
+
+    # This examples constructs 4 VCS Canvas a.plot(slab)
+    # Plot slab using default settings
+    b = vcs.init()
+
+    # Construct VCS object
+    template = b.gettemplate('AMIP')
+
+    # Get 'example' template object
+    b.plot(slab, template)
+
+    # Plot slab using template 'AMIP'
+    c = vcs.init()
+
+    # Construct new VCS object
+    isofill = c.getisofill('quick')
+
+    # Get 'quick' isofill graphics method
+    c.plot(slab,template,isofill)
+
+    # Plot slab using template and isofill objects
+    d = vcs.init()
+
+    # Construct new VCS object
+    isoline = c.getisoline('quick')
+
+    # Get 'quick' isoline graphics method
+    c.plot(isoline,slab,template)
+
+    # Plot slab using isoline and template objects
+
+``help``
+^^^^^^^^
+* Print out the object's doc string
+
+.. code-block:: python
+
+    import vcs
+    a = vcs.init()
+    ln = a.getline('red')
+
+    # Get a VCS line object
+    # This will print out information on how to use ln
+    a.objecthelp(ln)
+
+``open``
+^^^^^^^^
+* Open VCS Canvas object.
+* This routine really just manages the VCS canvas. It will popup the VCS Canvas for viewing. It can be used to display the VCS Canvas.
+
+.. code-block:: python
+
+    import vcs
+    a = vcs.init()
+    a.open()
+
+``close``
+^^^^^^^^^
+* Close the VCS Canvas. It will remove the VCS Canvas object from the screen, but not deallocate it.
+
+.. code-block:: python
+
+    import vcs
+    a = vcs.init()
+    a.plot(array, 'default', 'isofill', 'quick')
+    a.close()
+
+``mode``
+^^^^^^^^
+* ``Options <0 = manual, 1 = automatic>``
+* Update the VCS Canvas.
+* Updating of the graphical displays on the VCS Canvas can be deferred until a later time. This is helpful when generating templates or displaying numerous plots. If a series of commands are given to VCS and the Canvas Mode is set to manual (i.e., 0), then no updating of the VCS Canvas occurs until the 'update' function is executed.
+
+.. note:: By default the VCS Canvas Mode is set to ``1``, which means VCS will update the VCS Canvas as necessary without prompting from the user.
+
+.. code-block:: python
+
+    import vcs
+    a = vcs.init()
+    a.mode = 0
+    # Set updating to manual mode
+    a.plot(array, 'default', 'boxfill', 'quick')
+    box = x.getboxfill('quick')
+    box.color_1 = 100
+    box.xticlabels('lon30', 'lon30')
+    box.xticlabels('','')
+    box.datawc(1e20, 1e20, 1e20, 1e20)
+    box.datawc(-45.0, 45.0, -90.0, 90.0)
+
+    # Update the changes manually
+    a.update()
+
+``update``
+^^^^^^^^^^
+* Update the VCS Canvas manually when the ``mode`` is set to ``0`` (manual).
+
+.. code-block:: python
+
+    import vcs
+
+    a = vcs.init()
+    a.mode = 0
+
+    # Go to manual mode a.plot(s,'default','boxfill','quick')
+    box = x.getboxfill('quick')
+    box.color_1 = 100
+    box.xticlabels('lon30', 'lon30')
+    box.xticlabels('','')
+    box.datawc(1e20, 1e20, 1e20, 1e20)
+    box.datawc(-45.0, 45.0, -90.0, 90.0)
+
+    # Update the changes manually
+    a.update()
-- 
GitLab


From 853af67c62c4aa7e5e42400e3027bf497a5c49fd Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Mon, 16 May 2016 09:00:14 -0700
Subject: [PATCH 060/191] Update Canvas.py

Allow for deprecation warnings
---
 Packages/vcs/vcs/Canvas.py | 38 ++------------------------------------
 1 file changed, 2 insertions(+), 36 deletions(-)

diff --git a/Packages/vcs/vcs/Canvas.py b/Packages/vcs/vcs/Canvas.py
index 8de655fbc..79dcd0dcd 100644
--- a/Packages/vcs/vcs/Canvas.py
+++ b/Packages/vcs/vcs/Canvas.py
@@ -27,6 +27,7 @@ Normally, created by vcs.init()
 Contains the method plot.
 """
 import warnings
+warnings.filterwarnings("default","",DeprecationWarning,"",0)
 from pauser import pause
 import numpy.ma
 import MV2
@@ -5308,43 +5309,8 @@ Options:::
     ##########################################################################
     def gs(self, filename='noname.gs', device='png256',
            orientation=None, resolution='792x612'):
-        """
-        Function: gs
-
-        Description of Function:
-        This routine allows the user to save the VCS canvas in one of the many
-        GhostScript (gs) file types (also known as devices). To view other
-        GhostScript devices, issue the command "gs --help" at the terminal
-        prompt. Device names include: bmp256, epswrite, jpeg, jpeggray,
-        pdfwrite, png256, png16m, sgirgb, tiffpack, and tifflzw. By default
-        the device = 'png256'.
-
-        If no path/file name is given and no previously created gs file has been
-        designated, then file
-
-        /$HOME/%s/default.gs
-
-        will be used for storing gs images. However, if a previously created gs
-        file exist, then this output file will be used for storage.
 
-        By default, the page orientation is the canvas' orientation.
-        To translate the page orientation to portrait mode (p), set the parameter orientation = 'p'.
-        To translate the page orientation to landscape mode (l), set the parameter orientation = 'l'.
-
-        The gs command is used to create a single gs file at this point. The user
-        can use other tools to append separate image files.
-
-        Example of Use:
-        a=vcs.init()
-        a.plot(array)
-        a.gs('example') #defaults: device='png256', orientation='l' and resolution='792x612'
-        a.gs(filename='example.tif', device='tiffpack', orientation='l', resolution='800x600')
-        a.gs(filename='example.pdf', device='pdfwrite', orientation='l', resolution='200x200')
-        a.gs(filename='example.jpg', device='jpeg', orientation='p', resolution='1000x1000')
-
-        NOTE: This method is marked as deprecated
-        """ % (self._dotdir)
-        warnings.warn("Export to GhostScript is no longer supported", Warning)
+        warnings.warn("Export to GhostScript is no longer supported", DeprecationWarning)
 
     ##########################################################################
     #                                                                           #
-- 
GitLab


From 243863d7c57e1727ef3110610682910ad230026c Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Mon, 16 May 2016 14:36:56 -0400
Subject: [PATCH 061/191] Added note on deprecation warning and moved it
 further down

---
 Packages/vcs/vcs/Canvas.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Packages/vcs/vcs/Canvas.py b/Packages/vcs/vcs/Canvas.py
index 79dcd0dcd..06a8bebdc 100644
--- a/Packages/vcs/vcs/Canvas.py
+++ b/Packages/vcs/vcs/Canvas.py
@@ -27,7 +27,6 @@ Normally, created by vcs.init()
 Contains the method plot.
 """
 import warnings
-warnings.filterwarnings("default","",DeprecationWarning,"",0)
 from pauser import pause
 import numpy.ma
 import MV2
@@ -74,6 +73,8 @@ import vcs.manageElements  # noqa
 import configurator  # noqa
 from projection import round_projections  # noqa
 
+# Python < 3 DeprecationWarning ignored by default
+warnings.filterwarnings("default", "", DeprecationWarning, "", 0)
 
 class SIGNAL(object):
 
-- 
GitLab


From 4e5e43d954b7e8fd05c0873bc38df773e02e6743 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Mon, 16 May 2016 14:58:39 -0400
Subject: [PATCH 062/191] Using a simple approach to turn on deprecation
 warning

---
 Packages/vcs/vcs/Canvas.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Packages/vcs/vcs/Canvas.py b/Packages/vcs/vcs/Canvas.py
index 06a8bebdc..1599e0a03 100644
--- a/Packages/vcs/vcs/Canvas.py
+++ b/Packages/vcs/vcs/Canvas.py
@@ -74,7 +74,7 @@ import configurator  # noqa
 from projection import round_projections  # noqa
 
 # Python < 3 DeprecationWarning ignored by default
-warnings.filterwarnings("default", "", DeprecationWarning, "", 0)
+warnings.simplefilter('default')
 
 class SIGNAL(object):
 
-- 
GitLab


From ce13552f749e477e8fa55dc81b6b0d945d52497f Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Mon, 16 May 2016 13:18:22 -0700
Subject: [PATCH 063/191] Added some new tests

---
 Packages/vcsaddons/Lib/__init__.py            |   3 +
 Packages/vcsaddons/Lib/core.py                |   9 +-
 Packages/vcsaddons/Lib/histograms.py          |  53 ++-
 Packages/vcsaddons/Lib/polar.py               | 395 ++++++++++++++++++
 testing/vcsaddons/CMakeLists.txt              |  24 ++
 .../vcs_addons_test_convert_arrays.py         |  69 +++
 .../vcs_addons_test_histogram_defaults.py     |  22 +
 .../vcs_addons_test_histogram_inherit.py      |  62 +++
 testing/vcsaddons/vcs_addons_test_polar.py    |  28 ++
 .../vcs_addons_test_polar_inherit.py          |  50 +++
 10 files changed, 692 insertions(+), 23 deletions(-)
 create mode 100644 Packages/vcsaddons/Lib/polar.py
 create mode 100644 testing/vcsaddons/vcs_addons_test_convert_arrays.py
 create mode 100644 testing/vcsaddons/vcs_addons_test_histogram_defaults.py
 create mode 100644 testing/vcsaddons/vcs_addons_test_histogram_inherit.py
 create mode 100644 testing/vcsaddons/vcs_addons_test_polar.py
 create mode 100644 testing/vcsaddons/vcs_addons_test_polar_inherit.py

diff --git a/Packages/vcsaddons/Lib/__init__.py b/Packages/vcsaddons/Lib/__init__.py
index eadaa435c..1ba782945 100644
--- a/Packages/vcsaddons/Lib/__init__.py
+++ b/Packages/vcsaddons/Lib/__init__.py
@@ -1,5 +1,6 @@
 gms = {}
 import histograms
+import polar
 import EzTemplate
 import yxvsxfill
 import continents
@@ -10,3 +11,5 @@ def createhistogram(name=None,source='default',x=None,template=None):
     return histograms.Ghg(name,source=source,x=x,template=template)
 def createusercontinents(name=None,source="default",x=None,template=None):
     return continents.Guc(name,source=source,x=x,template=template)
+def createpolar(name=None, source="default", x=None, template=None):
+    return polar.Gpo(name, source=source, x=x, template=template)
diff --git a/Packages/vcsaddons/Lib/core.py b/Packages/vcsaddons/Lib/core.py
index d1b49bf11..0a75da125 100644
--- a/Packages/vcsaddons/Lib/core.py
+++ b/Packages/vcsaddons/Lib/core.py
@@ -54,9 +54,12 @@ class VCSaddon(object):
             self.legend = None
             self.projection='linear'
         else:
-            gm =  vcsaddons.gms[self.g_type].get(source,None)
-            if gm is None:
-                raise "error could not find graphic method %s (of type %s)" % (source, self.g_type)
+            if isinstance(source, (str, unicode)):
+                gm = vcsaddons.gms[self.g_type].get(source,None)
+                if gm is None:
+                    raise "error could not find graphic method %s (of type %s)" % (source, self.g_type)
+            else:
+                gm = source
             self.datawc_x1=gm.datawc_x1
             self.datawc_x2=gm.datawc_x2
             self.datawc_y1=gm.datawc_y1
diff --git a/Packages/vcsaddons/Lib/histograms.py b/Packages/vcsaddons/Lib/histograms.py
index 452ac671e..0273529cd 100644
--- a/Packages/vcsaddons/Lib/histograms.py
+++ b/Packages/vcsaddons/Lib/histograms.py
@@ -21,7 +21,10 @@ class Ghg(VCSaddon):
             self.fillareacolors = []
             self.bins = []
         else:
-            gm = vcsaddons.gms[self.g_name][source]
+            if isinstance(source, (str, unicode)):
+                gm = vcsaddons.gms[self.g_type][source]
+            else:
+                gm = source
             self.line = gm.line
             self.linewidth = gm.linewidth
             self.linecolors = gm.linecolors
@@ -31,16 +34,16 @@ class Ghg(VCSaddon):
             self.bins = gm.bins
 
     def list(self):
-        print '---------- Histogram (Ghg) member (attribute) listings ----------'
-        print 'Canvas Mode = ', self.x.mode
-        VCSaddon.list(self)
-        print 'fillareastyles = ', self.fillareastyles
-        print 'fillareaindices = ', self.fillareaindices
-        print 'fillareacolors = ', self.fillareacolors
-        print 'line = ', self.line
-        print 'linewidth = ', self.linewidth
-        print 'linecolors = ', self.linecolors
-        print 'bins = ', self.bins
+        print '---------- Histogram (Ghg) member (attribute) listings ----------'  # pragma: no cover
+        print 'Canvas Mode = ', self.x.mode  # pragma: no cover
+        VCSaddon.list(self)  # pragma: no cover
+        print 'fillareastyles = ', self.fillareastyles  # pragma: no cover
+        print 'fillareaindices = ', self.fillareaindices  # pragma: no cover
+        print 'fillareacolors = ', self.fillareacolors  # pragma: no cover
+        print 'line = ', self.line  # pragma: no cover
+        print 'linewidth = ', self.linewidth  # pragma: no cover
+        print 'linecolors = ', self.linecolors  # pragma: no cover
+        print 'bins = ', self.bins  # pragma: no cover
 
     def plot(self, data, template=None, bg=0, x=None, **kwargs):
         if x is None:
@@ -49,8 +52,8 @@ class Ghg(VCSaddon):
             template = self.template
         elif isinstance(template, str):
             template = x.gettemplate(template)
-        elif not vcs.istemplate(template):
-            raise ValueError("Error did not know what to do with template: %s" % template)
+        elif not vcs.istemplate(template):  # pragma: no cover
+            raise ValueError("Error did not know what to do with template: %s" % template)  # pragma: no cover
         try:
             data_name = data.title
         except AttributeError:
@@ -198,9 +201,9 @@ class Ghg(VCSaddon):
                         break
                     else:
                         # Shouldn't ever get here since level 0 is 0
-                        assert False
+                        assert False  # pragma: no cover
             else:
-                assert False
+                assert False  # pragma: no cover
             styles.append(self.fillareastyles[lev_ind])
             cols.append(self.fillareacolors[lev_ind])
             indices.append(self.fillareaindices[lev_ind])
@@ -235,11 +238,21 @@ class Ghg(VCSaddon):
         for d in dsp:
             if d is not None:
                 displays.append(d)
-
-        dsp = template.drawColorBar(self.fillareacolors, levels, legend={0: "No Variance", .1:"", .2: "", .3:"", .4:"", .5:"", .6:"", .7:"", .8:"", .9:"", 1: "High Variance"}, x=x)
-        for d in dsp:
-            if d is not None:
-                displays.append(d)
+        legend_labels = {0: "No Variance",
+                         .1: "",
+                         .2: "",
+                         .3: "",
+                         .4: "",
+                         .5: "",
+                         .6: "",
+                         .7: "",
+                         .8: "",
+                         .9: "",
+                         1: "High Variance"}
+        template.drawColorBar(self.fillareacolors, levels,
+                              legend=legend_labels, x=x,
+                              style=self.fillareastyles,
+                              index=self.fillareaindices)
 
         displays.append(x.plot(line, bg=bg))
 
diff --git a/Packages/vcsaddons/Lib/polar.py b/Packages/vcsaddons/Lib/polar.py
new file mode 100644
index 000000000..27fb73882
--- /dev/null
+++ b/Packages/vcsaddons/Lib/polar.py
@@ -0,0 +1,395 @@
+import vcs
+import numpy
+import vcsaddons
+
+def circle_points(center, radius, points=75, ratio=1):
+    """
+    Generates the coordinates of a circle in x list and y list.
+    """
+    x = []
+    y = []
+    if ratio > 1:
+        ymul = ratio
+        xmul = 1
+    else:
+        xmul = ratio
+        ymul = 1
+    for i in range(points):
+        x.append(center[0] + xmul * radius * numpy.cos(float(i) / points * numpy.pi * 2))
+        y.append(center[1] + ymul * radius * numpy.sin(float(i) / points * numpy.pi * 2))
+    x.append(x[0])
+    y.append(y[0])
+    return x, y
+
+
+def text_orientation_for_angle(theta, source="default"):
+    """
+    Generates a text orientation that will align text to look good depending on quadrant.
+    """
+    # Normalize to [0, 2*pi)
+    while 0 > theta:
+        theta += 2 * numpy.pi
+    while 2 * numpy.pi <= theta:
+        theta -= 2 * numpy.pi
+
+    if 0 < theta < numpy.pi:
+        valign = "bottom"
+    elif 0 == theta or numpy.pi == theta:
+        valign = "half"
+    else:
+        valign = "top"
+
+    if numpy.pi / 2 > theta or numpy.pi * 3 / 2 < theta:
+        halign = "left"
+    elif numpy.allclose(numpy.pi / 2, theta) or numpy.allclose(numpy.pi * 3 / 2, theta):
+        halign = "center"
+    else:
+        halign = "right"
+
+    # Build new text table
+    to = vcs.createtextorientation(source=source)
+    to.valign = valign
+    to.halign = halign
+    return to
+
+
+def convert_arrays(var, theta):
+    """
+    Normalizes valid input options to two lists of lists of values and a list of names.
+
+    Handles:
+    list/tuple of list/tuples/arrays
+    (X,N,2) array
+    (N,2) array
+    list/tuple, list/tuple
+    """
+    magnitudes = []
+    thetas = []
+    names = []
+    if theta is None:
+        # var must be list/tuple of arrays or an array
+        if isinstance(var, (list, tuple)):
+            for arr in var:
+                if isinstance(arr, numpy.ndarray):
+                    if len(arr.shape) == 2 and arr.shape[1] == 2:
+                        magnitudes.append(arr[..., 0].tolist())
+                        thetas.append(arr[..., 1].tolist())
+                        try:
+                            names.append(arr.id)
+                        except AttributeError:
+                            names.append(None)
+                    else:
+                        raise ValueError("Array is wrong shape; expected 2d array of 2-long elements, got %dd array of %d-long elements." % (len(arr.shape), arr.shape[-1]))
+                else:
+                    if len(arr) == 2:
+                        # Might be just a pair
+                        if not isinstance(arr[0], (list, tuple)):
+                            magnitudes.append([arr[0]])
+                            thetas.append([arr[1]])
+                            names.append(None)
+                            continue
+                    mag_group = []
+                    theta_group = []
+                    for val in arr:
+                        if len(val) != 2:
+                            raise ValueError("List is wrong shape; expected list/tuple of 2 element list/tuples, got %s of %d elements." % (type(val).__name__, len(val)))
+                        mag_group.append(val[0])
+                        theta_group.append(val[1])
+                        names.append(None)
+                    magnitudes.append(mag_group)
+                    thetas.append(theta_group)
+        else:
+            if len(var.shape) == 3:
+                for i in range(var.shape[0]):
+                    magnitudes.append(var[i, ..., 0].tolist())
+                    thetas.append(var[i, ..., 1].tolist())
+                    try:
+                        names.append(var[i].id)
+                    except AttributeError:
+                        names.append(None)
+            else:
+                magnitudes = [var[..., 0].tolist()]
+                thetas = [var[..., 1].tolist()]
+                try:
+                    names.append(var.id)
+                except AttributeError:
+                    names.append(None)
+    else:
+        magnitudes = []
+        if isinstance(var, (list, tuple)):
+            if isinstance(var[0], (list, tuple, numpy.ndarray)):
+                magnitudes = [list(v) for v in var]
+            else:
+                magnitudes = [var]
+        elif isinstance(var, numpy.ndarray):
+            if len(var.shape) == 1:
+                magnitudes = [list(var)]
+            elif len(var.shape) == 2:
+                magnitudes = [list(var[i]) for i in range(var.shape[0])]
+            else:
+                raise ValueError("Array is wrong shape; expected 1d array or 2d array, got %dd array." % len(var.shape))
+
+        thetas = []
+        if isinstance(theta, (list, tuple)):
+            if isinstance(theta[0], (list, tuple, numpy.ndarray)):
+                thetas = [list(v) for v in theta]
+            else:
+                thetas = [theta]
+        elif isinstance(theta, numpy.ndarray):
+            if len(theta.shape) == 1:
+                thetas = [list(theta)]
+            elif len(theta.shape) == 2:
+                thetas = [list(theta[i]) for i in range(theta.shape[0])]
+            else:
+                raise ValueError("Array is wrong shape; expected 1d array or 2d array, got %dd array." % len(var.shape))
+        names = [None] * len(var)
+    return magnitudes, thetas, names
+
+
+class Gpo(vcsaddons.core.VCSaddon):
+    def __init__(self, name=None, source="default", x=None, template=None):
+        self.g_name = "Gpo"
+        self.g_type = "polar_oned"
+        super(Gpo, self).__init__(name, source, x, template)
+        if source == "default":
+            self.markersizes = [3]
+            self.markercolors = ["black"]
+            self.markers = ["dot"]
+            self.clockwise = False
+            self.theta_offset = 0
+            self.magnitude_ticks = "*"
+            self.magnitude_tick_angle = 0
+            self.theta_tick_count = 6
+            self.group_names = []
+            # Nice default labels
+            self.xticlabels1 = {
+                0: "0 (2pi)",
+                numpy.pi / 4: "pi/4",
+                numpy.pi / 2: "pi/2",
+                numpy.pi * 3 / 4.: "3pi/4",
+                numpy.pi: "pi",
+                numpy.pi * 5 / 4.: "5pi/4",
+                numpy.pi * 3 / 2.: "3pi/2",
+                numpy.pi * 7 / 4.: "7pi/4",
+            }
+        else:
+            if isinstance(source, (str, unicode)):
+                gm = vcsaddons.gms[self.g_type][source]
+            else:
+                gm = source
+            self.markersizes = gm.markersizes
+            self.markercolors = gm.markercolors
+            self.markers = gm.markers
+            self.clockwise = gm.clockwise
+            self.theta_offset = gm.theta_offset
+            self.magnitude_ticks = gm.magnitude_ticks
+            self.magnitude_tick_angle = gm.magnitude_tick_angle
+            self.theta_tick_count = gm.theta_tick_count
+            self.group_names = gm.group_names
+
+    def theta_from_value(self, value):
+        if numpy.allclose((self.datawc_x1, self.datawc_x2), 1e20):
+            # No scale specified, just use the value as theta
+            return value
+
+        minval = self.datawc_x1
+        maxval = self.datawc_x2
+
+        pct_val = (value - minval) / float(maxval - minval)
+        rad_val = numpy.pi * 2 * pct_val
+        if self.clockwise:
+            # Reflect the value
+            rad_val *= -1
+        # Adjust by theta_offset
+        rad_val += self.theta_offset
+        return rad_val
+
+    def plot(self, var, theta=None, template=None, bg=0, x=None):
+        """
+        Plots a polar plot of your data.
+
+        If var is an ndarray with the second dimension being 2, it will use the first value
+        as magnitude and the second as theta.
+
+        Otherwise, if theta is provided, it uses var as magnitude and the theta given.
+        """
+        if x is None:
+            x = self.x
+        if template is None:
+            template = self.template
+
+        magnitudes, thetas, names = convert_arrays(var, theta)
+
+        if self.group_names:
+            names = self.group_names
+            while len(names) < len(magnitudes):
+                names.append(None)
+
+        flat_magnitude = []
+        for i in magnitudes:
+            flat_magnitude.extend(i)
+        flat_theta = []
+        for i in thetas:
+            flat_theta.extend(i)
+
+        canvas = x
+
+        # Determine aspect ratio for plotting the circle
+        canvas_info = canvas.canvasinfo()
+        # Calculate aspect ratio of window
+        window_aspect = canvas_info["width"] / float(canvas_info["height"])
+        if window_aspect > 1:
+            ymul = window_aspect
+            xmul = 1
+        else:
+            ymul = 1
+            xmul = window_aspect
+        # Use window_aspect to adjust size of template.data
+        x0, x1 = template.data.x1, template.data.x2
+        y0, y1 = template.data.y1, template.data.y2
+
+        xdiff = abs(x1 - x0)
+        ydiff = abs(y1 - y0)
+
+        center = x0 + xdiff / 2., y0 + ydiff / 2.
+        diameter = min(xdiff, ydiff)
+        radius = diameter / 2.
+
+        # Outer line
+        if template.box1.priority > 0:
+            outer = vcs.createline(source=template.box1.line)
+            x, y = circle_points(center, radius, ratio=window_aspect)
+            outer.x = x
+            outer.y = y
+            canvas.plot(outer, render=False, bg=bg)
+
+        if numpy.allclose((self.datawc_y1, self.datawc_y2), 1e20):
+            if self.magnitude_ticks == "*":
+                m_scale = vcs.mkscale(*vcs.minmax(flat_magnitude))
+            else:
+                if isinstance(self.magnitude_ticks, (str, unicode)):
+                    ticks = vcs.elements["list"][self.magnitude_ticks]
+                else:
+                    ticks = self.magnitude_ticks
+                m_scale = ticks
+        else:
+            m_scale = vcs.mkscale(self.datawc_y1, self.datawc_y2)
+
+        if template.ytic1.priority > 0:
+            m_ticks = vcs.createline(source=template.ytic1.line)
+            m_ticks.x = []
+            m_ticks.y = []
+
+            if template.ylabel1.priority > 0:
+                to = text_orientation_for_angle(self.magnitude_tick_angle, source=template.ylabel1.textorientation)
+                m_labels = vcs.createtext(Tt_source=template.ylabel1.texttable, To_source=to)
+                m_labels.x = []
+                m_labels.y = []
+                m_labels.string = []
+                if self.yticlabels1 == "*":
+                    mag_labels = vcs.mklabels(m_scale)
+                else:
+                    mag_labels = self.yticlabels1
+            else:
+                m_labels = None
+
+            for lev in m_scale:
+                lev_radius = radius * float(lev) / m_scale[-1]
+                x, y = circle_points(center, lev_radius, ratio=window_aspect)
+                if m_labels is not None:
+                    if lev in mag_labels:
+                        m_labels.string.append(mag_labels[lev])
+                        m_labels.x.append(xmul * lev_radius * numpy.cos(self.magnitude_tick_angle) + center[0])
+                        m_labels.y.append(ymul * lev_radius * numpy.sin(self.magnitude_tick_angle) + center[1])
+                m_ticks.x.append(x)
+                m_ticks.y.append(y)
+
+            canvas.plot(m_ticks, render=False, bg=bg)
+            if m_labels is not None:
+                canvas.plot(m_labels, render=False, bg=bg)
+
+        if template.xtic1.priority > 0:
+            t_ticks = vcs.createline(source=template.xtic1.line)
+            t_ticks.x = []
+            t_ticks.y = []
+
+            if self.xticlabels1 == "*":
+                if numpy.allclose((self.datawc_x1, self.datawc_x2), 1e20):
+                    tick_thetas = list(numpy.arange(0, numpy.pi * 2, numpy.pi / 4))
+                    tick_labels = {t: str(t) for t in tick_thetas}
+                else:
+                    d_theta = (self.datawc_x2 - self.datawc_x1) / float(self.theta_tick_count)
+                    tick_thetas = numpy.arange(self.datawc_x1, self.datawc_x2 + .0001, d_theta)
+                    tick_labels = vcs.mklabels(tick_thetas)
+            else:
+                tick_thetas = self.xticlabels1.keys()
+                tick_labels = self.xticlabels1
+
+            if template.xlabel1.priority > 0:
+                t_labels = []
+                if self.xticlabels1 == "*":
+                    theta_labels = vcs.mklabels(tick_thetas)
+                else:
+                    theta_labels = self.xticlabels1
+            else:
+                t_labels = None
+
+            for t in tick_thetas:
+                angle = self.theta_from_value(t)
+                x0 = center[0] + (xmul * radius * numpy.cos(angle))
+                x1 = center[0]
+                y0 = center[1] + (ymul * radius * numpy.sin(angle))
+                y1 = center[1]
+                if t_labels is not None:
+                    label = vcs.createtext(Tt_source=template.xlabel1.texttable,
+                                           To_source=text_orientation_for_angle(angle, source=template.xlabel1.textorientation))
+                    label.string = [theta_labels[t]]
+                    label.x = [x0]
+                    label.y = [y0]
+                    t_labels.append(label)
+                t_ticks.x.append([x0, x1])
+                t_ticks.y.append([y0, y1])
+            canvas.plot(t_ticks, render=False, bg=bg)
+            if t_labels is not None:
+                for l in t_labels:
+                    canvas.plot(l, render=False, bg=bg)
+
+        values = vcs.createmarker()
+        values.type = self.markers
+        values.size = self.markersizes
+        values.color = self.markercolors
+        values.x = []
+        values.y = []
+
+        if template.legend.priority > 0:
+            # Only labels that are set will show up in the legend
+            label_count = len(names) - len([i for i in names if i is None])
+            labels = vcs.createtext(Tt_source=template.legend.texttable, To_source=template.legend.textorientation)
+            labels.x = []
+            labels.y = []
+            labels.string = []
+
+        for mag, theta, name in zip(magnitudes, thetas, names):
+            x = []
+            y = []
+            for m, t in zip(mag, theta):
+                t = self.theta_from_value(t)
+                r = (m - m_scale[0]) / float(m_scale[-1] - m_scale[0]) * radius
+                x.append(xmul * numpy.cos(t) * r + center[0])
+                y.append(ymul * numpy.sin(t) * r + center[1])
+
+            if template.legend.priority > 0 and name is not None:
+                lx, ly = template.legend.x1, template.legend.y1 + len(labels.x) / float(label_count) * (template.legend.y2 - template.legend.y1)
+                x.append(lx)
+                y.append(ly)
+                labels.x.append(lx + .01)
+                labels.y.append(ly)
+                labels.string.append(name)
+            values.x.append(x)
+            values.y.append(y)
+
+        if template.legend.priority > 0:
+            canvas.plot(labels, bg=bg, render=False)
+        canvas.plot(values, bg=bg)
+
+        return canvas
diff --git a/testing/vcsaddons/CMakeLists.txt b/testing/vcsaddons/CMakeLists.txt
index 64b8d1755..06ebff600 100644
--- a/testing/vcsaddons/CMakeLists.txt
+++ b/testing/vcsaddons/CMakeLists.txt
@@ -35,6 +35,30 @@ cdat_add_test(vcs_addons_test_EzTemplate_12_plots_spacing
   ${cdat_SOURCE_DIR}/testing/vcsaddons/test_EzTemplate_12_plots_spacing.py
   ${BASELINE_DIR}/test_EzTemplate_12_plots_spacing.png
 )
+cdat_add_test(vcs_addons_test_histogram_defaults
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcsaddons/vcs_addons_test_histogram_defaults.py
+  ${BASELINE_DIR}/vcs_addons_test_histogram_defaults.png
+)
+cdat_add_test(vcs_addons_test_histogram_inherit
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcsaddons/vcs_addons_test_histogram_inherit.py
+  ${BASELINE_DIR}/vcs_addons_test_histogram_inherit.png
+)
+cdat_add_test(vcs_addons_test_polar
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcsaddons/vcs_addons_test_polar.py
+  ${BASELINE_DIR}/vcs_addons_test_polar.png
+)
+cdat_add_test(vcs_addons_test_polar_inherit
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcsaddons/vcs_addons_test_polar_inherit.py
+  ${BASELINE_DIR}/vcs_addons_test_polar_inherit.png
+)
+cdat_add_test(vcs_addons_test_convert_arrays
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcsaddons/vcs_addons_test_convert_arrays.py
+)
 
 if (CDAT_DOWNLOAD_SAMPLE_DATA)
   cdat_add_test(vcs_addons_EzTemplate_2x2
diff --git a/testing/vcsaddons/vcs_addons_test_convert_arrays.py b/testing/vcsaddons/vcs_addons_test_convert_arrays.py
new file mode 100644
index 000000000..c39bea513
--- /dev/null
+++ b/testing/vcsaddons/vcs_addons_test_convert_arrays.py
@@ -0,0 +1,69 @@
+import vcsaddons
+import numpy
+
+magnitudes = [1, 2, 3, 4]
+thetas = [5, 6, 7, 8]
+zipped_input = zip(magnitudes, thetas)
+grouped_zipped = [zipped_input[:2], zipped_input[2:]]
+
+one_array = numpy.array(zip(magnitudes, thetas))
+three_d_array = numpy.array(grouped_zipped)
+two_arrays = numpy.array(magnitudes), numpy.array(thetas)
+two_array_groups = numpy.array([magnitudes[:2], magnitudes[2:]]), numpy.array([thetas[:2], thetas[2:]])
+list_and_array = two_arrays[0], thetas
+two_lists = magnitudes, thetas
+lists_of_arrays = [two_arrays[0]], [two_arrays[1]]
+array_and_list = magnitudes, two_arrays[1]
+one_list_tuples = zip(magnitudes, thetas)
+one_list_grouped_tuples = [zip(magnitudes[:2], thetas[:2]), zip(magnitudes[2:], thetas[2:])]
+one_list_of_arrays = [numpy.array(zip(magnitudes[:2], thetas[:2])), numpy.array(zip(magnitudes[2:], thetas[2:]))]
+
+def compare(input, expected):
+    result = vcsaddons.polar.convert_arrays(*input)
+    print "Checking", result[0:2], "vs", expected
+    assert result[0] == expected[0]
+    assert result[1] == expected[1]
+
+grouped = ([magnitudes[:2], magnitudes[2:]],[thetas[:2], thetas[2:]])
+
+compare((one_array, None), ([magnitudes],[thetas]))
+compare(two_arrays, ([magnitudes],[thetas]))
+compare(two_array_groups, grouped)
+three_d_expected = ([[1, 2], [3, 4]], [[5, 6], [7, 8]])
+compare((three_d_array, None), three_d_expected)
+compare(list_and_array, ([magnitudes],[thetas]))
+compare(two_lists, ([magnitudes],[thetas]))
+compare(lists_of_arrays, ([magnitudes],[thetas]))
+compare(array_and_list, ([magnitudes],[thetas]))
+compare((one_list_tuples, None), ([[i] for i in magnitudes], [[i] for i in thetas]))
+compare((one_list_grouped_tuples, None), grouped)
+compare((one_list_of_arrays, None), grouped)
+
+
+def test_error(input, error):
+    try:
+        vcsaddons.polar.convert_arrays(*input)
+    except:
+        print "Got", error
+    else:
+        assert False, "Should have raised a %s" % error
+
+# Test error conditions
+
+# Single arg:
+
+# List of 3d arrays
+test_error(([numpy.array([[[1, 2]]])], None), "ValueError for list of 3d arrays")
+# >2 element arrays
+test_error(([numpy.array([[1, 2, 3]])], None), "ValueError for list of 3-element arrays")
+# <2 element arrays
+test_error(([numpy.array([[1]])], None), "ValueError for list of 1-element arrays")
+# Wrong-sized lists
+test_error(([[(1, 2, 3)]], None), "ValueError for wrong sized lists.")
+
+
+# Two args:
+
+# Too many dimensions
+test_error((numpy.array([[[1, 2]]]), numpy.array([[1, 2]])), "ValueError for too many dimensions for magnitude.")
+test_error((numpy.array([[1, 2]]), numpy.array([[[1, 2]]])), "ValueError for too many dimensions for magnitude.")
diff --git a/testing/vcsaddons/vcs_addons_test_histogram_defaults.py b/testing/vcsaddons/vcs_addons_test_histogram_defaults.py
new file mode 100644
index 000000000..b2b19e499
--- /dev/null
+++ b/testing/vcsaddons/vcs_addons_test_histogram_defaults.py
@@ -0,0 +1,22 @@
+import sys,os
+src = sys.argv[1]
+pth = os.path.join(os.path.dirname(__file__),"..")
+sys.path.append(pth)
+import checkimage
+import vcs
+import vcsaddons, numpy
+
+x=vcs.init()
+x.setantialiasing(0)
+x.drawlogooff()
+x.setbgoutputdimensions(1200,1091,units="pixels")
+
+numpy.random.seed(seed=12345)
+vals = numpy.random.random_sample(2000) * 100
+histo = vcsaddons.histograms.Ghg()
+histo.plot(vals, bg=True, x=x)
+
+fnm = "vcs_addons_test_histogram_defaults.png"
+x.png(fnm)
+ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold)
+sys.exit(ret)
diff --git a/testing/vcsaddons/vcs_addons_test_histogram_inherit.py b/testing/vcsaddons/vcs_addons_test_histogram_inherit.py
new file mode 100644
index 000000000..8ce19e0c2
--- /dev/null
+++ b/testing/vcsaddons/vcs_addons_test_histogram_inherit.py
@@ -0,0 +1,62 @@
+import sys,os
+src = sys.argv[1]
+pth = os.path.join(os.path.dirname(__file__),"..")
+sys.path.append(pth)
+import checkimage
+import vcs, cdms2
+import vcsaddons, numpy
+
+x=vcs.init()
+x.setantialiasing(0)
+x.drawlogooff()
+x.setbgoutputdimensions(1200,1091,units="pixels")
+cdmsfile = cdms2.open(vcs.sample_data + "/clt.nc")
+clt = cdmsfile("clt")
+
+levels = [10, 20, 30, 40, 60, 70, 80, 90, 100]
+histo = vcsaddons.histograms.Ghg()
+histo.bins = levels
+histo.line = ["solid", "dash", "dash-dot"]
+histo.linewidth = [1, 2, 3]
+histo.linecolors = ["red", "green", "blue"]
+histo.fillareastyles = ["solid", "hatch", "pattern", "solid"]
+histo.fillareaindices = [1, 2, 3, 4]
+histo.fillareacolors = ["blue", "green", "red", "orange"]
+
+histo2 = vcsaddons.createhistogram(source=histo)
+
+print "Checking all inherited attributes..."
+assert histo2.bins == histo.bins
+assert histo2.line == histo.line
+assert histo2.linewidth == histo.linewidth
+assert histo2.linecolors == histo.linecolors
+assert histo2.fillareastyles == histo.fillareastyles
+assert histo2.fillareacolors == histo.fillareacolors
+assert histo2.fillareaindices == histo.fillareaindices
+print "Inherited all values."
+
+histo2.levels = [10, 20, 10, 100, 110, 50, 20]
+histo3 = vcsaddons.createhistogram(source=histo2.name, x=x)
+
+print "Checking name-based inheritance"
+assert histo3.bins == histo2.bins
+assert histo3.line == histo2.line
+assert histo3.linewidth == histo2.linewidth
+assert histo3.linecolors == histo2.linecolors
+assert histo3.fillareastyles == histo2.fillareastyles
+assert histo3.fillareacolors == histo2.fillareacolors
+assert histo3.fillareaindices == histo2.fillareaindices
+print "Inherited all values."
+
+histo3.datawc_y1 = -1
+histo3.datawc_y2 = 200000
+histo3.datawc_x1 = 0
+histo3.datawc_x2 = 100
+
+histo3.bins = None
+histo3.plot(clt, template="default", bg=True)
+
+fnm = "vcs_addons_test_histogram_inherit.png"
+x.png(fnm)
+ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold)
+sys.exit(ret)
diff --git a/testing/vcsaddons/vcs_addons_test_polar.py b/testing/vcsaddons/vcs_addons_test_polar.py
new file mode 100644
index 000000000..8a848e7a1
--- /dev/null
+++ b/testing/vcsaddons/vcs_addons_test_polar.py
@@ -0,0 +1,28 @@
+import sys,os
+src = sys.argv[1]
+pth = os.path.join(os.path.dirname(__file__),"..")
+sys.path.append(pth)
+import checkimage
+import vcs
+import vcsaddons, numpy
+
+x=vcs.init()
+x.setantialiasing(0)
+x.drawlogooff()
+x.setbgoutputdimensions(1200,1091,units="pixels")
+
+polar = vcsaddons.polar.Gpo()
+polar.markers = ["dot", "circle"]
+polar.markersizes = [3, 5]
+
+polar.magnitude_tick_angle = numpy.pi / 6
+
+theta = list(numpy.arange(0, 4 * numpy.pi + .01, numpy.pi / 24))
+magnitude = list(numpy.sin(theta))
+
+polar.plot(magnitude, theta, bg=True, x=x)
+
+fnm = "vcs_addons_test_polar.png"
+x.png(fnm)
+ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold)
+sys.exit(ret)
diff --git a/testing/vcsaddons/vcs_addons_test_polar_inherit.py b/testing/vcsaddons/vcs_addons_test_polar_inherit.py
new file mode 100644
index 000000000..4eb946359
--- /dev/null
+++ b/testing/vcsaddons/vcs_addons_test_polar_inherit.py
@@ -0,0 +1,50 @@
+import sys,os
+src = sys.argv[1]
+pth = os.path.join(os.path.dirname(__file__),"..")
+sys.path.append(pth)
+import checkimage
+import vcs
+import vcsaddons, numpy
+
+x=vcs.init()
+x.setantialiasing(0)
+x.drawlogooff()
+x.setbgoutputdimensions(1200,1091,units="pixels")
+
+gm = vcsaddons.polar.Gpo()
+gm.markers = ["dot", "circle"]
+gm.markersizes = [3, 5]
+gm.markercolors = ["red", "blue"]
+gm.clockwise = True
+gm.theta_offset = numpy.pi / 4
+gm.magnitude_ticks = [.2 * i for i in range(6)]
+gm.magnitude_tick_angle = numpy.pi / 10
+gm.theta_tick_count = 10
+gm.group_names = ["First", "Second"]
+
+polar = vcsaddons.polar.Gpo(source=gm)
+
+assert polar.markersizes == gm.markersizes
+assert polar.markercolors == gm.markercolors
+assert polar.markers == gm.markers
+assert polar.clockwise == gm.clockwise
+assert polar.theta_offset == gm.theta_offset
+assert polar.magnitude_ticks == gm.magnitude_ticks
+assert polar.magnitude_tick_angle == gm.magnitude_tick_angle
+assert polar.theta_tick_count == gm.theta_tick_count
+assert polar.group_names == gm.group_names
+
+polar.magnitude_tick_angle = numpy.pi / 6
+
+theta = list(numpy.arange(0, 4 * numpy.pi + .01, numpy.pi / 24))
+magnitude = list(numpy.sin(theta))
+
+theta = [theta[:len(theta) / 2], theta[len(theta) / 2:]]
+magnitude = [magnitude[:len(magnitude)/ 2], magnitude[len(magnitude) / 2:]]
+
+polar.plot(magnitude, theta, bg=True, x=x)
+
+fnm = "vcs_addons_test_polar_inherit.png"
+x.png(fnm)
+ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold)
+sys.exit(ret)
-- 
GitLab


From 2dbbdec142265dc8199f3d990201ad660c551392 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Tue, 17 May 2016 16:34:12 -0400
Subject: [PATCH 064/191] Fixed vtk ui tests

---
 testing/vcs/vtk_ui/vtk_ui_test.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing/vcs/vtk_ui/vtk_ui_test.py b/testing/vcs/vtk_ui/vtk_ui_test.py
index 40bbeaef1..d5cbe18bf 100644
--- a/testing/vcs/vtk_ui/vtk_ui_test.py
+++ b/testing/vcs/vtk_ui/vtk_ui_test.py
@@ -1,4 +1,4 @@
-import, os, sys, time, vcs.vtk_ui, vtk
+import os, sys, time, vtk, vcs.vtk_ui
 
 
 def init():
@@ -102,7 +102,7 @@ class vtk_ui_test(object):
         generate_png(self.win, self.test_file)
         pth = os.path.join(os.path.dirname(__file__), "../..")
         sys.path.append(pth)
-        import regression
+        import testing.regression as regression
         return regression.check_result_image(self.test_file, compare_against)
 
     def test(self):
-- 
GitLab


From 29d182bd5442ea6b71f95f9856d6ec9a9983a6ac Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Wed, 18 May 2016 07:31:37 -0400
Subject: [PATCH 065/191] Updated test name to match the naming convention

---
 testing/vcs/test_vcs_boxfill_lev1_lev2.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/vcs/test_vcs_boxfill_lev1_lev2.py b/testing/vcs/test_vcs_boxfill_lev1_lev2.py
index c5b5cbcbe..6c1d985d7 100644
--- a/testing/vcs/test_vcs_boxfill_lev1_lev2.py
+++ b/testing/vcs/test_vcs_boxfill_lev1_lev2.py
@@ -7,4 +7,4 @@ b = x.createboxfill()
 b.level_1 = .5
 b.level_2 = 14.5
 x.plot(s, b, bg=1)
-regression.run(x, "test_boxfill_lev1_lev2.png")
+regression.run(x, "test_vcs_boxfill_lev1_lev2.png")
-- 
GitLab


From 88df13b95b1a5000db8d5e58c9c3152865dc5baa Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Wed, 18 May 2016 09:57:38 -0400
Subject: [PATCH 066/191] Updated dv3d package to use regression module

---
 testing/dv3d/TestManager.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/testing/dv3d/TestManager.py b/testing/dv3d/TestManager.py
index 51ed57183..94e7e365e 100644
--- a/testing/dv3d/TestManager.py
+++ b/testing/dv3d/TestManager.py
@@ -10,7 +10,7 @@ import vcs, os, sys, shutil, collections, subprocess
 TestingDir=os.path.dirname(__file__)
 pth = os.path.join(TestingDir,"..")
 sys.path.append(pth)
-import checkimage
+import testing.regression as regression
 
 DefaultSampleFile = "geos5-sample.nc"
 DefaultSampleVar = "uwnd"
@@ -128,8 +128,8 @@ class vcsTest:
         test_image = '.'.join( [ self.name, 'test', 'png' ] )
         self.canvas.png( test_image, width = 900, height = 600 )
 
-        ret = checkimage.check_result_image( test_image, self.image_name,\
-                checkimage.defaultThreshold+3. )
+        ret = regression.check_result_image( test_image, self.image_name,\
+                regression.defaultThreshold+3. )
 
         if  interactive:
             print "Type <Enter> to continue and update ref image ( type 'n' to skip update )."
-- 
GitLab


From 9e86fb3b9be60ea6e08558034a56c2a22bc2c9db Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Wed, 18 May 2016 09:59:10 -0400
Subject: [PATCH 067/191] Fixed flake8 test

---
 Packages/vcs/vcs/Canvas.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Packages/vcs/vcs/Canvas.py b/Packages/vcs/vcs/Canvas.py
index 49fdbf978..0e9d23426 100644
--- a/Packages/vcs/vcs/Canvas.py
+++ b/Packages/vcs/vcs/Canvas.py
@@ -76,6 +76,7 @@ from projection import round_projections  # noqa
 # Python < 3 DeprecationWarning ignored by default
 warnings.simplefilter('default')
 
+
 class SIGNAL(object):
 
     def __init__(self, name=None):
-- 
GitLab


From dc508774b3b0d886a7908213c73f8ac21b64a55d Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Wed, 18 May 2016 10:01:36 -0400
Subject: [PATCH 068/191] Updated esmf test to use regression module

---
 .../regrid/testEsmfRegridPeriodictyRegional.py  | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/testing/regrid/testEsmfRegridPeriodictyRegional.py b/testing/regrid/testEsmfRegridPeriodictyRegional.py
index 2b9279525..53a1a706b 100644
--- a/testing/regrid/testEsmfRegridPeriodictyRegional.py
+++ b/testing/regrid/testEsmfRegridPeriodictyRegional.py
@@ -1,9 +1,4 @@
-import vcs,cdms2
-import os,sys
-import EzTemplate
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import os, sys, vcs, cdms2, EzTemplate, testing.regression as regression
 
 data = sys.argv[1]
 png = sys.argv[2]
@@ -38,11 +33,7 @@ s_esmf_lin.id = "ESMF Linear"
 s_esmf_con = s.regrid(grid_dest,regridTool="esmf",regridMethod="conservative")
 s_esmf_lin.id = "ESMF Conservative"
 
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
-
+x=regression.init()
 t=x.createtemplate()
 t.blank()
 t.data.priority=1
@@ -60,7 +51,5 @@ x.plot(s,M.get(),gm,bg=1)
 x.plot(s_regrid2,M.get(),gm,bg=1)
 x.plot(s_esmf_lin,M.get(),gm,bg=1)
 x.plot(s_esmf_con,M.get(),gm,bg=1)
-x.png("esmf_issue_1125")
 
-ret = checkimage.check_result_image("esmf_issue_1125.png",png,checkimage.defaultThreshold)
-sys.exit(ret)
+ret = regression.run(x, "esmf_issue_1125.png", png)
-- 
GitLab


From 395c7459b2a3915c0c7a6eb4f37561ad9af972b8 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Wed, 18 May 2016 10:10:53 -0400
Subject: [PATCH 069/191] Updated diagnostics tests to use regression module

---
 testing/metrics/diags_test.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/testing/metrics/diags_test.py b/testing/metrics/diags_test.py
index ff71c8d66..2d4131cb8 100755
--- a/testing/metrics/diags_test.py
+++ b/testing/metrics/diags_test.py
@@ -12,7 +12,7 @@ import sys, os, shutil, tempfile, subprocess
 import cdms2, numpy
 pth = os.path.join(os.path.dirname(__file__),"..")
 sys.path.append(pth)
-import checkimage
+import testing.regression as regression
 import argparse, pdb
 
 class DiagTest(object):
@@ -95,7 +95,7 @@ class DiagTest(object):
     def execute(self, test_str, imagefilename, imagethreshold, ncfiles, rtol, atol):
         print test_str
         if imagethreshold is None:  # user didn't specify a value
-     	    imagethreshold = checkimage.defaultThreshold
+	    imagethreshold = regression.defaultThreshold
         # Silence annoying messages about how to set the NetCDF file type.  Anything will do.
         cdms2.setNetcdfShuffleFlag(0)
         cdms2.setNetcdfDeflateFlag(0)
@@ -118,7 +118,7 @@ class DiagTest(object):
             imagebaselinefname = os.path.join( self.baselinepath, imagefilename )
             #pdb.set_trace()
             print "OK THRESHOLD IS:",imagethreshold
-            graphics_result = checkimage.check_result_image( imagefname, imagebaselinefname, imagethreshold )
+            graphics_result = regression.check_result_image( imagefname, imagebaselinefname, imagethreshold )
             print "Graphics file", imagefname, "match difference:", graphics_result
             
             #initialize to successful graphics check
-- 
GitLab


From 314fc2bf70fb9c410ba7c1200a1fcaec9dfbfdd5 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Wed, 18 May 2016 11:53:42 -0400
Subject: [PATCH 070/191] Fixed numpy test

---
 testing/vcs/test_vcs_boxfill_10x10_numpy.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/vcs/test_vcs_boxfill_10x10_numpy.py b/testing/vcs/test_vcs_boxfill_10x10_numpy.py
index a45aa5889..765917942 100644
--- a/testing/vcs/test_vcs_boxfill_10x10_numpy.py
+++ b/testing/vcs/test_vcs_boxfill_10x10_numpy.py
@@ -3,5 +3,5 @@ import vcs, numpy, os, sys, testing.regression as regression
 s = numpy.sin(numpy.arange(100))
 s = numpy.reshape(s,(10,10))
 x = regression.init()
-x.plot(s)
+x.plot(s, bg=1)
 regression.run(x, "test_vcs_boxfill_10x10_numpy.png")
\ No newline at end of file
-- 
GitLab


From f19b372e0ccc187eef150f1ce7af83a56021616b Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Wed, 18 May 2016 11:59:38 -0400
Subject: [PATCH 071/191] Fixed canvas update test

---
 testing/vcs/test_vcs_boxfill_decreasing_latitude.py | 2 +-
 testing/vcs/test_vcs_canvas_background_update.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing/vcs/test_vcs_boxfill_decreasing_latitude.py b/testing/vcs/test_vcs_boxfill_decreasing_latitude.py
index 1f727e3b5..6cbc0f016 100755
--- a/testing/vcs/test_vcs_boxfill_decreasing_latitude.py
+++ b/testing/vcs/test_vcs_boxfill_decreasing_latitude.py
@@ -51,5 +51,5 @@ gm.fillareacolors = cols
 gm.datawc_y2 = 30
 gm.datawc_y1 = 90
 
-x.plot(ice, gm, tmpl, bg = 1)
+x.plot(ice, gm, tmpl, bg=1)
 regression.run(x, "test_boxfill_decreasing_latitude.png")
\ No newline at end of file
diff --git a/testing/vcs/test_vcs_canvas_background_update.py b/testing/vcs/test_vcs_canvas_background_update.py
index a28c08713..80f79d2aa 100644
--- a/testing/vcs/test_vcs_canvas_background_update.py
+++ b/testing/vcs/test_vcs_canvas_background_update.py
@@ -5,4 +5,4 @@ x.backgroundcolor = (255, 255, 255)
 x.open()
 x.backgroundcolor = (255, 255, 0)
 x.update()
-regression.run(x, "test_backgroundcolor_yellow.png")
\ No newline at end of file
+regression.check_result_image(x, "test_backgroundcolor_yellow.png")
\ No newline at end of file
-- 
GitLab


From a14200869100199487b89ea08dd37ad2b7d97731 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Wed, 18 May 2016 16:06:31 -0400
Subject: [PATCH 072/191] Using a fixed size for click test

---
 Packages/testing/regression.py     | 8 +++++---
 testing/vcs/test_vcs_click_info.py | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Packages/testing/regression.py b/Packages/testing/regression.py
index b272d592f..68ded76d9 100644
--- a/Packages/testing/regression.py
+++ b/Packages/testing/regression.py
@@ -16,14 +16,16 @@ import vcs
 
 defaultThreshold=10.0
 
-def init():
+def init(*args, **kwargs):
     testingDir = os.path.join(os.path.dirname(__file__), "..")
     sys.path.append(testingDir)
 
-    vcsinst = vcs.init()
+    vcsinst = vcs.init(*args, **kwargs)
     vcsinst.setantialiasing(0)
     vcsinst.drawlogooff()
-    vcsinst.setbgoutputdimensions(1200,1091,units="pixels")
+
+    if ('bg' in kwargs and kwargs['bg']) or ('bg' not in kwargs):
+        vcsinst.setbgoutputdimensions(1200, 1091, units="pixels")
     return vcsinst
 
 def run(vcsinst, fname, baseline=sys.argv[1], threshold=defaultThreshold):
diff --git a/testing/vcs/test_vcs_click_info.py b/testing/vcs/test_vcs_click_info.py
index c16a6c0d4..f37ee651a 100644
--- a/testing/vcs/test_vcs_click_info.py
+++ b/testing/vcs/test_vcs_click_info.py
@@ -8,7 +8,7 @@ testConfig = {'a_boxfill': ('clt.nc', 'clt', (200, 200)),
 # Tests if the info produced when clicking on a map is correct.
 src = sys.argv[1]
 plot = sys.argv[2]
-x = regression.init()
+x = regression.init(bg=False, geometry=(800, 600))
 
 # data
 f = cdms2.open(vcs.sample_data + "/" + testConfig[plot][0])
-- 
GitLab


From 9c121a20f2121a0fcca665123d50b27553f176a0 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Wed, 18 May 2016 21:19:46 -0400
Subject: [PATCH 073/191] Fixed failing test because of incorrect capture
 window size

---
 testing/vcs/test_vcs_configurator_resize.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/testing/vcs/test_vcs_configurator_resize.py b/testing/vcs/test_vcs_configurator_resize.py
index 7692e6218..bd3490afb 100644
--- a/testing/vcs/test_vcs_configurator_resize.py
+++ b/testing/vcs/test_vcs_configurator_resize.py
@@ -4,15 +4,16 @@ x = vcs.init()
 x.open()
 x.configure()
 
-x.backend.renWin.SetSize(814, 303)
-
 fnm = "test_vcs_configurator_resize.png"
 
 win = x.backend.renWin
-win.Render()
+win.SetSize(814, 303)
+
 out_filter = vtk.vtkWindowToImageFilter()
 out_filter.SetInput(win)
 
+win.Render()
+
 png_writer = vtk.vtkPNGWriter()
 png_writer.SetFileName(fnm)
 png_writer.SetInputConnection(out_filter.GetOutputPort())
-- 
GitLab


From 2c3407c4a791c301930ea1c634918f16a163d148 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Wed, 18 May 2016 21:38:46 -0400
Subject: [PATCH 074/191] Set size on render window only if it has been created

---
 Packages/vcs/vcs/VTKPlots.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/Packages/vcs/vcs/VTKPlots.py b/Packages/vcs/vcs/VTKPlots.py
index 8cfe83a28..da5810614 100644
--- a/Packages/vcs/vcs/VTKPlots.py
+++ b/Packages/vcs/vcs/VTKPlots.py
@@ -73,7 +73,7 @@ class VTKVCSBackend(object):
         # Initially set to 16x Multi-Sampled Anti-Aliasing
         self.antialiasing = 8
         self._rasterPropsInVectorFormats = False
-        self._initialGeometry = geometry
+        self._geometry = geometry
 
         if renWin is not None:
             self.renWin = renWin
@@ -383,9 +383,9 @@ class VTKVCSBackend(object):
             # turning off antialiasing by default
             # mostly so that pngs are same accross platforms
             self.renWin.SetMultiSamples(self.antialiasing)
-            if self._initialGeometry is not None:
-                width = self._initialGeometry["width"]
-                height = self._initialGeometry["height"]
+            if self._geometry is not None:
+                width = self._geometry["width"]
+                height = self._geometry["height"]
             else:
                 width = None
                 height = None
@@ -444,9 +444,9 @@ class VTKVCSBackend(object):
             if (self.bg):
                 height = self.canvas.bgY
                 width = self.canvas.bgX
-            elif (self._initialGeometry):
-                height = self._initialGeometry['height']
-                width = self._initialGeometry['width']
+            elif (self._geometry):
+                height = self._geometry['height']
+                width = self._geometry['width']
             else:
                 height = self.canvas.bgY
                 width = self.canvas.bgX
@@ -554,7 +554,9 @@ class VTKVCSBackend(object):
             return True
 
     def geometry(self, x, y, *args):
-        self.renWin.SetSize(x, y)
+        if self.renWin is not None:
+            self.renWin.SetSize(x, y)
+        self._geometry = {'width': x, 'height': y}
         self._lastSize = (x, y)
 
     def flush(self):
-- 
GitLab


From a36eba425fa8451c4628957e6af434f010736398 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Wed, 18 May 2016 21:48:57 -0400
Subject: [PATCH 075/191] Return geometry object if no argument is given

---
 Packages/vcs/vcs/Canvas.py   |  3 +++
 Packages/vcs/vcs/VTKPlots.py | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Packages/vcs/vcs/Canvas.py b/Packages/vcs/vcs/Canvas.py
index 0e9d23426..49361248c 100644
--- a/Packages/vcs/vcs/Canvas.py
+++ b/Packages/vcs/vcs/Canvas.py
@@ -4116,6 +4116,9 @@ Options:::
     a.geometry(450,337)
 
 """
+        if len(args) == 0:
+            return self.backend.geometry()
+
         if (args[0] <= 0) or (args[1] <= 0):
             raise ValueError(
                 'Error -  The width and height values must be an integer greater than 0.')
diff --git a/Packages/vcs/vcs/VTKPlots.py b/Packages/vcs/vcs/VTKPlots.py
index da5810614..7e32798d1 100644
--- a/Packages/vcs/vcs/VTKPlots.py
+++ b/Packages/vcs/vcs/VTKPlots.py
@@ -553,7 +553,15 @@ class VTKVCSBackend(object):
         else:
             return True
 
-    def geometry(self, x, y, *args):
+    def geometry(self, *args):
+        if len(args) == 0:
+            return self._geometry;
+        if len(args) < 2:
+            raise TypeError("Function takes zero or two <width, height> " \
+                            "or more than two arguments. Got " + len(*args))
+        x = args[0]
+        y = args[1]
+
         if self.renWin is not None:
             self.renWin.SetSize(x, y)
         self._geometry = {'width': x, 'height': y}
-- 
GitLab


From a5bc559a3c3e56daafe0a210071ef25a1c87005b Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Thu, 19 May 2016 13:18:50 -0700
Subject: [PATCH 076/191] Fixed some group name retrieval bugs, added colormap
 support, better secondary management

---
 Packages/vcsaddons/Lib/polar.py | 57 +++++++++++++++++++++------------
 1 file changed, 37 insertions(+), 20 deletions(-)

diff --git a/Packages/vcsaddons/Lib/polar.py b/Packages/vcsaddons/Lib/polar.py
index 27fb73882..8aff589a7 100644
--- a/Packages/vcsaddons/Lib/polar.py
+++ b/Packages/vcsaddons/Lib/polar.py
@@ -118,14 +118,29 @@ def convert_arrays(var, theta):
         magnitudes = []
         if isinstance(var, (list, tuple)):
             if isinstance(var[0], (list, tuple, numpy.ndarray)):
-                magnitudes = [list(v) for v in var]
+                for v in var:
+                    magnitudes.append(list(v))
+                    try:
+                        names.append(v.id)
+                    except AttributeError:
+                        names.append(None)
             else:
                 magnitudes = [var]
+                names.appned(None)
         elif isinstance(var, numpy.ndarray):
             if len(var.shape) == 1:
                 magnitudes = [list(var)]
+                try:
+                    names.append(var.id)
+                except AttributeError:
+                    names.append(None)
             elif len(var.shape) == 2:
-                magnitudes = [list(var[i]) for i in range(var.shape[0])]
+                for i in range(var.shape[0]):
+                    magnitudes.append(list(var[i]))
+                    try:
+                        names.append(var[i].id)
+                    except AttributeError:
+                        names.append(None)
             else:
                 raise ValueError("Array is wrong shape; expected 1d array or 2d array, got %dd array." % len(var.shape))
 
@@ -142,7 +157,8 @@ def convert_arrays(var, theta):
                 thetas = [list(theta[i]) for i in range(theta.shape[0])]
             else:
                 raise ValueError("Array is wrong shape; expected 1d array or 2d array, got %dd array." % len(var.shape))
-        names = [None] * len(var)
+        if not names:
+            names = [None] * len(var)
     return magnitudes, thetas, names
 
 
@@ -219,7 +235,6 @@ class Gpo(vcsaddons.core.VCSaddon):
             template = self.template
 
         magnitudes, thetas, names = convert_arrays(var, theta)
-
         if self.group_names:
             names = self.group_names
             while len(names) < len(magnitudes):
@@ -233,7 +248,6 @@ class Gpo(vcsaddons.core.VCSaddon):
             flat_theta.extend(i)
 
         canvas = x
-
         # Determine aspect ratio for plotting the circle
         canvas_info = canvas.canvasinfo()
         # Calculate aspect ratio of window
@@ -254,14 +268,15 @@ class Gpo(vcsaddons.core.VCSaddon):
         center = x0 + xdiff / 2., y0 + ydiff / 2.
         diameter = min(xdiff, ydiff)
         radius = diameter / 2.
-
+        plot_kwargs = {"render": False, "bg": bg, "donotstoredisplay": True}
         # Outer line
         if template.box1.priority > 0:
             outer = vcs.createline(source=template.box1.line)
             x, y = circle_points(center, radius, ratio=window_aspect)
             outer.x = x
             outer.y = y
-            canvas.plot(outer, render=False, bg=bg)
+            canvas.plot(outer, **plot_kwargs)
+            del vcs.elements["line"][outer.name]
 
         if numpy.allclose((self.datawc_y1, self.datawc_y2), 1e20):
             if self.magnitude_ticks == "*":
@@ -294,7 +309,7 @@ class Gpo(vcsaddons.core.VCSaddon):
                 m_labels = None
 
             for lev in m_scale:
-                lev_radius = radius * float(lev) / m_scale[-1]
+                lev_radius = radius * float(lev - m_scale[0]) / (m_scale[-1] - m_scale[0])
                 x, y = circle_points(center, lev_radius, ratio=window_aspect)
                 if m_labels is not None:
                     if lev in mag_labels:
@@ -303,10 +318,11 @@ class Gpo(vcsaddons.core.VCSaddon):
                         m_labels.y.append(ymul * lev_radius * numpy.sin(self.magnitude_tick_angle) + center[1])
                 m_ticks.x.append(x)
                 m_ticks.y.append(y)
-
-            canvas.plot(m_ticks, render=False, bg=bg)
+            canvas.plot(m_ticks, **plot_kwargs)
+            del vcs.elements["line"][m_ticks.name]
             if m_labels is not None:
-                canvas.plot(m_labels, render=False, bg=bg)
+                canvas.plot(m_labels, **plot_kwargs)
+                del vcs.elements["textcombined"][m_labels.name]
 
         if template.xtic1.priority > 0:
             t_ticks = vcs.createline(source=template.xtic1.line)
@@ -327,10 +343,7 @@ class Gpo(vcsaddons.core.VCSaddon):
 
             if template.xlabel1.priority > 0:
                 t_labels = []
-                if self.xticlabels1 == "*":
-                    theta_labels = vcs.mklabels(tick_thetas)
-                else:
-                    theta_labels = self.xticlabels1
+                theta_labels = tick_labels
             else:
                 t_labels = None
 
@@ -349,15 +362,18 @@ class Gpo(vcsaddons.core.VCSaddon):
                     t_labels.append(label)
                 t_ticks.x.append([x0, x1])
                 t_ticks.y.append([y0, y1])
-            canvas.plot(t_ticks, render=False, bg=bg)
+            canvas.plot(t_ticks, **plot_kwargs)
+            del vcs.elements["line"][t_ticks.name]
             if t_labels is not None:
                 for l in t_labels:
-                    canvas.plot(l, render=False, bg=bg)
+                    canvas.plot(l, **plot_kwargs)
+                    del vcs.elements["textcombined"][l.name]
 
         values = vcs.createmarker()
         values.type = self.markers
         values.size = self.markersizes
         values.color = self.markercolors
+        values.colormap = self.colormap
         values.x = []
         values.y = []
 
@@ -389,7 +405,8 @@ class Gpo(vcsaddons.core.VCSaddon):
             values.y.append(y)
 
         if template.legend.priority > 0:
-            canvas.plot(labels, bg=bg, render=False)
-        canvas.plot(values, bg=bg)
-
+            canvas.plot(labels, **plot_kwargs)
+            del vcs.elements["textcombined"][labels.name]
+        canvas.plot(values, bg=bg, donotstoredisplay=True)
+        del vcs.elements["marker"][values.name]
         return canvas
-- 
GitLab


From dc86269c4bf0eb8fe579234fa7bf386f55e1b242 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Thu, 19 May 2016 11:37:09 -0400
Subject: [PATCH 077/191] Added test to validate geometry function

---
 testing/vcs/CMakeLists.txt       |  4 ++++
 testing/vcs/test_vcs_geometry.py | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 testing/vcs/test_vcs_geometry.py

diff --git a/testing/vcs/CMakeLists.txt b/testing/vcs/CMakeLists.txt
index 9e8cf78e3..05928a0c8 100644
--- a/testing/vcs/CMakeLists.txt
+++ b/testing/vcs/CMakeLists.txt
@@ -381,6 +381,10 @@ cdat_add_test(test_vcs_missing_colorname
   ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_missing_colorname.py
   "${BASELINE_DIR}/test_vcs_missing_colorname.png"
   )
+cdat_add_test(test_vcs_geometry
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_geometry.py
+  )
 ##############################################################################
 #
 # These tests perform plotting and need sample data
diff --git a/testing/vcs/test_vcs_geometry.py b/testing/vcs/test_vcs_geometry.py
new file mode 100644
index 000000000..578bfb67d
--- /dev/null
+++ b/testing/vcs/test_vcs_geometry.py
@@ -0,0 +1,32 @@
+import sys, vcs
+
+# This will check if we can set the geometry
+# at the initialization of canvas
+canvas = vcs.init(geometry=(600, 400))
+canvas.open()
+
+if dict(width=600, height=400) != canvas.geometry():
+    canvas.close()
+    sys.exit(1)
+
+canvas.close()
+
+canvas2 = vcs.init()
+
+# This will check if we can safely set the geometry even
+# though the canvas window has not been created yet
+canvas2.geometry(400, 400)
+canvas2.open()
+if dict(width=400, height=400) != canvas2.geometry():
+    canvas2.close()
+    sys.exit(1)
+
+# This will check if we can dynamically change the geometry
+canvas2.geometry(500, 400)
+canvas2.geometry(500, 500)
+if dict(width=500, height=500) != canvas2.geometry():
+    canvas2.close()
+    sys.exit(1)
+
+canvas2.close()
+sys.exit(0)
\ No newline at end of file
-- 
GitLab


From 8d4184228fb68955da38207e85807417d5794794 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Thu, 19 May 2016 22:35:11 -0400
Subject: [PATCH 078/191] Added plot script output

---
 Packages/vcs/docs/static/clt.png | Bin 0 -> 58300 bytes
 Packages/vcs/docs/user-guide.rst |  12 +++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 Packages/vcs/docs/static/clt.png

diff --git a/Packages/vcs/docs/static/clt.png b/Packages/vcs/docs/static/clt.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d721ffdb6ef9be9c54cbff606c06497f33adf8d
GIT binary patch
literal 58300
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
K=d#Wzp$Py~z0&Uh

literal 0
HcmV?d00001

diff --git a/Packages/vcs/docs/user-guide.rst b/Packages/vcs/docs/user-guide.rst
index 9a9ae40fc..96ccab213 100644
--- a/Packages/vcs/docs/user-guide.rst
+++ b/Packages/vcs/docs/user-guide.rst
@@ -167,17 +167,23 @@ using default values for everything else.
     import vcs
     import cdms2
 
-    # Open sample NetCDF data file
+    # Open sample NetCDF data file. Depending on the location of clt.nc
+    # a relative or absolute path might be needed.
     data = cdms2.open('clt.nc')
 
-    # Initialize vcs and then plot the variable
-    canvas = vcs.init()
+    # Initialize vcs with specific width and height
+    # and then plot the variable
+    canvas = vcs.init(geometry=(400, 400))
     clt = data['clt']
     canvas.plot(clt)
 
     # Close the canvas context
     canvas.close()
 
+The script should produce a plot as shown below:
+.. |clt| image:: static/clt.png
+   :width: 100%
+
 As mentioned earlier, vcs can use numpy array directly. The example below shows how to plot numpy array data.
 
 .. code-block:: python
-- 
GitLab


From cab7fdd08d9cb721e4e3c52316704cacb55089a5 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Thu, 19 May 2016 23:01:43 -0400
Subject: [PATCH 079/191] Added sphinx configuration and fixed style

---
 Packages/vcs/docs/conf.py        | 275 +++++++++++++++++++++++++++++++
 Packages/vcs/docs/user-guide.rst |  24 +--
 2 files changed, 287 insertions(+), 12 deletions(-)
 create mode 100755 Packages/vcs/docs/conf.py

diff --git a/Packages/vcs/docs/conf.py b/Packages/vcs/docs/conf.py
new file mode 100755
index 000000000..7147eae21
--- /dev/null
+++ b/Packages/vcs/docs/conf.py
@@ -0,0 +1,275 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# Tangelo Web Framework documentation build configuration file, created by
+# sphinx-quickstart on Thu Apr 11 11:42:23 2013.
+#
+# This file is execfile()d with the current directory set to its containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys, os
+#import sphinx_bootstrap_theme
+
+# on_rtd is whether we are on readthedocs.org
+on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+
+if not on_rtd:  # only import and set the theme if we're building docs locally
+    import sphinx_rtd_theme
+    html_theme = 'sphinx_rtd_theme'
+    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+
+# otherwise, readthedocs.org uses their theme by default, so no need to specify it
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+sys.path.insert(0, os.path.abspath('..'))
+
+
+# -- General configuration -----------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be extensions
+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.mathjax', 'sphinx.ext.ifconfig', 'sphinx.ext.viewcode', 'sphinx.ext.extlinks', 'sphinx.ext.doctest']
+
+# turn off doctests of autodoc included files (these are tested elsewhere)
+doctest_test_doctest_blocks = None
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = 'vcs'
+copyright = '2016, LLNL'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# These are set to None here, but this is overridden in CMakeLists.txt via -D
+# flags to set them explicitly using a variable defined there.
+#
+# The short X.Y version.
+version = '0.1'
+
+# The full version, including alpha/beta/rc tags.
+release = '0.1.0'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = []
+
+# The reST default role (used for this markup: `text`) to use for all documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+# Define an external link to refer to the base Tangelo installation - this is
+# the actual installation if the docs are built locally, or the default location
+# of localhost, port 80, for the documentation built on readthedocs.
+import os
+on_rtd = os.environ.get("READTHEDOCS", None) is not None
+extlinks = {"root": ("http://localhost:8080%s" if on_rtd else "%s", None)}
+
+# -- Options for HTML output ---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#html_theme = 'pyramid'
+#html_theme = 'bootstrap'
+#html_theme_path = sphinx_bootstrap_theme.get_html_theme_path()
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {
+#   'bootswatch_theme': "readable"
+#}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = "tangelo.ico"
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['static']
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+html_domain_indices = False
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# Show "todo" notes.
+todo_include_todos = False
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'RomanescoDoc'
+
+
+# -- Options for LaTeX output --------------------------------------------------
+
+latex_elements = {
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass [howto/manual]).
+latex_documents = [
+  ('index', 'Romanesco.tex', 'Romanesco Documentation',
+   'Kitware, Inc.', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output --------------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    ('index', 'vcs', 'VCS Documentation',
+     ['LLNL'], 1)
+]
+
+# If true, show URL addresses after external links.
+#man_show_urls = False
+
+
+# -- Options for Texinfo output ------------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+  ('index', 'vcs', 'vcs Documentation',
+   'LLNL', 'vcs', 'Visualization library',
+   'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#texinfo_appendices = []
+
+# If false, no module index is generated.
+#texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#texinfo_show_urls = 'footnote'
diff --git a/Packages/vcs/docs/user-guide.rst b/Packages/vcs/docs/user-guide.rst
index 96ccab213..4c839c3d7 100644
--- a/Packages/vcs/docs/user-guide.rst
+++ b/Packages/vcs/docs/user-guide.rst
@@ -1,8 +1,8 @@
 User Guide
-**********
+==========
 
 Document Conventions
-====================
+--------------------
 
 This User Guide is written for end-users of vcs, rather than developers. If you
 have suggestions or questions about this documentation, feel free to contact us
@@ -14,7 +14,7 @@ vcs specific entities will be ``formatted like this``.
 .. _concepts:
 
 Installation
-============
+------------
 While there are many ways a user can install vcs, installation using conda is
 preferred for the end user. Currently, to install vcs, you need to install entire uvcdat
 pacakge. ::
@@ -25,14 +25,14 @@ It is assumed that conda is installed on user's system and is available on the s
 
 
 Concepts
-========
+--------
 
 The VCS module can accept data from the CDMS module or can use the numpy array. For use on
 how to use either of the mentioned modules, see their respective documentation. For examples on the
 direct use of these modules, see the VCS API Examples chapter and the examples located throughout this texts.
 
 VCS Model
----------
+^^^^^^^^^
 
 The VCS model is defined by a trio of named attribute sets, designated the “Primary Objects” (also known as “Primary Elements”).
 These include: the data, which specifies what is to be displayed and are obtained from the cdms2 or numpy array;
@@ -40,7 +40,7 @@ the graphics method, which specifies the display technique; and the picture temp
 each segment of the display.
 
 VCS Primary Objects (or Primary Elements)
------------------------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 A description of each primary object is warranted before showing their use and usefulness in VCS. See descriptions below.
 
@@ -63,14 +63,14 @@ A graphics method simply defines how data is to be displayed on the screen. Curr
 * **3dscalarobject** - The 3dscalar graphics method displays an interactive 3D plot of a 4-dimensional (x,y,z,t) data array. Its class symbol or alias is “3d_scalar”.
 * **3dvectorobject** - The 3dvector graphics method displays an interactive 3D plot of a 4-dimensional (x,y,z,t) vector field. Its class symbol or alias is “3d_vector”.
 
-**Picture Template Object**
-
+Picture Template Object
+^^^^^^^^^^^^^^^^^^^^^^^
 A picture template determines the location of each picture segment, the space to be allocated to it, and related properties relevant to its display. The description of the picture template is as follows:
 
 * **templateobject** - Picture Template attributes describe where and how segments of a picture will be displayed. The segments are graphical representations of: textual identification of the data formatted values of single-valued dimensions and mean, maximum, and minimum data values axes, tick marks, labels, boxes, lines, and a legend that is graphics-method specific the data. Picture templates describe where to display all segments including the data. Its class symbol or alias is “P”.
 
-**Data Object**
-
+Data Object
+^^^^^^^^^^^
 Array data attribute sets and their associated dimensions are to be modified outside of VCS. See the CDMS2 module documentation for data extraction, creation and manipulation.
 
 VCS Secondary Objects (or Secondary Elements)
@@ -348,7 +348,7 @@ Create the following VCS objects:
 
 
 Get Existing VCS Objects
-''''''''''''''''''''''''
+^^^^^^^^^^^^^^^^^^^^^^^^
 
 The get functions are used to obtain VCS objects that exist in the
 object memory tables. The get function directly manipulates the object's
@@ -431,7 +431,7 @@ The show function is used to list the VCS objects in memory:
 
 
 VCS Reference Guide
--------------------
+--------------------
 
 ``init``
 ^^^^^^^^
-- 
GitLab


From 2e3f6116b0d9463dab106a5667e00569839abdc6 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Thu, 19 May 2016 23:02:34 -0400
Subject: [PATCH 080/191] Added makefile to build sphinx documentation

---
 Packages/vcs/docs/Makefile       | 177 +++++++++++++++++++++++++++++++
 Packages/vcs/docs/conf.py        |   8 +-
 Packages/vcs/docs/user-guide.rst |   9 +-
 3 files changed, 187 insertions(+), 7 deletions(-)
 create mode 100644 Packages/vcs/docs/Makefile

diff --git a/Packages/vcs/docs/Makefile b/Packages/vcs/docs/Makefile
new file mode 100644
index 000000000..377f99e0d
--- /dev/null
+++ b/Packages/vcs/docs/Makefile
@@ -0,0 +1,177 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = _build
+
+# User-friendly check for sphinx-build
+ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
+$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
+endif
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  xml        to make Docutils-native XML files"
+	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+	rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/Girder.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/Girder.qhc"
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/Girder"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/Girder"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+latexpdfja:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through platex and dvipdfmx..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
+
+xml:
+	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+	@echo
+	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+pseudoxml:
+	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+	@echo
+	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
diff --git a/Packages/vcs/docs/conf.py b/Packages/vcs/docs/conf.py
index 7147eae21..cc3fcd57b 100755
--- a/Packages/vcs/docs/conf.py
+++ b/Packages/vcs/docs/conf.py
@@ -56,7 +56,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = 'vcs'
+project = 'VCS'
 copyright = '2016, LLNL'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -197,7 +197,7 @@ todo_include_todos = False
 #html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'RomanescoDoc'
+htmlhelp_basename = 'VCSDoc'
 
 
 # -- Options for LaTeX output --------------------------------------------------
@@ -216,8 +216,8 @@ latex_elements = {
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'Romanesco.tex', 'Romanesco Documentation',
-   'Kitware, Inc.', 'manual'),
+  ('index', 'vcs.tex', 'VCS Documentation',
+   'LLNL', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
diff --git a/Packages/vcs/docs/user-guide.rst b/Packages/vcs/docs/user-guide.rst
index 4c839c3d7..f4c783746 100644
--- a/Packages/vcs/docs/user-guide.rst
+++ b/Packages/vcs/docs/user-guide.rst
@@ -74,7 +74,7 @@ Data Object
 Array data attribute sets and their associated dimensions are to be modified outside of VCS. See the CDMS2 module documentation for data extraction, creation and manipulation.
 
 VCS Secondary Objects (or Secondary Elements)
----------------------------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 A description of each secondary object is warranted before showing their use and usefulness in VCS. It is these secondary objects that defines the detailed specification of the primary objects’ attributes. Currently, there are five secondary objects with more to follow.
 
 Colormap Object
@@ -181,8 +181,11 @@ using default values for everything else.
     canvas.close()
 
 The script should produce a plot as shown below:
-.. |clt| image:: static/clt.png
-   :width: 100%
+
+.. image:: static/clt.png
+   :width: 400px
+   :height: 400px
+   :align: center
 
 As mentioned earlier, vcs can use numpy array directly. The example below shows how to plot numpy array data.
 
-- 
GitLab


From 13517c5029063f09992e1ea9377d8650dfd2189f Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Fri, 20 May 2016 02:32:50 -0400
Subject: [PATCH 081/191] Updated style

---
 Packages/vcs/docs/user-guide.rst | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Packages/vcs/docs/user-guide.rst b/Packages/vcs/docs/user-guide.rst
index f4c783746..785b615ba 100644
--- a/Packages/vcs/docs/user-guide.rst
+++ b/Packages/vcs/docs/user-guide.rst
@@ -49,19 +49,19 @@ Graphics Method Objects
 
 A graphics method simply defines how data is to be displayed on the screen. Currently, there are eleven different graphics methods with more on the way. Each graphics method has its own unique set of attributes (or members) and functions. They also have a set of core attributes that are common in all graphics methods. The descriptions of the current set of graphics methods are as follows:
 
-* **boxfillobject** - The boxfill graphics method draws color grid cells to represent the data on the VCS - Canvas. Its class symbol or alias is “Gfb”.
-* **continentsobject** - The continents graphics method draws a predefined, generic set of continental -outlines in a longitude by latitude space. To draw continental outlines, no external data set is required. Its class symbol or alias is “Gcon”.
-* **isofillobject** - The isofill graphics method fills the area between selected isolevels (levels of constant value) of a two-dimensional array with a user-specified color. Its class symbol or alias is “Gfi”.
-* **isolineobject** - The isoline graphics method draws lines of constant value at specified levels in order to graphically represent a two-dimensional array. It also labels the values of these isolines on the VCS Canvas. Its class symbol or alias is “Gi”.
-* **outfillobject** - The outfill graphics method fills a set of integer values in any data array. Its primary purpose is to display continents by filling their area as defined by a surface type array that indicates land, ocean, and sea-ice points. Its class symbol or alias is “Gfo”.
-* **outlineobject** - The Outline graphics method outlines a set of integer values in any data array. Its primary purpose is to display continental outlines as defined by a surface type array that indicates land, ocean, and sea-ice points. Its class symbol or alias is “Go”.
-* **scatterobject** - The scatter graphics method displays a scatter plot of two 4-dimensional data arrays, e.g. A(x,y,z,t) and B(x,y,z,t). Its class symbol or alias is “GSp”.
-* **vectorobject** - The Vector graphics method displays a vector plot of a 2D vector field. Vectors are located at the coordinate locations and point in the direction of the data vector field. Vector magnitudes are the product of data vector field lengths and a scaling factor. Its class symbol or alias is “Gv”.
-* **xvsyobject** - The XvsY graphics method displays a line plot from two 1D data arrays, that is X(t) and Y(t), where ‘t’ represents the 1D coordinate values. Its class symbol or alias is “GXY”.
-* **xyvsyobject** - The Xyvsy graphics method displays a line plot from a 1D data array, i.e. a plot of X(y) where ‘y’ represents the 1D coordinate values. Its class symbol or alias is “GXy”.
-* **Yxvsxobject** - The Yxvsx graphics method displays a line plot from a 1D data array, i.e. a plot of Y(x) where ‘x’ represents the 1D coordinate values. Its class symbol or alias is “GYx”.
-* **3dscalarobject** - The 3dscalar graphics method displays an interactive 3D plot of a 4-dimensional (x,y,z,t) data array. Its class symbol or alias is “3d_scalar”.
-* **3dvectorobject** - The 3dvector graphics method displays an interactive 3D plot of a 4-dimensional (x,y,z,t) vector field. Its class symbol or alias is “3d_vector”.
+* ``boxfillobject`` - The boxfill graphics method draws color grid cells to represent the data on the VCS - Canvas. Its class symbol or alias is “Gfb”.
+* ``continentsobject`` - The continents graphics method draws a predefined, generic set of continental -outlines in a longitude by latitude space. To draw continental outlines, no external data set is required. Its class symbol or alias is “Gcon”.
+* ``isofillobject`` - The isofill graphics method fills the area between selected isolevels (levels of constant value) of a two-dimensional array with a user-specified color. Its class symbol or alias is “Gfi”.
+* ``isolineobject`` - The isoline graphics method draws lines of constant value at specified levels in order to graphically represent a two-dimensional array. It also labels the values of these isolines on the VCS Canvas. Its class symbol or alias is “Gi”.
+* ``outfillobject`` - The outfill graphics method fills a set of integer values in any data array. Its primary purpose is to display continents by filling their area as defined by a surface type array that indicates land, ocean, and sea-ice points. Its class symbol or alias is “Gfo”.
+* ``outlineobject`` - The Outline graphics method outlines a set of integer values in any data array. Its primary purpose is to display continental outlines as defined by a surface type array that indicates land, ocean, and sea-ice points. Its class symbol or alias is “Go”.
+* ``scatterobject`` - The scatter graphics method displays a scatter plot of two 4-dimensional data arrays, e.g. A(x,y,z,t) and B(x,y,z,t). Its class symbol or alias is “GSp”.
+* ``vectorobject`` - The Vector graphics method displays a vector plot of a 2D vector field. Vectors are located at the coordinate locations and point in the direction of the data vector field. Vector magnitudes are the product of data vector field lengths and a scaling factor. Its class symbol or alias is “Gv”.
+* ``xvsyobject`` - The XvsY graphics method displays a line plot from two 1D data arrays, that is X(t) and Y(t), where ‘t’ represents the 1D coordinate values. Its class symbol or alias is “GXY”.
+* ``xyvsyobject`` - The Xyvsy graphics method displays a line plot from a 1D data array, i.e. a plot of X(y) where ‘y’ represents the 1D coordinate values. Its class symbol or alias is “GXy”.
+* ``Yxvsxobject`` - The Yxvsx graphics method displays a line plot from a 1D data array, i.e. a plot of Y(x) where ‘x’ represents the 1D coordinate values. Its class symbol or alias is “GYx”.
+* ``3dscalarobject`` - The 3dscalar graphics method displays an interactive 3D plot of a 4-dimensional (x,y,z,t) data array. Its class symbol or alias is “3d_scalar”.
+* ``3dvectorobject`` - The 3dvector graphics method displays an interactive 3D plot of a 4-dimensional (x,y,z,t) vector field. Its class symbol or alias is “3d_vector”.
 
 Picture Template Object
 ^^^^^^^^^^^^^^^^^^^^^^^
-- 
GitLab


From b7a168e422325639f0b742a27c9c763932650c73 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Fri, 20 May 2016 02:44:38 -0400
Subject: [PATCH 082/191] Some more style fixes

---
 Packages/vcs/docs/user-guide.rst | 51 ++++++++++++++++----------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/Packages/vcs/docs/user-guide.rst b/Packages/vcs/docs/user-guide.rst
index 785b615ba..6ab873e9e 100644
--- a/Packages/vcs/docs/user-guide.rst
+++ b/Packages/vcs/docs/user-guide.rst
@@ -44,8 +44,8 @@ VCS Primary Objects (or Primary Elements)
 
 A description of each primary object is warranted before showing their use and usefulness in VCS. See descriptions below.
 
-Graphics Method Objects
-^^^^^^^^^^^^^^^^^^^^^^^
+**Graphics Method Objects**
+
 
 A graphics method simply defines how data is to be displayed on the screen. Currently, there are eleven different graphics methods with more on the way. Each graphics method has its own unique set of attributes (or members) and functions. They also have a set of core attributes that are common in all graphics methods. The descriptions of the current set of graphics methods are as follows:
 
@@ -63,61 +63,60 @@ A graphics method simply defines how data is to be displayed on the screen. Curr
 * ``3dscalarobject`` - The 3dscalar graphics method displays an interactive 3D plot of a 4-dimensional (x,y,z,t) data array. Its class symbol or alias is “3d_scalar”.
 * ``3dvectorobject`` - The 3dvector graphics method displays an interactive 3D plot of a 4-dimensional (x,y,z,t) vector field. Its class symbol or alias is “3d_vector”.
 
-Picture Template Object
-^^^^^^^^^^^^^^^^^^^^^^^
+
+**Picture Template Object**
+
 A picture template determines the location of each picture segment, the space to be allocated to it, and related properties relevant to its display. The description of the picture template is as follows:
 
-* **templateobject** - Picture Template attributes describe where and how segments of a picture will be displayed. The segments are graphical representations of: textual identification of the data formatted values of single-valued dimensions and mean, maximum, and minimum data values axes, tick marks, labels, boxes, lines, and a legend that is graphics-method specific the data. Picture templates describe where to display all segments including the data. Its class symbol or alias is “P”.
+* ``templateobject`` - Picture Template attributes describe where and how segments of a picture will be displayed. The segments are graphical representations of: textual identification of the data formatted values of single-valued dimensions and mean, maximum, and minimum data values axes, tick marks, labels, boxes, lines, and a legend that is graphics-method specific the data. Picture templates describe where to display all segments including the data. Its class symbol or alias is “P”.
+
+**Data Object**
 
-Data Object
-^^^^^^^^^^^
 Array data attribute sets and their associated dimensions are to be modified outside of VCS. See the CDMS2 module documentation for data extraction, creation and manipulation.
 
 VCS Secondary Objects (or Secondary Elements)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 A description of each secondary object is warranted before showing their use and usefulness in VCS. It is these secondary objects that defines the detailed specification of the primary objects’ attributes. Currently, there are five secondary objects with more to follow.
 
-Colormap Object
-^^^^^^^^^^^^^^^
+
+**Colormap Object**
 
 The colormap object is used to specify, create, and modify colormaps. There are 256 colors and color indices, but only the first 240 color indices can be modified (indices 240 through 255 are reserved for VCS internal use). The description of the colormap object is as follows:
 
-*colormapobject* - A colormap contains 240 user-definable colors that are used for graphical displays. The color mixtures are defined in terms of percentages of red, green, and blue colors (0 to 100% for each). The resulting color depends on the specified mixtures of red, green, and blue. Its class symbol or alias is “Cp”.
+* ``colormapobject`` - A colormap contains 240 user-definable colors that are used for graphical displays. The color mixtures are defined in terms of percentages of red, green, and blue colors (0 to 100% for each). The resulting color depends on the specified mixtures of red, green, and blue. Its class symbol or alias is “Cp”.
 Note: VCS colormaps are objects, but they are not referenced like other secondary objects.
 
-Fillarea Object
-^^^^^^^^^^^^^^^
+
+**Fillarea Object**
 
 The fillarea objects allows the user to edit fillarea attributes, including fillarea interior style, style index, and color index. The description of the fillarea object is as follows:
 
-*fillareaobject* - The fill area attributes are used to display regions defined by closed polygons, which can be filled with a uniform color, a pattern, or a hatch style. Attributes specify the style, color, position, and dimensions of the fill area. Its class symbol or alias is “Tf”.
-Line Object
+* ``fillareaobject`` - The fill area attributes are used to display regions defined by closed polygons, which can be filled with a uniform color, a pattern, or a hatch style. Attributes specify the style, color, position, and dimensions of the fill area. Its class symbol or alias is “Tf”.
+
 
-Line Object
-^^^^^^^^^^^
+**Line Object**
 
 The line object allows the editing of line type, width, and color index. The description of the line object is as follows:
 
-*lineobject* - The line attributes specify the type, width, and color of the line to be drawn for a graphical display. Its class symbol or alias is “Tl”.
-Marker Object
+* ``lineobject`` - The line attributes specify the type, width, and color of the line to be drawn for a graphical display. Its class symbol or alias is “Tl”.
+
+
+**Marker Object**
 
 The marker object allows the editing of the marker type, width, and color index. The description of the marker object is as follows:
 
-Marker Object
-^^^^^^^^^^^^^
+* ``markerobject`` - The marker attribute specifies graphical symbols, symbol sizes, and colors used in appropriate graphics methods. Its class symbol or alias is “Tm”.
 
-*markerobject* - The marker attribute specifies graphical symbols, symbol sizes, and colors used in appropriate graphics methods. Its class symbol or alias is “Tm”.
 
-Text Objects
-^^^^^^^^^^^^
+**Text Objects**
 
 Graphical displays often contain textual inscriptions, which provide further information. The text-table object attributes allow the generation of character strings on the VCS Canvas by defining the character font, precision, expansion, spacing, and color. The text-orientation object attributes allow the appearance of text character strings to be changed by defining the character height, up-angle, path, and horizontal and vertical alignment. The text-combined object is a combination of both text-table and text-orientation objects. The description of the text objects are as follows:
 
-*textcombinedobject* - The text-combined attributes combine the text-table attributes and a text-orientation attributes together. From combining the two classes, the user is able to set attributes for both classes at once (i.e., define the font, spacing, expansion, color index, height, angle, path, vertical alignment, and horizontal alignment). Its class symbol or alias is “Tc”.
+* ``textcombinedobject`` - The text-combined attributes combine the text-table attributes and a text-orientation attributes together. From combining the two classes, the user is able to set attributes for both classes at once (i.e., define the font, spacing, expansion, color index, height, angle, path, vertical alignment, and horizontal alignment). Its class symbol or alias is “Tc”.
 
-*textorientationobject* - The text-orientation attributes set names that define the height, angel, path, horizontal alignment and vertical alignment. Its class symbol or alias is “To”.
+* ``textorientationobject`` - The text-orientation attributes set names that define the height, angel, path, horizontal alignment and vertical alignment. Its class symbol or alias is “To”.
 
-*texttableobject* - The text-table attributes set names that define the font, spacing, expansion, and color index. Its class symbol or alias is “Tt”.
+* ``texttableobject`` - The text-table attributes set names that define the font, spacing, expansion, and color index. Its class symbol or alias is “Tt”.
 
 
 Getting Started with VCS
-- 
GitLab


From 10aa33613035e59edcb0affef993a6f56d27fdcf Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Fri, 20 May 2016 09:32:15 -0400
Subject: [PATCH 083/191] Fix minor grammatical issue

---
 Packages/vcs/docs/user-guide.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Packages/vcs/docs/user-guide.rst b/Packages/vcs/docs/user-guide.rst
index 6ab873e9e..d8a9789f5 100644
--- a/Packages/vcs/docs/user-guide.rst
+++ b/Packages/vcs/docs/user-guide.rst
@@ -16,7 +16,7 @@ vcs specific entities will be ``formatted like this``.
 Installation
 ------------
 While there are many ways a user can install vcs, installation using conda is
-preferred for the end user. Currently, to install vcs, you need to install entire uvcdat
+preferred for the end user. Currently, to install vcs, you need to install the entire uvcdat
 pacakge. ::
 
     conda install -c uvcdat
-- 
GitLab


From 9356d962eceb9b6521273e89b4cef2f5f88e4e45 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Fri, 20 May 2016 09:43:22 -0400
Subject: [PATCH 084/191] Separated reference to a separate document

---
 Packages/vcs/docs/developer-guide.rst |   2 +
 Packages/vcs/docs/index.rst           |   3 +-
 Packages/vcs/docs/reference.rst       | 129 +++++++++++++++++++++++++
 Packages/vcs/docs/user-guide.rst      | 131 --------------------------
 4 files changed, 133 insertions(+), 132 deletions(-)
 create mode 100644 Packages/vcs/docs/developer-guide.rst
 create mode 100644 Packages/vcs/docs/reference.rst

diff --git a/Packages/vcs/docs/developer-guide.rst b/Packages/vcs/docs/developer-guide.rst
new file mode 100644
index 000000000..cf18c40ac
--- /dev/null
+++ b/Packages/vcs/docs/developer-guide.rst
@@ -0,0 +1,2 @@
+Developer Guide
+===============
diff --git a/Packages/vcs/docs/index.rst b/Packages/vcs/docs/index.rst
index 0bb30b293..1fcb27b4e 100644
--- a/Packages/vcs/docs/index.rst
+++ b/Packages/vcs/docs/index.rst
@@ -49,7 +49,8 @@ Table of contents
    :maxdepth: 2
 
    user-guide
-   developer-docs
+   developer-guide
+   reference
 
 API index
 ---------
diff --git a/Packages/vcs/docs/reference.rst b/Packages/vcs/docs/reference.rst
new file mode 100644
index 000000000..0af233efa
--- /dev/null
+++ b/Packages/vcs/docs/reference.rst
@@ -0,0 +1,129 @@
+VCS Reference Guide
+--------------------
+
+``init``
+^^^^^^^^
+* Initialize, Construct a VCS Canvas Object
+
+.. code-block:: python
+
+    import vcs,cdms2
+
+    file = cdms2.open('clt.nc')
+
+    slab = file.getslab('clt')
+
+    a = vcs.init()
+
+    # This examples constructs 4 VCS Canvas a.plot(slab)
+    # Plot slab using default settings
+    b = vcs.init()
+
+    # Construct VCS object
+    template = b.gettemplate('AMIP')
+
+    # Get 'example' template object
+    b.plot(slab, template)
+
+    # Plot slab using template 'AMIP'
+    c = vcs.init()
+
+    # Construct new VCS object
+    isofill = c.getisofill('quick')
+
+    # Get 'quick' isofill graphics method
+    c.plot(slab,template,isofill)
+
+    # Plot slab using template and isofill objects
+    d = vcs.init()
+
+    # Construct new VCS object
+    isoline = c.getisoline('quick')
+
+    # Get 'quick' isoline graphics method
+    c.plot(isoline,slab,template)
+
+    # Plot slab using isoline and template objects
+
+``help``
+^^^^^^^^
+* Print out the object's doc string
+
+.. code-block:: python
+
+    import vcs
+    a = vcs.init()
+    ln = a.getline('red')
+
+    # Get a VCS line object
+    # This will print out information on how to use ln
+    a.objecthelp(ln)
+
+``open``
+^^^^^^^^
+* Open VCS Canvas object.
+* This routine really just manages the VCS canvas. It will popup the VCS Canvas for viewing. It can be used to display the VCS Canvas.
+
+.. code-block:: python
+
+    import vcs
+    a = vcs.init()
+    a.open()
+
+``close``
+^^^^^^^^^
+* Close the VCS Canvas. It will remove the VCS Canvas object from the screen, but not deallocate it.
+
+.. code-block:: python
+
+    import vcs
+    a = vcs.init()
+    a.plot(array, 'default', 'isofill', 'quick')
+    a.close()
+
+``mode``
+^^^^^^^^
+* ``Options <0 = manual, 1 = automatic>``
+* Update the VCS Canvas.
+* Updating of the graphical displays on the VCS Canvas can be deferred until a later time. This is helpful when generating templates or displaying numerous plots. If a series of commands are given to VCS and the Canvas Mode is set to manual (i.e., 0), then no updating of the VCS Canvas occurs until the 'update' function is executed.
+
+.. note:: By default the VCS Canvas Mode is set to ``1``, which means VCS will update the VCS Canvas as necessary without prompting from the user.
+
+.. code-block:: python
+
+    import vcs
+    a = vcs.init()
+    a.mode = 0
+    # Set updating to manual mode
+    a.plot(array, 'default', 'boxfill', 'quick')
+    box = x.getboxfill('quick')
+    box.color_1 = 100
+    box.xticlabels('lon30', 'lon30')
+    box.xticlabels('','')
+    box.datawc(1e20, 1e20, 1e20, 1e20)
+    box.datawc(-45.0, 45.0, -90.0, 90.0)
+
+    # Update the changes manually
+    a.update()
+
+``update``
+^^^^^^^^^^
+* Update the VCS Canvas manually when the ``mode`` is set to ``0`` (manual).
+
+.. code-block:: python
+
+    import vcs
+
+    a = vcs.init()
+    a.mode = 0
+
+    # Go to manual mode a.plot(s,'default','boxfill','quick')
+    box = x.getboxfill('quick')
+    box.color_1 = 100
+    box.xticlabels('lon30', 'lon30')
+    box.xticlabels('','')
+    box.datawc(1e20, 1e20, 1e20, 1e20)
+    box.datawc(-45.0, 45.0, -90.0, 90.0)
+
+    # Update the changes manually
+    a.update()
\ No newline at end of file
diff --git a/Packages/vcs/docs/user-guide.rst b/Packages/vcs/docs/user-guide.rst
index d8a9789f5..d74b3aec2 100644
--- a/Packages/vcs/docs/user-guide.rst
+++ b/Packages/vcs/docs/user-guide.rst
@@ -430,134 +430,3 @@ The show function is used to list the VCS objects in memory:
 +=================+==========================================================+
 | ``show()``      | list VCS primary and secondary class objects in memory   |
 +-----------------+----------------------------------------------------------+
-
-
-VCS Reference Guide
---------------------
-
-``init``
-^^^^^^^^
-* Initialize, Construct a VCS Canvas Object
-
-.. code-block:: python
-
-    import vcs,cdms2
-
-    file = cdms2.open('clt.nc')
-
-    slab = file.getslab('clt')
-
-    a = vcs.init()
-
-    # This examples constructs 4 VCS Canvas a.plot(slab)
-    # Plot slab using default settings
-    b = vcs.init()
-
-    # Construct VCS object
-    template = b.gettemplate('AMIP')
-
-    # Get 'example' template object
-    b.plot(slab, template)
-
-    # Plot slab using template 'AMIP'
-    c = vcs.init()
-
-    # Construct new VCS object
-    isofill = c.getisofill('quick')
-
-    # Get 'quick' isofill graphics method
-    c.plot(slab,template,isofill)
-
-    # Plot slab using template and isofill objects
-    d = vcs.init()
-
-    # Construct new VCS object
-    isoline = c.getisoline('quick')
-
-    # Get 'quick' isoline graphics method
-    c.plot(isoline,slab,template)
-
-    # Plot slab using isoline and template objects
-
-``help``
-^^^^^^^^
-* Print out the object's doc string
-
-.. code-block:: python
-
-    import vcs
-    a = vcs.init()
-    ln = a.getline('red')
-
-    # Get a VCS line object
-    # This will print out information on how to use ln
-    a.objecthelp(ln)
-
-``open``
-^^^^^^^^
-* Open VCS Canvas object.
-* This routine really just manages the VCS canvas. It will popup the VCS Canvas for viewing. It can be used to display the VCS Canvas.
-
-.. code-block:: python
-
-    import vcs
-    a = vcs.init()
-    a.open()
-
-``close``
-^^^^^^^^^
-* Close the VCS Canvas. It will remove the VCS Canvas object from the screen, but not deallocate it.
-
-.. code-block:: python
-
-    import vcs
-    a = vcs.init()
-    a.plot(array, 'default', 'isofill', 'quick')
-    a.close()
-
-``mode``
-^^^^^^^^
-* ``Options <0 = manual, 1 = automatic>``
-* Update the VCS Canvas.
-* Updating of the graphical displays on the VCS Canvas can be deferred until a later time. This is helpful when generating templates or displaying numerous plots. If a series of commands are given to VCS and the Canvas Mode is set to manual (i.e., 0), then no updating of the VCS Canvas occurs until the 'update' function is executed.
-
-.. note:: By default the VCS Canvas Mode is set to ``1``, which means VCS will update the VCS Canvas as necessary without prompting from the user.
-
-.. code-block:: python
-
-    import vcs
-    a = vcs.init()
-    a.mode = 0
-    # Set updating to manual mode
-    a.plot(array, 'default', 'boxfill', 'quick')
-    box = x.getboxfill('quick')
-    box.color_1 = 100
-    box.xticlabels('lon30', 'lon30')
-    box.xticlabels('','')
-    box.datawc(1e20, 1e20, 1e20, 1e20)
-    box.datawc(-45.0, 45.0, -90.0, 90.0)
-
-    # Update the changes manually
-    a.update()
-
-``update``
-^^^^^^^^^^
-* Update the VCS Canvas manually when the ``mode`` is set to ``0`` (manual).
-
-.. code-block:: python
-
-    import vcs
-
-    a = vcs.init()
-    a.mode = 0
-
-    # Go to manual mode a.plot(s,'default','boxfill','quick')
-    box = x.getboxfill('quick')
-    box.color_1 = 100
-    box.xticlabels('lon30', 'lon30')
-    box.xticlabels('','')
-    box.datawc(1e20, 1e20, 1e20, 1e20)
-    box.datawc(-45.0, 45.0, -90.0, 90.0)
-
-    # Update the changes manually
-    a.update()
-- 
GitLab


From 7a599261680593869bc2708a2a0697f5696f9f48 Mon Sep 17 00:00:00 2001
From: Dan Lipsa <dan.lipsa@kitware.com>
Date: Tue, 26 Apr 2016 16:34:06 -0400
Subject: [PATCH 085/191] ENH #1885: Show info at clicked point for point
 datasets

---
 Packages/vcs/vcs/VTKPlots.py                | 197 ++++++++++----------
 Packages/vcs/vcs/vcs2vtk.py                 |   1 +
 Packages/vcs/vcs/vcsvtk/boxfillpipeline.py  |   3 -
 Packages/vcs/vcs/vcsvtk/isofillpipeline.py  |   3 -
 Packages/vcs/vcs/vcsvtk/isolinepipeline.py  |   3 -
 Packages/vcs/vcs/vcsvtk/meshfillpipeline.py |   3 -
 Packages/vcs/vcs/vcsvtk/pipeline2d.py       |  32 +++-
 Packages/vcs/vcs/vcsvtk/vectorpipeline.py   | 124 ++++--------
 testing/vcs/CMakeLists.txt                  |  41 ++--
 testing/vcs/test_vcs_click_info.py          |  26 ++-
 10 files changed, 197 insertions(+), 236 deletions(-)

diff --git a/Packages/vcs/vcs/VTKPlots.py b/Packages/vcs/vcs/VTKPlots.py
index 8cfe83a28..37382c0e9 100644
--- a/Packages/vcs/vcs/VTKPlots.py
+++ b/Packages/vcs/vcs/VTKPlots.py
@@ -46,18 +46,16 @@ class VTKVCSBackend(object):
         self._renderers = {}
         self._plot_keywords = [
             'cdmsfile',
-            'cell_coordinates'
-            # used to render the continents
-            'continents_renderer',
+            'cell_coordinates',
             # dataset bounds in lon/lat coordinates
             'dataset_bounds',
             # This may be smaller than the data viewport. It is used
             # if autot is passed
             'ratio_autot_viewport',
-            # used to render the dataset
-            'dataset_renderer',
-            # dataset scale: (xScale, yScale)
-            'dataset_scale',
+            # used to render the dataset for clicked point info (hardware selection)
+            'surface_renderer',
+            # (xScale, yScale) - datasets can be scaled using the window ratio
+            'surface_scale',
             # the same as vcs.utils.getworldcoordinates for now. getworldcoordinates uses
             # gm.datawc_... or, if that is not set, it uses data axis margins (without bounds).
             'plotting_dataset_bounds',
@@ -138,99 +136,92 @@ class VTKVCSBackend(object):
             d = vcs.elements["display"][dnm]
             if d.array[0] is None:
                 continue
-            t = vcs.elements["template"][d.template]
-            gm = vcs.elements[d.g_type][d.g_name]
-            # for non-linear projection or for meshfill. Meshfill is wrapped at
-            # VTK level, so vcs calculations do not work.
-            if gm.projection != "linear" or gm.g_name == 'Gfm':
-                selector = vtk.vtkHardwareSelector()
-                datasetRenderer = d.backend['dataset_renderer']
-                continentsRenderer = d.backend.get('continents_renderer')
-                dataset = d.backend['vtk_backend_grid']
-                if (datasetRenderer and dataset):
-                    selector.SetRenderer(datasetRenderer)
-                    selector.SetArea(xy[0], xy[1], xy[0], xy[1])
-                    selector.SetFieldAssociation(vtk.vtkDataObject.FIELD_ASSOCIATION_CELLS)
-                    # We want to be able see information behind continents
-                    if (continentsRenderer):
-                        continentsRenderer.SetDraw(False)
-                    selection = selector.Select()
-                    if (continentsRenderer):
-                        continentsRenderer.SetDraw(True)
-                    if (selection.GetNumberOfNodes() > 0):
-                        selectionNode = selection.GetNode(0)
-                        prop = selectionNode.GetProperties().Get(selectionNode.PROP())
-                        if (prop):
-                            cellIds = prop.GetMapper().GetInput().GetCellData().GetGlobalIds()
-                            if (cellIds):
-                                # scalar value
-                                a = selectionNode.GetSelectionData().GetArray(0)
-                                geometryId = a.GetValue(0)
-                                cellId = cellIds.GetValue(geometryId)
-                                scalars = dataset.GetCellData().GetScalars()
-                                value = scalars.GetValue(cellId)
-                                geoTransform = d.backend['vtk_backend_geo']
-                                if (geoTransform):
-                                    geoTransform.Inverse()
-                                # Use the world picker to get world coordinates
-                                # we deform the dataset, so we need to fix the
-                                # world picker using xScale, yScale
-                                xScale, yScale = d.backend['dataset_scale']
-                                worldPicker = vtk.vtkWorldPointPicker()
-                                worldPicker.Pick(xy[0], xy[1], 0, datasetRenderer)
-                                worldPosition = list(worldPicker.GetPickPosition())
-                                if (xScale > yScale):
-                                    worldPosition[0] /= (xScale/yScale)
-                                else:
-                                    worldPosition[1] /= (yScale/xScale)
-                                lonLat = worldPosition
-                                if (geoTransform):
-                                    geoTransform.InternalTransformPoint(worldPosition, lonLat)
-                                    geoTransform.Inverse()
-                                st += "Var: %s\n" % d.array[0].id
-                                if (float("inf") not in lonLat):
-                                    st += "X=%4.1f\nY=%4.1f\n" % (lonLat[0], lonLat[1])
-                                st += "Value: %g" % value
-            else:
-                if t.data.x1 <= x <= t.data.x2 and t.data.y1 <= y <= t.data.y2:
-                    x1, x2, y1, y2 = vcs.utils.getworldcoordinates(gm,
-                                                                   d.array[0].getAxis(-1),
-                                                                   d.array[0].getAxis(-2))
-
-                    X = (x - t.data.x1) / (t.data.x2 - t.data.x1) * (x2 - x1) + x1
-                    Y = (y - t.data.y1) / (t.data.y2 - t.data.y1) * (y2 - y1) + y1
-
-                    # Ok we now have the X/Y values we need to figure out the
-                    # indices
-                    try:
-                        I = d.array[0].getAxis(-1).mapInterval((X, X, 'cob'))[0]
-                        try:
-                            J = d.array[
-                                0].getAxis(-2).mapInterval((Y, Y, 'cob'))[0]
-                            # Values at that point
-                            V = d.array[0][..., J, I]
-                        except:
-                            V = d.array[0][..., I]
-                        if isinstance(V, numpy.ndarray):
-                            # Grab the appropriate time slice
-                            if self.canvas.animate.created():
-                                t = self.canvas.animate.frame_num
-                                try:
-                                    taxis = V.getTime()
-                                    V = V(time=taxis[t % len(taxis)]).flat[0]
-                                except:
-                                    V = V.flat[0]
+            # Use the hardware selector to determine the cell id we clicked on
+            selector = vtk.vtkHardwareSelector()
+            surfaceRenderer = d.backend['surface_renderer']
+            dataset = d.backend['vtk_backend_grid']
+            if (surfaceRenderer and dataset):
+                selector.SetRenderer(surfaceRenderer)
+                selector.SetArea(xy[0], xy[1], xy[0], xy[1])
+                selector.SetFieldAssociation(vtk.vtkDataObject.FIELD_ASSOCIATION_CELLS)
+                # We only want to render the surface for selection
+                renderers = self.renWin.GetRenderers()
+                renderers.InitTraversal()
+                while(True):
+                    renderer = renderers.GetNextItem()
+                    if (renderer is None):
+                        break
+                    renderer.SetDraw(False)
+                surfaceRenderer.SetDraw(True)
+                selection = selector.Select()
+                renderers.InitTraversal()
+                while(True):
+                    renderer = renderers.GetNextItem()
+                    if (renderer is None):
+                        break
+                    renderer.SetDraw(True)
+                surfaceRenderer.SetDraw(False)
+                if (selection.GetNumberOfNodes() > 0):
+                    selectionNode = selection.GetNode(0)
+                    prop = selectionNode.GetProperties().Get(selectionNode.PROP())
+                    if (prop):
+                        cellIds = prop.GetMapper().GetInput().GetCellData().GetGlobalIds()
+                        if (cellIds):
+                            st += "Var: %s\n" % d.array[0].id
+                            # cell attribute
+                            a = selectionNode.GetSelectionData().GetArray(0)
+                            geometryId = a.GetValue(0)
+                            cellId = cellIds.GetValue(geometryId)
+                            attributes = dataset.GetCellData().GetScalars()
+                            if (attributes is None):
+                                attributes = dataset.GetCellData().GetVectors()
+                            elementId = cellId
+
+                            geoTransform = d.backend['vtk_backend_geo']
+                            if (geoTransform):
+                                geoTransform.Inverse()
+                            # Use the world picker to get world coordinates
+                            # we deform the dataset, so we need to fix the
+                            # world picker using xScale, yScale
+                            xScale, yScale = d.backend['surface_scale']
+                            worldPicker = vtk.vtkWorldPointPicker()
+                            worldPicker.Pick(xy[0], xy[1], 0, surfaceRenderer)
+                            worldPosition = list(worldPicker.GetPickPosition())
+                            if (xScale > yScale):
+                                worldPosition[0] /= (xScale/yScale)
                             else:
-                                V = V.flat[0]
-                        try:
-                            st += "Var: %s\nX[%i] = %4.1f\nY[%i] = %4.1f\nValue: %g" % (
-                                d.array[0].id, I, X, J, Y, V)
-                        except:
-                            st += "Var: %s\nX = %4.1f\nY[%i] = %4.1f\nValue: %g" % (
-                                d.array[0].id, X, I, Y, V)
-                    except:
-                        st += "Var: %s\nX=%g\nY=%g\nValue = N/A" % (
-                            d.array[0].id, X, Y)
+                                worldPosition[1] /= (yScale/xScale)
+                            lonLat = worldPosition
+                            if (attributes is None):
+                                # if point dataset, return the value for the closest point
+                                cell = dataset.GetCell(cellId)
+                                closestPoint = [0, 0, 0]
+                                subId = vtk.mutable(0)
+                                pcoords = [0, 0, 0]
+                                dist2 = vtk.mutable(0)
+                                weights = [0] * cell.GetNumberOfPoints()
+                                cell.EvaluatePosition(worldPosition, closestPoint,
+                                                      subId, pcoords, dist2, weights)
+                                indexMax = numpy.argmax(weights)
+                                pointId = cell.GetPointId(indexMax)
+                                attributes = dataset.GetPointData().GetScalars()
+                                if (attributes is None):
+                                    attributes = dataset.GetPointData().GetVectors()
+                                elementId = pointId
+                            if (geoTransform):
+                                geoTransform.InternalTransformPoint(worldPosition, lonLat)
+                                geoTransform.Inverse()
+                            if (float("inf") not in lonLat):
+                                st += "X=%4.1f\nY=%4.1f\n" % (lonLat[0], lonLat[1])
+                            # get the cell value or the closest point value
+                            if (attributes):
+                                if (attributes.GetNumberOfComponents() > 1):
+                                    v = attributes.GetTuple(elementId)
+                                    st += "Value: (%g, %g)" % (v[0], v[1])
+                                else:
+                                    value = attributes.GetValue(elementId)
+                                    st += "Value: %g" % value
+
         if st == "":
             return
         ren = vtk.vtkRenderer()
@@ -859,9 +850,9 @@ class VTKVCSBackend(object):
                     ren = self.createRenderer()
                     self.renWin.AddRenderer(ren)
                     self.setLayer(ren, 1)
-                    self._renderers[(None, None, None)] = ren
+                    self._renderers[(None, None, None)] = (ren, 1, 1)
                 else:
-                    ren = self._renderers[(None, None, None)]
+                    ren, xratio, yratio = self._renderers[(None, None, None)]
                 tt, to = crdate.name.split(":::")
                 tt = vcs.elements["texttable"][tt]
                 to = vcs.elements["textorientation"][to]
@@ -896,9 +887,9 @@ class VTKVCSBackend(object):
                     ren = self.createRenderer()
                     self.renWin.AddRenderer(ren)
                     self.setLayer(ren, 1)
-                    self._renderers[(None, None, None)] = ren
+                    self._renderers[(None, None, None)] = (ren, 1, 1)
                 else:
-                    ren = self._renderers[(None, None, None)]
+                    ren, xratio, yratio = self._renderers[(None, None, None)]
                 tt, to = zname.name.split(":::")
                 tt = vcs.elements["texttable"][tt]
                 to = vcs.elements["textorientation"][to]
diff --git a/Packages/vcs/vcs/vcs2vtk.py b/Packages/vcs/vcs/vcs2vtk.py
index 86cfcfd0a..aa4a228ac 100644
--- a/Packages/vcs/vcs/vcs2vtk.py
+++ b/Packages/vcs/vcs/vcs2vtk.py
@@ -809,6 +809,7 @@ def doWrap(Act, wc, wrap=[0., 360], fastClip=True):
     if wrap is None:
         return Act
     Mapper = Act.GetMapper()
+    Mapper.Update()
     data = Mapper.GetInput()
     # insure that GLOBALIDS are not removed by the append filter
     attributes = data.GetCellData()
diff --git a/Packages/vcs/vcs/vcsvtk/boxfillpipeline.py b/Packages/vcs/vcs/vcsvtk/boxfillpipeline.py
index 1ea81febb..f2a3ea602 100644
--- a/Packages/vcs/vcs/vcsvtk/boxfillpipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/boxfillpipeline.py
@@ -130,8 +130,6 @@ class BoxfillPipeline(Pipeline2D):
                 geo=self._vtkGeoTransform,
                 priority=self._template.data.priority,
                 create_renderer=(dataset_renderer is None))
-        self._resultDict['dataset_renderer'] = dataset_renderer
-        self._resultDict['dataset_scale'] = (xScale, yScale)
 
         for act in patternActors:
             if self._vtkGeoTransform is None:
@@ -211,7 +209,6 @@ class BoxfillPipeline(Pipeline2D):
                 vp, self._template.data.priority,
                 vtk_backend_grid=self._vtkDataSet,
                 dataset_bounds=self._vtkDataSetBounds)
-            self._resultDict['continents_renderer'] = continents_renderer
 
     def _plotInternalBoxfill(self):
         """Implements the logic to render a non-custom boxfill."""
diff --git a/Packages/vcs/vcs/vcsvtk/isofillpipeline.py b/Packages/vcs/vcs/vcsvtk/isofillpipeline.py
index af3b037a8..55098f9e5 100644
--- a/Packages/vcs/vcs/vcsvtk/isofillpipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/isofillpipeline.py
@@ -158,8 +158,6 @@ class IsofillPipeline(Pipeline2D):
                 geo=self._vtkGeoTransform,
                 priority=self._template.data.priority,
                 create_renderer=(dataset_renderer is None))
-        self._resultDict['dataset_renderer'] = dataset_renderer
-        self._resultDict['dataset_scale'] = (xScale, yScale)
         for act in patternActors:
             self._context().fitToViewport(
                 act, vp,
@@ -226,4 +224,3 @@ class IsofillPipeline(Pipeline2D):
                 vp, self._template.data.priority,
                 vtk_backend_grid=self._vtkDataSet,
                 dataset_bounds=self._vtkDataSetBounds)
-            self._resultDict['continents_renderer'] = continents_renderer
diff --git a/Packages/vcs/vcs/vcsvtk/isolinepipeline.py b/Packages/vcs/vcs/vcsvtk/isolinepipeline.py
index 2d9b66472..1560de7c1 100644
--- a/Packages/vcs/vcs/vcsvtk/isolinepipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/isolinepipeline.py
@@ -273,8 +273,6 @@ class IsolinePipeline(Pipeline2D):
                 create_renderer=(dataset_renderer is None))
 
             countLevels += len(l)
-        self._resultDict['dataset_renderer'] = dataset_renderer
-        self._resultDict['dataset_scale'] = (xScale, yScale)
         if len(textprops) > 0:
             self._resultDict["vtk_backend_contours_labels_text_properties"] = \
                 textprops
@@ -332,4 +330,3 @@ class IsolinePipeline(Pipeline2D):
                 vp, self._template.data.priority,
                 vtk_backend_grid=self._vtkDataSet,
                 dataset_bounds=self._vtkDataSetBounds)
-            self._resultDict['continents_renderer'] = continents_renderer
diff --git a/Packages/vcs/vcs/vcsvtk/meshfillpipeline.py b/Packages/vcs/vcs/vcsvtk/meshfillpipeline.py
index 7101a4729..64a95c4e3 100644
--- a/Packages/vcs/vcs/vcsvtk/meshfillpipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/meshfillpipeline.py
@@ -195,8 +195,6 @@ class MeshfillPipeline(Pipeline2D):
                 geo=self._vtkGeoTransform,
                 priority=self._template.data.priority,
                 create_renderer=(dataset_renderer is None))
-        self._resultDict['dataset_renderer'] = dataset_renderer
-        self._resultDict['dataset_scale'] = (xScale, yScale)
         for act in self._patternActors:
             if self._vtkGeoTransform is None:
                 # If using geofilter on wireframed does not get wrapped not sure
@@ -270,7 +268,6 @@ class MeshfillPipeline(Pipeline2D):
                 vp, self._template.data.priority,
                 vtk_backend_grid=self._vtkDataSet,
                 dataset_bounds=self._vtkDataSetBounds)
-            self._resultDict['continents_renderer'] = continents_renderer
 
     def getPlottingBounds(self):
         """gm.datawc if it is set or dataset_bounds
diff --git a/Packages/vcs/vcs/vcsvtk/pipeline2d.py b/Packages/vcs/vcs/vcsvtk/pipeline2d.py
index baa2f8915..dc12f3f5c 100644
--- a/Packages/vcs/vcs/vcsvtk/pipeline2d.py
+++ b/Packages/vcs/vcs/vcsvtk/pipeline2d.py
@@ -50,6 +50,7 @@ class IPipeline2D(Pipeline):
             applied to points.
         - _needsCellData: True if the plot needs cell scalars, false if
             the plot needs point scalars
+        - _needsVectors: True if the plot needs vectors, false if it needs scalars
         - _scalarRange: The range of _data1 as tuple(float min, float max)
         - _maskedDataMapper: The mapper used to render masked data.
     """
@@ -79,6 +80,7 @@ class IPipeline2D(Pipeline):
         self._dataWrapModulo = None
         self._hasCellData = None
         self._needsCellData = None
+        self._needsVectors = False
         self._scalarRange = None
         self._maskedDataMapper = None
 
@@ -276,6 +278,8 @@ class Pipeline2D(IPipeline2D):
 
         # Preprocess the input scalar data:
         self._updateScalarData()
+        self._min = self._data1.min()
+        self._max = self._data1.max()
         self._scalarRange = vcs.minmax(self._data1)
 
         # Create/update the VTK dataset.
@@ -313,8 +317,6 @@ class Pipeline2D(IPipeline2D):
         """Overrides baseclass implementation."""
         self._data1 = self._context().trimData2D(self._originalData1)
         self._data2 = self._context().trimData2D(self._originalData2)
-        self._min = self._data1.min()
-        self._max = self._data1.max()
 
     def _updateVTKDataSet(self, plotBasedDualGrid):
         """
@@ -327,8 +329,10 @@ class Pipeline2D(IPipeline2D):
         genGridDict = vcs2vtk.genGrid(self._data1, self._data2, self._gm,
                                       deep=False,
                                       grid=self._vtkDataSet,
-                                      geo=self._vtkGeoTransform, dualGrid=dualGrid)
+                                      geo=self._vtkGeoTransform, genVectors=self._needsVectors,
+                                      dualGrid=dualGrid)
         self._data1 = genGridDict["data"]
+        self._data2 = genGridDict["data2"]
         self._updateFromGenGridDict(genGridDict)
 
     def _createPolyDataFilter(self):
@@ -339,6 +343,7 @@ class Pipeline2D(IPipeline2D):
         elif self._hasCellData:
             # use cells but needs points
             c2p = vtk.vtkCellDataToPointData()
+            c2p.PassCellDataOn()
             c2p.SetInputData(self._vtkDataSet)
             self._vtkPolyDataFilter.SetInputConnection(c2p.GetOutputPort())
         else:
@@ -349,6 +354,27 @@ class Pipeline2D(IPipeline2D):
             self._vtkPolyDataFilter.SetInputConnection(p2c.GetOutputPort())
         self._vtkPolyDataFilter.Update()
         self._resultDict["vtk_backend_filter"] = self._vtkPolyDataFilter
+        # create an actor and a renderer for the surface mesh.
+        # this is used for displaying point information using the hardware selection
+        mapper = vtk.vtkPolyDataMapper()
+        mapper.SetInputConnection(self._vtkPolyDataFilter.GetOutputPort())
+        act = vtk.vtkActor()
+        act.SetMapper(mapper)
+        vp = self._resultDict.get(
+            'ratio_autot_viewport',
+            [self._template.data.x1, self._template.data.x2,
+             self._template.data.y1, self._template.data.y2])
+        plotting_dataset_bounds = self.getPlottingBounds()
+        surface_renderer, xScale, yScale = self._context().fitToViewport(
+            act, vp,
+            wc=plotting_dataset_bounds, geoBounds=self._vtkDataSet.GetBounds(),
+            geo=self._vtkGeoTransform,
+            priority=self._template.data.priority,
+            create_renderer=True)
+        self._resultDict['surface_renderer'] = surface_renderer
+        self._resultDict['surface_scale'] = (xScale, yScale)
+        if (surface_renderer):
+            surface_renderer.SetDraw(False)
 
     def _updateFromGenGridDict(self, genGridDict):
         """Overrides baseclass implementation."""
diff --git a/Packages/vcs/vcs/vcsvtk/vectorpipeline.py b/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
index bc34e3c9e..0badc60b4 100644
--- a/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
@@ -1,75 +1,47 @@
-from .pipeline import Pipeline
+from .pipeline2d import Pipeline2D
 
 import vcs
 from vcs import vcs2vtk
 import vtk
 
 
-class VectorPipeline(Pipeline):
+class VectorPipeline(Pipeline2D):
 
     """Implementation of the Pipeline interface for VCS vector plots."""
 
     def __init__(self, gm, context_):
         super(VectorPipeline, self).__init__(gm, context_)
+        self._needsCellData = False
+        self._needsVectors = True
 
-    def plot(self, data1, data2, tmpl, grid, transform, **kargs):
+    def _plotInternal(self):
         """Overrides baseclass implementation."""
         # Preserve time and z axis for plotting these inof in rendertemplate
-        geo = None  # to make flake8 happy
         projection = vcs.elements["projection"][self._gm.projection]
-        returned = {}
-        taxis = data1.getTime()
-        if data1.ndim > 2:
-            zaxis = data1.getAxis(-3)
+        taxis = self._originalData1.getTime()
+        if self._originalData1.ndim > 2:
+            zaxis = self._originalData1.getAxis(-3)
         else:
             zaxis = None
 
-        # Ok get3 only the last 2 dims
-        data1 = self._context().trimData2D(data1)
-        data2 = self._context().trimData2D(data2)
-
         scale = 1.0
         lat = None
         lon = None
 
-        latAccessor = data1.getLatitude()
-        lonAccessor = data1.getLongitude()
+        latAccessor = self._data1.getLatitude()
+        lonAccessor = self._data1.getLongitude()
         if latAccessor:
             lat = latAccessor[:]
         if lonAccessor:
             lon = lonAccessor[:]
 
-        plotBasedDualGrid = kargs.get('plot_based_dual_grid', True)
-        if (plotBasedDualGrid):
-            hasCellData = data1.hasCellData()
-            dualGrid = hasCellData
-        else:
-            dualGrid = False
-        gridGenDict = vcs2vtk.genGrid(data1, data2, self._gm, deep=False, grid=grid,
-                                      geo=transform, genVectors=True,
-                                      dualGrid=dualGrid)
-
-        data1 = gridGenDict["data"]
-        data2 = gridGenDict["data2"]
-        geo = gridGenDict["geo"]
-
-        grid = gridGenDict['vtk_backend_grid']
-        xm = gridGenDict['xm']
-        xM = gridGenDict['xM']
-        ym = gridGenDict['ym']
-        yM = gridGenDict['yM']
-        continents = gridGenDict['continents']
-        self._dataWrapModulo = gridGenDict['wrap']
-        geo = gridGenDict['geo']
-        cellData = gridGenDict['cellData']
-
-        if geo is not None:
+        if self._vtkGeoTransform is not None:
             newv = vtk.vtkDoubleArray()
             newv.SetNumberOfComponents(3)
             newv.InsertTupleValue(0, [lon.min(), lat.min(), 0])
             newv.InsertTupleValue(1, [lon.max(), lat.max(), 0])
 
-            vcs2vtk.projectArray(newv, projection, [xm, xM, ym, yM])
+            vcs2vtk.projectArray(newv, projection, self._vtkDataSetBounds)
             dimMin = [0, 0, 0]
             dimMax = [0, 0, 0]
 
@@ -89,22 +61,6 @@ class VectorPipeline(Pipeline):
         else:
             scale = 1.0
 
-        returned["vtk_backend_grid"] = grid
-        returned["vtk_backend_geo"] = geo
-        missingMapper = vcs2vtk.putMaskOnVTKGrid(data1, grid, actorColor=None,
-                                                 cellData=cellData, deep=False)
-
-        # None/False are for color and cellData
-        # (sent to vcs2vtk.putMaskOnVTKGrid)
-        returned["vtk_backend_missing_mapper"] = (missingMapper, None, False)
-
-        # convert to point data
-        if cellData:
-            c2p = vtk.vtkCellDataToPointData()
-            c2p.SetInputData(grid)
-            c2p.Update()
-            grid = c2p.GetOutput()
-
         # Vector attempt
         l = self._gm.line
         if l is None:
@@ -129,7 +85,7 @@ class VectorPipeline(Pipeline):
         arrow.FilledOff()
 
         glyphFilter = vtk.vtkGlyph2D()
-        glyphFilter.SetInputData(grid)
+        glyphFilter.SetInputConnection(self._vtkPolyDataFilter.GetOutputPort())
         glyphFilter.SetInputArrayToProcess(1, 0, 0, 0, "vector")
         glyphFilter.SetSourceConnection(arrow.GetOutputPort())
         glyphFilter.SetVectorModeToUseVector()
@@ -163,22 +119,20 @@ class VectorPipeline(Pipeline):
 
         plotting_dataset_bounds = vcs2vtk.getPlottingBounds(
             vcs.utils.getworldcoordinates(self._gm,
-                                          data1.getAxis(-1),
-                                          data1.getAxis(-2)),
-            [xm, xM, ym, yM], geo)
+                                          self._data1.getAxis(-1),
+                                          self._data1.getAxis(-2)),
+            self._vtkDataSetBounds, self._vtkGeoTransform)
         x1, x2, y1, y2 = plotting_dataset_bounds
-        if geo is None:
+        if self._vtkGeoTransform is None:
             wc = plotting_dataset_bounds
         else:
             xrange = list(act.GetXRange())
             yrange = list(act.GetYRange())
             wc = [xrange[0], xrange[1], yrange[0], yrange[1]]
 
-        if (transform and kargs.get('ratio', '0') == 'autot'):
-            returned['ratio_autot_viewport'] = self._processRatioAutot(tmpl, grid)
-
-        vp = returned.get('ratio_autot_viewport',
-                          [tmpl.data.x1, tmpl.data.x2, tmpl.data.y1, tmpl.data.y2])
+        vp = self._resultDict.get('ratio_autot_viewport',
+                                  [self._template.data.x1, self._template.data.x2,
+                                   self._template.data.y1, self._template.data.y2])
         # look for previous dataset_bounds different than ours and
         # modify the viewport so that the datasets are alligned
         # Hack to fix the case when the user does not specify gm.datawc_...
@@ -200,31 +154,29 @@ class VectorPipeline(Pipeline):
         dataset_renderer, xScale, yScale = self._context().fitToViewport(
             act, vp,
             wc=wc,
-            priority=tmpl.data.priority,
+            priority=self._template.data.priority,
             create_renderer=True)
-        returned['dataset_renderer'] = dataset_renderer
-        returned['dataset_scale'] = (xScale, yScale)
-        bounds = [min(xm, xM), max(xm, xM), min(ym, yM), max(ym, yM)]
-        kwargs = {'vtk_backend_grid': grid,
-                  'dataset_bounds': bounds,
+        kwargs = {'vtk_backend_grid': self._vtkDataSet,
+                  'dataset_bounds': self._vtkDataSetBounds,
                   'plotting_dataset_bounds': plotting_dataset_bounds}
-        if ('ratio_autot_viewport' in returned):
+        if ('ratio_autot_viewport' in self._resultDict):
             kwargs["ratio_autot_viewport"] = vp
-        returned.update(self._context().renderTemplate(
-            tmpl, data1,
+        self._resultDict.update(self._context().renderTemplate(
+            self._template, self._data1,
             self._gm, taxis, zaxis, **kwargs))
 
         if self._context().canvas._continents is None:
-            continents = False
-        if continents:
+            self._useContinents = False
+        if self._useContinents:
             continents_renderer, xScale, yScale = self._context().plotContinents(
                 plotting_dataset_bounds, projection,
-                self._dataWrapModulo, vp, tmpl.data.priority,
-                vtk_backend_grid=grid,
-                dataset_bounds=bounds)
-            returned["continents_renderer"] = continents_renderer
-        returned["vtk_backend_actors"] = [[act, plotting_dataset_bounds]]
-        returned["vtk_backend_glyphfilters"] = [glyphFilter]
-        returned["vtk_backend_luts"] = [[None, None]]
-
-        return returned
+                self._dataWrapModulo, vp, self._template.data.priority,
+                vtk_backend_grid=self._vtkDataSet,
+                dataset_bounds=self._vtkDataSetBounds)
+        self._resultDict["vtk_backend_actors"] = [[act, plotting_dataset_bounds]]
+        self._resultDict["vtk_backend_glyphfilters"] = [glyphFilter]
+        self._resultDict["vtk_backend_luts"] = [[None, None]]
+
+    def _updateContourLevelsAndColors(self):
+        """Overrides baseclass implementation."""
+        pass
diff --git a/testing/vcs/CMakeLists.txt b/testing/vcs/CMakeLists.txt
index 9e8cf78e3..fd253ac23 100644
--- a/testing/vcs/CMakeLists.txt
+++ b/testing/vcs/CMakeLists.txt
@@ -947,33 +947,22 @@ cdat_add_test(test_vcs_colorpicker_appearance
   ${BASELINE_DIR}/test_vcs_colorpicker_appearance.png
 )
 
-cdat_add_test(test_vcs_click_info
-  "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_click_info.py
-  ${BASELINE_DIR}/test_vcs_click_info.png
-  a_boxfill
-)
-
-cdat_add_test(test_vcs_click_info_mollweide_boxfill
-  "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_click_info.py
-  ${BASELINE_DIR}/test_vcs_click_info_mollweide_boxfill.png
-  a_mollweide_boxfill
-)
-
-cdat_add_test(test_vcs_click_info_meshfill
-  "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_click_info.py
-  ${BASELINE_DIR}/test_vcs_click_info_meshfill.png
-  a_meshfill
-)
 
-cdat_add_test(test_vcs_click_info_robinson_meshfill
-  "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_click_info.py
-  ${BASELINE_DIR}/test_vcs_click_info_robinson_meshfill.png
-  a_robinson_meshfill
-)
+foreach(plot a_boxfill a_mollweide_boxfill a_meshfill a_robinson_meshfill
+        a_isofill a_isoline vector_default)
+  string(SUBSTRING ${plot} 0 2 plot_prefix)
+  if (${plot_prefix} STREQUAL "a_")
+    string(SUBSTRING ${plot} 2 -1 plot_name)
+  else ()
+    string(REGEX MATCH "[^_]+" plot_name ${plot})
+  endif ()
+  cdat_add_test(test_vcs_click_info_${plot_name}
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_click_info.py
+    "${BASELINE_DIR}/test_vcs_click_info_${plot_name}.png"
+    ${plot}
+    )
+endforeach()
 
 
 cdat_add_test(test_vcs_mercator_edge
diff --git a/testing/vcs/test_vcs_click_info.py b/testing/vcs/test_vcs_click_info.py
index f37ee651a..8d55e77c6 100644
--- a/testing/vcs/test_vcs_click_info.py
+++ b/testing/vcs/test_vcs_click_info.py
@@ -2,6 +2,9 @@ import os, sys, cdms2, vcs, testing.regression as regression
 
 testConfig = {'a_boxfill': ('clt.nc', 'clt', (200, 200)),
               'a_mollweide_boxfill': ('clt.nc', 'clt', (222, 322)),
+              'a_isofill': ('clt.nc', 'clt', (200, 200)),
+              'a_isoline': ('clt.nc', 'clt', (200, 200)),
+              'vector_default': ('clt.nc', ('u', 'v'), (200, 200)),
               'a_meshfill': ('sampleCurveGrid4.nc', 'sample', (222, 322)),
               'a_robinson_meshfill': ('sampleCurveGrid4.nc', 'sample', (222, 322))}
 
@@ -10,21 +13,32 @@ src = sys.argv[1]
 plot = sys.argv[2]
 x = regression.init(bg=False, geometry=(800, 600))
 
-# data
-f = cdms2.open(vcs.sample_data + "/" + testConfig[plot][0])
-s = f(testConfig[plot][1])
-
+vector = False
 # graphics method
 if (plot.find('boxfill') != -1):
     gm = x.getboxfill(plot)
 elif (plot.find('meshfill') != -1):
     gm = x.getmeshfill(plot)
+elif (plot.find('isofill') != -1):
+    gm = x.getisofill(plot)
+elif (plot.find('isoline') != -1):
+    gm = x.getisoline(plot)
+elif (plot.find('vector') != -1):
+    gm = x.getvector(plot[plot.index('_') + 1:])
+    vector = True
 else:
     print "Invalid plot"
     sys.exit(13)
 
-# Has to plot in foreground to simulate a click
-x.plot(s, gm)
+# data
+f = cdms2.open(vcs.sample_data + "/" + testConfig[plot][0])
+if (vector):
+    u = f(testConfig[plot][1][0])
+    v = f(testConfig[plot][1][1])
+    x.plot(u, v, gm)
+else:
+    s = f(testConfig[plot][1])
+    x.plot(s, gm)
 
 # Simulate a click -- VTK Specific
 location = testConfig[plot][2]
-- 
GitLab


From 0376fde263b24867e86836c86450d97073e9090c Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Fri, 20 May 2016 12:09:12 -0700
Subject: [PATCH 086/191] Moved vcsaddons imports into functions, to prevent
 circular dependency issues

---
 Packages/vcs/vcs/Canvas.py      | 4 ++--
 Packages/vcs/vcs/displayplot.py | 2 +-
 Packages/vcs/vcs/queries.py     | 3 ++-
 Packages/vcs/vcs/utils.py       | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Packages/vcs/vcs/Canvas.py b/Packages/vcs/vcs/Canvas.py
index 3289cab04..a7df15f15 100644
--- a/Packages/vcs/vcs/Canvas.py
+++ b/Packages/vcs/vcs/Canvas.py
@@ -68,7 +68,6 @@ from xmldocs import plot_keywords_doc, graphics_method_core, axesconvert, xaxisc
     plot_2_1D_options
 gui_canvas_closed = 0
 canvas_closed = 0
-import vcsaddons  # noqa
 import vcs.manageElements  # noqa
 import configurator  # noqa
 from projection import round_projections  # noqa
@@ -124,7 +123,7 @@ def dictionarytovcslist(dictionary, name):
 
 def _determine_arg_list(g_name, actual_args):
     "Determine what is in the argument list for plotting graphics methods"
-
+    import vcsaddons
     itemplate_name = 2
     igraphics_method = 3
     igraphics_option = 4
@@ -2442,6 +2441,7 @@ Options:::
         return new
 
     def __plot(self, arglist, keyargs):
+        import vcsaddons
 
             # This routine has five arguments in arglist from _determine_arg_list
             # It adds one for bg and passes those on to Canvas.plot as its sixth
diff --git a/Packages/vcs/vcs/displayplot.py b/Packages/vcs/vcs/displayplot.py
index dd66fac1d..80638f226 100755
--- a/Packages/vcs/vcs/displayplot.py
+++ b/Packages/vcs/vcs/displayplot.py
@@ -25,7 +25,6 @@
 #
 import VCS_validation_functions
 import vcs
-import vcsaddons
 
 
 class Dp(object):
@@ -210,6 +209,7 @@ class Dp(object):
         return self._g_type
 
     def _setg_type(self, value):
+        import vcsaddons
         value = VCS_validation_functions.checkString(self, 'g_type', value)
         value = value.lower()
         if value not in vcs.elements and value != "text" and value not in vcsaddons.gms:
diff --git a/Packages/vcs/vcs/queries.py b/Packages/vcs/vcs/queries.py
index dc4ffa418..3974ff90a 100644
--- a/Packages/vcs/vcs/queries.py
+++ b/Packages/vcs/vcs/queries.py
@@ -44,7 +44,6 @@ import dv3d
 import displayplot
 import projection
 import vcs
-import vcsaddons
 
 from error import vcsError
 
@@ -69,6 +68,7 @@ box=a.getboxfill('quick')  # To Modify an existing boxfill use:
 if vcs.isgraphicsmethod(box):
    box.list()
 """
+    import vcsaddons
     if (isinstance(gobj, boxfill.Gfb)):
         return 1
     elif (isinstance(gobj, isofill.Gfi)):
@@ -134,6 +134,7 @@ print vcs.graphicsmethodtype(iso)         # Will print 'isofill'
 print vcs.graphicsmethodtype(ln)          # Will print None, because ln is not a
                                           #         graphics method
 """
+    import vcsaddons
     if (isinstance(gobj, boxfill.Gfb)):
         return 'boxfill'
     elif (isinstance(gobj, isofill.Gfi)):
diff --git a/Packages/vcs/vcs/utils.py b/Packages/vcs/vcs/utils.py
index 03815f71a..5c2a64590 100644
--- a/Packages/vcs/vcs/utils.py
+++ b/Packages/vcs/vcs/utils.py
@@ -20,7 +20,6 @@ import colormap
 import json
 import os
 import tempfile
-import vcsaddons
 import cdms2
 import genutil
 import vtk
@@ -1621,6 +1620,7 @@ def monotonic(x):
 
 
 def getgraphicsmethod(type, name):
+    import vcsaddons
     if type == "default":
         type = "boxfill"
     if isinstance(type, vcsaddons.core.VCSaddon):
@@ -1635,6 +1635,7 @@ def getgraphicsmethod(type, name):
 
 
 def creategraphicsmethod(gtype, name):
+    import vcsaddons
     if gtype in ['isoline', 'Gi']:
         func = vcs.createisoline
     elif gtype in ['isofill', 'Gfi']:
-- 
GitLab


From 732c8766ffadfed0d8ba5a206293b903ac1cfd68 Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Fri, 20 May 2016 12:09:42 -0700
Subject: [PATCH 087/191] Finished polar, added some convenient defaults for it

---
 Packages/vcsaddons/Lib/__init__.py | 111 +++++++++++++++++++++++++++++
 Packages/vcsaddons/Lib/polar.py    |  24 +++++--
 2 files changed, 128 insertions(+), 7 deletions(-)

diff --git a/Packages/vcsaddons/Lib/__init__.py b/Packages/vcsaddons/Lib/__init__.py
index 1ba782945..c38e5b29e 100644
--- a/Packages/vcsaddons/Lib/__init__.py
+++ b/Packages/vcsaddons/Lib/__init__.py
@@ -4,12 +4,123 @@ import polar
 import EzTemplate
 import yxvsxfill
 import continents
+import vcs
+
 
 def createyxvsxfill(name=None,source='default',x=None,template=None):
     return yxvsxfill.Gyf(name,source=source,x=x,template=template)
+
+
 def createhistogram(name=None,source='default',x=None,template=None):
     return histograms.Ghg(name,source=source,x=x,template=template)
+
+
 def createusercontinents(name=None,source="default",x=None,template=None):
     return continents.Guc(name,source=source,x=x,template=template)
+
+
 def createpolar(name=None, source="default", x=None, template=None):
     return polar.Gpo(name, source=source, x=x, template=template)
+
+
+def getpolar(name=None):
+    if name in gms["polar_oned"]:
+        return gms["polar_oned"][name]
+    raise KeyError("No Polar GM exists with name '%s'" % name)
+
+
+if "polar_oned" not in gms:
+    # Create nice polar template
+    try:
+        t = vcs.createtemplate("polar_oned")
+        t.data.x1 = .2
+        t.data.x2 = .8
+        t.data.y1 = .2
+        t.data.y2 = .8
+
+        t.legend.x1 = .85
+        t.legend.x2 = 1
+        t.legend.y1 = .15
+        t.legend.y2 = .85
+
+        dash = vcs.createline()
+        dash.type = "dash"
+        dot = vcs.createline()
+        dot.type = "dot"
+        t.xtic1.line = dash
+        t.ytic1.line = dot
+
+        left_aligned = vcs.createtextorientation()
+        left_aligned.halign = "left"
+        left_aligned.valign = "half"
+        t.legend.textorientation = left_aligned
+    except vcs.vcsError:
+        # Template already exists
+        pass
+    # Create some nice default polar GMs
+    degree_polar = createpolar("degrees", template="polar_oned")
+    degree_polar.datawc_x1 = 0
+    degree_polar.datawc_x2 = 360
+    degree_polar.xticlabels1 = {
+        i: str(i) for i in range(0, 360, 45)
+    }
+
+    clock_24 = createpolar("diurnal", template="polar_oned")
+    clock_24.datawc_x1 = 0
+    clock_24.datawc_x2 = 24
+    clock_24.clockwise = True
+    # 6 AM on the right
+    clock_24.theta_offset = -6
+    clock_24.xticlabels1 = {
+        i: str(i) for i in range(0, 24, 3)
+    }
+
+
+    clock_24_meridiem = createpolar("diurnal_12_hour", source="diurnal", template="polar_oned")
+    clock_24_meridiem.xticlabels1 = {
+        0: "12 AM",
+        3: "3 AM",
+        6: "6 AM",
+        9: "9 AM",
+        12: "12 PM",
+        15: "3 PM",
+        18: "6 PM",
+        21: "9 PM"
+    }
+
+    clock_12 = createpolar("semidiurnal", source="diurnal", template="polar_oned")
+    clock_12.datawc_x2 = 12
+    clock_12.xticlabels1 = {
+        i: str(i) for i in range(3, 13, 3)
+    }
+    # 3 on the right
+    clock_12.theta_offset = -3
+
+    annual_cycle = createpolar("annual_cycle", template="polar_oned")
+    annual_cycle.datawc_x1 = 1
+    annual_cycle.datawc_x2 = 13
+    annual_cycle.clockwise = True
+    annual_cycle.xticlabels1 = {
+        1: "Jan",
+        2: "Feb",
+        3: "Mar",
+        4: "Apr",
+        5: "May",
+        6: "Jun",
+        7: "Jul",
+        8: "Aug",
+        9: "Sep",
+        10: "Oct",
+        11: "Nov",
+        12: "Dec"
+    }
+    # Put December on the top
+    annual_cycle.theta_offset = -2
+
+    seasonal = createpolar("seasonal", template="polar_oned")
+    seasonal.datawc_x1 = 0
+    seasonal.datawc_x2 = 4
+    seasonal.xticlabels1 = {0: "DJF", 1: "MAM", 2: "JJA", 3: "SON"}
+    seasonal.clockwise = True
+    # DJF on top
+    seasonal.theta_offset = -1
diff --git a/Packages/vcsaddons/Lib/polar.py b/Packages/vcsaddons/Lib/polar.py
index 8aff589a7..0b0f6a9fc 100644
--- a/Packages/vcsaddons/Lib/polar.py
+++ b/Packages/vcsaddons/Lib/polar.py
@@ -126,7 +126,7 @@ def convert_arrays(var, theta):
                         names.append(None)
             else:
                 magnitudes = [var]
-                names.appned(None)
+                names.append(None)
         elif isinstance(var, numpy.ndarray):
             if len(var.shape) == 1:
                 magnitudes = [list(var)]
@@ -167,6 +167,7 @@ class Gpo(vcsaddons.core.VCSaddon):
         self.g_name = "Gpo"
         self.g_type = "polar_oned"
         super(Gpo, self).__init__(name, source, x, template)
+        self.x = None
         if source == "default":
             self.markersizes = [3]
             self.markercolors = ["black"]
@@ -203,21 +204,28 @@ class Gpo(vcsaddons.core.VCSaddon):
             self.theta_tick_count = gm.theta_tick_count
             self.group_names = gm.group_names
 
+    def magnitude_from_value(self, value, minmax):
+        if numpy.allclose((self.datawc_y1, self.datawc_y2), 1e20):
+            min, max = minmax
+        else:
+            min, max = self.datawc_y1, self.datawc_y2
+
+        return (value - min) / float(max - min)
+
     def theta_from_value(self, value):
         if numpy.allclose((self.datawc_x1, self.datawc_x2), 1e20):
             # No scale specified, just use the value as theta
-            return value
+            return value + self.theta_offset
 
         minval = self.datawc_x1
         maxval = self.datawc_x2
+        offset = self.theta_offset / float(maxval - minval)
 
-        pct_val = (value - minval) / float(maxval - minval)
+        pct_val = (value - minval) / float(maxval - minval) + offset
         rad_val = numpy.pi * 2 * pct_val
         if self.clockwise:
             # Reflect the value
             rad_val *= -1
-        # Adjust by theta_offset
-        rad_val += self.theta_offset
         return rad_val
 
     def plot(self, var, theta=None, template=None, bg=0, x=None):
@@ -230,6 +238,8 @@ class Gpo(vcsaddons.core.VCSaddon):
         Otherwise, if theta is provided, it uses var as magnitude and the theta given.
         """
         if x is None:
+            if self.x is None:
+                self.x = vcs.init()
             x = self.x
         if template is None:
             template = self.template
@@ -309,7 +319,7 @@ class Gpo(vcsaddons.core.VCSaddon):
                 m_labels = None
 
             for lev in m_scale:
-                lev_radius = radius * float(lev - m_scale[0]) / (m_scale[-1] - m_scale[0])
+                lev_radius = radius * self.magnitude_from_value(lev, (m_scale[0], m_scale[-1]))
                 x, y = circle_points(center, lev_radius, ratio=window_aspect)
                 if m_labels is not None:
                     if lev in mag_labels:
@@ -390,7 +400,7 @@ class Gpo(vcsaddons.core.VCSaddon):
             y = []
             for m, t in zip(mag, theta):
                 t = self.theta_from_value(t)
-                r = (m - m_scale[0]) / float(m_scale[-1] - m_scale[0]) * radius
+                r = self.magnitude_from_value(m, (m_scale[0], m_scale[-1])) * radius
                 x.append(xmul * numpy.cos(t) * r + center[0])
                 y.append(ymul * numpy.sin(t) * r + center[1])
 
-- 
GitLab


From 022a3aa788d39cef37242b3e86cb436214e2b88e Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Fri, 20 May 2016 12:10:07 -0700
Subject: [PATCH 088/191] Added tests for polar

---
 testing/vcsaddons/CMakeLists.txt              | 25 ++++++++
 .../vcsaddons/vcs_addons_test_polar_annual.py | 40 +++++++++++++
 .../vcs_addons_test_polar_degrees.py          | 29 ++++++++++
 .../vcs_addons_test_polar_diurnal.py          | 44 ++++++++++++++
 .../vcs_addons_test_polar_seasonal.py         | 58 +++++++++++++++++++
 .../vcs_addons_test_polar_semidiurnal.py      | 44 ++++++++++++++
 6 files changed, 240 insertions(+)
 create mode 100644 testing/vcsaddons/vcs_addons_test_polar_annual.py
 create mode 100644 testing/vcsaddons/vcs_addons_test_polar_degrees.py
 create mode 100644 testing/vcsaddons/vcs_addons_test_polar_diurnal.py
 create mode 100644 testing/vcsaddons/vcs_addons_test_polar_seasonal.py
 create mode 100644 testing/vcsaddons/vcs_addons_test_polar_semidiurnal.py

diff --git a/testing/vcsaddons/CMakeLists.txt b/testing/vcsaddons/CMakeLists.txt
index 06ebff600..a0fd4e90b 100644
--- a/testing/vcsaddons/CMakeLists.txt
+++ b/testing/vcsaddons/CMakeLists.txt
@@ -59,6 +59,31 @@ cdat_add_test(vcs_addons_test_convert_arrays
   "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/vcsaddons/vcs_addons_test_convert_arrays.py
 )
+cdat_add_test(vcs_addons_test_polar_degrees
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcsaddons/vcs_addons_test_polar_degrees.py
+  ${BASELINE_DIR}/vcs_addons_test_polar_degrees.png
+)
+cdat_add_test(vcs_addons_test_polar_annual
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcsaddons/vcs_addons_test_polar_annual.py
+  ${BASELINE_DIR}/vcs_addons_test_polar_annual.png
+)
+cdat_add_test(vcs_addons_test_polar_diurnal
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcsaddons/vcs_addons_test_polar_diurnal.py
+  ${BASELINE_DIR}/vcs_addons_test_polar_diurnal.png
+)
+cdat_add_test(vcs_addons_test_polar_seasonal
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcsaddons/vcs_addons_test_polar_seasonal.py
+  ${BASELINE_DIR}/vcs_addons_test_polar_seasonal.png
+)
+cdat_add_test(vcs_addons_test_polar_semidiurnal
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcsaddons/vcs_addons_test_polar_semidiurnal.py
+  ${BASELINE_DIR}/vcs_addons_test_polar_semidiurnal.png
+)
 
 if (CDAT_DOWNLOAD_SAMPLE_DATA)
   cdat_add_test(vcs_addons_EzTemplate_2x2
diff --git a/testing/vcsaddons/vcs_addons_test_polar_annual.py b/testing/vcsaddons/vcs_addons_test_polar_annual.py
new file mode 100644
index 000000000..420b724cd
--- /dev/null
+++ b/testing/vcsaddons/vcs_addons_test_polar_annual.py
@@ -0,0 +1,40 @@
+import sys,os
+src = sys.argv[1]
+pth = os.path.join(os.path.dirname(__file__),"..")
+sys.path.append(pth)
+import checkimage
+import vcs
+import vcsaddons, numpy
+
+x=vcs.init()
+x.setantialiasing(0)
+x.drawlogooff()
+x.setbgoutputdimensions(1200,1091,units="pixels")
+
+polar = vcsaddons.getpolar("annual_cycle")
+polar.markers = ["dot"]
+polar.markersizes = [3]
+
+polar.magnitude_tick_angle = numpy.pi / 8
+
+import cdms2, cdutil
+
+f = cdms2.open(os.path.join(vcs.sample_data, "clt.nc"))
+clt = f("clt")
+cdutil.setAxisTimeBoundsMonthly(clt.getTime())
+averaged_time = cdutil.averager(clt, axis="t")
+averaged_time = averaged_time.reshape((1, averaged_time.shape[0], averaged_time.shape[1]))
+averaged_time_for_departures = numpy.repeat(averaged_time, len(clt), axis=0)
+
+clt_departures = clt - averaged_time_for_departures
+clt_departures.setAxisList(clt.getAxisList())
+avg_departures = cdutil.averager(clt_departures, axis="xy")
+
+theta = range(1, len(clt) + 1)
+magnitude = avg_departures
+polar.plot(magnitude, theta, bg=True, x=x)
+
+fnm = "vcs_addons_test_polar_annual.png"
+x.png(fnm)
+ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold)
+sys.exit(ret)
diff --git a/testing/vcsaddons/vcs_addons_test_polar_degrees.py b/testing/vcsaddons/vcs_addons_test_polar_degrees.py
new file mode 100644
index 000000000..46d34168a
--- /dev/null
+++ b/testing/vcsaddons/vcs_addons_test_polar_degrees.py
@@ -0,0 +1,29 @@
+import sys,os
+src = sys.argv[1]
+pth = os.path.join(os.path.dirname(__file__),"..")
+sys.path.append(pth)
+import checkimage
+import vcs
+import vcsaddons, numpy
+
+x=vcs.init()
+x.setantialiasing(0)
+x.drawlogooff()
+x.setbgoutputdimensions(1200,1091,units="pixels")
+
+polar = vcsaddons.getpolar("degrees")
+polar.markers = ["dot", "circle"]
+polar.markersizes = [3, 5]
+
+polar.magnitude_tick_angle = numpy.pi / 6
+
+theta = numpy.array(range(0, 720, 2))
+magnitude = 9 * numpy.sin(5 * 2 * numpy.pi * theta / 360)
+polar.datawc_y1 = 0
+polar.datawc_y2 = max(magnitude)
+polar.plot(magnitude, theta, bg=True, x=x)
+
+fnm = "vcs_addons_test_polar_degrees.png"
+x.png(fnm)
+ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold)
+sys.exit(ret)
diff --git a/testing/vcsaddons/vcs_addons_test_polar_diurnal.py b/testing/vcsaddons/vcs_addons_test_polar_diurnal.py
new file mode 100644
index 000000000..ac0664171
--- /dev/null
+++ b/testing/vcsaddons/vcs_addons_test_polar_diurnal.py
@@ -0,0 +1,44 @@
+import sys,os
+src = sys.argv[1]
+pth = os.path.join(os.path.dirname(__file__),"..")
+sys.path.append(pth)
+import checkimage
+import vcs
+import vcsaddons, numpy
+import cdms2, cdutil, cdtime
+
+x=vcs.init()
+x.setantialiasing(0)
+x.drawlogooff()
+x.setbgoutputdimensions(1200,1091,units="pixels")
+
+f = cdms2.open(os.path.join(vcs.sample_data, "thermo.nc"))
+temp = f('t')
+levels = temp.getLevel()
+time = temp.getTime()
+# Break up temp by level
+magnitudes = [temp[:,i] for i in range(temp.shape[1])]
+for i, mag in enumerate(magnitudes):
+    mag.id = "%0.f %s" % (levels[i], levels.units)
+
+times = []
+for t in time:
+    reltime = cdtime.relativetime(t, time.units)
+    comptime = reltime.tocomponent()
+    times.append(comptime.hour)
+
+thetas = [times] * len(magnitudes)
+
+polar = vcsaddons.getpolar("diurnal")
+polar.markers = ["dot"]
+polar.markersizes = [3]
+polar.markercolors = vcs.getcolors(list(levels))
+
+polar.magnitude_tick_angle = numpy.pi / 8
+
+polar.plot(magnitudes, thetas, bg=True, x=x)
+
+fnm = "vcs_addons_test_polar_diurnal.png"
+x.png(fnm)
+ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold)
+sys.exit(ret)
diff --git a/testing/vcsaddons/vcs_addons_test_polar_seasonal.py b/testing/vcsaddons/vcs_addons_test_polar_seasonal.py
new file mode 100644
index 000000000..42612ddae
--- /dev/null
+++ b/testing/vcsaddons/vcs_addons_test_polar_seasonal.py
@@ -0,0 +1,58 @@
+import sys,os
+src = sys.argv[1]
+pth = os.path.join(os.path.dirname(__file__),"..")
+sys.path.append(pth)
+import checkimage
+import vcs
+import vcsaddons, numpy, MV2
+import cdms2, cdutil, cdtime
+
+x=vcs.init()
+x.setantialiasing(0)
+x.drawlogooff()
+x.setbgoutputdimensions(1200,1091,units="pixels")
+
+f = cdms2.open(os.path.join(vcs.sample_data, "clt.nc"))
+# Trim first few months and last month so we have even number of seasons
+cloudiness = f('clt', time=(11, 119))
+cdutil.setAxisTimeBoundsMonthly(cloudiness.getTime())
+cloudiness_time_axis = cloudiness.getTime()
+averaged_seasons = MV2.zeros((36, 46, 72))
+# Average the seasons in cloudiness
+for i in range(36):
+    averaged_seasons[i] = cdutil.averager(cloudiness(time=(cloudiness_time_axis[i * 3], cloudiness_time_axis[(i+1) * 3])), axis="t")
+
+averaged_seasons.setAxis(1, cloudiness.getLatitude())
+averaged_seasons.setAxis(2, cloudiness.getLongitude())
+
+regions = {
+    "north_polar": (66, 90),
+    "north_temperate": (22, 66),
+    "tropics": (-22, 22),
+    "south_temperate": (-66, -22),
+    "south_polar": (-90, -66)
+}
+
+def get_region_avg(var, r, axis="xy"):
+    avg = cdutil.averager(var(latitude=regions[r]), axis=axis)
+    avg.id = r
+    return avg
+
+magnitudes = [get_region_avg(averaged_seasons, region) for region in regions]
+thetas = [range(4) * 27] * 5
+
+polar = vcsaddons.getpolar("seasonal")
+polar.datawc_y1 = 0
+polar.datawc_y2 = 100
+polar.markers = ["dot"]
+polar.markersizes = [3]
+polar.markercolors = vcs.getcolors([-90, -66, -22, 22, 66, 90], split=False)
+
+polar.magnitude_tick_angle = numpy.pi / 4
+
+polar.plot(magnitudes, thetas, bg=True, x=x)
+
+fnm = "vcs_addons_test_polar_seasonal.png"
+x.png(fnm)
+ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold)
+sys.exit(ret)
diff --git a/testing/vcsaddons/vcs_addons_test_polar_semidiurnal.py b/testing/vcsaddons/vcs_addons_test_polar_semidiurnal.py
new file mode 100644
index 000000000..900d570b4
--- /dev/null
+++ b/testing/vcsaddons/vcs_addons_test_polar_semidiurnal.py
@@ -0,0 +1,44 @@
+import sys,os
+src = sys.argv[1]
+pth = os.path.join(os.path.dirname(__file__),"..")
+sys.path.append(pth)
+import checkimage
+import vcs
+import vcsaddons, numpy
+import cdms2, cdutil, cdtime
+
+x=vcs.init()
+x.setantialiasing(0)
+x.drawlogooff()
+x.setbgoutputdimensions(1200,1091,units="pixels")
+
+f = cdms2.open(os.path.join(vcs.sample_data, "thermo.nc"))
+temp = f('t')
+levels = temp.getLevel()
+time = temp.getTime()
+# Break up temp by level
+magnitudes = [temp[:,i] for i in range(temp.shape[1])]
+for i, mag in enumerate(magnitudes):
+    mag.id = "%0.f %s" % (levels[i], levels.units)
+
+times = []
+for t in time:
+    reltime = cdtime.relativetime(t, time.units)
+    comptime = reltime.tocomponent()
+    times.append(comptime.hour % 12)
+
+thetas = [times] * len(magnitudes)
+
+polar = vcsaddons.getpolar("semidiurnal")
+polar.markers = ["dot"]
+polar.markersizes = [3]
+polar.markercolors = vcs.getcolors(list(levels))
+
+polar.magnitude_tick_angle = numpy.pi / 8
+
+polar.plot(magnitudes, thetas, bg=True, x=x)
+
+fnm = "vcs_addons_test_polar_semidiurnal.png"
+x.png(fnm)
+ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold)
+sys.exit(ret)
-- 
GitLab


From 2dd2b3554fabbd1ec63e8e2c877f05cad4c61ecf Mon Sep 17 00:00:00 2001
From: Dan Lipsa <dan.lipsa@kitware.com>
Date: Thu, 12 May 2016 11:34:31 -0400
Subject: [PATCH 089/191] Reenable autot_axis tests. Keep max Y to 500.

---
 Packages/testing/regression.py            |  3 +-
 testing/vcs/CMakeLists.txt                | 35 ++++++++++++-----------
 testing/vcs/test_vcs_autot_axis_titles.py |  9 ++++--
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/Packages/testing/regression.py b/Packages/testing/regression.py
index 68ded76d9..b9cd2cdeb 100644
--- a/Packages/testing/regression.py
+++ b/Packages/testing/regression.py
@@ -24,7 +24,8 @@ def init(*args, **kwargs):
     vcsinst.setantialiasing(0)
     vcsinst.drawlogooff()
 
-    if ('bg' in kwargs and kwargs['bg']) or ('bg' not in kwargs):
+    if ((('bg' in kwargs and kwargs['bg']) or ('bg' not in kwargs)) and
+        ('geometry' not in kwargs)):
         vcsinst.setbgoutputdimensions(1200, 1091, units="pixels")
     return vcsinst
 
diff --git a/testing/vcs/CMakeLists.txt b/testing/vcs/CMakeLists.txt
index fd253ac23..c6ccf8517 100644
--- a/testing/vcs/CMakeLists.txt
+++ b/testing/vcs/CMakeLists.txt
@@ -983,23 +983,24 @@ cdat_add_test(test_vcs_large_pattern_hatch
   ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_large_pattern_hatch.py
   ${BASELINE_DIR}/test_vcs_large_pattern_hatch.png
 )
-# crashes on mac commenting out for release`
-#foreach(x_over_y 0.5 2)
-#  # a_meshfill does not work yet, as meshfills are wrapped which is not known to VCS
-#  foreach(plot a_boxfill a_mollweide_boxfill a_robinson_meshfill a_lambert_isofill a_robinson_isoline)
-#    foreach(mode foreground background)
-#      string(SUBSTRING ${plot} 2 -1 plot_name)
-#      cdat_add_test(test_vcs_autot_axis_titles_${mode}_${plot_name}_${x_over_y}
-#        "${PYTHON_EXECUTABLE}"
-#        ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_autot_axis_titles.py
-#        "${BASELINE_DIR}/test_vcs_autot_axis_titles_${plot_name}_${x_over_y}.png"
-#        ${mode}
-#        ${plot}
-#        ${x_over_y}
-#        )
-#    endforeach()
-#  endforeach()
-#endforeach()
+
+foreach(x_over_y 0.5 2)
+ # a_meshfill does not work yet, as meshfills are wrapped which is not known to VCS
+ foreach(plot a_boxfill a_mollweide_boxfill a_robinson_meshfill a_lambert_isofill a_robinson_isoline)
+   foreach(mode foreground background)
+     string(SUBSTRING ${plot} 2 -1 plot_name)
+     cdat_add_test(test_vcs_autot_axis_titles_${mode}_${plot_name}_${x_over_y}
+       "${PYTHON_EXECUTABLE}"
+       ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_autot_axis_titles.py
+       "${BASELINE_DIR}/test_vcs_autot_axis_titles_${plot_name}_${x_over_y}.png"
+       ${mode}
+       ${plot}
+       ${x_over_y}
+       )
+   endforeach()
+ endforeach()
+endforeach()
+
 cdat_add_test(test_vcs_boxfill_lambert_crash
   "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_lambert_crash.py
diff --git a/testing/vcs/test_vcs_autot_axis_titles.py b/testing/vcs/test_vcs_autot_axis_titles.py
index dcc0f00b1..2728cbd6d 100644
--- a/testing/vcs/test_vcs_autot_axis_titles.py
+++ b/testing/vcs/test_vcs_autot_axis_titles.py
@@ -8,11 +8,14 @@ testConfig = {'a_boxfill': ('clt.nc', 'clt'),
               'a_robinson_isoline': ('clt.nc', 'clt')}
 
 # Tests if ratio=autot works correctly for background and foreground plots
+bg = 1
+if (sys.argv[2] == 'foreground'):
+    bg = 0
 plot = sys.argv[3]
 x_over_y = sys.argv[4]
 if (x_over_y == '0.5'):
-    xSize = 400
-    ySize = 800
+    xSize = 250
+    ySize = 500
 else:
     xSize = 800
     ySize = 400
@@ -39,5 +42,5 @@ else:
 x.setantialiasing(0)
 x.drawlogooff()
 x.plot(s, gm, ratio="autot")
-name = "test_autot_axis_titles_" + plot[2:] + "_" + x_over_y + "_" + str(bg) + ".png"
+name = "test_vcs_autot_axis_titles_" + plot[2:] + "_" + x_over_y + "_" + str(bg) + ".png"
 regression.run(x, name, sys.argv[1])
\ No newline at end of file
-- 
GitLab


From c98cc7376ed2b5ed33886af8177e03a7b942872b Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Mon, 23 May 2016 08:59:16 -0400
Subject: [PATCH 090/191] Removed redundant object suffix

---
 Packages/vcs/docs/user-guide.rst | 41 ++++++++++++++++----------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/Packages/vcs/docs/user-guide.rst b/Packages/vcs/docs/user-guide.rst
index d74b3aec2..97a55b7d4 100644
--- a/Packages/vcs/docs/user-guide.rst
+++ b/Packages/vcs/docs/user-guide.rst
@@ -46,29 +46,28 @@ A description of each primary object is warranted before showing their use and u
 
 **Graphics Method Objects**
 
-
 A graphics method simply defines how data is to be displayed on the screen. Currently, there are eleven different graphics methods with more on the way. Each graphics method has its own unique set of attributes (or members) and functions. They also have a set of core attributes that are common in all graphics methods. The descriptions of the current set of graphics methods are as follows:
 
-* ``boxfillobject`` - The boxfill graphics method draws color grid cells to represent the data on the VCS - Canvas. Its class symbol or alias is “Gfb”.
-* ``continentsobject`` - The continents graphics method draws a predefined, generic set of continental -outlines in a longitude by latitude space. To draw continental outlines, no external data set is required. Its class symbol or alias is “Gcon”.
-* ``isofillobject`` - The isofill graphics method fills the area between selected isolevels (levels of constant value) of a two-dimensional array with a user-specified color. Its class symbol or alias is “Gfi”.
+* ``boxfill`` - The boxfill graphics method draws color grid cells to represent the data on the VCS - Canvas. Its class symbol or alias is “Gfb”.
+* ``continents`` - The continents graphics method draws a predefined, generic set of continental -outlines in a longitude by latitude space. To draw continental outlines, no external data set is required. Its class symbol or alias is “Gcon”.
+* ``isofill`` - The isofill graphics method fills the area between selected isolevels (levels of constant value) of a two-dimensional array with a user-specified color. Its class symbol or alias is “Gfi”.
 * ``isolineobject`` - The isoline graphics method draws lines of constant value at specified levels in order to graphically represent a two-dimensional array. It also labels the values of these isolines on the VCS Canvas. Its class symbol or alias is “Gi”.
-* ``outfillobject`` - The outfill graphics method fills a set of integer values in any data array. Its primary purpose is to display continents by filling their area as defined by a surface type array that indicates land, ocean, and sea-ice points. Its class symbol or alias is “Gfo”.
-* ``outlineobject`` - The Outline graphics method outlines a set of integer values in any data array. Its primary purpose is to display continental outlines as defined by a surface type array that indicates land, ocean, and sea-ice points. Its class symbol or alias is “Go”.
-* ``scatterobject`` - The scatter graphics method displays a scatter plot of two 4-dimensional data arrays, e.g. A(x,y,z,t) and B(x,y,z,t). Its class symbol or alias is “GSp”.
-* ``vectorobject`` - The Vector graphics method displays a vector plot of a 2D vector field. Vectors are located at the coordinate locations and point in the direction of the data vector field. Vector magnitudes are the product of data vector field lengths and a scaling factor. Its class symbol or alias is “Gv”.
-* ``xvsyobject`` - The XvsY graphics method displays a line plot from two 1D data arrays, that is X(t) and Y(t), where ‘t’ represents the 1D coordinate values. Its class symbol or alias is “GXY”.
-* ``xyvsyobject`` - The Xyvsy graphics method displays a line plot from a 1D data array, i.e. a plot of X(y) where ‘y’ represents the 1D coordinate values. Its class symbol or alias is “GXy”.
-* ``Yxvsxobject`` - The Yxvsx graphics method displays a line plot from a 1D data array, i.e. a plot of Y(x) where ‘x’ represents the 1D coordinate values. Its class symbol or alias is “GYx”.
-* ``3dscalarobject`` - The 3dscalar graphics method displays an interactive 3D plot of a 4-dimensional (x,y,z,t) data array. Its class symbol or alias is “3d_scalar”.
-* ``3dvectorobject`` - The 3dvector graphics method displays an interactive 3D plot of a 4-dimensional (x,y,z,t) vector field. Its class symbol or alias is “3d_vector”.
+* ``outfill`` - The outfill graphics method fills a set of integer values in any data array. Its primary purpose is to display continents by filling their area as defined by a surface type array that indicates land, ocean, and sea-ice points. Its class symbol or alias is “Gfo”.
+* ``outline`` - The Outline graphics method outlines a set of integer values in any data array. Its primary purpose is to display continental outlines as defined by a surface type array that indicates land, ocean, and sea-ice points. Its class symbol or alias is “Go”.
+* ``scatter`` - The scatter graphics method displays a scatter plot of two 4-dimensional data arrays, e.g. A(x,y,z,t) and B(x,y,z,t). Its class symbol or alias is “GSp”.
+* ``vector`` - The Vector graphics method displays a vector plot of a 2D vector field. Vectors are located at the coordinate locations and point in the direction of the data vector field. Vector magnitudes are the product of data vector field lengths and a scaling factor. Its class symbol or alias is “Gv”.
+* ``xvsy`` - The XvsY graphics method displays a line plot from two 1D data arrays, that is X(t) and Y(t), where ‘t’ represents the 1D coordinate values. Its class symbol or alias is “GXY”.
+* ``xyvsy`` - The Xyvsy graphics method displays a line plot from a 1D data array, i.e. a plot of X(y) where ‘y’ represents the 1D coordinate values. Its class symbol or alias is “GXy”.
+* ``Yxvsx`` - The Yxvsx graphics method displays a line plot from a 1D data array, i.e. a plot of Y(x) where ‘x’ represents the 1D coordinate values. Its class symbol or alias is “GYx”.
+* ``3dscalar`` - The 3dscalar graphics method displays an interactive 3D plot of a 4-dimensional (x,y,z,t) data array. Its class symbol or alias is “3d_scalar”.
+* ``3dvector`` - The 3dvector graphics method displays an interactive 3D plot of a 4-dimensional (x,y,z,t) vector field. Its class symbol or alias is “3d_vector”.
 
 
 **Picture Template Object**
 
 A picture template determines the location of each picture segment, the space to be allocated to it, and related properties relevant to its display. The description of the picture template is as follows:
 
-* ``templateobject`` - Picture Template attributes describe where and how segments of a picture will be displayed. The segments are graphical representations of: textual identification of the data formatted values of single-valued dimensions and mean, maximum, and minimum data values axes, tick marks, labels, boxes, lines, and a legend that is graphics-method specific the data. Picture templates describe where to display all segments including the data. Its class symbol or alias is “P”.
+* ``template`` - Picture Template attributes describe where and how segments of a picture will be displayed. The segments are graphical representations of: textual identification of the data formatted values of single-valued dimensions and mean, maximum, and minimum data values axes, tick marks, labels, boxes, lines, and a legend that is graphics-method specific the data. Picture templates describe where to display all segments including the data. Its class symbol or alias is “P”.
 
 **Data Object**
 
@@ -83,7 +82,7 @@ A description of each secondary object is warranted before showing their use and
 
 The colormap object is used to specify, create, and modify colormaps. There are 256 colors and color indices, but only the first 240 color indices can be modified (indices 240 through 255 are reserved for VCS internal use). The description of the colormap object is as follows:
 
-* ``colormapobject`` - A colormap contains 240 user-definable colors that are used for graphical displays. The color mixtures are defined in terms of percentages of red, green, and blue colors (0 to 100% for each). The resulting color depends on the specified mixtures of red, green, and blue. Its class symbol or alias is “Cp”.
+* ``colormap`` - A colormap contains 240 user-definable colors that are used for graphical displays. The color mixtures are defined in terms of percentages of red, green, and blue colors (0 to 100% for each). The resulting color depends on the specified mixtures of red, green, and blue. Its class symbol or alias is “Cp”.
 Note: VCS colormaps are objects, but they are not referenced like other secondary objects.
 
 
@@ -91,32 +90,32 @@ Note: VCS colormaps are objects, but they are not referenced like other secondar
 
 The fillarea objects allows the user to edit fillarea attributes, including fillarea interior style, style index, and color index. The description of the fillarea object is as follows:
 
-* ``fillareaobject`` - The fill area attributes are used to display regions defined by closed polygons, which can be filled with a uniform color, a pattern, or a hatch style. Attributes specify the style, color, position, and dimensions of the fill area. Its class symbol or alias is “Tf”.
+* ``fillarea`` - The fill area attributes are used to display regions defined by closed polygons, which can be filled with a uniform color, a pattern, or a hatch style. Attributes specify the style, color, position, and dimensions of the fill area. Its class symbol or alias is “Tf”.
 
 
 **Line Object**
 
 The line object allows the editing of line type, width, and color index. The description of the line object is as follows:
 
-* ``lineobject`` - The line attributes specify the type, width, and color of the line to be drawn for a graphical display. Its class symbol or alias is “Tl”.
+* ``line`` - The line attributes specify the type, width, and color of the line to be drawn for a graphical display. Its class symbol or alias is “Tl”.
 
 
 **Marker Object**
 
 The marker object allows the editing of the marker type, width, and color index. The description of the marker object is as follows:
 
-* ``markerobject`` - The marker attribute specifies graphical symbols, symbol sizes, and colors used in appropriate graphics methods. Its class symbol or alias is “Tm”.
+* ``marker`` - The marker attribute specifies graphical symbols, symbol sizes, and colors used in appropriate graphics methods. Its class symbol or alias is “Tm”.
 
 
 **Text Objects**
 
 Graphical displays often contain textual inscriptions, which provide further information. The text-table object attributes allow the generation of character strings on the VCS Canvas by defining the character font, precision, expansion, spacing, and color. The text-orientation object attributes allow the appearance of text character strings to be changed by defining the character height, up-angle, path, and horizontal and vertical alignment. The text-combined object is a combination of both text-table and text-orientation objects. The description of the text objects are as follows:
 
-* ``textcombinedobject`` - The text-combined attributes combine the text-table attributes and a text-orientation attributes together. From combining the two classes, the user is able to set attributes for both classes at once (i.e., define the font, spacing, expansion, color index, height, angle, path, vertical alignment, and horizontal alignment). Its class symbol or alias is “Tc”.
+* ``textcombined`` - The text-combined attributes combine the text-table attributes and a text-orientation attributes together. From combining the two classes, the user is able to set attributes for both classes at once (i.e., define the font, spacing, expansion, color index, height, angle, path, vertical alignment, and horizontal alignment). Its class symbol or alias is “Tc”.
 
-* ``textorientationobject`` - The text-orientation attributes set names that define the height, angel, path, horizontal alignment and vertical alignment. Its class symbol or alias is “To”.
+* ``textorientation`` - The text-orientation attributes set names that define the height, angel, path, horizontal alignment and vertical alignment. Its class symbol or alias is “To”.
 
-* ``texttableobject`` - The text-table attributes set names that define the font, spacing, expansion, and color index. Its class symbol or alias is “Tt”.
+* ``texttable`` - The text-table attributes set names that define the font, spacing, expansion, and color index. Its class symbol or alias is “Tt”.
 
 
 Getting Started with VCS
-- 
GitLab


From 6f529d921fce1a14e9a04ea2d6b62b12c853962f Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Mon, 23 May 2016 09:36:53 -0400
Subject: [PATCH 091/191] Fixed styling of references

---
 Packages/vcs/docs/reference.rst | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Packages/vcs/docs/reference.rst b/Packages/vcs/docs/reference.rst
index 0af233efa..73db692bf 100644
--- a/Packages/vcs/docs/reference.rst
+++ b/Packages/vcs/docs/reference.rst
@@ -1,8 +1,8 @@
 VCS Reference Guide
 --------------------
 
-``init``
-^^^^^^^^
+init
+^^^^
 * Initialize, Construct a VCS Canvas Object
 
 .. code-block:: python
@@ -45,8 +45,8 @@ VCS Reference Guide
 
     # Plot slab using isoline and template objects
 
-``help``
-^^^^^^^^
+help
+^^^^
 * Print out the object's doc string
 
 .. code-block:: python
@@ -59,8 +59,8 @@ VCS Reference Guide
     # This will print out information on how to use ln
     a.objecthelp(ln)
 
-``open``
-^^^^^^^^
+open
+^^^^
 * Open VCS Canvas object.
 * This routine really just manages the VCS canvas. It will popup the VCS Canvas for viewing. It can be used to display the VCS Canvas.
 
@@ -70,8 +70,8 @@ VCS Reference Guide
     a = vcs.init()
     a.open()
 
-``close``
-^^^^^^^^^
+close
+^^^^^
 * Close the VCS Canvas. It will remove the VCS Canvas object from the screen, but not deallocate it.
 
 .. code-block:: python
@@ -81,8 +81,8 @@ VCS Reference Guide
     a.plot(array, 'default', 'isofill', 'quick')
     a.close()
 
-``mode``
-^^^^^^^^
+mode
+^^^^
 * ``Options <0 = manual, 1 = automatic>``
 * Update the VCS Canvas.
 * Updating of the graphical displays on the VCS Canvas can be deferred until a later time. This is helpful when generating templates or displaying numerous plots. If a series of commands are given to VCS and the Canvas Mode is set to manual (i.e., 0), then no updating of the VCS Canvas occurs until the 'update' function is executed.
@@ -106,8 +106,8 @@ VCS Reference Guide
     # Update the changes manually
     a.update()
 
-``update``
-^^^^^^^^^^
+update
+^^^^^^
 * Update the VCS Canvas manually when the ``mode`` is set to ``0`` (manual).
 
 .. code-block:: python
-- 
GitLab


From f91b6b89d29293266c9de2deb367349bd4b57052 Mon Sep 17 00:00:00 2001
From: Dan Lipsa <dan.lipsa@kitware.com>
Date: Thu, 19 May 2016 14:34:34 -0400
Subject: [PATCH 092/191] BUG #1959: Fix memory override for vtkContourFiler in
 isofillpipeline.

This resulted in vtkStripper to generate double coverage of isocountours which resulted in
messed-up patterns.
Also adjusted plot patterns to easier to discriminate.
---
 Packages/vcs/vcs/vcs2vtk.py                |  8 ++++----
 Packages/vcs/vcs/vcsvtk/isolinepipeline.py |  1 -
 testing/vcs/CMakeLists.txt                 |  7 +++++++
 testing/vcs/test_vcs_line_patterns.py      | 22 ++++++++++++++++++++++
 4 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100755 testing/vcs/test_vcs_line_patterns.py

diff --git a/Packages/vcs/vcs/vcs2vtk.py b/Packages/vcs/vcs/vcs2vtk.py
index aa4a228ac..81142492c 100644
--- a/Packages/vcs/vcs/vcs2vtk.py
+++ b/Packages/vcs/vcs/vcs2vtk.py
@@ -1581,16 +1581,16 @@ def __build_ld__():
 
 def stippleLine(prop, line_type):
     if line_type == 'long-dash':
-        prop.SetLineStipplePattern(int('1111111100000000', 2))
+        prop.SetLineStipplePattern(int('0000111111111111', 2))
         prop.SetLineStippleRepeatFactor(1)
     elif line_type == 'dot':
-        prop.SetLineStipplePattern(int('1010101010101010', 2))
+        prop.SetLineStipplePattern(int('0101010101010101', 2))
         prop.SetLineStippleRepeatFactor(1)
     elif line_type == 'dash':
-        prop.SetLineStipplePattern(int('1111000011110000', 2))
+        prop.SetLineStipplePattern(int('0001111100011111', 2))
         prop.SetLineStippleRepeatFactor(1)
     elif line_type == 'dash-dot':
-        prop.SetLineStipplePattern(int('0011110000110011', 2))
+        prop.SetLineStipplePattern(int('0101111101011111', 2))
         prop.SetLineStippleRepeatFactor(1)
     elif line_type == 'solid':
         prop.SetLineStipplePattern(int('1111111111111111', 2))
diff --git a/Packages/vcs/vcs/vcsvtk/isolinepipeline.py b/Packages/vcs/vcs/vcsvtk/isolinepipeline.py
index 1560de7c1..3406824f0 100644
--- a/Packages/vcs/vcs/vcsvtk/isolinepipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/isolinepipeline.py
@@ -144,7 +144,6 @@ class IsolinePipeline(Pipeline2D):
 
             for n in range(numLevels):
                 cot.SetValue(n, l[n])
-            cot.SetValue(numLevels, l[-1])
             # TODO remove update
             cot.Update()
 
diff --git a/testing/vcs/CMakeLists.txt b/testing/vcs/CMakeLists.txt
index c6ccf8517..fbd89a10f 100644
--- a/testing/vcs/CMakeLists.txt
+++ b/testing/vcs/CMakeLists.txt
@@ -1007,6 +1007,13 @@ cdat_add_test(test_vcs_boxfill_lambert_crash
   "${BASELINE_DIR}/test_vcs_boxfill_lambert_crash.png"
   "${UVCDAT_GIT_TESTDATA_DIR}/data/NCEP_09_climo.nc"
 )
+
+cdat_add_test(test_vcs_line_patterns
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_line_patterns.py
+  "${BASELINE_DIR}/test_vcs_line_patterns.png"
+)
+
 cdat_add_test(test_vcs_init_open_sizing
   "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_init_open_sizing.py
diff --git a/testing/vcs/test_vcs_line_patterns.py b/testing/vcs/test_vcs_line_patterns.py
new file mode 100755
index 000000000..7597403fc
--- /dev/null
+++ b/testing/vcs/test_vcs_line_patterns.py
@@ -0,0 +1,22 @@
+import vcs
+import cdms2
+import sys
+import os
+import testing.regression as regression
+
+
+pth = os.path.join(os.path.dirname(__file__), "..")
+sys.path.append(pth)
+
+import checkimage
+
+x = regression.init(bg=1, geometry=(1620, 1080))
+
+f = cdms2.open(vcs.sample_data + "/clt.nc")
+s = f('clt')
+iso = x.createisoline()
+iso.level=[5, 50, 70, 95]
+iso.line = ['dot', 'dash', 'dash-dot', 'long-dash']
+x.plot(s,iso,continents=0)
+name = "test_vcs_line_patterns.png"
+regression.run(x, name)
-- 
GitLab


From a89570eb76580ac3453462fddd2b895d4fdc89f3 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Mon, 23 May 2016 09:07:45 -0700
Subject: [PATCH 093/191] updated crypto to latest version so it builds on
 Ubuntu 16

---
 CMake/cdat_modules/cryptography_pkg.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMake/cdat_modules/cryptography_pkg.cmake b/CMake/cdat_modules/cryptography_pkg.cmake
index cde5afa76..0b5671da1 100644
--- a/CMake/cdat_modules/cryptography_pkg.cmake
+++ b/CMake/cdat_modules/cryptography_pkg.cmake
@@ -1,10 +1,10 @@
 set(CRYPTOGRAPHY_MAJOR_SRC 1)
-set(CRYPTOGRAPHY_MINOR_SRC 2)
+set(CRYPTOGRAPHY_MINOR_SRC 3)
 set(CRYPTOGRAPHY_PATCH_SRC 2)
 
 set(CRYPTOGRAPHY_VERSION ${CRYPTOGRAPHY_MAJOR_SRC}.${CRYPTOGRAPHY_MINOR_SRC}.${CRYPTOGRAPHY_PATCH_SRC})
 set(CRYPTOGRAPHY_GZ cryptography-${CRYPTOGRAPHY_VERSION}.tar.gz)
 set(CRYPTOGRAPHY_SOURCE ${LLNL_URL}/${CRYPTOGRAPHY_GZ})
-set(CRYPTOGRAPHY_MD5 a8daf092d0558dac6700d7be93b555e5)
+set(CRYPTOGRAPHY_MD5 0359190f291824dc8ad9e6d477a607b2)
 
 add_cdat_package_dependent(CRYPTOGRAPHY "" "" OFF "CDAT_BUILD_LEAN" OFF)
-- 
GitLab


From 1129e5b4c949a305fb26f355d50252877ced9067 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Mon, 23 May 2016 14:42:12 -0400
Subject: [PATCH 094/191] Compute vector scaling correctly

VTK does clamping and not remapping of input range to desired
range which leads to undesirable visual effects.
---
 Packages/vcs/vcs/vcsvtk/vectorpipeline.py | 39 ++++++++++++++++++-----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/Packages/vcs/vcs/vcsvtk/vectorpipeline.py b/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
index 0badc60b4..0dee32da4 100644
--- a/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
@@ -84,25 +84,48 @@ class VectorPipeline(Pipeline2D):
         arrow.SetOutputPointsPrecision(vtk.vtkAlgorithm.DOUBLE_PRECISION)
         arrow.FilledOff()
 
+        polydata = self._vtkPolyDataFilter.GetOutput()
+        vectors = polydata.GetPointData().GetVectors()
+        vectorsRangeX = vectors.GetRange(0)
+        vectorsRangeY = vectors.GetRange(1)
+        vectorsRange = []
+        vectorsRange.insert(0, vectorsRangeY[0] if
+            (vectorsRangeX[0] > vectorsRangeY[0])  else vectorsRangeX[0])
+        vectorsRange.insert(1, vectorsRangeY[1]
+            if (vectorsRangeX[1] > vectorsRangeY[1])  else vectorsRangeX[1])
+
+        scalarArray = vtk.vtkDoubleArray()
+        scalarArray.SetNumberOfComponents(1)
+        scalarArray.SetNumberOfValues(vectors.GetNumberOfTuples())
+
+        oldRange = vectorsRange[1] - vectorsRange[0]
+        newRange = 1.0 - 0.1
+
+        for i in range (0, vectors.GetNumberOfTuples()):
+            norm = vtk.vtkMath.Norm(vectors.GetTuple(i))
+            newValue = (((norm - vectorsRange[0]) * newRange) / oldRange) + 0.1
+            scalarArray.SetValue(i, newValue)
+
+        polydata.GetPointData().SetScalars(scalarArray)
+
         glyphFilter = vtk.vtkGlyph2D()
-        glyphFilter.SetInputConnection(self._vtkPolyDataFilter.GetOutputPort())
+        # glyphFilter.SetInputConnection(self._vtkPolyDataFilter.GetOutputPort())
+        glyphFilter.SetInputData(polydata)
         glyphFilter.SetInputArrayToProcess(1, 0, 0, 0, "vector")
         glyphFilter.SetSourceConnection(arrow.GetOutputPort())
         glyphFilter.SetVectorModeToUseVector()
 
         # Rotate arrows to match vector data:
         glyphFilter.OrientOn()
+        glyphFilter.ScalingOn()
 
         # Scale to vector magnitude:
-        glyphFilter.SetScaleModeToScaleByVector()
+        # NOTE: Currently we compute our own scaling factor since VTK does
+        # it by clamping the values > max to max  and values < min to min
+        # and not remap the range.
+        glyphFilter.SetScaleModeToScaleByScalar()
         glyphFilter.SetScaleFactor(scale * 2.0 * self._gm.scale)
 
-        # These are some unfortunately named methods. It does *not* clamp the
-        # scale range to [min, max], but rather remaps the range
-        # [min, max] --> [0, 1].
-        glyphFilter.ClampingOn()
-        glyphFilter.SetRange(0.01, 1.0)
-
         mapper = vtk.vtkPolyDataMapper()
 
         glyphFilter.Update()
-- 
GitLab


From 9589f126db667b2a836e0f8d1fe06e8f94ae3cfd Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Mon, 23 May 2016 15:51:10 -0400
Subject: [PATCH 095/191] Set default to 1 for range

---
 Packages/vcs/vcs/vcsvtk/vectorpipeline.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Packages/vcs/vcs/vcsvtk/vectorpipeline.py b/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
index 0dee32da4..d6b395da2 100644
--- a/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
@@ -99,6 +99,7 @@ class VectorPipeline(Pipeline2D):
         scalarArray.SetNumberOfValues(vectors.GetNumberOfTuples())
 
         oldRange = vectorsRange[1] - vectorsRange[0]
+        oldRange = 1.0 if oldRange == 0.0 else oldRange
         newRange = 1.0 - 0.1
 
         for i in range (0, vectors.GetNumberOfTuples()):
-- 
GitLab


From 9648e967b9802360adac06c860d4790a93ad0e40 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Mon, 23 May 2016 15:58:18 -0400
Subject: [PATCH 096/191] Using descriptive variable names

---
 Packages/vcs/vcs/vcsvtk/vectorpipeline.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Packages/vcs/vcs/vcsvtk/vectorpipeline.py b/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
index d6b395da2..dc5a9701a 100644
--- a/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
@@ -100,11 +100,15 @@ class VectorPipeline(Pipeline2D):
 
         oldRange = vectorsRange[1] - vectorsRange[0]
         oldRange = 1.0 if oldRange == 0.0 else oldRange
-        newRange = 1.0 - 0.1
+
+        # New range min, max.
+        newRangeValues = [0.0, 1.0]
+
+        newRange = newRangeValues[1] - newRangeValues[0]
 
         for i in range (0, vectors.GetNumberOfTuples()):
             norm = vtk.vtkMath.Norm(vectors.GetTuple(i))
-            newValue = (((norm - vectorsRange[0]) * newRange) / oldRange) + 0.1
+            newValue = (((norm - vectorsRange[0]) * newRange) / oldRange) + newRangeValues[0]
             scalarArray.SetValue(i, newValue)
 
         polydata.GetPointData().SetScalars(scalarArray)
-- 
GitLab


From 2a4089ea74d32fe96c49a065ee7bc6aab99ecc2a Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Mon, 23 May 2016 17:39:03 -0400
Subject: [PATCH 097/191] Fixed flake8 test

---
 Packages/vcs/vcs/VTKPlots.py              |  4 ++--
 Packages/vcs/vcs/vcsvtk/vectorpipeline.py | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Packages/vcs/vcs/VTKPlots.py b/Packages/vcs/vcs/VTKPlots.py
index fb34a4c26..814719536 100644
--- a/Packages/vcs/vcs/VTKPlots.py
+++ b/Packages/vcs/vcs/VTKPlots.py
@@ -546,9 +546,9 @@ class VTKVCSBackend(object):
 
     def geometry(self, *args):
         if len(args) == 0:
-            return self._geometry;
+            return self._geometry
         if len(args) < 2:
-            raise TypeError("Function takes zero or two <width, height> " \
+            raise TypeError("Function takes zero or two <width, height> "
                             "or more than two arguments. Got " + len(*args))
         x = args[0]
         y = args[1]
diff --git a/Packages/vcs/vcs/vcsvtk/vectorpipeline.py b/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
index dc5a9701a..10161a52f 100644
--- a/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
@@ -89,10 +89,10 @@ class VectorPipeline(Pipeline2D):
         vectorsRangeX = vectors.GetRange(0)
         vectorsRangeY = vectors.GetRange(1)
         vectorsRange = []
-        vectorsRange.insert(0, vectorsRangeY[0] if
-            (vectorsRangeX[0] > vectorsRangeY[0])  else vectorsRangeX[0])
-        vectorsRange.insert(1, vectorsRangeY[1]
-            if (vectorsRangeX[1] > vectorsRangeY[1])  else vectorsRangeX[1])
+        vectorsRange.insert(0, vectorsRangeY[0] if (vectorsRangeX[0] > vectorsRangeY[0])
+                            else vectorsRangeX[0])
+        vectorsRange.insert(1, vectorsRangeY[1] if (vectorsRangeX[1] > vectorsRangeY[1])
+                            else vectorsRangeX[1])
 
         scalarArray = vtk.vtkDoubleArray()
         scalarArray.SetNumberOfComponents(1)
@@ -106,7 +106,7 @@ class VectorPipeline(Pipeline2D):
 
         newRange = newRangeValues[1] - newRangeValues[0]
 
-        for i in range (0, vectors.GetNumberOfTuples()):
+        for i in range(0, vectors.GetNumberOfTuples()):
             norm = vtk.vtkMath.Norm(vectors.GetTuple(i))
             newValue = (((norm - vectorsRange[0]) * newRange) / oldRange) + newRangeValues[0]
             scalarArray.SetValue(i, newValue)
-- 
GitLab


From 7102a1da891048c5d755579e44ec50f1cc2bb44f Mon Sep 17 00:00:00 2001
From: Dan Lipsa <dan.lipsa@kitware.com>
Date: Tue, 24 May 2016 15:12:30 -0400
Subject: [PATCH 098/191] Fix flake8 warnings and a test generated file

---
 Packages/vcs/vcs/VTKPlots.py                  | 4 ++--
 testing/vcs/test_vcs_isoline_width_stipple.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Packages/vcs/vcs/VTKPlots.py b/Packages/vcs/vcs/VTKPlots.py
index fb34a4c26..814719536 100644
--- a/Packages/vcs/vcs/VTKPlots.py
+++ b/Packages/vcs/vcs/VTKPlots.py
@@ -546,9 +546,9 @@ class VTKVCSBackend(object):
 
     def geometry(self, *args):
         if len(args) == 0:
-            return self._geometry;
+            return self._geometry
         if len(args) < 2:
-            raise TypeError("Function takes zero or two <width, height> " \
+            raise TypeError("Function takes zero or two <width, height> "
                             "or more than two arguments. Got " + len(*args))
         x = args[0]
         y = args[1]
diff --git a/testing/vcs/test_vcs_isoline_width_stipple.py b/testing/vcs/test_vcs_isoline_width_stipple.py
index 5da8f91f4..20a7e5c4f 100644
--- a/testing/vcs/test_vcs_isoline_width_stipple.py
+++ b/testing/vcs/test_vcs_isoline_width_stipple.py
@@ -25,4 +25,4 @@ isoline.linewidths = (1, 2, 3, 4, 1)
 isoline.line = ('dot', 'dash', 'solid', 'dash-dot', 'long-dash', 'dot', 'dash')
 # Next plot the isolines with labels
 canvas.plot(data, isoline, bg=1)
-regression.run(canvas, "test_isoline_width_stipple.png")
+regression.run(canvas, "test_vcs_isoline_width_stipple.png")
-- 
GitLab


From 2513a0c8327c93e4c0c49e6cb3a0b69d3d2c929f Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Tue, 24 May 2016 15:00:40 -0400
Subject: [PATCH 099/191] Added scale options to vector graphic method

---
 Packages/vcs/vcs/vcsvtk/vectorpipeline.py |  87 +++++++++++-------
 Packages/vcs/vcs/vector.py                | 105 ++++++++++++++--------
 2 files changed, 127 insertions(+), 65 deletions(-)

diff --git a/Packages/vcs/vcs/vcsvtk/vectorpipeline.py b/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
index 10161a52f..dd3b7ba04 100644
--- a/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
@@ -19,6 +19,8 @@ class VectorPipeline(Pipeline2D):
         # Preserve time and z axis for plotting these inof in rendertemplate
         projection = vcs.elements["projection"][self._gm.projection]
         taxis = self._originalData1.getTime()
+        scaleFactor = 1.0
+
         if self._originalData1.ndim > 2:
             zaxis = self._originalData1.getAxis(-3)
         else:
@@ -84,37 +86,20 @@ class VectorPipeline(Pipeline2D):
         arrow.SetOutputPointsPrecision(vtk.vtkAlgorithm.DOUBLE_PRECISION)
         arrow.FilledOff()
 
+
         polydata = self._vtkPolyDataFilter.GetOutput()
         vectors = polydata.GetPointData().GetVectors()
         vectorsRangeX = vectors.GetRange(0)
         vectorsRangeY = vectors.GetRange(1)
-        vectorsRange = []
-        vectorsRange.insert(0, vectorsRangeY[0] if (vectorsRangeX[0] > vectorsRangeY[0])
-                            else vectorsRangeX[0])
-        vectorsRange.insert(1, vectorsRangeY[1] if (vectorsRangeX[1] > vectorsRangeY[1])
-                            else vectorsRangeX[1])
-
-        scalarArray = vtk.vtkDoubleArray()
-        scalarArray.SetNumberOfComponents(1)
-        scalarArray.SetNumberOfValues(vectors.GetNumberOfTuples())
-
-        oldRange = vectorsRange[1] - vectorsRange[0]
-        oldRange = 1.0 if oldRange == 0.0 else oldRange
-
-        # New range min, max.
-        newRangeValues = [0.0, 1.0]
 
-        newRange = newRangeValues[1] - newRangeValues[0]
-
-        for i in range(0, vectors.GetNumberOfTuples()):
-            norm = vtk.vtkMath.Norm(vectors.GetTuple(i))
-            newValue = (((norm - vectorsRange[0]) * newRange) / oldRange) + newRangeValues[0]
-            scalarArray.SetValue(i, newValue)
-
-        polydata.GetPointData().SetScalars(scalarArray)
+        if self._gm.scaletype == 'constant' or\
+           self._gm.scaletype == 'constantNNormalize' or\
+           self._gm.scaletype == 'constantNLinear':
+            scaleFactor = scale * 2.0 * self._gm.scale
+        else:
+            scaleFactor = 1.0
 
         glyphFilter = vtk.vtkGlyph2D()
-        # glyphFilter.SetInputConnection(self._vtkPolyDataFilter.GetOutputPort())
         glyphFilter.SetInputData(polydata)
         glyphFilter.SetInputArrayToProcess(1, 0, 0, 0, "vector")
         glyphFilter.SetSourceConnection(arrow.GetOutputPort())
@@ -124,12 +109,54 @@ class VectorPipeline(Pipeline2D):
         glyphFilter.OrientOn()
         glyphFilter.ScalingOn()
 
-        # Scale to vector magnitude:
-        # NOTE: Currently we compute our own scaling factor since VTK does
-        # it by clamping the values > max to max  and values < min to min
-        # and not remap the range.
-        glyphFilter.SetScaleModeToScaleByScalar()
-        glyphFilter.SetScaleFactor(scale * 2.0 * self._gm.scale)
+        glyphFilter.SetScaleModeToScaleByVector()
+
+        if self._gm.scaletype == 'normalize' or self._gm.scaletype == 'linear' or\
+           self._gm.scaletype == 'constantNNormalize' or self._gm.scaletype == 'constantNLinear':
+
+            # Find the min and max vector magnitudes
+            minNorm = None
+            maxNorm = None
+
+            for i in range(0, vectors.GetNumberOfTuples()):
+                norm = vtk.vtkMath.Norm(vectors.GetTuple(i))
+
+                if (minNorm is None or norm < minNorm):
+                    minNorm = norm
+                if (maxNorm is None or norm > maxNorm):
+                    maxNorm = norm
+
+            if maxNorm == 0:
+                maxNorm = 1.0
+
+            if self._gm.scaletype == 'normalize' or self._gm.scaletype == 'constantNNormalize':
+                scaleFactor /= maxNorm
+
+            if self._gm.scaletype == 'linear' or self._gm.scaletype == 'constantNLinear':
+                scalarArray = vtk.vtkDoubleArray()
+                scalarArray.SetNumberOfComponents(1)
+                scalarArray.SetNumberOfValues(vectors.GetNumberOfTuples())
+
+                oldRange = maxNorm - minNorm
+                oldRange = 1.0 if oldRange == 0.0 else oldRange
+
+                # New range min, max.
+                newRangeValues = self._gm.scalerange
+                newRange = newRangeValues[1] - newRangeValues[0]
+
+                for i in range(0, vectors.GetNumberOfTuples()):
+                    norm = vtk.vtkMath.Norm(vectors.GetTuple(i))
+                    newValue = (((norm - minNorm) * newRange) / oldRange) + newRangeValues[0]
+                    scalarArray.SetValue(i, newValue)
+                    polydata.GetPointData().SetScalars(scalarArray)
+
+                # Scale to vector magnitude:
+                # NOTE: Currently we compute our own scaling factor since VTK does
+                # it by clamping the values > max to max  and values < min to min
+                # and not remap the range.
+                glyphFilter.SetScaleModeToScaleByScalar()
+
+        glyphFilter.SetScaleFactor(scaleFactor)
 
         mapper = vtk.vtkPolyDataMapper()
 
diff --git a/Packages/vcs/vcs/vector.py b/Packages/vcs/vcs/vector.py
index acea94c04..b48d74116 100755
--- a/Packages/vcs/vcs/vector.py
+++ b/Packages/vcs/vcs/vector.py
@@ -131,7 +131,7 @@ def process_src(nm, code):
 class Gv(object):
 
     """
- Class:	Gv				# Vector
+ Class: Gv              # Vector
 
  Description of Gv Class:
     The vector graphics method displays a vector plot of a 2D vector field. Vectors
@@ -145,76 +145,76 @@ class Gv(object):
     entry.
 
  Other Useful Functions:
-         a=vcs.init()			# Constructor
-         a.show('vector')		# Show predefined vector graphics methods
-         a.show('line')			# Show predefined VCS line objects
-         a.setcolormap("AMIP")		# Change the VCS color Map
-         a.vector(s1, s2, v,'default')	# Plot data 's1', and 's2' with vector 'v'
+         a=vcs.init()           # Constructor
+         a.show('vector')       # Show predefined vector graphics methods
+         a.show('line')         # Show predefined VCS line objects
+         a.setcolormap("AMIP")      # Change the VCS color Map
+         a.vector(s1, s2, v,'default')  # Plot data 's1', and 's2' with vector 'v'
                                          and 'default' template
-         a.update()		 	# Updates the VCS Canvas at user's request
-         a.mode=1, or 0 	 	# If 1, then automatic update, else if
+         a.update()         # Updates the VCS Canvas at user's request
+         a.mode=1, or 0         # If 1, then automatic update, else if
                                           0, then use update function to
                                           update the VCS Canvas.
 
  Example of Use:
     a=vcs.init()
     To Create a new instance of vector use:
-     vc=a.createvector('new','quick')	# Copies content of 'quick' to 'new'
-     vc=a.createvector('new') 		# Copies content of 'default' to 'new'
+     vc=a.createvector('new','quick')   # Copies content of 'quick' to 'new'
+     vc=a.createvector('new')       # Copies content of 'default' to 'new'
 
     To Modify an existing vector use:
      vc=a.getvector('AMIP_psl')
 
-    vc.list()  				# Will list all the vector attribute values
-    vc.projection='linear'   		# Can only be 'linear'
+    vc.list()               # Will list all the vector attribute values
+    vc.projection='linear'          # Can only be 'linear'
     lon30={-180:'180W',-150:'150W',0:'Eq'}
     vc.xticlabels1=lon30
     vc.xticlabels2=lon30
-    vc.xticlabels(lon30, lon30)  	# Will set them both
+    vc.xticlabels(lon30, lon30)     # Will set them both
     vc.xmtics1=''
     vc.xmtics2=''
-    vc.xmtics(lon30, lon30)  		# Will set them both
+    vc.xmtics(lon30, lon30)         # Will set them both
     vc.yticlabels1=lat10
     vc.yticlabels2=lat10
-    vc.yticlabels(lat10, lat10)  	# Will set them both
+    vc.yticlabels(lat10, lat10)     # Will set them both
     vc.ymtics1=''
     vc.ymtics2=''
-    vc.ymtics(lat10, lat10)  		# Will set them both
+    vc.ymtics(lat10, lat10)         # Will set them both
     vc.datawc_y1=-90.0
     vc.datawc_y2=90.0
     vc.datawc_x1=-180.0
     vc.datawc_x2=180.0
-    vc.datawc(-90, 90, -180, 180)  	# Will set them all
+    vc.datawc(-90, 90, -180, 180)   # Will set them all
     xaxisconvert='linear'
     yaxisconvert='linear'
-    vc.xyscale('linear', 'area_wt')  	# Will set them both
+    vc.xyscale('linear', 'area_wt')     # Will set them both
 
     Specify the line style:
-     vc.line=0 				# Same as vc.line='solid'
-     vc.line=1 				# Same as vc.line='dash'
-     vc.line=2 				# Same as vc.line='dot'
-     vc.line=3 				# Same as vc.line='dash-dot'
-     vc.line=4 				# Same as vc.line='long-dot'
+     vc.line=0              # Same as vc.line='solid'
+     vc.line=1              # Same as vc.line='dash'
+     vc.line=2              # Same as vc.line='dot'
+     vc.line=3              # Same as vc.line='dash-dot'
+     vc.line=4              # Same as vc.line='long-dot'
 
     Specify the line color of the vectors:
-     vc.linecolor=16   			# Color range: 16 to 230, default line color is black
-     vc.linewidth=1   			# Width range: 1 to 100, default size is 1
+     vc.linecolor=16            # Color range: 16 to 230, default line color is black
+     vc.linewidth=1             # Width range: 1 to 100, default size is 1
 
     Specify the vector scale factor:
-     vc.scale=2.0   			# Can be an integer or float
+     vc.scale=2.0               # Can be an integer or float
 
     Specify the vector alignment:
-     vc.alignment=0			# Same as vc.alignment='head'
-     vc.alignment=1			# Same as vc.alignment='center'
-     vc.alignment=2			# Same as vc.alignment='tail'
+     vc.alignment=0         # Same as vc.alignment='head'
+     vc.alignment=1         # Same as vc.alignment='center'
+     vc.alignment=2         # Same as vc.alignment='tail'
 
     Specify the vector type:
-      vc.type=0   			# Same as vc.type='arrow head'
-      vc.type=1   			# Same as vc.type='wind barbs'
-      vc.type=2   			# Same as vc.type='solid arrow head'
+      vc.type=0             # Same as vc.type='arrow head'
+      vc.type=1             # Same as vc.type='wind barbs'
+      vc.type=2             # Same as vc.type='solid arrow head'
 
     Specify the vector reference:
-      vc.reference=4    		# Can be an integer or float
+      vc.reference=4            # Can be an integer or float
 """
     __slots__ = [
         'name',
@@ -244,6 +244,9 @@ class Gv(object):
         'type',
         'reference',
         'colormap',
+        'scaleoptions',
+        'scaletype',
+        'scalerange',
         '_name',
         '_xaxisconvert',
         '_yaxisconvert',
@@ -270,9 +273,13 @@ class Gv(object):
         '_type',
         '_reference',
         '_colormap',
+        '_scaleoptions',
+        '_scaletype',
+        '_scalerange',
     ]
 
     colormap = VCS_validation_functions.colormap
+    scaleoptions = ('off', 'constant', 'normalize', 'linear', 'constantNNormalize', 'constantNLinear')
 
     def _getname(self):
         return self._name
@@ -528,6 +535,25 @@ class Gv(object):
         self._alignment = value
     alignment = property(_getalignment, _setalignment)
 
+
+    def _getscaletype(self):
+        return self._scaletype
+
+    def _setscaletype(self, value):
+        if value in self.scaleoptions:
+            self._scaletype = value
+        else:
+            raise ValueError('Invalid value '+ value + ' expected ' + self.scaleoptions)
+    scaletype = property(_getscaletype, _setscaletype)
+
+    def _getscalerange(self):
+        return self._scalerange
+
+    def _setscalerange(self, value):
+        self._scalerange = value
+    scalerange = property(_getscalerange, _setscalerange)
+
+
     def __init__(self, Gv_name, Gv_name_src='default'):
                 #                                                         #
                 ###########################################################
@@ -568,6 +594,8 @@ class Gv(object):
             self._datawc_timeunits = "days since 2000"
             self._datawc_calendar = 135441
             self._colormap = None
+            self._scaletype = self.scaleoptions[5]
+            self._scalerange = [0.1, 1.0]
         else:
             if isinstance(Gv_name_src, Gv):
                 Gv_name_src = Gv_name_src.name
@@ -583,7 +611,9 @@ class Gv(object):
                         'datawc_x2', 'xaxisconvert', 'yaxisconvert',
                         'line', 'linecolor', 'linewidth',
                         'datawc_timeunits', 'datawc_calendar', 'colormap',
-                        'scale', 'alignment', 'type', 'reference']:
+                        'scale', 'alignment', 'type', 'reference', 'scaletype',
+                        'scalerange']:
+
                 setattr(self, att, getattr(src, att))
         # Ok now we need to stick in the elements
         vcs.elements["vector"][Gv_name] = self
@@ -660,6 +690,8 @@ class Gv(object):
         print "alignment = ", self.alignment
         print "type = ", self.type
         print "reference = ", self.reference
+        print "scaletype = ", self.scaletype
+        print "scalerange = ", self.scalerange
 
     ##########################################################################
     #                                                                           #
@@ -798,6 +830,9 @@ class Gv(object):
             fp.write("%s.linecolor = %s\n" % (unique_name, self.linecolor))
             fp.write("%s.linewidth = %s\n" % (unique_name, self.linewidth))
             fp.write("%s.scale = %s\n" % (unique_name, self.scale))
+            fp.write("%s.scaletype = %s\n" % (unique_name, self.scaletype))
+            fp.write("%s.scalerange = %s\n" % (unique_name, self.scalerange))
+            fp.write("%s.scaleoptions = %s\n" % (unique_name, self.scaleoptions))
             fp.write("%s.alignment = '%s'\n" % (unique_name, self.alignment))
             fp.write("%s.type = '%s'\n" % (unique_name, self.type))
             fp.write("%s.reference = %s\n\n" % (unique_name, self.reference))
@@ -814,5 +849,5 @@ class Gv(object):
 
 
 ###############################################################################
-#        END OF FILE							      #
+#        END OF FILE                                  #
 ###############################################################################
-- 
GitLab


From e1d77e43c389af4f649e3399a5b346eea5f5845d Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Wed, 25 May 2016 08:47:58 -0400
Subject: [PATCH 100/191] Added check for valid range

---
 Packages/vcs/vcs/vector.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Packages/vcs/vcs/vector.py b/Packages/vcs/vcs/vector.py
index b48d74116..dd06f6b0b 100755
--- a/Packages/vcs/vcs/vector.py
+++ b/Packages/vcs/vcs/vector.py
@@ -550,6 +550,8 @@ class Gv(object):
         return self._scalerange
 
     def _setscalerange(self, value):
+        value = VCS_validation_functions.checkListOfNumbers(self, 'scalerange',
+                    value, minvalue=0.0, minelements=2, maxelements=2)
         self._scalerange = value
     scalerange = property(_getscalerange, _setscalerange)
 
@@ -594,7 +596,7 @@ class Gv(object):
             self._datawc_timeunits = "days since 2000"
             self._datawc_calendar = 135441
             self._colormap = None
-            self._scaletype = self.scaleoptions[5]
+            self._scaletype = self.scaleoptions[4]
             self._scalerange = [0.1, 1.0]
         else:
             if isinstance(Gv_name_src, Gv):
-- 
GitLab


From f00bea8901ba156b9ca388af9fdccadb55898f57 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Wed, 25 May 2016 11:18:48 -0400
Subject: [PATCH 101/191] Added test for new scale options

---
 Packages/vcs/vcs/vcsvtk/vectorpipeline.py     |  6 +-
 testing/vcs/CMakeLists.txt                    | 10 ++++
 testing/vcs/test_vcs_vectors_scale_options.py | 59 +++++++++++++++++++
 3 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 testing/vcs/test_vcs_vectors_scale_options.py

diff --git a/Packages/vcs/vcs/vcsvtk/vectorpipeline.py b/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
index dd3b7ba04..b0f1cfd1e 100644
--- a/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
@@ -118,8 +118,10 @@ class VectorPipeline(Pipeline2D):
             minNorm = None
             maxNorm = None
 
+            noOfComponents = vectors.GetNumberOfComponents()
+
             for i in range(0, vectors.GetNumberOfTuples()):
-                norm = vtk.vtkMath.Norm(vectors.GetTuple(i))
+                norm = vtk.vtkMath.Norm(vectors.GetTuple(i), noOfComponents)
 
                 if (minNorm is None or norm < minNorm):
                     minNorm = norm
@@ -145,7 +147,7 @@ class VectorPipeline(Pipeline2D):
                 newRange = newRangeValues[1] - newRangeValues[0]
 
                 for i in range(0, vectors.GetNumberOfTuples()):
-                    norm = vtk.vtkMath.Norm(vectors.GetTuple(i))
+                    norm = vtk.vtkMath.Norm(vectors.GetTuple(i), noOfComponents)
                     newValue = (((norm - minNorm) * newRange) / oldRange) + newRangeValues[0]
                     scalarArray.SetValue(i, newValue)
                     polydata.GetPointData().SetScalars(scalarArray)
diff --git a/testing/vcs/CMakeLists.txt b/testing/vcs/CMakeLists.txt
index cadb80cc9..e65b3ca43 100644
--- a/testing/vcs/CMakeLists.txt
+++ b/testing/vcs/CMakeLists.txt
@@ -904,6 +904,16 @@ cdat_add_test(test_vcs_settings_color_name_rgba
       ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_vectors_robinson_wrap.py
       "${BASELINE_DIR}/test_vcs_vectors_robinson_wrap.png"
       )
+    cdat_add_test(test_vcs_vectors_scale_options
+      "${PYTHON_EXECUTABLE}"
+      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_vectors_scale_options.py
+      "${BASELINE_DIR}/test_vcs_vector_scale_options_off.png"
+      "${BASELINE_DIR}/test_vcs_vector_scale_options_constant.png"
+      "${BASELINE_DIR}/test_vcs_vector_scale_options_linear.png"
+      "${BASELINE_DIR}/test_vcs_vector_scale_options_normalize.png"
+      "${BASELINE_DIR}/test_vcs_vector_scale_options_constantNLinear.png"
+      "${BASELINE_DIR}/test_vcs_vector_scale_options_constantNNormalize.png"
+      )
   endif()
 endif()
 
diff --git a/testing/vcs/test_vcs_vectors_scale_options.py b/testing/vcs/test_vcs_vectors_scale_options.py
new file mode 100644
index 000000000..5dff25d3f
--- /dev/null
+++ b/testing/vcs/test_vcs_vectors_scale_options.py
@@ -0,0 +1,59 @@
+import sys, cdms2, vcs, testing.regression as regression
+
+data = cdms2.open(vcs.sample_data+"/clt.nc")
+v = data['v'][...,::10,::10]
+u = data['u'][...,::10,::10]
+
+canvas = regression.init()
+gv = vcs.createvector()
+
+gv.scaletype = 'off'
+canvas.plot(u, v, gv)
+outFilename = 'test_vcs_vector_scale_options_off.png'
+canvas.png(outFilename)
+ret = regression.check_result_image(outFilename, sys.argv[1])
+canvas.clear()
+
+v = data['v'][...,::4,::4]
+u = data['u'][...,::4,::4]
+gv.scaletype = 'constant'
+gv.scale = 0.1
+canvas.plot(u, v, gv)
+outFilename = 'test_vcs_vector_scale_options_constant.png'
+canvas.png(outFilename)
+ret += regression.check_result_image(outFilename, sys.argv[2])
+canvas.clear()
+
+v = data['v']
+u = data['u']
+gv.scale = 1.0
+
+gv.scaletype = 'normalize'
+canvas.plot(u, v, gv)
+outFilename = 'test_vcs_vector_scale_options_normalize.png'
+canvas.png(outFilename)
+ret += regression.check_result_image(outFilename, sys.argv[2])
+canvas.clear()
+
+gv.scaletype = 'linear'
+canvas.plot(u, v, gv)
+outFilename = 'test_vcs_vector_scale_options_linear.png'
+canvas.png(outFilename)
+ret += regression.check_result_image(outFilename, sys.argv[3])
+canvas.clear()
+
+gv.scaletype = 'constantNNormalize'
+canvas.plot(u, v, gv)
+outFilename = 'test_vcs_vector_scale_options_constantNNormalize.png'
+canvas.png(outFilename)
+ret += regression.check_result_image(outFilename, sys.argv[4])
+canvas.clear()
+
+gv.scaletype = 'constantNLinear'
+canvas.plot(u, v, gv)
+outFilename = 'test_vcs_vector_scale_options_constantNLinear.png'
+canvas.png(outFilename)
+ret += regression.check_result_image(outFilename, sys.argv[5])
+canvas.clear()
+
+sys.ecanvasit(ret)
-- 
GitLab


From 9404c34157ededc830a4287d35e6082e55edf6bf Mon Sep 17 00:00:00 2001
From: Bryce Sampson <sampson.bryce@yahoo.com>
Date: Wed, 25 May 2016 13:58:38 -0700
Subject: [PATCH 102/191] Added missing graphics method types to
 creategraphicsmethod

---
 Packages/vcs/vcs/utils.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Packages/vcs/vcs/utils.py b/Packages/vcs/vcs/utils.py
index 6b94f4352..e69466eab 100644
--- a/Packages/vcs/vcs/utils.py
+++ b/Packages/vcs/vcs/utils.py
@@ -1629,7 +1629,7 @@ def getgraphicsmethod(type, name):
     return copy_mthd
 
 
-def creategraphicsmethod(gtype, name):
+def creategraphicsmethod(gtype, gname='default', name=None):
     if gtype in ['isoline', 'Gi']:
         func = vcs.createisoline
     elif gtype in ['isofill', 'Gfi']:
@@ -1652,11 +1652,17 @@ def creategraphicsmethod(gtype, name):
         func = vcs.createvector
     elif gtype in ['taylordiagram', 'Gtd']:
         func = vcs.createtaylordiagram
-    elif isinstance(type, vcsaddons.core.VCSaddon):
-        func = type.creategm
+    elif gtype == '3d_scalar':
+        func = vcs.create3d_scalar
+    elif gtype == '3d_dual_scalar':
+        func = vcs.create3d_dual_scalar
+    elif gtype == '3d_vector':
+        func = vcs.create3d_vector
+    elif isinstance(gtype, vcsaddons.core.VCSaddon):
+        func = gtype.creategm
     else:
         return None
-    copy_mthd = func(source=name)
+    copy_mthd = func(name=name, source=gname)
     return copy_mthd
 
 
-- 
GitLab


From db669a6b5af83c129e3e1307b9cdd920ce9ab8a2 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Wed, 25 May 2016 20:55:14 -0400
Subject: [PATCH 103/191] Using vtkDataArray GetMaxNorm for performance

---
 Packages/vcs/vcs/vcsvtk/vectorpipeline.py | 28 +++++++++++++----------
 Packages/vcs/vcs/vector.py                |  3 ++-
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/Packages/vcs/vcs/vcsvtk/vectorpipeline.py b/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
index b0f1cfd1e..896e32a8e 100644
--- a/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
@@ -115,18 +115,7 @@ class VectorPipeline(Pipeline2D):
            self._gm.scaletype == 'constantNNormalize' or self._gm.scaletype == 'constantNLinear':
 
             # Find the min and max vector magnitudes
-            minNorm = None
-            maxNorm = None
-
-            noOfComponents = vectors.GetNumberOfComponents()
-
-            for i in range(0, vectors.GetNumberOfTuples()):
-                norm = vtk.vtkMath.Norm(vectors.GetTuple(i), noOfComponents)
-
-                if (minNorm is None or norm < minNorm):
-                    minNorm = norm
-                if (maxNorm is None or norm > maxNorm):
-                    maxNorm = norm
+            maxNorm = vectors.GetMaxNorm()
 
             if maxNorm == 0:
                 maxNorm = 1.0
@@ -135,6 +124,21 @@ class VectorPipeline(Pipeline2D):
                 scaleFactor /= maxNorm
 
             if self._gm.scaletype == 'linear' or self._gm.scaletype == 'constantNLinear':
+                minNorm = None
+                maxNorm = None
+
+                noOfComponents = vectors.GetNumberOfComponents()
+                for i in range(0, vectors.GetNumberOfTuples()):
+                    norm = vtk.vtkMath.Norm(vectors.GetTuple(i), noOfComponents)
+
+                    if (minNorm is None or norm < minNorm):
+                        minNorm = norm
+                    if (maxNorm is None or norm > maxNorm):
+                        maxNorm = norm
+
+                if maxNorm == 0:
+                    maxNorm = 1.0
+
                 scalarArray = vtk.vtkDoubleArray()
                 scalarArray.SetNumberOfComponents(1)
                 scalarArray.SetNumberOfValues(vectors.GetNumberOfTuples())
diff --git a/Packages/vcs/vcs/vector.py b/Packages/vcs/vcs/vector.py
index dd06f6b0b..5d65fb4ad 100755
--- a/Packages/vcs/vcs/vector.py
+++ b/Packages/vcs/vcs/vector.py
@@ -543,7 +543,8 @@ class Gv(object):
         if value in self.scaleoptions:
             self._scaletype = value
         else:
-            raise ValueError('Invalid value '+ value + ' expected ' + self.scaleoptions)
+            VCS_validation_functions.checkedRaise(self, value, ValueError,
+                'Invalid value '+ value + '. Valid options are: ' + ','.join(self.scaleoptions))
     scaletype = property(_getscaletype, _setscaletype)
 
     def _getscalerange(self):
-- 
GitLab


From 06bc68d0c4ec89b16463f8c977acd91dfddbf1ac Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Wed, 25 May 2016 20:57:42 -0400
Subject: [PATCH 104/191] Fixed typo in the test

---
 testing/vcs/test_vcs_vectors_scale_options.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/vcs/test_vcs_vectors_scale_options.py b/testing/vcs/test_vcs_vectors_scale_options.py
index 5dff25d3f..a4574bfdd 100644
--- a/testing/vcs/test_vcs_vectors_scale_options.py
+++ b/testing/vcs/test_vcs_vectors_scale_options.py
@@ -56,4 +56,4 @@ canvas.png(outFilename)
 ret += regression.check_result_image(outFilename, sys.argv[5])
 canvas.clear()
 
-sys.ecanvasit(ret)
+sys.exit(ret)
-- 
GitLab


From bd610acc966443e5d227694f0a553843fa08e636 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Wed, 25 May 2016 22:08:59 -0400
Subject: [PATCH 105/191] Added method to check for valid option

---
 Packages/vcs/vcs/VCS_validation_functions.py | 12 ++++++++++++
 Packages/vcs/vcs/vector.py                   |  8 +++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Packages/vcs/vcs/VCS_validation_functions.py b/Packages/vcs/vcs/VCS_validation_functions.py
index 7595d900e..db848b968 100644
--- a/Packages/vcs/vcs/VCS_validation_functions.py
+++ b/Packages/vcs/vcs/VCS_validation_functions.py
@@ -243,6 +243,18 @@ def checkListOfNumbers(self, name, value, minvalue=None,
     return list(value)
 
 
+def checkValidOption(self, name, value, options):
+    checkName(self, name, value)
+    if value not in options:
+        VCS_validation_functions.checkedRaise(
+            self,
+            value,
+            ValueError,
+            'Invalid value '+ value + '. Valid options are: ' +
+            ','.join(self.scaleoptions))
+    return value
+
+
 def checkFont(self, name, value):
     if (value is None):
         pass
diff --git a/Packages/vcs/vcs/vector.py b/Packages/vcs/vcs/vector.py
index 5d65fb4ad..db681cc78 100755
--- a/Packages/vcs/vcs/vector.py
+++ b/Packages/vcs/vcs/vector.py
@@ -540,11 +540,9 @@ class Gv(object):
         return self._scaletype
 
     def _setscaletype(self, value):
-        if value in self.scaleoptions:
-            self._scaletype = value
-        else:
-            VCS_validation_functions.checkedRaise(self, value, ValueError,
-                'Invalid value '+ value + '. Valid options are: ' + ','.join(self.scaleoptions))
+        value = VCS_validation_functions.checkValidOption(self, 'scaletype',
+                    value, self.scaleoptions)
+        self._scaletype = value
     scaletype = property(_getscaletype, _setscaletype)
 
     def _getscalerange(self):
-- 
GitLab


From b69d09d59a2d07853c5f4f2fe6987610d141b07a Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Wed, 25 May 2016 22:20:47 -0400
Subject: [PATCH 106/191] Fixed using wrong baseline image

---
 testing/vcs/test_vcs_vectors_scale_options.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/testing/vcs/test_vcs_vectors_scale_options.py b/testing/vcs/test_vcs_vectors_scale_options.py
index a4574bfdd..ce48b63c1 100644
--- a/testing/vcs/test_vcs_vectors_scale_options.py
+++ b/testing/vcs/test_vcs_vectors_scale_options.py
@@ -28,13 +28,6 @@ v = data['v']
 u = data['u']
 gv.scale = 1.0
 
-gv.scaletype = 'normalize'
-canvas.plot(u, v, gv)
-outFilename = 'test_vcs_vector_scale_options_normalize.png'
-canvas.png(outFilename)
-ret += regression.check_result_image(outFilename, sys.argv[2])
-canvas.clear()
-
 gv.scaletype = 'linear'
 canvas.plot(u, v, gv)
 outFilename = 'test_vcs_vector_scale_options_linear.png'
@@ -42,9 +35,9 @@ canvas.png(outFilename)
 ret += regression.check_result_image(outFilename, sys.argv[3])
 canvas.clear()
 
-gv.scaletype = 'constantNNormalize'
+gv.scaletype = 'normalize'
 canvas.plot(u, v, gv)
-outFilename = 'test_vcs_vector_scale_options_constantNNormalize.png'
+outFilename = 'test_vcs_vector_scale_options_normalize.png'
 canvas.png(outFilename)
 ret += regression.check_result_image(outFilename, sys.argv[4])
 canvas.clear()
@@ -56,4 +49,11 @@ canvas.png(outFilename)
 ret += regression.check_result_image(outFilename, sys.argv[5])
 canvas.clear()
 
+gv.scaletype = 'constantNNormalize'
+canvas.plot(u, v, gv)
+outFilename = 'test_vcs_vector_scale_options_constantNNormalize.png'
+canvas.png(outFilename)
+ret += regression.check_result_image(outFilename, sys.argv[6])
+canvas.clear()
+
 sys.exit(ret)
-- 
GitLab


From eb982112ec45b2bd78986fb405646f9cf8b24b05 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Thu, 26 May 2016 00:18:59 -0400
Subject: [PATCH 107/191] Added option to export text as object or path

---
 Packages/vcs/vcs/Canvas.py   | 24 ++++++++++++------------
 Packages/vcs/vcs/VTKPlots.py | 23 +++++++++++++++--------
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/Packages/vcs/vcs/Canvas.py b/Packages/vcs/vcs/Canvas.py
index 49361248c..c8712580c 100644
--- a/Packages/vcs/vcs/Canvas.py
+++ b/Packages/vcs/vcs/Canvas.py
@@ -2313,7 +2313,7 @@ Options:::
     Other:
        [x|y]rev         = 0|1                         # if ==1, reverse the direction of the x
                                                              or y axis
-       continents	= 0,1,2,3,4,5,6,7,8,9,10,11   #	if >=1, plot continental outlines
+       continents   = 0,1,2,3,4,5,6,7,8,9,10,11   # if >=1, plot continental outlines
                                                              (default: plot if xaxis is
                                                              longitude, yaxis is latitude -or-
                                                              xname is 'longitude' and yname is
@@ -3939,7 +3939,7 @@ Options:::
 
     ##########################################################################
     #                                                                           #
-    # Destroy VCS Canvas Object (i.e., call the Dealloc C code).      		#
+    # Destroy VCS Canvas Object (i.e., call the Dealloc C code).            #
     #                                                                           #
     ##########################################################################
     def destroy(self):
@@ -4680,7 +4680,7 @@ Options:::
     # pdf wrapper for VCS.                                               #
     #                                                                           #
     ##########################################################################
-    def pdf(self, file, width=None, height=None, units='inches'):
+    def pdf(self, file, width=None, height=None, units='inches', textAsObject=True):
         """
  Function: postscript
 
@@ -4704,14 +4704,14 @@ Options:::
 
         if not file.split('.')[-1].lower() in ['pdf']:
             file += '.pdf'
-        return self.backend.pdf(file, W, H)
+        return self.backend.pdf(file, W, H, textAsObject)
     ##########################################################################
-    #                                                                           #
-    # SVG wrapper for VCS.                                               #
-    #                                                                           #
+    #                                                                        #
+    # SVG wrapper for VCS.                                                   #
+    #                                                                        #
     ##########################################################################
 
-    def svg(self, file, width=None, height=None, units='inches'):
+    def svg(self, file, width=None, height=None, units='inches', textAsObject=True):
         """
  Function: postscript
 
@@ -4735,7 +4735,7 @@ Options:::
 
         if not file.split('.')[-1].lower() in ['svg']:
             file += '.svg'
-        return self.backend.svg(file, W, H)
+        return self.backend.svg(file, W, H, textAsObject)
 
     def _compute_margins(
             self, W, H, top_margin, bottom_margin, right_margin, left_margin, dpi):
@@ -4911,7 +4911,7 @@ Options:::
         return W, H
 
     def postscript(self, file, mode='r', orientation=None, width=None, height=None,
-                   units='inches'):
+                   units='inches', textAsObject=True):
         """
  Function: postscript
 
@@ -4950,7 +4950,7 @@ Options:::
         if not file.split('.')[-1].lower() in ['ps', 'eps']:
             file += '.ps'
         if mode == 'r':
-            return self.backend.postscript(file, W, H, units="pixels")
+            return self.backend.postscript(file, W, H, units="pixels", textAsObject=textAsObject)
         else:
             n = random.randint(0, 10000000000000)
             psnm = '/tmp/' + '__VCS__tmp__' + str(n) + '.ps'
@@ -5209,7 +5209,7 @@ Options:::
 
     ##########################################################################
     #                                                                        #
-    # Set continents type wrapper for VCS.                           		 #
+    # Set continents type wrapper for VCS.                                   #
     #                                                                        #
     ##########################################################################
     def setcontinentstype(self, value):
diff --git a/Packages/vcs/vcs/VTKPlots.py b/Packages/vcs/vcs/VTKPlots.py
index 814719536..b6b49ec1b 100644
--- a/Packages/vcs/vcs/VTKPlots.py
+++ b/Packages/vcs/vcs/VTKPlots.py
@@ -1064,7 +1064,7 @@ class VTKVCSBackend(object):
         return plot
 
     def vectorGraphics(
-            self, output_type, file, width=None, height=None, units=None):
+            self, output_type, file, width=None, height=None, units=None, textAsObject=True):
         if self.renWin is None:
             raise Exception("Nothing on Canvas to dump to file")
 
@@ -1095,7 +1095,11 @@ class VTKVCSBackend(object):
         gl.SetInput(self.renWin)
         gl.SetCompress(0)  # Do not compress
         gl.SetFilePrefix(".".join(file.split(".")[:-1]))
-        gl.TextAsPathOn()
+
+        if textAsObject:
+            gl.TextAsPathOff()
+        else:
+            gl.TextAsPathOn()
         if output_type == "svg":
             gl.SetFileFormatToSVG()
         elif output_type == "ps":
@@ -1112,14 +1116,17 @@ class VTKVCSBackend(object):
         self.showGUI()
 
     def postscript(self, file, width=None, height=None,
-                   units=None):
-        return self.vectorGraphics("ps", file, width, height, units)
+                   units=None, textAsObject=True):
+        return self.vectorGraphics("ps", file, width, height,
+                                    units, textAsObject)
 
-    def pdf(self, file, width=None, height=None, units=None):
-        return self.vectorGraphics("pdf", file, width, height, units)
+    def pdf(self, file, width=None, height=None, units=None, textAsObject=True):
+        return self.vectorGraphics("pdf", file, width, height,
+                                    units, textAsObject)
 
-    def svg(self, file, width=None, height=None, units=None):
-        return self.vectorGraphics("svg", file, width, height, units)
+    def svg(self, file, width=None, height=None, units=None, textAsObject=True):
+        return self.vectorGraphics("svg", file, width,
+                                    height, units, textAsObject)
 
     def gif(self, filename='noname.gif', merge='r', orientation=None,
             geometry='1600x1200'):
-- 
GitLab


From 0b2065ad031cf1e0b9c4efc1006273a65647d1f6 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Thu, 26 May 2016 09:51:16 -0400
Subject: [PATCH 108/191] Fixed comment style

---
 Packages/vcs/vcs/Canvas.py | 481 +++++++++++++++++++------------------
 1 file changed, 241 insertions(+), 240 deletions(-)

diff --git a/Packages/vcs/vcs/Canvas.py b/Packages/vcs/vcs/Canvas.py
index c8712580c..38ca2a013 100644
--- a/Packages/vcs/vcs/Canvas.py
+++ b/Packages/vcs/vcs/Canvas.py
@@ -18,7 +18,7 @@
 #               landscape (width exceeding height), portrait (height exceeding#
 #               width), or full-screen mode.                                  #
 #                                                                             #
-# Version: 2.4                                                          #
+# Version: 2.4                                                                #
 #                                                                             #
 ###############################################################################
 
@@ -322,9 +322,9 @@ class Canvas(object):
     a=vcs.Canvas()                    # This examples constructs a VCS Canvas
 """
     ##########################################################################
-    #                                                                           #
-    # Set attributes for VCS Canvas Class (i.e., set VCS Canvas Mode).          #
-    #                                                                           #
+    #                                                                        #
+    # Set attributes for VCS Canvas Class (i.e., set VCS Canvas Mode).       #
+    #                                                                        #
     ##########################################################################
     __slots__ = [
         '_mode',
@@ -835,9 +835,9 @@ class Canvas(object):
         return tv
 
     ##########################################################################
-    #                                                                           #
-    # Print out the object's doc string.                                        #
-    #                                                                           #
+    #                                                                        #
+    # Print out the object's doc string.                                     #
+    #                                                                        #
     ##########################################################################
     def objecthelp(self, *arg):
         """
@@ -855,13 +855,13 @@ class Canvas(object):
         for x in arg:
             print getattr(x, "__doc__", "")
 
-    ##########################################################################
-    #                                                                           #
-    # Initialize the VCS Canvas and set the Canvas mode to 0. Because the mode  #
-    # is set to 0, the user will have to manually update the VCS Canvas by      #
-    # using the "update" function.                                              #
-    #                                                                           #
-    ##########################################################################
+    ############################################################################
+    #                                                                          #
+    # Initialize the VCS Canvas and set the Canvas mode to 0. Because the mode #
+    # is set to 0, the user will have to manually update the VCS Canvas by     #
+    # using the "update" function.                                             #
+    #                                                                          #
+    ############################################################################
     def __init__(self, mode=1, pause_time=0,
                  call_from_gui=0, size=None, backend="vtk", geometry=None, bg=None):
         self._canvas_id = vcs.next_canvas_id
@@ -964,12 +964,12 @@ class Canvas(object):
 
 # Initial.attributes is being called in main.c, so it is not needed here!
 # Actually it is for taylordiagram graphic methods....
-##########################################################################
+###########################################################################################
 #  Okay, then this is redundant since it is done in main.c. When time perments, put the   #
 #  taylordiagram graphic methods attributes in main.c Because this is here we must check  #
 #  to make sure that the initial attributes file is called only once for normalization    #
 #  purposes....                                                                           #
-##########################################################################
+###########################################################################################
 
         self.canvas_template_editor = None
         self.ratio = '0'
@@ -1013,11 +1013,11 @@ class Canvas(object):
     def initLogoDrawing(self):
         self.drawLogo = self.enableLogo
 
-    ##########################################################################
+    #############################################################################
     #                                                                           #
     # Update wrapper function for VCS.                                          #
     #                                                                           #
-    ##########################################################################
+    #############################################################################
 
     def update(self, *args, **kargs):
         """
@@ -1046,11 +1046,11 @@ class Canvas(object):
 
         return self.backend.update(*args, **kargs)
 
-    ##########################################################################
+    #############################################################################
     #                                                                           #
     # Update wrapper function for VCS with a check to update the continents.    #
     #                                                                           #
-    ##########################################################################
+    #############################################################################
     def _update_continents_check(self, *args):
 
         a = self.canvas.updatecanvas_continents(*args)
@@ -1060,11 +1060,11 @@ class Canvas(object):
 
         return a
 
-    ##########################################################################
+    #############################################################################
     #                                                                           #
     # Script VCS primary or secondary elements wrapper functions for VCS.       #
     #                                                                           #
-    ##########################################################################
+    #############################################################################
     def scriptobject(self, obj, script_filename=None, mode=None):
         """
  Function: scriptobject       # Script a single primary or secondary class object
@@ -1139,11 +1139,11 @@ class Canvas(object):
         else:
             print 'This is not a template, graphics method or secondary method object.'
 
-    ##########################################################################
+    #############################################################################
     #                                                                           #
     # Remove VCS primary and secondary methods wrapper functions for VCS.       #
     #                                                                           #
-    ##########################################################################
+    #############################################################################
 
     def removeobject(self, obj):
         __doc__ = vcs.removeobject.__doc__  # noqa
@@ -1193,11 +1193,11 @@ class Canvas(object):
     def check_name_source(self, name, source, typ):
         return vcs.check_name_source(name, source, typ)
 
-    ##########################################################################
+    #############################################################################
     #                                                                           #
     # Template functions for VCS.                                               #
     #                                                                           #
-    ##########################################################################
+    #############################################################################
     def createtemplate(self, name=None, source='default'):
         return vcs.createtemplate(name, source)
     createtemplate.__doc__ = vcs.manageElements.createtemplate.__doc__
@@ -1206,11 +1206,11 @@ class Canvas(object):
         return vcs.gettemplate(Pt_name_src)
     gettemplate.__doc__ = vcs.manageElements.gettemplate.__doc__
 
-    ##########################################################################
+    #############################################################################
     #                                                                           #
     # Projection functions for VCS.                                             #
     #                                                                           #
-    ##########################################################################
+    #############################################################################
     def createprojection(self, name=None, source='default'):
         return vcs.createprojection(name, source)
     createprojection.__doc__ = vcs.manageElements.createprojection.__doc__
@@ -1219,11 +1219,11 @@ class Canvas(object):
         return vcs.getprojection(Proj_name_src)
     getprojection.__doc__ = vcs.manageElements.getprojection.__doc__
 
-    ##########################################################################
+    #############################################################################
     #                                                                           #
     # Boxfill functions for VCS.                                                #
     #                                                                           #
-    ##########################################################################
+    #############################################################################
     def createboxfill(self, name=None, source='default'):
         return vcs.createboxfill(name, source)
     createboxfill.__doc__ = vcs.manageElements.createboxfill.__doc__
@@ -1282,11 +1282,11 @@ Options:::
     boxfill.__doc__ = boxfill.__doc__ % (
         plot_keywords_doc, graphics_method_core, axesconvert, plot_2D_input, plot_output)
 
-    ##########################################################################
+    #############################################################################
     #                                                                           #
     # Taylordiagram functions for VCS.                                          #
     #                                                                           #
-    ##########################################################################
+    #############################################################################
     def createtaylordiagram(self, name=None, source='default'):
         return vcs.createtaylordiagram(name, source)
     createtaylordiagram.__doc__ = vcs.manageElements.createtaylordiagram.__doc__
@@ -1317,11 +1317,11 @@ Options:::
         arglist = _determine_arg_list('taylordiagram', args)
         return self.__plot(arglist, parms)
 
-    ##########################################################################
+    #############################################################################
     #                                                                           #
     # Meshfill functions for VCS.                                               #
     #                                                                           #
-    ##########################################################################
+    #############################################################################
 
     def createmeshfill(self, name=None, source='default'):
         return vcs.createmeshfill(name, source)
@@ -1368,11 +1368,11 @@ Options:::
         arglist = _determine_arg_list('meshfill', args)
         return self.__plot(arglist, parms)
 
-    ##########################################################################
+    #############################################################################
     #                                                                           #
-    # DV3D functions for VCS.                                                #
+    # DV3D functions for VCS.                                                   #
     #                                                                           #
-    ##########################################################################
+    #############################################################################
 
     def create3d_scalar(self, name=None, source='default'):
         return vcs.create3d_scalar(name, source)
@@ -1413,11 +1413,11 @@ Options:::
         arglist = _determine_arg_list('3d_dual_scalar', args)
         return self.__plot(arglist, parms)
 
-    ##########################################################################
+    #############################################################################
     #                                                                           #
     # Isofill functions for VCS.                                                #
     #                                                                           #
-    ##########################################################################
+    #############################################################################
     def createisofill(self, name=None, source='default'):
         return vcs.createisofill(name, source)
     createisofill.__doc__ = vcs.manageElements.createisofill.__doc__
@@ -1469,11 +1469,11 @@ Options:::
     isofill.__doc__ = isofill.__doc__ % (
         plot_keywords_doc, graphics_method_core, axesconvert, plot_2D_input, plot_output)
 
-    ##########################################################################
+    #############################################################################
     #                                                                           #
     # Isoline functions for VCS.                                                #
     #                                                                           #
-    ##########################################################################
+    #############################################################################
     def createisoline(self, name=None, source='default'):
         return vcs.createisoline(name, source)
     createisoline.__doc__ = vcs.manageElements.createisoline.__doc__
@@ -1533,11 +1533,11 @@ Options:::
         return vcs.get1d(name)
     create1d.__doc__ = vcs.manageElements.create1d.__doc__
 
-    ##########################################################################
+    #############################################################################
     #                                                                           #
     # Xyvsy functions for VCS.                                                  #
     #                                                                           #
-    ##########################################################################
+    #############################################################################
     def createxyvsy(self, name=None, source='default'):
         return vcs.createxyvsy(name, source)
     createxyvsy.__doc__ = vcs.manageElements.createxyvsy.__doc__
@@ -1589,11 +1589,11 @@ Options:::
     xyvsy.__doc__ = xyvsy.__doc__ % (
         plot_keywords_doc, graphics_method_core, xaxisconvert, plot_1D_input, plot_output)
 
-    ##########################################################################
+    #############################################################################
     #                                                                           #
     # Yxvsx functions for VCS.                                                  #
     #                                                                           #
-    ##########################################################################
+    #############################################################################
     def createyxvsx(self, name=None, source='default'):
         return vcs.createyxvsx(name, source)
     createyxvsx.__doc__ = vcs.manageElements.createyxvsx.__doc__
@@ -1645,11 +1645,11 @@ Options:::
     yxvsx.__doc__ = yxvsx.__doc__ % (
         plot_keywords_doc, graphics_method_core, xaxisconvert, plot_1D_input, plot_output)
 
-    ##########################################################################
+    #############################################################################
     #                                                                           #
     # XvsY functions for VCS.                                                   #
     #                                                                           #
-    ##########################################################################
+    #############################################################################
     def createxvsy(self, name=None, source='default'):
         return vcs.createxvsy(name, source)
     createxvsy.__doc__ = vcs.manageElements.createxvsy.__doc__
@@ -1702,11 +1702,11 @@ Options:::
                                    plot_2_1D_input,
                                    plot_output)
 
-    ##########################################################################
+    #############################################################################
     #                                                                           #
     # Vector functions for VCS.                                                 #
     #                                                                           #
-    ##########################################################################
+    #############################################################################
     def createvector(self, name=None, source='default'):
         return vcs.createvector(name, source)
     createvector.__doc__ = vcs.manageElements.createvector.__doc__
@@ -1737,11 +1737,11 @@ Options:::
         arglist = _determine_arg_list('vector', args)
         return self.__plot(arglist, parms)
 
-    ##########################################################################
+    #############################################################################
     #                                                                           #
     # Scatter functions for VCS.                                                #
     #                                                                           #
-    ##########################################################################
+    #############################################################################
     def createscatter(self, name=None, source='default'):
         return vcs.createscatter(name, source)
     createscatter.__doc__ = vcs.manageElements.createscatter.__doc__
@@ -1792,11 +1792,11 @@ Options:::
     scatter.__doc__ = scatter.__doc__ % (
         plot_keywords_doc, graphics_method_core, axesconvert, plot_2_1D_input, plot_output)
 
-    ##########################################################################
+    #############################################################################
     #                                                                           #
     # Line  functions for VCS.                                                  #
     #                                                                           #
-    ##########################################################################
+    #############################################################################
     def createline(self, name=None, source='default', ltype=None,  # noqa
                    width=None, color=None, priority=None,
                    viewport=None, worldcoordinate=None,
@@ -1876,11 +1876,11 @@ Options:::
 
         return ln
 
-    ##########################################################################
+    #############################################################################
     #                                                                           #
     # Marker  functions for VCS.                                                #
     #                                                                           #
-    ##########################################################################
+    #############################################################################
     def createmarker(self, name=None, source='default', mtype=None,  # noqa
                      size=None, color=None, priority=1,
                      viewport=None, worldcoordinate=None,
@@ -1959,11 +1959,11 @@ Options:::
 
         return mrk
 
-    ##########################################################################
+    #############################################################################
     #                                                                           #
     # Fillarea  functions for VCS.                                              #
     #                                                                           #
-    ##########################################################################
+    #############################################################################
     def createfillarea(self, name=None, source='default', style=None,
                        index=None, color=None, priority=1,
                        viewport=None, worldcoordinate=None,
@@ -2044,11 +2044,11 @@ Options:::
 
         return fa
 
-    ##########################################################################
+    #############################################################################
     #                                                                           #
     # Text Table  functions for VCS.                                            #
     #                                                                           #
-    ##########################################################################
+    #############################################################################
     def createtexttable(self, name=None, source='default', font=None,
                         spacing=None, expansion=None, color=None, priority=None,
                         viewport=None, worldcoordinate=None,
@@ -2066,11 +2066,11 @@ Options:::
                                 viewport, worldcoordinate, x, y)
     gettexttable.__doc__ = vcs.manageElements.gettexttable.__doc__
 
-    ##########################################################################
+    #############################################################################
     #                                                                           #
     # Text Orientation  functions for VCS.                                      #
     #                                                                           #
-    ##########################################################################
+    #############################################################################
     def createtextorientation(self, name=None, source='default'):
         return vcs.createtextorientation(name, source)
     createtextorientation.__doc__ = vcs.manageElements.createtextorientation.__doc__
@@ -2079,11 +2079,11 @@ Options:::
         return vcs.gettextorientation(To_name_src)
     gettextorientation.__doc__ = vcs.manageElements.gettextorientation.__doc__
 
-    ##########################################################################
+    #############################################################################
     #                                                                           #
     # Text Combined  functions for VCS.                                         #
     #                                                                           #
-    ##########################################################################
+    #############################################################################
     def createtextcombined(self, Tt_name=None, Tt_source='default', To_name=None, To_source='default',  # noqa
                            font=None, spacing=None, expansion=None, color=None,
                            priority=None, viewport=None, worldcoordinate=None, x=None, y=None,
@@ -3802,33 +3802,33 @@ Options:::
         self.backend.setAnimationStepper(stepper)
 
     ##########################################################################
-    #                                                                           #
-    # VCS utility wrapper to return the number of displays that are "ON".       #
-    #                                                                           #
+    #                                                                        #
+    # VCS utility wrapper to return the number of displays that are "ON".    #
+    #                                                                        #
     ##########################################################################
     def return_display_ON_num(self, *args):
         return self.canvas.return_display_ON_num(*args)
 
     ##########################################################################
-    #                                                                           #
-    # VCS utility wrapper to return the current display names.                  #
-    #                                                                           #
+    #                                                                        #
+    # VCS utility wrapper to return the current display names.               #
+    #                                                                        #
     ##########################################################################
     def return_display_names(self, *args):
         return self.display_names
 
     ##########################################################################
-    #                                                                           #
-    # VCS utility wrapper to remove the display names.                          #
-    #                                                                           #
+    #                                                                        #
+    # VCS utility wrapper to remove the display names.                       #
+    #                                                                        #
     ##########################################################################
     def remove_display_name(self, *args):
         return self.canvas.remove_display_name(*args)
 
     ##########################################################################
-    #                                                                           #
-    # CGM  wrapper for VCS.                                                     #
-    #                                                                           #
+    #                                                                        #
+    # CGM  wrapper for VCS.                                                  #
+    #                                                                        #
     ##########################################################################
     def cgm(self, file, mode='w'):
         """
@@ -3861,9 +3861,9 @@ Options:::
         return self.backend.cgm(file)
 
     ##########################################################################
-    #                                                                           #
-    # Clear VCS Canvas wrapper for VCS.                                         #
-    #                                                                           #
+    #                                                                        #
+    # Clear VCS Canvas wrapper for VCS.                                      #
+    #                                                                        #
     ##########################################################################
     def clear(self, *args, **kargs):
         """
@@ -3912,9 +3912,9 @@ Options:::
         return
 
     ##########################################################################
-    #                                                                           #
-    # Close VCS Canvas wrapper for VCS.                                         #
-    #                                                                           #
+    #                                                                        #
+    # Close VCS Canvas wrapper for VCS.                                      #
+    #                                                                        #
     ##########################################################################
     def close(self, *args, **kargs):
         """
@@ -3938,9 +3938,9 @@ Options:::
         return a
 
     ##########################################################################
-    #                                                                           #
-    # Destroy VCS Canvas Object (i.e., call the Dealloc C code).            #
-    #                                                                           #
+    #                                                                        #
+    # Destroy VCS Canvas Object (i.e., call the Dealloc C code).             #
+    #                                                                        #
     ##########################################################################
     def destroy(self):
         """
@@ -3962,9 +3962,9 @@ Options:::
         gc.collect()
 
     ##########################################################################
-    #                                                                           #
-    # Graphics Method Change display.                                           #
-    #                                                                           #
+    #                                                                        #
+    # Graphics Method Change display.                                        #
+    #                                                                        #
     ##########################################################################
     def change_display_graphic_method(self, display, type, name):
         '''
@@ -3977,9 +3977,9 @@ Options:::
         return self.canvas.change_display_graphic_method(
             *(display, type, name))
     ##########################################################################
-    #                                                                           #
-    # Figures out which display is selected in graphic method editor mode       #
-    #                                                                           #
+    #                                                                        #
+    # Figures out which display is selected in graphic method editor mode    #
+    #                                                                        #
     ##########################################################################
 
     def get_selected_display(self):
@@ -3990,9 +3990,9 @@ Options:::
         return self.canvas.get_selected_display(*())
 
     ##########################################################################
-    #                                                                           #
-    # Send a request to turn on a picture template object in the VCS Canvas.    #
-    #                                                                           #
+    #                                                                        #
+    # Send a request to turn on a picture template object in the VCS Canvas. #
+    #                                                                        #
     ##########################################################################
     def _select_one(self, template_name, attr_name, X1, X2, Y1, Y2):
         # flush and block the X main loop
@@ -4000,19 +4000,19 @@ Options:::
         self.canvas._select_one(template_name, attr_name, X1, X2, Y1, Y2)
 
     ##########################################################################
-    #                                                                           #
-    # Send a request to turn off a picture template object in the VCS Canvas.   #
-    #                                                                           #
+    #                                                                        #
+    # Send a request to turn off a picture template object in the VCS Canvas.#
+    #                                                                        #
     ##########################################################################
     def _unselect_one(self, template_name, attr_name, X1, X2, Y1, Y2):
 
         self.canvas._unselect_one(template_name, attr_name, X1, X2, Y1, Y2)
 
     ##########################################################################
-    #                                                                           #
-    # Set the template editor event flag to select all template objects on the  #
-    # VCS Canvas.                                                               #
-    #                                                                           #
+    #                                                                        #
+    # Set the template editor event flag to select all template objects on   #
+    # the VCS Canvas.                                                        #
+    #                                                                        #
     ##########################################################################
     def _select_all(self):
         # flush and block the X main loop
@@ -4020,10 +4020,10 @@ Options:::
         self.canvas._select_all()
 
     ##########################################################################
-    #                                                                           #
-    # Set the template editor event flag to unselect all the template objects   #
-    # on the VCS Canvas.                                                        #
-    #                                                                           #
+    #                                                                        #
+    # Set the template editor event flag to unselect all the template        #
+    # objects on the VCS Canvas.                                             #
+    #                                                                        #
     ##########################################################################
     def _unselect_all(self):
         # flush and block the X main loop
@@ -4031,57 +4031,57 @@ Options:::
         self.canvas._unselect_all()
 
     ##########################################################################
-    #                                                                           #
-    # Set the template editor mode for the VCS Canvas screen.                   #
-    #                                                                           #
+    #                                                                        #
+    # Set the template editor mode for the VCS Canvas screen.                #
+    #                                                                        #
     ##########################################################################
     def _SCREEN_TEMPLATE_FLAG(self):
         self.canvas.SCREEN_TEMPLATE_FLAG()
 
     ##########################################################################
-    #                                                                           #
-    # Set the graphic method editor mode for the VCS Canvas screen.                   #
-    #                                                                           #
+    #                                                                        #
+    # Set the graphic method editor mode for the VCS Canvas screen.          #
+    #                                                                        #
     ##########################################################################
     def _SCREEN_GM_FLAG(self):
         self.canvas.SCREEN_GM_FLAG()
 
     ##########################################################################
-    #                                                                           #
-    # Set the data mode for the VCS Canvas screen.                              #
-    #                                                                           #
+    #                                                                        #
+    # Set the data mode for the VCS Canvas screen.                           #
+    #                                                                        #
     ##########################################################################
     def _SCREEN_DATA_FLAG(self):
         self.canvas.SCREEN_DATA_FLAG()
 
     ##########################################################################
-    #                                                                           #
-    # Set the screen check mode to DATA for the VCS Canvas.                     #
-    #                                                                           #
+    #                                                                        #
+    # Set the screen check mode to DATA for the VCS Canvas.                  #
+    #                                                                        #
     ##########################################################################
     def _SCREEN_CHECKMODE_DATA_FLAG(self):
         self.canvas.SCREEN_CHECKMODE_DATA_FLAG()
 
     ##########################################################################
-    #                                                                           #
-    # Return the Screen mode, either data mode or template editor mode.         #
-    #                                                                           #
+    #                                                                        #
+    # Return the Screen mode, either data mode or template editor mode.      #
+    #                                                                        #
     ##########################################################################
     def SCREEN_MODE(self, *args):
         return self.canvas.SCREEN_MODE(*args)
 
     ##########################################################################
-    #                                                                           #
-    # Return the Screen mode, either data mode or template editor mode.         #
-    #                                                                           #
+    #                                                                        #
+    # Return the Screen mode, either data mode or template editor mode.      #
+    #                                                                        #
     ##########################################################################
     def plot_annotation(self, *args):
         self.canvas.plot_annotation(*args)
 
     ##########################################################################
-    #                                                                           #
-    # Flush X event que wrapper for VCS.                                        #
-    #                                                                           #
+    #                                                                        #
+    # Flush X event que wrapper for VCS.                                     #
+    #                                                                        #
     ##########################################################################
     def flush(self, *args):
         """
@@ -4099,9 +4099,9 @@ Options:::
         return self.backend.flush(*args)
 
     ##########################################################################
-    #                                                                           #
-    # Geometry wrapper for VCS.                                                 #
-    #                                                                           #
+    #                                                                        #
+    # Geometry wrapper for VCS.                                              #
+    #                                                                        #
     ##########################################################################
     def geometry(self, *args):
         """
@@ -4129,9 +4129,9 @@ Options:::
         return a
 
     ##########################################################################
-    #                                                                           #
-    # VCS Canvas Information wrapper.                                           #
-    #                                                                           #
+    #                                                                        #
+    # VCS Canvas Information wrapper.                                        #
+    #                                                                        #
     ##########################################################################
     def canvasinfo(self, *args, **kargs):
         """
@@ -4149,9 +4149,9 @@ Options:::
         return self.backend.canvasinfo(*args, **kargs)
 
     ##########################################################################
-    #                                                                           #
-    # Get continents type wrapper for VCS.                                      #
-    #                                                                           #
+    #                                                                        #
+    # Get continents type wrapper for VCS.                                   #
+    #                                                                        #
     ##########################################################################
     def getcontinentstype(self, *args):
         """
@@ -4219,9 +4219,9 @@ Options:::
         return
 
     ##########################################################################
-    #                                                                           #
-    # Grid wrapper for VCS.                                                     #
-    #                                                                           #
+    #                                                                        #
+    # Grid wrapper for VCS.                                                  #
+    #                                                                        #
     ##########################################################################
     def grid(self, *args):
         """
@@ -4243,9 +4243,9 @@ Options:::
         return p
 
     ##########################################################################
-    #                                                                           #
-    # Landscape VCS Canvas orientation wrapper for VCS.                         #
-    #                                                                           #
+    #                                                                        #
+    # Landscape VCS Canvas orientation wrapper for VCS.                      #
+    #                                                                        #
     ##########################################################################
     def landscape(self, width=-99, height=-99, x=-99, y=-99, clear=0):
         """
@@ -4305,9 +4305,9 @@ Options:::
         return l
 
     ##########################################################################
-    #                                                                           #
-    # List Primary and Secondary elements wrapper for VCS.                      #
-    #                                                                           #
+    #                                                                        #
+    # List Primary and Secondary elements wrapper for VCS.                   #
+    #                                                                        #
     ##########################################################################
     def listelements(self, *args):
         """
@@ -4331,9 +4331,9 @@ Options:::
         return L
 
     ##########################################################################
-    #                                                                           #
-    # update VCS's Canvas orientation wrapper for VCS.                          #
-    #                                                                           #
+    #                                                                        #
+    # update VCS's Canvas orientation wrapper for VCS.                       #
+    #                                                                        #
     ##########################################################################
     def updateorientation(self, *args):
         """
@@ -4347,9 +4347,9 @@ Options:::
         return a
 
     ##########################################################################
-    #                                                                           #
-    # Open VCS Canvas wrapper for VCS.                                          #
-    #                                                                           #
+    #                                                                        #
+    # Open VCS Canvas wrapper for VCS.                                       #
+    #                                                                        #
     ##########################################################################
     def open(self, width=None, height=None, **kargs):
         """
@@ -4370,9 +4370,9 @@ Options:::
         return a
 
     ##########################################################################
-    #                                                                           #
-    # Return VCS Canvas ID.                                                     #
-    #                                                                           #
+    #                                                                        #
+    # Return VCS Canvas ID.                                                  #
+    #                                                                        #
     ##########################################################################
     def canvasid(self, *args):
         '''
@@ -4390,17 +4390,18 @@ Options:::
         return self._canvas_id
 
     ##########################################################################
-    #                                                                           #
-    # Connect the VCS Canvas to the GUI.                                        #
-    #                                                                           #
+    #                                                                        #
+    # Connect the VCS Canvas to the GUI.                                     #
+    #                                                                        #
     ##########################################################################
     def _connect_gui_and_canvas(self, *args):
         return self.canvas.connect_gui_and_canvas(*args)
 
     ##########################################################################
-    #                                                                           #
-    # Page VCS Canvas orientation ('portrait' or 'landscape') wrapper for VCS.  #
-    #                                                                           #
+    #                                                                        #
+    # Page VCS Canvas orientation ('portrait' or 'landscape') wrapper for    #
+    # VCS.                                                                   #
+    #                                                                        #
     ##########################################################################
     def page(self, *args):
         """
@@ -4424,9 +4425,9 @@ Options:::
         return l
 
     ##########################################################################
-    #                                                                           #
-    # Portrait VCS Canvas orientation wrapper for VCS.                          #
-    #                                                                           #
+    #                                                                        #
+    # Portrait VCS Canvas orientation wrapper for VCS.                       #
+    #                                                                        #
     ##########################################################################
     def portrait(self, width=-99, height=-99, x=-99, y=-99, clear=0):
         """
@@ -4676,9 +4677,9 @@ Options:::
             file, W, H, units, draw_white_background, **args)
 
     ##########################################################################
-    #                                                                           #
-    # pdf wrapper for VCS.                                               #
-    #                                                                           #
+    #                                                                        #
+    # pdf wrapper for VCS.                                                   #
+    #                                                                        #
     ##########################################################################
     def pdf(self, file, width=None, height=None, units='inches', textAsObject=True):
         """
@@ -4967,9 +4968,9 @@ Options:::
                 shutil.move(psnm, file)
 
     ##########################################################################
-    #                                                                           #
-    # Showbg wrapper for VCS.                                                   #
-    #                                                                           #
+    #                                                                        #
+    # Showbg wrapper for VCS.                                                #
+    #                                                                        #
     ##########################################################################
     def showbg(self, *args):
         """
@@ -4992,9 +4993,9 @@ Options:::
         return a
 
     ##########################################################################
-    #                                                                           #
-    # Backing Store wrapper for VCS.                                            #
-    #                                                                           #
+    #                                                                        #
+    # Backing Store wrapper for VCS.                                         #
+    #                                                                        #
     ##########################################################################
     def backing_store(self, *args):
         """
@@ -5010,25 +5011,25 @@ Options:::
         return self.canvas.backing_store(*args)
 
     ##########################################################################
-    #                                                                           #
-    # Update the animation slab. Used only for the VCS Canvas GUI.              #
-    #                                                                           #
+    #                                                                        #
+    # Update the animation slab. Used only for the VCS Canvas GUI.           #
+    #                                                                        #
     ##########################################################################
     def update_animation_data(self, *args):
         return self.canvas.update_animation_data(*args)
 
     ##########################################################################
-    #                                                                           #
-    # Return the dimension information. Used only for the VCS Canvas GUI.       #
-    #                                                                           #
+    #                                                                        #
+    # Return the dimension information. Used only for the VCS Canvas GUI.    #
+    #                                                                        #
     ##########################################################################
     def return_dimension_info(self, *args):
         return self.canvas.return_dimension_info(*args)
 
     ##########################################################################
-    #                                                                           #
-    # Raster wrapper for VCS.                                                   #
-    #                                                                           #
+    #                                                                        #
+    # Raster wrapper for VCS.                                                #
+    #                                                                        #
     ##########################################################################
     def raster(self, file, mode='a'):
         """
@@ -5058,9 +5059,9 @@ Options:::
         return self.canvas.raster(*(file, mode))
 
     ##########################################################################
-    #                                                                           #
-    # Reset grid wrapper for VCS.                                               #
-    #                                                                           #
+    #                                                                        #
+    # Reset grid wrapper for VCS.                                            #
+    #                                                                        #
     ##########################################################################
     def resetgrid(self, *args):
         """
@@ -5075,9 +5076,9 @@ Options:::
         return self.canvas.resetgrid(*args)
 
     ##########################################################################
-    #                                                                           #
-    # Script wrapper for VCS.                                                   #
-    #                                                                           #
+    #                                                                        #
+    # Script wrapper for VCS.                                                #
+    #                                                                        #
     ##########################################################################
     def _scriptrun(self, *args):
         return vcs._scriptrun(*args)
@@ -5086,9 +5087,9 @@ Options:::
         vcs.scriptrun(aFile, *args, **kargs)
 
     ##########################################################################
-    #                                                                           #
-    # Set default graphics method and template wrapper for VCS.                 #
-    #                                                                           #
+    #                                                                        #
+    # Set default graphics method and template wrapper for VCS.              #
+    #                                                                        #
     ##########################################################################
     def set(self, *args):
         """
@@ -5108,9 +5109,9 @@ Options:::
         return self.canvas.set(*args)
 
     ##########################################################################
-    #                                                                           #
-    # Set VCS color map wrapper for VCS.                                        #
-    #                                                                           #
+    #                                                                        #
+    # Set VCS color map wrapper for VCS.                                     #
+    #                                                                        #
     ##########################################################################
     def setcolormap(self, name):
         """
@@ -5140,9 +5141,9 @@ Options:::
         return
 
     ##########################################################################
-    #                                                                           #
-    # Set VCS color map cell wrapper for VCS.                                   #
-    #                                                                           #
+    #                                                                        #
+    # Set VCS color map cell wrapper for VCS.                                #
+    #                                                                        #
     ##########################################################################
     def setcolorcell(self, *args):
         """
@@ -5312,9 +5313,9 @@ Options:::
         return self.backend.gif(nargs)
 
     ##########################################################################
-    #                                                                           #
-    # Screen GhostScript (gs) wrapper for VCS.                                  #
-    #                                                                           #
+    #                                                                        #
+    # Screen GhostScript (gs) wrapper for VCS.                               #
+    #                                                                        #
     ##########################################################################
     def gs(self, filename='noname.gs', device='png256',
            orientation=None, resolution='792x612'):
@@ -5322,9 +5323,9 @@ Options:::
         warnings.warn("Export to GhostScript is no longer supported", DeprecationWarning)
 
     ##########################################################################
-    #                                                                           #
-    # Screen Encapsulated PostScript wrapper for VCS.                           #
-    #                                                                           #
+    #                                                                        #
+    # Screen Encapsulated PostScript wrapper for VCS.                        #
+    #                                                                        #
     ##########################################################################
     def eps(self, file, mode='r', orientation=None, width=None, height=None, units='inches',
             left_margin=None, right_margin=None, top_margin=None, bottom_margin=None):
@@ -5373,18 +5374,18 @@ Options:::
         os.remove(tmpfile)
 
     ##########################################################################
-    #                                                                           #
-    # Show VCS primary and secondary elements wrapper for VCS.                  #
-    #                                                                           #
+    #                                                                        #
+    # Show VCS primary and secondary elements wrapper for VCS.               #
+    #                                                                        #
     ##########################################################################
     def show(self, *args):
         return vcs.show(*args)
     show.__doc__ = vcs.__doc__
 
     ##########################################################################
-    #                                                                           #
-    # Look if a graphic method is in a file           .                         #
-    #                                                                           #
+    #                                                                        #
+    # Look if a graphic method is in a file           .                      #
+    #                                                                        #
     ##########################################################################
     def isinfile(self, GM, file=None):
         """ Checks if a graphic method is stored in a file
@@ -5404,9 +5405,9 @@ Options:::
                 return 1
         return 0
     ##########################################################################
-    #                                                                           #
-    # Save VCS initial.attribute file  wrapper for VCS.                         #
-    #                                                                           #
+    #                                                                        #
+    # Save VCS initial.attribute file  wrapper for VCS.                      #
+    #                                                                        #
     ##########################################################################
 
     def saveinitialfile(self):
@@ -5443,9 +5444,9 @@ Options:::
         return vcs.saveinitialfile()
 
     ##########################################################################
-    #                                                                           #
-    # Raise VCS Canvas to the top of all its siblings.                          #
-    #                                                                           #
+    #                                                                        #
+    # Raise VCS Canvas to the top of all its siblings.                       #
+    #                                                                        #
     ##########################################################################
     def canvasraised(self, *args):
         """
@@ -5465,10 +5466,10 @@ Options:::
         return self.backend.canvasraised(*args)
 
     ##########################################################################
-    #                                                                           #
-    # Returns 1 if a VCS Canvas is displayed on the screen. Returns a 0 if no   #
-    # VCS Canvas is displayed on the screen.                                    #
-    #                                                                           #
+    #                                                                        #
+    # Returns 1 if a VCS Canvas is displayed on the screen. Returns a 0 if no#
+    # VCS Canvas is displayed on the screen.                                 #
+    #                                                                        #
     ##########################################################################
     def iscanvasdisplayed(self, *args):
         """
@@ -5488,9 +5489,9 @@ Options:::
         return self.canvas.iscanvasdisplayed(*args)
 
     ##########################################################################
-    #                                                                           #
-    # Is VCS's orientation landscape?                                           #
-    #                                                                           #
+    #                                                                        #
+    # Is VCS's orientation landscape?                                        #
+    #                                                                        #
     ##########################################################################
     def islandscape(self):
         """
@@ -5515,9 +5516,9 @@ Options:::
             return 0
 
     ##########################################################################
-    #                                                                           #
-    # Is VCS's orientation portrait?                                            #
-    #                                                                           #
+    #                                                                        #
+    # Is VCS's orientation portrait?                                         #
+    #                                                                        #
     ##########################################################################
     def isportrait(self):
         """
@@ -5541,9 +5542,9 @@ Options:::
         else:
             return 0
     ##########################################################################
-    #                                                                           #
-    # Dislplay plot functions for VCS.                                          #
-    #                                                                           #
+    #                                                                        #
+    # Dislplay plot functions for VCS.                                       #
+    #                                                                        #
     ##########################################################################
 
     def getplot(self, Dp_name_src='default', template=None):
@@ -5570,9 +5571,9 @@ Options:::
         return display
 
     ##########################################################################
-    #                                                                           #
-    # Colormap functions for VCS.                                               #
-    #                                                                           #
+    #                                                                        #
+    # Colormap functions for VCS.                                            #
+    #                                                                        #
     ##########################################################################
     def createcolormap(self, Cp_name=None, Cp_name_src='default'):
         return vcs.createcolormap(Cp_name, Cp_name_src)
@@ -5583,9 +5584,9 @@ Options:::
     getcolormap.__doc__ = vcs.manageElements.getcolormap.__doc__
 
     ##########################################################################
-    #                                                                           #
-    # Font functions.                       #
-    #                                                                           #
+    #                                                                        #
+    # Font functions.                                                        #
+    #                                                                        #
     ##########################################################################
     def addfont(self, path, name=""):
         """
@@ -5698,9 +5699,9 @@ Options:::
         return self.copyfontto(font, 1)
 
     ##########################################################################
-    #                                                                           #
-    # Orientation VCS Canvas orientation wrapper for VCS.                       #
-    #                                                                           #
+    #                                                                        #
+    # Orientation VCS Canvas orientation wrapper for VCS.                    #
+    #                                                                        #
     ##########################################################################
     def orientation(self, *args, **kargs):
         """
@@ -5716,9 +5717,9 @@ Options:::
         return self.backend.orientation(*args, **kargs)
 
     ##########################################################################
-    #                                                                           #
-    # Get VCS color map cell wrapper for VCS.                                   #
-    #                                                                           #
+    #                                                                        #
+    # Get VCS color map cell wrapper for VCS.                                #
+    #                                                                        #
     ##########################################################################
     def getcolorcell(self, *args):
         """
@@ -5750,9 +5751,9 @@ Options:::
         return vcs.getcolorcell(args[0], self)
 
     ##########################################################################
-    #                                                                           #
-    # Get VCS color map name wrapper for VCS.                                   #
-    #                                                                           #
+    #                                                                        #
+    # Get VCS color map name wrapper for VCS.                                #
+    #                                                                        #
     ##########################################################################
     def getcolormapname(self, *args):
         """
-- 
GitLab


From c30239c24c6ec90e5b9393c7d869151fe902d4a0 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Fri, 27 May 2016 13:12:11 -0400
Subject: [PATCH 109/191] Fixed flake8

---
 Packages/vcs/vcs/VCS_validation_functions.py |  4 ++--
 Packages/vcs/vcs/vcsvtk/vectorpipeline.py    |  3 ---
 Packages/vcs/vcs/vector.py                   | 16 ++++++++++------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Packages/vcs/vcs/VCS_validation_functions.py b/Packages/vcs/vcs/VCS_validation_functions.py
index db848b968..33d554f27 100644
--- a/Packages/vcs/vcs/VCS_validation_functions.py
+++ b/Packages/vcs/vcs/VCS_validation_functions.py
@@ -246,11 +246,11 @@ def checkListOfNumbers(self, name, value, minvalue=None,
 def checkValidOption(self, name, value, options):
     checkName(self, name, value)
     if value not in options:
-        VCS_validation_functions.checkedRaise(
+        self.checkedRaise(
             self,
             value,
             ValueError,
-            'Invalid value '+ value + '. Valid options are: ' +
+            'Invalid value ' + value + '. Valid options are: ' +
             ','.join(self.scaleoptions))
     return value
 
diff --git a/Packages/vcs/vcs/vcsvtk/vectorpipeline.py b/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
index 896e32a8e..642884bc6 100644
--- a/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
@@ -86,11 +86,8 @@ class VectorPipeline(Pipeline2D):
         arrow.SetOutputPointsPrecision(vtk.vtkAlgorithm.DOUBLE_PRECISION)
         arrow.FilledOff()
 
-
         polydata = self._vtkPolyDataFilter.GetOutput()
         vectors = polydata.GetPointData().GetVectors()
-        vectorsRangeX = vectors.GetRange(0)
-        vectorsRangeY = vectors.GetRange(1)
 
         if self._gm.scaletype == 'constant' or\
            self._gm.scaletype == 'constantNNormalize' or\
diff --git a/Packages/vcs/vcs/vector.py b/Packages/vcs/vcs/vector.py
index db681cc78..9976fae44 100755
--- a/Packages/vcs/vcs/vector.py
+++ b/Packages/vcs/vcs/vector.py
@@ -535,13 +535,14 @@ class Gv(object):
         self._alignment = value
     alignment = property(_getalignment, _setalignment)
 
-
     def _getscaletype(self):
         return self._scaletype
 
     def _setscaletype(self, value):
-        value = VCS_validation_functions.checkValidOption(self, 'scaletype',
-                    value, self.scaleoptions)
+        value = VCS_validation_functions.checkValidOption(self,
+                                                          'scaletype',
+                                                          value,
+                                                          self.scaleoptions)
         self._scaletype = value
     scaletype = property(_getscaletype, _setscaletype)
 
@@ -549,12 +550,15 @@ class Gv(object):
         return self._scalerange
 
     def _setscalerange(self, value):
-        value = VCS_validation_functions.checkListOfNumbers(self, 'scalerange',
-                    value, minvalue=0.0, minelements=2, maxelements=2)
+        value = VCS_validation_functions.checkListOfNumbers(self,
+                                                            'scalerange',
+                                                            value,
+                                                            minvalue=0.0,
+                                                            minelements=2,
+                                                            maxelements=2)
         self._scalerange = value
     scalerange = property(_getscalerange, _setscalerange)
 
-
     def __init__(self, Gv_name, Gv_name_src='default'):
                 #                                                         #
                 ###########################################################
-- 
GitLab


From 9a2d02d9c8b78479ca07411a3fd7baf43d82f96a Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Fri, 27 May 2016 13:32:48 -0400
Subject: [PATCH 110/191] Updated method name for consistency

---
 Packages/vcs/vcs/VCS_validation_functions.py | 2 +-
 Packages/vcs/vcs/vector.py                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Packages/vcs/vcs/VCS_validation_functions.py b/Packages/vcs/vcs/VCS_validation_functions.py
index 33d554f27..2968d7832 100644
--- a/Packages/vcs/vcs/VCS_validation_functions.py
+++ b/Packages/vcs/vcs/VCS_validation_functions.py
@@ -243,7 +243,7 @@ def checkListOfNumbers(self, name, value, minvalue=None,
     return list(value)
 
 
-def checkValidOption(self, name, value, options):
+def checkInStringList(self, name, value, options):
     checkName(self, name, value)
     if value not in options:
         self.checkedRaise(
diff --git a/Packages/vcs/vcs/vector.py b/Packages/vcs/vcs/vector.py
index 9976fae44..9ed8bfbef 100755
--- a/Packages/vcs/vcs/vector.py
+++ b/Packages/vcs/vcs/vector.py
@@ -539,7 +539,7 @@ class Gv(object):
         return self._scaletype
 
     def _setscaletype(self, value):
-        value = VCS_validation_functions.checkValidOption(self,
+        value = VCS_validation_functions.checkInStringList(self,
                                                           'scaletype',
                                                           value,
                                                           self.scaleoptions)
-- 
GitLab


From a7f5b860ff1408282431b70890044f956396c320 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Sat, 28 May 2016 03:52:42 -0400
Subject: [PATCH 111/191] Made background rendering default for testing

---
 Packages/testing/regression.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Packages/testing/regression.py b/Packages/testing/regression.py
index b9cd2cdeb..25255fdc0 100644
--- a/Packages/testing/regression.py
+++ b/Packages/testing/regression.py
@@ -20,13 +20,15 @@ def init(*args, **kwargs):
     testingDir = os.path.join(os.path.dirname(__file__), "..")
     sys.path.append(testingDir)
 
-    vcsinst = vcs.init(*args, **kwargs)
-    vcsinst.setantialiasing(0)
-    vcsinst.drawlogooff()
-
     if ((('bg' in kwargs and kwargs['bg']) or ('bg' not in kwargs)) and
         ('geometry' not in kwargs)):
+        vcsinst = vcs.init(*args, **dict(kwargs, bg=1))
         vcsinst.setbgoutputdimensions(1200, 1091, units="pixels")
+    else:
+        vcsinst = vcs.init(*args, **dict(kwargs, bg=0))
+
+    vcsinst.setantialiasing(0)
+    vcsinst.drawlogooff()
     return vcsinst
 
 def run(vcsinst, fname, baseline=sys.argv[1], threshold=defaultThreshold):
-- 
GitLab


From b59d84e4807a5efa678338aaa7cf6cbd1454beca Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Sat, 28 May 2016 04:16:31 -0400
Subject: [PATCH 112/191] Using consistent naming scheme

---
 testing/vcs/CMakeLists.txt                    | 12 ++++++------
 testing/vcs/test_vcs_vectors_scale_options.py | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/testing/vcs/CMakeLists.txt b/testing/vcs/CMakeLists.txt
index d15355ce4..bee8b9a45 100644
--- a/testing/vcs/CMakeLists.txt
+++ b/testing/vcs/CMakeLists.txt
@@ -907,12 +907,12 @@ cdat_add_test(test_vcs_settings_color_name_rgba
     cdat_add_test(test_vcs_vectors_scale_options
       "${PYTHON_EXECUTABLE}"
       ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_vectors_scale_options.py
-      "${BASELINE_DIR}/test_vcs_vector_scale_options_off.png"
-      "${BASELINE_DIR}/test_vcs_vector_scale_options_constant.png"
-      "${BASELINE_DIR}/test_vcs_vector_scale_options_linear.png"
-      "${BASELINE_DIR}/test_vcs_vector_scale_options_normalize.png"
-      "${BASELINE_DIR}/test_vcs_vector_scale_options_constantNLinear.png"
-      "${BASELINE_DIR}/test_vcs_vector_scale_options_constantNNormalize.png"
+      "${BASELINE_DIR}/test_vcs_vectors_scale_options_off.png"
+      "${BASELINE_DIR}/test_vcs_vectors_scale_options_constant.png"
+      "${BASELINE_DIR}/test_vcs_vectors_scale_options_linear.png"
+      "${BASELINE_DIR}/test_vcs_vectors_scale_options_normalize.png"
+      "${BASELINE_DIR}/test_vcs_vectors_scale_options_constantNLinear.png"
+      "${BASELINE_DIR}/test_vcs_vectors_scale_options_constantNNormalize.png"
       )
   endif()
 endif()
diff --git a/testing/vcs/test_vcs_vectors_scale_options.py b/testing/vcs/test_vcs_vectors_scale_options.py
index ce48b63c1..32898d129 100644
--- a/testing/vcs/test_vcs_vectors_scale_options.py
+++ b/testing/vcs/test_vcs_vectors_scale_options.py
@@ -9,7 +9,7 @@ gv = vcs.createvector()
 
 gv.scaletype = 'off'
 canvas.plot(u, v, gv)
-outFilename = 'test_vcs_vector_scale_options_off.png'
+outFilename = 'test_vcs_vectors_scale_options_off.png'
 canvas.png(outFilename)
 ret = regression.check_result_image(outFilename, sys.argv[1])
 canvas.clear()
@@ -19,7 +19,7 @@ u = data['u'][...,::4,::4]
 gv.scaletype = 'constant'
 gv.scale = 0.1
 canvas.plot(u, v, gv)
-outFilename = 'test_vcs_vector_scale_options_constant.png'
+outFilename = 'test_vcs_vectors_scale_options_constant.png'
 canvas.png(outFilename)
 ret += regression.check_result_image(outFilename, sys.argv[2])
 canvas.clear()
@@ -30,28 +30,28 @@ gv.scale = 1.0
 
 gv.scaletype = 'linear'
 canvas.plot(u, v, gv)
-outFilename = 'test_vcs_vector_scale_options_linear.png'
+outFilename = 'test_vcs_vectors_scale_options_linear.png'
 canvas.png(outFilename)
 ret += regression.check_result_image(outFilename, sys.argv[3])
 canvas.clear()
 
 gv.scaletype = 'normalize'
 canvas.plot(u, v, gv)
-outFilename = 'test_vcs_vector_scale_options_normalize.png'
+outFilename = 'test_vcs_vectors_scale_options_normalize.png'
 canvas.png(outFilename)
 ret += regression.check_result_image(outFilename, sys.argv[4])
 canvas.clear()
 
 gv.scaletype = 'constantNLinear'
 canvas.plot(u, v, gv)
-outFilename = 'test_vcs_vector_scale_options_constantNLinear.png'
+outFilename = 'test_vcs_vectors_scale_options_constantNLinear.png'
 canvas.png(outFilename)
 ret += regression.check_result_image(outFilename, sys.argv[5])
 canvas.clear()
 
 gv.scaletype = 'constantNNormalize'
 canvas.plot(u, v, gv)
-outFilename = 'test_vcs_vector_scale_options_constantNNormalize.png'
+outFilename = 'test_vcs_vectors_scale_options_constantNNormalize.png'
 canvas.png(outFilename)
 ret += regression.check_result_image(outFilename, sys.argv[6])
 canvas.clear()
-- 
GitLab


From c8befa3b19aab92a53ad644a6113f816965b5d98 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Sat, 28 May 2016 04:26:50 -0400
Subject: [PATCH 113/191] Fixed another flake8 issue

---
 Packages/vcs/vcs/vector.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Packages/vcs/vcs/vector.py b/Packages/vcs/vcs/vector.py
index 9ed8bfbef..2c49bfd30 100755
--- a/Packages/vcs/vcs/vector.py
+++ b/Packages/vcs/vcs/vector.py
@@ -540,9 +540,9 @@ class Gv(object):
 
     def _setscaletype(self, value):
         value = VCS_validation_functions.checkInStringList(self,
-                                                          'scaletype',
-                                                          value,
-                                                          self.scaleoptions)
+                                                           'scaletype',
+                                                           value,
+                                                           self.scaleoptions)
         self._scaletype = value
     scaletype = property(_getscaletype, _setscaletype)
 
-- 
GitLab


From e3f7ede95f7fb84f144e6942c9e5dbe0eb1f5a9f Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Sat, 28 May 2016 04:33:32 -0400
Subject: [PATCH 114/191] Using more generic name for testing

---
 testing/vcs/test_vcs_dump_json.json | 24 ++++++++++++------------
 testing/vcs/test_vcs_dump_json.py   | 26 +++++++++++++-------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/testing/vcs/test_vcs_dump_json.json b/testing/vcs/test_vcs_dump_json.json
index b79b1319c..fdd28171b 100644
--- a/testing/vcs/test_vcs_dump_json.json
+++ b/testing/vcs/test_vcs_dump_json.json
@@ -1,6 +1,6 @@
 {
  "G1d": {
-  "Charles.Doutriaux": {
+  "vcs_instance": {
    "colormap": null, 
    "datawc_calendar": 135441, 
    "datawc_timeunits": "days since 2000", 
@@ -29,7 +29,7 @@
   }
  }, 
  "Gfb": {
-  "Charles.Doutriaux": {
+  "vcs_instance": {
    "boxfill_type": "linear", 
    "color_1": 16, 
    "color_2": 239, 
@@ -70,7 +70,7 @@
   }
  }, 
  "Gfi": {
-  "Charles.Doutriaux": {
+  "vcs_instance": {
    "colormap": null, 
    "datawc_calendar": 135441, 
    "datawc_timeunits": "days since 2000", 
@@ -110,7 +110,7 @@
   }
  }, 
  "Gfm": {
-  "Charles.Doutriaux": {
+  "vcs_instance": {
    "colormap": null, 
    "datawc_calendar": 135441, 
    "datawc_timeunits": "days since 2000", 
@@ -153,7 +153,7 @@
   }
  }, 
  "Gi": {
-  "Charles.Doutriaux": {
+  "vcs_instance": {
    "angle": [
     35.0
    ], 
@@ -211,7 +211,7 @@
   }
  }, 
  "P": {
-  "Charles.Doutriaux": {
+  "vcs_instance": {
    "box1": {
     "line": "default", 
     "priority": 1, 
@@ -579,7 +579,7 @@
   }
  }, 
  "Proj": {
-  "Charles.Doutriaux": {
+  "vcs_instance": {
    "parameters": [
     1e+20, 
     1e+20, 
@@ -601,7 +601,7 @@
   }
  }, 
  "Tf": {
-  "Charles.Doutriaux": {
+  "vcs_instance": {
    "color": [
     1
    ], 
@@ -632,7 +632,7 @@
   }
  }, 
  "Tl": {
-  "Charles.Doutriaux": {
+  "vcs_instance": {
    "color": [
     1
    ], 
@@ -662,7 +662,7 @@
   }
  }, 
  "Tm": {
-  "Charles.Doutriaux": {
+  "vcs_instance": {
    "color": [
     1
    ], 
@@ -691,7 +691,7 @@
   }
  }, 
  "To": {
-  "Charles.Doutriaux": {
+  "vcs_instance": {
    "angle": 0, 
    "halign": 0, 
    "height": 14, 
@@ -700,7 +700,7 @@
   }
  }, 
  "Tt": {
-  "Charles.Doutriaux": {
+  "vcs_instance": {
    "backgroundcolor": 0, 
    "backgroundopacity": 0, 
    "color": 1, 
diff --git a/testing/vcs/test_vcs_dump_json.py b/testing/vcs/test_vcs_dump_json.py
index aca6215b8..9247b2d38 100644
--- a/testing/vcs/test_vcs_dump_json.py
+++ b/testing/vcs/test_vcs_dump_json.py
@@ -1,33 +1,33 @@
 
 import filecmp
 import vcs,numpy,os,sys
-src=sys.argv[1]
+src = sys.argv[1]
 if os.path.exists("test_vcs_dump_json.json"):
     os.remove("test_vcs_dump_json.json")
 
-b = vcs.createboxfill("Charles.Doutriaux")
+b = vcs.createboxfill("vcs_instance")
 b.script("test_vcs_dump_json","a")
-b = vcs.createisofill("Charles.Doutriaux")
+b = vcs.createisofill("vcs_instance")
 b.script("test_vcs_dump_json","a")
-b = vcs.createisoline("Charles.Doutriaux")
+b = vcs.createisoline("vcs_instance")
 b.script("test_vcs_dump_json","a")
-b = vcs.createmeshfill("Charles.Doutriaux")
+b = vcs.createmeshfill("vcs_instance")
 b.script("test_vcs_dump_json","a")
-b = vcs.create1d("Charles.Doutriaux")
+b = vcs.create1d("vcs_instance")
 b.script("test_vcs_dump_json","a")
-b = vcs.createfillarea("Charles.Doutriaux")
+b = vcs.createfillarea("vcs_instance")
 b.script("test_vcs_dump_json","a")
-b = vcs.createtext("Charles.Doutriaux")
+b = vcs.createtext("vcs_instance")
 b.script("test_vcs_dump_json","a")
-b = vcs.createline("Charles.Doutriaux")
+b = vcs.createline("vcs_instance")
 b.script("test_vcs_dump_json","a")
-b = vcs.createmarker("Charles.Doutriaux")
+b = vcs.createmarker("vcs_instance")
 b.script("test_vcs_dump_json","a")
-b = vcs.createtemplate("Charles.Doutriaux")
+b = vcs.createtemplate("vcs_instance")
 b.script("test_vcs_dump_json","a")
-b = vcs.createprojection("Charles.Doutriaux")
+b = vcs.createprojection("vcs_instance")
 b.script("test_vcs_dump_json","a")
 
-assert(filecmp.cmp("test_vcs_dump_json.json",src))
+assert(filecmp.cmp("test_vcs_dump_json.json", src))
 
 
-- 
GitLab


From 8c05ac458f0fbc5b325ff8373197e96555ac20a0 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Sat, 28 May 2016 04:49:13 -0400
Subject: [PATCH 115/191] Added vector method for testing

---
 testing/vcs/test_vcs_dump_json.json | 42 +++++++++++++++++++++++++++++
 testing/vcs/test_vcs_dump_json.py   |  2 ++
 2 files changed, 44 insertions(+)

diff --git a/testing/vcs/test_vcs_dump_json.json b/testing/vcs/test_vcs_dump_json.json
index fdd28171b..d40844987 100644
--- a/testing/vcs/test_vcs_dump_json.json
+++ b/testing/vcs/test_vcs_dump_json.json
@@ -210,6 +210,48 @@
    "yticlabels2": "*"
   }
  }, 
+ "Gv": {
+  "vcs_instance": {
+   "alignment": "center", 
+   "colormap": null, 
+   "datawc_calendar": 135441, 
+   "datawc_timeunits": "days since 2000", 
+   "datawc_x1": 1e+20, 
+   "datawc_x2": 1e+20, 
+   "datawc_y1": 1e+20, 
+   "datawc_y2": 1e+20, 
+   "line": null, 
+   "linecolor": null, 
+   "linewidth": null, 
+   "projection": "linear", 
+   "reference": 1e+20, 
+   "scale": 1.0, 
+   "scaleoptions": [
+    "off", 
+    "constant", 
+    "normalize", 
+    "linear", 
+    "constantNNormalize", 
+    "constantNLinear"
+   ], 
+   "scalerange": [
+    0.1, 
+    1.0
+   ], 
+   "scaletype": "constantNNormalize", 
+   "type": "arrows", 
+   "xaxisconvert": "linear", 
+   "xmtics1": "", 
+   "xmtics2": "", 
+   "xticlabels1": "*", 
+   "xticlabels2": "*", 
+   "yaxisconvert": "linear", 
+   "ymtics1": "", 
+   "ymtics2": "", 
+   "yticlabels1": "*", 
+   "yticlabels2": "*"
+  }
+ }, 
  "P": {
   "vcs_instance": {
    "box1": {
diff --git a/testing/vcs/test_vcs_dump_json.py b/testing/vcs/test_vcs_dump_json.py
index 9247b2d38..421606c4d 100644
--- a/testing/vcs/test_vcs_dump_json.py
+++ b/testing/vcs/test_vcs_dump_json.py
@@ -17,6 +17,8 @@ b = vcs.create1d("vcs_instance")
 b.script("test_vcs_dump_json","a")
 b = vcs.createfillarea("vcs_instance")
 b.script("test_vcs_dump_json","a")
+b = vcs.createvector("vcs_instance")
+b.script("test_vcs_dump_json","a")
 b = vcs.createtext("vcs_instance")
 b.script("test_vcs_dump_json","a")
 b = vcs.createline("vcs_instance")
-- 
GitLab


From 92d5053c014b8ef0f5ecf5ca136d1f8e5c039ce7 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Sat, 28 May 2016 05:05:33 -0400
Subject: [PATCH 116/191] Added new test for text as object feature

---
 testing/vcs/CMakeLists.txt          |  4 +++
 testing/vcs/test_vcs_text_object.py | 41 +++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 testing/vcs/test_vcs_text_object.py

diff --git a/testing/vcs/CMakeLists.txt b/testing/vcs/CMakeLists.txt
index 09910f4a3..4cace0204 100644
--- a/testing/vcs/CMakeLists.txt
+++ b/testing/vcs/CMakeLists.txt
@@ -385,6 +385,10 @@ cdat_add_test(test_vcs_geometry
   "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_geometry.py
   )
+cdat_add_test(test_vcs_text_object
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_text_object.py
+  )
 ##############################################################################
 #
 # These tests perform plotting and need sample data
diff --git a/testing/vcs/test_vcs_text_object.py b/testing/vcs/test_vcs_text_object.py
new file mode 100644
index 000000000..f36d44b77
--- /dev/null
+++ b/testing/vcs/test_vcs_text_object.py
@@ -0,0 +1,41 @@
+import cdms2, vcs, tempfile
+
+x = vcs.init(bg=1, geometry=(800, 600))
+txt = x.createtext()
+txt.x = [.0000005,.00000005,.5,.99999,.999999]
+txt.y = [0.05,.9,.5,.9,0.05]
+txt.string = ["SAMPLE TEXT A","SAMPLE TEXT B","SAMPLE TEXT C","SAMPLE TEXT D","SAMPLE TEXT E"]
+txt.halign = "center"
+txt.valign = "base"
+txt.height = 10
+x.plot(txt)
+
+tmpfile = tempfile.NamedTemporaryFile(suffix='.ps', \
+              prefix='tmpTextAsObjectFalse', delete=True)
+x.postscript(tmpfile.name, textAsObject=False)
+tmpfile.close()
+
+tmpfile = tempfile.NamedTemporaryFile(suffix='.ps', \
+              prefix='tmpTextAsObjectTrue', delete=True)
+x.postscript(tmpfile.name, textAsObject=True)
+tmpfile.close()
+
+tmpfile = tempfile.NamedTemporaryFile(suffix='.pdf', \
+              prefix='tmpTextAsObjectFalse', delete=True)
+x.pdf(tmpfile.name, textAsObject=False)
+tmpfile.close()
+
+tmpfile = tempfile.NamedTemporaryFile(suffix='.pdf', \
+              prefix='tmpTextAsObjectTrue', delete=True )
+x.pdf(tmpfile.name, textAsObject=True)
+tmpfile.close()
+
+tmpfile = tempfile.NamedTemporaryFile(suffix='.svg', \
+              prefix='tmpTextAsObjectFalse', delete=True)
+x.pdf(tmpfile.name, textAsObject=False)
+tmpfile.close()
+
+tmpfile = tempfile.NamedTemporaryFile(suffix='.svg', \
+              prefix='tmpTextAsObjectTrue', delete=True)
+x.pdf(tmpfile.name, textAsObject=True)
+tmpfile.close()
\ No newline at end of file
-- 
GitLab


From ab65bdb33de0bf0ee5434860791bb57729b65990 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Sat, 28 May 2016 12:44:35 -0400
Subject: [PATCH 117/191] Made text export as path the default

---
 Packages/vcs/vcs/Canvas.py          | 22 ++++++++++-------
 Packages/vcs/vcs/VTKPlots.py        | 38 ++++++++++++++++++++++-------
 testing/vcs/test_vcs_text_object.py | 24 +++++++++---------
 3 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/Packages/vcs/vcs/Canvas.py b/Packages/vcs/vcs/Canvas.py
index 38ca2a013..8a91c4ab6 100644
--- a/Packages/vcs/vcs/Canvas.py
+++ b/Packages/vcs/vcs/Canvas.py
@@ -4681,7 +4681,8 @@ Options:::
     # pdf wrapper for VCS.                                                   #
     #                                                                        #
     ##########################################################################
-    def pdf(self, file, width=None, height=None, units='inches', textAsObject=True):
+    def pdf(self, file, width=None, height=None, units='inches',
+            textAsPaths=True):
         """
  Function: postscript
 
@@ -4705,14 +4706,15 @@ Options:::
 
         if not file.split('.')[-1].lower() in ['pdf']:
             file += '.pdf'
-        return self.backend.pdf(file, W, H, textAsObject)
+        return self.backend.pdf(file, W, H, textAsPaths)
     ##########################################################################
     #                                                                        #
     # SVG wrapper for VCS.                                                   #
     #                                                                        #
     ##########################################################################
 
-    def svg(self, file, width=None, height=None, units='inches', textAsObject=True):
+    def svg(self, file, width=None, height=None, units='inches',
+            textAsPaths=True):
         """
  Function: postscript
 
@@ -4736,7 +4738,7 @@ Options:::
 
         if not file.split('.')[-1].lower() in ['svg']:
             file += '.svg'
-        return self.backend.svg(file, W, H, textAsObject)
+        return self.backend.svg(file, W, H, textAsPaths)
 
     def _compute_margins(
             self, W, H, top_margin, bottom_margin, right_margin, left_margin, dpi):
@@ -4912,7 +4914,7 @@ Options:::
         return W, H
 
     def postscript(self, file, mode='r', orientation=None, width=None, height=None,
-                   units='inches', textAsObject=True):
+                   units='inches', textAsPaths=True):
         """
  Function: postscript
 
@@ -4951,7 +4953,7 @@ Options:::
         if not file.split('.')[-1].lower() in ['ps', 'eps']:
             file += '.ps'
         if mode == 'r':
-            return self.backend.postscript(file, W, H, units="pixels", textAsObject=textAsObject)
+            return self.backend.postscript(file, W, H, units="pixels", textAsPaths=textAsPaths)
         else:
             n = random.randint(0, 10000000000000)
             psnm = '/tmp/' + '__VCS__tmp__' + str(n) + '.ps'
@@ -5327,8 +5329,9 @@ Options:::
     # Screen Encapsulated PostScript wrapper for VCS.                        #
     #                                                                        #
     ##########################################################################
-    def eps(self, file, mode='r', orientation=None, width=None, height=None, units='inches',
-            left_margin=None, right_margin=None, top_margin=None, bottom_margin=None):
+    def eps(self, file, mode='r', orientation=None, width=None, height=None,
+            units='inches', left_margin=None, right_margin=None, top_margin=None,
+            bottom_margin=None, textAsPaths=True):
         """
         Function: Encapsulated PostScript
 
@@ -5369,7 +5372,8 @@ Options:::
             left_margin,
             right_margin,
             top_margin,
-            bottom_margin)
+            bottom_margin,
+            textAsPaths)
         os.popen("ps2epsi %s %s" % (tmpfile, file)).readlines()
         os.remove(tmpfile)
 
diff --git a/Packages/vcs/vcs/VTKPlots.py b/Packages/vcs/vcs/VTKPlots.py
index b6b49ec1b..975b5cdfd 100644
--- a/Packages/vcs/vcs/VTKPlots.py
+++ b/Packages/vcs/vcs/VTKPlots.py
@@ -1063,8 +1063,28 @@ class VTKVCSBackend(object):
                 break
         return plot
 
-    def vectorGraphics(
-            self, output_type, file, width=None, height=None, units=None, textAsObject=True):
+    def vectorGraphics(self, output_type, file, width=None, height=None,
+                       units=None, textAsPaths=True):
+        """Export vector graphics to PDF, Postscript, SVG and EPS format.
+
+       Reasoning for textAsPaths as default:
+       The output formats supported by gl2ps which VTK uses for postscript/pdf/svg/etc
+       vector exports) handle text objects inconsistently. For example, postscript mangles
+       newlines, pdf doesn't fully support rotation and alignment, stuff like that.
+       These are limitations in the actual format specifications themselves.
+
+       On top of that, embedding text objects then relies on the viewer to locate
+       a similar font and render the text, and odds are good that the fonts used
+       by the viewer will have different characteristics than the ones used in the
+       original rendering. So, for instance, you have some right-justified lines of
+       text, like the data at the top of the VCS plots. If the font used by the viewer
+       uses different widths for any of glyphs composing the text, the text will be
+       unaligned along the right-hand side, since the text is always anchored on
+       it's left side due to how these formats represent text objects. This just looks bad.
+       Exporting text as paths eliminates all of these problems with portability across
+       viewers and inconsistent text object handling between output formats.
+       """
+
         if self.renWin is None:
             raise Exception("Nothing on Canvas to dump to file")
 
@@ -1096,7 +1116,7 @@ class VTKVCSBackend(object):
         gl.SetCompress(0)  # Do not compress
         gl.SetFilePrefix(".".join(file.split(".")[:-1]))
 
-        if textAsObject:
+        if textAsPaths:
             gl.TextAsPathOff()
         else:
             gl.TextAsPathOn()
@@ -1116,17 +1136,17 @@ class VTKVCSBackend(object):
         self.showGUI()
 
     def postscript(self, file, width=None, height=None,
-                   units=None, textAsObject=True):
+                   units=None, textAsPaths=True):
         return self.vectorGraphics("ps", file, width, height,
-                                    units, textAsObject)
+                                    units, textAsPaths)
 
-    def pdf(self, file, width=None, height=None, units=None, textAsObject=True):
+    def pdf(self, file, width=None, height=None, units=None, textAsPaths=True):
         return self.vectorGraphics("pdf", file, width, height,
-                                    units, textAsObject)
+                                    units, textAsPaths)
 
-    def svg(self, file, width=None, height=None, units=None, textAsObject=True):
+    def svg(self, file, width=None, height=None, units=None, textAsPaths=True):
         return self.vectorGraphics("svg", file, width,
-                                    height, units, textAsObject)
+                                    height, units, textAsPaths)
 
     def gif(self, filename='noname.gif', merge='r', orientation=None,
             geometry='1600x1200'):
diff --git a/testing/vcs/test_vcs_text_object.py b/testing/vcs/test_vcs_text_object.py
index f36d44b77..b98d7ec24 100644
--- a/testing/vcs/test_vcs_text_object.py
+++ b/testing/vcs/test_vcs_text_object.py
@@ -11,31 +11,31 @@ txt.height = 10
 x.plot(txt)
 
 tmpfile = tempfile.NamedTemporaryFile(suffix='.ps', \
-              prefix='tmpTextAsObjectFalse', delete=True)
-x.postscript(tmpfile.name, textAsObject=False)
+              prefix='textAsPathsFalse', delete=True)
+x.postscript(tmpfile.name, textAsPaths=False)
 tmpfile.close()
 
 tmpfile = tempfile.NamedTemporaryFile(suffix='.ps', \
-              prefix='tmpTextAsObjectTrue', delete=True)
-x.postscript(tmpfile.name, textAsObject=True)
+              prefix='textAsPathsTrue', delete=True)
+x.postscript(tmpfile.name, textAsPaths=True)
 tmpfile.close()
 
 tmpfile = tempfile.NamedTemporaryFile(suffix='.pdf', \
-              prefix='tmpTextAsObjectFalse', delete=True)
-x.pdf(tmpfile.name, textAsObject=False)
+              prefix='textAsPathsFalse', delete=True)
+x.pdf(tmpfile.name, textAsPaths=False)
 tmpfile.close()
 
 tmpfile = tempfile.NamedTemporaryFile(suffix='.pdf', \
-              prefix='tmpTextAsObjectTrue', delete=True )
-x.pdf(tmpfile.name, textAsObject=True)
+              prefix='textAsPathsTrue', delete=True )
+x.pdf(tmpfile.name, textAsPaths=True)
 tmpfile.close()
 
 tmpfile = tempfile.NamedTemporaryFile(suffix='.svg', \
-              prefix='tmpTextAsObjectFalse', delete=True)
-x.pdf(tmpfile.name, textAsObject=False)
+              prefix='textAsPathsFalse', delete=True)
+x.pdf(tmpfile.name, textAsPaths=False)
 tmpfile.close()
 
 tmpfile = tempfile.NamedTemporaryFile(suffix='.svg', \
-              prefix='tmpTextAsObjectTrue', delete=True)
-x.pdf(tmpfile.name, textAsObject=True)
+              prefix='textAsPathsTrue', delete=True)
+x.pdf(tmpfile.name, textAsPaths=True)
 tmpfile.close()
\ No newline at end of file
-- 
GitLab


From ee7da76d3a193ba0f5245d0fb0619fd67f97ac17 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Sat, 28 May 2016 12:56:56 -0400
Subject: [PATCH 118/191] Renamed text for clarity

---
 testing/vcs/CMakeLists.txt                                    | 4 ++--
 .../vcs/{test_vcs_text_object.py => test_vcs_export_text.py}  | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename testing/vcs/{test_vcs_text_object.py => test_vcs_export_text.py} (100%)

diff --git a/testing/vcs/CMakeLists.txt b/testing/vcs/CMakeLists.txt
index 873a17d63..43f6b5fe6 100644
--- a/testing/vcs/CMakeLists.txt
+++ b/testing/vcs/CMakeLists.txt
@@ -385,9 +385,9 @@ cdat_add_test(test_vcs_geometry
   "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_geometry.py
   )
-cdat_add_test(test_vcs_text_object
+cdat_add_test(test_vcs_export_text
   "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_text_object.py
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_export_text.py
   )
 ##############################################################################
 #
diff --git a/testing/vcs/test_vcs_text_object.py b/testing/vcs/test_vcs_export_text.py
similarity index 100%
rename from testing/vcs/test_vcs_text_object.py
rename to testing/vcs/test_vcs_export_text.py
-- 
GitLab


From a90c075415a47deaa6f1ba0a3ab04ff27ff0f8ba Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Sat, 28 May 2016 13:00:11 -0400
Subject: [PATCH 119/191] Added test for eps format

---
 testing/vcs/test_vcs_export_text.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/testing/vcs/test_vcs_export_text.py b/testing/vcs/test_vcs_export_text.py
index b98d7ec24..3e477b7d1 100644
--- a/testing/vcs/test_vcs_export_text.py
+++ b/testing/vcs/test_vcs_export_text.py
@@ -23,7 +23,7 @@ tmpfile.close()
 tmpfile = tempfile.NamedTemporaryFile(suffix='.pdf', \
               prefix='textAsPathsFalse', delete=True)
 x.pdf(tmpfile.name, textAsPaths=False)
-tmpfile.close()
+# tmpfile.close()
 
 tmpfile = tempfile.NamedTemporaryFile(suffix='.pdf', \
               prefix='textAsPathsTrue', delete=True )
@@ -32,10 +32,20 @@ tmpfile.close()
 
 tmpfile = tempfile.NamedTemporaryFile(suffix='.svg', \
               prefix='textAsPathsFalse', delete=True)
-x.pdf(tmpfile.name, textAsPaths=False)
+x.svg(tmpfile.name, textAsPaths=False)
 tmpfile.close()
 
 tmpfile = tempfile.NamedTemporaryFile(suffix='.svg', \
               prefix='textAsPathsTrue', delete=True)
-x.pdf(tmpfile.name, textAsPaths=True)
+x.svg(tmpfile.name, textAsPaths=True)
+tmpfile.close()
+
+tmpfile = tempfile.NamedTemporaryFile(suffix='.eps', \
+              prefix='textAsPathsFalse', delete=True)
+x.eps(tmpfile.name, textAsPaths=False)
+tmpfile.close()
+
+tmpfile = tempfile.NamedTemporaryFile(suffix='.eps', \
+              prefix='textAsPathsTrue', delete=True)
+x.eps(tmpfile.name, textAsPaths=True)
 tmpfile.close()
\ No newline at end of file
-- 
GitLab


From f53c74a1fa1d04dfa5a3ea74df8f1169a52ee42f Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Sat, 28 May 2016 13:05:43 -0400
Subject: [PATCH 120/191] Fixed eps method runtime error

---
 Packages/vcs/vcs/Canvas.py          |  9 +++------
 testing/vcs/test_vcs_export_text.py | 22 +++++++++++-----------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/Packages/vcs/vcs/Canvas.py b/Packages/vcs/vcs/Canvas.py
index 8a91c4ab6..07514563b 100644
--- a/Packages/vcs/vcs/Canvas.py
+++ b/Packages/vcs/vcs/Canvas.py
@@ -4913,6 +4913,7 @@ Options:::
             H = tmp
         return W, H
 
+
     def postscript(self, file, mode='r', orientation=None, width=None, height=None,
                    units='inches', textAsPaths=True):
         """
@@ -5330,8 +5331,7 @@ Options:::
     #                                                                        #
     ##########################################################################
     def eps(self, file, mode='r', orientation=None, width=None, height=None,
-            units='inches', left_margin=None, right_margin=None, top_margin=None,
-            bottom_margin=None, textAsPaths=True):
+            units='inches', textAsPaths=True):
         """
         Function: Encapsulated PostScript
 
@@ -5369,11 +5369,8 @@ Options:::
             width,
             height,
             units,
-            left_margin,
-            right_margin,
-            top_margin,
-            bottom_margin,
             textAsPaths)
+
         os.popen("ps2epsi %s %s" % (tmpfile, file)).readlines()
         os.remove(tmpfile)
 
diff --git a/testing/vcs/test_vcs_export_text.py b/testing/vcs/test_vcs_export_text.py
index 3e477b7d1..d4507e3d8 100644
--- a/testing/vcs/test_vcs_export_text.py
+++ b/testing/vcs/test_vcs_export_text.py
@@ -2,8 +2,8 @@ import cdms2, vcs, tempfile
 
 x = vcs.init(bg=1, geometry=(800, 600))
 txt = x.createtext()
-txt.x = [.0000005,.00000005,.5,.99999,.999999]
-txt.y = [0.05,.9,.5,.9,0.05]
+txt.x = [0.2, 0.2, 0.5, 0.8, 0.8]
+txt.y = [0.2, 0.8, 0.5, 0.8, 0.2]
 txt.string = ["SAMPLE TEXT A","SAMPLE TEXT B","SAMPLE TEXT C","SAMPLE TEXT D","SAMPLE TEXT E"]
 txt.halign = "center"
 txt.valign = "base"
@@ -11,41 +11,41 @@ txt.height = 10
 x.plot(txt)
 
 tmpfile = tempfile.NamedTemporaryFile(suffix='.ps', \
-              prefix='textAsPathsFalse', delete=True)
+              prefix='textAsPathsFalse', delete=False)
 x.postscript(tmpfile.name, textAsPaths=False)
 tmpfile.close()
 
 tmpfile = tempfile.NamedTemporaryFile(suffix='.ps', \
-              prefix='textAsPathsTrue', delete=True)
+              prefix='textAsPathsTrue', delete=False)
 x.postscript(tmpfile.name, textAsPaths=True)
 tmpfile.close()
 
 tmpfile = tempfile.NamedTemporaryFile(suffix='.pdf', \
-              prefix='textAsPathsFalse', delete=True)
+              prefix='textAsPathsFalse', delete=False)
 x.pdf(tmpfile.name, textAsPaths=False)
-# tmpfile.close()
+tmpfile.close()
 
 tmpfile = tempfile.NamedTemporaryFile(suffix='.pdf', \
-              prefix='textAsPathsTrue', delete=True )
+              prefix='textAsPathsTrue', delete=False)
 x.pdf(tmpfile.name, textAsPaths=True)
 tmpfile.close()
 
 tmpfile = tempfile.NamedTemporaryFile(suffix='.svg', \
-              prefix='textAsPathsFalse', delete=True)
+              prefix='textAsPathsFalse', delete=False)
 x.svg(tmpfile.name, textAsPaths=False)
 tmpfile.close()
 
 tmpfile = tempfile.NamedTemporaryFile(suffix='.svg', \
-              prefix='textAsPathsTrue', delete=True)
+              prefix='textAsPathsTrue', delete=False)
 x.svg(tmpfile.name, textAsPaths=True)
 tmpfile.close()
 
 tmpfile = tempfile.NamedTemporaryFile(suffix='.eps', \
-              prefix='textAsPathsFalse', delete=True)
+              prefix='textAsPathsFalse', delete=False)
 x.eps(tmpfile.name, textAsPaths=False)
 tmpfile.close()
 
 tmpfile = tempfile.NamedTemporaryFile(suffix='.eps', \
-              prefix='textAsPathsTrue', delete=True)
+              prefix='textAsPathsTrue', delete=False)
 x.eps(tmpfile.name, textAsPaths=True)
 tmpfile.close()
\ No newline at end of file
-- 
GitLab


From a90268e4337be88ebc69adfcd9aeb12cb9a65e0d Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Tue, 31 May 2016 08:24:36 -0700
Subject: [PATCH 121/191] Fixed memory leak, added mintic

---
 Packages/vcsaddons/Lib/polar.py | 222 +++++++++++++++++++++++++-------
 1 file changed, 173 insertions(+), 49 deletions(-)

diff --git a/Packages/vcsaddons/Lib/polar.py b/Packages/vcsaddons/Lib/polar.py
index 0b0f6a9fc..622b0d3a0 100644
--- a/Packages/vcsaddons/Lib/polar.py
+++ b/Packages/vcsaddons/Lib/polar.py
@@ -2,6 +2,7 @@ import vcs
 import numpy
 import vcsaddons
 
+
 def circle_points(center, radius, points=75, ratio=1):
     """
     Generates the coordinates of a circle in x list and y list.
@@ -22,37 +23,6 @@ def circle_points(center, radius, points=75, ratio=1):
     return x, y
 
 
-def text_orientation_for_angle(theta, source="default"):
-    """
-    Generates a text orientation that will align text to look good depending on quadrant.
-    """
-    # Normalize to [0, 2*pi)
-    while 0 > theta:
-        theta += 2 * numpy.pi
-    while 2 * numpy.pi <= theta:
-        theta -= 2 * numpy.pi
-
-    if 0 < theta < numpy.pi:
-        valign = "bottom"
-    elif 0 == theta or numpy.pi == theta:
-        valign = "half"
-    else:
-        valign = "top"
-
-    if numpy.pi / 2 > theta or numpy.pi * 3 / 2 < theta:
-        halign = "left"
-    elif numpy.allclose(numpy.pi / 2, theta) or numpy.allclose(numpy.pi * 3 / 2, theta):
-        halign = "center"
-    else:
-        halign = "right"
-
-    # Build new text table
-    to = vcs.createtextorientation(source=source)
-    to.valign = valign
-    to.halign = halign
-    return to
-
-
 def convert_arrays(var, theta):
     """
     Normalizes valid input options to two lists of lists of values and a list of names.
@@ -172,12 +142,21 @@ class Gpo(vcsaddons.core.VCSaddon):
             self.markersizes = [3]
             self.markercolors = ["black"]
             self.markers = ["dot"]
+            self.markercolorsource = "group"
             self.clockwise = False
             self.theta_offset = 0
             self.magnitude_ticks = "*"
+            self.magnitude_mintics = None
             self.magnitude_tick_angle = 0
             self.theta_tick_count = 6
             self.group_names = []
+            self.draw_lines = False
+            self.connect_groups = False
+            self.linecolors = ["black"]
+            self.lines = ["solid"]
+            self.linewidths = [1]
+            self.markerpriority = 2
+            self.linepriority = 1
             # Nice default labels
             self.xticlabels1 = {
                 0: "0 (2pi)",
@@ -197,12 +176,59 @@ class Gpo(vcsaddons.core.VCSaddon):
             self.markersizes = gm.markersizes
             self.markercolors = gm.markercolors
             self.markers = gm.markers
+            self.markercolorsource = gm.markercolorsource
+            self.markerpriority = gm.markerpriority
             self.clockwise = gm.clockwise
+            self.draw_lines = gm.draw_lines
+            self.linecolors = gm.linecolors
+            self.linewidths = gm.linewidths
+            self.linepriority = gm.linepriority
+            self.lines = gm.lines
+            self.connect_groups = gm.connect_groups
             self.theta_offset = gm.theta_offset
             self.magnitude_ticks = gm.magnitude_ticks
+            self.magnitude_mintics = gm.magnitude_mintics
             self.magnitude_tick_angle = gm.magnitude_tick_angle
             self.theta_tick_count = gm.theta_tick_count
             self.group_names = gm.group_names
+        self.to_cleanup = []
+
+    def create_text(self, tt, to):
+        tc = vcs.createtext(Tt_source=tt, To_source=to)
+        self.to_cleanup.append(tc.Tt)
+        self.to_cleanup.append(tc.To)
+        return tc
+
+    def text_orientation_for_angle(self, theta, source="default"):
+        """
+        Generates a text orientation that will align text to look good depending on quadrant.
+        """
+        # Normalize to [0, 2*pi)
+        while 0 > theta:
+            theta += 2 * numpy.pi
+        while 2 * numpy.pi <= theta:
+            theta -= 2 * numpy.pi
+
+        if 0 < theta < numpy.pi:
+            valign = "bottom"
+        elif 0 == theta or numpy.pi == theta:
+            valign = "half"
+        else:
+            valign = "top"
+
+        if numpy.pi / 2 > theta or numpy.pi * 3 / 2 < theta:
+            halign = "left"
+        elif numpy.allclose(numpy.pi / 2, theta) or numpy.allclose(numpy.pi * 3 / 2, theta):
+            halign = "center"
+        else:
+            halign = "right"
+
+        # Build new text table
+        to = vcs.createtextorientation(source=source)
+        to.valign = valign
+        to.halign = halign
+        self.to_cleanup.append(to)
+        return to
 
     def magnitude_from_value(self, value, minmax):
         if numpy.allclose((self.datawc_y1, self.datawc_y2), 1e20):
@@ -244,6 +270,9 @@ class Gpo(vcsaddons.core.VCSaddon):
         if template is None:
             template = self.template
 
+        if self.markercolorsource.lower() not in ("group", "magnitude", "theta"):
+            raise ValueError("polar.markercolorsource must be one of: 'group', 'magnitude', 'theta'")
+
         magnitudes, thetas, names = convert_arrays(var, theta)
         if self.group_names:
             names = self.group_names
@@ -306,8 +335,8 @@ class Gpo(vcsaddons.core.VCSaddon):
             m_ticks.y = []
 
             if template.ylabel1.priority > 0:
-                to = text_orientation_for_angle(self.magnitude_tick_angle, source=template.ylabel1.textorientation)
-                m_labels = vcs.createtext(Tt_source=template.ylabel1.texttable, To_source=to)
+                to = self.text_orientation_for_angle(self.magnitude_tick_angle, source=template.ylabel1.textorientation)
+                m_labels = self.create_text(template.ylabel1.texttable, to)
                 m_labels.x = []
                 m_labels.y = []
                 m_labels.string = []
@@ -334,23 +363,40 @@ class Gpo(vcsaddons.core.VCSaddon):
                 canvas.plot(m_labels, **plot_kwargs)
                 del vcs.elements["textcombined"][m_labels.name]
 
+        if template.ymintic1.priority > 0 and self.magnitude_mintics is not None:
+            mag_mintics = vcs.createline(source=template.ymintic1.line)
+            mag_mintics.x = []
+            mag_mintics.y = []
+
+            mintics = self.magnitude_mintics
+            if isinstance(mintics, (str, unicode)):
+                mintics = vcs.elements["list"][mintics]
+
+            for mag in mintics:
+                mintic_radius = radius * self.magnitude_from_value(mag, (m_scale[0], m_scale[-1]))
+                x, y = circle_points(center, mintic_radius, ratio=window_aspect)
+                mag_mintics.x.append(x)
+                mag_mintics.y.append(y)
+            canvas.plot(mag_mintics, **plot_kwargs)
+            del vcs.elements["line"][mag_mintics.name]
+
+        if self.xticlabels1 == "*":
+            if numpy.allclose((self.datawc_x1, self.datawc_x2), 1e20):
+                tick_thetas = list(numpy.arange(0, numpy.pi * 2, numpy.pi / 4))
+                tick_labels = {t: str(t) for t in tick_thetas}
+            else:
+                d_theta = (self.datawc_x2 - self.datawc_x1) / float(self.theta_tick_count)
+                tick_thetas = numpy.arange(self.datawc_x1, self.datawc_x2 + .0001, d_theta)
+                tick_labels = vcs.mklabels(tick_thetas)
+        else:
+            tick_thetas = self.xticlabels1.keys()
+            tick_labels = self.xticlabels1
+
         if template.xtic1.priority > 0:
             t_ticks = vcs.createline(source=template.xtic1.line)
             t_ticks.x = []
             t_ticks.y = []
 
-            if self.xticlabels1 == "*":
-                if numpy.allclose((self.datawc_x1, self.datawc_x2), 1e20):
-                    tick_thetas = list(numpy.arange(0, numpy.pi * 2, numpy.pi / 4))
-                    tick_labels = {t: str(t) for t in tick_thetas}
-                else:
-                    d_theta = (self.datawc_x2 - self.datawc_x1) / float(self.theta_tick_count)
-                    tick_thetas = numpy.arange(self.datawc_x1, self.datawc_x2 + .0001, d_theta)
-                    tick_labels = vcs.mklabels(tick_thetas)
-            else:
-                tick_thetas = self.xticlabels1.keys()
-                tick_labels = self.xticlabels1
-
             if template.xlabel1.priority > 0:
                 t_labels = []
                 theta_labels = tick_labels
@@ -364,8 +410,7 @@ class Gpo(vcsaddons.core.VCSaddon):
                 y0 = center[1] + (ymul * radius * numpy.sin(angle))
                 y1 = center[1]
                 if t_labels is not None:
-                    label = vcs.createtext(Tt_source=template.xlabel1.texttable,
-                                           To_source=text_orientation_for_angle(angle, source=template.xlabel1.textorientation))
+                    label = self.create_text(template.xlabel1.texttable, self.text_orientation_for_angle(angle, source=template.xlabel1.textorientation))
                     label.string = [theta_labels[t]]
                     label.x = [x0]
                     label.y = [y0]
@@ -384,17 +429,65 @@ class Gpo(vcsaddons.core.VCSaddon):
         values.size = self.markersizes
         values.color = self.markercolors
         values.colormap = self.colormap
+        values.priority = self.markerpriority
         values.x = []
         values.y = []
 
         if template.legend.priority > 0:
             # Only labels that are set will show up in the legend
             label_count = len(names) - len([i for i in names if i is None])
-            labels = vcs.createtext(Tt_source=template.legend.texttable, To_source=template.legend.textorientation)
+            labels = self.create_text(template.legend.texttable, template.legend.textorientation)
             labels.x = []
             labels.y = []
             labels.string = []
 
+        if self.draw_lines:
+            line = vcs.createline()
+            line.x = []
+            line.y = []
+            line.type = self.lines
+            line.color = self.linecolors if self.linecolors is not None else self.markercolors
+            line.width = self.linewidths
+            line.priority = self.linepriority
+
+            # This is up here because when it's part of the main loop, we can lose "order" of points when we flatten them.
+            for mag, theta in zip(magnitudes, thetas):
+                x = []
+                y = []
+
+                for m, t in zip(mag, theta):
+                    t = self.theta_from_value(t)
+                    r = self.magnitude_from_value(m, (m_scale[0], m_scale[-1])) * radius
+                    x.append(xmul * numpy.cos(t) * r + center[0])
+                    y.append(ymul * numpy.sin(t) * r + center[1])
+
+                if self.connect_groups:
+                    line.x.extend(x)
+                    line.y.extend(y)
+                else:
+                    line.x.append(x)
+                    line.y.append(y)
+
+        if self.markercolorsource.lower() in ('magnitude', "theta"):
+            # Regroup the values using the appropriate metric
+
+            mag_flat = numpy.array(magnitudes).flatten()
+            theta_flat = numpy.array(thetas).flatten()
+
+            if self.markercolorsource.lower() == "magnitude":
+                scale = m_scale
+                vals = mag_flat
+            else:
+                scale = theta_ticks
+                vals = theta_flat
+
+            indices = [numpy.where(numpy.logical_and(vals >= scale[i], vals <= scale[i + 1])) for i in range(len(scale) - 1)]
+            magnitudes = [mag_flat[inds] for inds in indices]
+            thetas = [theta_flat[inds] for inds in indices]
+            names = vcs.mklabels(scale, output="list")
+            names = [names[i] + " - " + names[i + 1] for i in range(len(names) - 1)]
+            label_count = len(names)
+
         for mag, theta, name in zip(magnitudes, thetas, names):
             x = []
             y = []
@@ -410,13 +503,44 @@ class Gpo(vcsaddons.core.VCSaddon):
                 y.append(ly)
                 labels.x.append(lx + .01)
                 labels.y.append(ly)
-                labels.string.append(name)
+                labels.string.append(str(name))
             values.x.append(x)
             values.y.append(y)
 
         if template.legend.priority > 0:
             canvas.plot(labels, **plot_kwargs)
             del vcs.elements["textcombined"][labels.name]
+        if self.draw_lines:
+            canvas.plot(line, **plot_kwargs)
+            del vcs.elements["line"][line.name]
+
+        for el in self.to_cleanup:
+            if vcs.istexttable(el):
+                if el.name in vcs.elements["texttable"]:
+                    del vcs.elements["texttable"][el.name]
+            else:
+                if el.name in vcs.elements["textorientation"]:
+                    del vcs.elements["textorientation"][el.name]
+        self.to_cleanup = []
+
+        # Prune unneeded levels from values
+        to_prune = []
+        for ind, (x, y) in enumerate(zip(values.x, values.y)):
+            if x and y:
+                continue
+            else:
+                to_prune.append(ind)
+
+        for prune_ind in to_prune[::-1]:
+            del values.x[prune_ind]
+            del values.y[prune_ind]
+            if len(values.color) > prune_ind and len(values.color) > 1:
+                del values.color[prune_ind]
+            if len(values.size) > prune_ind and len(values.size) > 1:
+                del values.size[prune_ind]
+            if len(values.type) > prune_ind and len(values.type) > 1:
+                del values.type[prune_ind]
+
         canvas.plot(values, bg=bg, donotstoredisplay=True)
         del vcs.elements["marker"][values.name]
         return canvas
-- 
GitLab


From 9196c2c16a5c73c11ebfc3c8951b9098919a9f42 Mon Sep 17 00:00:00 2001
From: Dan Lipsa <dan.lipsa@kitware.com>
Date: Mon, 23 May 2016 13:59:03 -0400
Subject: [PATCH 122/191] BUG #1985: orthographic projection plot is empty

This is because proj4 sets points that are not visisble to infinity.
We set those points to 0 and hide them.
---
 Packages/vcs/vcs/Canvas.py                    |   8 +-
 Packages/vcs/vcs/VTKPlots.py                  |   4 +-
 Packages/vcs/vcs/projection.py                |  12 +-
 Packages/vcs/vcs/vcs2vtk.py                   | 124 +++++++++++++-----
 Packages/vcs/vcs/vcsvtk/boxfillpipeline.py    |   3 +-
 Packages/vcs/vcs/vcsvtk/isofillpipeline.py    |   3 +-
 Packages/vcs/vcs/vcsvtk/isolinepipeline.py    |   3 +-
 Packages/vcs/vcs/vcsvtk/meshfillpipeline.py   |   3 +-
 Packages/vcs/vcs/vcsvtk/vectorpipeline.py     |   3 +-
 testing/vcs/CMakeLists.txt                    |  25 +++-
 testing/vcs/test_vcs_boxfill_orthographic.py  |  21 +++
 ...olar.py => test_vcs_boxfill_projection.py} |  10 +-
 12 files changed, 160 insertions(+), 59 deletions(-)
 create mode 100644 testing/vcs/test_vcs_boxfill_orthographic.py
 rename testing/vcs/{test_vcs_boxfill_polar.py => test_vcs_boxfill_projection.py} (64%)

diff --git a/Packages/vcs/vcs/Canvas.py b/Packages/vcs/vcs/Canvas.py
index 49361248c..e95609e3e 100644
--- a/Packages/vcs/vcs/Canvas.py
+++ b/Packages/vcs/vcs/Canvas.py
@@ -71,7 +71,7 @@ canvas_closed = 0
 import vcsaddons  # noqa
 import vcs.manageElements  # noqa
 import configurator  # noqa
-from projection import round_projections  # noqa
+from projection import no_deformation_projections  # noqa
 
 # Python < 3 DeprecationWarning ignored by default
 warnings.simplefilter('default')
@@ -3497,7 +3497,7 @@ Options:::
                 if hasattr(gm, "priority") and gm.priority == 0:
                     return
             p = self.getprojection(gm.projection)
-            if p.type in round_projections and (
+            if p.type in no_deformation_projections and (
                     doratio == "0" or doratio[:4] == "auto"):
                 doratio = "1t"
             for keyarg in keyargs.keys():
@@ -3554,7 +3554,7 @@ Options:::
                 t.data.y2 = p.viewport[3]
 
                 proj = self.getprojection(p.projection)
-                if proj.type in round_projections and (
+                if proj.type in no_deformation_projections and (
                         doratio == "0" or doratio[:4] == "auto"):
                     doratio = "1t"
 
@@ -3610,7 +3610,7 @@ Options:::
                         tp = "textcombined"
                     gm = vcs.elements[tp][arglist[4]]
                 p = self.getprojection(gm.projection)
-                if p.type in round_projections:
+                if p.type in no_deformation_projections:
                     doratio = "1t"
                 if p.type == 'linear':
                     if gm.g_name == 'Gfm':
diff --git a/Packages/vcs/vcs/VTKPlots.py b/Packages/vcs/vcs/VTKPlots.py
index 814719536..9d3d85c74 100644
--- a/Packages/vcs/vcs/VTKPlots.py
+++ b/Packages/vcs/vcs/VTKPlots.py
@@ -597,6 +597,7 @@ class VTKVCSBackend(object):
 
         vtk_backend_grid = kargs.get("vtk_backend_grid", None)
         vtk_backend_geo = kargs.get("vtk_backend_geo", None)
+        bounds = vtk_backend_grid.GetBounds() if vtk_backend_grid else None
 
         pipeline = vcsvtk.createPipeline(gm, self)
         if pipeline is not None:
@@ -626,7 +627,7 @@ class VTKVCSBackend(object):
                     ren,
                     to=to,
                     tt=tt,
-                    cmap=self.canvas.colormap)
+                    cmap=self.canvas.colormap, geoBounds=bounds, geo=vtk_backend_geo)
                 self.setLayer(ren, tt.priority)
                 self.text_renderers[tt_key] = ren
         elif gtype == "line":
@@ -635,7 +636,6 @@ class VTKVCSBackend(object):
                                           cmap=self.canvas.colormap)
                 returned["vtk_backend_line_actors"] = actors
                 create_renderer = True
-                bounds = vtk_backend_grid.GetBounds() if vtk_backend_grid else None
                 for act, geo in actors:
                     ren = self.fitToViewport(
                         act,
diff --git a/Packages/vcs/vcs/projection.py b/Packages/vcs/vcs/projection.py
index a8476a989..6b19c5e62 100644
--- a/Packages/vcs/vcs/projection.py
+++ b/Packages/vcs/vcs/projection.py
@@ -16,13 +16,15 @@ import VCS_validation_functions
 import vcs
 import copy
 
-# projection that seems to be doing a circle
-# We will probably to add some more in it as we find more that fit this
-round_projections = ['polar (non gctp)', 'stereographic',
-                     'orthographic', "ortho", ]
+# used to decide if we show longitude labels for round projections or
+# latitude labels for elliptical projections
+round_projections = ['polar (non gctp)', 'stereographic']
+elliptical_projections = ["robinson", "mollweide", 'orthographic', "ortho"]
+# projections in this list are not deformed based on the window size
+no_deformation_projections = ['polar (non gctp)', 'stereographic',
+                              'orthographic', "ortho", ]
 
 no_over_proj4_parameter_projections = round_projections+["aeqd", "lambert conformal c"]
-elliptical_projections = ["robinson", "mollweide"]
 
 
 def process_src(nm, code):
diff --git a/Packages/vcs/vcs/vcs2vtk.py b/Packages/vcs/vcs/vcs2vtk.py
index 81142492c..27fe8f16b 100644
--- a/Packages/vcs/vcs/vcs2vtk.py
+++ b/Packages/vcs/vcs/vcs2vtk.py
@@ -4,12 +4,14 @@ import vtk
 import numpy
 import json
 import os
+import math
 import meshfill
 from vtk.util import numpy_support as VN
 import cdms2
 import warnings
 from projection import round_projections, no_over_proj4_parameter_projections
 from vcsvtk import fillareautils
+import sys
 import numbers
 
 f = open(os.path.join(vcs.prefix, "share", "vcs", "wmo_symbols.json"))
@@ -220,6 +222,34 @@ def getBoundsList(axis, hasCellData, dualGrid):
         return None
 
 
+def setInfToValid(geoPoints, ghost):
+    '''
+    Set infinity points to a point that already exists in the list.
+    If a ghost array is passed, we also hide infinity points.
+    We return true if any points are infinity
+    '''
+    anyInfinity = False
+    validPoint = [0, 0, 0]
+    for i in range(geoPoints.GetNumberOfPoints()):
+        point = geoPoints.GetPoint(i)
+        if (not math.isinf(point[0]) and not math.isinf(point[1])):
+            validPoint[0] = point[0]
+            validPoint[1] = point[1]
+            break
+    for i in range(geoPoints.GetNumberOfPoints()):
+        point = geoPoints.GetPoint(i)
+        if (math.isinf(point[0]) or math.isinf(point[1])):
+            anyInfinity = True
+            newPoint = list(point)
+            if (math.isinf(point[0])):
+                newPoint[0] = validPoint[0]
+            if (math.isinf(point[1])):
+                newPoint[1] = validPoint[1]
+            geoPoints.SetPoint(i, newPoint)
+            ghost.SetValue(i, vtk.vtkDataSetAttributes.HIDDENPOINT)
+    return anyInfinity
+
+
 def genGrid(data1, data2, gm, deep=True, grid=None, geo=None, genVectors=False,
             dualGrid=False):
     continents = False
@@ -444,6 +474,25 @@ def genGrid(data1, data2, gm, deep=True, grid=None, geo=None, genVectors=False,
                                                data1.getAxis(-2))
         geo, geopts = project(pts, projection, getWrappedBounds(
             wc, [xm, xM, ym, yM], wrap))
+        # proj4 returns inf for points that are not visible. Set those to a valid point
+        # and hide them.
+        ghost = vg.AllocatePointGhostArray()
+        if (setInfToValid(geopts, ghost)):
+            # if there are hidden points, we recompute the bounds
+            xm = ym = sys.float_info.max
+            xM = yM = - sys.float_info.max
+            for i in range(pts.GetNumberOfPoints()):
+                if (ghost.GetValue(i) & vtk.vtkDataSetAttributes.HIDDENPOINT == 0):
+                    # point not hidden
+                    p = pts.GetPoint(i)
+                    if (p[0] < xm):
+                        xm = p[0]
+                    if (p[0] > xM):
+                        xM = p[0]
+                    if (p[1] < ym):
+                        ym = p[1]
+                    if (p[1] > yM):
+                        yM = p[1]
         # Sets the vertics into the grid
         vg.SetPoints(geopts)
     else:
@@ -557,24 +606,42 @@ def apply_proj_parameters(pd, projection, x1, x2, y1, y2):
         else:
             pd.SetOptionalParameter("over", "false")
             setProjectionParameters(pd, projection)
-        if (hasattr(projection, 'centralmeridian') and
-                numpy.allclose(projection.centralmeridian, 1e+20)):
-            pd.SetCentralMeridian(float(x1 + x2) / 2.0)
-        if (hasattr(projection, 'centerlongitude') and
-                numpy.allclose(projection.centerlongitude, 1e+20)):
-            pd.SetOptionalParameter("lon_0", str(float(x1 + x2) / 2.0))
-        if (hasattr(projection, 'originlatitude') and
-                numpy.allclose(projection.originlatitude, 1e+20)):
-            pd.SetOptionalParameter("lat_0", str(float(y1 + y2) / 2.0))
-        if (hasattr(projection, 'centerlatitude') and
-                numpy.allclose(projection.centerlatitude, 1e+20)):
-            pd.SetOptionalParameter("lat_0", str(float(y1 + y2) / 2.0))
-        if (hasattr(projection, 'standardparallel1') and
-                numpy.allclose(projection.standardparallel1, 1.e20)):
-            pd.SetOptionalParameter('lat_1', str(min(y1, y2)))
-        if (hasattr(projection, 'standardparallel2') and
-                numpy.allclose(projection.standardparallel2, 1.e20)):
-            pd.SetOptionalParameter('lat_2', str(max(y1, y2)))
+        if (hasattr(projection, 'centralmeridian')):
+            if (numpy.allclose(projection.centralmeridian, 1e+20)):
+                centralmeridian = float(x1 + x2) / 2.0
+            else:
+                centralmeridian = projection.centralmeridian
+            pd.SetCentralMeridian(centralmeridian)
+        if (hasattr(projection, 'centerlongitude')):
+            if (numpy.allclose(projection.centerlongitude, 1e+20)):
+                centerlongitude = float(x1 + x2) / 2.0
+            else:
+                centerlongitude = projection.centerlongitude
+            pd.SetOptionalParameter("lon_0", str(centerlongitude))
+        if (hasattr(projection, 'originlatitude')):
+            if (numpy.allclose(projection.originlatitude, 1e+20)):
+                originlatitude = float(y1 + y2) / 2.0
+            else:
+                originlatitude = projection.originlatitude
+            pd.SetOptionalParameter("lat_0", str(originlatitude))
+        if (hasattr(projection, 'centerlatitude')):
+            if (numpy.allclose(projection.centerlatitude, 1e+20)):
+                centerlatitude = float(y1 + y2) / 2.0
+            else:
+                centerlatitude = projection.centerlatitude
+            pd.SetOptionalParameter("lat_0", str(centerlatitude))
+        if (hasattr(projection, 'standardparallel1')):
+            if (numpy.allclose(projection.standardparallel1, 1.e20)):
+                standardparallel1 = min(y1, y2)
+            else:
+                standardparallel1 = projection.standardparallel1
+            pd.SetOptionalParameter('lat_1', str(standardparallel1))
+        if (hasattr(projection, 'standardparallel2')):
+            if (numpy.allclose(projection.standardparallel2, 1.e20)):
+                standardparallel2 = max(y1, y2)
+            else:
+                standardparallel2 = projection.standardparallel2
+            pd.SetOptionalParameter('lat_2', str(standardparallel2))
 
 
 def projectArray(w, projection, wc, geo=None):
@@ -1072,7 +1139,7 @@ def prepTextProperty(p, winSize, to="default", tt="default", cmap=None,
 
 
 def genTextActor(renderer, string=None, x=None, y=None,
-                 to='default', tt='default', cmap=None):
+                 to='default', tt='default', cmap=None, geoBounds=None, geo=None):
     if isinstance(to, str):
         to = vcs.elements["textorientation"][to]
     if isinstance(tt, str):
@@ -1096,21 +1163,8 @@ def genTextActor(renderer, string=None, x=None, y=None,
     sz = renderer.GetRenderWindow().GetSize()
     actors = []
     pts = vtk.vtkPoints()
-    geo = None
     if vcs.elements["projection"][tt.projection].type != "linear":
-            # Need to figure out new WC
-        Npts = 20
-        for i in range(Npts + 1):
-            X = tt.worldcoordinate[
-                0] + float(i) / Npts * (tt.worldcoordinate[1] -
-                                        tt.worldcoordinate[0])
-            for j in range(Npts + 1):
-                Y = tt.worldcoordinate[
-                    2] + float(j) / Npts * (tt.worldcoordinate[3] -
-                                            tt.worldcoordinate[2])
-                pts.InsertNextPoint(X, Y, 0.)
-        geo, pts = project(pts, tt.projection, tt.worldcoordinate, geo=None)
-        wc = pts.GetBounds()[:4]
+        wc = geoBounds[:4]
         # renderer.SetViewport(tt.viewport[0],tt.viewport[2],tt.viewport[1],tt.viewport[3])
         renderer.SetWorldPoint(wc)
 
@@ -1120,8 +1174,8 @@ def genTextActor(renderer, string=None, x=None, y=None,
         prepTextProperty(p, sz, to, tt, cmap)
         pts = vtk.vtkPoints()
         pts.InsertNextPoint(x[i], y[i], 0.)
-        if geo is not None:
-            geo, pts = project(pts, tt.projection, tt.worldcoordinate, geo=geo)
+        if vcs.elements["projection"][tt.projection].type != "linear":
+            _, pts = project(pts, tt.projection, tt.worldcoordinate, geo=geo)
             X, Y, tz = pts.GetPoint(0)
             X, Y = world2Renderer(renderer, X, Y, tt.viewport, wc)
         else:
diff --git a/Packages/vcs/vcs/vcsvtk/boxfillpipeline.py b/Packages/vcs/vcs/vcsvtk/boxfillpipeline.py
index f2a3ea602..005241b4a 100644
--- a/Packages/vcs/vcs/vcsvtk/boxfillpipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/boxfillpipeline.py
@@ -152,7 +152,8 @@ class BoxfillPipeline(Pipeline2D):
             z = None
         kwargs = {"vtk_backend_grid": self._vtkDataSet,
                   "dataset_bounds": self._vtkDataSetBounds,
-                  "plotting_dataset_bounds": plotting_dataset_bounds}
+                  "plotting_dataset_bounds": plotting_dataset_bounds,
+                  "vtk_backend_geo": self._vtkGeoTransform}
         if ("ratio_autot_viewport" in self._resultDict):
             kwargs["ratio_autot_viewport"] = vp
         self._resultDict.update(self._context().renderTemplate(
diff --git a/Packages/vcs/vcs/vcsvtk/isofillpipeline.py b/Packages/vcs/vcs/vcsvtk/isofillpipeline.py
index 55098f9e5..887c6158c 100644
--- a/Packages/vcs/vcs/vcsvtk/isofillpipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/isofillpipeline.py
@@ -176,7 +176,8 @@ class IsofillPipeline(Pipeline2D):
             z = None
         kwargs = {"vtk_backend_grid": self._vtkDataSet,
                   "dataset_bounds": self._vtkDataSetBounds,
-                  "plotting_dataset_bounds": plotting_dataset_bounds}
+                  "plotting_dataset_bounds": plotting_dataset_bounds,
+                  "vtk_backend_geo": self._vtkGeoTransform}
         if ("ratio_autot_viewport" in self._resultDict):
             kwargs["ratio_autot_viewport"] = vp
         self._resultDict.update(self._context().renderTemplate(
diff --git a/Packages/vcs/vcs/vcsvtk/isolinepipeline.py b/Packages/vcs/vcs/vcsvtk/isolinepipeline.py
index 3406824f0..4cc1519a0 100644
--- a/Packages/vcs/vcs/vcsvtk/isolinepipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/isolinepipeline.py
@@ -311,7 +311,8 @@ class IsolinePipeline(Pipeline2D):
             z = None
         kwargs = {"vtk_backend_grid": self._vtkDataSet,
                   "dataset_bounds": self._vtkDataSetBounds,
-                  "plotting_dataset_bounds": plotting_dataset_bounds}
+                  "plotting_dataset_bounds": plotting_dataset_bounds,
+                  "vtk_backend_geo": self._vtkGeoTransform}
         if ("ratio_autot_viewport" in self._resultDict):
             kwargs["ratio_autot_viewport"] = vp
         self._resultDict.update(self._context().renderTemplate(
diff --git a/Packages/vcs/vcs/vcsvtk/meshfillpipeline.py b/Packages/vcs/vcs/vcsvtk/meshfillpipeline.py
index 64a95c4e3..49320aff9 100644
--- a/Packages/vcs/vcs/vcsvtk/meshfillpipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/meshfillpipeline.py
@@ -210,7 +210,8 @@ class MeshfillPipeline(Pipeline2D):
         self._resultDict["vtk_backend_actors"] = actors
         kwargs = {"vtk_backend_grid": self._vtkDataSet,
                   "dataset_bounds": self._vtkDataSetBounds,
-                  "plotting_dataset_bounds": plotting_dataset_bounds}
+                  "plotting_dataset_bounds": plotting_dataset_bounds,
+                  "vtk_backend_geo": self._vtkGeoTransform}
         if ("ratio_autot_viewport" in self._resultDict):
             kwargs["ratio_autot_viewport"] = vp
         self._template.plot(self._context().canvas, self._data1, self._gm,
diff --git a/Packages/vcs/vcs/vcsvtk/vectorpipeline.py b/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
index 642884bc6..c471a6fa9 100644
--- a/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
@@ -216,7 +216,8 @@ class VectorPipeline(Pipeline2D):
             create_renderer=True)
         kwargs = {'vtk_backend_grid': self._vtkDataSet,
                   'dataset_bounds': self._vtkDataSetBounds,
-                  'plotting_dataset_bounds': plotting_dataset_bounds}
+                  'plotting_dataset_bounds': plotting_dataset_bounds,
+                  'vtk_backend_geo': self._vtkGeoTransform}
         if ('ratio_autot_viewport' in self._resultDict):
             kwargs["ratio_autot_viewport"] = vp
         self._resultDict.update(self._context().renderTemplate(
diff --git a/testing/vcs/CMakeLists.txt b/testing/vcs/CMakeLists.txt
index bee8b9a45..b1e6247e7 100644
--- a/testing/vcs/CMakeLists.txt
+++ b/testing/vcs/CMakeLists.txt
@@ -11,11 +11,26 @@ cdat_add_test(test_vcs_bad_png_path
   "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_bad_png_path.py
 )
-cdat_add_test(test_vcs_boxfill_polar
-  "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_polar.py
-  "${BASELINE_DIR}/test_vcs_boxfill_polar.png"
-  )
+
+foreach(projection polar mollweide lambert orthographic mercator polyconic robinson)
+  cdat_add_test(test_vcs_boxfill_${projection}
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_projection.py
+    "${BASELINE_DIR}/test_vcs_boxfill_${projection}.png"
+    ${projection}
+    )
+endforeach()
+
+foreach(lat_0 45 90)
+  cdat_add_test(test_vcs_boxfill_orthographic_${lat_0}
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_orthographic.py
+    "${BASELINE_DIR}/test_vcs_boxfill_orthographic_${lat_0}.png"
+    ${lat_0}
+    )
+endforeach()
+
+
 cdat_add_test(test_vcs_create_get
   "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_create_get.py
diff --git a/testing/vcs/test_vcs_boxfill_orthographic.py b/testing/vcs/test_vcs_boxfill_orthographic.py
new file mode 100644
index 000000000..b0ebbb3a0
--- /dev/null
+++ b/testing/vcs/test_vcs_boxfill_orthographic.py
@@ -0,0 +1,21 @@
+import os, sys, cdms2, vcs, testing.regression as regression
+
+baselineName = sys.argv[1]
+centerlatitude = float(sys.argv[2])
+
+
+f = cdms2.open(vcs.sample_data + "/clt.nc")
+a = f("clt")
+
+x = regression.init()
+p = x.getprojection('orthographic')
+p.centerlatitude = centerlatitude
+b = x.createboxfill()
+b.projection = p
+x.plot(a(latitude=(90,-90)), b, bg=1)
+
+fileName = os.path.basename(baselineName)
+fileName = os.path.splitext(fileName)[0]
+fileName += '.png'
+
+regression.run(x, fileName)
diff --git a/testing/vcs/test_vcs_boxfill_polar.py b/testing/vcs/test_vcs_boxfill_projection.py
similarity index 64%
rename from testing/vcs/test_vcs_boxfill_polar.py
rename to testing/vcs/test_vcs_boxfill_projection.py
index 869d09802..6f319efd4 100644
--- a/testing/vcs/test_vcs_boxfill_polar.py
+++ b/testing/vcs/test_vcs_boxfill_projection.py
@@ -1,16 +1,20 @@
 import os, sys, cdms2, vcs, testing.regression as regression
 
+baselineName = sys.argv[1]
+projection = sys.argv[2]
+
 
 f = cdms2.open(vcs.sample_data + "/clt.nc")
 a = f("clt")
 
 x = regression.init()
-p = x.getprojection("polar")
+p = x.getprojection(projection)
 b = x.createboxfill()
 b.projection = p
 x.plot(a(latitude=(90,-90)), b, bg=1)
 
-fileName = os.path.basename(__file__)
+fileName = os.path.basename(baselineName)
 fileName = os.path.splitext(fileName)[0]
 fileName += '.png'
-regression.run(x, fileName)
\ No newline at end of file
+
+regression.run(x, fileName)
-- 
GitLab


From e489972640e0d824181550c208c82f2fcac1fffa Mon Sep 17 00:00:00 2001
From: Dan Lipsa <dan.lipsa@kitware.com>
Date: Tue, 24 May 2016 17:44:23 -0400
Subject: [PATCH 123/191] Remove code that results in non-deterministic
 behavior for test_vcs_boxfill_mercator

We deal with points set to infinity by setting them to 0 and hidding them.
See the following commit: BUG: orthographic projection plot is empty
---
 Packages/vcs/vcs/vcs2vtk.py | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/Packages/vcs/vcs/vcs2vtk.py b/Packages/vcs/vcs/vcs2vtk.py
index 27fe8f16b..686b1a677 100644
--- a/Packages/vcs/vcs/vcs2vtk.py
+++ b/Packages/vcs/vcs/vcs2vtk.py
@@ -165,23 +165,6 @@ def putMaskOnVTKGrid(data, grid, actorColor=None, cellData=True, deep=True):
     return mapper
 
 
-def handleProjectionEdgeCases(projection, data):
-    # For mercator projection, latitude values of -90 or 90
-    # transformation result in infinity values. We chose -85, 85
-    # as that's the typical limit used by the community.
-    ptype = projDict.get(projection._type, projection.type)
-    if (ptype.lower() == "merc"):
-        lat = data.getLatitude()
-        if isinstance(lat, cdms2.axis.TransientAxis):
-            lat = lat[:]
-            # Reverse the latitudes incase the starting latitude is greater
-            # than the ending one
-            if lat[-1] < lat[0]:
-                lat = lat[::-1]
-        data = data(latitude=(max(-85, lat.min()), min(85, lat.max())))
-    return data
-
-
 def getBoundsList(axis, hasCellData, dualGrid):
     '''
     Returns the bounds list for 'axis'. If axis has n elements the
@@ -260,10 +243,6 @@ def genGrid(data1, data2, gm, deep=True, grid=None, geo=None, genVectors=False,
     xm, xM, ym, yM = None, None, None, None
     projection = vcs.elements["projection"][gm.projection]
 
-    data1 = handleProjectionEdgeCases(projection, data1)
-    if data2 is not None:
-        data2 = handleProjectionEdgeCases(projection, data2)
-
     try:  # First try to see if we can get a mesh out of this
         g = data1.getGrid()
         # Ok need unstructured grid
-- 
GitLab


From b95883e9a640c83ac1a52b156238a72fa493fc8a Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Tue, 31 May 2016 12:03:05 -0700
Subject: [PATCH 124/191] Renamed to match scheme

---
 testing/vcsaddons/CMakeLists.txt              | 38 +++++++++----------
 ...s.py => test_vcs_addons_convert_arrays.py} |  0
 ... => test_vcs_addons_histogram_defaults.py} |  0
 ...y => test_vcs_addons_histogram_inherit.py} |  0
 ...test_polar.py => test_vcs_addons_polar.py} |  0
 ...ual.py => test_vcs_addons_polar_annual.py} |  0
 ...es.py => test_vcs_addons_polar_degrees.py} |  0
 ...al.py => test_vcs_addons_polar_diurnal.py} |  0
 ...it.py => test_vcs_addons_polar_inherit.py} |  0
 ...l.py => test_vcs_addons_polar_seasonal.py} |  0
 ...y => test_vcs_addons_polar_semidiurnal.py} |  0
 11 files changed, 19 insertions(+), 19 deletions(-)
 rename testing/vcsaddons/{vcs_addons_test_convert_arrays.py => test_vcs_addons_convert_arrays.py} (100%)
 rename testing/vcsaddons/{vcs_addons_test_histogram_defaults.py => test_vcs_addons_histogram_defaults.py} (100%)
 rename testing/vcsaddons/{vcs_addons_test_histogram_inherit.py => test_vcs_addons_histogram_inherit.py} (100%)
 rename testing/vcsaddons/{vcs_addons_test_polar.py => test_vcs_addons_polar.py} (100%)
 rename testing/vcsaddons/{vcs_addons_test_polar_annual.py => test_vcs_addons_polar_annual.py} (100%)
 rename testing/vcsaddons/{vcs_addons_test_polar_degrees.py => test_vcs_addons_polar_degrees.py} (100%)
 rename testing/vcsaddons/{vcs_addons_test_polar_diurnal.py => test_vcs_addons_polar_diurnal.py} (100%)
 rename testing/vcsaddons/{vcs_addons_test_polar_inherit.py => test_vcs_addons_polar_inherit.py} (100%)
 rename testing/vcsaddons/{vcs_addons_test_polar_seasonal.py => test_vcs_addons_polar_seasonal.py} (100%)
 rename testing/vcsaddons/{vcs_addons_test_polar_semidiurnal.py => test_vcs_addons_polar_semidiurnal.py} (100%)

diff --git a/testing/vcsaddons/CMakeLists.txt b/testing/vcsaddons/CMakeLists.txt
index a0fd4e90b..d6b382faf 100644
--- a/testing/vcsaddons/CMakeLists.txt
+++ b/testing/vcsaddons/CMakeLists.txt
@@ -37,52 +37,52 @@ cdat_add_test(vcs_addons_test_EzTemplate_12_plots_spacing
 )
 cdat_add_test(vcs_addons_test_histogram_defaults
   "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcsaddons/vcs_addons_test_histogram_defaults.py
-  ${BASELINE_DIR}/vcs_addons_test_histogram_defaults.png
+  ${cdat_SOURCE_DIR}/testing/vcsaddons/test_vcs_addons_histogram_defaults.py
+  ${BASELINE_DIR}/test_vcs_addons_histogram_defaults.png
 )
 cdat_add_test(vcs_addons_test_histogram_inherit
   "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcsaddons/vcs_addons_test_histogram_inherit.py
-  ${BASELINE_DIR}/vcs_addons_test_histogram_inherit.png
+  ${cdat_SOURCE_DIR}/testing/vcsaddons/test_vcs_addons_histogram_inherit.py
+  ${BASELINE_DIR}/test_vcs_addons_histogram_inherit.png
 )
 cdat_add_test(vcs_addons_test_polar
   "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcsaddons/vcs_addons_test_polar.py
-  ${BASELINE_DIR}/vcs_addons_test_polar.png
+  ${cdat_SOURCE_DIR}/testing/vcsaddons/test_vcs_addons_polar.py
+  ${BASELINE_DIR}/test_vcs_addons_polar.png
 )
 cdat_add_test(vcs_addons_test_polar_inherit
   "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcsaddons/vcs_addons_test_polar_inherit.py
-  ${BASELINE_DIR}/vcs_addons_test_polar_inherit.png
+  ${cdat_SOURCE_DIR}/testing/vcsaddons/test_vcs_addons_polar_inherit.py
+  ${BASELINE_DIR}/test_vcs_addons_polar_inherit.png
 )
 cdat_add_test(vcs_addons_test_convert_arrays
   "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcsaddons/vcs_addons_test_convert_arrays.py
+  ${cdat_SOURCE_DIR}/testing/vcsaddons/test_vcs_addons_convert_arrays.py
 )
 cdat_add_test(vcs_addons_test_polar_degrees
   "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcsaddons/vcs_addons_test_polar_degrees.py
-  ${BASELINE_DIR}/vcs_addons_test_polar_degrees.png
+  ${cdat_SOURCE_DIR}/testing/vcsaddons/test_vcs_addons_polar_degrees.py
+  ${BASELINE_DIR}/test_vcs_addons_polar_degrees.png
 )
 cdat_add_test(vcs_addons_test_polar_annual
   "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcsaddons/vcs_addons_test_polar_annual.py
-  ${BASELINE_DIR}/vcs_addons_test_polar_annual.png
+  ${cdat_SOURCE_DIR}/testing/vcsaddons/test_vcs_addons_polar_annual.py
+  ${BASELINE_DIR}/test_vcs_addons_polar_annual.png
 )
 cdat_add_test(vcs_addons_test_polar_diurnal
   "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcsaddons/vcs_addons_test_polar_diurnal.py
-  ${BASELINE_DIR}/vcs_addons_test_polar_diurnal.png
+  ${cdat_SOURCE_DIR}/testing/vcsaddons/test_vcs_addons_polar_diurnal.py
+  ${BASELINE_DIR}/test_vcs_addons_polar_diurnal.png
 )
 cdat_add_test(vcs_addons_test_polar_seasonal
   "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcsaddons/vcs_addons_test_polar_seasonal.py
-  ${BASELINE_DIR}/vcs_addons_test_polar_seasonal.png
+  ${cdat_SOURCE_DIR}/testing/vcsaddons/test_vcs_addons_polar_seasonal.py
+  ${BASELINE_DIR}/test_vcs_addons_polar_seasonal.png
 )
 cdat_add_test(vcs_addons_test_polar_semidiurnal
   "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcsaddons/vcs_addons_test_polar_semidiurnal.py
-  ${BASELINE_DIR}/vcs_addons_test_polar_semidiurnal.png
+  ${cdat_SOURCE_DIR}/testing/vcsaddons/test_vcs_addons_polar_semidiurnal.py
+  ${BASELINE_DIR}/test_vcs_addons_polar_semidiurnal.png
 )
 
 if (CDAT_DOWNLOAD_SAMPLE_DATA)
diff --git a/testing/vcsaddons/vcs_addons_test_convert_arrays.py b/testing/vcsaddons/test_vcs_addons_convert_arrays.py
similarity index 100%
rename from testing/vcsaddons/vcs_addons_test_convert_arrays.py
rename to testing/vcsaddons/test_vcs_addons_convert_arrays.py
diff --git a/testing/vcsaddons/vcs_addons_test_histogram_defaults.py b/testing/vcsaddons/test_vcs_addons_histogram_defaults.py
similarity index 100%
rename from testing/vcsaddons/vcs_addons_test_histogram_defaults.py
rename to testing/vcsaddons/test_vcs_addons_histogram_defaults.py
diff --git a/testing/vcsaddons/vcs_addons_test_histogram_inherit.py b/testing/vcsaddons/test_vcs_addons_histogram_inherit.py
similarity index 100%
rename from testing/vcsaddons/vcs_addons_test_histogram_inherit.py
rename to testing/vcsaddons/test_vcs_addons_histogram_inherit.py
diff --git a/testing/vcsaddons/vcs_addons_test_polar.py b/testing/vcsaddons/test_vcs_addons_polar.py
similarity index 100%
rename from testing/vcsaddons/vcs_addons_test_polar.py
rename to testing/vcsaddons/test_vcs_addons_polar.py
diff --git a/testing/vcsaddons/vcs_addons_test_polar_annual.py b/testing/vcsaddons/test_vcs_addons_polar_annual.py
similarity index 100%
rename from testing/vcsaddons/vcs_addons_test_polar_annual.py
rename to testing/vcsaddons/test_vcs_addons_polar_annual.py
diff --git a/testing/vcsaddons/vcs_addons_test_polar_degrees.py b/testing/vcsaddons/test_vcs_addons_polar_degrees.py
similarity index 100%
rename from testing/vcsaddons/vcs_addons_test_polar_degrees.py
rename to testing/vcsaddons/test_vcs_addons_polar_degrees.py
diff --git a/testing/vcsaddons/vcs_addons_test_polar_diurnal.py b/testing/vcsaddons/test_vcs_addons_polar_diurnal.py
similarity index 100%
rename from testing/vcsaddons/vcs_addons_test_polar_diurnal.py
rename to testing/vcsaddons/test_vcs_addons_polar_diurnal.py
diff --git a/testing/vcsaddons/vcs_addons_test_polar_inherit.py b/testing/vcsaddons/test_vcs_addons_polar_inherit.py
similarity index 100%
rename from testing/vcsaddons/vcs_addons_test_polar_inherit.py
rename to testing/vcsaddons/test_vcs_addons_polar_inherit.py
diff --git a/testing/vcsaddons/vcs_addons_test_polar_seasonal.py b/testing/vcsaddons/test_vcs_addons_polar_seasonal.py
similarity index 100%
rename from testing/vcsaddons/vcs_addons_test_polar_seasonal.py
rename to testing/vcsaddons/test_vcs_addons_polar_seasonal.py
diff --git a/testing/vcsaddons/vcs_addons_test_polar_semidiurnal.py b/testing/vcsaddons/test_vcs_addons_polar_semidiurnal.py
similarity index 100%
rename from testing/vcsaddons/vcs_addons_test_polar_semidiurnal.py
rename to testing/vcsaddons/test_vcs_addons_polar_semidiurnal.py
-- 
GitLab


From 6f7c191de90aa38506a78a28f4447dcbe19d7a88 Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Tue, 31 May 2016 12:03:38 -0700
Subject: [PATCH 125/191] Converted to using new testing.regression module

---
 .../test_vcs_addons_histogram_defaults.py        | 13 ++++---------
 .../test_vcs_addons_histogram_inherit.py         | 14 +++++---------
 testing/vcsaddons/test_vcs_addons_polar.py       | 13 ++++---------
 .../vcsaddons/test_vcs_addons_polar_annual.py    | 16 ++++++----------
 .../vcsaddons/test_vcs_addons_polar_degrees.py   | 15 +++++----------
 .../vcsaddons/test_vcs_addons_polar_diurnal.py   | 13 ++++---------
 .../vcsaddons/test_vcs_addons_polar_inherit.py   | 13 ++++---------
 .../vcsaddons/test_vcs_addons_polar_seasonal.py  | 13 ++++---------
 .../test_vcs_addons_polar_semidiurnal.py         | 13 ++++---------
 9 files changed, 40 insertions(+), 83 deletions(-)

diff --git a/testing/vcsaddons/test_vcs_addons_histogram_defaults.py b/testing/vcsaddons/test_vcs_addons_histogram_defaults.py
index b2b19e499..24af6757b 100644
--- a/testing/vcsaddons/test_vcs_addons_histogram_defaults.py
+++ b/testing/vcsaddons/test_vcs_addons_histogram_defaults.py
@@ -1,22 +1,17 @@
 import sys,os
 src = sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import testing.regression as regression
 import vcs
 import vcsaddons, numpy
 
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
+x=regression.init()
 
 numpy.random.seed(seed=12345)
 vals = numpy.random.random_sample(2000) * 100
 histo = vcsaddons.histograms.Ghg()
 histo.plot(vals, bg=True, x=x)
 
-fnm = "vcs_addons_test_histogram_defaults.png"
+fnm = "test_vcs_addons_histogram_defaults.png"
 x.png(fnm)
-ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold)
+ret = regression.check_result_image(fnm, src)
 sys.exit(ret)
diff --git a/testing/vcsaddons/test_vcs_addons_histogram_inherit.py b/testing/vcsaddons/test_vcs_addons_histogram_inherit.py
index 8ce19e0c2..c761c4e05 100644
--- a/testing/vcsaddons/test_vcs_addons_histogram_inherit.py
+++ b/testing/vcsaddons/test_vcs_addons_histogram_inherit.py
@@ -1,15 +1,11 @@
 import sys,os
 src = sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import testing.regression as regression
 import vcs, cdms2
 import vcsaddons, numpy
 
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
+x=regression.init()
+
 cdmsfile = cdms2.open(vcs.sample_data + "/clt.nc")
 clt = cdmsfile("clt")
 
@@ -56,7 +52,7 @@ histo3.datawc_x2 = 100
 histo3.bins = None
 histo3.plot(clt, template="default", bg=True)
 
-fnm = "vcs_addons_test_histogram_inherit.png"
+fnm = "test_vcs_addons_histogram_inherit.png"
 x.png(fnm)
-ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold)
+ret = regression.check_result_image(fnm, src)
 sys.exit(ret)
diff --git a/testing/vcsaddons/test_vcs_addons_polar.py b/testing/vcsaddons/test_vcs_addons_polar.py
index 8a848e7a1..5512d9d52 100644
--- a/testing/vcsaddons/test_vcs_addons_polar.py
+++ b/testing/vcsaddons/test_vcs_addons_polar.py
@@ -1,15 +1,10 @@
 import sys,os
 src = sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import testing.regression as regression
 import vcs
 import vcsaddons, numpy
 
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
+x=regression.init()
 
 polar = vcsaddons.polar.Gpo()
 polar.markers = ["dot", "circle"]
@@ -22,7 +17,7 @@ magnitude = list(numpy.sin(theta))
 
 polar.plot(magnitude, theta, bg=True, x=x)
 
-fnm = "vcs_addons_test_polar.png"
+fnm = "test_vcs_addons_polar.png"
 x.png(fnm)
-ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold)
+ret = regression.check_result_image(fnm, src)
 sys.exit(ret)
diff --git a/testing/vcsaddons/test_vcs_addons_polar_annual.py b/testing/vcsaddons/test_vcs_addons_polar_annual.py
index 420b724cd..5cea2bfc1 100644
--- a/testing/vcsaddons/test_vcs_addons_polar_annual.py
+++ b/testing/vcsaddons/test_vcs_addons_polar_annual.py
@@ -1,15 +1,11 @@
 import sys,os
-src = sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import testing.regression as regression
 import vcs
 import vcsaddons, numpy
 
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
+src = sys.argv[1]
+
+x = regression.init()
 
 polar = vcsaddons.getpolar("annual_cycle")
 polar.markers = ["dot"]
@@ -34,7 +30,7 @@ theta = range(1, len(clt) + 1)
 magnitude = avg_departures
 polar.plot(magnitude, theta, bg=True, x=x)
 
-fnm = "vcs_addons_test_polar_annual.png"
+fnm = "test_vcs_addons_polar_annual.png"
 x.png(fnm)
-ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold)
+ret = regression.check_result_image(fnm, src)
 sys.exit(ret)
diff --git a/testing/vcsaddons/test_vcs_addons_polar_degrees.py b/testing/vcsaddons/test_vcs_addons_polar_degrees.py
index 46d34168a..3727dad14 100644
--- a/testing/vcsaddons/test_vcs_addons_polar_degrees.py
+++ b/testing/vcsaddons/test_vcs_addons_polar_degrees.py
@@ -1,15 +1,10 @@
-import sys,os
+import sys
 src = sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import testing.regression as regression
 import vcs
 import vcsaddons, numpy
 
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
+x=regression.init()
 
 polar = vcsaddons.getpolar("degrees")
 polar.markers = ["dot", "circle"]
@@ -23,7 +18,7 @@ polar.datawc_y1 = 0
 polar.datawc_y2 = max(magnitude)
 polar.plot(magnitude, theta, bg=True, x=x)
 
-fnm = "vcs_addons_test_polar_degrees.png"
+fnm = "test_vcs_addons_polar_degrees.png"
 x.png(fnm)
-ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold)
+ret = regression.check_result_image(fnm, src)
 sys.exit(ret)
diff --git a/testing/vcsaddons/test_vcs_addons_polar_diurnal.py b/testing/vcsaddons/test_vcs_addons_polar_diurnal.py
index ac0664171..927180e38 100644
--- a/testing/vcsaddons/test_vcs_addons_polar_diurnal.py
+++ b/testing/vcsaddons/test_vcs_addons_polar_diurnal.py
@@ -1,16 +1,11 @@
 import sys,os
 src = sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
 import vcs
 import vcsaddons, numpy
 import cdms2, cdutil, cdtime
+import testing.regression as regression
 
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
+x=regression.init()
 
 f = cdms2.open(os.path.join(vcs.sample_data, "thermo.nc"))
 temp = f('t')
@@ -38,7 +33,7 @@ polar.magnitude_tick_angle = numpy.pi / 8
 
 polar.plot(magnitudes, thetas, bg=True, x=x)
 
-fnm = "vcs_addons_test_polar_diurnal.png"
+fnm = "test_vcs_addons_polar_diurnal.png"
 x.png(fnm)
-ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold)
+ret = regression.check_result_image(fnm, src)
 sys.exit(ret)
diff --git a/testing/vcsaddons/test_vcs_addons_polar_inherit.py b/testing/vcsaddons/test_vcs_addons_polar_inherit.py
index 4eb946359..4fc56138d 100644
--- a/testing/vcsaddons/test_vcs_addons_polar_inherit.py
+++ b/testing/vcsaddons/test_vcs_addons_polar_inherit.py
@@ -1,15 +1,10 @@
 import sys,os
 src = sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import testing.regression as regression
 import vcs
 import vcsaddons, numpy
 
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
+x=regression.init()
 
 gm = vcsaddons.polar.Gpo()
 gm.markers = ["dot", "circle"]
@@ -44,7 +39,7 @@ magnitude = [magnitude[:len(magnitude)/ 2], magnitude[len(magnitude) / 2:]]
 
 polar.plot(magnitude, theta, bg=True, x=x)
 
-fnm = "vcs_addons_test_polar_inherit.png"
+fnm = "test_vcs_addons_polar_inherit.png"
 x.png(fnm)
-ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold)
+ret = regression.check_result_image(fnm, src)
 sys.exit(ret)
diff --git a/testing/vcsaddons/test_vcs_addons_polar_seasonal.py b/testing/vcsaddons/test_vcs_addons_polar_seasonal.py
index 42612ddae..6a6eafd9b 100644
--- a/testing/vcsaddons/test_vcs_addons_polar_seasonal.py
+++ b/testing/vcsaddons/test_vcs_addons_polar_seasonal.py
@@ -1,16 +1,11 @@
 import sys,os
 src = sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import testing.regression as regression
 import vcs
 import vcsaddons, numpy, MV2
 import cdms2, cdutil, cdtime
 
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
+x=regression.init()
 
 f = cdms2.open(os.path.join(vcs.sample_data, "clt.nc"))
 # Trim first few months and last month so we have even number of seasons
@@ -52,7 +47,7 @@ polar.magnitude_tick_angle = numpy.pi / 4
 
 polar.plot(magnitudes, thetas, bg=True, x=x)
 
-fnm = "vcs_addons_test_polar_seasonal.png"
+fnm = "test_vcs_addons_polar_seasonal.png"
 x.png(fnm)
-ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold)
+ret = regression.check_result_image(fnm, src)
 sys.exit(ret)
diff --git a/testing/vcsaddons/test_vcs_addons_polar_semidiurnal.py b/testing/vcsaddons/test_vcs_addons_polar_semidiurnal.py
index 900d570b4..3061e8a0d 100644
--- a/testing/vcsaddons/test_vcs_addons_polar_semidiurnal.py
+++ b/testing/vcsaddons/test_vcs_addons_polar_semidiurnal.py
@@ -1,16 +1,11 @@
 import sys,os
 src = sys.argv[1]
-pth = os.path.join(os.path.dirname(__file__),"..")
-sys.path.append(pth)
-import checkimage
+import testing.regression as regression
 import vcs
 import vcsaddons, numpy
 import cdms2, cdutil, cdtime
 
-x=vcs.init()
-x.setantialiasing(0)
-x.drawlogooff()
-x.setbgoutputdimensions(1200,1091,units="pixels")
+x=regression.init()
 
 f = cdms2.open(os.path.join(vcs.sample_data, "thermo.nc"))
 temp = f('t')
@@ -38,7 +33,7 @@ polar.magnitude_tick_angle = numpy.pi / 8
 
 polar.plot(magnitudes, thetas, bg=True, x=x)
 
-fnm = "vcs_addons_test_polar_semidiurnal.png"
+fnm = "test_vcs_addons_polar_semidiurnal.png"
 x.png(fnm)
-ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold)
+ret = regression.check_result_image(fnm, src)
 sys.exit(ret)
-- 
GitLab


From 34352f73e172b596e2f0e243561e61bb5c63868a Mon Sep 17 00:00:00 2001
From: Dan Lipsa <dan.lipsa@kitware.com>
Date: Tue, 31 May 2016 15:29:10 -0400
Subject: [PATCH 126/191] Fix regression for test_vcs_png_window_resize

The regression is from a7f5b860ff1408282431b70890044f956396c320
---
 testing/vcs/test_vcs_png_window_resize.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing/vcs/test_vcs_png_window_resize.py b/testing/vcs/test_vcs_png_window_resize.py
index a6346ca28..2adc55d15 100644
--- a/testing/vcs/test_vcs_png_window_resize.py
+++ b/testing/vcs/test_vcs_png_window_resize.py
@@ -1,9 +1,9 @@
 import vcs, sys, os, testing.regression as regression
 
-x = regression.init()
+x = regression.init(bg=0)
 x.setantialiasing(0)
 x.drawlogooff()
 x.open(814,628)
 x.plot([1,2,3,4,5,6,7])
 fnm = __file__[:-3]+".png"
-regression.run(x, fnm)
\ No newline at end of file
+regression.run(x, fnm)
-- 
GitLab


From b8882669bc2758923350695eae0905aba9b27d4f Mon Sep 17 00:00:00 2001
From: Dan Lipsa <dan.lipsa@kitware.com>
Date: Tue, 31 May 2016 16:20:53 -0400
Subject: [PATCH 127/191] BUG: Use the geometry argument, if available, for
 background tests

---
 Packages/testing/regression.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Packages/testing/regression.py b/Packages/testing/regression.py
index 25255fdc0..6b1b2bf9b 100644
--- a/Packages/testing/regression.py
+++ b/Packages/testing/regression.py
@@ -20,10 +20,13 @@ def init(*args, **kwargs):
     testingDir = os.path.join(os.path.dirname(__file__), "..")
     sys.path.append(testingDir)
 
-    if ((('bg' in kwargs and kwargs['bg']) or ('bg' not in kwargs)) and
-        ('geometry' not in kwargs)):
+    if ((('bg' in kwargs and kwargs['bg']) or ('bg' not in kwargs))):
         vcsinst = vcs.init(*args, **dict(kwargs, bg=1))
-        vcsinst.setbgoutputdimensions(1200, 1091, units="pixels")
+        if ('geometry' not in kwargs):
+            vcsinst.setbgoutputdimensions(1200, 1091, units="pixels")
+        else:
+            xy = kwargs['geometry']
+            vcsinst.setbgoutputdimensions(xy[0], xy[1], units="pixels")
     else:
         vcsinst = vcs.init(*args, **dict(kwargs, bg=0))
 
-- 
GitLab


From e5ee0a05e23004734bfde10337da204479945ab2 Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Wed, 1 Jun 2016 12:00:22 -0700
Subject: [PATCH 128/191] Fixes issues with tests for DV3D, makes DV3D obey VCS
 create/source semantics

---
 Packages/DV3D/ConfigurationFunctions.py |  3 +--
 Packages/vcs/vcs/dv3d.py                | 35 +++++++++++++++++++------
 testing/dv3d/TestManager.py             |  5 ++--
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/Packages/DV3D/ConfigurationFunctions.py b/Packages/DV3D/ConfigurationFunctions.py
index c3bff88c3..98e1947b7 100644
--- a/Packages/DV3D/ConfigurationFunctions.py
+++ b/Packages/DV3D/ConfigurationFunctions.py
@@ -245,7 +245,7 @@ class ConfigManager:
         if ( self.parent <> None ):
             for parm_address in self.parent.parameters.keys():
                 basename = get_parameter_name( parm_address )
-                self.parameters[basename] = self.getParameter( basename  )
+                self.parameters[basename] = ConfigParameter(basename, parent=self.parent.getParameter(basename))
         self.initialized = False
 
     def clear( self, cell ):
@@ -264,7 +264,6 @@ class ConfigManager:
             if self.parent is None:
                 cparm = ConfigParameter( param_name, **args )
             else:
-#                print "Getting config param from parent: ", param_name
                 cparm_parent = self.parent.getParameter( param_name, cell=self.cell_coordinates )
                 cparm = ConfigParameter( param_name, parent=cparm_parent, **args )
             self.addParam( param_name, cparm )
diff --git a/Packages/vcs/vcs/dv3d.py b/Packages/vcs/vcs/dv3d.py
index 19a35a808..2afae29f2 100644
--- a/Packages/vcs/vcs/dv3d.py
+++ b/Packages/vcs/vcs/dv3d.py
@@ -126,19 +126,38 @@ class Gfdv3d(object):
         self.projection = 'default'
         self.provenanceHandler = None
 
+        vcs.elements[self.g_name][Gfdv3d_name] = self
+
+        self._axes = "xyz"
+
+        # Use parent config values if possible
+        if isinstance(Gfdv3d_name_src, (unicode, str)):
+            # Make sure we aren't inheriting from ourself
+            if Gfdv3d_name_src != Gfdv3d_name:
+                parent_cfg = vcs.elements[self.g_name][Gfdv3d_name_src].cfgManager
+                self._axes = vcs.elements[self.g_name][Gfdv3d_name_src]._axes
+            else:
+                parent_cfg = None
+        else:
+            # Make sure we aren't inheriting from ourself
+            if Gfdv3d_name_src.name != self.name:
+                parent_cfg = Gfdv3d_name_src.cfgManager
+                self._axes = Gfdv3d_name_src._axes
+            else:
+                parent_cfg = None
+
+        self.cfgManager = ConfigManager(cm=parent_cfg)
+
         if Gfdv3d_name == "Hovmoller3D":
             self._axes = "xyt"
-        else:
-            self._axes = "xyz"
 
-        self.cfgManager = ConfigManager()
         self.ncores = multiprocessing.cpu_count()
+
         self.addParameters()
 
-        vcs.elements[self.g_name][Gfdv3d_name] = self
         self.plot_attributes['name'] = self.g_name
         self.plot_attributes['template'] = Gfdv3d_name
-#        print "Adding VCS element: %s %s " % ( self.g_name, Gfdv3d_name )
+
 
     def setProvenanceHandler(self, provenanceHandler):
         self.provenanceHandler = provenanceHandler
@@ -215,14 +234,14 @@ class Gf3Dvector(Gfdv3d):
 
     def __init__(self, Gfdv3d_name, Gfdv3d_name_src='default'):
         self.g_name = '3d_vector'
-        Gfdv3d.__init__(self, Gfdv3d_name, Gfdv3d_name_src='default')
+        Gfdv3d.__init__(self, Gfdv3d_name, Gfdv3d_name_src=Gfdv3d_name_src)
 
 
 class Gf3Dscalar(Gfdv3d):
 
     def __init__(self, Gfdv3d_name, Gfdv3d_name_src='default'):
         self.g_name = '3d_scalar'
-        Gfdv3d.__init__(self, Gfdv3d_name, Gfdv3d_name_src='default')
+        Gfdv3d.__init__(self, Gfdv3d_name, Gfdv3d_name_src=Gfdv3d_name_src)
         self.VectorDisplay = Gfdv3d_name
 
 
@@ -230,7 +249,7 @@ class Gf3DDualScalar(Gfdv3d):
 
     def __init__(self, Gfdv3d_name, Gfdv3d_name_src='default'):
         self.g_name = '3d_dual_scalar'
-        Gfdv3d.__init__(self, Gfdv3d_name, Gfdv3d_name_src='default')
+        Gfdv3d.__init__(self, Gfdv3d_name, Gfdv3d_name_src=Gfdv3d_name_src)
 
 if __name__ == '__main__':
     dv3d = vcs.get3d_scalar()
diff --git a/testing/dv3d/TestManager.py b/testing/dv3d/TestManager.py
index 94e7e365e..5b0aa208e 100644
--- a/testing/dv3d/TestManager.py
+++ b/testing/dv3d/TestManager.py
@@ -106,9 +106,8 @@ class vcsTest:
 
         plot_kwargs = { 'cdmsfile': self.file.id, 'window_size': (900,600) }
         self.canvas.setantialiasing(False)
-        self.canvas.plot( *plot_args, **plot_kwargs )
-        self.plot = self.canvas.backend.plotApps[ self.gm ]
-#        self.applyActions()
+        display = self.canvas.plot( *plot_args, **plot_kwargs )
+        self.plot = self.canvas.backend.plotApps[ vcs.elements[display.g_type][display.g_name] ]
 
     def applyActions(self):
         for action in self.actions:
-- 
GitLab


From f29a6d136b98f4e84bd56eb63af3e6ed26910ba9 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 1 Jun 2016 15:35:53 -0700
Subject: [PATCH 129/191] first pass, bare bones but works for me

---
 CMake/cdat_modules/cdat_deps.cmake            |  17 +-
 CMake/cdat_modules/cdat_external.cmake        |  12 +-
 CMake/cdat_modules/cdat_pkg.cmake             |   4 +-
 .../install_cdat_from_conda.bash              |  16 +
 CMake/cdat_modules_extra/runtest              |   4 +
 CMake/cdat_modules_extra/runtest.in           |   4 -
 CMakeLists.txt                                | 775 +-----------------
 testing/CMakeLists.txt                        |  47 +-
 8 files changed, 33 insertions(+), 846 deletions(-)
 create mode 100755 CMake/cdat_modules_extra/install_cdat_from_conda.bash
 create mode 100755 CMake/cdat_modules_extra/runtest
 delete mode 100755 CMake/cdat_modules_extra/runtest.in

diff --git a/CMake/cdat_modules/cdat_deps.cmake b/CMake/cdat_modules/cdat_deps.cmake
index 70d44f426..dcb9b307a 100644
--- a/CMake/cdat_modules/cdat_deps.cmake
+++ b/CMake/cdat_modules/cdat_deps.cmake
@@ -1,16 +1 @@
-set(CDAT_deps ${wget_pkg} ${python_pkg} ${numpy_pkg}
-              ${libcdms_pkg}
-              ${libcf_pkg} ${netcdf_pkg} ${myproxyclient_pkg} ${udunits2_pkg})
-if (CDAT_BUILD_GRAPHICS)
-  if (CDAT_BUILD_PARAVIEW)
-    list(APPEND CDAT_deps ${paraview_pkg})
-  else()
-    list(APPEND CDAT_deps ${vtk_pkg})
-  endif()
-  list(APPEND CDAT_deps ${ffmpeg_pkg})
-endif()
-
-if (CDAT_BUILD_ESMF)
-    list(APPEND CDAT_deps ${esmf_pkg})
-endif()
-
+set(CDAT_deps)
diff --git a/CMake/cdat_modules/cdat_external.cmake b/CMake/cdat_modules/cdat_external.cmake
index 7b1b53f9b..3a273bcb0 100644
--- a/CMake/cdat_modules/cdat_external.cmake
+++ b/CMake/cdat_modules/cdat_external.cmake
@@ -1,19 +1,11 @@
 set(CDAT_source "${cdat_SOURCE_DIR}")
 
-set(RUNTIME_FLAGS ${cdat_EXTERNALS}/lib)
-set(LDFLAGS -L${cdat_EXTERNALS}/lib)
-
-if (CDAT_BUILD_LIBDRS)
- set(cdat_xtra_flags "${cdat_xtra_flags} --enable-drs")
-endif()
-
-set(cdat_build_dir ${CMAKE_CURRENT_BINARY_DIR}/cdat-build)
-
 set(WORKING_DIR "${cdat_CMAKE_BINARY_DIR}")
 configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/cdat_python_install_step.cmake.in
   ${cdat_CMAKE_BINARY_DIR}/cdat_python_install_step.cmake
   @ONLY)
 
+message("[CDAT BUILD SCRIPT:${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/install_cdat_from_conda.bash")
 ExternalProject_Add(CDAT
   DOWNLOAD_DIR ""
   SOURCE_DIR ${cdat_SOURCE_DIR}
@@ -22,7 +14,7 @@ ExternalProject_Add(CDAT
   PATCH_COMMAND ""
   CONFIGURE_COMMAND ""
   BUILD_COMMAND ""
-  INSTALL_COMMAND env "PYTHONPATH=$ENV{PYTHONPATH}" ${CMAKE_COMMAND} -DPYTHON_INSTALL_ARGS=${cdat_xtra_flags} -P ${cdat_CMAKE_BINARY_DIR}/cdat_python_install_step.cmake
+  INSTALL_COMMAND ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/install_cdat_from_conda.bash
   DEPENDS ${CDAT_deps}
   ${ep_log_options}
 )
diff --git a/CMake/cdat_modules/cdat_pkg.cmake b/CMake/cdat_modules/cdat_pkg.cmake
index 05a66faf5..3997c0d96 100644
--- a/CMake/cdat_modules/cdat_pkg.cmake
+++ b/CMake/cdat_modules/cdat_pkg.cmake
@@ -1,5 +1,5 @@
 set(cdat_VERSION_MAJOR 2)
-set(cdat_VERSION_MINOR 2)
+set(cdat_VERSION_MINOR 6)
 set(cdat_VERSION_PATCH 0)
 set(cdat_VERSION ${cdat_VERSION_MAJOR}.${cdat_VERSION_MINOR}.${cdat_VERSION_PATCH})
 
@@ -30,6 +30,6 @@ configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/version.in
   ${cdat_BINARY_DIR}/version
   @ONLY
 )
-
+message("[INFO] ADDIBNG CDAT")
 add_cdat_package(CDAT "" "" ON)
 
diff --git a/CMake/cdat_modules_extra/install_cdat_from_conda.bash b/CMake/cdat_modules_extra/install_cdat_from_conda.bash
new file mode 100755
index 000000000..9d393b5da
--- /dev/null
+++ b/CMake/cdat_modules_extra/install_cdat_from_conda.bash
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+SRCS=`dirname $0`
+conda create -n TEST_UVCDAT -c uvcdat uvcdat
+source activate TEST_UVCDAT
+cd ${SRCS}/../..
+echo "PATH:"`pwd`
+for pkg in cdtime regrid2 cdms2 esg DV3D vcs vcsaddons cdutil unidata xmgrace genutil Thermo WK distarray; do
+    cd Packages/${pkg}
+    rm -rf build
+    python setup.py install
+    cd ../..
+done
+
+
+
+
diff --git a/CMake/cdat_modules_extra/runtest b/CMake/cdat_modules_extra/runtest
new file mode 100755
index 000000000..8ca0cbf3b
--- /dev/null
+++ b/CMake/cdat_modules_extra/runtest
@@ -0,0 +1,4 @@
+#!/bin/bash
+source activate TEST _UVCDAT
+echo `which python`
+python $@
diff --git a/CMake/cdat_modules_extra/runtest.in b/CMake/cdat_modules_extra/runtest.in
deleted file mode 100755
index 972a674ad..000000000
--- a/CMake/cdat_modules_extra/runtest.in
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-# source is not portable whereas . is
-. "@CMAKE_INSTALL_PREFIX@/bin/setup_runtime.sh"
-$@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32b16d453..982d6d3e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,4 @@
-#=============================================================================
 cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR)
-CMAKE_POLICY(SET CMP0012 NEW)
-
-if ("${CMAKE_VERSION}" VERSION_LESS "2.8.12")
-  message(WARNING "Your CMake version is ${CMAKE_VERSION} which is depreciated for UV-CDAT. The recommended minimum CMake version is 2.8.12. Using older versions can result in build errors particularly with Xcode 5")
-endif()
-
-# Project name and initial checks
 #=============================================================================
 project(cdat)
 
@@ -19,15 +11,6 @@ set(cdat_external_patch_dir ${cdat_SOURCE_DIR}/exsrc)
 
 
 
-if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local")
-  get_filename_component(cdat_ROOT_DIR ${cdat_BINARY_DIR} PATH)
-  set(CMAKE_INSTALL_PREFIX ${cdat_BINARY_DIR}/install CACHE STRING "" FORCE)
-endif()
-
-set(cdat_EXTERNALS ${CMAKE_INSTALL_PREFIX}/Externals)
-set(ENV{PATH} "${cdat_EXTERNALS}/bin:$ENV{PATH}")
-message("[INFO] We reset your path to: " $ENV{PATH})
-
 set(CMAKE_MODULE_PATH
   ${cdat_CMAKE_SOURCE_DIR}
   ${cdat_CMAKE_SOURCE_DIR}/cmake_modules
@@ -49,64 +32,12 @@ else()
   set(ENV{UVCDAT_ANONYMOUS_LOG} "no")
 endif()
 
-# Disable in source build of any kind.
-#=============================================================================
-include(CheckBuildOutOfSource)
-check_build_out_of_source("${cdat_SOURCE_DIR}" "${cdat_BINARY_DIR}"
-                          BUILDINSOURCE)
-if(BUILDINSOURCE)
-   set(msg "[ERROR] CDAT requires an out of source Build.")
-   set(msg "${msg}\nRun 'git clean -dfx' to restore source dir.")
-   message(FATAL_ERROR "${msg}")
-endif()
-
 # Include useful cmake scripts
 #=============================================================================
 include(cmake_utils)
 include(check_fortran)
 include(CTest)
 
-# Enable/Disable coverage
-#=============================================================================
-option(CDAT_MEASURE_COVERAGE "Measure test coverage while running tests" OFF)
-
-if(CDAT_MEASURE_COVERAGE)
-  message("Coverage measurement enabled; tests will run slower.")
-  set(COVERAGE_PKGS "cdms2,vcs,cdutil,genutil,DV3D,vcsaddons,vcs.vtk_ui,vcs.editors,vcs.vcsvtk,regrid2")
-  configure_file(${cdat_CMAKE_SOURCE_DIR}/coverage_report.py.in
-    ${CMAKE_INSTALL_PREFIX}/bin/coverage_report
-    @ONLY
-  )
-endif()
-
-# Set up the test data. If UVCDAT_USE_SYSTEM_TESTDATA is ON and UVCDAT_TESTDATA
-# is not set then we won't use it for testing. Otherwise we'll test either
-# with the system test data or download it ourselves.
-#=============================================================================
-if (BUILD_TESTING)
-  set(UVCDAT_USE_SYSTEM_TESTDATA ON CACHE BOOL "Use UV-CDAT's test data from the system")
-  if(UVCDAT_USE_SYSTEM_TESTDATA)
-    set(UVCDAT_TESTDATA "" CACHE PATH "Location of UV-CDAT test data")
-    set(UVCDAT_TESTDATA_LOCATION ${UVCDAT_TESTDATA})
-  else()
-    set(UVCDAT_TestData_GZ boonth-1-22-2013.p94m.tar.gz)
-    set(UVCDAT_TestData_MD5 cf47adb0b6164997fb122ccbc3bd6f92)
-    file(DOWNLOAD ${LLNL_URL}/${UVCDAT_TestData_GZ} ${CMAKE_BINARY_DIR}/${UVCDAT_TestData_GZ}
-      STATUS testdatastatus SHOW_PROGRESS EXPECTED_MD5 ${UVCDAT_TestData_MD5})
-    list(GET testdatastatus 0 actualtestdatastatus)
-    if(actualtestdatastatus)
-      message("[WARNING] Unable to automatically download test data ${testdatastatus}")
-    else()
-      set(UVCDAT_TESTDATA_DIR ${CMAKE_BINARY_DIR}/UVCDAT_TestData)
-      file(MAKE_DIRECTORY ${UVCDAT_TESTDATA_DIR})
-      execute_process(
-        COMMAND ${CMAKE_COMMAND} -E tar xzf ${CMAKE_BINARY_DIR}/${UVCDAT_TestData_GZ}
-        WORKING_DIRECTORY ${UVCDAT_TESTDATA_DIR})
-      set(UVCDAT_TESTDATA_LOCATION ${UVCDAT_TESTDATA_DIR})
-    endif()
-  endif()
-endif()
-
 # Change architecture *before* any enable_language() or project()
 # calls so that it's set properly to detect 64-bit-ness...
 #-----------------------------------------------------------------------------
@@ -143,50 +74,6 @@ if(NOT GIT_PROTOCOL)
   set_property(CACHE GIT_PROTOCOL PROPERTY STRINGS "git://" "http://" "https://")
 endif()
 
-if(GIT_PROTOCOL MATCHES "http://")
-  execute_process(
-    COMMAND ${GIT_EXECUTABLE} config --global url.http://github.com/ajdawson/eof2.git.insteadof git://github.com/ajdawson/eof2.git
-    WORKING_DIRECTORY ${cdat_SOURCE_DIR}
-  )
-  execute_process(
-    COMMAND ${GIT_EXECUTABLE} config --global url.http://github.com/ajdawson/eofs.git.insteadof git://github.com/ajdawson/eofs.git
-    WORKING_DIRECTORY ${cdat_SOURCE_DIR}
- )
-  execute_process(
-    COMMAND ${GIT_EXECUTABLE} config --global --unset url.git://uv-cdat.llnl.gov/windfield.git.insteadof http://uv-cdat.llnl.gov/git/windfield.git
-    WORKING_DIRECTORY ${cdat_SOURCE_DIR}
-  )
-  execute_process(
-      COMMAND ${GIT_EXECUTABLE} config --global url.http://github.com/UV-CDAT/scimake.git.insteadof git://github.com/UV-CDAT/scimake.git
-    WORKING_DIRECTORY ${cdat_SOURCE_DIR}
-    )
-  execute_process(
-    COMMAND ${GIT_EXECUTABLE} config --global url.http://github.com/ajdawson/windspharm.git.insteadof git://github.com/ajdawson/windspharm.git
-    WORKING_DIRECTORY ${cdat_SOURCE_DIR}
- )
-else()
-  execute_process(
-    COMMAND ${GIT_EXECUTABLE} config --global --unset url.http://github.com/ajdawson/eof2.git.insteadof git://github.com/ajdawson/eof2.git
-    WORKING_DIRECTORY ${cdat_SOURCE_DIR}
-  )
-  execute_process(
-    COMMAND ${GIT_EXECUTABLE} config --global --unset url.http://github.com/ajdawson/eofs.git.insteadof git://github.com/ajdawson/eofs.git
-    WORKING_DIRECTORY ${cdat_SOURCE_DIR}
- )
-  execute_process(
-    COMMAND ${GIT_EXECUTABLE} config --global url.git://uv-cdat.llnl.gov/windfield.git.insteadof http://uv-cdat.llnl.gov/git/windfield.git
-    WORKING_DIRECTORY ${cdat_SOURCE_DIR}
-  )
-  execute_process(
-      COMMAND ${GIT_EXECUTABLE} config --global --unset url.http://github.com/UV-CDAT/scimake.git.insteadof git://github.com/UV-CDAT/scimake.git
-    WORKING_DIRECTORY ${cdat_SOURCE_DIR}
-    )
-  execute_process(
-    COMMAND ${GIT_EXECUTABLE} config --global --unset url.http://github.com/ajdawson/windspharm.git.insteadof git://github.com/ajdawson/windspharm.git
-    WORKING_DIRECTORY ${cdat_SOURCE_DIR}
- )
-endif()
-
 # Checkout the baseline repository.
 #=============================================================================
 if(BUILD_TESTING)
@@ -231,7 +118,7 @@ set(PARTS_BUILT_INFO "${cdat_BINARY_DIR}/build_info.txt" CACHE STRING "File wher
 # files in order to move them (somehow) to the OFFLINE machine where build will happen
 # OFF the machine has no internet access all files are suppposed to be here, pre-downloaded
 
-option(OFFLINE_BUILD "Is there internet access, are we preping for it?" OFF)
+# option(OFFLINE_BUILD "Is there internet access, are we preping for it?" OFF)
 option(CDAT_BUILD_PARALLEL "Build parallel components of CDAT" OFF)
 
 # OSMesa/VTK aren't playing nicely on macs. Disabling for now.
@@ -242,85 +129,6 @@ cmake_dependent_option(CDAT_BUILD_OFFSCREEN "Use OSMesa for offscreen rendering.
 # Option to enable vtkweb for cdatweb
 option(CDAT_BUILD_WEB "Build in Web support (VTKWeb, etc.)" OFF)
 
-# Option to enable CMOR
-option(CDAT_BUILD_CMOR "Build CMOR" ON)
-
-# Option to choose between easy_install and pip (crunchy ssl/man in the middle prevents us to use pip here...
-set(EGG_INSTALLER "PIP" CACHE STRING "Which package installer to use")
-set_property(CACHE EGG_INSTALLER PROPERTY STRINGS "PIP" "EASY_INSTALL")
-set(PIP_CERTIFICATE "" CACHE STRING "Certificate to use for PIP (LLNL issue really)")
-
-# Options for various types of builds
-option(CDAT_USE_SYSTEM_PYTHON "Use system Python" OFF)
-
-# Default state
-set(CDAT_BUILD_LEAN OFF)
-set(CDAT_BUILD_ALL OFF)
-
-# Some more options
-option(CDAT_BUILD_GUI "Builds GUI-based dependencies (Vistrails, ParaView, VisIt, R, etc.) " ON)
-option(CDAT_BUILD_GRAPHICS "Build graphics-based dependencies (vcs, pyqt, Vistrails, ParaView, VisIt, R, etc.) " ON)
-option(CDAT_BUILD_ESGF "Alias for CDAT_BUILD_LEAN" OFF)
-option(CDAT_BUILD_UVCMETRICSPKG "Builds uvcmetrics package " ON)
-option(CDAT_BUILD_PARAVIEW "Build ParaView rather than just VTK" OFF)
-option(CDAT_DOWNLOAD_UVCMETRICS_TESTDATA "Download test data uvcmetrics package " ON)
-
-# If ESGF option is on then our build mode is LEAN.
-if (CDAT_BUILD_ESGF)
-  if( (DEFINED CDAT_BUILD_MODE) AND (NOT "${CDAT_BUILD_MODE}" STREQUAL "LEAN") )
-    message(WARNING "[INFO] CDAT_BUILD_ESGF enabled, forcing CDAT_BUILD_MODE to LEAN")
-  endif()
-  set(CDAT_BUILD_MODE "LEAN" CACHE STRING "Build mode for CDAT <ALL, LEAN, DEFAULT>" FORCE)
-  set(CDAT_DOWNLOAD_SAMPLE_DATA OFF)
-endif()
-set(CDAT_BUILD_MODE "DEFAULT" CACHE STRING "Build mode for CDAT <ALL, LEAN, DEFAULT>")
-set_property(CACHE CDAT_BUILD_MODE PROPERTY STRINGS "DEFAULT" "ALL" "LEAN")
-message([INFO] BUILD MODE: ${CDAT_BUILD_MODE})
-
-# Set the state of LEAN all based on the MODE
-if (CDAT_BUILD_MODE STREQUAL "LEAN")
-  set(CDAT_BUILD_LEAN ON)
-  set(CDAT_BUILD_ALL OFF)
-elseif (CDAT_BUILD_MODE STREQUAL "ALL")
-  set(CDAT_BUILD_LEAN OFF)
-  set(CDAT_BUILD_ALL ON)
-elseif (CDAT_BUILD_MODE STREQUAL "DEFAULT")
-  set(CDAT_BUILD_LEAN OFF)
-  set(CDAT_BUILD_ALL OFF)
-else()
-  message(FATAL_ERROR "[ERROR] Unknown CDAT_BUILD_MODE \"${CDAT_BUILD_MODE}\" VALID MODES ARE \"DEFAULT\" \"ALL\" \"LEAN\"")
-endif()
-
-# First of all if LEAN then turn OFF GRAPHICS and PARALLEL
-if (CDAT_BUILD_LEAN)
-  set_property(CACHE CDAT_BUILD_GRAPHICS PROPERTY VALUE OFF)
-  set_property(CACHE CDAT_BUILD_PARALLEL PROPERTY VALUE OFF)
-  set_property(CACHE CDAT_BUILD_UVCMETRICSPKG PROPERTY VALUE OFF)
-  set(CDMS_ONLY --enable-cdms-only)
-else()
-  set(CDMS_ONLY "")
-endif()
-
-# If ALL is enabled then turn ON GUI, GRAPHICS, and PARALLEL
-if (CDAT_BUILD_ALL)
-  set_property(CACHE CDAT_BUILD_GUI PROPERTY VALUE ON)
-  set_property(CACHE CDAT_BUILD_GRAPHICS PROPERTY VALUE ON)
-  set_property(CACHE CDAT_BUILD_PARALLEL PROPERTY VALUE ON)
-  set_property(CACHE CDAT_BUILD_ESGF PROPERTY VALUE OFF)
-  set_property(CACHE CDAT_BUILD_UVCMETRICSPKG PROPERTY VALUE ON)
-  set(CDMS_ONLY "")
-endif()
-
-# If no graphics then no gui as well
-if (NOT CDAT_BUILD_GRAPHICS)
-  set_property(CACHE CDAT_BUILD_GUI PROPERTY VALUE OFF)
-endif()
-
-# Don't build GUI if this is an offscreen-only build:
-if(CDAT_BUILD_OFFSCREEN AND CDAT_BUILD_GUI)
-  message("[INFO] Turning off CDAT_BUILD_GUI; incompatible with CDAT_BUILD_OFFSCREEN.")
-  set_property(CACHE CDAT_BUILD_GUI PROPERTY VALUE OFF)
-endif()
 
 set(ep_prefix ${cdat_BINARY_DIR}/build/prefix)
 set_property(DIRECTORY PROPERTY ep_log_dir ${cdat_BINARY_DIR}/logs)
@@ -418,228 +226,13 @@ endif()
 # when left to create them.
 #=============================================================================
 set(CDAT_PACKAGE_CACHE_DIR
-#  ${CMAKE_CURRENT_BINARY_DIR}/../cdat_dependencies"
   "${CMAKE_CURRENT_BINARY_DIR}"
   CACHE PATH
   "Directory where source tar balls of external dependencies are kept"
 )
 
 include(ExternalProject)
-
-file(MAKE_DIRECTORY ${cdat_EXTERNALS})
-file(MAKE_DIRECTORY ${cdat_EXTERNALS}/lib)
-file(MAKE_DIRECTORY ${cdat_EXTERNALS}/bin)
-file(MAKE_DIRECTORY ${cdat_EXTERNALS}/include)
-file(MAKE_DIRECTORY ${cdat_BINARY_DIR}/logs)
-file(MAKE_DIRECTORY ${cdat_BINARY_DIR}/build)
-file(MAKE_DIRECTORY ${cdat_BINARY_DIR}/sources)
-
-# Configure cdat command files
-#=============================================================================
-set(cdat_configure_command ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake)
-set(cdat_make_command ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake)
-set(cdat_install_command ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/cdat_install_step.cmake)
-
-# Include essential packages
-#=============================================================================
-set(external_packages)
-set(found_system_include_dirs)
-set(found_system_libraries)
-
-include(python_pkg)
-if (APPLE)
-  set(SB_EXTERNALS_DIR "${CMAKE_INSTALL_PREFIX}/Externals")
-  set(SB_DIR "${CMAKE_INSTALL_PREFIX}/Library/Frameworks/Python.framework/Versions/${PYVER}")
-else()
-  set(SB_DIR "${CMAKE_INSTALL_PREFIX}")
-  # Helper variables to locate programs and libraries
-  set(SB_EXTERNALS_DIR "${CMAKE_INSTALL_PREFIX}/Externals")
-endif()
-
-set(SB_LIB_DIR "${SB_DIR}/lib")
-set(SB_BIN_DIR "${SB_DIR}/bin")
-
-include(basemap_pkg)
 include(cdat_pkg)
-include(clapack_pkg)
-#include(curl_pkg)
-include(configobj_pkg)
-include(cycler_pkg)
-include(cython_pkg)
-include(data_pkg)
-include(esmf_pkg)
-include(x264_pkg)
-include(ffmpeg_pkg)
-include(pyflakes_pkg)
-include(pep8_pkg)
-include(mccabe_pkg)
-include(flake8_pkg)
-include(g2clib_pkg)
-include(proj4_pkg)
-include(ocgis_pkg)
-include(cligj_pkg)
-include(click_pkg)
-include(fiona_pkg)
-include(pynetcdf4_pkg)
-include(gdal_pkg)
-include(geos_pkg)
-include(gsw_pkg)
-include(gui_support_pkg)
-include(h5py_pkg)
-include(hdf5_pkg)
-include(zmq_pkg)
-include(pyzmq_pkg)
-include(tornado_pkg)
-include(ipython_pkg)
-include(jasper_pkg)
-include(lapack_pkg)
-include(lepl_pkg)
-include(libcf_pkg)
-include(lats_pkg)
-include(libdrs_pkg)
-include(libdrsfortran_pkg)
-include(ezget_pkg)
-include(cd77_pkg)
-include(matplotlib_pkg)
-include(six_pkg)
-include(openssl_pkg)
-include(cryptography_pkg)
-include(enum34_pkg)
-include(idna_pkg)
-include(pyasn1_pkg)
-include(ipaddress_pkg)
-include(cffi_pkg)
-include(ffi_pkg)
-include(dateutils_pkg)
-include(pyparsing_pkg)
-include(pycparser_pkg)
-include(md5_pkg)
-include(mpi4py_pkg)
-include(pyopenssl_pkg)
-include(setuptools_pkg)
-include(myproxyclient_pkg)
-include(netcdf_pkg)
-include(numexpr_pkg)
-include(numpy_pkg)
-include(mpi_pkg)
-include(osmesa_pkg)
-include(seawater_pkg)
-include(vacumm_pkg)
-if (CDAT_BUILD_PARAVIEW)
-  include(paraview_pkg)
-else()
-  include(vtk_pkg)
-endif()
-include(pkgconfig_pkg)
-include(libcdms_pkg)
-include(sampledata_pkg)
-include(pyspharm_pkg)
-include(pytables_pkg)
-include(readline_pkg)
-include(r_pkg)
-include(rpy2_pkg)
-include(singledispatch_pkg)
-include(scikits_pkg)
-include(scipy_pkg)
-## Part of setuptools no need to extra build it
-## include(distribute_pkg)
-if (NOT CDAT_USE_SYSTEM_PYTHON)
-  include(pip_pkg)
-endif()
-include(shapely_pkg)
-include(pygments_pkg)
-include(markupsafe_pkg)
-include(jinja2_pkg)
-include(docutils_pkg)
-include(sphinx_pkg)
-include(freetype_pkg)
-include(coverage_pkg)
-## C. Doutriaux: We need to replace the following with a findPackage at some point
-if (APPLE)
-else()
-  include(jpeg_pkg)
-  include(pixman_pkg)
-  include(fontconfig_pkg)
-  include(curses_pkg)
-  #include(tiff_pkg)
-  include(netcdfplus_pkg)
-endif()
-#include(geotiff_pkg)
-include(cmor_pkg)
-include(udunits2_pkg)
-include(uuid_pkg)
-# IF we build the UVCDAT Metrics package
-if (CDAT_BUILD_UVCMETRICSPKG)
-  if (CDAT_DOWNLOAD_UVCMETRICS_TESTDATA)
-    set(UVCMETRICS_TEST_DATA_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/uvcmetrics/test_data CACHE PATH "DIR FOR UVCMETRICS TEST DATA" )
-  endif()
-  include(uvcmetrics_pkg)
-endif()
-include(vistrails_pkg)
-#include(yasm_pkg)
-include(pylibxml2_pkg)
-include(cdatlogger_pkg)
-include(pyclimate_pkg)
-include(scientificpython_pkg)
-include(windspharm_pkg)
-include(eof2_pkg)
-include(eofs_pkg)
-include(windfield_pkg)
-if (CDAT_BUILD_ESGF)
-    include(lxml_pkg)
-endif()
-
-if (CDAT_BUILD_GUI)
-  include(qt4_pkg)
-  if (NOT CDAT_USE_SYSTEM_PYTHON)
-    include(sip_pkg)
-    include(pyqt_pkg)
-  endif()
-  include(spyder_pkg)
-endif()
-
-# Configure custom configure/build/install step files
-#=============================================================================
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/cdat_common_environment.cmake.in
-    ${cdat_CMAKE_BINARY_DIR}/cdat_common_environment.cmake
-    @ONLY
-)
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/cdat_configure_step.cmake.in
-    ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-    @ONLY
-)
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/cdat_make_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
-  @ONLY
-)
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/cdat_cmake_make_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/cdat_cmake_make_step.cmake
-  @ONLY
-)
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/cdat_install_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/cdat_install_step.cmake
-  @ONLY
-)
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/cleanenv_configure_step.cmake.in
-    ${cdat_CMAKE_BINARY_DIR}/cleanenv_configure_step.cmake
-    @ONLY
-)
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/cdatmpi_configure_step.cmake.in
-    ${cdat_CMAKE_BINARY_DIR}/cdatmpi_configure_step.cmake
-    @ONLY
-)
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/fix_install_name.py.in
-    ${cdat_CMAKE_BINARY_DIR}/fix_install_name.py
-    @ONLY
-)
-
 # Now sort and include external packages
 #=============================================================================
 include(TopologicalSort)
@@ -670,368 +263,4 @@ foreach(package ${external_packages})
     include("${lc_package}_external")
   endif()
 endforeach()
-file(WRITE ${PARTS_BUILT_INFO} ${packages_info})
-
-# Construct Include and Link variables
-#=============================================================================
-if(found_system_include_dirs)
-  list(REMOVE_DUPLICATES found_system_include_dirs)
-  list(REMOVE_ITEM found_system_include_dirs ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES} ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES})
-  set(cdat_external_include_directories)
-  foreach(include_dir ${found_system_include_dirs})
-    set(cdat_external_include_directories "-I${include_dir} ${cdat_external_include_directories}")
-  endforeach()
-endif()
-message("[INFO] CDAT external include directories: ${cdat_external_include_directories}")
-
-message("[INFO] System libraries: ${found_system_libraries}")
-if(found_system_libraries)
-  list(REMOVE_DUPLICATES found_system_libraries)
-  list(REMOVE_ITEM found_system_libraries ${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES})
-  set(cdat_external_link_directories)
-  foreach(library_dir ${found_system_libraries})
-    set(cdat_external_link_directories "-L${library_dir} ${cdat_external_link_directories}")
-  endforeach()
-endif()
-message("[INFO] CDAT external link directories: ${cdat_external_link_directories}")
-
-# Configure remaining files
-#=============================================================================
-
-# set candidate paths for setup_runtime scripts
-# will be added to environment variables in reverse order
-set(SETUP_LIBRARY_PATHS
-  "Externals/lib/paraview-${PARAVIEW_MAJOR}.${PARAVIEW_MINOR} "
-  "Externals/lib/R/lib "
-  "Externals/lib "
-  "Externals/proj4/lib "
-  "Externals/lib64 "
-  "lib "
-)
-string(REPLACE ";" " " SETUP_LIBRARY_PATHS ${SETUP_LIBRARY_PATHS})
-set(SETUP_EXECUTABLE_PATHS
-  "Externals/paraview.app/Contents/bin "
-  "Library/Frameworks/Python.framework/Versions/${PYVER}/bin "
-  "Externals/bin "
-  "bin "
-)
-string(REPLACE ";" " " SETUP_EXECUTABLE_PATHS ${SETUP_EXECUTABLE_PATHS})
-set(SETUP_PYTHON_PATHS
-  "Externals/paraview.app/Contents/Python "
-  "Externals/lib/python${PYVER}/site-packages "
-  "Externals/lib/paraview-${PARAVIEW_MAJOR}.${PARAVIEW_MINOR}/site-packages "
-  "lib/python${PYVER}/site-packages "
-)
-string(REPLACE ";" " " SETUP_PYTHON_PATHS ${SETUP_PYTHON_PATHS})
-include(GetGitRevisionDescription)
-git_describe(UVCDAT_PROMPT_STRING)
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/install.py.in
-    ${cdat_SOURCE_DIR}/installation/install.py
-  @ONLY
-)
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/checked_get.sh.in
-  ${cdat_BINARY_DIR}/checked_get.sh
-  @ONLY
-)
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/predownload.py.in
-  ${cdat_BINARY_DIR}/predownload.py
-  @ONLY
-)
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/setup_runtime.sh.in
-  ${CMAKE_INSTALL_PREFIX}/bin/setup_runtime.sh
-  @ONLY
-)
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/reset_runtime.sh.in
-  ${CMAKE_INSTALL_PREFIX}/bin/reset_runtime.sh
-  @ONLY
-)
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/preofflinebuild.sh.in
-  ${cdat_BINARY_DIR}/preofflinebuild.sh
-  @ONLY
-)
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/setup_runtime.csh.in
-  ${CMAKE_INSTALL_PREFIX}/bin/setup_runtime.csh
-  @ONLY
-)
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/reset_runtime.csh.in
-  ${CMAKE_INSTALL_PREFIX}/bin/reset_runtime.csh
-  @ONLY
-)
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/uvcdat.in
-  ${CMAKE_INSTALL_PREFIX}/bin/uvcdat
-  @ONLY
-)
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/cdat.in
-  ${CMAKE_INSTALL_PREFIX}/bin/cdat
-  @ONLY
-)
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/runtest.in
-  ${CMAKE_INSTALL_PREFIX}/bin/runtest
-  @ONLY
-)
-
-
-if (BUILD_TESTING)
-  configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/runpytest.in
-    ${CMAKE_INSTALL_PREFIX}/bin/runpytest
-    @ONLY
-  )
-  add_subdirectory(testing)
-endif()
-
-# Where to install the wrapper scripts
-set(WRAPPER_INSTALL_LOCATION ${CMAKE_INSTALL_PREFIX}/wrappers
-    CACHE PATH
-    "Install wrapper scripts 'cdat', 'uvcdat' and 'loadcdat' in that directory")
-
-add_custom_command(
-        OUTPUT ${WRAPPER_INSTALL_LOCATION}/loadcdat
-        COMMAND ${CMAKE_COMMAND} -E copy
-        ${CMAKE_INSTALL_PREFIX}/bin/setup_runtime.sh
-        ${WRAPPER_INSTALL_LOCATION}/loadcdat)
-add_custom_command(
-        OUTPUT ${WRAPPER_INSTALL_LOCATION}/loadcdat.csh
-        COMMAND ${CMAKE_COMMAND} -E copy
-        ${CMAKE_INSTALL_PREFIX}/bin/setup_runtime.csh
-        ${WRAPPER_INSTALL_LOCATION}/loadcdat.csh)
-add_custom_command(
-        OUTPUT ${WRAPPER_INSTALL_LOCATION}/uvcdat
-        COMMAND ${CMAKE_COMMAND} -E copy
-        ${CMAKE_INSTALL_PREFIX}/bin/uvcdat
-        ${WRAPPER_INSTALL_LOCATION}/uvcdat)
-add_custom_command(
-        OUTPUT ${WRAPPER_INSTALL_LOCATION}/cdat
-        COMMAND ${CMAKE_COMMAND} -E copy
-        ${CMAKE_INSTALL_PREFIX}/bin/cdat
-        ${WRAPPER_INSTALL_LOCATION}/cdat)
-
-add_custom_target(wrappers ALL DEPENDS
-                  ${WRAPPER_INSTALL_LOCATION}/loadcdat
-                  ${WRAPPER_INSTALL_LOCATION}/loadcdat.csh
-                  ${WRAPPER_INSTALL_LOCATION}/uvcdat
-                  ${WRAPPER_INSTALL_LOCATION}/cdat)
-
-# Package UV-CDAT with CPACK
-include(InstallRequiredSystemLibraries)
-
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "UVCDAT")
-set(CPACK_PACKAGE_VENDOR "UVCDAT")
-set(CPACK_PACKAGE_NAME "UVCDAT")
-set(CPACK_PACKAGE_VERSION_MAJOR "2")
-set(CPACK_PACKAGE_VERSION_MINOR "3")
-set(CPACK_PACKAGE_VERSION_PATCH "0")
-set(CPACK_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/docs/README.txt")
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/docs/Legal.txt")
-set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Aashish Chaudhary") #required
-set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
-set(CPACK_RPM_PACKAGE_PROVIDES /usr/local/uvcdat/bin/python /usr/local/uvcdat/bin/python2.7)
-set(CPACK_DESTINATION_BIN_PREFIX "bin")
-
-if (APPLE)
-  set(SB_EXTERNALS_DIR "Externals")
-  set(SB_LIB_DIR "Library/Frameworks/Python.framework/Versions/2.7/lib")
-  set(CPACK_GENERATOR DragNDrop)
-  set(CPACK_DESTINATION_PREFIX "\${CMAKE_INSTALL_PREFIX}/UVCDAT.app/Contents")
-  set(CPACK_DESTINATION_BIN_PREFIX "${CPACK_DESTINATION_PREFIX}/MacOS")
-endif()
-
-include(CPack)
-
-
-install(CODE "
-  set(SB_EXTERNALS_DIR ${SB_EXTERNALS_DIR})
-  set(SB_LIB_DIR ${SB_LIB_DIR})
-  set(PYVER ${PYVER})
-  set(PARAVIEW_MAJOR ${PARAVIEW_MAJOR})
-  set(PARAVIEW_MINOR ${PARAVIEW_MINOR})
-  set(VISIT_VERSION ${VISIT_VERSION})
-  set(CDAT_BUILD_PARAVIEW ${CDAT_BUILD_PARAVIEW})
-  set(SETUP_EXECUTABLE_PATHS \"${SETUP_EXECUTABLE_PATHS}\")
-  set(SETUP_PYTHON_PATHS \"${SETUP_PYTHON_PATHS}\")
-  set(SETUP_LIBRARY_PATHS \"${SETUP_LIBRARY_PATHS}\")
-
-  file(GLOB_RECURSE programs \"${CMAKE_INSTALL_PREFIX}/bin/*\")
-  file(GLOB programs_images \"${CMAKE_INSTALL_PREFIX}/bin/images/*\")
-  file(GLOB programs_tutorials \"${CMAKE_INSTALL_PREFIX}/bin/tutorials/*\")
-
-  if (NOT \"\${programs_images}\" STREQUAL \"\" OR NOT \"\${programs_tutorials}\" STREQUAL \"\")
-    list(REMOVE_ITEM programs \${programs_images} \${programs_tutorials})
-  endif()
-
-  set (resolved_programs \"\")
-  foreach (program \${programs})
-    get_filename_component(res_program \"\${program}\" REALPATH)
-    set (regex_match \"\")
-    # Do not install uuid as its dependencies are not resolved when using
-    # RPMBuild
-    file (STRINGS \"\${res_program}\" regex_match REGEX \"uuid\")
-    if (\"\${regex_match}\" STREQUAL \"\")
-      file (STRINGS \"\${res_program}\" regex_match REGEX \"#!${CMAKE_INSTALL_PREFIX}\")
-      if (\"\${regex_match}\" STREQUAL \"\")
-        list (APPEND resolved_programs \"\${res_program}\")
-      endif ()
-    endif ()
-  endforeach()
-  
-
-  file(INSTALL FILES \${resolved_programs} DESTINATION
-    \"\${CMAKE_INSTALL_PREFIX}/${CPACK_DESTINATION_BIN_PREFIX}\"
-       PERMISSIONS USE_SOURCE_PERMISSIONS
-  )
-
-  if(EXISTS \"${CMAKE_INSTALL_PREFIX}/bin/images\" AND IS_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/bin/images\")
-    file(INSTALL FILES ${CMAKE_INSTALL_PREFIX}/bin/images DESTINATION
-      \"\${CMAKE_INSTALL_PREFIX}/${CPACK_DESTINATION_BIN_PREFIX}\"
-         PERMISSIONS USE_SOURCE_PERMISSIONS
-    )
-  endif()
-
-  if(EXISTS \"${CMAKE_INSTALL_PREFIX}/bin/tutorials\" AND IS_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/bin/tutorials\")
-    file(INSTALL FILES ${CMAKE_INSTALL_PREFIX}/bin/tutorials DESTINATION
-      \"\${CMAKE_INSTALL_PREFIX}/${CPACK_DESTINATION_BIN_PREFIX}\"
-         PERMISSIONS USE_SOURCE_PERMISSIONS
-    )
-  endif()
-
-  if(EXISTS \"${CMAKE_INSTALL_PREFIX}/Externals\" AND IS_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/Externals\")
-    file(INSTALL FILES ${CMAKE_INSTALL_PREFIX}/Externals DESTINATION
-      \"\${CMAKE_INSTALL_PREFIX}\"
-      PERMISSIONS USE_SOURCE_PERMISSIONS
-      REGEX \"uuid\" EXCLUDE
-    )
-  endif()
-
-  if(EXISTS \"${CMAKE_INSTALL_PREFIX}/include\" AND IS_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/include\")
-    file(INSTALL FILES ${CMAKE_INSTALL_PREFIX}/include DESTINATION
-      \"\${CMAKE_INSTALL_PREFIX}\"
-         PERMISSIONS USE_SOURCE_PERMISSIONS
-    )
-  endif()
-
-  if(EXISTS \"${CMAKE_INSTALL_PREFIX}/lib\" AND IS_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/lib\")
-    file(INSTALL FILES ${CMAKE_INSTALL_PREFIX}/lib DESTINATION
-      \"\${CMAKE_INSTALL_PREFIX}\"
-         PERMISSIONS USE_SOURCE_PERMISSIONS
-    )
-  endif()
-
-  # Patch cgi.py to look for installed python
-  if (EXISTS \"\$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX}/lib/python2.7/cgi.py\")
-    file (READ \"\$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX}/lib/python2.7/cgi.py\" CGI_FILE)
-    SET (SEARCH_REGEX \"\\\#! /usr/local/bin/python\")
-    SET (REPLACEMENT_TEXT \"#! /usr/bin/env python\")
-    STRING (REGEX REPLACE \"\${SEARCH_REGEX}\" \"\${REPLACEMENT_TEXT}\"
-      MODIFIED_FILE \"\${CGI_FILE}\")
-    file (WRITE \"\$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX}/lib/python2.7/cgi.py\"
-      \"\${MODIFIED_FILE}\")
-  endif ()
-
-  if(EXISTS \"${CMAKE_INSTALL_PREFIX}/share\" AND IS_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/share\")
-    file(INSTALL FILES ${CMAKE_INSTALL_PREFIX}/share DESTINATION
-      \"\${CMAKE_INSTALL_PREFIX}\"
-         PERMISSIONS USE_SOURCE_PERMISSIONS
-    )
-  endif()
-
-  if(EXISTS \"${CMAKE_INSTALL_PREFIX}/wrappers\" AND IS_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/wrappers\")
-    file(INSTALL FILES ${CMAKE_INSTALL_PREFIX}/wrappers DESTINATION
-      \"\${CMAKE_INSTALL_PREFIX}\"
-         PERMISSIONS USE_SOURCE_PERMISSIONS
-    )
-  endif()
-
-  if(EXISTS \"${CMAKE_INSTALL_PREFIX}/bin/man\" AND IS_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/bin/man\")
-    file(INSTALL FILES ${CMAKE_INSTALL_PREFIX}/man DESTINATION
-      \"\${CMAKE_INSTALL_PREFIX}/${CPACK_DESTINATION_BIN_PREFIX}\"
-         PERMISSIONS USE_SOURCE_PERMISSIONS
-    )
-  endif()
-
-  if(EXISTS \"${CMAKE_INSTALL_PREFIX}/vistrails\" AND IS_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/vistrails\")
-    file(INSTALL FILES ${CMAKE_INSTALL_PREFIX}/vistrails DESTINATION
-      \"\${CMAKE_INSTALL_PREFIX}\"
-         PERMISSIONS USE_SOURCE_PERMISSIONS
-    )
-  endif()
-
-  if(EXISTS \"${CMAKE_INSTALL_PREFIX}/Library\" AND IS_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/Library\")
-    file(INSTALL FILES ${CMAKE_INSTALL_PREFIX}/Library DESTINATION
-      \"\${CMAKE_INSTALL_PREFIX}\"
-         PERMISSIONS USE_SOURCE_PERMISSIONS
-    )
-  endif()
-  
-  file(INSTALL FILES ${cdat_BINARY_DIR}/build_info.txt DESTINATION ${CMAKE_INSTALL_PREFIX}/info)
-
-  # Unset QT_LIB_DIR as we need to use the one in user's environment
-  # We need to keep in ming that we might need to build Qt on some systems
-  # (e.g. RH6) in which case this might break something
-  set(QT_LIB_DIR)
-
-  # Configure the environment setup script to point to the installation
-  # Creating a temporary file that will be installed.
-  configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/setup_runtime.sh.in
-    \"\$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX}/${CPACK_DESTINATION_BIN_PREFIX}/setup_runtime.sh\"
-    @ONLY
-  )
-
-  # Finally, create a symlink for python to point to point to installed python
-  if (EXISTS \"\$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX}/${CPACK_DESTINATION_BIN_PREFIX}/python2.7\"
-      AND
-      NOT EXISTS \"\$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX}/${CPACK_DESTINATION_BIN_PREFIX}/python\")
-    execute_process(COMMAND \${CMAKE_COMMAND} -E create_symlink
-      \"\$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX}/${CPACK_DESTINATION_BIN_PREFIX}/python2.7\"
-      \"\$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX}/${CPACK_DESTINATION_BIN_PREFIX}/python\"
-      )
-  endif ()
-
-  if (APPLE)
-    configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/uvcdat.mac.in
-      ${CPACK_DESTINATION_BIN_PREFIX}/uvcdat
-      @ONLY
-    )
-    execute_process(COMMAND \${CMAKE_COMMAND} -E copy_directory ${cdat_SOURCE_DIR}/resources
-      ${CPACK_DESTINATION_PREFIX}/Resources
-      OUTPUT_VARIABLE out
-      RESULT_VARIABLE res
-      ERROR_VARIABLE err
-    )
-    if(NOT \${res} EQUAL 0)
-      message(\"Output: \${out}; Result: \${res}; Error: \${err}\")
-    endif()
-
-    execute_process(COMMAND \${CMAKE_COMMAND} -E copy ${cdat_CMAKE_SOURCE_DIR}/uvcdat.plist
-      ${CPACK_DESTINATION_PREFIX}/Info.plist
-      OUTPUT_VARIABLE out
-      RESULT_VARIABLE res
-      ERROR_VARIABLE err
-    )
-    if(NOT \${res} EQUAL 0)
-      message(\"Output: \${out}; Result: \${res}; Error: \${err}\")
-    endif()
-
-    execute_process(COMMAND ${PYTHON_EXECUTABLE} ${cdat_CMAKE_BINARY_DIR}/fix_install_name.py
-      ${CPACK_DESTINATION_PREFIX}
-      OUTPUT_VARIABLE out
-      RESULT_VARIABLE res
-      ERROR_VARIABLE err
-    )
-    if(NOT \${res} EQUAL 0)
-      message(\"Output: \${out}; Result: \${res}; Error: \${err}\")
-    endif()
-  endif()"
-
-  COMPONENT superbuild
-)
-
+add_subdirectory(testing)
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
index 229488172..94dcc6dde 100644
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -12,8 +12,7 @@ macro (cdat_add_test name)
     endif()
   endif()
 
-  add_test(${name} "${CMAKE_INSTALL_PREFIX}/bin/runtest"
-           ${ARGS})
+  add_test(${name} ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/runtest  ${ARGS})
 
   if(DEFINED ENV{UVCDAT_ANONYMOUS_LOG})
     set_tests_properties (${name}
@@ -25,48 +24,14 @@ macro (cdat_add_test name)
     )
   endif()
 endmacro()
-if (CDAT_BUILD_GRAPHICS)
-  add_subdirectory(regrid)
-  add_subdirectory(vcs)
-  add_subdirectory(vcsaddons)
-  add_subdirectory(dv3d)
-endif()
+add_subdirectory(regrid)
+add_subdirectory(vcs)
+add_subdirectory(vcsaddons)
+add_subdirectory(dv3d)
 add_subdirectory(cdutil)
 add_subdirectory(Thermo)
 add_subdirectory(unidata)
 add_subdirectory(cdms2)
 add_subdirectory(xmgrace)
-if (CDAT_BUILD_OCGIS)
-  add_subdirectory(ocgis)
-endif()
-if (CDAT_BUILD_UVCMETRICSPKG)
-  add_subdirectory(metrics)
-endif()
 
-# Disabling ParaView tests
-#if (CDAT_BUILD_PARAVIEW)
-#  add_subdirectory(paraview)
-#endif()
-
-# Test RPY2
-if (CDAT_BUILD_RPY2)
-  add_subdirectory(rpy2)
-endif()
-
-# Test Matplotlib
-if (CDAT_BUILD_MATPLOTLIB)
-  add_subdirectory(matplotlib)
-endif()
-
-# PCMDI Tools
-if (CDAT_BUILD_PCMDI)
-    add_subdirectory(pcmdi)
-endif()
-
-# CMake module tests:
-# Test that out-of-source build detection is working:
-add_test(cmake_checkBuildOutOfSource
-  "${CMAKE_COMMAND}"
-    -DTEST_check_build_out_of_source=ON
-    -P "${cdat_SOURCE_DIR}/CMake/cmake_modules/CheckBuildOutOfSource.cmake"
-)
+add_subdirectory(pcmdi)
-- 
GitLab


From d1c8a97738a721e04452ff538d8b4b8cbeaaa799 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 1 Jun 2016 16:52:04 -0700
Subject: [PATCH 130/191] closer but got some reloc issues

---
 CMake/cdat_modules/cdat_external.cmake              |  7 +------
 CMake/cdat_modules/cdat_pkg.cmake                   |  1 -
 ...m_conda.bash => install_cdat_from_conda.bash.in} | 10 +++-------
 CMake/cdat_modules_extra/runtest                    |  4 ----
 CMake/cdat_modules_extra/runtest.in                 |  4 ++++
 CMakeLists.txt                                      | 13 +++++++++++++
 testing/CMakeLists.txt                              |  2 +-
 7 files changed, 22 insertions(+), 19 deletions(-)
 rename CMake/cdat_modules_extra/{install_cdat_from_conda.bash => install_cdat_from_conda.bash.in} (53%)
 delete mode 100755 CMake/cdat_modules_extra/runtest
 create mode 100755 CMake/cdat_modules_extra/runtest.in

diff --git a/CMake/cdat_modules/cdat_external.cmake b/CMake/cdat_modules/cdat_external.cmake
index 3a273bcb0..2f79aa507 100644
--- a/CMake/cdat_modules/cdat_external.cmake
+++ b/CMake/cdat_modules/cdat_external.cmake
@@ -1,11 +1,6 @@
 set(CDAT_source "${cdat_SOURCE_DIR}")
-
 set(WORKING_DIR "${cdat_CMAKE_BINARY_DIR}")
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/cdat_python_install_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/cdat_python_install_step.cmake
-  @ONLY)
 
-message("[CDAT BUILD SCRIPT:${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/install_cdat_from_conda.bash")
 ExternalProject_Add(CDAT
   DOWNLOAD_DIR ""
   SOURCE_DIR ${cdat_SOURCE_DIR}
@@ -14,7 +9,7 @@ ExternalProject_Add(CDAT
   PATCH_COMMAND ""
   CONFIGURE_COMMAND ""
   BUILD_COMMAND ""
-  INSTALL_COMMAND ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/install_cdat_from_conda.bash
+  INSTALL_COMMAND ${cdat_CMAKE_BINARY_DIR}/install_cdat_from_conda.bash
   DEPENDS ${CDAT_deps}
   ${ep_log_options}
 )
diff --git a/CMake/cdat_modules/cdat_pkg.cmake b/CMake/cdat_modules/cdat_pkg.cmake
index 3997c0d96..92aa4ed99 100644
--- a/CMake/cdat_modules/cdat_pkg.cmake
+++ b/CMake/cdat_modules/cdat_pkg.cmake
@@ -30,6 +30,5 @@ configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/version.in
   ${cdat_BINARY_DIR}/version
   @ONLY
 )
-message("[INFO] ADDIBNG CDAT")
 add_cdat_package(CDAT "" "" ON)
 
diff --git a/CMake/cdat_modules_extra/install_cdat_from_conda.bash b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
similarity index 53%
rename from CMake/cdat_modules_extra/install_cdat_from_conda.bash
rename to CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
index 9d393b5da..d8e7ec958 100755
--- a/CMake/cdat_modules_extra/install_cdat_from_conda.bash
+++ b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
@@ -1,14 +1,10 @@
 #!/usr/bin/env bash
-SRCS=`dirname $0`
-conda create -n TEST_UVCDAT -c uvcdat uvcdat
-source activate TEST_UVCDAT
-cd ${SRCS}/../..
-echo "PATH:"`pwd`
+conda create -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@ uvcdat
+source activate @CONDA_ENVIRONMENT_NAME@
 for pkg in cdtime regrid2 cdms2 esg DV3D vcs vcsaddons cdutil unidata xmgrace genutil Thermo WK distarray; do
-    cd Packages/${pkg}
+    cd @cdat_SOURCE_DIR@/Packages/${pkg}
     rm -rf build
     python setup.py install
-    cd ../..
 done
 
 
diff --git a/CMake/cdat_modules_extra/runtest b/CMake/cdat_modules_extra/runtest
deleted file mode 100755
index 8ca0cbf3b..000000000
--- a/CMake/cdat_modules_extra/runtest
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-source activate TEST _UVCDAT
-echo `which python`
-python $@
diff --git a/CMake/cdat_modules_extra/runtest.in b/CMake/cdat_modules_extra/runtest.in
new file mode 100755
index 000000000..ee8f59a2c
--- /dev/null
+++ b/CMake/cdat_modules_extra/runtest.in
@@ -0,0 +1,4 @@
+#!/bin/bash
+source activate @CONDA_ENVIRONMENT_NAME@
+echo "Python:" `which python`
+python $@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 982d6d3e7..a9e2fb3f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -233,6 +233,9 @@ set(CDAT_PACKAGE_CACHE_DIR
 
 include(ExternalProject)
 include(cdat_pkg)
+# CONDA Options
+set(CONDA_ENVIRONMENT_NAME ${cdat_VERSION} CACHE STRING "Name of conda environment we want to build CDAT in")
+set(CONDA_CHANNEL_UVCDAT uvcdat CACHE STRING "channels to use (if more than one use '-c' between channels e.g. uvcdat/label/nightly -c uvcdat)")
 # Now sort and include external packages
 #=============================================================================
 include(TopologicalSort)
@@ -263,4 +266,14 @@ foreach(package ${external_packages})
     include("${lc_package}_external")
   endif()
 endforeach()
+
+configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/runtest.in
+    ${cdat_CMAKE_BINARY_DIR}/runtest
+    @ONLY
+    )
+configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/install_cdat_from_conda.bash.in
+    ${cdat_CMAKE_BINARY_DIR}/install_cdat_from_conda.bash
+    @ONLY
+    )
+
 add_subdirectory(testing)
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
index 94dcc6dde..0e7286fbe 100644
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -12,7 +12,7 @@ macro (cdat_add_test name)
     endif()
   endif()
 
-  add_test(${name} ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/runtest  ${ARGS})
+  add_test(${name} ${cdat_CMAKE_BINARY_DIR}/runtest  ${ARGS})
 
   if(DEFINED ENV{UVCDAT_ANONYMOUS_LOG})
     set_tests_properties (${name}
-- 
GitLab


From a8aa5a8db11f51ce776c0e4a060947fac1ea7168 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 1 Jun 2016 17:07:17 -0700
Subject: [PATCH 131/191] still not there

---
 CMake/cdat_modules_extra/install_cdat_from_conda.bash.in | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
index d8e7ec958..e7dd07f48 100755
--- a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
+++ b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
-conda create -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@ uvcdat
+
+conda create -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@  hdf5 libnetcdf lapack clapack ossuuid libcf esmf jasper g2clib yasm x264 ffmpeg cmor vtk libcdms cdat_info
+
 source activate @CONDA_ENVIRONMENT_NAME@
 for pkg in cdtime regrid2 cdms2 esg DV3D vcs vcsaddons cdutil unidata xmgrace genutil Thermo WK distarray; do
     cd @cdat_SOURCE_DIR@/Packages/${pkg}
@@ -7,6 +9,3 @@ for pkg in cdtime regrid2 cdms2 esg DV3D vcs vcsaddons cdutil unidata xmgrace ge
     python setup.py install
 done
 
-
-
-
-- 
GitLab


From 5babb4b6d4483a8e61e75b625899345cf20ef642 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Thu, 2 Jun 2016 10:11:28 -0700
Subject: [PATCH 132/191] added -y so it doesn't wait for user answer

---
 CMake/cdat_modules_extra/install_cdat_from_conda.bash.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
index e7dd07f48..8b1382431 100755
--- a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
+++ b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-conda create -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@  hdf5 libnetcdf lapack clapack ossuuid libcf esmf jasper g2clib yasm x264 ffmpeg cmor vtk libcdms cdat_info
+conda create -y -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@  hdf5 libnetcdf lapack clapack ossuuid libcf esmf jasper g2clib yasm x264 ffmpeg cmor vtk libcdms cdat_info
 
 source activate @CONDA_ENVIRONMENT_NAME@
 for pkg in cdtime regrid2 cdms2 esg DV3D vcs vcsaddons cdutil unidata xmgrace genutil Thermo WK distarray; do
-- 
GitLab


From e7f1ea72b92fc09f37ea9e8067944a854f865a69 Mon Sep 17 00:00:00 2001
From: Dan Lipsa <dan.lipsa@kitware.com>
Date: Thu, 2 Jun 2016 09:36:43 -0400
Subject: [PATCH 133/191] BUG 1944: Extend the isoline attribute list with the
 last value from the existing attribute list

If there are no attributes in the list, we choose
default values: linewidth=1, linestyle='solid', linecolor='black'
---
 Packages/vcs/vcs/isoline.py                   |  2 ++
 Packages/vcs/vcs/vcsvtk/isolinepipeline.py    | 32 ++++++++-----------
 testing/vcs/CMakeLists.txt                    |  5 +++
 .../vcs/test_vcs_isoline_extend_attributes.py | 14 ++++++++
 testing/vcs/test_vcs_isoline_numpy.py         |  7 ++--
 5 files changed, 37 insertions(+), 23 deletions(-)
 create mode 100644 testing/vcs/test_vcs_isoline_extend_attributes.py

diff --git a/Packages/vcs/vcs/isoline.py b/Packages/vcs/vcs/isoline.py
index c1912c57a..5961dfbad 100755
--- a/Packages/vcs/vcs/isoline.py
+++ b/Packages/vcs/vcs/isoline.py
@@ -310,6 +310,8 @@ class Gi(object):
         iso.linewidths=([1,2,3,4,5,6,7,8])	# Will set the isoline to a specific
                                                 #     width size
         iso.linewidths=None			# Turns off the line width size
+    If the number of line styles, colors or widths are less than the number of levels
+    we extend the attribute list using the last attribute value in the attribute list.
 
     There are three ways to specify the text or font number:
         iso.text=(1,2,3,4,5,6,7,8,9)     	# Font numbers are between 1 and 9
diff --git a/Packages/vcs/vcs/vcsvtk/isolinepipeline.py b/Packages/vcs/vcs/vcsvtk/isolinepipeline.py
index 4cc1519a0..1204d973c 100644
--- a/Packages/vcs/vcs/vcsvtk/isolinepipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/isolinepipeline.py
@@ -14,6 +14,14 @@ class IsolinePipeline(Pipeline2D):
         super(IsolinePipeline, self).__init__(gm, context_)
         self._needsCellData = False
 
+    def extendAttribute(self, attributes, default):
+        if len(attributes) < len(self._contourLevels):
+            if (len(attributes) == 0):
+                attributeValue = default
+            else:
+                attributeValue = attributes[-1]
+            attributes += [attributeValue] * (len(self._contourLevels) - len(attributes))
+
     def _updateContourLevelsAndColors(self):
         """Overrides baseclass implementation."""
         # Contour values:
@@ -31,9 +39,8 @@ class IsolinePipeline(Pipeline2D):
             else:
                 if numpy.allclose(self._contourLevels[0], 1.e20):
                     self._contourLevels[0] = -1.e20
-
-        # Contour colors:
         self._contourColors = self._gm.linecolors
+        self.extendAttribute(self._contourColors, default='black')
 
     def _plotInternal(self):
         """Overrides baseclass implementation."""
@@ -43,15 +50,10 @@ class IsolinePipeline(Pipeline2D):
         tmpLineStyles = []
 
         linewidth = self._gm.linewidths
-        linestyle = self._gm.line
-
-        if len(linewidth) < len(self._contourLevels):
-            # fill up the line width values
-            linewidth += [1.0] * (len(self._contourLevels) - len(linewidth))
+        self.extendAttribute(linewidth, default=1.0)
 
-        if len(linestyle) < len(self._contourLevels):
-            # fill up the line style values
-            linestyle += ['solid'] * (len(self._contourLevels) - len(linestyle))
+        linestyle = self._gm.line
+        self.extendAttribute(linestyle, default='solid')
 
         plotting_dataset_bounds = self.getPlottingBounds()
         x1, x2, y1, y2 = plotting_dataset_bounds
@@ -69,20 +71,14 @@ class IsolinePipeline(Pipeline2D):
                 if W == linewidth[i] and S == linestyle[i]:
                     # Ok same style and width, lets keep going
                     L.append(l)
-                    if i >= len(self._contourColors):
-                        C.append(self._contourColors[-1])
-                    else:
-                        C.append(self._contourColors[i])
+                    C.append(self._contourColors[i])
                 else:
                     tmpLevels.append(L)
                     tmpColors.append(C)
                     tmpLineWidths.append(W)
                     tmpLineStyles.append(S)
                     L = [l]
-                    if i >= len(self._contourColors):
-                        C = [self._contourColors[-1]]
-                    else:
-                        C = [self._contourColors[i]]
+                    C = [self._contourColors[i]]
                     W = linewidth[i]
                     S = linestyle[i]
 
diff --git a/testing/vcs/CMakeLists.txt b/testing/vcs/CMakeLists.txt
index b1e6247e7..d32e9cb90 100644
--- a/testing/vcs/CMakeLists.txt
+++ b/testing/vcs/CMakeLists.txt
@@ -692,6 +692,11 @@ cdat_add_test(test_vcs_settings_color_name_rgba
    ENDFOREACH(ptype)
   ENDFOREACH(gm)
 
+  cdat_add_test(test_vcs_isoline_extend_attributes
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_extend_attributes.py
+    ${BASELINE_DIR}/test_vcs_isoline_extend_attributes.png
+    )
   cdat_add_test(test_vcs_isoline_numpy
     "${PYTHON_EXECUTABLE}"
     ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_numpy.py
diff --git a/testing/vcs/test_vcs_isoline_extend_attributes.py b/testing/vcs/test_vcs_isoline_extend_attributes.py
new file mode 100644
index 000000000..77b212c3e
--- /dev/null
+++ b/testing/vcs/test_vcs_isoline_extend_attributes.py
@@ -0,0 +1,14 @@
+import cdms2
+import vcs
+import testing.regression as regression
+
+x = regression.init()
+isoline = vcs.createisoline()
+f = cdms2.open(vcs.sample_data + '/clt.nc')
+s = f("clt")
+isoline.line = ["dash-dot"]
+isoline.linecolors = [250]
+isoline.linewidths = [5]
+x.plot(s, isoline)
+fnm = "test_vcs_isoline_extend_attributes.png"
+regression.run(x, fnm)
diff --git a/testing/vcs/test_vcs_isoline_numpy.py b/testing/vcs/test_vcs_isoline_numpy.py
index 147f2f499..4534529ba 100644
--- a/testing/vcs/test_vcs_isoline_numpy.py
+++ b/testing/vcs/test_vcs_isoline_numpy.py
@@ -1,13 +1,10 @@
 import os, sys, cdms2, vcs, testing.regression as regression
 
 x = regression.init()
-x.setantialiasing(0)
-x.setbgoutputdimensions(1200,1091,units="pixels")
-x.drawlogooff()
 fnm = os.path.join(vcs.sample_data,'clt.nc')
 f = cdms2.open(fnm)
 s = f("clt")
 gm = x.createisofill()
-x.plot(s.filled(),gm,bg=1)
+x.plot(s.filled(),gm)
 fnm = "test_vcs_isoline_numpy.png"
-regression.run(x, fnm)
\ No newline at end of file
+regression.run(x, fnm)
-- 
GitLab


From 888462c5bb9f64129f14ec8ee703e31c1284f060 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Thu, 2 Jun 2016 21:43:32 -0700
Subject: [PATCH 134/191] add DYLD env library for mac in runtest

developpers will also need it in their path in order to use outside of runtest
---
 CMake/cdat_modules_extra/runtest.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMake/cdat_modules_extra/runtest.in b/CMake/cdat_modules_extra/runtest.in
index ee8f59a2c..8d37c2033 100755
--- a/CMake/cdat_modules_extra/runtest.in
+++ b/CMake/cdat_modules_extra/runtest.in
@@ -1,4 +1,5 @@
 #!/bin/bash
 source activate @CONDA_ENVIRONMENT_NAME@
+export DYLD_FALLBACK_LIBRARY_PATH=`python -c "import sys,os;print os.path.join(sys.prefix,'lib')"`
 echo "Python:" `which python`
 python $@
-- 
GitLab


From d7581f3a24cbcaee0adffe369443b604d74b763c Mon Sep 17 00:00:00 2001
From: Dan Lipsa <dan.lipsa@kitware.com>
Date: Fri, 3 Jun 2016 11:30:04 -0400
Subject: [PATCH 135/191] BUG: datawc does not work on a time axis.

This happened because datawc is converted to cdtime.reltime type.
---
 Packages/vcs/vcs/utils.py                   | 36 ++++++++++++++-------
 testing/vcs/CMakeLists.txt                  |  5 +++
 testing/vcs/test_vcs_boxfill_datawc_time.py | 23 +++++++++++++
 3 files changed, 52 insertions(+), 12 deletions(-)
 create mode 100644 testing/vcs/test_vcs_boxfill_datawc_time.py

diff --git a/Packages/vcs/vcs/utils.py b/Packages/vcs/vcs/utils.py
index e69466eab..db4db640e 100644
--- a/Packages/vcs/vcs/utils.py
+++ b/Packages/vcs/vcs/utils.py
@@ -1666,13 +1666,25 @@ def creategraphicsmethod(gtype, gname='default', name=None):
     return copy_mthd
 
 
+# Returns the float value for datawc_...
+# datawc_ can be a float or a cdtime.reltime
+# TODO: Investigate why datawc is converted to a cdtime.reltime
+def getDataWcValue(v):
+    if (type(v) is type(cdtime.reltime(0, 'months since 1900'))):
+        return v.value
+    else:
+        return v
+
+
 def getworldcoordinates(gm, X, Y):
     """Given a graphics method and two axes
     figures out correct world coordinates"""
     # compute the spanning in x and y, and adjust for the viewport
     wc = [0, 1, 0, 1]
     try:
-        if gm.datawc_x1 > 9.E19:
+        datawc = [getDataWcValue(gm.datawc_x1), getDataWcValue(gm.datawc_x2),
+                  getDataWcValue(gm.datawc_y1), getDataWcValue(gm.datawc_y2)]
+        if numpy.isclose(datawc[0], 1.e20):
             try:
                 i = 0
                 try:
@@ -1684,8 +1696,8 @@ def getworldcoordinates(gm, X, Y):
             except:
                 wc[0] = X[:].min()
         else:
-            wc[0] = gm.datawc_x1
-        if gm.datawc_x2 > 9.E19:
+            wc[0] = datawc[0]
+        if numpy.isclose(datawc[1], 1.e20):
             try:
                 i = -1
                 try:
@@ -1697,18 +1709,18 @@ def getworldcoordinates(gm, X, Y):
             except:
                 wc[1] = X[:].max()
         else:
-            wc[1] = gm.datawc_x2
+            wc[1] = datawc[1]
     except:
         return wc
     if (((not isinstance(X, cdms2.axis.TransientAxis) and
           isinstance(Y, cdms2.axis.TransientAxis)) or
          not vcs.utils.monotonic(X[:])) and
-        numpy.allclose([gm.datawc_x1, gm.datawc_x2], 1.e20))\
+        numpy.allclose([datawc[0], datawc[1]], 1.e20))\
             or (hasattr(gm, "projection") and
                 vcs.elements["projection"][gm.projection].type != "linear"):
         wc[0] = X[:].min()
         wc[1] = X[:].max()
-    if gm.datawc_y1 > 9.E19:
+    if numpy.isclose(datawc[2], 1.e20):
         try:
             i = 0
             try:
@@ -1720,8 +1732,8 @@ def getworldcoordinates(gm, X, Y):
         except:
             wc[2] = Y[:].min()
     else:
-        wc[2] = gm.datawc_y1
-    if gm.datawc_y2 > 9.E19:
+        wc[2] = datawc[2]
+    if numpy.isclose(datawc[3], 1.e20):
         try:
             i = -1
             try:
@@ -1733,16 +1745,16 @@ def getworldcoordinates(gm, X, Y):
         except:
             wc[3] = Y[:].max()
     else:
-        wc[3] = gm.datawc_y2
+        wc[3] = datawc[3]
     if (((not isinstance(Y, cdms2.axis.TransientAxis) and
           isinstance(X, cdms2.axis.TransientAxis)) or not vcs.utils.monotonic(Y[:])) and
-        numpy.allclose([gm.datawc_y1, gm.datawc_y2], 1.e20)) \
+        numpy.allclose([datawc[2], datawc[3]], 1.e20)) \
             or (hasattr(gm, "projection") and
                 vcs.elements["projection"][
                 gm.projection].type.lower().split()[0]
                 not in ["linear", "polar"] and
-                numpy.allclose([gm.datawc_y1, gm.datawc_y2], 1.e20) and
-                numpy.allclose([gm.datawc_x1, gm.datawc_x2], 1.e20)):
+                numpy.allclose([datawc[2], datawc[3]], 1.e20) and
+                numpy.allclose([datawc[0], datawc[1]], 1.e20)):
         wc[2] = Y[:].min()
         wc[3] = Y[:].max()
     if wc[3] == wc[2]:
diff --git a/testing/vcs/CMakeLists.txt b/testing/vcs/CMakeLists.txt
index d32e9cb90..dc8cfc15f 100644
--- a/testing/vcs/CMakeLists.txt
+++ b/testing/vcs/CMakeLists.txt
@@ -442,6 +442,11 @@ if (CDAT_DOWNLOAD_SAMPLE_DATA)
     ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_custom.py
     "${BASELINE_DIR}/test_vcs_boxfill_custom.png"
     )
+  cdat_add_test(test_vcs_boxfill_datawc_time
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_datawc_time.py
+    "${BASELINE_DIR}/test_vcs_boxfill_datawc_time.png"
+    )
   cdat_add_test(test_vcs_boxfill_custom_non_default_levels
     "${PYTHON_EXECUTABLE}"
     ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_custom_non_default_levels.py
diff --git a/testing/vcs/test_vcs_boxfill_datawc_time.py b/testing/vcs/test_vcs_boxfill_datawc_time.py
new file mode 100644
index 000000000..3b459b7e7
--- /dev/null
+++ b/testing/vcs/test_vcs_boxfill_datawc_time.py
@@ -0,0 +1,23 @@
+import cdms2, os, sys, vcs, cdtime, testing.regression as regression
+
+# Test that we can restrict the plot using datawc along a time axis
+dataFile = cdms2.open(os.path.join(vcs.sample_data, "clt.nc"))
+clt = dataFile("clt")
+clt = clt(latitude=(-90.0, 90.0), longitude=(0.), squeeze=1,
+          time=('1979-1-1 0:0:0.0', '1988-12-1 0:0:0.0'))
+
+# Initialize canvas:
+canvas = regression.init()
+
+# Create and plot quick boxfill with default settings:
+boxfill=canvas.createboxfill()
+
+# Change the type
+boxfill.boxfill_type = 'custom'
+boxfill.datawc_y1 = 12
+
+canvas.plot(clt, boxfill, bg=1)
+
+# Load the image testing module:
+# Create the test image and compare:
+regression.run(canvas, "test_vcs_boxfill_datawc_time.png")
-- 
GitLab


From 67300c9a4f3470daf8b95e61bb89cddd04634e4c Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Mon, 6 Jun 2016 16:23:39 -0700
Subject: [PATCH 136/191] closer, now build and some ctest pass

---
 .../install_cdat_from_conda.bash.in           | 10 +++--
 CMake/cdat_modules_extra/runtest.in           |  2 +
 .../files.txt => vcs/Share/sample_files.txt}  |  0
 Packages/vcs/setup.py                         |  1 +
 Packages/vcs/vcs/utils.py                     | 40 +++++++++++++++++++
 5 files changed, 50 insertions(+), 3 deletions(-)
 rename Packages/{dat/files.txt => vcs/Share/sample_files.txt} (100%)

diff --git a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
index 8b1382431..81a54299b 100755
--- a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
+++ b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
@@ -1,11 +1,15 @@
 #!/usr/bin/env bash
 
-conda create -y -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@  hdf5 libnetcdf lapack clapack ossuuid libcf esmf jasper g2clib yasm x264 ffmpeg cmor vtk libcdms cdat_info
+conda create -y -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@  hdf5 libnetcdf lapack clapack ossuuid libcf esmf jasper g2clib yasm x264 ffmpeg cmor vtk libcdms cdat_info flake8 requests
 
 source activate @CONDA_ENVIRONMENT_NAME@
-for pkg in cdtime regrid2 cdms2 esg DV3D vcs vcsaddons cdutil unidata xmgrace genutil Thermo WK distarray; do
+for pkg in testing cdtime regrid2 cdms2 esg DV3D vcs vcsaddons cdutil unidata xmgrace genutil Thermo WK distarray; do
     cd @cdat_SOURCE_DIR@/Packages/${pkg}
     rm -rf build
-    python setup.py install
+    if [ ${pkg} == "vcs" ]; then
+        python setup.py install --old-and-unmanageable
+    else
+        python setup.py install
+    fi
 done
 
diff --git a/CMake/cdat_modules_extra/runtest.in b/CMake/cdat_modules_extra/runtest.in
index 8d37c2033..4cd4b5fd7 100755
--- a/CMake/cdat_modules_extra/runtest.in
+++ b/CMake/cdat_modules_extra/runtest.in
@@ -2,4 +2,6 @@
 source activate @CONDA_ENVIRONMENT_NAME@
 export DYLD_FALLBACK_LIBRARY_PATH=`python -c "import sys,os;print os.path.join(sys.prefix,'lib')"`
 echo "Python:" `which python`
+# make sure data is downloaded
+python -c "import vcs;vcs.download_sample_data_files()"
 python $@
diff --git a/Packages/dat/files.txt b/Packages/vcs/Share/sample_files.txt
similarity index 100%
rename from Packages/dat/files.txt
rename to Packages/vcs/Share/sample_files.txt
diff --git a/Packages/vcs/setup.py b/Packages/vcs/setup.py
index e3f9dd022..10f64da9b 100755
--- a/Packages/vcs/setup.py
+++ b/Packages/vcs/setup.py
@@ -40,6 +40,7 @@ setup(name="vcs",
                                  'Share/text_icon.png',
                                  'Share/fill_icon.png',
                                  'Share/line_icon.png',
+                                 'Share/sample_files.txt',
                                  'Fonts/Adelon_Regular.ttf',
                                  'Fonts/Arabic.ttf',
                                  'Fonts/Athens_Greek.ttf',
diff --git a/Packages/vcs/vcs/utils.py b/Packages/vcs/vcs/utils.py
index e69466eab..791ee41d2 100644
--- a/Packages/vcs/vcs/utils.py
+++ b/Packages/vcs/vcs/utils.py
@@ -1794,3 +1794,43 @@ def png_read_metadata(path):
     for i in range(0, numberOfTextChunks):
         m[reader.GetTextKey(i)] = reader.GetTextValue(i)
     return m
+
+def download_sample_data_files(path=None):
+    import requests
+    import sys
+    import hashlib
+    if path is None:
+        path = vcs.sample_data
+    samples = open(os.path.join(vcs.prefix,"share","vcs","sample_files.txt")).readlines()
+    for sample in samples:
+        good_md5,name = sample.split()
+        local_filename = os.path.join(path,name)
+        try:
+            os.makedirs(os.path.dirname(local_filename))
+        except Exception,err:
+            pass
+        attempts = 0
+        while attempts < 3:
+            md5 = hashlib.md5()
+            if os.path.exists(local_filename):
+                f=open(local_filename)
+                md5.update(f.read())
+                if md5.hexdigest()==good_md5:
+                    attempts = 5
+                    continue
+            print "Downloading:",name,"in",local_filename
+            r = requests.get("http://uvcdat.llnl.gov/cdat/sample_data/"+name,stream = True)
+            with open(local_filename, 'wb') as f:
+                for chunk in r.iter_content(chunk_size=1024): 
+                    if chunk: # filter local_filename keep-alive new chunks
+                        f.write(chunk)
+                        md5.update(chunk)
+            f.close()
+            if md5.hexdigest() == good_md5:
+                attempts = 5
+            else:
+                attempts+=1
+
+
+
+
-- 
GitLab


From 2247a41830f4971314644dddde2f3ffa3bc9c3a7 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 7 Jun 2016 07:50:22 -0700
Subject: [PATCH 137/191] working on flake8

---
 CMake/cdat_modules_extra/runtest.in | 2 +-
 testing/Thermo/CMakeLists.txt       | 4 ++--
 testing/vcs/CMakeLists.txt          | 4 ++--
 testing/xmgrace/CMakeLists.txt      | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMake/cdat_modules_extra/runtest.in b/CMake/cdat_modules_extra/runtest.in
index 4cd4b5fd7..1a470bbc8 100755
--- a/CMake/cdat_modules_extra/runtest.in
+++ b/CMake/cdat_modules_extra/runtest.in
@@ -4,4 +4,4 @@ export DYLD_FALLBACK_LIBRARY_PATH=`python -c "import sys,os;print os.path.join(s
 echo "Python:" `which python`
 # make sure data is downloaded
 python -c "import vcs;vcs.download_sample_data_files()"
-python $@
+$*
diff --git a/testing/Thermo/CMakeLists.txt b/testing/Thermo/CMakeLists.txt
index bae57cea1..c855dc953 100644
--- a/testing/Thermo/CMakeLists.txt
+++ b/testing/Thermo/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_test(flake8_Thermo
-  "${FLAKE8_EXECUTABLE}" "${cdat_SOURCE_DIR}/Packages/Thermo/Lib/"
+cdat_add_test(flake8_Thermo
+  flake8 "${cdat_SOURCE_DIR}/Packages/Thermo/Lib/"
   --show-source # Show context for detected errors
   --statistics  # Show summary of errors at end of output
   --max-line-length=120 # Reasonable line length
diff --git a/testing/vcs/CMakeLists.txt b/testing/vcs/CMakeLists.txt
index b1e6247e7..98a4f5fc2 100644
--- a/testing/vcs/CMakeLists.txt
+++ b/testing/vcs/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(BASELINE_DIR "${UVCDAT_GIT_TESTDATA_DIR}/baselines/vcs")
 
-add_test(flake8_vcs
-  "${FLAKE8_EXECUTABLE}" "${cdat_SOURCE_DIR}/Packages/vcs/vcs/"
+cdat_add_test(flake8_vcs
+  flake8 "${cdat_SOURCE_DIR}/Packages/vcs/vcs/"
   --show-source # Show context for detected errors
   --statistics  # Show summary of errors at end of output
   --max-line-length=120 # Reasonable line length
diff --git a/testing/xmgrace/CMakeLists.txt b/testing/xmgrace/CMakeLists.txt
index e1de5fd91..470aa056d 100644
--- a/testing/xmgrace/CMakeLists.txt
+++ b/testing/xmgrace/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_test(flake8_xmgrace
-  "${FLAKE8_EXECUTABLE}" "${cdat_SOURCE_DIR}/Packages/xmgrace/Lib/"
+cdat_add_test(flake8_xmgrace
+  flake8 "${cdat_SOURCE_DIR}/Packages/xmgrace/Lib/"
   --show-source # Show context for detected errors
   --statistics  # Show summary of errors at end of output
   --max-line-length=128 # Max line 128 not 80
-- 
GitLab


From cad058d3496ef5980193c9af7fe0301b9a780838 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 7 Jun 2016 08:04:53 -0700
Subject: [PATCH 138/191] flake8 passe again

---
 Packages/Thermo/Lib/thermo.py               |  2 +-
 Packages/vcs/vcs/utils.py                   | 28 +++++++++------------
 Packages/xmgrace/Lib/ValidationFunctions.py | 10 +++-----
 testing/vcs/CMakeLists.txt                  |  1 +
 4 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/Packages/Thermo/Lib/thermo.py b/Packages/Thermo/Lib/thermo.py
index c2d5ccc58..9f8cc6a93 100644
--- a/Packages/Thermo/Lib/thermo.py
+++ b/Packages/Thermo/Lib/thermo.py
@@ -4,9 +4,9 @@ import cdms2
 import genutil
 import unidata
 import vcs
+import numpy
 from vcs import VCS_validation_functions
 thermo_objects = []
-import numpy
 
 
 def Es(T, method=None):
diff --git a/Packages/vcs/vcs/utils.py b/Packages/vcs/vcs/utils.py
index 791ee41d2..1f0f8edad 100644
--- a/Packages/vcs/vcs/utils.py
+++ b/Packages/vcs/vcs/utils.py
@@ -1795,42 +1795,38 @@ def png_read_metadata(path):
         m[reader.GetTextKey(i)] = reader.GetTextValue(i)
     return m
 
+
 def download_sample_data_files(path=None):
     import requests
-    import sys
     import hashlib
     if path is None:
         path = vcs.sample_data
-    samples = open(os.path.join(vcs.prefix,"share","vcs","sample_files.txt")).readlines()
+    samples = open(os.path.join(vcs.prefix, "share", "vcs", "sample_files.txt")).readlines()
     for sample in samples:
-        good_md5,name = sample.split()
-        local_filename = os.path.join(path,name)
+        good_md5, name = sample.split()
+        local_filename = os.path.join(path, name)
         try:
             os.makedirs(os.path.dirname(local_filename))
-        except Exception,err:
+        except:
             pass
         attempts = 0
         while attempts < 3:
             md5 = hashlib.md5()
             if os.path.exists(local_filename):
-                f=open(local_filename)
+                f = open(local_filename)
                 md5.update(f.read())
-                if md5.hexdigest()==good_md5:
+                if md5.hexdigest() == good_md5:
                     attempts = 5
                     continue
-            print "Downloading:",name,"in",local_filename
-            r = requests.get("http://uvcdat.llnl.gov/cdat/sample_data/"+name,stream = True)
+            print "Downloading:", name, "in", local_filename
+            r = requests.get("http://uvcdat.llnl.gov/cdat/sample_data/" + name, stream=True)
             with open(local_filename, 'wb') as f:
-                for chunk in r.iter_content(chunk_size=1024): 
-                    if chunk: # filter local_filename keep-alive new chunks
+                for chunk in r.iter_content(chunk_size=1024):
+                    if chunk:  # filter local_filename keep-alive new chunks
                         f.write(chunk)
                         md5.update(chunk)
             f.close()
             if md5.hexdigest() == good_md5:
                 attempts = 5
             else:
-                attempts+=1
-
-
-
-
+                attempts += 1
diff --git a/Packages/xmgrace/Lib/ValidationFunctions.py b/Packages/xmgrace/Lib/ValidationFunctions.py
index b9325ba02..b2a68514c 100644
--- a/Packages/xmgrace/Lib/ValidationFunctions.py
+++ b/Packages/xmgrace/Lib/ValidationFunctions.py
@@ -74,8 +74,8 @@ def isNumber(value):
 def checkPositiveInt(self, name, value):
     if not isNumber(value):
         raise ValueError(name + ' must be an integer')
-    elif (not (isinstance(value, int) or isinstance(value, long))
-            and (not int(value) == value)):
+    elif (not (isinstance(value, int) or isinstance(value, long)) and
+            (not int(value) == value)):
         raise ValueError(name + ' must be an integer')
     elif value < 0:
         raise ValueError(name + ' must be positve')
@@ -172,8 +172,7 @@ def checkSide(self, name, value):
 def checkLoc(self, name, value):
     """ check the loc (auto) or a location """
     if not (
-        (isinstance(value, str) and value.lower() == 'auto')
-        or
+        (isinstance(value, str) and value.lower() == 'auto') or
         isListorTuple(value)
     ):
         raise ValueError(name + 'must be a "auto" or a tuple/list')
@@ -296,8 +295,7 @@ def checkFormat(self, name, value):
 def checkAuto(self, name, value):
     """ check for 'auto' or a value """
     if not (
-        (isinstance(value, str) and value.lower() == 'auto')
-        or
+        (isinstance(value, str) and value.lower() == 'auto') or
         isNumber(value)
     ):
         raise ValueError(name + 'must be a "auto" or a number')
diff --git a/testing/vcs/CMakeLists.txt b/testing/vcs/CMakeLists.txt
index 98a4f5fc2..83042128b 100644
--- a/testing/vcs/CMakeLists.txt
+++ b/testing/vcs/CMakeLists.txt
@@ -5,6 +5,7 @@ cdat_add_test(flake8_vcs
   --show-source # Show context for detected errors
   --statistics  # Show summary of errors at end of output
   --max-line-length=120 # Reasonable line length
+  --ignore=F999,E121,E123,E126,E226,E24,E704 # recent version show zillions of errors if object come from an import * line
 )
 
 cdat_add_test(test_vcs_bad_png_path
-- 
GitLab


From 3aa5426d6d7b4caf365aecca4ba6dd34223ca90e Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 7 Jun 2016 08:21:30 -0700
Subject: [PATCH 139/191] added code to automatically update the baselines

---
 CMake/cdat_modules_extra/runtest.in |    1 +
 Packages/testing/regression.py      |    8 +-
 testing/vcs/CMakeLists.txt          | 1007 +++++++++++++--------------
 3 files changed, 511 insertions(+), 505 deletions(-)

diff --git a/CMake/cdat_modules_extra/runtest.in b/CMake/cdat_modules_extra/runtest.in
index 1a470bbc8..194632e5d 100755
--- a/CMake/cdat_modules_extra/runtest.in
+++ b/CMake/cdat_modules_extra/runtest.in
@@ -4,4 +4,5 @@ export DYLD_FALLBACK_LIBRARY_PATH=`python -c "import sys,os;print os.path.join(s
 echo "Python:" `which python`
 # make sure data is downloaded
 python -c "import vcs;vcs.download_sample_data_files()"
+echo "Running:"$*
 $*
diff --git a/Packages/testing/regression.py b/Packages/testing/regression.py
index 6b1b2bf9b..72047380e 100644
--- a/Packages/testing/regression.py
+++ b/Packages/testing/regression.py
@@ -83,7 +83,7 @@ def find_alternates(fname):
     return results
 
 def check_result_image(fname, baselinefname=sys.argv[1], threshold=defaultThreshold,
-                       baseline=True, cleanup=True):
+                       baseline=True, cleanup=True, update_baselines = False):
     testImage = image_from_file(fname)
     if testImage is None:
         print "Testing image missing, test failed."
@@ -133,6 +133,12 @@ def check_result_image(fname, baselinefname=sys.argv[1], threshold=defaultThresh
 
     print "All baselines failed! Lowest error (%f) exceeds threshold (%f)."%(bestDiff, threshold)
 
+    if update_baselines:
+        print "Update baselines is ON so we are assuming you know what you're doing"
+        print "Replacing baseline %s with new baseline from %s" % (bestFilename, fname)
+        import shutil
+        shutil.copy2(fname, bestFilename)
+
     sp = fname.split(".")
     diffFilename = ".".join(sp[:-1])+"_diff."+sp[-1]
     print "Saving image diff at '%s'."%diffFilename
diff --git a/testing/vcs/CMakeLists.txt b/testing/vcs/CMakeLists.txt
index 83042128b..ba48af6b3 100644
--- a/testing/vcs/CMakeLists.txt
+++ b/testing/vcs/CMakeLists.txt
@@ -1,4 +1,5 @@
 set(BASELINE_DIR "${UVCDAT_GIT_TESTDATA_DIR}/baselines/vcs")
+set(PYTHON_EXECUTABLE python)
 
 cdat_add_test(flake8_vcs
   flake8 "${cdat_SOURCE_DIR}/Packages/vcs/vcs/"
@@ -406,531 +407,529 @@ cdat_add_test(test_vcs_geometry
 # These tests perform plotting and need sample data
 #
 ##############################################################################
-if (CDAT_DOWNLOAD_SAMPLE_DATA)
-  FOREACH(gm boxfill isofill meshfill isoline vector)
-    FOREACH(src vcs canvas gm)
-      cdat_add_test(test_vcs_colormaps_source_${gm}_${src}
-        "${PYTHON_EXECUTABLE}"
-        ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_colormaps_source.py
-        -b ${BASELINE_DIR}/test_vcs_colormaps_source_${gm}_${src}.png
-        -g ${gm}
-        -s ${src}
-        )
-    ENDFOREACH()
-  ENDFOREACH()
-
-  # NOTE Fix baseline name
-  cdat_add_test(test_vcs_meshfill_regular_grid
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_meshfill_regular_grid.py
-    "${BASELINE_DIR}/test_vcs_meshfill_regular_grid.png"
-  )
-  # NOTE Fix baseline name
-  cdat_add_test(test_vcs_plot_unstructured_via_boxfill
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_plot_unstructured_via_boxfill.py
-    "${BASELINE_DIR}/test_vcs_plot_unstructured_via_boxfill.png"
-  )
-  # NOTE Fix baseline name
-  cdat_add_test(test_vcs_box_custom_as_def_vistrails_exts
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_box_custom_as_def_vistrails_exts.py
-    "${BASELINE_DIR}/test_vcs_box_custom_as_def_vistrails_exts.png"
-    )
-  # NOTE Fix baseline name
-  cdat_add_test(test_vcs_boxfill_custom
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_custom.py
-    "${BASELINE_DIR}/test_vcs_boxfill_custom.png"
-    )
-  cdat_add_test(test_vcs_boxfill_custom_non_default_levels
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_custom_non_default_levels.py
-    "${BASELINE_DIR}/test_vcs_boxfill_custom_non_default_levels.png"
-    )
-  cdat_add_test(test_vcs_boxfill_custom_ext1
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_custom_ext1.py
-    "${BASELINE_DIR}/test_vcs_boxfill_custom_ext1.png"
-    )
-  cdat_add_test(test_vcs_boxfill_custom_ext2
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_custom_ext2.py
-    "${BASELINE_DIR}/test_vcs_boxfill_custom_ext2.png"
-    )
-  cdat_add_test(test_vcs_boxfill_custom_ext1_ext2
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_custom_ext1_ext2.py
-    "${BASELINE_DIR}/test_vcs_boxfill_custom_ext1_ext2.png"
-    )
-  cdat_add_test(test_vcs_boxfill_number_color_less_than_number_levels
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_number_color_less_than_number_levels.py
-    )
-  cdat_add_test(test_vcs_boxfill_number_color_more_than_number_levels
+FOREACH(gm boxfill isofill meshfill isoline vector)
+FOREACH(src vcs canvas gm)
+  cdat_add_test(test_vcs_colormaps_source_${gm}_${src}
     "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_number_color_more_than_number_levels.py
-    )
-  cdat_add_test(test_vcs_user_passed_date
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_user_passed_date.py
-    "${BASELINE_DIR}/test_vcs_user_passed_date.png"
-    )
-  cdat_add_test(test_vcs_user_passed_date_as_string
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_user_passed_date_as_string.py
-    "${BASELINE_DIR}/test_vcs_user_passed_date_as_string.png"
-    )
-  cdat_add_test(test_vcs_auto_time_labels
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_auto_time_labels.py
-    "${BASELINE_DIR}/test_vcs_auto_time_labels.png"
-    )
-  cdat_add_test(test_vcs_isofill_data_read_north_to_south
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isofill_data_read_north_to_south.py
-    "${BASELINE_DIR}/test_vcs_isofill_data_read_north_to_south.png"
-    )
-  # Rename baseline
-  cdat_add_test(test_vcs_lon_axes_freak_out
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_lon_axes_freak_out.py
-    "${BASELINE_DIR}/test_vcs_lon_axes_freak_out.png"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_colormaps_source.py
+    -b ${BASELINE_DIR}/test_vcs_colormaps_source_${gm}_${src}.png
+    -g ${gm}
+    -s ${src}
     )
+ENDFOREACH()
+ENDFOREACH()
+
+# NOTE Fix baseline name
+cdat_add_test(test_vcs_meshfill_regular_grid
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_meshfill_regular_grid.py
+"${BASELINE_DIR}/test_vcs_meshfill_regular_grid.png"
+)
+# NOTE Fix baseline name
+cdat_add_test(test_vcs_plot_unstructured_via_boxfill
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_plot_unstructured_via_boxfill.py
+"${BASELINE_DIR}/test_vcs_plot_unstructured_via_boxfill.png"
+)
+# NOTE Fix baseline name
+cdat_add_test(test_vcs_box_custom_as_def_vistrails_exts
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_box_custom_as_def_vistrails_exts.py
+"${BASELINE_DIR}/test_vcs_box_custom_as_def_vistrails_exts.png"
+)
+# NOTE Fix baseline name
+cdat_add_test(test_vcs_boxfill_custom
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_custom.py
+"${BASELINE_DIR}/test_vcs_boxfill_custom.png"
+)
+cdat_add_test(test_vcs_boxfill_custom_non_default_levels
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_custom_non_default_levels.py
+"${BASELINE_DIR}/test_vcs_boxfill_custom_non_default_levels.png"
+)
+cdat_add_test(test_vcs_boxfill_custom_ext1
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_custom_ext1.py
+"${BASELINE_DIR}/test_vcs_boxfill_custom_ext1.png"
+)
+cdat_add_test(test_vcs_boxfill_custom_ext2
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_custom_ext2.py
+"${BASELINE_DIR}/test_vcs_boxfill_custom_ext2.png"
+)
+cdat_add_test(test_vcs_boxfill_custom_ext1_ext2
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_custom_ext1_ext2.py
+"${BASELINE_DIR}/test_vcs_boxfill_custom_ext1_ext2.png"
+)
+cdat_add_test(test_vcs_boxfill_number_color_less_than_number_levels
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_number_color_less_than_number_levels.py
+)
+cdat_add_test(test_vcs_boxfill_number_color_more_than_number_levels
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_number_color_more_than_number_levels.py
+)
+cdat_add_test(test_vcs_user_passed_date
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_user_passed_date.py
+"${BASELINE_DIR}/test_vcs_user_passed_date.png"
+)
+cdat_add_test(test_vcs_user_passed_date_as_string
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_user_passed_date_as_string.py
+"${BASELINE_DIR}/test_vcs_user_passed_date_as_string.png"
+)
+cdat_add_test(test_vcs_auto_time_labels
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_auto_time_labels.py
+"${BASELINE_DIR}/test_vcs_auto_time_labels.png"
+)
+cdat_add_test(test_vcs_isofill_data_read_north_to_south
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isofill_data_read_north_to_south.py
+"${BASELINE_DIR}/test_vcs_isofill_data_read_north_to_south.png"
+)
+# Rename baseline
+cdat_add_test(test_vcs_lon_axes_freak_out
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_lon_axes_freak_out.py
+"${BASELINE_DIR}/test_vcs_lon_axes_freak_out.png"
+)
 cdat_add_test(test_vcs_set_colors_name_rgba_1d
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba_1d.py
-    "${BASELINE_DIR}/test_vcs_settings_color_name_rgba_1d.png"
-    )
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba_1d.py
+"${BASELINE_DIR}/test_vcs_settings_color_name_rgba_1d.png"
+)
 cdat_add_test(test_vcs_set_colors_name_rgba_isoline
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba_isoline.py
-    "${BASELINE_DIR}/test_vcs_settings_color_name_rgba_isoline.png"
-    )
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba_isoline.py
+"${BASELINE_DIR}/test_vcs_settings_color_name_rgba_isoline.png"
+)
 cdat_add_test(test_vcs_settings_color_name_rgba_meshfill
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba_meshfill.py
-    "${BASELINE_DIR}/test_vcs_settings_color_name_rgba_meshfill.png"
-    )
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba_meshfill.py
+"${BASELINE_DIR}/test_vcs_settings_color_name_rgba_meshfill.png"
+)
 cdat_add_test(test_vcs_settings_color_name_rgba_boxfill
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba_boxfill.py
-    "${BASELINE_DIR}/test_vcs_settings_color_name_rgba_boxfill.png"
-    )
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba_boxfill.py
+"${BASELINE_DIR}/test_vcs_settings_color_name_rgba_boxfill.png"
+)
 cdat_add_test(test_vcs_settings_color_name_rgba
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba.py
-    "${BASELINE_DIR}/test_vcs_settings_color_name_rgba_isofill.png"
-    )
-  cdat_add_test(test_vcs_isofill_mask_cell_shift
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isofill_mask_cell_shift.py
-    "${BASELINE_DIR}/test_vcs_isofill_mask_cell_shift.png"
-    )
-  cdat_add_test(test_vcs_bad_time_units
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_bad_time_units.py
-    )
-  cdat_add_test(test_vcs_plot_file_varible
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_plot_file_var.py
-    )
-  FOREACH(gm boxfill isofill meshfill)
-    FOREACH(ori horizontal vertical)
-      FOREACH(ext1 y n)
-        FOREACH(ext2 y n)
-          cdat_add_test(test_vcs_legend_${gm}_${ori}_ext1_${ext1}_ext2_${ext2}
-            "${PYTHON_EXECUTABLE}"
-            ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_legend.py
-            --gm_type=${gm}
-            --orientation=${ori}
-            --ext1=${ext1}
-            --ext2=${ext2}
-            "--source=${BASELINE_DIR}/test_vcs_legend_${gm}_${ori}_ext1_${ext1}_ext2_${ext2}.png"
-            )
-        ENDFOREACH(ext2)
-      ENDFOREACH(ext1)
-    ENDFOREACH(ori)
-  ENDFOREACH(gm)
-  FOREACH(gm boxfill isofill isoline vector meshfill yxvsx xvsy xyvsy 1d scatter)
-    cdat_add_test(test_vcs_basic_${gm}_transparent
-      "${PYTHON_EXECUTABLE}"
-      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-      --gm_type=${gm}
-      --transparent
-      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_transparent.png"
-      )
-    cdat_add_test(test_vcs_basic_${gm}_zero
-      "${PYTHON_EXECUTABLE}"
-      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-      --gm_type=${gm}
-      --zero
-      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_zero.png"
-      )
-    cdat_add_test(test_vcs_basic_${gm}
-      "${PYTHON_EXECUTABLE}"
-      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-      --gm_type=${gm}
-      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}.png"
-      )
-    cdat_add_test(test_vcs_basic_${gm}_masked
-      "${PYTHON_EXECUTABLE}"
-      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-      --gm_type=${gm}
-      --mask
-      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_masked.png"
-      )
-  ENDFOREACH(gm)
-  cdat_add_test(test_vcs_show
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_show.py
-    )
-  FOREACH(gm boxfill isofill isoline meshfill )
-   FOREACH(ptype 0 -3 aeqd)
-    cdat_add_test(test_vcs_basic_${gm}_masked_${ptype}_proj
-      "${PYTHON_EXECUTABLE}"
-      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-      --gm_type=${gm}
-      --mask
-      --projection=${ptype}
-      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_masked_${ptype}_proj.png"
-      )
-    cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_SH
-      "${PYTHON_EXECUTABLE}"
-      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-      --gm_type=${gm}
-      --projection=${ptype}
-      --lat1=-90
-      --lat2=0
-      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH.png"
-      )
-    cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_SH_-180_180
-      "${PYTHON_EXECUTABLE}"
-      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-      --gm_type=${gm}
-      --projection=${ptype}
-      --lat1=-90
-      --lat2=0
-      --lon1=-180
-      --lon2=180
-      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_-180_180.png"
-      )
-    cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_SH_0_360
-      "${PYTHON_EXECUTABLE}"
-      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-      --gm_type=${gm}
-      --projection=${ptype}
-      --lat1=-90
-      --lat2=0
-      --lon1=0
-      --lon2=360
-      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_0_360.png"
-      )
-    cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_NH
-      "${PYTHON_EXECUTABLE}"
-      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-      --gm_type=${gm}
-      --projection=${ptype}
-      --lat1=90
-      --lat2=0
-      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_NH.png"
-      )
-    cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_SH_gm
-      "${PYTHON_EXECUTABLE}"
-      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-      --gm_type=${gm}
-      --projection=${ptype}
-      --lat1=-90
-      --lat2=0
-      --range_via_gm
-      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_via_gm.png"
-      )
-    cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_SH_-180_180_gm
-      "${PYTHON_EXECUTABLE}"
-      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-      --gm_type=${gm}
-      --projection=${ptype}
-      --lat1=-90
-      --lat2=0
-      --lon1=-180
-      --lon2=180
-      --range_via_gm
-      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_-180_180_via_gm.png"
-      )
-    cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_SH_0_360_gm
-      "${PYTHON_EXECUTABLE}"
-      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-      --gm_type=${gm}
-      --projection=${ptype}
-      --lat1=-90
-      --lat2=0
-      --lon1=0
-      --lon2=360
-      --range_via_gm
-      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_0_360_via_gm.png"
-      )
-    cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_NH_gm
-      "${PYTHON_EXECUTABLE}"
-      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-      --gm_type=${gm}
-      --projection=${ptype}
-      --lat1=90
-      --lat2=0
-      --range_via_gm
-      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_NH_via_gm.png"
-      )
-    cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_NH_gm_flip
-      "${PYTHON_EXECUTABLE}"
-      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-      --gm_type=${gm}
-      --projection=${ptype}
-      --lat1=90
-      --lat2=0
-      --range_via_gm
-      --gm_flips_lat_range
-      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_gmflip_NH_via_gm.png"
-      )
-   ENDFOREACH(ptype)
-  ENDFOREACH(gm)
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba.py
+"${BASELINE_DIR}/test_vcs_settings_color_name_rgba_isofill.png"
+)
+cdat_add_test(test_vcs_isofill_mask_cell_shift
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isofill_mask_cell_shift.py
+"${BASELINE_DIR}/test_vcs_isofill_mask_cell_shift.png"
+)
+cdat_add_test(test_vcs_bad_time_units
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_bad_time_units.py
+)
+cdat_add_test(test_vcs_plot_file_varible
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_plot_file_var.py
+)
+FOREACH(gm boxfill isofill meshfill)
+FOREACH(ori horizontal vertical)
+  FOREACH(ext1 y n)
+    FOREACH(ext2 y n)
+      cdat_add_test(test_vcs_legend_${gm}_${ori}_ext1_${ext1}_ext2_${ext2}
+        "${PYTHON_EXECUTABLE}"
+        ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_legend.py
+        --gm_type=${gm}
+        --orientation=${ori}
+        --ext1=${ext1}
+        --ext2=${ext2}
+        "--source=${BASELINE_DIR}/test_vcs_legend_${gm}_${ori}_ext1_${ext1}_ext2_${ext2}.png"
+        )
+    ENDFOREACH(ext2)
+  ENDFOREACH(ext1)
+ENDFOREACH(ori)
+ENDFOREACH(gm)
+FOREACH(gm boxfill isofill isoline vector meshfill yxvsx xvsy xyvsy 1d scatter)
+cdat_add_test(test_vcs_basic_${gm}_transparent
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+  --gm_type=${gm}
+  --transparent
+  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_transparent.png"
+  )
+cdat_add_test(test_vcs_basic_${gm}_zero
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+  --gm_type=${gm}
+  --zero
+  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_zero.png"
+  )
+cdat_add_test(test_vcs_basic_${gm}
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+  --gm_type=${gm}
+  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}.png"
+  )
+cdat_add_test(test_vcs_basic_${gm}_masked
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+  --gm_type=${gm}
+  --mask
+  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_masked.png"
+  )
+ENDFOREACH(gm)
+cdat_add_test(test_vcs_show
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_show.py
+)
+FOREACH(gm boxfill isofill isoline meshfill )
+FOREACH(ptype 0 -3 aeqd)
+cdat_add_test(test_vcs_basic_${gm}_masked_${ptype}_proj
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+  --gm_type=${gm}
+  --mask
+  --projection=${ptype}
+  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_masked_${ptype}_proj.png"
+  )
+cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_SH
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+  --gm_type=${gm}
+  --projection=${ptype}
+  --lat1=-90
+  --lat2=0
+  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH.png"
+  )
+cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_SH_-180_180
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+  --gm_type=${gm}
+  --projection=${ptype}
+  --lat1=-90
+  --lat2=0
+  --lon1=-180
+  --lon2=180
+  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_-180_180.png"
+  )
+cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_SH_0_360
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+  --gm_type=${gm}
+  --projection=${ptype}
+  --lat1=-90
+  --lat2=0
+  --lon1=0
+  --lon2=360
+  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_0_360.png"
+  )
+cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_NH
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+  --gm_type=${gm}
+  --projection=${ptype}
+  --lat1=90
+  --lat2=0
+  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_NH.png"
+  )
+cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_SH_gm
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+  --gm_type=${gm}
+  --projection=${ptype}
+  --lat1=-90
+  --lat2=0
+  --range_via_gm
+  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_via_gm.png"
+  )
+cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_SH_-180_180_gm
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+  --gm_type=${gm}
+  --projection=${ptype}
+  --lat1=-90
+  --lat2=0
+  --lon1=-180
+  --lon2=180
+  --range_via_gm
+  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_-180_180_via_gm.png"
+  )
+cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_SH_0_360_gm
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+  --gm_type=${gm}
+  --projection=${ptype}
+  --lat1=-90
+  --lat2=0
+  --lon1=0
+  --lon2=360
+  --range_via_gm
+  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_0_360_via_gm.png"
+  )
+cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_NH_gm
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+  --gm_type=${gm}
+  --projection=${ptype}
+  --lat1=90
+  --lat2=0
+  --range_via_gm
+  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_NH_via_gm.png"
+  )
+cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_NH_gm_flip
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+  --gm_type=${gm}
+  --projection=${ptype}
+  --lat1=90
+  --lat2=0
+  --range_via_gm
+  --gm_flips_lat_range
+  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_gmflip_NH_via_gm.png"
+  )
+ENDFOREACH(ptype)
+ENDFOREACH(gm)
 
-  cdat_add_test(test_vcs_isoline_numpy
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_numpy.py
-    ${BASELINE_DIR}/test_vcs_isoline_numpy.png
-    )
-  # Rename baseline
-  cdat_add_test(test_vcs_meshfill_draw_mesh
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_meshfill_draw_mesh.py
-    ${BASELINE_DIR}/test_vcs_meshfill_draw_mesh.png
-    )
-  # @dlonie is looking into why RH6 fails for these
-  # Rename baselines
-  if (NOT EXISTS /etc/redhat-release)
-    cdat_add_test(test_vcs_isoline_labels_multi_label_input_types
-      "${PYTHON_EXECUTABLE}"
-      "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_labels_multi_label_input_types.py"
-      "${BASELINE_DIR}/test_vcs_isoline_labels_multi_label_input_types.png"
-      )
-    cdat_add_test(test_vcs_isoline_labels
-      "${PYTHON_EXECUTABLE}"
-      "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_labels.py"
-      "${BASELINE_DIR}/test_vcs_isoline_labels.png"
-      )
-    cdat_add_test(test_vcs_isoline_labelskipdistance
-      "${PYTHON_EXECUTABLE}"
-      "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_labelskipdistance.py"
-      "${BASELINE_DIR}/test_vcs_isoline_labelskipdistance.png"
-      )
-    cdat_add_test(test_vcs_isofill_isoline_labels
-      "${PYTHON_EXECUTABLE}"
-      "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isofill_isoline_labels.py"
-      "${BASELINE_DIR}/test_vcs_isofill_isoline_labels.png"
-      )
-    # Rename baseline
-    cdat_add_test(test_vcs_isoline_width_stipple
-      "${PYTHON_EXECUTABLE}"
-      "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_width_stipple.py"
-      "${BASELINE_DIR}/test_vcs_isoline_width_stipple.png"
-      )
-    cdat_add_test(test_vcs_isoline_labels_background
-      "${PYTHON_EXECUTABLE}"
-      "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_labels_background.py"
-      "${BASELINE_DIR}/test_vcs_isoline_labels_background.png"
-      )
-  endif()
-  cdat_add_test(test_vcs_oned_level_axis
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_oned_level_axis.py
-    "${BASELINE_DIR}/test_vcs_oned_level_axis.png"
-    )
-  cdat_add_test(test_vcs_first_png_blank
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_first_png_blank.py
-    "${BASELINE_DIR}/first_png_blank.png"
-    )
-  #    cdat_add_test(test_vcs_aspect_ratio
-  #  "${PYTHON_EXECUTABLE}"
-  #  ${cdat_SOURCE_DIR}/testing/vcs/test_aspect_ratio.py
-  #  ${cdat_SOURCE_DIR}/testing/vcs/test_aspect_ratio.py
-  #  )
-  cdat_add_test(test_vcs_polar_set_opt_param_polar
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_polar_set_opt_param_polar.py
-    "${BASELINE_DIR}/test_vcs_polar_set_opt_param_polar.png"
-    )
-  cdat_add_test(test_vcs_boxfill_lev1_lev2
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_lev1_lev2.py
-    "${BASELINE_DIR}/test_vcs_boxfill_lev1_lev2.png"
-    )
-  cdat_add_test(test_vcs_boxfill_lev1_lev2_ext1
+cdat_add_test(test_vcs_isoline_numpy
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_numpy.py
+${BASELINE_DIR}/test_vcs_isoline_numpy.png
+)
+# Rename baseline
+cdat_add_test(test_vcs_meshfill_draw_mesh
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_meshfill_draw_mesh.py
+${BASELINE_DIR}/test_vcs_meshfill_draw_mesh.png
+)
+# @dlonie is looking into why RH6 fails for these
+# Rename baselines
+if (NOT EXISTS /etc/redhat-release)
+cdat_add_test(test_vcs_isoline_labels_multi_label_input_types
+  "${PYTHON_EXECUTABLE}"
+  "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_labels_multi_label_input_types.py"
+  "${BASELINE_DIR}/test_vcs_isoline_labels_multi_label_input_types.png"
+  )
+cdat_add_test(test_vcs_isoline_labels
+  "${PYTHON_EXECUTABLE}"
+  "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_labels.py"
+  "${BASELINE_DIR}/test_vcs_isoline_labels.png"
+  )
+cdat_add_test(test_vcs_isoline_labelskipdistance
+  "${PYTHON_EXECUTABLE}"
+  "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_labelskipdistance.py"
+  "${BASELINE_DIR}/test_vcs_isoline_labelskipdistance.png"
+  )
+cdat_add_test(test_vcs_isofill_isoline_labels
+  "${PYTHON_EXECUTABLE}"
+  "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isofill_isoline_labels.py"
+  "${BASELINE_DIR}/test_vcs_isofill_isoline_labels.png"
+  )
+# Rename baseline
+cdat_add_test(test_vcs_isoline_width_stipple
+  "${PYTHON_EXECUTABLE}"
+  "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_width_stipple.py"
+  "${BASELINE_DIR}/test_vcs_isoline_width_stipple.png"
+  )
+cdat_add_test(test_vcs_isoline_labels_background
+  "${PYTHON_EXECUTABLE}"
+  "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_labels_background.py"
+  "${BASELINE_DIR}/test_vcs_isoline_labels_background.png"
+  )
+endif()
+cdat_add_test(test_vcs_oned_level_axis
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_oned_level_axis.py
+"${BASELINE_DIR}/test_vcs_oned_level_axis.png"
+)
+cdat_add_test(test_vcs_first_png_blank
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_first_png_blank.py
+"${BASELINE_DIR}/first_png_blank.png"
+)
+#    cdat_add_test(test_vcs_aspect_ratio
+#  "${PYTHON_EXECUTABLE}"
+#  ${cdat_SOURCE_DIR}/testing/vcs/test_aspect_ratio.py
+#  ${cdat_SOURCE_DIR}/testing/vcs/test_aspect_ratio.py
+#  )
+cdat_add_test(test_vcs_polar_set_opt_param_polar
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_polar_set_opt_param_polar.py
+"${BASELINE_DIR}/test_vcs_polar_set_opt_param_polar.png"
+)
+cdat_add_test(test_vcs_boxfill_lev1_lev2
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_lev1_lev2.py
+"${BASELINE_DIR}/test_vcs_boxfill_lev1_lev2.png"
+)
+cdat_add_test(test_vcs_boxfill_lev1_lev2_ext1
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_lev1_lev2_ext1.py
+"${BASELINE_DIR}/test_vcs_boxfill_lev1_lev2_ext1.png"
+)
+cdat_add_test(test_vcs_boxfill_lev1_lev2_ext2
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_lev1_lev2_ext2.py
+"${BASELINE_DIR}/test_vcs_boxfill_lev1_lev2_ext2.png"
+)
+cdat_add_test(test_vcs_boxfill_lev1_lev2_ext1_ext2
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_lev1_lev2_ext1_ext2.py
+"${BASELINE_DIR}/test_vcs_boxfill_lev1_lev2_ext1_ext2.png"
+)
+
+cdat_add_test(test_vcs_hatches_patterns
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_hatches_patterns.py
+"${BASELINE_DIR}/test_vcs_hatches_patterns.png"
+)
+FOREACH(gm isofill boxfill meshfill)
+FOREACH(style solid pattern hatch)
+  cdat_add_test(test_vcs_${gm}_${style}_fill_non-contig
     "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_lev1_lev2_ext1.py
-    "${BASELINE_DIR}/test_vcs_boxfill_lev1_lev2_ext1.png"
+    "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_gms_patterns_hatches.py"
+    --gm_type=${gm}
+    --fill_style=${style}
+    --non-contiguous
+    "--source=${BASELINE_DIR}/test_vcs_${gm}_${style}_SH_-180_180_non-contig.png"
+    "--threshold=45"
     )
-  cdat_add_test(test_vcs_boxfill_lev1_lev2_ext2
+  cdat_add_test(test_vcs_${gm}_${style}_fill
     "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_lev1_lev2_ext2.py
-    "${BASELINE_DIR}/test_vcs_boxfill_lev1_lev2_ext2.png"
+    "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_gms_patterns_hatches.py"
+    --gm_type=${gm}
+    --fill_style=${style}
+    "--source=${BASELINE_DIR}/test_vcs_${gm}_${style}_SH_-180_180.png"
+    "--threshold=45"
     )
-  cdat_add_test(test_vcs_boxfill_lev1_lev2_ext1_ext2
+  cdat_add_test(test_vcs_${gm}_${style}_fill_0_360
     "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_lev1_lev2_ext1_ext2.py
-    "${BASELINE_DIR}/test_vcs_boxfill_lev1_lev2_ext1_ext2.png"
+    "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_gms_patterns_hatches.py"
+    --gm_type=${gm}
+    --fill_style=${style}
+    --lon1=0
+    --lon2=360
+    "--source=${BASELINE_DIR}/test_vcs_${gm}_${style}_SH_0_360.png"
+    "--threshold=45"
     )
+ENDFOREACH(style)
+ENDFOREACH(gm)
 
-  cdat_add_test(test_vcs_hatches_patterns
+FOREACH(gm isofill meshfill boxfill)
+FOREACH(proj robinson)
+  cdat_add_test(test_vcs_animate_projected_${gm}_${proj}
     "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_hatches_patterns.py
-    "${BASELINE_DIR}/test_vcs_hatches_patterns.png"
+    "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_gms_animate_projected_plots.py"
+    --gm_type=${gm}
+    --projection_type=${proj}
+    --source=${BASELINE_DIR}/test_vcs_animate_projected_${gm}_${proj}.png
+    --threshold=40
     )
-  FOREACH(gm isofill boxfill meshfill)
-    FOREACH(style solid pattern hatch)
-      cdat_add_test(test_vcs_${gm}_${style}_fill_non-contig
-        "${PYTHON_EXECUTABLE}"
-        "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_gms_patterns_hatches.py"
-        --gm_type=${gm}
-        --fill_style=${style}
-        --non-contiguous
-        "--source=${BASELINE_DIR}/test_vcs_${gm}_${style}_SH_-180_180_non-contig.png"
-        "--threshold=45"
-        )
-      cdat_add_test(test_vcs_${gm}_${style}_fill
-        "${PYTHON_EXECUTABLE}"
-        "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_gms_patterns_hatches.py"
-        --gm_type=${gm}
-        --fill_style=${style}
-        "--source=${BASELINE_DIR}/test_vcs_${gm}_${style}_SH_-180_180.png"
-        "--threshold=45"
-        )
-      cdat_add_test(test_vcs_${gm}_${style}_fill_0_360
-        "${PYTHON_EXECUTABLE}"
-        "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_gms_patterns_hatches.py"
-        --gm_type=${gm}
-        --fill_style=${style}
-        --lon1=0
-        --lon2=360
-        "--source=${BASELINE_DIR}/test_vcs_${gm}_${style}_SH_0_360.png"
-        "--threshold=45"
-        )
-    ENDFOREACH(style)
-  ENDFOREACH(gm)
+ENDFOREACH(proj)
+ENDFOREACH(gm)
 
-  FOREACH(gm isofill meshfill boxfill)
-    FOREACH(proj robinson)
-      cdat_add_test(test_vcs_animate_projected_${gm}_${proj}
-        "${PYTHON_EXECUTABLE}"
-        "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_gms_animate_projected_plots.py"
-        --gm_type=${gm}
-        --projection_type=${proj}
-        --source=${BASELINE_DIR}/test_vcs_animate_projected_${gm}_${proj}.png
-        --threshold=40
-        )
-    ENDFOREACH(proj)
-  ENDFOREACH(gm)
-
-  FOREACH(flip None X XY Y)
-    cdat_add_test(test_vcs_flip${flip}
-      "${PYTHON_EXECUTABLE}"
-      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_flip${flip}.py
-      "${BASELINE_DIR}/test_vcs_flip${flip}.png"
-      )
-  ENDFOREACH(flip)
+FOREACH(flip None X XY Y)
+cdat_add_test(test_vcs_flip${flip}
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_flip${flip}.py
+  "${BASELINE_DIR}/test_vcs_flip${flip}.png"
+  )
+ENDFOREACH(flip)
 
-  cdat_add_test(test_vcs_lambert
-     "${PYTHON_EXECUTABLE}"
-     ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_lambert.py
-     "${BASELINE_DIR}/test_vcs_lambert.png"
-    )
-  # Rename baseline
-  cdat_add_test(test_vcs_boxfill_lev1_lev2_ta_missing
-     "${PYTHON_EXECUTABLE}"
-     ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_lev1_lev2_ta_missing.py
-     "${BASELINE_DIR}/test_vcs_boxfill_lev1_lev2_ta_missing.png"
-    )
+cdat_add_test(test_vcs_lambert
+ "${PYTHON_EXECUTABLE}"
+ ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_lambert.py
+ "${BASELINE_DIR}/test_vcs_lambert.png"
+)
+# Rename baseline
+cdat_add_test(test_vcs_boxfill_lev1_lev2_ta_missing
+ "${PYTHON_EXECUTABLE}"
+ ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_lev1_lev2_ta_missing.py
+ "${BASELINE_DIR}/test_vcs_boxfill_lev1_lev2_ta_missing.png"
+)
 
-  cdat_add_test(test_vcs_close
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_close.py
-    "${BASELINE_DIR}/test_vcs_close.png"
-    )
+cdat_add_test(test_vcs_close
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_close.py
+"${BASELINE_DIR}/test_vcs_close.png"
+)
 
-  cdat_add_test(test_vcs_basic_isofill_bigvalues
-    "${PYTHON_EXECUTABLE}"
-    "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py"
-    --gm_type=isofill
-    --bigvalues
-    "--source=${BASELINE_DIR}/test_vcs_basic_isofill_bigvalues.png"
-    )
-  cdat_add_test(test_vcs_issue_960_labels
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_issue_960_labels.py
-    ${BASELINE_DIR}/test_vcs_issue_960_labels_1.png
-    ${BASELINE_DIR}/test_vcs_issue_960_labels_2.png
-    )
-  cdat_add_test(test_vcs_animate_meshfill
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_meshfill.py
-    ${BASELINE_DIR}
-    )
-  cdat_add_test(test_vcs_animate_isofill
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_isofill.py
-    ${BASELINE_DIR}
-    )
-  cdat_add_test(test_vcs_animate_boxfill
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_boxfill.py
-    ${BASELINE_DIR}
-    )
-  cdat_add_test(test_vcs_animate_isoline
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_isoline.py
-    ${BASELINE_DIR}
-    )
-  cdat_add_test(test_vcs_animate_isoline_colored
-    "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_isoline_colored.py
-    ${BASELINE_DIR}
-    )
-  if ( (NOT EXISTS /etc/redhat-release) AND (NOT CDAT_BUILD_OFFSCREEN))
-    cdat_add_test(test_vcs_animate_isoline_text_labels
-      "${PYTHON_EXECUTABLE}"
-      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_isoline_text_labels.py
-      ${BASELINE_DIR}
-      )
-    cdat_add_test(test_vcs_animate_isoline_text_labels_colored
-      "${PYTHON_EXECUTABLE}"
-      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_isoline_text_labels_colored.py
-      ${BASELINE_DIR}
-      )
-    cdat_add_test(test_vcs_patterns
-      "${PYTHON_EXECUTABLE}"
-      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_patterns.py
-      "${BASELINE_DIR}/test_vcs_patterns.png"
-      )
-    cdat_add_test(test_vcs_vectors_robinson
-      "${PYTHON_EXECUTABLE}"
-      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_vectors_robinson.py
-      "${BASELINE_DIR}/test_vcs_vectors_robinson.png"
-      )
-    cdat_add_test(test_vcs_vectors_robinson_wrap
-      "${PYTHON_EXECUTABLE}"
-      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_vectors_robinson_wrap.py
-      "${BASELINE_DIR}/test_vcs_vectors_robinson_wrap.png"
-      )
-    cdat_add_test(test_vcs_vectors_scale_options
-      "${PYTHON_EXECUTABLE}"
-      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_vectors_scale_options.py
-      "${BASELINE_DIR}/test_vcs_vectors_scale_options_off.png"
-      "${BASELINE_DIR}/test_vcs_vectors_scale_options_constant.png"
-      "${BASELINE_DIR}/test_vcs_vectors_scale_options_linear.png"
-      "${BASELINE_DIR}/test_vcs_vectors_scale_options_normalize.png"
-      "${BASELINE_DIR}/test_vcs_vectors_scale_options_constantNLinear.png"
-      "${BASELINE_DIR}/test_vcs_vectors_scale_options_constantNNormalize.png"
-      )
-  endif()
+cdat_add_test(test_vcs_basic_isofill_bigvalues
+"${PYTHON_EXECUTABLE}"
+"${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py"
+--gm_type=isofill
+--bigvalues
+"--source=${BASELINE_DIR}/test_vcs_basic_isofill_bigvalues.png"
+)
+cdat_add_test(test_vcs_issue_960_labels
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_issue_960_labels.py
+${BASELINE_DIR}/test_vcs_issue_960_labels_1.png
+${BASELINE_DIR}/test_vcs_issue_960_labels_2.png
+)
+cdat_add_test(test_vcs_animate_meshfill
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_meshfill.py
+${BASELINE_DIR}
+)
+cdat_add_test(test_vcs_animate_isofill
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_isofill.py
+${BASELINE_DIR}
+)
+cdat_add_test(test_vcs_animate_boxfill
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_boxfill.py
+${BASELINE_DIR}
+)
+cdat_add_test(test_vcs_animate_isoline
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_isoline.py
+${BASELINE_DIR}
+)
+cdat_add_test(test_vcs_animate_isoline_colored
+"${PYTHON_EXECUTABLE}"
+${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_isoline_colored.py
+${BASELINE_DIR}
+)
+if ( (NOT EXISTS /etc/redhat-release) AND (NOT CDAT_BUILD_OFFSCREEN))
+cdat_add_test(test_vcs_animate_isoline_text_labels
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_isoline_text_labels.py
+  ${BASELINE_DIR}
+  )
+cdat_add_test(test_vcs_animate_isoline_text_labels_colored
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_isoline_text_labels_colored.py
+  ${BASELINE_DIR}
+  )
+cdat_add_test(test_vcs_patterns
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_patterns.py
+  "${BASELINE_DIR}/test_vcs_patterns.png"
+  )
+cdat_add_test(test_vcs_vectors_robinson
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_vectors_robinson.py
+  "${BASELINE_DIR}/test_vcs_vectors_robinson.png"
+  )
+cdat_add_test(test_vcs_vectors_robinson_wrap
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_vectors_robinson_wrap.py
+  "${BASELINE_DIR}/test_vcs_vectors_robinson_wrap.png"
+  )
+cdat_add_test(test_vcs_vectors_scale_options
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_vectors_scale_options.py
+  "${BASELINE_DIR}/test_vcs_vectors_scale_options_off.png"
+  "${BASELINE_DIR}/test_vcs_vectors_scale_options_constant.png"
+  "${BASELINE_DIR}/test_vcs_vectors_scale_options_linear.png"
+  "${BASELINE_DIR}/test_vcs_vectors_scale_options_normalize.png"
+  "${BASELINE_DIR}/test_vcs_vectors_scale_options_constantNLinear.png"
+  "${BASELINE_DIR}/test_vcs_vectors_scale_options_constantNNormalize.png"
+  )
 endif()
 
 cdat_add_test(test_vcs_endconfigure
-- 
GitLab


From d7cc903cfca55568620a7006196ca3ec8ba9dfd7 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 7 Jun 2016 09:13:19 -0700
Subject: [PATCH 140/191] do not remove test for SAMPLE_DATA makes impossible
 to merge master back in

---
 testing/vcs/CMakeLists.txt | 1007 ++++++++++++++++++------------------
 1 file changed, 505 insertions(+), 502 deletions(-)

diff --git a/testing/vcs/CMakeLists.txt b/testing/vcs/CMakeLists.txt
index ba48af6b3..12c191412 100644
--- a/testing/vcs/CMakeLists.txt
+++ b/testing/vcs/CMakeLists.txt
@@ -1,5 +1,6 @@
 set(BASELINE_DIR "${UVCDAT_GIT_TESTDATA_DIR}/baselines/vcs")
 set(PYTHON_EXECUTABLE python)
+set(CDAT_DOWNLOAD_SAMPLE_DATA ON)
 
 cdat_add_test(flake8_vcs
   flake8 "${cdat_SOURCE_DIR}/Packages/vcs/vcs/"
@@ -407,529 +408,531 @@ cdat_add_test(test_vcs_geometry
 # These tests perform plotting and need sample data
 #
 ##############################################################################
-FOREACH(gm boxfill isofill meshfill isoline vector)
-FOREACH(src vcs canvas gm)
-  cdat_add_test(test_vcs_colormaps_source_${gm}_${src}
+if (CDAT_DOWNLOAD_SAMPLE_DATA)
+  FOREACH(gm boxfill isofill meshfill isoline vector)
+    FOREACH(src vcs canvas gm)
+      cdat_add_test(test_vcs_colormaps_source_${gm}_${src}
+        "${PYTHON_EXECUTABLE}"
+        ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_colormaps_source.py
+        -b ${BASELINE_DIR}/test_vcs_colormaps_source_${gm}_${src}.png
+        -g ${gm}
+        -s ${src}
+        )
+    ENDFOREACH()
+  ENDFOREACH()
+
+  # NOTE Fix baseline name
+  cdat_add_test(test_vcs_meshfill_regular_grid
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_meshfill_regular_grid.py
+    "${BASELINE_DIR}/test_vcs_meshfill_regular_grid.png"
+  )
+  # NOTE Fix baseline name
+  cdat_add_test(test_vcs_plot_unstructured_via_boxfill
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_plot_unstructured_via_boxfill.py
+    "${BASELINE_DIR}/test_vcs_plot_unstructured_via_boxfill.png"
+  )
+  # NOTE Fix baseline name
+  cdat_add_test(test_vcs_box_custom_as_def_vistrails_exts
     "${PYTHON_EXECUTABLE}"
-    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_colormaps_source.py
-    -b ${BASELINE_DIR}/test_vcs_colormaps_source_${gm}_${src}.png
-    -g ${gm}
-    -s ${src}
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_box_custom_as_def_vistrails_exts.py
+    "${BASELINE_DIR}/test_vcs_box_custom_as_def_vistrails_exts.png"
+    )
+  # NOTE Fix baseline name
+  cdat_add_test(test_vcs_boxfill_custom
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_custom.py
+    "${BASELINE_DIR}/test_vcs_boxfill_custom.png"
+    )
+  cdat_add_test(test_vcs_boxfill_custom_non_default_levels
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_custom_non_default_levels.py
+    "${BASELINE_DIR}/test_vcs_boxfill_custom_non_default_levels.png"
+    )
+  cdat_add_test(test_vcs_boxfill_custom_ext1
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_custom_ext1.py
+    "${BASELINE_DIR}/test_vcs_boxfill_custom_ext1.png"
+    )
+  cdat_add_test(test_vcs_boxfill_custom_ext2
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_custom_ext2.py
+    "${BASELINE_DIR}/test_vcs_boxfill_custom_ext2.png"
+    )
+  cdat_add_test(test_vcs_boxfill_custom_ext1_ext2
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_custom_ext1_ext2.py
+    "${BASELINE_DIR}/test_vcs_boxfill_custom_ext1_ext2.png"
+    )
+  cdat_add_test(test_vcs_boxfill_number_color_less_than_number_levels
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_number_color_less_than_number_levels.py
+    )
+  cdat_add_test(test_vcs_boxfill_number_color_more_than_number_levels
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_number_color_more_than_number_levels.py
+    )
+  cdat_add_test(test_vcs_user_passed_date
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_user_passed_date.py
+    "${BASELINE_DIR}/test_vcs_user_passed_date.png"
+    )
+  cdat_add_test(test_vcs_user_passed_date_as_string
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_user_passed_date_as_string.py
+    "${BASELINE_DIR}/test_vcs_user_passed_date_as_string.png"
+    )
+  cdat_add_test(test_vcs_auto_time_labels
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_auto_time_labels.py
+    "${BASELINE_DIR}/test_vcs_auto_time_labels.png"
+    )
+  cdat_add_test(test_vcs_isofill_data_read_north_to_south
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isofill_data_read_north_to_south.py
+    "${BASELINE_DIR}/test_vcs_isofill_data_read_north_to_south.png"
+    )
+  # Rename baseline
+  cdat_add_test(test_vcs_lon_axes_freak_out
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_lon_axes_freak_out.py
+    "${BASELINE_DIR}/test_vcs_lon_axes_freak_out.png"
     )
-ENDFOREACH()
-ENDFOREACH()
-
-# NOTE Fix baseline name
-cdat_add_test(test_vcs_meshfill_regular_grid
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_meshfill_regular_grid.py
-"${BASELINE_DIR}/test_vcs_meshfill_regular_grid.png"
-)
-# NOTE Fix baseline name
-cdat_add_test(test_vcs_plot_unstructured_via_boxfill
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_plot_unstructured_via_boxfill.py
-"${BASELINE_DIR}/test_vcs_plot_unstructured_via_boxfill.png"
-)
-# NOTE Fix baseline name
-cdat_add_test(test_vcs_box_custom_as_def_vistrails_exts
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_box_custom_as_def_vistrails_exts.py
-"${BASELINE_DIR}/test_vcs_box_custom_as_def_vistrails_exts.png"
-)
-# NOTE Fix baseline name
-cdat_add_test(test_vcs_boxfill_custom
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_custom.py
-"${BASELINE_DIR}/test_vcs_boxfill_custom.png"
-)
-cdat_add_test(test_vcs_boxfill_custom_non_default_levels
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_custom_non_default_levels.py
-"${BASELINE_DIR}/test_vcs_boxfill_custom_non_default_levels.png"
-)
-cdat_add_test(test_vcs_boxfill_custom_ext1
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_custom_ext1.py
-"${BASELINE_DIR}/test_vcs_boxfill_custom_ext1.png"
-)
-cdat_add_test(test_vcs_boxfill_custom_ext2
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_custom_ext2.py
-"${BASELINE_DIR}/test_vcs_boxfill_custom_ext2.png"
-)
-cdat_add_test(test_vcs_boxfill_custom_ext1_ext2
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_custom_ext1_ext2.py
-"${BASELINE_DIR}/test_vcs_boxfill_custom_ext1_ext2.png"
-)
-cdat_add_test(test_vcs_boxfill_number_color_less_than_number_levels
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_number_color_less_than_number_levels.py
-)
-cdat_add_test(test_vcs_boxfill_number_color_more_than_number_levels
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_number_color_more_than_number_levels.py
-)
-cdat_add_test(test_vcs_user_passed_date
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_user_passed_date.py
-"${BASELINE_DIR}/test_vcs_user_passed_date.png"
-)
-cdat_add_test(test_vcs_user_passed_date_as_string
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_user_passed_date_as_string.py
-"${BASELINE_DIR}/test_vcs_user_passed_date_as_string.png"
-)
-cdat_add_test(test_vcs_auto_time_labels
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_auto_time_labels.py
-"${BASELINE_DIR}/test_vcs_auto_time_labels.png"
-)
-cdat_add_test(test_vcs_isofill_data_read_north_to_south
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isofill_data_read_north_to_south.py
-"${BASELINE_DIR}/test_vcs_isofill_data_read_north_to_south.png"
-)
-# Rename baseline
-cdat_add_test(test_vcs_lon_axes_freak_out
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_lon_axes_freak_out.py
-"${BASELINE_DIR}/test_vcs_lon_axes_freak_out.png"
-)
 cdat_add_test(test_vcs_set_colors_name_rgba_1d
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba_1d.py
-"${BASELINE_DIR}/test_vcs_settings_color_name_rgba_1d.png"
-)
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba_1d.py
+    "${BASELINE_DIR}/test_vcs_settings_color_name_rgba_1d.png"
+    )
 cdat_add_test(test_vcs_set_colors_name_rgba_isoline
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba_isoline.py
-"${BASELINE_DIR}/test_vcs_settings_color_name_rgba_isoline.png"
-)
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba_isoline.py
+    "${BASELINE_DIR}/test_vcs_settings_color_name_rgba_isoline.png"
+    )
 cdat_add_test(test_vcs_settings_color_name_rgba_meshfill
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba_meshfill.py
-"${BASELINE_DIR}/test_vcs_settings_color_name_rgba_meshfill.png"
-)
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba_meshfill.py
+    "${BASELINE_DIR}/test_vcs_settings_color_name_rgba_meshfill.png"
+    )
 cdat_add_test(test_vcs_settings_color_name_rgba_boxfill
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba_boxfill.py
-"${BASELINE_DIR}/test_vcs_settings_color_name_rgba_boxfill.png"
-)
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba_boxfill.py
+    "${BASELINE_DIR}/test_vcs_settings_color_name_rgba_boxfill.png"
+    )
 cdat_add_test(test_vcs_settings_color_name_rgba
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba.py
-"${BASELINE_DIR}/test_vcs_settings_color_name_rgba_isofill.png"
-)
-cdat_add_test(test_vcs_isofill_mask_cell_shift
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isofill_mask_cell_shift.py
-"${BASELINE_DIR}/test_vcs_isofill_mask_cell_shift.png"
-)
-cdat_add_test(test_vcs_bad_time_units
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_bad_time_units.py
-)
-cdat_add_test(test_vcs_plot_file_varible
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_plot_file_var.py
-)
-FOREACH(gm boxfill isofill meshfill)
-FOREACH(ori horizontal vertical)
-  FOREACH(ext1 y n)
-    FOREACH(ext2 y n)
-      cdat_add_test(test_vcs_legend_${gm}_${ori}_ext1_${ext1}_ext2_${ext2}
-        "${PYTHON_EXECUTABLE}"
-        ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_legend.py
-        --gm_type=${gm}
-        --orientation=${ori}
-        --ext1=${ext1}
-        --ext2=${ext2}
-        "--source=${BASELINE_DIR}/test_vcs_legend_${gm}_${ori}_ext1_${ext1}_ext2_${ext2}.png"
-        )
-    ENDFOREACH(ext2)
-  ENDFOREACH(ext1)
-ENDFOREACH(ori)
-ENDFOREACH(gm)
-FOREACH(gm boxfill isofill isoline vector meshfill yxvsx xvsy xyvsy 1d scatter)
-cdat_add_test(test_vcs_basic_${gm}_transparent
-  "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-  --gm_type=${gm}
-  --transparent
-  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_transparent.png"
-  )
-cdat_add_test(test_vcs_basic_${gm}_zero
-  "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-  --gm_type=${gm}
-  --zero
-  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_zero.png"
-  )
-cdat_add_test(test_vcs_basic_${gm}
-  "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-  --gm_type=${gm}
-  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}.png"
-  )
-cdat_add_test(test_vcs_basic_${gm}_masked
-  "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-  --gm_type=${gm}
-  --mask
-  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_masked.png"
-  )
-ENDFOREACH(gm)
-cdat_add_test(test_vcs_show
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_show.py
-)
-FOREACH(gm boxfill isofill isoline meshfill )
-FOREACH(ptype 0 -3 aeqd)
-cdat_add_test(test_vcs_basic_${gm}_masked_${ptype}_proj
-  "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-  --gm_type=${gm}
-  --mask
-  --projection=${ptype}
-  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_masked_${ptype}_proj.png"
-  )
-cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_SH
-  "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-  --gm_type=${gm}
-  --projection=${ptype}
-  --lat1=-90
-  --lat2=0
-  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH.png"
-  )
-cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_SH_-180_180
-  "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-  --gm_type=${gm}
-  --projection=${ptype}
-  --lat1=-90
-  --lat2=0
-  --lon1=-180
-  --lon2=180
-  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_-180_180.png"
-  )
-cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_SH_0_360
-  "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-  --gm_type=${gm}
-  --projection=${ptype}
-  --lat1=-90
-  --lat2=0
-  --lon1=0
-  --lon2=360
-  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_0_360.png"
-  )
-cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_NH
-  "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-  --gm_type=${gm}
-  --projection=${ptype}
-  --lat1=90
-  --lat2=0
-  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_NH.png"
-  )
-cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_SH_gm
-  "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-  --gm_type=${gm}
-  --projection=${ptype}
-  --lat1=-90
-  --lat2=0
-  --range_via_gm
-  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_via_gm.png"
-  )
-cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_SH_-180_180_gm
-  "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-  --gm_type=${gm}
-  --projection=${ptype}
-  --lat1=-90
-  --lat2=0
-  --lon1=-180
-  --lon2=180
-  --range_via_gm
-  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_-180_180_via_gm.png"
-  )
-cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_SH_0_360_gm
-  "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-  --gm_type=${gm}
-  --projection=${ptype}
-  --lat1=-90
-  --lat2=0
-  --lon1=0
-  --lon2=360
-  --range_via_gm
-  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_0_360_via_gm.png"
-  )
-cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_NH_gm
-  "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-  --gm_type=${gm}
-  --projection=${ptype}
-  --lat1=90
-  --lat2=0
-  --range_via_gm
-  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_NH_via_gm.png"
-  )
-cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_NH_gm_flip
-  "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
-  --gm_type=${gm}
-  --projection=${ptype}
-  --lat1=90
-  --lat2=0
-  --range_via_gm
-  --gm_flips_lat_range
-  "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_gmflip_NH_via_gm.png"
-  )
-ENDFOREACH(ptype)
-ENDFOREACH(gm)
-
-cdat_add_test(test_vcs_isoline_numpy
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_numpy.py
-${BASELINE_DIR}/test_vcs_isoline_numpy.png
-)
-# Rename baseline
-cdat_add_test(test_vcs_meshfill_draw_mesh
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_meshfill_draw_mesh.py
-${BASELINE_DIR}/test_vcs_meshfill_draw_mesh.png
-)
-# @dlonie is looking into why RH6 fails for these
-# Rename baselines
-if (NOT EXISTS /etc/redhat-release)
-cdat_add_test(test_vcs_isoline_labels_multi_label_input_types
-  "${PYTHON_EXECUTABLE}"
-  "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_labels_multi_label_input_types.py"
-  "${BASELINE_DIR}/test_vcs_isoline_labels_multi_label_input_types.png"
-  )
-cdat_add_test(test_vcs_isoline_labels
-  "${PYTHON_EXECUTABLE}"
-  "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_labels.py"
-  "${BASELINE_DIR}/test_vcs_isoline_labels.png"
-  )
-cdat_add_test(test_vcs_isoline_labelskipdistance
-  "${PYTHON_EXECUTABLE}"
-  "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_labelskipdistance.py"
-  "${BASELINE_DIR}/test_vcs_isoline_labelskipdistance.png"
-  )
-cdat_add_test(test_vcs_isofill_isoline_labels
-  "${PYTHON_EXECUTABLE}"
-  "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isofill_isoline_labels.py"
-  "${BASELINE_DIR}/test_vcs_isofill_isoline_labels.png"
-  )
-# Rename baseline
-cdat_add_test(test_vcs_isoline_width_stipple
-  "${PYTHON_EXECUTABLE}"
-  "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_width_stipple.py"
-  "${BASELINE_DIR}/test_vcs_isoline_width_stipple.png"
-  )
-cdat_add_test(test_vcs_isoline_labels_background
-  "${PYTHON_EXECUTABLE}"
-  "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_labels_background.py"
-  "${BASELINE_DIR}/test_vcs_isoline_labels_background.png"
-  )
-endif()
-cdat_add_test(test_vcs_oned_level_axis
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_oned_level_axis.py
-"${BASELINE_DIR}/test_vcs_oned_level_axis.png"
-)
-cdat_add_test(test_vcs_first_png_blank
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_first_png_blank.py
-"${BASELINE_DIR}/first_png_blank.png"
-)
-#    cdat_add_test(test_vcs_aspect_ratio
-#  "${PYTHON_EXECUTABLE}"
-#  ${cdat_SOURCE_DIR}/testing/vcs/test_aspect_ratio.py
-#  ${cdat_SOURCE_DIR}/testing/vcs/test_aspect_ratio.py
-#  )
-cdat_add_test(test_vcs_polar_set_opt_param_polar
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_polar_set_opt_param_polar.py
-"${BASELINE_DIR}/test_vcs_polar_set_opt_param_polar.png"
-)
-cdat_add_test(test_vcs_boxfill_lev1_lev2
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_lev1_lev2.py
-"${BASELINE_DIR}/test_vcs_boxfill_lev1_lev2.png"
-)
-cdat_add_test(test_vcs_boxfill_lev1_lev2_ext1
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_lev1_lev2_ext1.py
-"${BASELINE_DIR}/test_vcs_boxfill_lev1_lev2_ext1.png"
-)
-cdat_add_test(test_vcs_boxfill_lev1_lev2_ext2
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_lev1_lev2_ext2.py
-"${BASELINE_DIR}/test_vcs_boxfill_lev1_lev2_ext2.png"
-)
-cdat_add_test(test_vcs_boxfill_lev1_lev2_ext1_ext2
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_lev1_lev2_ext1_ext2.py
-"${BASELINE_DIR}/test_vcs_boxfill_lev1_lev2_ext1_ext2.png"
-)
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba.py
+    "${BASELINE_DIR}/test_vcs_settings_color_name_rgba_isofill.png"
+    )
+  cdat_add_test(test_vcs_isofill_mask_cell_shift
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isofill_mask_cell_shift.py
+    "${BASELINE_DIR}/test_vcs_isofill_mask_cell_shift.png"
+    )
+  cdat_add_test(test_vcs_bad_time_units
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_bad_time_units.py
+    )
+  cdat_add_test(test_vcs_plot_file_varible
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_plot_file_var.py
+    )
+  FOREACH(gm boxfill isofill meshfill)
+    FOREACH(ori horizontal vertical)
+      FOREACH(ext1 y n)
+        FOREACH(ext2 y n)
+          cdat_add_test(test_vcs_legend_${gm}_${ori}_ext1_${ext1}_ext2_${ext2}
+            "${PYTHON_EXECUTABLE}"
+            ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_legend.py
+            --gm_type=${gm}
+            --orientation=${ori}
+            --ext1=${ext1}
+            --ext2=${ext2}
+            "--source=${BASELINE_DIR}/test_vcs_legend_${gm}_${ori}_ext1_${ext1}_ext2_${ext2}.png"
+            )
+        ENDFOREACH(ext2)
+      ENDFOREACH(ext1)
+    ENDFOREACH(ori)
+  ENDFOREACH(gm)
+  FOREACH(gm boxfill isofill isoline vector meshfill yxvsx xvsy xyvsy 1d scatter)
+    cdat_add_test(test_vcs_basic_${gm}_transparent
+      "${PYTHON_EXECUTABLE}"
+      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+      --gm_type=${gm}
+      --transparent
+      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_transparent.png"
+      )
+    cdat_add_test(test_vcs_basic_${gm}_zero
+      "${PYTHON_EXECUTABLE}"
+      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+      --gm_type=${gm}
+      --zero
+      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_zero.png"
+      )
+    cdat_add_test(test_vcs_basic_${gm}
+      "${PYTHON_EXECUTABLE}"
+      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+      --gm_type=${gm}
+      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}.png"
+      )
+    cdat_add_test(test_vcs_basic_${gm}_masked
+      "${PYTHON_EXECUTABLE}"
+      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+      --gm_type=${gm}
+      --mask
+      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_masked.png"
+      )
+  ENDFOREACH(gm)
+  cdat_add_test(test_vcs_show
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_show.py
+    )
+  FOREACH(gm boxfill isofill isoline meshfill )
+   FOREACH(ptype 0 -3 aeqd)
+    cdat_add_test(test_vcs_basic_${gm}_masked_${ptype}_proj
+      "${PYTHON_EXECUTABLE}"
+      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+      --gm_type=${gm}
+      --mask
+      --projection=${ptype}
+      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_masked_${ptype}_proj.png"
+      )
+    cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_SH
+      "${PYTHON_EXECUTABLE}"
+      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+      --gm_type=${gm}
+      --projection=${ptype}
+      --lat1=-90
+      --lat2=0
+      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH.png"
+      )
+    cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_SH_-180_180
+      "${PYTHON_EXECUTABLE}"
+      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+      --gm_type=${gm}
+      --projection=${ptype}
+      --lat1=-90
+      --lat2=0
+      --lon1=-180
+      --lon2=180
+      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_-180_180.png"
+      )
+    cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_SH_0_360
+      "${PYTHON_EXECUTABLE}"
+      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+      --gm_type=${gm}
+      --projection=${ptype}
+      --lat1=-90
+      --lat2=0
+      --lon1=0
+      --lon2=360
+      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_0_360.png"
+      )
+    cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_NH
+      "${PYTHON_EXECUTABLE}"
+      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+      --gm_type=${gm}
+      --projection=${ptype}
+      --lat1=90
+      --lat2=0
+      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_NH.png"
+      )
+    cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_SH_gm
+      "${PYTHON_EXECUTABLE}"
+      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+      --gm_type=${gm}
+      --projection=${ptype}
+      --lat1=-90
+      --lat2=0
+      --range_via_gm
+      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_via_gm.png"
+      )
+    cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_SH_-180_180_gm
+      "${PYTHON_EXECUTABLE}"
+      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+      --gm_type=${gm}
+      --projection=${ptype}
+      --lat1=-90
+      --lat2=0
+      --lon1=-180
+      --lon2=180
+      --range_via_gm
+      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_-180_180_via_gm.png"
+      )
+    cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_SH_0_360_gm
+      "${PYTHON_EXECUTABLE}"
+      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+      --gm_type=${gm}
+      --projection=${ptype}
+      --lat1=-90
+      --lat2=0
+      --lon1=0
+      --lon2=360
+      --range_via_gm
+      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_0_360_via_gm.png"
+      )
+    cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_NH_gm
+      "${PYTHON_EXECUTABLE}"
+      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+      --gm_type=${gm}
+      --projection=${ptype}
+      --lat1=90
+      --lat2=0
+      --range_via_gm
+      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_NH_via_gm.png"
+      )
+    cdat_add_test(test_vcs_basic_${gm}_${ptype}_proj_NH_gm_flip
+      "${PYTHON_EXECUTABLE}"
+      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py
+      --gm_type=${gm}
+      --projection=${ptype}
+      --lat1=90
+      --lat2=0
+      --range_via_gm
+      --gm_flips_lat_range
+      "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_gmflip_NH_via_gm.png"
+      )
+   ENDFOREACH(ptype)
+  ENDFOREACH(gm)
 
-cdat_add_test(test_vcs_hatches_patterns
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_hatches_patterns.py
-"${BASELINE_DIR}/test_vcs_hatches_patterns.png"
-)
-FOREACH(gm isofill boxfill meshfill)
-FOREACH(style solid pattern hatch)
-  cdat_add_test(test_vcs_${gm}_${style}_fill_non-contig
+  cdat_add_test(test_vcs_isoline_numpy
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_numpy.py
+    ${BASELINE_DIR}/test_vcs_isoline_numpy.png
+    )
+  # Rename baseline
+  cdat_add_test(test_vcs_meshfill_draw_mesh
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_meshfill_draw_mesh.py
+    ${BASELINE_DIR}/test_vcs_meshfill_draw_mesh.png
+    )
+  # @dlonie is looking into why RH6 fails for these
+  # Rename baselines
+  if (NOT EXISTS /etc/redhat-release)
+    cdat_add_test(test_vcs_isoline_labels_multi_label_input_types
+      "${PYTHON_EXECUTABLE}"
+      "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_labels_multi_label_input_types.py"
+      "${BASELINE_DIR}/test_vcs_isoline_labels_multi_label_input_types.png"
+      )
+    cdat_add_test(test_vcs_isoline_labels
+      "${PYTHON_EXECUTABLE}"
+      "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_labels.py"
+      "${BASELINE_DIR}/test_vcs_isoline_labels.png"
+      )
+    cdat_add_test(test_vcs_isoline_labelskipdistance
+      "${PYTHON_EXECUTABLE}"
+      "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_labelskipdistance.py"
+      "${BASELINE_DIR}/test_vcs_isoline_labelskipdistance.png"
+      )
+    cdat_add_test(test_vcs_isofill_isoline_labels
+      "${PYTHON_EXECUTABLE}"
+      "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isofill_isoline_labels.py"
+      "${BASELINE_DIR}/test_vcs_isofill_isoline_labels.png"
+      )
+    # Rename baseline
+    cdat_add_test(test_vcs_isoline_width_stipple
+      "${PYTHON_EXECUTABLE}"
+      "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_width_stipple.py"
+      "${BASELINE_DIR}/test_vcs_isoline_width_stipple.png"
+      )
+    cdat_add_test(test_vcs_isoline_labels_background
+      "${PYTHON_EXECUTABLE}"
+      "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_labels_background.py"
+      "${BASELINE_DIR}/test_vcs_isoline_labels_background.png"
+      )
+  endif()
+  cdat_add_test(test_vcs_oned_level_axis
     "${PYTHON_EXECUTABLE}"
-    "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_gms_patterns_hatches.py"
-    --gm_type=${gm}
-    --fill_style=${style}
-    --non-contiguous
-    "--source=${BASELINE_DIR}/test_vcs_${gm}_${style}_SH_-180_180_non-contig.png"
-    "--threshold=45"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_oned_level_axis.py
+    "${BASELINE_DIR}/test_vcs_oned_level_axis.png"
     )
-  cdat_add_test(test_vcs_${gm}_${style}_fill
+  cdat_add_test(test_vcs_first_png_blank
     "${PYTHON_EXECUTABLE}"
-    "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_gms_patterns_hatches.py"
-    --gm_type=${gm}
-    --fill_style=${style}
-    "--source=${BASELINE_DIR}/test_vcs_${gm}_${style}_SH_-180_180.png"
-    "--threshold=45"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_first_png_blank.py
+    "${BASELINE_DIR}/first_png_blank.png"
     )
-  cdat_add_test(test_vcs_${gm}_${style}_fill_0_360
+  #    cdat_add_test(test_vcs_aspect_ratio
+  #  "${PYTHON_EXECUTABLE}"
+  #  ${cdat_SOURCE_DIR}/testing/vcs/test_aspect_ratio.py
+  #  ${cdat_SOURCE_DIR}/testing/vcs/test_aspect_ratio.py
+  #  )
+  cdat_add_test(test_vcs_polar_set_opt_param_polar
     "${PYTHON_EXECUTABLE}"
-    "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_gms_patterns_hatches.py"
-    --gm_type=${gm}
-    --fill_style=${style}
-    --lon1=0
-    --lon2=360
-    "--source=${BASELINE_DIR}/test_vcs_${gm}_${style}_SH_0_360.png"
-    "--threshold=45"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_polar_set_opt_param_polar.py
+    "${BASELINE_DIR}/test_vcs_polar_set_opt_param_polar.png"
+    )
+  cdat_add_test(test_vcs_boxfill_lev1_lev2
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_lev1_lev2.py
+    "${BASELINE_DIR}/test_vcs_boxfill_lev1_lev2.png"
+    )
+  cdat_add_test(test_vcs_boxfill_lev1_lev2_ext1
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_lev1_lev2_ext1.py
+    "${BASELINE_DIR}/test_vcs_boxfill_lev1_lev2_ext1.png"
+    )
+  cdat_add_test(test_vcs_boxfill_lev1_lev2_ext2
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_lev1_lev2_ext2.py
+    "${BASELINE_DIR}/test_vcs_boxfill_lev1_lev2_ext2.png"
+    )
+  cdat_add_test(test_vcs_boxfill_lev1_lev2_ext1_ext2
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_lev1_lev2_ext1_ext2.py
+    "${BASELINE_DIR}/test_vcs_boxfill_lev1_lev2_ext1_ext2.png"
     )
-ENDFOREACH(style)
-ENDFOREACH(gm)
 
-FOREACH(gm isofill meshfill boxfill)
-FOREACH(proj robinson)
-  cdat_add_test(test_vcs_animate_projected_${gm}_${proj}
+  cdat_add_test(test_vcs_hatches_patterns
     "${PYTHON_EXECUTABLE}"
-    "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_gms_animate_projected_plots.py"
-    --gm_type=${gm}
-    --projection_type=${proj}
-    --source=${BASELINE_DIR}/test_vcs_animate_projected_${gm}_${proj}.png
-    --threshold=40
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_hatches_patterns.py
+    "${BASELINE_DIR}/test_vcs_hatches_patterns.png"
     )
-ENDFOREACH(proj)
-ENDFOREACH(gm)
+  FOREACH(gm isofill boxfill meshfill)
+    FOREACH(style solid pattern hatch)
+      cdat_add_test(test_vcs_${gm}_${style}_fill_non-contig
+        "${PYTHON_EXECUTABLE}"
+        "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_gms_patterns_hatches.py"
+        --gm_type=${gm}
+        --fill_style=${style}
+        --non-contiguous
+        "--source=${BASELINE_DIR}/test_vcs_${gm}_${style}_SH_-180_180_non-contig.png"
+        "--threshold=45"
+        )
+      cdat_add_test(test_vcs_${gm}_${style}_fill
+        "${PYTHON_EXECUTABLE}"
+        "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_gms_patterns_hatches.py"
+        --gm_type=${gm}
+        --fill_style=${style}
+        "--source=${BASELINE_DIR}/test_vcs_${gm}_${style}_SH_-180_180.png"
+        "--threshold=45"
+        )
+      cdat_add_test(test_vcs_${gm}_${style}_fill_0_360
+        "${PYTHON_EXECUTABLE}"
+        "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_gms_patterns_hatches.py"
+        --gm_type=${gm}
+        --fill_style=${style}
+        --lon1=0
+        --lon2=360
+        "--source=${BASELINE_DIR}/test_vcs_${gm}_${style}_SH_0_360.png"
+        "--threshold=45"
+        )
+    ENDFOREACH(style)
+  ENDFOREACH(gm)
 
-FOREACH(flip None X XY Y)
-cdat_add_test(test_vcs_flip${flip}
-  "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_flip${flip}.py
-  "${BASELINE_DIR}/test_vcs_flip${flip}.png"
-  )
-ENDFOREACH(flip)
+  FOREACH(gm isofill meshfill boxfill)
+    FOREACH(proj robinson)
+      cdat_add_test(test_vcs_animate_projected_${gm}_${proj}
+        "${PYTHON_EXECUTABLE}"
+        "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_gms_animate_projected_plots.py"
+        --gm_type=${gm}
+        --projection_type=${proj}
+        --source=${BASELINE_DIR}/test_vcs_animate_projected_${gm}_${proj}.png
+        --threshold=40
+        )
+    ENDFOREACH(proj)
+  ENDFOREACH(gm)
 
-cdat_add_test(test_vcs_lambert
- "${PYTHON_EXECUTABLE}"
- ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_lambert.py
- "${BASELINE_DIR}/test_vcs_lambert.png"
-)
-# Rename baseline
-cdat_add_test(test_vcs_boxfill_lev1_lev2_ta_missing
- "${PYTHON_EXECUTABLE}"
- ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_lev1_lev2_ta_missing.py
- "${BASELINE_DIR}/test_vcs_boxfill_lev1_lev2_ta_missing.png"
-)
+  FOREACH(flip None X XY Y)
+    cdat_add_test(test_vcs_flip${flip}
+      "${PYTHON_EXECUTABLE}"
+      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_flip${flip}.py
+      "${BASELINE_DIR}/test_vcs_flip${flip}.png"
+      )
+  ENDFOREACH(flip)
 
-cdat_add_test(test_vcs_close
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_close.py
-"${BASELINE_DIR}/test_vcs_close.png"
-)
+  cdat_add_test(test_vcs_lambert
+     "${PYTHON_EXECUTABLE}"
+     ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_lambert.py
+     "${BASELINE_DIR}/test_vcs_lambert.png"
+    )
+  # Rename baseline
+  cdat_add_test(test_vcs_boxfill_lev1_lev2_ta_missing
+     "${PYTHON_EXECUTABLE}"
+     ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_lev1_lev2_ta_missing.py
+     "${BASELINE_DIR}/test_vcs_boxfill_lev1_lev2_ta_missing.png"
+    )
 
-cdat_add_test(test_vcs_basic_isofill_bigvalues
-"${PYTHON_EXECUTABLE}"
-"${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py"
---gm_type=isofill
---bigvalues
-"--source=${BASELINE_DIR}/test_vcs_basic_isofill_bigvalues.png"
-)
-cdat_add_test(test_vcs_issue_960_labels
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_issue_960_labels.py
-${BASELINE_DIR}/test_vcs_issue_960_labels_1.png
-${BASELINE_DIR}/test_vcs_issue_960_labels_2.png
-)
-cdat_add_test(test_vcs_animate_meshfill
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_meshfill.py
-${BASELINE_DIR}
-)
-cdat_add_test(test_vcs_animate_isofill
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_isofill.py
-${BASELINE_DIR}
-)
-cdat_add_test(test_vcs_animate_boxfill
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_boxfill.py
-${BASELINE_DIR}
-)
-cdat_add_test(test_vcs_animate_isoline
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_isoline.py
-${BASELINE_DIR}
-)
-cdat_add_test(test_vcs_animate_isoline_colored
-"${PYTHON_EXECUTABLE}"
-${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_isoline_colored.py
-${BASELINE_DIR}
-)
-if ( (NOT EXISTS /etc/redhat-release) AND (NOT CDAT_BUILD_OFFSCREEN))
-cdat_add_test(test_vcs_animate_isoline_text_labels
-  "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_isoline_text_labels.py
-  ${BASELINE_DIR}
-  )
-cdat_add_test(test_vcs_animate_isoline_text_labels_colored
-  "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_isoline_text_labels_colored.py
-  ${BASELINE_DIR}
-  )
-cdat_add_test(test_vcs_patterns
-  "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_patterns.py
-  "${BASELINE_DIR}/test_vcs_patterns.png"
-  )
-cdat_add_test(test_vcs_vectors_robinson
-  "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_vectors_robinson.py
-  "${BASELINE_DIR}/test_vcs_vectors_robinson.png"
-  )
-cdat_add_test(test_vcs_vectors_robinson_wrap
-  "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_vectors_robinson_wrap.py
-  "${BASELINE_DIR}/test_vcs_vectors_robinson_wrap.png"
-  )
-cdat_add_test(test_vcs_vectors_scale_options
-  "${PYTHON_EXECUTABLE}"
-  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_vectors_scale_options.py
-  "${BASELINE_DIR}/test_vcs_vectors_scale_options_off.png"
-  "${BASELINE_DIR}/test_vcs_vectors_scale_options_constant.png"
-  "${BASELINE_DIR}/test_vcs_vectors_scale_options_linear.png"
-  "${BASELINE_DIR}/test_vcs_vectors_scale_options_normalize.png"
-  "${BASELINE_DIR}/test_vcs_vectors_scale_options_constantNLinear.png"
-  "${BASELINE_DIR}/test_vcs_vectors_scale_options_constantNNormalize.png"
-  )
+  cdat_add_test(test_vcs_close
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_close.py
+    "${BASELINE_DIR}/test_vcs_close.png"
+    )
+
+  cdat_add_test(test_vcs_basic_isofill_bigvalues
+    "${PYTHON_EXECUTABLE}"
+    "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py"
+    --gm_type=isofill
+    --bigvalues
+    "--source=${BASELINE_DIR}/test_vcs_basic_isofill_bigvalues.png"
+    )
+  cdat_add_test(test_vcs_issue_960_labels
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_issue_960_labels.py
+    ${BASELINE_DIR}/test_vcs_issue_960_labels_1.png
+    ${BASELINE_DIR}/test_vcs_issue_960_labels_2.png
+    )
+  cdat_add_test(test_vcs_animate_meshfill
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_meshfill.py
+    ${BASELINE_DIR}
+    )
+  cdat_add_test(test_vcs_animate_isofill
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_isofill.py
+    ${BASELINE_DIR}
+    )
+  cdat_add_test(test_vcs_animate_boxfill
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_boxfill.py
+    ${BASELINE_DIR}
+    )
+  cdat_add_test(test_vcs_animate_isoline
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_isoline.py
+    ${BASELINE_DIR}
+    )
+  cdat_add_test(test_vcs_animate_isoline_colored
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_isoline_colored.py
+    ${BASELINE_DIR}
+    )
+  if ( (NOT EXISTS /etc/redhat-release) AND (NOT CDAT_BUILD_OFFSCREEN))
+    cdat_add_test(test_vcs_animate_isoline_text_labels
+      "${PYTHON_EXECUTABLE}"
+      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_isoline_text_labels.py
+      ${BASELINE_DIR}
+      )
+    cdat_add_test(test_vcs_animate_isoline_text_labels_colored
+      "${PYTHON_EXECUTABLE}"
+      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_animate_isoline_text_labels_colored.py
+      ${BASELINE_DIR}
+      )
+    cdat_add_test(test_vcs_patterns
+      "${PYTHON_EXECUTABLE}"
+      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_patterns.py
+      "${BASELINE_DIR}/test_vcs_patterns.png"
+      )
+    cdat_add_test(test_vcs_vectors_robinson
+      "${PYTHON_EXECUTABLE}"
+      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_vectors_robinson.py
+      "${BASELINE_DIR}/test_vcs_vectors_robinson.png"
+      )
+    cdat_add_test(test_vcs_vectors_robinson_wrap
+      "${PYTHON_EXECUTABLE}"
+      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_vectors_robinson_wrap.py
+      "${BASELINE_DIR}/test_vcs_vectors_robinson_wrap.png"
+      )
+    cdat_add_test(test_vcs_vectors_scale_options
+      "${PYTHON_EXECUTABLE}"
+      ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_vectors_scale_options.py
+      "${BASELINE_DIR}/test_vcs_vectors_scale_options_off.png"
+      "${BASELINE_DIR}/test_vcs_vectors_scale_options_constant.png"
+      "${BASELINE_DIR}/test_vcs_vectors_scale_options_linear.png"
+      "${BASELINE_DIR}/test_vcs_vectors_scale_options_normalize.png"
+      "${BASELINE_DIR}/test_vcs_vectors_scale_options_constantNLinear.png"
+      "${BASELINE_DIR}/test_vcs_vectors_scale_options_constantNNormalize.png"
+      )
+  endif()
 endif()
 
 cdat_add_test(test_vcs_endconfigure
-- 
GitLab


From aeb94b7a6ac509d34e0fa36462c4164c9671d762 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 7 Jun 2016 12:53:32 -0700
Subject: [PATCH 141/191] ok got the build system to download/check sample data
 only once

---
 CMake/cdat_modules_extra/runtest.in           |  2 --
 Packages/vcs/scripts/vcs_download_sample_data |  4 ++++
 Packages/vcs/setup.py                         |  1 +
 Packages/vcs/vcs/template.py                  |  5 ++++-
 Packages/vcs/vcs/utils.py                     |  2 +-
 testing/CMakeLists.txt                        | 15 ++++++++++++---
 testing/vcs/CMakeLists.txt                    |  2 --
 7 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100755 Packages/vcs/scripts/vcs_download_sample_data

diff --git a/CMake/cdat_modules_extra/runtest.in b/CMake/cdat_modules_extra/runtest.in
index 194632e5d..19769f740 100755
--- a/CMake/cdat_modules_extra/runtest.in
+++ b/CMake/cdat_modules_extra/runtest.in
@@ -2,7 +2,5 @@
 source activate @CONDA_ENVIRONMENT_NAME@
 export DYLD_FALLBACK_LIBRARY_PATH=`python -c "import sys,os;print os.path.join(sys.prefix,'lib')"`
 echo "Python:" `which python`
-# make sure data is downloaded
-python -c "import vcs;vcs.download_sample_data_files()"
 echo "Running:"$*
 $*
diff --git a/Packages/vcs/scripts/vcs_download_sample_data b/Packages/vcs/scripts/vcs_download_sample_data
new file mode 100755
index 000000000..de3829e37
--- /dev/null
+++ b/Packages/vcs/scripts/vcs_download_sample_data
@@ -0,0 +1,4 @@
+#!/usr/bin/env python
+import vcs
+vcs.download_sample_data_files()
+
diff --git a/Packages/vcs/setup.py b/Packages/vcs/setup.py
index 10f64da9b..06f0ef5b9 100755
--- a/Packages/vcs/setup.py
+++ b/Packages/vcs/setup.py
@@ -27,6 +27,7 @@ setup(name="vcs",
       packages=find_packages(),
       package_dir={'vcs': 'vcs',
                    },
+      scripts= ["scripts/vcs_download_sample_data"],
       data_files=[('share/vcs', ('Share/wmo_symbols.json',
                                  'Share/data_continent_coarse',
                                  'Share/data_continent_political',
diff --git a/Packages/vcs/vcs/template.py b/Packages/vcs/vcs/template.py
index fd2ee2f0c..adabacda0 100644
--- a/Packages/vcs/vcs/template.py
+++ b/Packages/vcs/vcs/template.py
@@ -1486,7 +1486,10 @@ class P(object):
                                                       axis=" ".join(["(%s)" %
                                                                      S for S in slab.getAxisIds()])))
                         except:
-                            meanstring = 'Mean %.4g' % slab.mean()
+                            try:
+                                meanstring = 'Mean %.4g' % slab.mean()
+                            except:
+                                meanstring = 'Mean %.4g' % numpy.mean(slab.filled())
                     tt.string = meanstring
                 else:
                     tt.string = str(getattr(slab, s))
diff --git a/Packages/vcs/vcs/utils.py b/Packages/vcs/vcs/utils.py
index 4fc59ed89..d3a02dcda 100644
--- a/Packages/vcs/vcs/utils.py
+++ b/Packages/vcs/vcs/utils.py
@@ -1670,7 +1670,7 @@ def creategraphicsmethod(gtype, gname='default', name=None):
 # datawc_ can be a float or a cdtime.reltime
 # TODO: Investigate why datawc is converted to a cdtime.reltime
 def getDataWcValue(v):
-    if (type(v) is type(cdtime.reltime(0, 'months since 1900'))):
+    if (type(v) is type(cdtime.reltime(0, 'months since 1900'))):  # noqa
         return v.value
     else:
         return v
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
index 0e7286fbe..909790f68 100644
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -1,5 +1,5 @@
-# Disabling GUI tests as they don't work
-#add_subdirectory(uvcdat)
+set(PYTHON_EXECUTABLE python)
+set(CDAT_DOWNLOAD_SAMPLE_DATA ON)
 
 # Helper macro that sets the environment correctly
 macro (cdat_add_test name)
@@ -13,6 +13,9 @@ macro (cdat_add_test name)
   endif()
 
   add_test(${name} ${cdat_CMAKE_BINARY_DIR}/runtest  ${ARGS})
+  if ( NOT (${name} STREQUAL download_sample_data ))
+      set_tests_properties(${name} PROPERTIES DEPENDS download_sample_data)
+  endif()
 
   if(DEFINED ENV{UVCDAT_ANONYMOUS_LOG})
     set_tests_properties (${name}
@@ -24,6 +27,13 @@ macro (cdat_add_test name)
     )
   endif()
 endmacro()
+
+#separate_arguments(DOWNLOAD_ARGS)
+# make sure data is downloaded
+cdat_add_test(download_sample_data
+    vcs_download_sample_data
+    )
+
 add_subdirectory(regrid)
 add_subdirectory(vcs)
 add_subdirectory(vcsaddons)
@@ -33,5 +43,4 @@ add_subdirectory(Thermo)
 add_subdirectory(unidata)
 add_subdirectory(cdms2)
 add_subdirectory(xmgrace)
-
 add_subdirectory(pcmdi)
diff --git a/testing/vcs/CMakeLists.txt b/testing/vcs/CMakeLists.txt
index c80cbc44f..dba30b168 100644
--- a/testing/vcs/CMakeLists.txt
+++ b/testing/vcs/CMakeLists.txt
@@ -1,6 +1,4 @@
 set(BASELINE_DIR "${UVCDAT_GIT_TESTDATA_DIR}/baselines/vcs")
-set(PYTHON_EXECUTABLE python)
-set(CDAT_DOWNLOAD_SAMPLE_DATA ON)
 
 cdat_add_test(flake8_vcs
   flake8 "${cdat_SOURCE_DIR}/Packages/vcs/vcs/"
-- 
GitLab


From 3b995dbf4d6d75fd5f2e3f9f9fc0d9afb4426dbc Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 7 Jun 2016 12:57:40 -0700
Subject: [PATCH 142/191] travis update

---
 .travis.yml | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dbf2b1399..e085b7f64 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,20 +2,25 @@ os:
   - linux
   - osx
 
-language: c++
+language: python
+    - "2.7"
 
 before_install:
-    - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq; sudo apt-get install -y gfortran; fi
-    - if [ "$TRAVIS_OS_NAME" = "linux" ]; then pushd $HOME && mkdir cmake3.1 && cd cmake3.1 && (curl -L "http://cmake.org/files/v3.1/cmake-3.1.0-Linux-x86_64.tar.gz" | gunzip -c | tar x) && cd cmake-*/bin && export PATH="${PWD}:${PATH}"; popd; fi
-    - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update ; brew outdated cmake || brew upgrade cmake ; fi
-    - cmake --version
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq; sudo apt-get install -y gfortran xvfb; fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update ; fi 
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then wget https://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh -O miniconda.sh; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then wget https://github.com/UV-CDAT/uvcdat/releases/download/v2.4.1/gfortran-4.9.2-Mac.tar.gz -O ~/gfortran-4.9.2-Mac.tar.gz ; pushd / ; sudo tar xzvf ~/gfortran-4.9.2-Mac.tar.gz ; pushd ; fi
+  - export PATH="$HOME/miniconda/bin:$PATH"
+  - bash miniconda.sh -b -p $HOME/miniconda
+  - conda config --set always_yes yes --set changeps1 no
+  - conda update -y -q conda
+  - conda install openssl=1.0.2d
 
 script:
-    - git submodule init
-    - git submodule update
     - cd ..
     - mkdir _build
     - cd _build
-    - cmake -DGIT_PROTOCOL=git:// -DCDAT_BUILD_MODE=LEAN -DCDAT_BUILD_GRAPHICS=ON -DCDAT_BUILD_SCIPY=OFF ../uvcdat
-    - ctest -VV -S ../uvcdat/CMake/travis_build.cmake
-    - ctest -VV -S ../uvcdat/CMake/travis_submit.cmake
+    - cmake -DGIT_PROTOCOL=git:// ../uvcdat
+    - make
+    - ctest -j8 -D Experimental
-- 
GitLab


From aecf027540fac030aead25a2bc16997d8e50a8e6 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 7 Jun 2016 13:49:05 -0700
Subject: [PATCH 143/191] need to push to go to Linux, mac is dyimg

---
 CMake/cdat_modules_extra/install_cdat_from_conda.bash.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
index 81a54299b..90de4ad7b 100755
--- a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
+++ b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-conda create -y -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@  hdf5 libnetcdf lapack clapack ossuuid libcf esmf jasper g2clib yasm x264 ffmpeg cmor vtk libcdms cdat_info flake8 requests
+conda create -y -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@  hdf5 libnetcdf lapack clapack ossuuid libcf esmf jasper g2clib yasm x264 ffmpeg cmor vtk libcdms cdat_info flake8 requests numpy==1.9.2
 
 source activate @CONDA_ENVIRONMENT_NAME@
 for pkg in testing cdtime regrid2 cdms2 esg DV3D vcs vcsaddons cdutil unidata xmgrace genutil Thermo WK distarray; do
-- 
GitLab


From 29b67f0e2399ad14b06c0f1d3b8f12c43e726c8d Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 7 Jun 2016 14:59:35 -0700
Subject: [PATCH 144/191] testing on mac

---
 CMake/cdat_modules_extra/install_cdat_from_conda.bash.in | 2 +-
 CMake/cdat_modules_extra/runtest.in                      | 3 +++
 Packages/testing/regression.py                           | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
index 90de4ad7b..6655f8059 100755
--- a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
+++ b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-conda create -y -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@  hdf5 libnetcdf lapack clapack ossuuid libcf esmf jasper g2clib yasm x264 ffmpeg cmor vtk libcdms cdat_info flake8 requests numpy==1.9.2
+conda create -y -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@  hdf5 libnetcdf lapack clapack ossuuid libcf esmf jasper g2clib yasm x264 ffmpeg cmor vtk==uvcdat libcdms cdat_info flake8 requests numpy==1.9.2 --show-channel-urls
 
 source activate @CONDA_ENVIRONMENT_NAME@
 for pkg in testing cdtime regrid2 cdms2 esg DV3D vcs vcsaddons cdutil unidata xmgrace genutil Thermo WK distarray; do
diff --git a/CMake/cdat_modules_extra/runtest.in b/CMake/cdat_modules_extra/runtest.in
index 19769f740..f981c796d 100755
--- a/CMake/cdat_modules_extra/runtest.in
+++ b/CMake/cdat_modules_extra/runtest.in
@@ -1,6 +1,9 @@
 #!/bin/bash
+echo "ACTIVATING ENV:"@CONDA_ENVIRONMENT_NAME@
 source activate @CONDA_ENVIRONMENT_NAME@
 export DYLD_FALLBACK_LIBRARY_PATH=`python -c "import sys,os;print os.path.join(sys.prefix,'lib')"`
 echo "Python:" `which python`
 echo "Running:"$*
+python -c "import vtk;print 'VTK_VERSION:',vtk.VTK_VERSION"
+python -c "import numpy;print 'NUMPY_VERSION:',numpy.version.version"
 $*
diff --git a/Packages/testing/regression.py b/Packages/testing/regression.py
index 72047380e..aa8efa96b 100644
--- a/Packages/testing/regression.py
+++ b/Packages/testing/regression.py
@@ -83,7 +83,7 @@ def find_alternates(fname):
     return results
 
 def check_result_image(fname, baselinefname=sys.argv[1], threshold=defaultThreshold,
-                       baseline=True, cleanup=True, update_baselines = False):
+                       baseline=True, cleanup=True, update_baselines = True):
     testImage = image_from_file(fname)
     if testImage is None:
         print "Testing image missing, test failed."
-- 
GitLab


From e2741805ecafda1ab0033a1513b9bc6b2ddd3761 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 7 Jun 2016 15:46:17 -0700
Subject: [PATCH 145/191] somehow this numpy i acting up

---
 CMake/cdat_modules_extra/install_cdat_from_conda.bash.in | 4 ++--
 CMake/cdat_modules_extra/runtest.in                      | 2 +-
 Packages/testing/regression.py                           | 2 +-
 Packages/vcs/vcs/VTKPlots.py                             | 5 ++++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
index 6655f8059..78e72d78e 100755
--- a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
+++ b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
-conda create -y -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@  hdf5 libnetcdf lapack clapack ossuuid libcf esmf jasper g2clib yasm x264 ffmpeg cmor vtk==uvcdat libcdms cdat_info flake8 requests numpy==1.9.2 --show-channel-urls
+conda create -y -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@  hdf5 libnetcdf lapack clapack ossuuid libcf esmf jasper g2clib yasm x264 ffmpeg cmor vtk==uvcdat libcdms cdat_info flake8 requests numpy==1.9.2 matplotlib --show-channel-urls
 
 source activate @CONDA_ENVIRONMENT_NAME@
-for pkg in testing cdtime regrid2 cdms2 esg DV3D vcs vcsaddons cdutil unidata xmgrace genutil Thermo WK distarray; do
+for pkg in testing cdtime regrid2 cdms2 esg DV3D vcs vcsaddons EzTemplate cdutil unidata xmgrace genutil Thermo WK distarray; do
     cd @cdat_SOURCE_DIR@/Packages/${pkg}
     rm -rf build
     if [ ${pkg} == "vcs" ]; then
diff --git a/CMake/cdat_modules_extra/runtest.in b/CMake/cdat_modules_extra/runtest.in
index f981c796d..4946cf488 100755
--- a/CMake/cdat_modules_extra/runtest.in
+++ b/CMake/cdat_modules_extra/runtest.in
@@ -3,7 +3,7 @@ echo "ACTIVATING ENV:"@CONDA_ENVIRONMENT_NAME@
 source activate @CONDA_ENVIRONMENT_NAME@
 export DYLD_FALLBACK_LIBRARY_PATH=`python -c "import sys,os;print os.path.join(sys.prefix,'lib')"`
 echo "Python:" `which python`
-echo "Running:"$*
+echo "Running: "$*
 python -c "import vtk;print 'VTK_VERSION:',vtk.VTK_VERSION"
 python -c "import numpy;print 'NUMPY_VERSION:',numpy.version.version"
 $*
diff --git a/Packages/testing/regression.py b/Packages/testing/regression.py
index aa8efa96b..72047380e 100644
--- a/Packages/testing/regression.py
+++ b/Packages/testing/regression.py
@@ -83,7 +83,7 @@ def find_alternates(fname):
     return results
 
 def check_result_image(fname, baselinefname=sys.argv[1], threshold=defaultThreshold,
-                       baseline=True, cleanup=True, update_baselines = True):
+                       baseline=True, cleanup=True, update_baselines = False):
     testImage = image_from_file(fname)
     if testImage is None:
         print "Testing image missing, test failed."
diff --git a/Packages/vcs/vcs/VTKPlots.py b/Packages/vcs/vcs/VTKPlots.py
index 9d3d85c74..2d3efbdab 100644
--- a/Packages/vcs/vcs/VTKPlots.py
+++ b/Packages/vcs/vcs/VTKPlots.py
@@ -1499,7 +1499,10 @@ class VTKVCSBackend(object):
                                 float(cdutil.averager(array1, axis=" ".join(["(%s)" %
                                                                              S for S in array1.getAxisIds()])))
                         except:
-                            meanstring = 'Mean %.4g' % array1.mean()
+                            try:
+                                meanstring = 'Mean %.4g' % array1.mean()
+                            except:
+                                meanstring = 'Mean %.4g' % numpy.mean(array1.filled())
                     t.SetInput(meanstring)
                 elif att == "crdate" and tstr is not None:
                     t.SetInput(tstr.split()[0].replace("-", "/"))
-- 
GitLab


From 761fc9b1b6db5282a10d4eaf57ecf1ad844fd7ac Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 7 Jun 2016 16:05:07 -0700
Subject: [PATCH 146/191] major clean up

---
 Changes.txt                                   |    3 -
 TODO.txt                                      |    5 -
 exsrc/Makefile.am.pixman                      |   54 -
 exsrc/Numeric.sh                              |   16 -
 exsrc/Pmw.sh                                  |    6 -
 exsrc/R.sh                                    |    5 -
 exsrc/README.txt                              |   23 -
 exsrc/VTK_BUILD_ANSWERS.core                  | 1320 ----------
 exsrc/blas.sh                                 |   25 -
 exsrc/cairo.sh                                |   14 -
 exsrc/clean_script                            |    2 -
 exsrc/cmake.sh                                |    7 -
 exsrc/curl.sh                                 |   12 -
 exsrc/detect_fortran.py                       |   36 -
 exsrc/ffmpeg.sh                               |   14 -
 exsrc/find_site.py                            |    9 -
 exsrc/fontconfig.sh                           |   15 -
 exsrc/freetype.sh                             |   12 -
 exsrc/gdal.sh                                 |    5 -
 exsrc/ghostscript.sh                          |    5 -
 exsrc/gifmerge.sh                             |    5 -
 exsrc/gifsicle.sh                             |    5 -
 exsrc/gplot.sh                                |    6 -
 exsrc/hdf.sh                                  |   12 -
 exsrc/install_script.obsolete                 | 1154 ---------
 exsrc/ioapi.sh                                |   22 -
 exsrc/ipython.sh                              |    5 -
 exsrc/ipython1.sh                             |    6 -
 exsrc/jpeg.sh                                 |   12 -
 exsrc/lapack.sh                               |   25 -
 exsrc/lapack95.sh                             |   25 -
 exsrc/libcf.sh                                |   20 -
 exsrc/libdap.sh                               |   14 -
 exsrc/libnc-dap.sh                            |   14 -
 exsrc/libpixman.sh                            |   12 -
 exsrc/libpng.sh                               |   12 -
 exsrc/libxml.sh                               |   12 -
 exsrc/netcdf.sh                               |   50 -
 exsrc/netcdf_fortran.sh                       |   42 -
 exsrc/netpbm.input.conf                       |   19 -
 exsrc/netpbm.input.conf.Cygwin                |   18 -
 exsrc/netpbm.input.conf.Darwin                |   19 -
 exsrc/netpbm.input.conf.sun                   |   20 -
 exsrc/netpbm.input.inst                       |    9 -
 exsrc/netpbm.sh                               |   35 -
 exsrc/numpy.sh                                |   30 -
 exsrc/pbmplus.sh                              |    9 -
 exsrc/pixman.def                              |   62 -
 exsrc/pkgconfig.sh                            |   12 -
 exsrc/proj.sh                                 |    5 -
 exsrc/prolog.sh                               |   76 -
 exsrc/pyfort.sh                               |    4 -
 exsrc/setuptools.sh                           |    6 -
 exsrc/src/CMakeCache.txt.linux.in             | 1965 ---------------
 exsrc/src/CMakeCache.txt.mac.Framework.in     | 2066 ---------------
 exsrc/src/CMakeCache.txt.mac.in               | 1965 ---------------
 exsrc/src/cmake/multi.c                       | 1978 ---------------
 exsrc/src/h5diff_correct_ansi.c               | 2222 ----------------
 exsrc/src/o.txt                               |    3 -
 exsrc/src/pbmplus/Makefile.in                 |  134 -
 exsrc/src/pbmplus/libpbm1.c                   |  674 -----
 exsrc/src/pbmplus/pbmplus.h                   |  192 --
 exsrc/src/pbmplus/pnm/Makefile.in             |  188 --
 exsrc/src/png/pngconf.h                       |  632 -----
 exsrc/src/readline/shobj-conf                 |  579 -----
 exsrc/src/yes.txt                             |    2 -
 exsrc/twisted.sh                              |    6 -
 exsrc/vtk.sh                                  |   17 -
 exsrc/xgks.sh                                 |   21 -
 images/2leftarrow.gif                         |  Bin 1180 -> 0 bytes
 images/2rightarrow.gif                        |  Bin 1180 -> 0 bytes
 images/ASD.scr                                | 1268 ----------
 images/HARD_COPY                              |   76 -
 images/PCM_isofill.scr                        |  976 -------
 images/UV-CDAT_logo.png                       |  Bin 31325 -> 0 bytes
 images/UV-CDAT_logo_sites.png                 |  Bin 116663 -> 0 bytes
 images/add.gif                                |  Bin 986 -> 0 bytes
 images/animate_load.gif                       |  Bin 1893 -> 0 bytes
 images/animate_save.gif                       |  Bin 1966 -> 0 bytes
 images/base10.gif                             |  Bin 978 -> 0 bytes
 images/bookmark_folder.gif                    |  Bin 1302 -> 0 bytes
 images/cdatdemo.gif                           |  Bin 413 -> 0 bytes
 images/cdatnews                               |    2 -
 images/cos.gif                                |  Bin 964 -> 0 bytes
 images/cosh.gif                               |  Bin 978 -> 0 bytes
 images/cycle.gif                              |  Bin 1119 -> 0 bytes
 images/devel_20.gif                           |  Bin 825 -> 0 bytes
 images/devel_menu.gif                         |  Bin 1493 -> 0 bytes
 images/divide.gif                             |  Bin 987 -> 0 bytes
 images/edit.gif                               |  Bin 1500 -> 0 bytes
 images/edit_20.gif                            |  Bin 1258 -> 0 bytes
 images/edit_menu.gif                          |  Bin 1781 -> 0 bytes
 images/editdelete.gif                         |  Bin 1313 -> 0 bytes
 images/editdelete_20.gif                      |  Bin 825 -> 0 bytes
 images/editdelete_menu.gif                    |  Bin 1568 -> 0 bytes
 images/equal.gif                              |  Bin 194 -> 0 bytes
 images/exp.gif                                |  Bin 991 -> 0 bytes
 images/fabs.gif                               |  Bin 988 -> 0 bytes
 images/function.gif                           |  Bin 957 -> 0 bytes
 images/getmask.gif                            |  Bin 1096 -> 0 bytes
 images/gohome.gif                             |  Bin 1206 -> 0 bytes
 images/greater.gif                            |  Bin 194 -> 0 bytes
 images/grower.gif                             |  Bin 1250 -> 0 bytes
 images/hand1.gif                              |  Bin 1176 -> 0 bytes
 images/hand2.gif                              |  Bin 1179 -> 0 bytes
 images/info.gif                               |  Bin 1580 -> 0 bytes
 images/info_20.gif                            |  Bin 1258 -> 0 bytes
 images/info_menu.gif                          |  Bin 2152 -> 0 bytes
 images/inpin_red.gif                          |  Bin 1050 -> 0 bytes
 images/inverse.gif                            |  Bin 957 -> 0 bytes
 images/less.gif                               |  Bin 203 -> 0 bytes
 images/list_20.gif                            |  Bin 743 -> 0 bytes
 images/lock.gif                               |  Bin 1124 -> 0 bytes
 images/log.gif                                |  Bin 1640 -> 0 bytes
 images/log_20.gif                             |  Bin 1258 -> 0 bytes
 images/log_menu.gif                           |  Bin 2277 -> 0 bytes
 images/mask.gif                               |  Bin 1302 -> 0 bytes
 images/mlog.gif                               |  Bin 1002 -> 0 bytes
 images/mlog10.gif                             |  Bin 1011 -> 0 bytes
 images/multiply.gif                           |  Bin 995 -> 0 bytes
 images/not.gif                                |  Bin 1418 -> 0 bytes
 images/off.gif                                |  Bin 1457 -> 0 bytes
 images/on.gif                                 |  Bin 1966 -> 0 bytes
 images/open.gif                               |  Bin 1216 -> 0 bytes
 images/opendap.gif                            |  Bin 1292 -> 0 bytes
 images/outpin_red.gif                         |  Bin 1016 -> 0 bytes
 images/pan_down.gif                           |  Bin 587 -> 0 bytes
 images/pan_left.gif                           |  Bin 592 -> 0 bytes
 images/pan_right.gif                          |  Bin 596 -> 0 bytes
 images/pan_up.gif                             |  Bin 583 -> 0 bytes
 images/player_end2.gif                        |  Bin 1145 -> 0 bytes
 images/player_pause.gif                       |  Bin 639 -> 0 bytes
 images/player_play.gif                        |  Bin 1052 -> 0 bytes
 images/player_rev.gif                         |  Bin 1051 -> 0 bytes
 images/player_start.gif                       |  Bin 1142 -> 0 bytes
 images/player_stop.gif                        |  Bin 650 -> 0 bytes
 images/power.gif                              |  Bin 996 -> 0 bytes
 images/pydebug                                |   14 -
 images/pythonenv                              |   14 -
 images/recycle.gif                            |  Bin 1624 -> 0 bytes
 images/recycle_20.gif                         |  Bin 1258 -> 0 bytes
 images/recycle_file.gif                       |  Bin 1301 -> 0 bytes
 images/recycle_menu.gif                       |  Bin 2026 -> 0 bytes
 images/regrid.gif                             |  Bin 1098 -> 0 bytes
 images/remove.gif                             |  Bin 1457 -> 0 bytes
 images/save.gif                               |  Bin 1259 -> 0 bytes
 images/save_20.gif                            |  Bin 585 -> 0 bytes
 images/save_file.gif                          |  Bin 1335 -> 0 bytes
 images/save_menu.gif                          |  Bin 1299 -> 0 bytes
 images/sin.gif                                |  Bin 960 -> 0 bytes
 images/sinh.gif                               |  Bin 977 -> 0 bytes
 images/spk2scr.py                             |  117 -
 images/splash.gif                             |  Bin 25144 -> 0 bytes
 images/sqrt.gif                               |  Bin 1014 -> 0 bytes
 images/std.gif                                |  Bin 151 -> 0 bytes
 images/subtract.gif                           |  Bin 978 -> 0 bytes
 images/tan.gif                                |  Bin 959 -> 0 bytes
 images/tanh.gif                               |  Bin 972 -> 0 bytes
 images/templator                              |   10 -
 images/tg2_20.gif                             |  Bin 825 -> 0 bytes
 images/tg_20.gif                              |  Bin 743 -> 0 bytes
 images/tg_menu.gif                            |  Bin 1774 -> 0 bytes
 images/tiltedpin_red.gif                      |  Bin 1067 -> 0 bytes
 images/toggle_menu.gif                        |  Bin 1096 -> 0 bytes
 images/trashcan_empty.gif                     |  Bin 1500 -> 0 bytes
 images/trashcan_empty_20.gif                  |  Bin 444 -> 0 bytes
 images/trashcan_full.gif                      |  Bin 993 -> 0 bytes
 images/trashcan_full_20.gif                   |  Bin 825 -> 0 bytes
 images/trashcan_menu.gif                      |  Bin 1757 -> 0 bytes
 images/unlock.gif                             |  Bin 1048 -> 0 bytes
 images/vcs2py.py                              |  367 ---
 images/vcs_icon.xbm                           |  566 -----
 images/viewmag+.gif                           |  Bin 1069 -> 0 bytes
 images/viewmag-.gif                           |  Bin 1064 -> 0 bytes
 images/viewmag-.png                           |  Bin 1056 -> 0 bytes
 installation/DAP.py                           |   29 -
 installation/HDF.py                           |   26 -
 installation/cdmsonly.py                      |   16 -
 installation/contrib.py                       |   73 -
 installation/control.py                       |   72 -
 installation/debug.py                         |   12 -
 installation/irix.py                          |    2 -
 installation/pcmdi.py                         |   22 -
 installation/pp.py                            |    3 -
 installation/psql.py                          |    3 -
 installation/standard.py                      |   81 -
 pysrc/README.txt                              |   36 -
 pysrc/clean_script                            |    2 -
 pysrc/install_script.obsolete                 |  117 -
 pysrc/prolog.sh                               |   85 -
 pysrc/python.sh                               |   76 -
 pysrc/readline.sh                             |   23 -
 pysrc/src/setup-2.7.1.py                      | 2067 ---------------
 pysrc/src/setup-2.7.2.py                      | 2090 ---------------
 pysrc/src/setup-2.7.3.py                      | 2094 ---------------
 pysrc/src/setup-2.7.4.py                      | 2186 ----------------
 pysrc/src/setup-2.7.7.py                      | 2244 -----------------
 pysrc/src/setup.py                            | 2244 -----------------
 pysrc/src/site-2.7.7.py                       |  602 -----
 pysrc/tcl.sh                                  |   25 -
 pysrc/tk.sh                                   |   24 -
 pysrc/zlib.sh                                 |   25 -
 resources/uvcdat.icns                         |  Bin 40131 -> 0 bytes
 resources/uvcdat.jpg                          |  Bin 94795 -> 0 bytes
 scripts/clean_script                          |   14 -
 scripts/get_git_version.sh                    |    7 -
 scripts/git_hooks/commit-msg                  |    3 -
 scripts/git_hooks/pre-commit                  |   13 -
 scripts/git_hooks/pre-push                    |   14 -
 scripts/git_hooks/prepare-commit-msg          |    3 -
 scripts/git_setup/.gitattributes              |    9 -
 scripts/git_setup/LICENSE                     |  202 --
 scripts/git_setup/NOTICE                      |    5 -
 scripts/git_setup/README                      |   80 -
 scripts/git_setup/config                      |    2 -
 scripts/git_setup/config.sample               |   22 -
 scripts/git_setup/git-gerrit-push             |   73 -
 scripts/git_setup/setup-gerrit                |  147 --
 scripts/git_setup/setup-hooks                 |   63 -
 scripts/git_setup/setup-ssh                   |  111 -
 scripts/git_setup/setup-stage                 |   82 -
 scripts/git_setup/setup-user                  |   39 -
 scripts/git_setup/setup_aliases.sh            |    8 -
 scripts/git_setup/tips                        |   55 -
 scripts/last_update_time.py                   |   12 -
 scripts/nightly.sh                            |   35 -
 scripts/setup_for_development.sh              |   19 -
 scripts/tarballit.sh                          |    7 -
 tests/cdat/test_cdat.py                       |  500 ----
 tests/cdat/test_exsrc_ok.py                   |  107 -
 tests/test_script                             |   31 -
 uvcdatspt/scripts/MHTScreenshots.py           |  170 --
 uvcdatspt/scripts/MHTTemporalStatistics.py    |   26 -
 uvcdatspt/scripts/MOCScreenshots.py           |  535 ----
 uvcdatspt/scripts/MOCTemporalStatistics.py    |   26 -
 .../scripts/MWehnerTemporalStatistics.py      |   47 -
 uvcdatspt/scripts/POPGenerateImages.py        |  310 ---
 uvcdatspt/scripts/benchmark.py                |  626 -----
 uvcdatspt/scripts/ocean.py                    |  187 --
 239 files changed, 37288 deletions(-)
 delete mode 100644 Changes.txt
 delete mode 100644 TODO.txt
 delete mode 100644 exsrc/Makefile.am.pixman
 delete mode 100755 exsrc/Numeric.sh
 delete mode 100755 exsrc/Pmw.sh
 delete mode 100755 exsrc/R.sh
 delete mode 100644 exsrc/README.txt
 delete mode 100644 exsrc/VTK_BUILD_ANSWERS.core
 delete mode 100755 exsrc/blas.sh
 delete mode 100755 exsrc/cairo.sh
 delete mode 100755 exsrc/clean_script
 delete mode 100755 exsrc/cmake.sh
 delete mode 100755 exsrc/curl.sh
 delete mode 100644 exsrc/detect_fortran.py
 delete mode 100755 exsrc/ffmpeg.sh
 delete mode 100644 exsrc/find_site.py
 delete mode 100755 exsrc/fontconfig.sh
 delete mode 100755 exsrc/freetype.sh
 delete mode 100755 exsrc/gdal.sh
 delete mode 100755 exsrc/ghostscript.sh
 delete mode 100755 exsrc/gifmerge.sh
 delete mode 100755 exsrc/gifsicle.sh
 delete mode 100755 exsrc/gplot.sh
 delete mode 100755 exsrc/hdf.sh
 delete mode 100755 exsrc/install_script.obsolete
 delete mode 100755 exsrc/ioapi.sh
 delete mode 100755 exsrc/ipython.sh
 delete mode 100755 exsrc/ipython1.sh
 delete mode 100755 exsrc/jpeg.sh
 delete mode 100755 exsrc/lapack.sh
 delete mode 100755 exsrc/lapack95.sh
 delete mode 100755 exsrc/libcf.sh
 delete mode 100755 exsrc/libdap.sh
 delete mode 100755 exsrc/libnc-dap.sh
 delete mode 100755 exsrc/libpixman.sh
 delete mode 100755 exsrc/libpng.sh
 delete mode 100755 exsrc/libxml.sh
 delete mode 100755 exsrc/netcdf.sh
 delete mode 100755 exsrc/netcdf_fortran.sh
 delete mode 100644 exsrc/netpbm.input.conf
 delete mode 100644 exsrc/netpbm.input.conf.Cygwin
 delete mode 100644 exsrc/netpbm.input.conf.Darwin
 delete mode 100644 exsrc/netpbm.input.conf.sun
 delete mode 100644 exsrc/netpbm.input.inst
 delete mode 100755 exsrc/netpbm.sh
 delete mode 100755 exsrc/numpy.sh
 delete mode 100755 exsrc/pbmplus.sh
 delete mode 100644 exsrc/pixman.def
 delete mode 100755 exsrc/pkgconfig.sh
 delete mode 100755 exsrc/proj.sh
 delete mode 100755 exsrc/prolog.sh
 delete mode 100755 exsrc/pyfort.sh
 delete mode 100755 exsrc/setuptools.sh
 delete mode 100644 exsrc/src/CMakeCache.txt.linux.in
 delete mode 100644 exsrc/src/CMakeCache.txt.mac.Framework.in
 delete mode 100644 exsrc/src/CMakeCache.txt.mac.in
 delete mode 100644 exsrc/src/cmake/multi.c
 delete mode 100644 exsrc/src/h5diff_correct_ansi.c
 delete mode 100644 exsrc/src/o.txt
 delete mode 100644 exsrc/src/pbmplus/Makefile.in
 delete mode 100644 exsrc/src/pbmplus/libpbm1.c
 delete mode 100644 exsrc/src/pbmplus/pbmplus.h
 delete mode 100644 exsrc/src/pbmplus/pnm/Makefile.in
 delete mode 100644 exsrc/src/png/pngconf.h
 delete mode 100644 exsrc/src/readline/shobj-conf
 delete mode 100644 exsrc/src/yes.txt
 delete mode 100755 exsrc/twisted.sh
 delete mode 100755 exsrc/vtk.sh
 delete mode 100755 exsrc/xgks.sh
 delete mode 100644 images/2leftarrow.gif
 delete mode 100644 images/2rightarrow.gif
 delete mode 100755 images/ASD.scr
 delete mode 100755 images/HARD_COPY
 delete mode 100644 images/PCM_isofill.scr
 delete mode 100644 images/UV-CDAT_logo.png
 delete mode 100644 images/UV-CDAT_logo_sites.png
 delete mode 100644 images/add.gif
 delete mode 100644 images/animate_load.gif
 delete mode 100644 images/animate_save.gif
 delete mode 100644 images/base10.gif
 delete mode 100644 images/bookmark_folder.gif
 delete mode 100644 images/cdatdemo.gif
 delete mode 100755 images/cdatnews
 delete mode 100644 images/cos.gif
 delete mode 100644 images/cosh.gif
 delete mode 100644 images/cycle.gif
 delete mode 100644 images/devel_20.gif
 delete mode 100644 images/devel_menu.gif
 delete mode 100644 images/divide.gif
 delete mode 100644 images/edit.gif
 delete mode 100644 images/edit_20.gif
 delete mode 100644 images/edit_menu.gif
 delete mode 100644 images/editdelete.gif
 delete mode 100644 images/editdelete_20.gif
 delete mode 100644 images/editdelete_menu.gif
 delete mode 100644 images/equal.gif
 delete mode 100644 images/exp.gif
 delete mode 100644 images/fabs.gif
 delete mode 100644 images/function.gif
 delete mode 100644 images/getmask.gif
 delete mode 100644 images/gohome.gif
 delete mode 100644 images/greater.gif
 delete mode 100644 images/grower.gif
 delete mode 100644 images/hand1.gif
 delete mode 100644 images/hand2.gif
 delete mode 100644 images/info.gif
 delete mode 100644 images/info_20.gif
 delete mode 100644 images/info_menu.gif
 delete mode 100644 images/inpin_red.gif
 delete mode 100644 images/inverse.gif
 delete mode 100644 images/less.gif
 delete mode 100644 images/list_20.gif
 delete mode 100644 images/lock.gif
 delete mode 100644 images/log.gif
 delete mode 100644 images/log_20.gif
 delete mode 100644 images/log_menu.gif
 delete mode 100644 images/mask.gif
 delete mode 100644 images/mlog.gif
 delete mode 100644 images/mlog10.gif
 delete mode 100644 images/multiply.gif
 delete mode 100644 images/not.gif
 delete mode 100644 images/off.gif
 delete mode 100644 images/on.gif
 delete mode 100644 images/open.gif
 delete mode 100644 images/opendap.gif
 delete mode 100644 images/outpin_red.gif
 delete mode 100644 images/pan_down.gif
 delete mode 100644 images/pan_left.gif
 delete mode 100644 images/pan_right.gif
 delete mode 100644 images/pan_up.gif
 delete mode 100644 images/player_end2.gif
 delete mode 100644 images/player_pause.gif
 delete mode 100644 images/player_play.gif
 delete mode 100644 images/player_rev.gif
 delete mode 100644 images/player_start.gif
 delete mode 100644 images/player_stop.gif
 delete mode 100644 images/power.gif
 delete mode 100755 images/pydebug
 delete mode 100755 images/pythonenv
 delete mode 100644 images/recycle.gif
 delete mode 100644 images/recycle_20.gif
 delete mode 100644 images/recycle_file.gif
 delete mode 100644 images/recycle_menu.gif
 delete mode 100644 images/regrid.gif
 delete mode 100644 images/remove.gif
 delete mode 100644 images/save.gif
 delete mode 100644 images/save_20.gif
 delete mode 100644 images/save_file.gif
 delete mode 100644 images/save_menu.gif
 delete mode 100644 images/sin.gif
 delete mode 100644 images/sinh.gif
 delete mode 100755 images/spk2scr.py
 delete mode 100755 images/splash.gif
 delete mode 100644 images/sqrt.gif
 delete mode 100644 images/std.gif
 delete mode 100644 images/subtract.gif
 delete mode 100644 images/tan.gif
 delete mode 100644 images/tanh.gif
 delete mode 100755 images/templator
 delete mode 100644 images/tg2_20.gif
 delete mode 100644 images/tg_20.gif
 delete mode 100644 images/tg_menu.gif
 delete mode 100644 images/tiltedpin_red.gif
 delete mode 100644 images/toggle_menu.gif
 delete mode 100644 images/trashcan_empty.gif
 delete mode 100644 images/trashcan_empty_20.gif
 delete mode 100644 images/trashcan_full.gif
 delete mode 100644 images/trashcan_full_20.gif
 delete mode 100644 images/trashcan_menu.gif
 delete mode 100644 images/unlock.gif
 delete mode 100755 images/vcs2py.py
 delete mode 100644 images/vcs_icon.xbm
 delete mode 100644 images/viewmag+.gif
 delete mode 100644 images/viewmag-.gif
 delete mode 100644 images/viewmag-.png
 delete mode 100644 installation/DAP.py
 delete mode 100644 installation/HDF.py
 delete mode 100644 installation/cdmsonly.py
 delete mode 100644 installation/contrib.py
 delete mode 100644 installation/control.py
 delete mode 100644 installation/debug.py
 delete mode 100644 installation/irix.py
 delete mode 100644 installation/pcmdi.py
 delete mode 100644 installation/pp.py
 delete mode 100644 installation/psql.py
 delete mode 100644 installation/standard.py
 delete mode 100644 pysrc/README.txt
 delete mode 100755 pysrc/clean_script
 delete mode 100755 pysrc/install_script.obsolete
 delete mode 100755 pysrc/prolog.sh
 delete mode 100755 pysrc/python.sh
 delete mode 100755 pysrc/readline.sh
 delete mode 100644 pysrc/src/setup-2.7.1.py
 delete mode 100644 pysrc/src/setup-2.7.2.py
 delete mode 100644 pysrc/src/setup-2.7.3.py
 delete mode 100644 pysrc/src/setup-2.7.4.py
 delete mode 100644 pysrc/src/setup-2.7.7.py
 delete mode 100644 pysrc/src/setup.py
 delete mode 100644 pysrc/src/site-2.7.7.py
 delete mode 100755 pysrc/tcl.sh
 delete mode 100755 pysrc/tk.sh
 delete mode 100755 pysrc/zlib.sh
 delete mode 100644 resources/uvcdat.icns
 delete mode 100644 resources/uvcdat.jpg
 delete mode 100755 scripts/clean_script
 delete mode 100755 scripts/get_git_version.sh
 delete mode 100755 scripts/git_hooks/commit-msg
 delete mode 100755 scripts/git_hooks/pre-commit
 delete mode 100755 scripts/git_hooks/pre-push
 delete mode 100755 scripts/git_hooks/prepare-commit-msg
 delete mode 100644 scripts/git_setup/.gitattributes
 delete mode 100644 scripts/git_setup/LICENSE
 delete mode 100644 scripts/git_setup/NOTICE
 delete mode 100644 scripts/git_setup/README
 delete mode 100644 scripts/git_setup/config
 delete mode 100644 scripts/git_setup/config.sample
 delete mode 100755 scripts/git_setup/git-gerrit-push
 delete mode 100755 scripts/git_setup/setup-gerrit
 delete mode 100755 scripts/git_setup/setup-hooks
 delete mode 100755 scripts/git_setup/setup-ssh
 delete mode 100755 scripts/git_setup/setup-stage
 delete mode 100755 scripts/git_setup/setup-user
 delete mode 100755 scripts/git_setup/setup_aliases.sh
 delete mode 100755 scripts/git_setup/tips
 delete mode 100644 scripts/last_update_time.py
 delete mode 100755 scripts/nightly.sh
 delete mode 100755 scripts/setup_for_development.sh
 delete mode 100755 scripts/tarballit.sh
 delete mode 100644 tests/cdat/test_cdat.py
 delete mode 100644 tests/cdat/test_exsrc_ok.py
 delete mode 100755 tests/test_script
 delete mode 100644 uvcdatspt/scripts/MHTScreenshots.py
 delete mode 100644 uvcdatspt/scripts/MHTTemporalStatistics.py
 delete mode 100644 uvcdatspt/scripts/MOCScreenshots.py
 delete mode 100644 uvcdatspt/scripts/MOCTemporalStatistics.py
 delete mode 100644 uvcdatspt/scripts/MWehnerTemporalStatistics.py
 delete mode 100644 uvcdatspt/scripts/POPGenerateImages.py
 delete mode 100644 uvcdatspt/scripts/benchmark.py
 delete mode 100644 uvcdatspt/scripts/ocean.py

diff --git a/Changes.txt b/Changes.txt
deleted file mode 100644
index bc7cd069e..000000000
--- a/Changes.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-[updated_packages_versions]: Added distribute, added option to choose between ip and easy_install, added option to use cert for pip
-[updated_packages_versions]: Upgraded Packages to latest version
-1.3.1
diff --git a/TODO.txt b/TODO.txt
deleted file mode 100644
index fb03af1f8..000000000
--- a/TODO.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-- Fix ESMF build
-- Verify individual packages
-- Verify if we can build using system
-- Consistent install and build directories
-- Install headers and lib under their own package name
diff --git a/exsrc/Makefile.am.pixman b/exsrc/Makefile.am.pixman
deleted file mode 100644
index e57c21c46..000000000
--- a/exsrc/Makefile.am.pixman
+++ /dev/null
@@ -1,54 +0,0 @@
-lib_LTLIBRARIES = libpixman-1.la
-libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -no-undefined -export-symbols pixman.def
-libpixman_1_la_LIBADD = @DEP_LIBS@ -lm
-libpixman_1_la_SOURCES =		\
-	pixman.h			\
-	pixman-access.c			\
-	pixman-access-accessors.c	\
-	pixman-region.c			\
-	pixman-private.h		\
-	pixman-image.c			\
-	pixman-combine.c		\
-	pixman-compose.c		\
-	pixman-compose-accessors.c	\
-	pixman-pict.c			\
-	pixman-source.c			\
-	pixman-transformed.c		\
-	pixman-transformed-accessors.c	\
-	pixman-utils.c			\
-	pixman-edge.c			\
-	pixman-edge-accessors.c		\
-	pixman-edge-imp.h		\
-	pixman-trap.c			\
-	pixman-compute-region.c		\
-	pixman-timer.c
-
-libpixmanincludedir = $(includedir)/pixman-1/
-libpixmaninclude_HEADERS = pixman.h pixman-version.h
-noinst_LTLIBRARIES = 
-
-EXTRA_DIST = Makefile.win32
-
-# mmx code
-if USE_MMX
-noinst_LTLIBRARIES += libpixman-mmx.la
-libpixman_mmx_la_SOURCES = \
-	pixman-mmx.c \
-	pixman-mmx.h
-libpixman_mmx_la_CFLAGS = $(DEP_CFLAGS) $(MMX_CFLAGS)
-libpixman_mmx_la_LIBADD = $(DEP_LIBS)
-libpixman_1_la_LIBADD += libpixman-mmx.la
-endif
-
-
-# sse2 code
-if USE_SSE2
-noinst_LTLIBRARIES += libpixman-sse.la
-libpixman_sse_la_SOURCES = \
-	pixman-sse.c \
-	pixman-sse.h
-libpixman_sse_la_CFLAGS = $(DEP_CFLAGS) $(SSE_CFLAGS)
-libpixman_sse_la_LIBADD = $(DEP_LIBS)
-libpixman_1_la_LIBADD += libpixman-sse.la
-endif
-
diff --git a/exsrc/Numeric.sh b/exsrc/Numeric.sh
deleted file mode 100755
index d82ca417b..000000000
--- a/exsrc/Numeric.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-PACKAGE="Numeric"
-. ./prolog.sh 
-CDMSARCH=`uname -m`
-if (test "${CDMSARCH}" = "ia64") then
-   echo "Numeric won't build on 64bit system, use numpy instead"
-   exit
-fi
-if (test "${CDMSARCH}" = "x86_64") then
-   echo "Numeric won't build on 64bit system, use numpy instead"
-   exit
-fi
-
-# Numeric, MA, PropertiedClasses, etc.
-(cd Numeric-*; ${prefix}/${version}/bin/python setup.py build ${D} install)
-
diff --git a/exsrc/Pmw.sh b/exsrc/Pmw.sh
deleted file mode 100755
index 70629fa8e..000000000
--- a/exsrc/Pmw.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-PACKAGE="Pmw"
-. ./prolog.sh 
-# Twisted.
-(cd Pmw-* ; cd src;  ${prefix}/${version}/bin/python setup.py build ${D} install)
-
diff --git a/exsrc/R.sh b/exsrc/R.sh
deleted file mode 100755
index 4e2a38f55..000000000
--- a/exsrc/R.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-PACKAGE="R"
-. ./prolog.sh
-(cd R*; ./configure --enable-R-shlib --prefix=${prefix}/Externals/R ; make ; make install ; make install ; cd ${prefix}/Externals/R/lib ; ln -s Externals/R/bin/libR.so )
-
diff --git a/exsrc/README.txt b/exsrc/README.txt
deleted file mode 100644
index 72e35f7dc..000000000
--- a/exsrc/README.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-This directory cannot be built until Python is built.
-
-This directory contains sources for some parts of the CDAT
-system that we didn't write or which change on very slow timescales. 
-
-./install_script /whereyouwanttoputit 
-
-The subdirectory src contains the tarred/zipped files that are used to make
-the product. A subdirectory build will be created that contains the output.
-Some of these products can be tested by changing to their directory under 
-build and typing "make test".
-
-This process will unpack the tar files from the src directory if there is no 
-build subdirectory. Otherwise it doesn't. If you put in a new source file
-into src you need to clean before building.
-
-Log files are created in the build subdirectory.
-
-Each of the pieces may be built individually using the corresponding .sh 
-files in this directory. Some warning errors are usual from 
-many of the packages and vary from architecture to architecture.
-
-
diff --git a/exsrc/VTK_BUILD_ANSWERS.core b/exsrc/VTK_BUILD_ANSWERS.core
deleted file mode 100644
index d20aa1e61..000000000
--- a/exsrc/VTK_BUILD_ANSWERS.core
+++ /dev/null
@@ -1,1320 +0,0 @@
-# This is the CMakeCache file.
-# For build in directory: CDAT_PREFIX/VTK
-# You can edit this file to change values found and used by cmake.
-# If you do not want to change any of the values, simply exit the editor.
-# If you do want to change a value, simply edit, save, and exit the editor.
-# The syntax for the file is as follows:
-# KEY:TYPE=VALUE
-# KEY is the name of a variable in the cache.
-# TYPE is a hint to GUI's for the type of VALUE, DO NOT EDIT TYPE!.
-# VALUE is the current value for the KEY.
-
-########################
-# EXTERNAL cache entries
-########################
-
-//Build the documentation (Doxygen).
-BUILD_DOCUMENTATION:BOOL=OFF
-
-//Build VTK examples.
-BUILD_EXAMPLES:BOOL=OFF
-
-//Build VTK with shared libraries.
-BUILD_SHARED_LIBS:BOOL=ON
-
-//Build the testing tree.
-BUILD_TESTING:BOOL=OFF
-
-//Path to a program.
-CMAKE_AR:FILEPATH=/usr/bin/ar
-
-//For backwards compatibility, what version of CMake commands and
-// syntax should this version of CMake allow.
-CMAKE_BACKWARDS_COMPATIBILITY:STRING=2.0
-
-//Choose the type of build, options are: None(CMAKE_CXX_FLAGS or
-// CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.
-//
-CMAKE_BUILD_TYPE:STRING=
-
-//C++ compiler
-CMAKE_CXX_COMPILER:STRING=c++
-
-//Flags used by the compiler during all build types.
-CMAKE_CXX_FLAGS:STRING=
-
-//Flags used by the compiler during debug builds.
-CMAKE_CXX_FLAGS_DEBUG:STRING=-g
-
-//Flags used by the compiler during release minsize builds.
-CMAKE_CXX_FLAGS_MINSIZEREL:STRING=-Os
-
-//Flags used by the compiler during release builds (/MD /Ob1 /Oi
-// /Ot /Oy /Gs will produce slightly less optimized but smaller
-// files).
-CMAKE_CXX_FLAGS_RELEASE:STRING=-O3
-
-//Flags used by the compiler during Release with Debug Info builds.
-//
-CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g
-
-//C compiler
-CMAKE_C_COMPILER:STRING=gcc
-
-//Flags for C compiler.
-CMAKE_C_FLAGS:STRING=
-
-//Flags used by the compiler during debug builds.
-CMAKE_C_FLAGS_DEBUG:STRING=-g
-
-//Flags used by the compiler during release minsize builds.
-CMAKE_C_FLAGS_MINSIZEREL:STRING=-Os
-
-//Flags used by the compiler during release builds (/MD /Ob1 /Oi
-// /Ot /Oy /Gs will produce slightly less optimized but smaller
-// files).
-CMAKE_C_FLAGS_RELEASE:STRING=-O3
-
-//Flags used by the compiler during Release with Debug Info builds.
-//
-CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=-O2 -g
-
-//Flags used by the linker.
-CMAKE_EXE_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during debug builds.
-CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during release minsize builds.
-CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during release builds.
-CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during Release with Debug Info builds.
-//
-CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//Use HP pthreads.
-CMAKE_HP_PTHREADS:BOOL=OFF
-
-//Install path prefix, prepended onto install directories.
-CMAKE_INSTALL_PREFIX:PATH=CDAT_PREFIX
-
-//Path to a program.
-CMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/gmake
-
-//Flags used by the linker during the creation of modules.
-CMAKE_MODULE_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during debug builds.
-CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during release minsize builds.
-CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during release builds.
-CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during Release with Debug Info builds.
-//
-CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//Path to a program.
-CMAKE_RANLIB:FILEPATH=/usr/bin/ranlib
-
-//Flags used by the linker during the creation of dll's.
-CMAKE_SHARED_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during debug builds.
-CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during release minsize builds.
-CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during release builds.
-CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during Release with Debug Info builds.
-//
-CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//Thread library used.
-CMAKE_THREAD_LIBS:STRING=-lpthread
-
-//Use the pthreads library.
-CMAKE_USE_PTHREADS:BOOL=ON
-
-//If true, cmake will use relative paths in makefiles and projects.
-//
-CMAKE_USE_RELATIVE_PATHS:BOOL=OFF
-
-//Use sproc libs.
-CMAKE_USE_SPROC:BOOL=OFF
-
-//Use the win32 thread library.
-CMAKE_USE_WIN32_THREADS:BOOL=OFF
-
-//If this value is on, makefiles will be generated without the
-// .SILENT directive, and all commands will be echoed to the console
-// during the make.  This is useful for debugging only. With Visual
-// Studio IDE projects all commands are done without /nologo.
-CMAKE_VERBOSE_MAKEFILE:BOOL=OFF
-
-//X11 extra flags.
-CMAKE_X_CFLAGS:STRING=-I/usr/X11R6/include
-
-//Libraries and options used in X11 programs.
-CMAKE_X_LIBS:STRING=-lSM;-lICE;-lSM;-lICE;/usr/X11R6/lib/libX11.so;/usr/X11R6/lib/libXext.so;/usr/X11R6/lib/libX11.so;/usr/X11R6/lib/libXext.so
-
-//Path to program used to compress files for transfer to the dart
-// server
-COMPRESSIONCOMMAND:FILEPATH=/usr/bin/gzip
-
-//Path to the coverage program that Dart client uses for performing
-// coverage inspection
-COVERAGE_COMMAND:FILEPATH=/usr/bin/gcov
-
-//Path to a program.
-CVSCOMMAND:FILEPATH=/usr/bin/cvs
-
-//Options passed to the cvs update command.
-CVS_UPDATE_OPTIONS:STRING=-d -A -P
-
-//Limit of reported errors, -1 reports all.
-DART_BUILD_ERROR_REPORT_LIMIT:BOOL=OFF
-
-//Limit of reported warnings, -1 reports all.
-DART_BUILD_WARNING_REPORT_LIMIT:BOOL=OFF
-
-//If you have Dart installed, where is it located?
-DART_ROOT:PATH=DART_ROOT-NOTFOUND
-
-//Time alloted for a test before Dart will kill the test.
-DART_TESTING_TIMEOUT:STRING=1500
-
-//Show the actual output of the build, or if off show a . for each
-// 1024 bytes.
-DART_VERBOSE_BUILD:BOOL=OFF
-
-//Should Dart server send email when build errors are found in
-// Continuous builds?
-DELIVER_CONTINUOUS_EMAIL:BOOL=OFF
-
-//Value Computed by CMake
-DICOMParser_BINARY_DIR:STATIC=CDAT_PREFIX/VTK/Utilities/DICOMParser
-
-//Value Computed by CMake
-DICOMParser_SOURCE_DIR:STATIC=CDAT_BUILD_DIR/VTK/VTK/Utilities/DICOMParser
-
-//Path to gunzip executable
-GUNZIPCOMMAND:FILEPATH=/usr/bin/gunzip
-
-//Path to java command, used by the Dart server to create html.
-//
-JAVACOMMAND:FILEPATH=/usr/bin/java
-
-//Command used to build entire project from the command line.
-MAKECOMMAND:STRING=/usr/bin/gmake -i
-
-//Path to Rational purify command, used for memory error detection.
-//
-MEMORYCHECK_COMMAND:FILEPATH=MEMORYCHECK_COMMAND-NOTFOUND
-
-//File that contains suppressions for the memmory checker
-MEMORYCHECK_SUPPRESSIONS_FILE:FILEPATH=
-
-//What is the path where the file GL/gl.h can be found
-OPENGL_INCLUDE_DIR:PATH=/usr/share/doc/NVIDIA_GLX-1.0/include
-
-//Where can one of the MesaGL or GL libraries be found
-OPENGL_gl_LIBRARY:FILEPATH=/usr/lib/libGL.so
-
-//Where can one of the MesaGLU or GLU libraries be found
-OPENGL_glu_LIBRARY:FILEPATH=/usr/lib/libGLU.so
-
-//What is the path where the file GL/xmesa.h can be found
-OPENGL_xmesa_INCLUDE_DIR:PATH=OPENGL_xmesa_INCLUDE_DIR-NOTFOUND
-
-//Path to a program.
-PYTHON_EXECUTABLE:FILEPATH=CDAT_PREFIX/bin/python
-
-//What is the path where the file Python.h can be found
-PYTHON_INCLUDE_PATH:PATH=CDAT_PREFIX/include/pythonPY_VERSION
-
-//Where can one of the python23, python2.3, python2.3.dll, python22,
-// python2.2, python2.2.dll, python21, python2.1, python2.1.dll,
-// python20, python2.0, python2.0.dll, python16, python1.6, python1.6.dll,
-// python15, python1.5 or python1.5.dll libraries be found
-PYTHON_LIBRARY:FILEPATH=CDAT_PREFIX/lib/pythonPY_VERSION/config/libpythonPY_VERSION.a
-
-//Utility library needed for vtkpython
-PYTHON_UTIL_LIBRARY:FILEPATH=/usr/lib/libutil.so
-
-//Path to scp command, used by some Dart clients for submitting
-// results to a Dart server (when not using ftp for submissions)
-//
-SCPCOMMAND:FILEPATH=/usr/bin/scp
-
-//Name of the computer/site where compile is being run
-SITE:STRING=
-
-//What is the path where the file tcl.h can be found
-TCL_INCLUDE_PATH:PATH=CDAT_PREFIX/include
-
-//Where can one of the tcl, tcl84, tcl8.4, tcl83, tcl8.3, tcl82,
-// tcl8.2, tcl80 or tcl8.0 libraries be found
-TCL_LIBRARY:FILEPATH=CDAT_PREFIX/lib/libtclTCLTK_VERSION.a
-
-//Path to a program.
-TCL_TCLSH:FILEPATH=CDAT_PREFIX/bin/tclshTCLTK_VERSION
-
-//What is the path where the file tk.h can be found
-TK_INCLUDE_PATH:PATH=CDAT_PREFIX/include
-
-//Where can one of the tk, tk84, tk8.4, tk83, tk8.3, tk82, tk8.2,
-// tk80 or tk8.0 libraries be found
-TK_LIBRARY:FILEPATH=CDAT_PREFIX/lib/libtkTCLTK_VERSION.a
-
-//Value Computed by CMake
-VTKEXPAT_BINARY_DIR:STATIC=CDAT_PREFIX/VTK/Utilities/vtkexpat
-
-//Value Computed by CMake
-VTKEXPAT_SOURCE_DIR:STATIC=CDAT_BUILD_DIR/VTK/VTK/Utilities/vtkexpat
-
-//Value Computed by CMake
-VTKFREETYPE_BINARY_DIR:STATIC=CDAT_PREFIX/VTK/Utilities/vtkfreetype
-
-//Value Computed by CMake
-VTKFREETYPE_SOURCE_DIR:STATIC=CDAT_BUILD_DIR/VTK/VTK/Utilities/vtkfreetype
-
-//Value Computed by CMake
-VTKFTGL_BINARY_DIR:STATIC=CDAT_PREFIX/VTK/Utilities/ftgl
-
-//Value Computed by CMake
-VTKFTGL_SOURCE_DIR:STATIC=CDAT_BUILD_DIR/VTK/VTK/Utilities/ftgl
-
-//Value Computed by CMake
-VTKJPEG_BINARY_DIR:STATIC=CDAT_PREFIX/VTK/Utilities/vtkjpeg
-
-//Value Computed by CMake
-VTKJPEG_SOURCE_DIR:STATIC=CDAT_BUILD_DIR/VTK/VTK/Utilities/vtkjpeg
-
-//Value Computed by CMake
-VTKNETCDF_BINARY_DIR:STATIC=CDAT_PREFIX/VTK/Utilities/vtknetcdf
-
-//Value Computed by CMake
-VTKNETCDF_SOURCE_DIR:STATIC=CDAT_BUILD_DIR/VTK/VTK/Utilities/vtknetcdf
-
-//Value Computed by CMake
-VTKPNG_BINARY_DIR:STATIC=CDAT_PREFIX/VTK/Utilities/vtkpng
-
-//Value Computed by CMake
-VTKPNG_SOURCE_DIR:STATIC=CDAT_BUILD_DIR/VTK/VTK/Utilities/vtkpng
-
-//Value Computed by CMake
-VTKTIFF_BINARY_DIR:STATIC=CDAT_PREFIX/VTK/Utilities/vtktiff
-
-//Value Computed by CMake
-VTKTIFF_SOURCE_DIR:STATIC=CDAT_BUILD_DIR/VTK/VTK/Utilities/vtktiff
-
-//Value Computed by CMake
-VTKZLIB_BINARY_DIR:STATIC=CDAT_PREFIX/VTK/Utilities/vtkzlib
-
-//Value Computed by CMake
-VTKZLIB_SOURCE_DIR:STATIC=CDAT_BUILD_DIR/VTK/VTK/Utilities/vtkzlib
-
-//Value Computed by CMake
-VTK_BINARY_DIR:STATIC=CDAT_PREFIX/VTK
-
-//What is the path where the file VTKData.readme can be found
-VTK_DATA_ROOT:PATH=CDAT_BUILD_DIR/VTK/VTKData
-
-//Build leak checking support into VTK.
-VTK_DEBUG_LEAKS:BOOL=OFF
-
-//Location of the OpenGL extensions header file (glext.h).
-VTK_GLEXT_FILE:FILEPATH=CDAT_BUILD_DIR/VTK/VTK/Utilities/ParseOGLExt/headers/glext.h
-
-//Location of the GLX extensions header file (glxext.h).
-VTK_GLXEXT_FILE:FILEPATH=CDAT_BUILD_DIR/VTK/VTK/Utilities/ParseOGLExt/headers/glxext.h
-
-//Remove all legacy code completely.
-VTK_LEGACY_REMOVE:BOOL=OFF
-
-//Silence all legacy code messages.
-VTK_LEGACY_SILENT:BOOL=OFF
-
-//The opengl library being used supports off screen Mesa calls.
-//
-VTK_OPENGL_HAS_OSMESA:BOOL=OFF
-
-//Value Computed by CMake
-VTK_SOURCE_DIR:STATIC=CDAT_BUILD_DIR/VTK/VTK
-
-//Build with static Tcl/Tk support. TCL_LIBRARY and TK_LIBRARY
-// must point to the corresponding Tcl/Tk static libraries (example,
-// tcl84sx.lib, tk84sx.lib).
-VTK_TCL_TK_STATIC:BOOL=ON
-
-//Build VTK with 64 bit ids
-VTK_USE_64BIT_IDS:BOOL=OFF
-
-//Use the ANSI standard iostream library.
-VTK_USE_ANSI_STDLIB:BOOL=ON
-
-//Turn this option off and tests will not popup windows
-VTK_USE_DISPLAY:BOOL=ON
-
-//Build VTK with gl2ps support.
-VTK_USE_GL2PS:BOOL=ON
-
-//Build VTK with GUI Support
-VTK_USE_GUISUPPORT:BOOL=OFF
-
-//Use mangled Mesa with OpenGL.
-VTK_USE_MANGLED_MESA:BOOL=OFF
-
-//Build the vtkParallel kit.
-VTK_USE_PARALLEL:BOOL=OFF
-
-//Build the vtkRendering kit.  Needed for displaying data or using
-// widgets.
-VTK_USE_RENDERING:BOOL=ON
-
-//Build shared libraries with rpath.  This makes it easy to run
-// executables from the build tree when using shared libraries,
-// but removes install support.
-VTK_USE_RPATH:BOOL=ON
-
-//Use the system's expat library.
-VTK_USE_SYSTEM_EXPAT:BOOL=OFF
-
-//Use the system's freetype library.
-VTK_USE_SYSTEM_FREETYPE:BOOL=OFF
-
-//Use the system's jpeg library.
-VTK_USE_SYSTEM_JPEG:BOOL=OFF
-
-//Use the system's png library.
-VTK_USE_SYSTEM_PNG:BOOL=OFF
-
-//Use the system's tiff library.
-VTK_USE_SYSTEM_TIFF:BOOL=OFF
-
-//Use the system's zlib library.
-VTK_USE_SYSTEM_ZLIB:BOOL=OFF
-
-//Location of the WGL extensions header file (wglext.h).
-VTK_WGLEXT_FILE:FILEPATH=CDAT_BUILD_DIR/VTK/VTK/Utilities/ParseOGLExt/headers/wglext.h
-
-//Where can the hints file be found
-VTK_WRAP_HINTS:FILEPATH=CDAT_BUILD_DIR/VTK/VTK/Wrapping/hints
-
-//Wrap VTK classes into the Java language.
-VTK_WRAP_JAVA:BOOL=OFF
-
-//Wrap VTK classes into the Python language.
-VTK_WRAP_PYTHON:BOOL=ON
-
-//Path to an internal program.
-VTK_WRAP_PYTHON_EXE:FILEPATH=CDAT_PREFIX/VTK/bin/vtkWrapPython
-
-//Path to an internal program.
-VTK_WRAP_PYTHON_INIT_EXE:FILEPATH=CDAT_PREFIX/VTK/bin/vtkWrapPythonInit
-
-//Wrap VTK classes into the TCL language.
-VTK_WRAP_TCL:BOOL=ON
-
-//Path to an internal program.
-VTK_WRAP_TCL_EXE:FILEPATH=CDAT_PREFIX/VTK/bin/vtkWrapTcl
-
-//Path to an internal program.
-VTK_WRAP_TCL_INIT_EXE:FILEPATH=CDAT_PREFIX/VTK/bin/vtkWrapTclInit
-
-//What is the path where the file X11/X.h can be found
-X11_X11_INCLUDE_PATH:PATH=/usr/X11R6/include
-
-//Where can the X11 library be found
-X11_X11_LIB:FILEPATH=/usr/X11R6/lib/libX11.so
-
-//Where can the Xext library be found
-X11_Xext_LIB:FILEPATH=/usr/X11R6/lib/libXext.so
-
-//What is the path where the file X11/Xlib.h can be found
-X11_Xlib_INCLUDE_PATH:PATH=/usr/X11R6/include
-
-//What is the path where the file X11/Xutil.h can be found
-X11_Xutil_INCLUDE_PATH:PATH=/usr/X11R6/include
-
-//Dependencies for the target
-vtkCommonPython_LIB_DEPENDS:STATIC=vtkCommon;
-
-//Dependencies for the target
-vtkCommonTCL_LIB_DEPENDS:STATIC=vtkCommon;CDAT_PREFIX/lib/libtclTCLTK_VERSION.a;m;
-
-//Dependencies for the target
-vtkCommon_LIB_DEPENDS:STATIC=-lpthread;-ldl;-lm;
-
-//Dependencies for target
-vtkDICOMParser_LIB_DEPENDS:STATIC=
-
-//Value Computed by CMake
-vtkExodus2_BINARY_DIR:STATIC=CDAT_PREFIX/VTK/Utilities/vtkexodus2
-
-//Value Computed by CMake
-vtkExodus2_SOURCE_DIR:STATIC=CDAT_BUILD_DIR/VTK/VTK/Utilities/vtkexodus2
-
-//Dependencies for the target
-vtkFilteringPython_LIB_DEPENDS:STATIC=vtkFiltering;vtkCommonPython;
-
-//Dependencies for the target
-vtkFilteringTCL_LIB_DEPENDS:STATIC=vtkFiltering;vtkCommonTCL;
-
-//Dependencies for the target
-vtkFiltering_LIB_DEPENDS:STATIC=vtkCommon;
-
-//Dependencies for the target
-vtkGenericFilteringPython_LIB_DEPENDS:STATIC=vtkGenericFiltering;vtkFilteringPython;vtkGraphicsPython;
-
-//Dependencies for the target
-vtkGenericFilteringTCL_LIB_DEPENDS:STATIC=vtkGenericFiltering;vtkFilteringTCL;vtkGraphicsTCL;
-
-//Dependencies for the target
-vtkGenericFiltering_LIB_DEPENDS:STATIC=vtkFiltering;vtkGraphics;
-
-//Dependencies for the target
-vtkGraphicsPython_LIB_DEPENDS:STATIC=vtkGraphics;vtkFilteringPython;
-
-//Dependencies for the target
-vtkGraphicsTCL_LIB_DEPENDS:STATIC=vtkGraphics;vtkFilteringTCL;
-
-//Dependencies for the target
-vtkGraphics_LIB_DEPENDS:STATIC=vtkFiltering;
-
-//Dependencies for the target
-vtkHybridPython_LIB_DEPENDS:STATIC=vtkHybrid;vtkRenderingPython;vtkIOPython;
-
-//Dependencies for the target
-vtkHybridTCL_LIB_DEPENDS:STATIC=vtkHybrid;vtkRenderingTCL;vtkIOTCL;
-
-//Dependencies for the target
-vtkHybrid_LIB_DEPENDS:STATIC=vtkRendering;vtkIO;vtkexoIIc;
-
-//Dependencies for the target
-vtkIOPython_LIB_DEPENDS:STATIC=vtkIO;vtkFilteringPython;
-
-//Dependencies for the target
-vtkIOTCL_LIB_DEPENDS:STATIC=vtkIO;vtkFilteringTCL;
-
-//Dependencies for the target
-vtkIO_LIB_DEPENDS:STATIC=vtkFiltering;vtkDICOMParser;vtkpng;vtkzlib;vtkjpeg;vtktiff;vtkexpat;
-
-//Dependencies for the target
-vtkImagingPython_LIB_DEPENDS:STATIC=vtkImaging;vtkFilteringPython;
-
-//Dependencies for the target
-vtkImagingTCL_LIB_DEPENDS:STATIC=vtkImaging;vtkFilteringTCL;
-
-//Dependencies for the target
-vtkImaging_LIB_DEPENDS:STATIC=vtkFiltering;
-
-//Dependencies for target
-vtkNetCDF_LIB_DEPENDS:STATIC=
-
-//Dependencies for the target
-vtkRenderingPythonTkWidgets_LIB_DEPENDS:STATIC=vtkRendering;CDAT_PREFIX/lib/libtkTCLTK_VERSION.a;CDAT_PREFIX/lib/libtclTCLTK_VERSION.a;m;
-
-//Dependencies for the target
-vtkRenderingPython_LIB_DEPENDS:STATIC=vtkRendering;vtkGraphicsPython;vtkImagingPython;
-
-//Dependencies for the target
-vtkRenderingTCL_LIB_DEPENDS:STATIC=vtkRendering;vtkGraphicsTCL;vtkImagingTCL;CDAT_PREFIX/lib/libtkTCLTK_VERSION.a;CDAT_PREFIX/lib/libtclTCLTK_VERSION.a;m;
-
-//Dependencies for the target
-vtkRendering_LIB_DEPENDS:STATIC=vtkGraphics;vtkImaging;vtkIO;vtkftgl;vtkfreetype;vtkzlib;/usr/lib/libGL.so;-lXt;-lSM;-lICE;-lSM;-lICE;-lSM;-lICE;/usr/X11R6/lib/libX11.so;/usr/X11R6/lib/libXext.so;/usr/X11R6/lib/libX11.so;/usr/X11R6/lib/libXext.so;/usr/X11R6/lib/libX11.so;/usr/X11R6/lib/libXext.so;
-
-//Dependencies for the target
-vtkVolumeRenderingPython_LIB_DEPENDS:STATIC=vtkVolumeRendering;vtkRenderingPython;vtkIOPython;
-
-//Dependencies for the target
-vtkVolumeRenderingTCL_LIB_DEPENDS:STATIC=vtkVolumeRendering;vtkRenderingTCL;vtkIOTCL;
-
-//Dependencies for the target
-vtkVolumeRendering_LIB_DEPENDS:STATIC=vtkRendering;vtkIO;
-
-//Dependencies for the target
-vtkWidgetsPython_LIB_DEPENDS:STATIC=vtkWidgets;vtkRenderingPython;vtkHybridPython;
-
-//Dependencies for the target
-vtkWidgetsTCL_LIB_DEPENDS:STATIC=vtkWidgets;vtkRenderingTCL;vtkHybridTCL;
-
-//Dependencies for the target
-vtkWidgets_LIB_DEPENDS:STATIC=vtkRendering;vtkHybrid;
-
-//Dependencies for the target
-vtkexoIIc_LIB_DEPENDS:STATIC=vtkNetCDF;
-
-//Dependencies for target
-vtkexpat_LIB_DEPENDS:STATIC=
-
-//Dependencies for target
-vtkfreetype_LIB_DEPENDS:STATIC=
-
-//Dependencies for the target
-vtkftgl_LIB_DEPENDS:STATIC=/usr/lib/libGL.so;vtkfreetype;
-
-//Dependencies for target
-vtkjpeg_LIB_DEPENDS:STATIC=
-
-//Dependencies for the target
-vtkpng_LIB_DEPENDS:STATIC=vtkzlib;
-
-//Value Computed by CMake
-vtksys_BINARY_DIR:STATIC=CDAT_PREFIX/VTK/Utilities/kwsys
-
-//Dependencies for target
-vtksys_LIB_DEPENDS:STATIC=
-
-//Value Computed by CMake
-vtksys_SOURCE_DIR:STATIC=CDAT_BUILD_DIR/VTK/VTK/Utilities/kwsys
-
-//Dependencies for the target
-vtktiff_LIB_DEPENDS:STATIC=vtkzlib;vtkjpeg;
-
-//Dependencies for target
-vtkzlib_LIB_DEPENDS:STATIC=
-
-
-########################
-# INTERNAL cache entries
-########################
-
-//Executable to project name.
-CDAT_PREFIX/VTK/bin/vtkWrapPython:INTERNAL=vtkWrapPython
-//Executable to project name.
-CDAT_PREFIX/VTK/bin/vtkWrapPythonInit:INTERNAL=vtkWrapPythonInit
-//Executable to project name.
-CDAT_PREFIX/VTK/bin/vtkWrapTcl:INTERNAL=vtkWrapTcl
-//Executable to project name.
-CDAT_PREFIX/VTK/bin/vtkWrapTclInit:INTERNAL=vtkWrapTclInit
-//Advanced flag for variable: BUILD_DOCUMENTATION
-BUILD_DOCUMENTATION-ADVANCED:INTERNAL=1
-//Advanced flag for variable: BUILD_TESTING
-BUILD_TESTING-ADVANCED:INTERNAL=1
-//Result of TRY_COMPILE
-CMAKE_ANSI_FOR_SCOPE:INTERNAL=TRUE
-//Have include iostream
-CMAKE_ANSI_STREAM_HEADERS:INTERNAL=1
-//Advanced flag for variable: CMAKE_AR
-CMAKE_AR-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_BUILD_TOOL
-CMAKE_BUILD_TOOL-ADVANCED:INTERNAL=1
-//What is the target build tool cmake is generating for.
-CMAKE_BUILD_TOOL:INTERNAL=/usr/bin/gmake
-//This is the directory where this CMakeCahe.txt was created
-CMAKE_CACHEFILE_DIR:INTERNAL=CDAT_PREFIX/VTK
-//Major version of cmake used to create the current loaded cache
-//
-CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2
-//Minor version of cmake used to create the current loaded cache
-//
-CMAKE_CACHE_MINOR_VERSION:INTERNAL=0
-//Major version of cmake used to create the current loaded cache
-//
-CMAKE_CACHE_RELEASE_VERSION:INTERNAL=patch 6
-//Path to CMake executable.
-CMAKE_COMMAND:INTERNAL=CDAT_PREFIX/bin/cmake
-//Advanced flag for variable: CMAKE_CTEST_COMMAND
-CMAKE_CTEST_COMMAND-ADVANCED:INTERNAL=1
-//Path to ctest program executable.
-CMAKE_CTEST_COMMAND:INTERNAL=CDAT_PREFIX/bin/ctest
-//Advanced flag for variable: CMAKE_CXX_COMPILER
-CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1
-//full path to the compiler cmake found
-CMAKE_CXX_COMPILER_FULLPATH:INTERNAL=/usr/bin/c++
-//Result of TRY_COMPILE
-CMAKE_CXX_COMPILER_WORKS:INTERNAL=TRUE
-//Advanced flag for variable: CMAKE_CXX_FLAGS
-CMAKE_CXX_FLAGS-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_CXX_FLAGS_DEBUG
-CMAKE_CXX_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_CXX_FLAGS_MINSIZEREL
-CMAKE_CXX_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_CXX_FLAGS_RELEASE
-CMAKE_CXX_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_CXX_FLAGS_RELWITHDEBINFO
-CMAKE_CXX_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_C_COMPILER
-CMAKE_C_COMPILER-ADVANCED:INTERNAL=1
-//full path to the compiler cmake found
-CMAKE_C_COMPILER_FULLPATH:INTERNAL=/usr/bin/gcc
-//Result of TRY_COMPILE
-CMAKE_C_COMPILER_WORKS:INTERNAL=TRUE
-//Advanced flag for variable: CMAKE_C_FLAGS
-CMAKE_C_FLAGS-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_C_FLAGS_DEBUG
-CMAKE_C_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_C_FLAGS_MINSIZEREL
-CMAKE_C_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_C_FLAGS_RELEASE
-CMAKE_C_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_C_FLAGS_RELWITHDEBINFO
-CMAKE_C_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//Path to cache edit program executable.
-CMAKE_EDIT_COMMAND:INTERNAL=CDAT_PREFIX/bin/ccmake
-//Advanced flag for variable: CMAKE_EXE_LINKER_FLAGS
-CMAKE_EXE_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_EXE_LINKER_FLAGS_DEBUG
-CMAKE_EXE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_EXE_LINKER_FLAGS_MINSIZEREL
-//
-CMAKE_EXE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_EXE_LINKER_FLAGS_RELEASE
-CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
-//
-CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//Name of generator.
-CMAKE_GENERATOR:INTERNAL=Unix Makefiles
-//Have include sstream
-CMAKE_HAS_ANSI_STRING_STREAM:INTERNAL=1
-//Is X11 around.
-CMAKE_HAS_X:INTERNAL=1
-//Have function connect
-CMAKE_HAVE_CONNECT:INTERNAL=1
-//Have function gethostbyname
-CMAKE_HAVE_GETHOSTBYNAME:INTERNAL=1
-//Have include limits.h
-CMAKE_HAVE_LIMITS_H:INTERNAL=1
-//Have library pthreads
-CMAKE_HAVE_PTHREADS_CREATE:INTERNAL=
-//Have library pthread
-CMAKE_HAVE_PTHREAD_CREATE:INTERNAL=1
-//Have include pthread.h
-CMAKE_HAVE_PTHREAD_H:INTERNAL=1
-//Have function remove
-CMAKE_HAVE_REMOVE:INTERNAL=1
-//Have function shmat
-CMAKE_HAVE_SHMAT:INTERNAL=1
-//Have include sys/prctl.h
-CMAKE_HAVE_SYS_PRCTL_H:INTERNAL=1
-//Have include unistd.h
-CMAKE_HAVE_UNISTD_H:INTERNAL=1
-//Start directory with the top level CMakeLists.txt file for this
-// project
-CMAKE_HOME_DIRECTORY:INTERNAL=CDAT_BUILD_DIR/VTK/VTK
-//Advanced flag for variable: CMAKE_HP_PTHREADS
-CMAKE_HP_PTHREADS-ADVANCED:INTERNAL=1
-//Have library ICE
-CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER:INTERNAL=1
-//Advanced flag for variable: CMAKE_MAKE_PROGRAM
-CMAKE_MAKE_PROGRAM-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_MODULE_LINKER_FLAGS
-CMAKE_MODULE_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_MODULE_LINKER_FLAGS_DEBUG
-CMAKE_MODULE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL
-//
-CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_MODULE_LINKER_FLAGS_RELEASE
-//
-CMAKE_MODULE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO
-//
-CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//Does the compiler support ansi for scope.
-CMAKE_NO_ANSI_FOR_SCOPE:INTERNAL=0
-//Advanced flag for variable: CMAKE_NO_ANSI_STREAM_HEADERS
-CMAKE_NO_ANSI_STREAM_HEADERS-ADVANCED:INTERNAL=1
-//Does the compiler support headers like iostream.
-CMAKE_NO_ANSI_STREAM_HEADERS:INTERNAL=0
-//Does the compiler support std::.
-CMAKE_NO_STD_NAMESPACE:INTERNAL=0
-//Advanced flag for variable: CMAKE_RANLIB
-CMAKE_RANLIB-ADVANCED:INTERNAL=1
-//Path to CMake installation.
-CMAKE_ROOT:INTERNAL=CDAT_PREFIX/share/CMake
-//Advanced flag for variable: CMAKE_SHARED_LINKER_FLAGS
-CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG
-CMAKE_SHARED_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL
-//
-CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_SHARED_LINKER_FLAGS_RELEASE
-//
-CMAKE_SHARED_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO
-//
-CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//Result of TRY_RUN
-CMAKE_SIZEOF_CHAR:INTERNAL=1
-//Result of TRY_RUN
-CMAKE_SIZEOF_DOUBLE:INTERNAL=8
-//Result of TRY_RUN
-CMAKE_SIZEOF_FLOAT:INTERNAL=4
-//Result of TRY_RUN
-CMAKE_SIZEOF_INT:INTERNAL=4
-//Result of TRY_RUN
-CMAKE_SIZEOF_LONG:INTERNAL=4
-//Result of TRY_RUN
-CMAKE_SIZEOF_SHORT:INTERNAL=2
-//Result of TRY_RUN
-CMAKE_SIZEOF_VOID_P:INTERNAL=4
-//Advanced flag for variable: CMAKE_SKIP_RPATH
-CMAKE_SKIP_RPATH-ADVANCED:INTERNAL=1
-//Whether to build with rpath.
-CMAKE_SKIP_RPATH:INTERNAL=0
-//Result of TRY_COMPILE
-CMAKE_STD_NAMESPACE:INTERNAL=TRUE
-//Advanced flag for variable: CMAKE_THREAD_LIBS
-CMAKE_THREAD_LIBS-ADVANCED:INTERNAL=1
-//uname command
-CMAKE_UNAME:INTERNAL=/bin/uname
-//Advanced flag for variable: CMAKE_USE_PTHREADS
-CMAKE_USE_PTHREADS-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_USE_RELATIVE_PATHS
-CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_USE_SPROC
-CMAKE_USE_SPROC-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_USE_WIN32_THREADS
-CMAKE_USE_WIN32_THREADS-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_VERBOSE_MAKEFILE
-CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
-//Result of TRY_RUN
-CMAKE_WORDS_BIGENDIAN:INTERNAL=0
-//Advanced flag for variable: CMAKE_X_CFLAGS
-CMAKE_X_CFLAGS-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CMAKE_X_LIBS
-CMAKE_X_LIBS-ADVANCED:INTERNAL=1
-//Advanced flag for variable: COMPRESSIONCOMMAND
-COMPRESSIONCOMMAND-ADVANCED:INTERNAL=1
-//Advanced flag for variable: COVERAGE_COMMAND
-COVERAGE_COMMAND-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CVSCOMMAND
-CVSCOMMAND-ADVANCED:INTERNAL=1
-//Advanced flag for variable: CVS_UPDATE_OPTIONS
-CVS_UPDATE_OPTIONS-ADVANCED:INTERNAL=1
-//Path to an executable
-CommonCxxTests_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Common/Testing/Cxx
-//Advanced flag for variable: DART_BUILD_ERROR_REPORT_LIMIT
-DART_BUILD_ERROR_REPORT_LIMIT-ADVANCED:INTERNAL=1
-//Advanced flag for variable: DART_BUILD_WARNING_REPORT_LIMIT
-DART_BUILD_WARNING_REPORT_LIMIT-ADVANCED:INTERNAL=1
-//Advanced flag for variable: DART_ROOT
-DART_ROOT-ADVANCED:INTERNAL=1
-//Advanced flag for variable: DART_TESTING_TIMEOUT
-DART_TESTING_TIMEOUT-ADVANCED:INTERNAL=1
-//Advanced flag for variable: DART_VERBOSE_BUILD
-DART_VERBOSE_BUILD-ADVANCED:INTERNAL=1
-//Advanced flag for variable: DELIVER_CONTINUOUS_EMAIL
-DELIVER_CONTINUOUS_EMAIL-ADVANCED:INTERNAL=1
-//Single output directory for building all executables.
-EXECUTABLE_OUTPUT_PATH:INTERNAL=CDAT_PREFIX/VTK/bin
-//Path to an executable
-FilteringCxxTests_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Filtering/Testing/Cxx
-//Advanced flag for variable: GUNZIPCOMMAND
-GUNZIPCOMMAND-ADVANCED:INTERNAL=1
-//Path to an executable
-GenericFilteringCxxTests_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/GenericFiltering/Testing/Cxx
-//Path to an executable
-GraphicsCxxTests_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Graphics/Testing/Cxx
-//Have symbol alloca
-HAVE_ALLOCA:INTERNAL=1
-//Have include HAVE_ALLOCA_H
-HAVE_ALLOCA_H:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_CHAR:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_DOUBLE:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_FLOAT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_INT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_LONG:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_SHORT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_VOID_P:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_WORDS_BIGENDIAN:INTERNAL=TRUE
-//Have include fcntl.h
-HAVE_FCNTL_H:INTERNAL=1
-//NetCDF test 
-HAVE_FTRUNCATE:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_SIZEOF_DOUBLE:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_FLOAT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_INT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_LONG:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_OFF_T:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_PTRDIFF_T:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_SHORT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_SIZE_T:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_SSIZE_T:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_UNSIGNED_CHAR:INTERNAL=TRUE
-//Have include HAVE_STDDEF_H
-HAVE_STDDEF_H:INTERNAL=1
-//Have include HAVE_STDINT_H
-HAVE_STDINT_H:INTERNAL=1
-//Have include HAVE_STDIO_H
-HAVE_STDIO_H:INTERNAL=1
-//Have include HAVE_STDLIB_H
-HAVE_STDLIB_H:INTERNAL=1
-//Have symbol strerror
-HAVE_STRERROR:INTERNAL=1
-//Have include HAVE_STRING_H
-HAVE_STRING_H:INTERNAL=1
-//NetCDF test 
-HAVE_ST_BLKSIZE:INTERNAL=1
-//Have include HAVE_SYS_STAT_H
-HAVE_SYS_STAT_H:INTERNAL=1
-//Have include HAVE_SYS_TYPES_H
-HAVE_SYS_TYPES_H:INTERNAL=1
-//Have include unistd.h
-HAVE_UNISTD_H:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_VTK_SIZEOF_LONG_LONG:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_VTK_SIZEOF___INT64:INTERNAL=FALSE
-//Result of TRY_COMPILE
-HAVE_WORDS_BIGENDIAN:INTERNAL=TRUE
-//Path to an executable
-IOCxxTests_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/IO/Testing/Cxx
-//Path to an executable
-ImagingCxxTests_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Imaging/Testing/Cxx
-//Advanced flag for variable: JAVACOMMAND
-JAVACOMMAND-ADVANCED:INTERNAL=1
-//Result of TRY_COMPILE
-KWSYS_CXX_HAS_ARGUMENT_DEPENDENT_LOOKUP_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_CXX_HAS_CSTDDEF_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_CXX_HAS_FULL_SPECIALIZATION_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_CXX_HAS_MEMBER_TEMPLATES_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_CXX_HAS_NULL_TEMPLATE_ARGS_COMPILED:INTERNAL=FALSE
-//Result of TRY_COMPILE
-KWSYS_IOS_HAVE_STD_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_IOS_USE_ANSI_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_IOS_USE_SSTREAM_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_STAT_HAS_ST_MTIM_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_STL_HAS_ALLOCATOR_MAX_SIZE_ARGUMENT_COMPILED:INTERNAL=FALSE
-//Result of TRY_COMPILE
-KWSYS_STL_HAS_ALLOCATOR_OBJECTS_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_STL_HAS_ALLOCATOR_REBIND_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_STL_HAS_ALLOCATOR_TEMPLATE_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_STL_HAS_ITERATOR_TRAITS_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_STL_HAVE_STD_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_STL_STRING_HAVE_NEQ_CHAR_COMPILED:INTERNAL=TRUE
-//Single output directory for building all libraries.
-LIBRARY_OUTPUT_PATH:INTERNAL=CDAT_PREFIX/VTK/bin
-//Advanced flag for variable: MAKECOMMAND
-MAKECOMMAND-ADVANCED:INTERNAL=1
-//Advanced flag for variable: MEMORYCHECK_COMMAND
-MEMORYCHECK_COMMAND-ADVANCED:INTERNAL=1
-//Advanced flag for variable: MEMORYCHECK_SUPPRESSIONS_FILE
-MEMORYCHECK_SUPPRESSIONS_FILE-ADVANCED:INTERNAL=1
-//Advanced flag for variable: OPENGL_INCLUDE_DIR
-OPENGL_INCLUDE_DIR-ADVANCED:INTERNAL=1
-//Advanced flag for variable: OPENGL_gl_LIBRARY
-OPENGL_gl_LIBRARY-ADVANCED:INTERNAL=1
-//Advanced flag for variable: OPENGL_glu_LIBRARY
-OPENGL_glu_LIBRARY-ADVANCED:INTERNAL=1
-//Advanced flag for variable: OPENGL_xmesa_INCLUDE_DIR
-OPENGL_xmesa_INCLUDE_DIR-ADVANCED:INTERNAL=1
-//Advanced flag for variable: PYTHON_EXECUTABLE
-PYTHON_EXECUTABLE-ADVANCED:INTERNAL=1
-//Advanced flag for variable: PYTHON_UTIL_LIBRARY
-PYTHON_UTIL_LIBRARY-ADVANCED:INTERNAL=1
-//Path to an executable
-RenderingCxxTests_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Rendering/Testing/Cxx
-//Advanced flag for variable: SCPCOMMAND
-SCPCOMMAND-ADVANCED:INTERNAL=1
-//Advanced flag for variable: SITE
-SITE-ADVANCED:INTERNAL=1
-//Result of TRY_RUN
-SIZEOF_DOUBLE:INTERNAL=8
-//Result of TRY_RUN
-SIZEOF_FLOAT:INTERNAL=4
-//Result of TRY_RUN
-SIZEOF_INT:INTERNAL=4
-//Result of TRY_RUN
-SIZEOF_LONG:INTERNAL=4
-//Result of TRY_RUN
-SIZEOF_OFF_T:INTERNAL=4
-//Result of TRY_RUN
-SIZEOF_PTRDIFF_T:INTERNAL=4
-//Result of TRY_RUN
-SIZEOF_SHORT:INTERNAL=2
-//Result of TRY_RUN
-SIZEOF_SIZE_T:INTERNAL=4
-//Result of TRY_RUN
-SIZEOF_SSIZE_T:INTERNAL=4
-//Result of TRY_RUN
-SIZEOF_UNSIGNED_CHAR:INTERNAL=1
-//Have include STDC_HEADERS
-STDC_HEADERS:INTERNAL=1
-//This value is not used by VTK.
-TCL_LIBRARY_DEBUG:INTERNAL=TCL_LIBRARY_DEBUG-NOTFOUND
-//Advanced flag for variable: TCL_STUB_LIBRARY
-TCL_STUB_LIBRARY-ADVANCED:INTERNAL=1
-//This value is not used by VTK.
-TCL_STUB_LIBRARY:INTERNAL=CDAT_PREFIX/lib/libtclstubTCLTK_VERSION.a
-//Advanced flag for variable: TCL_STUB_LIBRARY_DEBUG
-TCL_STUB_LIBRARY_DEBUG-ADVANCED:INTERNAL=1
-//This value is not used by VTK.
-TCL_STUB_LIBRARY_DEBUG:INTERNAL=TCL_STUB_LIBRARY_DEBUG-NOTFOUND
-//Advanced flag for variable: TCL_TCLSH
-TCL_TCLSH-ADVANCED:INTERNAL=1
-//This value is not used by VTK.
-TK_LIBRARY_DEBUG:INTERNAL=TK_LIBRARY_DEBUG-NOTFOUND
-//Advanced flag for variable: TK_STUB_LIBRARY
-TK_STUB_LIBRARY-ADVANCED:INTERNAL=1
-//This value is not used by VTK.
-TK_STUB_LIBRARY:INTERNAL=CDAT_PREFIX/lib/libtkstubTCLTK_VERSION.a
-//Advanced flag for variable: TK_STUB_LIBRARY_DEBUG
-TK_STUB_LIBRARY_DEBUG-ADVANCED:INTERNAL=1
-//This value is not used by VTK.
-TK_STUB_LIBRARY_DEBUG:INTERNAL=TK_STUB_LIBRARY_DEBUG-NOTFOUND
-//This value is not used by VTK.
-TK_WISH:INTERNAL=/usr/bin/wish
-//Path to an executable
-TestCxxFeatures_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Common/Testing/Cxx
-//Path to an executable
-TestInstantiator_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Common/Testing/Cxx
-//Path to an executable
-VTKBenchMark_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Rendering/Testing/Cxx
-//Result of TRY_COMPILE
-VTK_ANSI_STREAM_EOF_COMPILED:INTERNAL=TRUE
-//Result of TRY_RUN
-VTK_ANSI_STREAM_EOF_RESULT:INTERNAL=0
-//Result of TRY_COMPILE
-VTK_CMAKE_EXTENSIONS_COMPILED:INTERNAL=TRUE
-//Support for C++ type bool
-VTK_COMPILER_HAS_BOOL:INTERNAL=1
-//Support for full template specialization syntax
-VTK_COMPILER_HAS_FULL_SPECIALIZATION:INTERNAL=1
-//Advanced flag for variable: VTK_DEBUG_LEAKS
-VTK_DEBUG_LEAKS-ADVANCED:INTERNAL=1
-//Disables the automatic initialization of Tk widgets when loading
-// the rendering library.
-VTK_DISABLE_TK_INIT:INTERNAL=OFF
-//Support for C++ explict templates
-VTK_EXPLICIT_TEMPLATES:INTERNAL=1
-//Advanced flag for variable: VTK_GLEXT_FILE
-VTK_GLEXT_FILE-ADVANCED:INTERNAL=1
-//Advanced flag for variable: VTK_GLXEXT_FILE
-VTK_GLXEXT_FILE-ADVANCED:INTERNAL=1
-//Result of TRY_COMPILE
-VTK_GLX_GET_PROC_ADDRESS_ARB_PROTOTYPE_EXISTS:INTERNAL=FALSE
-//Already set VTK_GLX_GET_PROC_ADDRESS_ARB_PROTOTYPE_EXISTS
-VTK_GLX_GET_PROC_ADDRESS_ARB_PROTOTYPE_EXISTS_TESTED:INTERNAL=1
-//Have include iosfwd
-VTK_HAVE_ANSI_STREAMS:INTERNAL=1
-//Have include iostream.h
-VTK_HAVE_OLD_STREAMS:INTERNAL=1
-//Have include strstream.h
-VTK_HAVE_OLD_STRSTREAM_H:INTERNAL=1
-//Have include strstrea.h
-VTK_HAVE_OLD_STRSTREA_H:INTERNAL=
-//Whether istream supports long long
-VTK_ISTREAM_SUPPORTS_LONG_LONG:INTERNAL=1
-//Advanced flag for variable: VTK_LEGACY_REMOVE
-VTK_LEGACY_REMOVE-ADVANCED:INTERNAL=1
-//Advanced flag for variable: VTK_LEGACY_SILENT
-VTK_LEGACY_SILENT-ADVANCED:INTERNAL=1
-//Advanced flag for variable: VTK_OPENGL_HAS_OSMESA
-VTK_OPENGL_HAS_OSMESA-ADVANCED:INTERNAL=1
-//Whether ostream supports long long
-VTK_OSTREAM_SUPPORTS_LONG_LONG:INTERNAL=1
-//OpenGL extensions parser.
-VTK_PARSEOGLEXT_EXE:INTERNAL=CDAT_PREFIX/VTK/bin/vtkParseOGLExt
-//Result of TRY_RUN
-VTK_SIZEOF_LONG_LONG:INTERNAL=8
-//Path to the Tcl support library files.
-VTK_TCL_SUPPORT_LIBRARY_PATH:INTERNAL=CDAT_PREFIX/include/../lib/tclTCLTK_VERSION
-//Very few users should worry about this option. If VTK is built
-// against a static Tcl/Tk lib (see VTK_TCL_TK_STATIC) or a shared
-// Tcl/Tk bundled inside a project with no library support files
-// (ex: ParaViewComplete), this variable should be set to ON and
-// both VTK_TCL_SUPPORT_LIBRARY_PATH and VTK_TK_SUPPORT_LIBRARY_PATH
-// should point to the directories that hold those files (typically,
-// lib/tcl8.4 and lib/tk8.4 for a typical Tcl/Tk installation,
-// or tcl8.4.5/library and tk8.4.5/library for a Tcl/Tk source
-// repository). Once this variable is set to ON, support files
-// will automatically be copied to the build directory and the
-// executables will try to use that location to initialize Tcl/Tk.
-//
-VTK_TCL_TK_COPY_SUPPORT_LIBRARY:INTERNAL=ON
-//Advanced flag for variable: VTK_TCL_TK_STATIC
-VTK_TCL_TK_STATIC-ADVANCED:INTERNAL=1
-//Path to the Tk support library files.
-VTK_TK_SUPPORT_LIBRARY_PATH:INTERNAL=CDAT_PREFIX/include/../lib/tkTCLTK_VERSION
-//Whether char is signed.
-VTK_TYPE_CHAR_IS_SIGNED:INTERNAL=1
-//Result of TRY_COMPILE
-VTK_TYPE_CHAR_IS_SIGNED_COMPILED:INTERNAL=TRUE
-//Advanced flag for variable: VTK_USE_64BIT_IDS
-VTK_USE_64BIT_IDS-ADVANCED:INTERNAL=1
-//Advanced flag for variable: VTK_USE_ANSI_STDLIB
-VTK_USE_ANSI_STDLIB-ADVANCED:INTERNAL=1
-//Advanced flag for variable: VTK_USE_DISPLAY
-VTK_USE_DISPLAY-ADVANCED:INTERNAL=1
-//Advanced flag for variable: VTK_USE_GL2PS
-VTK_USE_GL2PS-ADVANCED:INTERNAL=1
-//Have function glXGetProcAddressARB
-VTK_USE_GLX_GET_PROC_ADDRESS_ARB:INTERNAL=1
-//Advanced flag for variable: VTK_USE_GUISUPPORT
-VTK_USE_GUISUPPORT-ADVANCED:INTERNAL=1
-//Advanced flag for variable: VTK_USE_MANGLED_MESA
-VTK_USE_MANGLED_MESA-ADVANCED:INTERNAL=1
-//Advanced flag for variable: VTK_USE_SYSTEM_EXPAT
-VTK_USE_SYSTEM_EXPAT-ADVANCED:INTERNAL=1
-//Advanced flag for variable: VTK_USE_SYSTEM_FREETYPE
-VTK_USE_SYSTEM_FREETYPE-ADVANCED:INTERNAL=1
-//Advanced flag for variable: VTK_USE_SYSTEM_JPEG
-VTK_USE_SYSTEM_JPEG-ADVANCED:INTERNAL=1
-//Advanced flag for variable: VTK_USE_SYSTEM_PNG
-VTK_USE_SYSTEM_PNG-ADVANCED:INTERNAL=1
-//Advanced flag for variable: VTK_USE_SYSTEM_TIFF
-VTK_USE_SYSTEM_TIFF-ADVANCED:INTERNAL=1
-//Advanced flag for variable: VTK_USE_SYSTEM_ZLIB
-VTK_USE_SYSTEM_ZLIB-ADVANCED:INTERNAL=1
-//Advanced flag for variable: VTK_WGLEXT_FILE
-VTK_WGLEXT_FILE-ADVANCED:INTERNAL=1
-//Advanced flag for variable: VTK_WRAP_HINTS
-VTK_WRAP_HINTS-ADVANCED:INTERNAL=1
-//Advanced flag for variable: VTK_WRAP_PYTHON_EXE
-VTK_WRAP_PYTHON_EXE-ADVANCED:INTERNAL=1
-//Advanced flag for variable: VTK_WRAP_PYTHON_INIT_EXE
-VTK_WRAP_PYTHON_INIT_EXE-ADVANCED:INTERNAL=1
-//Advanced flag for variable: VTK_WRAP_TCL_EXE
-VTK_WRAP_TCL_EXE-ADVANCED:INTERNAL=1
-//Advanced flag for variable: VTK_WRAP_TCL_INIT_EXE
-VTK_WRAP_TCL_INIT_EXE-ADVANCED:INTERNAL=1
-//Path to an executable
-VolumeRenderingCxxTests_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/VolumeRendering/Testing/Cxx
-//Result of TRY_RUN
-WORDS_BIGENDIAN:INTERNAL=0
-//Path to an executable
-WidgetsCxxTests_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Widgets/Testing/Cxx
-//Have library /usr/X11R6/lib/libX11.so;/usr/X11R6/lib/libXext.so
-//
-X11_LIB_X11_SOLO:INTERNAL=1
-//Advanced flag for variable: X11_X11_INCLUDE_PATH
-X11_X11_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//Advanced flag for variable: X11_X11_LIB
-X11_X11_LIB-ADVANCED:INTERNAL=1
-//Advanced flag for variable: X11_Xext_LIB
-X11_Xext_LIB-ADVANCED:INTERNAL=1
-//Advanced flag for variable: X11_Xlib_INCLUDE_PATH
-X11_Xlib_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//Advanced flag for variable: X11_Xutil_INCLUDE_PATH
-X11_Xutil_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//Path to an executable
-mkg3states_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Utilities/vtktiff
-//Path to a library
-vtkCommonPython_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Common
-//Whether a library is static, shared or module.
-vtkCommonPython_LIBRARY_TYPE:INTERNAL=MODULE
-//Path to a library
-vtkCommonTCL_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Common
-//Whether a library is static, shared or module.
-vtkCommonTCL_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkCommon_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Common
-//Whether a library is static, shared or module.
-vtkCommon_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkDICOMParser_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Utilities/DICOMParser
-//Whether a library is static, shared or module.
-vtkDICOMParser_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkFilteringPython_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Filtering
-//Whether a library is static, shared or module.
-vtkFilteringPython_LIBRARY_TYPE:INTERNAL=MODULE
-//Path to a library
-vtkFilteringTCL_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Filtering
-//Whether a library is static, shared or module.
-vtkFilteringTCL_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkFiltering_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Filtering
-//Whether a library is static, shared or module.
-vtkFiltering_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkGenericFilteringPython_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/GenericFiltering
-//Whether a library is static, shared or module.
-vtkGenericFilteringPython_LIBRARY_TYPE:INTERNAL=MODULE
-//Path to a library
-vtkGenericFilteringTCL_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/GenericFiltering
-//Whether a library is static, shared or module.
-vtkGenericFilteringTCL_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkGenericFiltering_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/GenericFiltering
-//Whether a library is static, shared or module.
-vtkGenericFiltering_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkGraphicsPython_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Graphics
-//Whether a library is static, shared or module.
-vtkGraphicsPython_LIBRARY_TYPE:INTERNAL=MODULE
-//Path to a library
-vtkGraphicsTCL_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Graphics
-//Whether a library is static, shared or module.
-vtkGraphicsTCL_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkGraphics_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Graphics
-//Whether a library is static, shared or module.
-vtkGraphics_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkHybridPython_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Hybrid
-//Whether a library is static, shared or module.
-vtkHybridPython_LIBRARY_TYPE:INTERNAL=MODULE
-//Path to a library
-vtkHybridTCL_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Hybrid
-//Whether a library is static, shared or module.
-vtkHybridTCL_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkHybrid_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Hybrid
-//Whether a library is static, shared or module.
-vtkHybrid_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkIOPython_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/IO
-//Whether a library is static, shared or module.
-vtkIOPython_LIBRARY_TYPE:INTERNAL=MODULE
-//Path to a library
-vtkIOTCL_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/IO
-//Whether a library is static, shared or module.
-vtkIOTCL_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkIO_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/IO
-//Whether a library is static, shared or module.
-vtkIO_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkImagingPython_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Imaging
-//Whether a library is static, shared or module.
-vtkImagingPython_LIBRARY_TYPE:INTERNAL=MODULE
-//Path to a library
-vtkImagingTCL_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Imaging
-//Whether a library is static, shared or module.
-vtkImagingTCL_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkImaging_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Imaging
-//Whether a library is static, shared or module.
-vtkImaging_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkNetCDF_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Utilities/vtknetcdf
-//Whether a library is static, shared or module.
-vtkNetCDF_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to an executable
-vtkParseOGLExt_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Utilities/ParseOGLExt
-//Path to a library
-vtkRenderingPythonTkWidgets_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Rendering
-//Whether a library is static, shared or module.
-vtkRenderingPythonTkWidgets_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkRenderingPython_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Rendering
-//Whether a library is static, shared or module.
-vtkRenderingPython_LIBRARY_TYPE:INTERNAL=MODULE
-//Path to a library
-vtkRenderingTCL_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Rendering
-//Whether a library is static, shared or module.
-vtkRenderingTCL_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkRendering_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Rendering
-//Whether a library is static, shared or module.
-vtkRendering_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkVolumeRenderingPython_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/VolumeRendering
-//Whether a library is static, shared or module.
-vtkVolumeRenderingPython_LIBRARY_TYPE:INTERNAL=MODULE
-//Path to a library
-vtkVolumeRenderingTCL_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/VolumeRendering
-//Whether a library is static, shared or module.
-vtkVolumeRenderingTCL_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkVolumeRendering_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/VolumeRendering
-//Whether a library is static, shared or module.
-vtkVolumeRendering_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkWidgetsPython_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Widgets
-//Whether a library is static, shared or module.
-vtkWidgetsPython_LIBRARY_TYPE:INTERNAL=MODULE
-//Path to a library
-vtkWidgetsTCL_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Widgets
-//Whether a library is static, shared or module.
-vtkWidgetsTCL_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkWidgets_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Widgets
-//Whether a library is static, shared or module.
-vtkWidgets_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to an executable
-vtkWrapPythonInit_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Wrapping
-//Path to an executable
-vtkWrapPython_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Wrapping
-//Path to an executable
-vtkWrapTclInit_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Wrapping
-//Path to an executable
-vtkWrapTcl_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Wrapping
-//Path to an executable
-vtk_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Wrapping/Tcl
-//Path to a library
-vtkexoIIc_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Utilities/vtkexodus2
-//Whether a library is static, shared or module.
-vtkexoIIc_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkexpat_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Utilities/vtkexpat
-//Whether a library is static, shared or module.
-vtkexpat_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkfreetype_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Utilities/vtkfreetype
-//Whether a library is static, shared or module.
-vtkfreetype_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkftgl_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Utilities/ftgl
-//Whether a library is static, shared or module.
-vtkftgl_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkjpeg_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Utilities/vtkjpeg
-//Whether a library is static, shared or module.
-vtkjpeg_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkpng_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Utilities/vtkpng
-//Whether a library is static, shared or module.
-vtkpng_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to an executable
-vtkpython_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Wrapping/Python
-//Path to a library
-vtksys_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Utilities/kwsys
-//Whether a library is static, shared or module.
-vtksys_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtktiff_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Utilities/vtktiff
-//Whether a library is static, shared or module.
-vtktiff_LIBRARY_TYPE:INTERNAL=SHARED
-//Path to a library
-vtkzlib_CMAKE_PATH:INTERNAL=CDAT_PREFIX/VTK/Utilities/vtkzlib
-//Whether a library is static, shared or module.
-vtkzlib_LIBRARY_TYPE:INTERNAL=SHARED
-
diff --git a/exsrc/blas.sh b/exsrc/blas.sh
deleted file mode 100755
index 921446f3d..000000000
--- a/exsrc/blas.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-PACKAGE="blas"
-BUILD=`pwd`
-export BUILD
-. ./prolog.sh
-
-FC=`${prefix}/${version}/bin/python ${BUILD}/detect_fortran.py`
-export FC
-if ( test $FC = "gfortran") then
-    CPPFLAGS="-DpgiFortran"; export CPPFLAGS
-fi
-if (test `uname` = "HP-UX") then
-    CPPFLAGS="+z -D_HPUX_SOURCE"; export CPPFLAGS
-elif (test `uname` = "Darwin") then
-(    CXX=""; export CXX \
-)
-fi
-
-cd blas*;\
-    # Add f77 support
-unset PGI; \
-    echo $FC ; \
-    env FORTRAN=${FC} make; cp libblas.a ${prefix}/Externals/lib; \
-    
-
diff --git a/exsrc/cairo.sh b/exsrc/cairo.sh
deleted file mode 100755
index 795491483..000000000
--- a/exsrc/cairo.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-PACKAGE="cairo"
-. ./prolog.sh
-CDMSARCH=`uname -m`
-if (test "${CDMSARCH}" = "ia64") then
-  export CC="gcc -fPIC"
-fi
-if (test "${CDMSARCH}" = "x86_64") then
-  export CC="gcc -fPIC"
-fi
-PKG_CONFIG=${prefix}/Externals/bin/pkg-config
-export PKG_CONFIG
-(cd cairo-* ; ./configure --prefix=${prefix}/Externals ; make ; make install )
-
diff --git a/exsrc/clean_script b/exsrc/clean_script
deleted file mode 100755
index 185cc2b0e..000000000
--- a/exsrc/clean_script
+++ /dev/null
@@ -1,2 +0,0 @@
-/bin/rm -fr build >/dev/null 2>&1
-find . -name 'config.cache' -print -exec rm {} \; 
diff --git a/exsrc/cmake.sh b/exsrc/cmake.sh
deleted file mode 100755
index 069754011..000000000
--- a/exsrc/cmake.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-PACKAGE="cmake"
-. ./prolog.sh
-(   cd cmake*; \
-   ./configure --prefix=${prefix}/Externals; \
-   make; make install
-)
diff --git a/exsrc/curl.sh b/exsrc/curl.sh
deleted file mode 100755
index 951fa4c53..000000000
--- a/exsrc/curl.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-PACKAGE="curl"
-. ./prolog.sh
-CDMSARCH=`uname -m`
-if (test "${CDMSARCH}" = "ia64") then
-  export CC="gcc -fPIC"
-fi
-if (test "${CDMSARCH}" = "x86_64") then
-  export CC="gcc -fPIC"
-fi
-(cd curl* ; ./configure --disable-shared --prefix=${prefix}/Externals/OpenDAP ; make ; make install )
-
diff --git a/exsrc/detect_fortran.py b/exsrc/detect_fortran.py
deleted file mode 100644
index 17c0c5661..000000000
--- a/exsrc/detect_fortran.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env python
-import os,sys
-
-def detect_fortran_compiler(full_path=True):
-
-
-  fortrans = """
-g77
-gfortran
-f90
-f95
-g95
-xlf90
-fort77
-pgf77
-pgf90
-cf77
-xlf
-ghf77
-"""
-  if os.environ.has_key('FC'):
-    return os.environ['FC']
-
-  for f in fortrans.split():
-    i,o=os.popen4('which '+f)
-    ln=o.readlines()
-    o.close()
-    i.close()
-    if (ln!=[]) and (not 'no' in ln[0].lower().split()) and (not 'not' in ln[0].lower().split()) :
-      if full_path :
-        return ln[0].strip()
-      else:
-        return f
-
-if __name__=="__main__":
-  print detect_fortran_compiler()
diff --git a/exsrc/ffmpeg.sh b/exsrc/ffmpeg.sh
deleted file mode 100755
index 50c6b5949..000000000
--- a/exsrc/ffmpeg.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-PACKAGE="ffmpeg"
-. ./prolog.sh
-CDMSARCH=`uname -m`
-if (test "${CDMSARCH}" = "ia64") then
-  export CC="gcc -fPIC"
-fi
-if (test "${CDMSARCH}" = "x86_64") then
-  export CC="gcc -fPIC"
-fi
-PKG_CONFIG=${prefix}/Externals/bin/pkg-config
-export PKG_CONFIG
-(cd ffmpeg ; ./configure --enable-pthreads --enable-gpl --enable-pp --enable-swscaler --enable-x11grab --prefix=${prefix}/Externals ; make ; make install )
-
diff --git a/exsrc/find_site.py b/exsrc/find_site.py
deleted file mode 100644
index 39d76dbff..000000000
--- a/exsrc/find_site.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# helper routine for installing Pmw since it has no installer.
-import sys, os
-for x in sys.path:
-    y = os.path.basename(x)
-    if y == 'site-packages':
-        print x
-        break
-else:  #If there is none such as on older windows versions
-    print sys.path[-1]
diff --git a/exsrc/fontconfig.sh b/exsrc/fontconfig.sh
deleted file mode 100755
index 060f335fb..000000000
--- a/exsrc/fontconfig.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-PACKAGE="fontconfig"
-. ./prolog.sh
-CDMSARCH=`uname -m`
-if (test "${CDMSARCH}" = "ia64") then
-  export CC="gcc -fPIC"
-fi
-if (test "${CDMSARCH}" = "x86_64") then
-  export CC="gcc -fPIC"
-fi
-PKG_CONFIG=${prefix}/Externals/bin/pkg-config
-export PKG_CONFIG
-
-(cd fontconfig-* ; ./configure --prefix=${prefix}/Externals --enable-libxml2 --with-freetype-config=${prefix}/Externals/bin/freetype-config ; make ; make install )
-
diff --git a/exsrc/freetype.sh b/exsrc/freetype.sh
deleted file mode 100755
index a540ae58f..000000000
--- a/exsrc/freetype.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-PACKAGE="freetype"
-. ./prolog.sh
-CDMSARCH=`uname -m`
-if (test "${CDMSARCH}" = "ia64") then
-  export CC="gcc -fPIC"
-fi
-if (test "${CDMSARCH}" = "x86_64") then
-  export CC="gcc -fPIC"
-fi
-(cd freetype-* ; ./configure --prefix=${prefix}/Externals ; make ; make install ; ln -s ${prefix}/Externals/include/freetype2/freetype ${prefix}/Externals/include/freetype )
-
diff --git a/exsrc/gdal.sh b/exsrc/gdal.sh
deleted file mode 100755
index 714a94bb5..000000000
--- a/exsrc/gdal.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-PACKAGE="gdal"
-. ./prolog.sh
-(cd gdal* ; ./configure --with-libtiff=internal --with-gif=internal --without-cfitsio --prefix=${prefix}/Externals ; make ; make install; ${prefix}/${version}/bin/python setup.py install )
-
diff --git a/exsrc/ghostscript.sh b/exsrc/ghostscript.sh
deleted file mode 100755
index 0a100777b..000000000
--- a/exsrc/ghostscript.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-PACKAGE="ghostscript"
-. ./prolog.sh
-(mkdir -p ${prefix}/Externals/share/ghostscript ; cd ghostscript-*; ln -s ../libpng-1.2.8 libpng ; ln -s ../jpeg-6b jpeg ; ./configure --prefix=${prefix}/Externals ; make ; make install ; mv ../fonts ${prefix}/Externals/share/ghostscript )
-
diff --git a/exsrc/gifmerge.sh b/exsrc/gifmerge.sh
deleted file mode 100755
index 85a4ac810..000000000
--- a/exsrc/gifmerge.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-PACKAGE="gifmerge"
-. ./prolog.sh
-(cd gifmerge* ; make ; mv gifmerge ${prefix}/Externals/bin )
-
diff --git a/exsrc/gifsicle.sh b/exsrc/gifsicle.sh
deleted file mode 100755
index 6ebe09f5f..000000000
--- a/exsrc/gifsicle.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-PACKAGE="gifsicle"
-. ./prolog.sh
-(cd gifsicle*; ./configure --prefix=${prefix}/Externals ; make install )
-
diff --git a/exsrc/gplot.sh b/exsrc/gplot.sh
deleted file mode 100755
index 2b588cd1f..000000000
--- a/exsrc/gplot.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-PACKAGE=gplot
-. ./prolog.sh
-d=`uname`
-(cd gplot; make -f Makefile.${d} ; mv gplot ${prefix}/Externals/bin )
-
diff --git a/exsrc/hdf.sh b/exsrc/hdf.sh
deleted file mode 100755
index f4a8cbf53..000000000
--- a/exsrc/hdf.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-PACKAGE="HDF"
-. ./prolog.sh
-CDMSARCH=`uname -m`
-if (test "${CDMSARCH}" = "ia64") then
-  export CC="gcc -fPIC"
-fi
-if (test "${CDMSARCH}" = "x86_64") then
-  export CC="gcc -fPIC"
-fi
-(cd HDF* ; env CFLAGS=-DHAVE_NETCDF CXXFLAGS=-DHAVE_NETCDF ./configure --enable-fortran=no --disable-shared --with-jpeg=${prefix}/External/HDF --prefix=${prefix}/Externals/HDF ; make ; make install ; cp -pf ${prefix}/Externals/HDF/bin/* ${prefix}/Externals/bin )
-
diff --git a/exsrc/install_script.obsolete b/exsrc/install_script.obsolete
deleted file mode 100755
index 109797609..000000000
--- a/exsrc/install_script.obsolete
+++ /dev/null
@@ -1,1154 +0,0 @@
-#!/bin/sh
-
-if [ -n "$PYTHONPATH" ]; then
-    echo "PYTHONPATH environment variable should not be set!"
-    exit 1
-fi
-
-if [ -n "$PYTHONHOME" ]; then
-   echo "PYTHONHOME environment variable should not be set!"
-   exit 1
-fi
-
-cdmsonly=no
-
-OS=`uname`
-NetCDF=yes
-dap=no
-hdf=no 
-freetype=yes
-numpy=yes
-scipy=yes
-ipython=yes
-cairo=yes
-ffmpeg=yes
-blas=yes
-lapack=yes
-lapack95=yes
-
-echo $OS
-if [ "$OS" = "Linux" ]; then
-    pbmplus=no
-    netpbm=no
-elif [ "$OS" = "Darwin" ]; then
-    pbmplus=no
-    netpbm=yes  
-elif [ "$OS" = "CYGWIN_NT-5.1" ]; then
-    pbmplus=no
-    netpbm=yes  
-elif [ "$OS" = "CYGWIN_NT-6.0" ]; then
-    pbmplus=no
-    netpbm=yes  
-else
-    netpbm=no
-    pbmplus=yes
-fi
-
-s=$1; shift;
-Pyfort=yes
-Numeric=no
-XGKS=yes
-Pmw=yes
-gplot=no
-gifsicle=yes
-R=no
-VTK=no
-ghostscript=no
-ioapi=no
-ncfortran=no
-
-while [ "$#" -ne 0 ]
-do
-  # Translate $1 to lowercase
-  MYOPT=`echo $1 | tr 'A-Z' 'a-z'`
-    if [ "$MYOPT" = "--help" ]; then
-        echo "  Builds external software required by CDAT."
-        echo "  Packages builds are:"
-	echo "          numpy 1.3.0.1 (on)"
-	echo "          scipy 0.5.2.1 (on)"
-	echo "          ipython 0.8 (off) (includes ipython1 and Twisted 2.5.0)"
-        echo "          freetype 2.3.4 (on)"
-        echo "          cairo 1.4.12 (on)"
-        echo "          ffmpeg (11/4/2007) (on)"
-        echo "          Pyfort 8.5.5 (on)"
-	echo "          jpeg 6b (on)"
-	echo "          libpng 1.2.8 (on)"
-	echo "          Ghostscript 8.50 with jpeg 6b and libpng 1.2.8 (on)"
-        echo "          NetCDF 3.6.1"
-        echo "          NetCDF-Fortran 3.6.1 (off) to build NetCDF with Fortran"
-        echo "          XGKS (on) with plug to freetype fonts"
-        echo "          Numeric 23.1 (on)"
-        echo "          Pmw 1.3 (on)"
-        echo "          gplot (off)"
-        echo "          gifsicle 1.35 (on)"
-        echo "          netpbm 10.27 (on Linux/Mac, off otherwise)"
-        echo "          pbmplus (off Linux/Mac, on otherwise)"
-        echo "          gifmerge (on)"
-        echo "          opendap 3.5: libdap 3.5.3 libnc-dap 3.5.2"
-        echo "          HDF 4.2.r1 (off)"
-        echo "          R 2.5.0 (off)"
-        echo "          ioapi 3.0 (off) will turn off opendap and on NetCDF-Fortran"
-        echo "		gdal 1.4.3 (off) turned on by ioapi"
-	echo "		proj 4.4.9 (off) turned on by ioapi"
-        echo "  Packages can be turned on/off using --enable-PACKAGE --disable-PACKAGE"
-        echo "  You can build a single Package by passing --PACKAGE-only"
-        echo "  If you already built externals before, or do not wish to build them because you think you already have them"
-        echo "  pass: --disable-externals-build"
-        echo "        This will only build python-based externals"
-        echo "  Notes:"
-        echo "          opendap is very unlikely to build on any non standard platform"
-                                                                                                                             
-
-	exit 1
-    fi
-    if [ "$MYOPT" = "--cdms-only" ]; then
-	Pyfort=no
-	XGKS=no
-	Pmw=no
-	gplot=no
-	gifsicle=no
-	pbmplus=no
-	netpbm=no
-	gifmerge=no
-	ghostscript=no
-        freetype=no
-	scipy=no
-	ipython=no
-	cairo=no
-	ffmpeg=no
-	blas=no
-	lapack=no
-	lapack95=no
-    fi
-    if [ "$MYOPT" = "--ioapi-only" ]; then
-	Pyfort=no
-	XGKS=no
-	Pmw=no
-	gplot=no
-	gifsicle=no
-	pbmplus=no
-	netpbm=no
-	gifmerge=no
-	ghostscript=no
-	ioapi=yes
-	ncfortran=yes
-	NetCDF=no
-	dap=no
-	Numeric=no
-	hdf=no
-        freetype=no
-	numpy=no
-	scipy=no
-	ipython=no
-	cairo=no
-	ffmpeg=no
-	blas=no
-	lapack=no
-	lapack95=no
-    fi
-    if [ "$MYOPT" = "--numeric-only" ]; then
-	Numeric=yes
-	dap=no
-	NetCDF=no
-	Pyfort=no
-	XGKS=no
-	Pmw=no
-	gplot=no
-	gifsicle=no
-	pbmplus=no
-	netpbm=no
-	gifmerge=no
-        ghostscript=no
-	ioapi=no
-	hdf=no
-        freetype=no
-	numpy=no
-	scipy=no
-	ipython=no
-	cairo=no
-	ffmpeg=no
-	blas=no
-	lapack=no
-	lapack95=no
-    fi
-    if [ "$MYOPT" = "--opendap-only" ]; then
-	Numeric=no
-	dap=yes
-	hdf=no
-	NetCDF=no
-	Pyfort=no
-	XGKS=no
-	Pmw=no
-	gplot=no
-	gifsicle=no
-	pbmplus=no
-        netpbm=no
-	gifmerge=no
-        ghostscript=no
-        freetype=no
-	numpy=no
-	scipy=no
-	ipython=no
-	cairo=no
- 	ffmpeg=no
-	blas=no
-	lapack=no
-	lapack95=no
-   fi
-    if [ "$MYOPT" = "--hdf4-only" ]; then
-	Numeric=no
-	dap=no
-	hdf=yes
-	NetCDF=no
-	Pyfort=no
-	XGKS=no
-	Pmw=no
-	gplot=no
-	gifsicle=no
-	pbmplus=no
-        netpbm=no
-	gifmerge=no
-        ghostscript=no
-        freetype=no
-	numpy=no
-	scipy=no
-	ipython=no
-	cairo=no
- 	ffmpeg=no
-	blas=no
-	lapack=no
-	lapack95=no
-   fi
-    if [ "$MYOPT" = "--netcdf-only" ]; then
-	Numeric=no
-	dap=no
-	hdf=no
-	NetCDF=yes
-	Pyfort=no
-	XGKS=no
-	Pmw=no
-	gplot=no
-	gifsicle=no
-        netpbm=no
-	pbmplus=no
-	gifmerge=no
-        ghostscript=no
-        freetype=no
-	numpy=no
-	scipy=no
-	ipython=no
-	cairo=no
- 	ffmpeg=no
- 	blas=no
-	lapack=no
-	lapack95=no
-  fi
-    if [ "$MYOPT" = "--netcdf-fortran-only" ]; then
-	Numeric=no
-	hdf=no
-	dap=no
-	NetCDF=no
-	ncfortran=yes
-	Pyfort=no
-	XGKS=no
-	Pmw=no
-	gplot=no
-	gifsicle=no
-        netpbm=no
-	pbmplus=no
-	gifmerge=no
-        ghostscript=no
-        freetype=no
-	numpy=no
-	scipy=no
-	ipython=no
-	cairo=no
-	ffmpeg=no
- 	blas=no
-	lapack=no
-	lapack95=no
-   fi
-    if [ "$MYOPT" = "--pyfort-only" ]; then
-	Numeric=no
-	dap=no
-	hdf=no
-	NetCDF=no
-	Pyfort=yes
-	XGKS=no
-	Pmw=no
-	gplot=no
-	gifsicle=no
-	pbmplus=no
-        netpbm=no
-	gifmerge=no
-        ghostscript=no
-        freetype=no
-	numpy=no
-	scipy=no
-	ipython=no
-	cairo=no
-	ffmpeg=no
-	blas=no
-	lapack=no
-	lapack95=no
-    fi
-    if [ "$MYOPT" = "--xgks-only" ]; then
-	Numeric=no
-	dap=no
-	hdf=no
-	NetCDF=no
-	Pyfort=no
-	XGKS=yes
-	Pmw=no
-	gplot=no
-	gifsicle=no
-	pbmplus=no
-        netpbm=no
-	gifmerge=no
-        ghostscript=no
-        freetype=no
-	numpy=no
-	scipy=no
-	ipython=no
-	cairo=no
-	ffmpeg=no
-	blas=no
-	lapack=no
-	lapack95=no
-    fi
-    if [ "$MYOPT" = "--pmw-only" ]; then
-	Numeric=no
-	dap=no
-	NetCDF=no
-	Pyfort=no
-	XGKS=no
-	Pmw=yes
-	gplot=no
-	gifsicle=no
-	pbmplus=no
-        netpbm=no
-	gifmerge=no
-        ghostscript=no
-        freetype=no
-	numpy=no
-	scipy=no
-	ipython=no
-	cairo=no
-	ffmpeg=no
-	blas=no
-	lapack=no
-	lapack95=no
-    fi
-    if [ "$MYOPT" = "--gplot-only" ]; then
-	Numeric=no
-	dap=no
-	hdf=no
-	NetCDF=no
-	Pyfort=no
-	XGKS=no
-	Pmw=no
-	gplot=yes
-	gifsicle=no
-        netpbm=no
-	pbmplus=no
-	gifmerge=no
-        ghostscript=no
-        freetype=no
-	numpy=no
-	scipy=no
-	ipython=no
-	cairo=no
-	ffmpeg=no
-	blas=no
-	lapack=no
-	lapack95=no
-   fi
-    if [ "$MYOPT" = "--gifsicle-only" ]; then
-	Numeric=no
-	dap=no
-	hdf=no
-	NetCDF=no
-	Pyfort=no
-	XGKS=no
-	Pmw=no
-	gplot=no
-	gifsicle=yes
-        netpbm=no
-	pbmplus=no
-	gifmerge=no
-        ghostscript=no
-        freetype=no
-	numpy=no
-	scipy=no
-	ipython=no
-	cairo=no
-	ffmpeg=no
-	blas=no
-	lapack=no
-	lapack95=no
-    fi
-    if [ "$MYOPT" = "--netpbm-only" ]; then
-        Numeric=no
-        dap=no
-	hdf=no
-        NetCDF=no
-        Pyfort=no
-        XGKS=no
-        Pmw=no
-        gplot=no
-        gifsicle=no
-        netpbm=yes
-        pbmplus=no
-        gifmerge=no
-        ghostscript=no
-        freetype=no
-	numpy=no
-	scipy=no
-	ipython=no
-	cairo=no
-	ffmpeg=no
-	blas=no
-	lapack=no
-	lapack95=no
-    fi
-    if [ "$MYOPT" = "--pbmplus-only"  ]; then
-	Numeric=no
-	dap=no
-	hdf=no
-	NetCDF=no
-	Pyfort=no
-	XGKS=no
-	Pmw=no
-	gplot=no
-	gifsicle=no
-        netpbm=no
-	pbmplus=yes
-	gifmerge=no
-        ghostscript=no
-        freetype=no
-	numpy=no
-	scipy=no
-	ipython=no
-	cairo=no
-	ffmpeg=no
- 	blas=no
-	lapack=no
-	lapack95=no
-   fi
-    if [ "$MYOPT" = "--gifmerge-only"  ]; then
-	Numeric=no
-	dap=no
-	hdf=no
-	NetCDF=no
-	Pyfort=no
-	XGKS=no
-	Pmw=no
-	gplot=no
-	gifsicle=no
-        netpbm=no
-	pbmplus=no
-	gifmerge=yes
-        ghostscript=no
-        freetype=no
-	numpy=no
-	scipy=no
-	ipython=no
-	cairo=no
-	ffmpeg=no
- 	blas=no
-	lapack=no
-	lapack95=no
-   fi
-    if [ "$MYOPT" = "--r-only" ]; then
-	Numeric=no
-	dap=no
-	hdf=no
-	NetCDF=no
-	Pyfort=no
-	XGKS=no
-	Pmw=no
-	gplot=no
-	gifsicle=no
-        netpbm=no
-	pbmplus=no
-	gifmerge=no
-	R=yes
-        ghostscript=no
-        freetype=no
-	numpy=no
-	scipy=no
-	ipython=no
-	cairo=no
-	ffmpeg=no
-	blas=no
-	lapack=no
-	lapack95=no
-    fi
-#    if [ "$MYOPT" = "--vtk-only" ]; then
-#	Numeric=no
-#	dap=no
-#	hdf=no
-#	NetCDF=no
-#	Pyfort=no
-#	XGKS=no
-#	Pmw=no
-#	gplot=no
-#	gifsicle=no
-#        netpbm=no
-#	pbmplus=no
-#	gifmerge=no
-#	VTK=yes
-#        ghostscript=no
-#        freetype=no
-#	numpy=no
-#	scipy=no
-#	ipython=no
-#    fi
-    if [ "$MYOPT" = "--ghostscript-only" ]; then
-        Numeric=no
-        dap=no
-	hdf=no
-        NetCDF=no
-        Pyfort=no
-        XGKS=no
-        Pmw=no
-        gplot=no
-        gifsicle=no
-        netpbm=no
-        pbmplus=no
-        gifmerge=no
-        ghostscript=yes
-        freetype=no
-	numpy=no
-	scipy=no
-	ipython=no
-	cairo=no
-	ffmpeg=no
-	blas=no
-	lapack=no
-	lapack95=no
-    fi
-    if [ "$MYOPT" = "--freetype-only" ]; then
-        Numeric=no
-        dap=no
-	hdf=no
-        NetCDF=no
-        Pyfort=no
-        XGKS=no
-        Pmw=no
-        gplot=no
-        gifsicle=no
-        netpbm=no
-        pbmplus=no
-        gifmerge=no
-        ghostscript=no
-        freetype=yes
-	cairo=no
-	ffmpeg=no
-	numpy=no
-	scipy=no
-	ipython=no
-	cairo=no
-	ffmpeg=no
-	blas=no
-	lapack=no
-	lapack95=no
-    fi
-    if [ "$MYOPT" = "--numpy-only" ]; then
-        Numeric=no
-        dap=no
-	hdf=no
-        NetCDF=no
-        Pyfort=no
-        XGKS=no
-        Pmw=no
-        gplot=no
-        gifsicle=no
-        netpbm=no
-        pbmplus=no
-        gifmerge=no
-        ghostscript=no
-        freetype=no
-	numpy=yes
-	scipy=no
-	ipython=no
-	cairo=no
-	ffmpeg=no
-	blas=no
-	lapack=no
-	lapack95=no
-    fi
-    if [ "$MYOPT" = "--scipy-only" ]; then
-        Numeric=no
-        dap=no
-	hdf=no
-        NetCDF=no
-        Pyfort=no
-        XGKS=no
-        Pmw=no
-        gplot=no
-        gifsicle=no
-        netpbm=no
-        pbmplus=no
-        gifmerge=no
-        ghostscript=no
-        freetype=no
-	numpy=no
-	scipy=yes
-	ipython=no
-	cairo=no
-	ffmpeg=no
- 	blas=no
-	lapack=no
-	lapack95=no
-   fi
-    if [ "$MYOPT" = "--ipython-only" ]; then
-        Numeric=no
-        dap=no
-	hdf=no
-        NetCDF=no
-        Pyfort=no
-        XGKS=no
-        Pmw=no
-        gplot=no
-        gifsicle=no
-        netpbm=no
-        pbmplus=no
-        gifmerge=no
-        ghostscript=no
-        freetype=no
-	numpy=no
-	scipy=no
-	ipython=yes
-	cairo=no
-	ffmpeg=no
-	blas=no
-	lapack=no
-	lapack95=no
-    fi
-    if [ "$MYOPT" = "--cairo-only" ]; then
-        Numeric=no
-        dap=no
-	hdf=no
-        NetCDF=no
-        Pyfort=no
-        XGKS=no
-        Pmw=no
-        gplot=no
-        gifsicle=no
-        netpbm=no
-        pbmplus=no
-        gifmerge=no
-        ghostscript=no
-        freetype=no
-        numpy=no
-        scipy=no
-        ipython=no
-	cairo=yes
-	ffmpeg=no
-	blas=no
-	lapack=no
-	lapack95=no
-    fi
-    if [ "$MYOPT" = "--ffmpeg-only" ]; then
-        Numeric=no
-        dap=no
-	hdf=no
-        NetCDF=no
-        Pyfort=no
-        XGKS=no
-        Pmw=no
-        gplot=no
-        gifsicle=no
-        netpbm=no
-        pbmplus=no
-        gifmerge=no
-        ghostscript=no
-        freetype=no
-	cairo=no
-	ffmpeg=yes
-        numpy=no
-        scipy=no
-        ipython=no
-	blas=no
-	lapack=no
-	lapack95=no
-    fi
-    if [ "$MYOPT" = "--blas-only" ]; then
-        Numeric=no
-        dap=no
-	hdf=no
-        NetCDF=no
-        Pyfort=no
-        XGKS=no
-        Pmw=no
-        gplot=no
-        gifsicle=no
-        netpbm=no
-        pbmplus=no
-        gifmerge=no
-        ghostscript=no
-        freetype=no
-	cairo=no
-	ffmpeg=no
-        numpy=no
-        scipy=no
-        ipython=no
-	blas=yes
-	lapack=no
-	lapack95=no
-    fi
-    if [ "$MYOPT" = "--lapack-only" ]; then
-        Numeric=no
-        dap=no
-	hdf=no
-        NetCDF=no
-        Pyfort=no
-        XGKS=no
-        Pmw=no
-        gplot=no
-        gifsicle=no
-        netpbm=no
-        pbmplus=no
-        gifmerge=no
-        ghostscript=no
-        freetype=no
-	cairo=no
-	ffmpeg=no
-        numpy=no
-        scipy=no
-        ipython=no
-	blas=no
-	lapack=yes
-	lapack95=no
-    fi
-    if [ "$MYOPT" = "--lapack95-only" ]; then
-        Numeric=no
-        dap=no
-	hdf=no
-        NetCDF=no
-        Pyfort=no
-        XGKS=no
-        Pmw=no
-        gplot=no
-        gifsicle=no
-        netpbm=no
-        pbmplus=no
-        gifmerge=no
-        ghostscript=no
-        freetype=no
-	cairo=no
-	ffmpeg=no
-        numpy=no
-        scipy=no
-        ipython=no
-	blas=no
-	lapack=no
-	lapack95=yes
-    fi
-# Turn Off Options.....
-    if [ "$MYOPT" = "--disable-opendap" ]; then
-	dap=no
-        if [ $ioapi = no ]; then
-	   NetCDF=yes
-	fi
-	echo "Turning opendap Off"
-    fi
-    if [ "$MYOPT" = "--disable-hdf4" ]; then
-	hdf=no
-	echo "Turning hdf4 Off"
-    fi
-    if [ "$MYOPT" = "--disable-ioapi" ]; then
-	ioapi=no
-	echo "Turning ioapi Off"
-    fi
-    if [ "$MYOPT" = "--disable-ghostscript" ]; then
-	ghostscript=no
-	echo "Turning ghostscript Off"
-    fi
-    if [ "$MYOPT" = "--disable-pyfort" ]; then
-        Pyfort=no
-        echo "Turning Pyfort Off"
-    fi
-    if [ "$MYOPT" = "--disable-numeric" ]; then
-	Numeric=no
-	echo "Turning Numeric Off"
-    fi
-    if [ "$MYOPT" = "--disable-xgks" ]; then
-	XGKS=no
-	echo "Turning XGKS Off"
-    fi
-    if [ "$MYOPT" = "--disable-pmw" ]; then
-	Pmw=no
-	echo "Turning Pmw Off"
-    fi
-    if [ "$MYOPT" = "--disable-gplot" ]; then
-	gplot=no
-	echo "Turning gplot Off"
-    fi
-    if [ "$MYOPT" = "--disable-gifsicle" ]; then
-	gifsicle=no
-	echo "Turning gifsicle Off"
-    fi
-    if [ "$MYOPT" = "--disable-netpbm" ]; then
-	netpbm=no
-	echo "Turning netpbm Off"
-    fi
-    if [ "$MYOPT" = "--disable-pbmplus" ]; then
-	pbmplus=no
-	echo "Turning pbmplus Off"
-    fi
-    if [ "$MYOPT" = "--disable-gifmerge" ]; then
-	gifmerge=no
-	echo "Turning gifmerge Off"
-    fi
-    if [ "$MYOPT" = "--disable-netcdf" ]; then
-	NetCDF=no
-	echo "Turning NetCDF Off"
-    fi
-    if [ "$MYOPT" = "--disable-r"  ]; then
-	R=no
-	echo "Turning R Off"
-    fi
-#    if [ "$MYOPT" = "--disable-vtk"  ]; then
-#	VTK=no
-#	echo "Turning VTK Off"
-#    fi
-    if [ "$MYOPT" = "--disable-freetype" ]; then
-	freetype=no
-	echo "Turning freetype Off"
-    fi
-    if [ "$MYOPT" = "--disable-numpy" ]; then
-	numpy=no
-	echo "Turning numpy Off"
-    fi
-    if [ "$MYOPT" = "--disable-scipy" ]; then
-	scipy=no
-	echo "Turning scipy Off"
-    fi
-    if [ "$MYOPT" = "--disable-ipython" ]; then
-	ipython=no
-	echo "Turning ipython Off"
-    fi
-    if [ "$MYOPT" = "--disable-cairo" ]; then
-	cairo=no
-	echo "Turning cairo Off"
-    fi
-    if [ "$MYOPT" = "--disable-ffmpeg" ]; then
-	ffmpeg=no
-	echo "Turning ffmpeg Off"
-    fi
-    if [ "$MYOPT" = "--disable-blas" ]; then
-	blas=no
-	echo "Turning blas Off"
-    fi
-    if [ "$MYOPT" = "--disable-lapack" ]; then
-	lapack=no
-	lapack95=no
-	echo "Turning lapack and lapack95 Off"
-    fi
-    if [ "$MYOPT" = "--disable-lapack95" ]; then
-	lapack95=no
-	echo "Turning lapack95 Off"
-    fi
-# Turn On Options.....
-    if [ "$MYOPT" = "--enable-ioapi" ]; then
-	ioapi=yes
-	NetCDF=no
-	ncfortran=yes
-	echo "Turning ioapi On"
-    fi
-    if [ "$MYOPT" = "--enable-opendap" ]; then
-	dap=yes
-	echo "Turning opendap On"
-    fi
-    if [ "$MYOPT" = "--enable-pyfort" ]; then
-	Pyfort=yes
-	echo "Turning Pyfort On"
-    fi
-    if [ "$MYOPT" = "--enable-ghostscript" ]; then
-        ghostscript=yes
-        echo "Turning Ghostscript On"
-    fi
-    if [ "$MYOPT" = "--enable-numeric" ]; then
-	Numeric=yes
-	echo "Turning Numeric On"
-    fi
-    if [ "$MYOPT" = "--enable-xgks" ]; then
-	XGKS=yes
-	echo "Turning XGKS On"
-    fi
-    if [ "$MYOPT" = "--enable-pmw" ]; then
-	Pmw=yes
-	echo "Turning Pmw On"
-    fi
-    if [ "$MYOPT" = "--enable-gplot" ]; then
-	gplot=yes
-	echo "Turning gplot On"
-    fi
-    if [ "$MYOPT" = "--enable-gifsicle" ]; then
-	gifsicle=yes
-	echo "Turning gifsicle On"
-    fi
-    if [ "$MYOPT" = "--enable-netpbm" ]; then
-	netpbm=yes
-	echo "Turning netpbm On"
-    fi
-    if [ "$MYOPT" = "--enable-pbmplus" ]; then
-	pbmplus=yes
-	echo "Turning pbmplus On"
-    fi
-    if [ "$MYOPT" = "--enable-gifmerge" ]; then
-	gifmerge=yes
-	echo "Turning gifmerge On"
-    fi
-    if [ "$MYOPT" = "--enable-netcdf" ]; then
-	NetCDF=yes
-	echo "Turning NetCDF On"
-    fi
-    if [ "$MYOPT" = "--enable-r" ]; then
-	R=yes
-	echo "Turning R On"
-    fi
-    if [ "$MYOPT" = "--enable-hdf4" ]; then
-	hdf=yes
-	echo "Turning hdf4 On"
-    fi
-#    if [ "$MYOPT" = "--enable-vtk" ]; then
-#	VTK=yes
-#	echo "Turning VTK On"
-#    fi
-    if [ "$MYOPT" = "--enable-freetype" ]; then
-	freetype=yes
-	echo "Turning freetype On"
-    fi
-    if [ "$MYOPT" = "--enable-numpy" ]; then
-	numpy=yes
-	echo "Turning numpy On"
-    fi
-    if [ "$MYOPT" = "--enable-scipy" ]; then
-	scipy=yes
-	echo "Turning scipy On, do not turn off blas and lapack if they're not on your system"
-    fi
-    if [ "$MYOPT" = "--enable-ipython" ]; then
-	ipython=yes
-	echo "Turning ipython On"
-    fi
-    if [ "$MYOPT" = "--enable-cairo" ]; then
-	cairo=yes
-	echo "Turning cairo On"
-    fi
-    if [ "$MYOPT" = "--enable-ffmpeg" ]; then
-	ffmpeg=yes
-	echo "Turning ffmpeg On"
-    fi
-    if [ "$MYOPT" = "--enable-blas" ]; then
-	blas=yes
-	echo "Turning blas On"
-    fi
-    if [ "$MYOPT" = "--enable-lapack" ]; then
-	lapack=yes
-	echo "Turning lapack On"
-    fi
-    if [ "$MYOPT" = "--enable-ffmpeg" ]; then
-	lapack=yes
-	lapack95=yes
-	echo "Turning lapack and lapack95 On"
-    fi
-    if [ "$MYOPT" = "--disable-externals-build" ]; then
-	gplot=no
-	gifsicle=no
-        netpbm=no
-	pbmplus=no
-	gifmerge=no
-        ghostscript=no
-        freetype=no
-	cairo=no
-	ffmpeg=no
-	XGKS=no
-        dap=no
-	hdf=no
-        NetCDF=no
-	blas=no
-	lapack=no
-	lapack95=no
-    fi
-    shift
-done
-
-## Make sure we don't build NetCDF if opendap is there...
-if [ "$dap" = "yes" ]; then
-    NetCDF=no
-fi
-
-d=`pwd`
-echo "Building external software that CDAT requires."
-echo "See $d/build for logs of the build."
-echo "Any Package can be NOT build by passing --disable-Package"
-echo "If you wish to build 1 Package only, pass --Package-only"
-echo "Packages are: netcdf, netcdf-fortran, opendap, pyfort, numeric, xgks, pmw, gplot, gifsicle,"
-echo "              netpbm, pbmplus, gifmerge, r, ghostscript, ioapi, hdf4, freetype, cairo"
-echo "Note R is not built by default: Pass --enable-r to build R library (Linux only)."
-#echo "Note VTK is not built by default: Pass --enable-vtk to build (linux only)."
-echo "opendap MIGHT work on solaris but probably won't, try to build separately"
-echo "Warning errors in these builds are expected."
-
-
-#(./prolog.sh $s) || (echo "Unpack of tar files failed."; exit 1)
-mkdir -p build
-if [ "$Pyfort" = "yes" ]; then
-    echo "Building Pyfort (Fortran/C interface)"
-    (./pyfort.sh $s 2>&1 | tee build/pyfort.LOG > ../logs/pyfort.LOG) ||  (echo "Build of Pyfort failed."; exit 1)
-fi
-if [ "$ghostscript" = "yes" ]; then
-    echo "Building Ghostscript"
-    (./ghostscript.sh $s 2>&1 | tee build/ghostscript.LOG > ../logs/ghostscript.LOG) ||  (echo "Build of ghostscript failed."; exit 1)
-fi
-if [ "$ffmpeg" = "yes" ]; then
-    echo "Building ffmpeg"
-    (./ffmpeg.sh $s 2>&1 | tee build/ffmpeg.LOG > ../logs/ffmpeg.LOG) ||  (echo "Build of ffmpeg failed."; exit 1)
-fi
-if [ "$freetype" = "yes" ]; then
-    echo "Building Freetype"
-    (./freetype.sh $s 2>&1 | tee build/freetype.LOG > ../logs/freetype.LOG) ||  (echo "Build of freetype failed."; exit 1)
-fi
-if [ "$cairo" = "yes" ]; then
-    echo "Building necessary libs for cairo"
-    echo "  Building xml"
-    (./libxml.sh $s 2>&1 | tee build/libxml.LOG > ../logs/libxml.LOG) ||  (echo "Build of libxml failed."; exit 1)
-    echo "  Building libpixman"
-    (./libpixman.sh $s 2>&1 | tee build/libpixman.LOG > ../logs/libpixman.LOG) ||  (echo "Build of libpixman failed."; exit 1)
-    echo "  Building libpng"
-    (./libpng.sh $s 2>&1 | tee build/libpng.LOG > ../logs/libpng.LOG) ||  (echo "Build of libpng failed."; exit 1)
-    echo "  Building pkgconfig"
-    (./pkgconfig.sh $s 2>&1 | tee build/pkgconfig.LOG > ../logs/pkgconfig.LOG) ||  (echo "Build of pkgconfig failed."; exit 1)
-    echo "  Building fontconfig"
-    (./fontconfig.sh $s 2>&1 | tee build/fontconfig.LOG > ../logs/fontconfig.LOG) ||  (echo "Build of fontconfig failed."; exit 1)
-    echo "Building Cairo"
-    (./cairo.sh $s 2>&1 | tee build/cairo.LOG > ../logs/cairo.LOG) ||  (echo "Build of cairo failed."; exit 1)
-fi
-if [ "$NetCDF" = "yes" ]; then
-    echo "Building netcdf without Fortran support"
-    (./netcdf.sh $s 2>&1 | tee build/netcdf.LOG > ../logs/netcdf.LOG ) || (echo "Build of netcdf without fortran failed."; exit 1)
-fi
-if [ "$hdf" = "yes" ]; then
-    echo "Building HDF"
-    echo "... Building JPEG library required by HDF"
-    (./jpeg.sh $s 2>&1 | tee build/jpeg.LOG > ../logs/jpeg.LOG ) || (echo "Build of jpeg."; exit 1)
-    echo "... Building HDF4 library"
-    (./hdf.sh $s 2>&1 | tee build/hdf.LOG > ../logs/hdf.LOG ) || (echo "Build of hdf."; exit 1)
-fi
-if [ "$ncfortran" = "yes" ]; then
-    echo "Building netcdf with Fortran support"
-    (./netcdf_fortran.sh $s 2>&1 | tee build/netcdf.LOG > ../logs/netcdf.LOG ) || (echo "Build of netcdf with fortran failed."; exit 1)
-fi
-if [ "$blas" = "yes" ]; then
-    echo "Building blas"
-    (./blas.sh $s 2>&1 | tee build/blas.LOG > ../logs/blas.LOG ) || (echo "Build of blas failed."; exit 1)
-fi
-if [ "$lapack" = "yes" ]; then
-    echo "Building lapack"
-    (./lapack.sh $s 2>&1 | tee build/lapack.LOG > ../logs/lapack.LOG ) || (echo "Build of lapack failed."; exit 1)
-fi
-if [ "$lapack95" = "yes" ]; then
-    echo "Building lapack95"
-    (./lapack95.sh $s 2>&1 | tee build/lapack95.LOG > ../logs/lapack95.LOG ) || (echo "Build of lapack95 failed."; exit 1)
-fi
-if [ "$numpy" = "yes" ]; then
-    if [ "$BLAS" = "" ]; then
-      BLAS=SETBLAS
-      export BLAS
-    fi
-    if [ "$LAPACK" = "" ]; then
-      LAPACK=SETLAPACK
-      export LAPACK
-    fi
-    echo "Building numpy" ${BLAS} ${LAPACK}
-    (./numpy.sh $s 2>&1 | tee build/numpy.LOG > ../logs/numpy.LOG ) || (echo "Build of numpy failed."; exit 1)
-fi
-if [ "$scipy" = "yes" ]; then
-    if [ "$BLAS" = "" ]; then
-      BLAS=SETBLAS
-      export BLAS
-    fi
-    if [ "$LAPACK" = "" ]; then
-      LAPACK=SETLAPACK
-      export LAPACK
-    fi
-    echo "Building scipy"
-    (./scipy.sh $s 2>&1 | tee build/scipy.LOG > ../logs/scipy.LOG ) || (echo "Build of scipy failed."; exit 1)
-fi
-if [ "$ipython" = "yes" ]; then
-    echo "Building ipython and its dependencies"
-    echo "... Building setuptools (with zope interface)"
-    (./setuptools.sh $s 2>&1 | tee build/setuptools.LOG > ../logs/setuptools.LOG ) || (echo "Build of setuptools failed."; exit 1)
-    echo "... Building Twisted (with zope interface)"
-    (./twisted.sh $s 2>&1 | tee build/twisted.LOG > ../logs/twisted.LOG ) || (echo "Build of Twisted failed."; exit 1)
-    echo "... Building ipython1"
-    (./ipython1.sh $s 2>&1 | tee build/ipython1.LOG > ../logs/ipython1.LOG ) || (echo "Build of ipython1 failed."; exit 1)
-    echo "... Building ipython"
-    (./ipython.sh $s 2>&1 | tee build/ipython.LOG > ../logs/ipython.LOG ) || (echo "Build of ipython failed."; exit 1)
-fi
-if [ "$ioapi" = "yes" ]; then
-    echo "Building IOAPI and its dependencies"
-    echo "... Building ioapi"
-    (./ioapi.sh $s 2>&1 | tee build/ioapi.LOG > ../logs/ioapi.LOG ) || (echo "Build of ioapi failed."; exit 1)
-    echo "... Building proj"
-    (./proj.sh $s 2>&1 | tee build/proj.LOG > ../logs/proj.LOG ) || (echo "Build of proj failed."; exit 1)
-    echo "... Building gdal"
-    (./gdal.sh $s 2>&1 | tee build/gdal.LOG > ../logs/gdal.LOG ) || (echo "Build of gdal failed."; exit 1)
-fi
-if [ "$XGKS" = "yes" ]; then
-    echo "Building xgks header files and fonts. (graphics display)"
-    (./xgks.sh $s 2>&1 | tee build/xgks.LOG > ../logs/xgks.LOG ) || (echo "Build of xgks failed."; exit 1)
-fi
-if [ "$Numeric" = "yes" ]; then
-    echo "Building Numeric (numerical operations, masked arrays, etc...)"
-    (./Numeric.sh $s 2>&1 | tee build/Numeric.LOG > ../logs/Numeric.LOG) || (echo "Build of Numeric failed."; exit 1)
-fi
-if [ "$dap" = "yes" ]; then
-    echo "Building opendap (client side only)"
-    echo "... Building curl required by opendap"
-    (./curl.sh $s 2>&1 | tee build/curl.LOG > ../logs/curl.LOG) || (echo "Build of curl failed";exit 1)
-    echo "... Building libxml required by opendap"
-    (./libxml.sh $s 2>&1 | tee build/libxml.LOG > ../logs/libxml.LOG) || (echo "Build of libxml failed";exit 1)
-    echo "... Building libdap required by opendap"
-    (./libdap.sh $s 2>&1 | tee build/libdap.LOG > ../logs/libdap.LOG) || (echo "Build of libdap failed";exit 1)
-    echo "... Building ncdap required by opendap, replaces standard netCDF libraries"
-    (./libnc-dap.sh $s 2>&1 | tee build/libnc-dap.LOG > ../logs/libnc-dap.LOG) || (echo "Build of libncdap failed";exit 1)
-fi
-if [ "$Pmw" = "yes" ]; then
-    echo "Building Pmw (Python Mega Widget, to design GUIs)"
-    (./Pmw.sh $s 2>&1 | tee build/Pmw.LOG > ../logs/Pmw.LOG) || (echo "Build of Pmw failed."; exit 1)
-fi
-if [ "$gplot" = "yes" ]; then
-    echo "Building gplot (postscript output)"
-    (./gplot.sh $s 2>&1 | tee build/gplot.LOG > ../logs/gplot.LOG) || (echo "Build of gplot failed, try manualy."; exit 1)
-fi
-if [ "$gifsicle" = "yes" ]; then
-    echo "Building gifsicle (for animated GIF output)"
-    (./gifsicle.sh $s 2>&1 | tee build/gifsicle.LOG > ../logs/gifsicle.LOG) || (echo "Build of gifsicle failed."; exit 1)
-fi
-if [ "$netpbm" = "yes" ]; then
-    echo "Building netpbm (for GIF output)"
-    (./netpbm.sh $s 2>&1 | tee build/netpbm.LOG > ../logs/netpbm.LOG) || (echo "Build of netpbm failed."; exit 1)
-fi
-if [ "$pbmplus" = "yes" ]; then
-    echo "Building pbmplus (for GIF output)"
-    (./pbmplus.sh $s 2>&1 | tee build/pbmplus.LOG > ../logs/pbmplus.LOG) || (echo "Build of pbmplus failed."; exit 1)
-fi
-if [ "$gifmerge" = "yes" ]; then
-    echo "Building gifmerge (for GIF output)"
-    (./gifmerge.sh $s 2>&1 | tee build/gifmerge.LOG > ../logs/gifmerge.LOG) || (echo "Build of gifmerge failed."; exit 1)
-fi
-if [ "$R" = "yes" ]; then
-    echo "Building R statistical library"
-    (./R.sh $s 2>&1 | tee build/R.LOG > ../logs/R.LOG) || (echo "Build of R failed";exit 1)
-fi
-#if [ "$VTK" = "yes" ]; then
-#    echo "Building cmake (required by VTK)"
-#    (./cmake.sh $s 2>&1 | tee build/cmake.LOG > ../logs/cmake.LOG) || (echo "Build of cmake failed";exit 1)
-#    echo "Building VTK"
-#    (./vtk.sh $s 2>&1 | tee build/VTK.LOG > ../logs/VTK.LOG) || (echo "Build of VTK failed";exit 1)
-#fi
-echo "Done with building the external software."
diff --git a/exsrc/ioapi.sh b/exsrc/ioapi.sh
deleted file mode 100755
index a2f973a90..000000000
--- a/exsrc/ioapi.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-BUILD=`pwd`
-export BUILD
-PACKAGE="ioapi"
-. ./prolog.sh
-FC=`${prefix}/${version}/bin/python ${BUILD}/detect_fortran.py`
-export FC
-(cd ioapi*/ioapi; \
-    # build the library
-    make -f Makefile.nocpl; \
-    # go to the object/lib directory
-    # and run ranlib (only needed for Darwin)
-    # but doesn't effect the build
-    cd ../neutral_g77; \
-    ranlib libioapi.a; \
-
-    # copy the library to pyIoapi contrib package
-    # and the installation directory (prefix)
-#    echo "Copying IOAPI library to pyIoapi package" ; \
-#    cp libioapi.a ../../../../contrib/pyIoapi/Src/lib_external; \
-    cp libioapi.a ${prefix}/Externals/lib;
-)
diff --git a/exsrc/ipython.sh b/exsrc/ipython.sh
deleted file mode 100755
index 66166ce8a..000000000
--- a/exsrc/ipython.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-PACKAGE="ipython"
-. ./prolog.sh 
-# ipython.
-(cd ipython-* ; ${prefix}/${version}/bin/python setup.py build ${D} install)
diff --git a/exsrc/ipython1.sh b/exsrc/ipython1.sh
deleted file mode 100755
index db6b6e84e..000000000
--- a/exsrc/ipython1.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-PACKAGE="ipython1"
-. ./prolog.sh 
-# ipython1.
-(cd ipython1*; ${prefix}/${version}/bin/python setup.py build ${D} install)
-
diff --git a/exsrc/jpeg.sh b/exsrc/jpeg.sh
deleted file mode 100755
index 206570e3a..000000000
--- a/exsrc/jpeg.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-PACKAGE="jpeg"
-. ./prolog.sh
-CDMSARCH=`uname -m`
-if (test "${CDMSARCH}" = "ia64") then
-  export CC="gcc -fPIC"
-fi
-if (test "${CDMSARCH}" = "x86_64") then
-  export CC="gcc -fPIC"
-fi
-(mkdir ${prefix}/Externals/HDF ; mkdir ${prefix}/Externals/HDF/lib ; mkdir ${prefix}/Externals/HDF/include ; cd jpeg* ; ./configure --prefix=${prefix}/Externals/HDF ; make ; mv libjpeg.a ${prefix}/Externals/HDF/lib ; cp *.h ${prefix}/Externals/HDF/include )
-
diff --git a/exsrc/lapack.sh b/exsrc/lapack.sh
deleted file mode 100755
index 73df47e3d..000000000
--- a/exsrc/lapack.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-PACKAGE="lapack-lite"
-BUILD=`pwd`
-export BUILD
-. ./prolog.sh
-
-FC=`${prefix}/${version}/bin/python ${BUILD}/detect_fortran.py`
-export FC
-if ( test $FC = "gfortran") then
-    CPPFLAGS="-DpgiFortran"; export CPPFLAGS
-fi
-if (test `uname` = "HP-UX") then
-    CPPFLAGS="+z -D_HPUX_SOURCE"; export CPPFLAGS
-elif (test `uname` = "Darwin") then
-(    CXX=""; export CXX \
-)
-fi
-
-cd lapack-lite*;\
-    # Add f77 support
-unset PGI; \
-    echo $FC ; \
-    env LOADER=${FC} FORTRAN=${FC} BLAS=${prefix}/Externals/libblas.a make; cp liblapack.a libtmglib.a ${prefix}/Externals/lib; \
-    
-
diff --git a/exsrc/lapack95.sh b/exsrc/lapack95.sh
deleted file mode 100755
index b4344cd6d..000000000
--- a/exsrc/lapack95.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-PACKAGE="lapack95"
-BUILD=`pwd`
-export BUILD
-. ./prolog.sh
-
-FC=`${prefix}/${version}/bin/python ${BUILD}/detect_fortran.py`
-export FC
-if ( test $FC = "gfortran") then
-    CPPFLAGS="-DpgiFortran"; export CPPFLAGS
-fi
-if (test `uname` = "HP-UX") then
-    CPPFLAGS="+z -D_HPUX_SOURCE"; export CPPFLAGS
-elif (test `uname` = "Darwin") then
-(    CXX=""; export CXX \
-)
-fi
-
-cd lapack95*/SRC;\
-    # Add f77 support
-unset PGI; \
-    echo $FC ; \
-    env LAPACK_PATH=${prefix}/Externals/lib make; cp ../lapack95.a  ${prefix}/Externals/lib/liblapack95.a; cp ../lapack95_modules/* ${prefix}/Externals/include  \
-    
-
diff --git a/exsrc/libcf.sh b/exsrc/libcf.sh
deleted file mode 100755
index 5e0add5c3..000000000
--- a/exsrc/libcf.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-PACKAGE="libcf"
-BUILD=`pwd`
-export BUILD
-. ./prolog.sh
-
-NC4LOC=`grep NC4LOC ../config.log | sed 's/NC4LOC=//' | sed "s/'//"`
-HDF5LOC=`grep HDF5LOC ../config.log | sed 's/HDF5LOC=//' | sed "s/'//"`
-
-echo "prefix is ${prefix}"
-echo "using netcdf at $NC4LOC, using hdf5 at $HDF5LOC"
-
-(cd libcf*; \ 
-  mkdir ${prefix}/Externals/libcf ; \  
-  mkdir ${prefix}/Externals/NetCDF ; \
-  ./configure --prefix=${prefix}/Externals/NetCDF --with-netcdf=$NC4LOC --with-hdf5=$HDF5LOC --enable-shared; \
-  make; make install
-)
-
diff --git a/exsrc/libdap.sh b/exsrc/libdap.sh
deleted file mode 100755
index d79e566c8..000000000
--- a/exsrc/libdap.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-PACKAGE="libdap"
-. ./prolog.sh
-CDMSARCH=`uname -m`
-if (test "${CDMSARCH}" = "ia64") then
-  export CC="gcc -fPIC"
-  export CXX="g++ -fPIC"
-fi
-if (test "${CDMSARCH}" = "x86_64") then
-  export CC="gcc -fPIC"
-  export CXX="g++ -fPIC"
-fi
-(cd libdap* ; env PATH=${prefix}/Externals/OpenDAP/bin\:${PATH} ./configure --disable-shared --prefix=${prefix}/Externals/OpenDAP ; make ; make install )
-
diff --git a/exsrc/libnc-dap.sh b/exsrc/libnc-dap.sh
deleted file mode 100755
index de5bb66fc..000000000
--- a/exsrc/libnc-dap.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-PACKAGE="libnc-dap"
-. ./prolog.sh
-CDMSARCH=`uname -m`
-if (test "${CDMSARCH}" = "ia64") then
-  export CC="gcc -fPIC"
-  export CXX="g++ -fPIC"
-fi
-if (test "${CDMSARCH}" = "x86_64") then
-  export CC="gcc -fPIC"
-  export CXX="g++ -fPIC"
-fi
-(cd libnc-dap* ; env PATH=${prefix}/Externals/OpenDAP/bin\:${PATH} ./configure --disable-shared --prefix=${prefix}/Externals/OpenDAP ; make ; make install ; cp -pf ${prefix}/Externals/OpenDAP/bin/* ${prefix}/Externals/bin )
-
diff --git a/exsrc/libpixman.sh b/exsrc/libpixman.sh
deleted file mode 100755
index 2b8c09e00..000000000
--- a/exsrc/libpixman.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-PACKAGE="pixman"
-. ./prolog.sh
-CDMSARCH=`uname -m`
-if (test "${CDMSARCH}" = "ia64") then
-  export CC="gcc -fPIC"
-fi
-if (test "${CDMSARCH}" = "x86_64") then
-  export CC="gcc -fPIC"
-fi
-(cd pixman* ; ./configure --prefix=${prefix}/Externals ; make ; make install )
-
diff --git a/exsrc/libpng.sh b/exsrc/libpng.sh
deleted file mode 100755
index 2cb505cc3..000000000
--- a/exsrc/libpng.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-PACKAGE="libpng"
-. ./prolog.sh
-CDMSARCH=`uname -m`
-if (test "${CDMSARCH}" = "ia64") then
-  export CC="gcc -fPIC"
-fi
-if (test "${CDMSARCH}" = "x86_64") then
-  export CC="gcc -fPIC"
-fi
-(cd libpng* ; ./configure --prefix=${prefix}/Externals ; make ; make install )
-
diff --git a/exsrc/libxml.sh b/exsrc/libxml.sh
deleted file mode 100755
index de23dc8cb..000000000
--- a/exsrc/libxml.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-PACKAGE="libxml"
-. ./prolog.sh
-CDMSARCH=`uname -m`
-if (test "${CDMSARCH}" = "ia64") then
-  export CC="gcc -fPIC"
-fi
-if (test "${CDMSARCH}" = "x86_64") then
-  export CC="gcc -fPIC"
-fi
-(cd libxml2* ; ./configure --prefix=${prefix}/Externals ; make ; make install )
-
diff --git a/exsrc/netcdf.sh b/exsrc/netcdf.sh
deleted file mode 100755
index 6222460fd..000000000
--- a/exsrc/netcdf.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-PACKAGE="netcdf"
-. ./prolog.sh
-if (test `uname` = "HP-UX") then
-    CPPFLAGS="+z -D_HPUX_SOURCE"; export CPPFLAGS
-elif (test `uname` = "Darwin") then
-    CXX=""; export CXX
-fi
-
-echo "prefix is"${prefix}
-# Define compilation flags for itanium based NEC TX-7 (and gcc) -> ia64
-# Also define compilation flags for SGI Altrix (and gcc) -> ia64
-# Same for AMD Opteron based HP Proliant DL585                  -> x86_64
-# export CFLAGS="$CFLAGS -fpic -O"
-CDMSARCH=`uname -m`
-if (test "${CDMSARCH}" = "ia64") then
-    export CFLAGS="$CFLAGS -fPIC"
-fi
-if (test "${CDMSARCH}" = "x86_64") then
-    export CFLAGS="$CFLAGS -fPIC"
-fi
-
-if (test `uname ` = "CYGWIN_NT-5.1") then
-(cd netcdf*; \
-    FC=''; export FC; \
-    F90='';export F90; \
-    unset PGI; \
-    mkdir ${prefix}/Externals/NetCDF ; \
-    ./configure --build=i686-pc-linux-gnu --prefix=${prefix}/Externals/NetCDF; \
-    make; make install
-)
-elif (test `uname ` = "CYGWIN_NT-6.0") then
-(cd netcdf*; \
-    FC=''; export FC; \
-    F90='';export F90; \
-    unset PGI; \
-    mkdir ${prefix}/Externals/NetCDF ; \
-    ./configure --build=i686-pc-linux-gnu --prefix=${prefix}/Externals/NetCDF; \
-    make; make install
-)
-else
-(cd netcdf*; \
-    FC=''; export FC; \
-    F90='';export F90; \
-    unset PGI; \
-    mkdir ${prefix}/Externals/NetCDF ; \
-    ./configure --prefix=${prefix}/Externals/NetCDF; \
-    make; make install
-)
-fi
diff --git a/exsrc/netcdf_fortran.sh b/exsrc/netcdf_fortran.sh
deleted file mode 100755
index bbf4c9886..000000000
--- a/exsrc/netcdf_fortran.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-PACKAGE="netcdf"
-BUILD=`pwd`
-export BUILD
-. ./prolog.sh
-
-FC=`${prefix}/${version}/bin/python ${BUILD}/detect_fortran.py`
-export FC
-if ( test $FC = "gfortran") then
-    CPPFLAGS="-DpgiFortran"; export CPPFLAGS
-fi
-if (test `uname` = "HP-UX") then
-    CPPFLAGS="+z -D_HPUX_SOURCE"; export CPPFLAGS
-elif (test `uname` = "Darwin") then
-(    CXX=""; export CXX \
-)
-fi
-
-if (test `uname ` = "CYGWIN_NT-5.1") then 
-(cd netcdf*; \
-    unset PGI; \
-    mkdir ${prefix}/Externals/NetCDF; \
-    ./configure --build=i686-pc-linux-gnu --prefix=${prefix}/Externals/NetCDF; \
-    make; make install
-)
-elif (test `uname ` = "CYGWIN_NT-6.0") then 
-(cd netcdf*; \
-    unset PGI; \
-    mkdir ${prefix}/Externals/NetCDF; \
-    ./configure --build=i686-pc-linux-gnu --prefix=${prefix}/Externals/NetCDF; \
-    make; make install
-)
-else
-(cd netcdf*;\
-    # Add f77 support
-    unset PGI; \
-    mkdir ${prefix}/Externals/NetCDF; \
-    ./configure --prefix=${prefix}/Externals/NetCDF; \
-    make; make install; \
-)
-fi
-
diff --git a/exsrc/netpbm.input.conf b/exsrc/netpbm.input.conf
deleted file mode 100644
index a7f73f85f..000000000
--- a/exsrc/netpbm.input.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-static
-
-none
-none
-none
-none
-
-
-
-
-
-
-
-
-
-
diff --git a/exsrc/netpbm.input.conf.Cygwin b/exsrc/netpbm.input.conf.Cygwin
deleted file mode 100644
index 5bd669a10..000000000
--- a/exsrc/netpbm.input.conf.Cygwin
+++ /dev/null
@@ -1,18 +0,0 @@
-
-gnu
-
-static
-
-none
-none
-none
-
-
-
-
-
-
-
-
-
-
diff --git a/exsrc/netpbm.input.conf.Darwin b/exsrc/netpbm.input.conf.Darwin
deleted file mode 100644
index 81ee29886..000000000
--- a/exsrc/netpbm.input.conf.Darwin
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-static
-
-none
-none
-none
-none
-
-
-
-
-
-
-
-
-
diff --git a/exsrc/netpbm.input.conf.sun b/exsrc/netpbm.input.conf.sun
deleted file mode 100644
index ae45aa38c..000000000
--- a/exsrc/netpbm.input.conf.sun
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-cc
-sun
-
-
-static
-none
-none
-none
-
-
-
-
-
-
-
-
-
-
diff --git a/exsrc/netpbm.input.inst b/exsrc/netpbm.input.inst
deleted file mode 100644
index c9167ec1e..000000000
--- a/exsrc/netpbm.input.inst
+++ /dev/null
@@ -1,9 +0,0 @@
-INST_PREFIX
-CDAT_PREFIX
-
-
-
-
-
-N
-
diff --git a/exsrc/netpbm.sh b/exsrc/netpbm.sh
deleted file mode 100755
index 1e5d07180..000000000
--- a/exsrc/netpbm.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-PACKAGE="netpbm"
-OS=`uname`
-if ( test "${OS}" = 'Darwin' ) then
-    echo "Darwin" ;
-    CONF_FILE=netpbm.input.conf.Darwin;
-elif ( test "${OS}" = 'sunOS' ) then
-    echo "Sun OS";
-    CONF_FILE=netpbm.input.conf.sun;
-elif ( test "${OS}" = 'Linux' ) then
-    echo "GNU Linux";
-    CONF_FILE=netpbm.input.conf;
-elif ( test "${OS}" = 'CYGWIN_NT-5.1' ) then
-    echo "GNU Build for Cygwin";
-    CONF_FILE=netpbm.input.conf.Cygwin;
-elif ( test "${OS}" = 'CYGWIN_NT-6.0' ) then
-    echo "GNU Build for Cygwin";
-    CONF_FILE=netpbm.input.conf.Cygwin;
-else
-    echo "Platform not tested, using GNU conf file";
-    echo "If hangs or fails try manually or use pbmplus";
-fi
-. ./prolog.sh
-(  
-   cd netpbm*; \
-   BUILD_DIR=`pwd`;\
-   sed -e 's@CDAT_PREFIX@'${prefix}'/Externals@g' \
-       -e 's@INST_PREFIX@'${BUILD_DIR}'/TMP@g' \
-        ../../netpbm.input.inst > netpbm.input.inst.feed ; \
-   ./configure < ../../${CONF_FILE} ; \
-   make ; \
-   make package pkgdir=${BUILD_DIR}/TMP; \
-   ./installnetpbm < netpbm.input.inst.feed ; \
-   rm -rf  ${BUILD_DIR}/TMP 
-)
diff --git a/exsrc/numpy.sh b/exsrc/numpy.sh
deleted file mode 100755
index a1560bcbb..000000000
--- a/exsrc/numpy.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-PACKAGE="numpy"
-. ./prolog.sh 
-# Handle x86_64 arch
-CDATARCH=`uname -m`
-if (test "${CDATARCH}" = "x86_64") then
-  cd numpy-*
-  cat >site.cfg <<EOF
-# Defaults
-#  ========
-# The settings given here will apply to all other sections if not overridden.
-# This is a good place to add general library and include directories like
-# /usr/local/{lib,include}
-#
-[DEFAULT]
-library_dirs = /usr/lib64
-EOF
-  cd ..
-fi
-if (test "${BLAS}" = "SETBLAS") then
-BLAS=${prefix}/Externals/lib/libblas.a
-export BLAS
-fi
-if (test "${LAPACK}" = "SETLAPACK") then
-LAPACK=${prefix}/Externals/lib/liblapack.a
-export LAPACK
-fi
-# Numpy.
-(cd numpy-*; ${prefix}/${version}/bin/python setup.py build ${D} install)
-
diff --git a/exsrc/pbmplus.sh b/exsrc/pbmplus.sh
deleted file mode 100755
index 03f48e043..000000000
--- a/exsrc/pbmplus.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-PACKAGE="pbmplus"
-. ./prolog.sh
-d=`uname`
-if ( test "Linux" = "${d}" ) then
-( INSTALLBINARIES=${prefix}/Externals/bin; export INSTALLBINARIES; INSTALLMANUALS=${prefix}/Externals/man/mann ; export INSTALLMANUALS ; CC="gcc -ansi" ; export CC;cd pbmplus; make install )
-else
-( INSTALLBINARIES=${prefix}/Externals/bin; export INSTALLBINARIES ; INSTALLMANUALS=${prefix}/Externals/man/mann ; export INSTALLMANUALS ; cd pbmplus; make install )
-fi
diff --git a/exsrc/pixman.def b/exsrc/pixman.def
deleted file mode 100644
index 4b69464c5..000000000
--- a/exsrc/pixman.def
+++ /dev/null
@@ -1,62 +0,0 @@
-EXPORTS
-pixman_region_set_static_pointers
-pixman_region_init
-pixman_region_init_rect
-pixman_region_init_with_extents
-pixman_region_fini
-pixman_region_translate
-pixman_region_copy
-pixman_region_intersect
-pixman_region_union
-pixman_region_union_rect
-pixman_region_subtract
-pixman_region_inverse
-pixman_region_contains_point
-pixman_region_contains_rectangle
-pixman_region_not_empty
-pixman_region_extents
-pixman_region_n_rects
-pixman_region_rectangles
-pixman_region_equal
-pixman_region_selfcheck
-pixman_region_reset
-pixman_region_init_rects
-pixman_blt
-pixman_fill
-pixman_image_create_solid_fill
-pixman_image_create_linear_gradient
-pixman_image_create_radial_gradient
-pixman_image_create_conical_gradient
-pixman_image_create_bits
-pixman_image_ref
-pixman_image_unref
-pixman_image_set_clip_region
-pixman_image_set_has_client_clip
-pixman_image_set_transform
-pixman_image_set_repeat
-pixman_image_set_filter
-pixman_image_set_source_clipping
-pixman_image_set_alpha_map
-pixman_image_set_component_alpha
-pixman_image_set_accessors
-pixman_image_set_indexed
-pixman_image_get_data
-pixman_image_get_width
-pixman_image_get_height
-pixman_image_get_stride
-pixman_image_get_depth
-pixman_image_fill_rectangles
-pixman_compute_composite_region
-pixman_image_composite
-pixman_sample_ceil_y
-pixman_sample_floor_y
-pixman_edge_step
-pixman_edge_init
-pixman_line_fixed_edge_init
-pixman_rasterize_edges
-pixman_add_traps
-pixman_add_trapezoids
-pixman_rasterize_trapezoid
-pixman_format_supported_destination
-pixman_transform_point_3d
-LIBRARY libpixman-1.dll
diff --git a/exsrc/pkgconfig.sh b/exsrc/pkgconfig.sh
deleted file mode 100755
index b72b9fedd..000000000
--- a/exsrc/pkgconfig.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-PACKAGE="pkgconfig"
-. ./prolog.sh
-CDMSARCH=`uname -m`
-if (test "${CDMSARCH}" = "ia64") then
-  export CC="gcc -fPIC"
-fi
-if (test "${CDMSARCH}" = "x86_64") then
-  export CC="gcc -fPIC"
-fi
-(cd pkgconfig-* ; ./configure --prefix=${prefix}/Externals ; make ; make install )
-
diff --git a/exsrc/proj.sh b/exsrc/proj.sh
deleted file mode 100755
index 108cce340..000000000
--- a/exsrc/proj.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-PACKAGE="proj"
-. ./prolog.sh
-(cd proj* ; ./configure --prefix=${prefix}/Externals ; make ; make install )
-
diff --git a/exsrc/prolog.sh b/exsrc/prolog.sh
deleted file mode 100755
index 9d0e7b6d6..000000000
--- a/exsrc/prolog.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-# superstition
-## Undoing superstition, let's be rational here.
-#unset PYTHONPATH
-#unset PYTHONSTARTUP
-#unset PYTHONHOME
-
-if (test "$1" = "--debug") then
-    D="--debug";
-    OPT=-g; 
-    shift
-else
-    D="";
-    OPT=${OPT:=-O}
-fi
-export OPT
-
-OS=`uname`
-if (test -z "$1") then
-    echo "Usage: $0 prefix";
-    exit 1
-fi
-version=`more ../version`
-
-if (test ! -d $1) then
-    echo -n "$1 is not a directory; create it? (y/[n])";
-    y='n'
-    read y;
-    if (test ${y} = 'y') then
-        mkdir -p $1/${version}/bin; mkdir $1/${version}/lib; mkdir $1/${version}/include ; mkdir -p $1/Externals/bin ; mkdir $!/Externals/lib ; mkdir $1/Externals/share ; mkdir $1/Externals/include
-        if (test ! -d $1) then
-            echo "Could not create $1, installation aborted.";
-            exit 1
-        fi
-    else
-        echo 'Installation aborted.';
-        exit 1
-    fi
-fi
-prefix=`(cd $1;pwd)`
-
-cp -f detect_fortran.py ${prefix}/${version}/bin/detect_fortran.py;
-chmod +x  ${prefix}/${version}/bin/detect_fortran.py;
-
-#mkdir -p build
-/bin/cp src/${PACKAGE}*gz build
-cd build
-chmod +w ${PACKAGE}*gz
-echo "untarring "${PACKAGE}
-
-for x in ${PACKAGE}*gz;
-    do
-        echo $x;
-        echo `basename $x .gz`;
-	gunzip -f $x;
-	tar xf `basename $x .gz`;
-	/bin/rm -f `basename $x .gz`;
-    done
-
-
-#if (test ! -d build) then
-#    # Unpack everything into build
-#    mkdir -p build
-#    /bin/cp src/*.gz build
-#    cd build
-#    chmod +w *.gz 
-#    for x in *.gz; 
-#    do 
-#        echo "$x"; 
-#        gunzip -f $x;
-#        tar xf `basename $x .gz`;
-#        /bin/rm -f `basename $x .gz`
-#    done
-#    cd ..
-#fi
-echo "Installation of ${PACKAGE} to ${prefix}"
diff --git a/exsrc/pyfort.sh b/exsrc/pyfort.sh
deleted file mode 100755
index 361e67ea0..000000000
--- a/exsrc/pyfort.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-PACKAGE="Pyfort"
-. ./prolog.sh
-(cd Pyfort*; ${prefix}/${version}/bin/python setup.py build ${D} install )
diff --git a/exsrc/setuptools.sh b/exsrc/setuptools.sh
deleted file mode 100755
index 5082091d3..000000000
--- a/exsrc/setuptools.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-PACKAGE="setuptools"
-. ./prolog.sh 
-# Twisted.
-(cd setuptools-* ; ${prefix}/${version}/bin/python setup.py build ${D} install)
-
diff --git a/exsrc/src/CMakeCache.txt.linux.in b/exsrc/src/CMakeCache.txt.linux.in
deleted file mode 100644
index 15a056b28..000000000
--- a/exsrc/src/CMakeCache.txt.linux.in
+++ /dev/null
@@ -1,1965 +0,0 @@
-# This is the CMakeCache file.
-# For build in directory: @BUILD_DIR@/VTK-build
-# It was generated by CMake: cmake
-# You can edit this file to change values found and used by cmake.
-# If you do not want to change any of the values, simply exit the editor.
-# If you do want to change a value, simply edit, save, and exit the editor.
-# The syntax for the file is as follows:
-# KEY:TYPE=VALUE
-# KEY is the name of a variable in the cache.
-# TYPE is a hint to GUI's for the type of VALUE, DO NOT EDIT TYPE!.
-# VALUE is the current value for the KEY.
-
-########################
-# EXTERNAL cache entries
-########################
-
-//Build the documentation (Doxygen).
-BUILD_DOCUMENTATION:BOOL=OFF
-
-//Build VTK examples.
-BUILD_EXAMPLES:BOOL=ON
-
-//Build Verdict with shared libraries.
-BUILD_SHARED_LIBS:BOOL=ON
-
-//Build the testing tree.
-BUILD_TESTING:BOOL=OFF
-
-//Path to a program.
-BZRCOMMAND:FILEPATH=BZRCOMMAND-NOTFOUND
-
-//Path to a program.
-CMAKE_AR:FILEPATH=/usr/bin/ar
-
-//For backwards compatibility, what version of CMake commands and
-// syntax should this version of CMake try to support.
-CMAKE_BACKWARDS_COMPATIBILITY:STRING=2.4
-
-//Choose the type of build, options are: None(CMAKE_CXX_FLAGS or
-// CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.
-CMAKE_BUILD_TYPE:STRING=
-
-//Enable/Disable color output during build.
-CMAKE_COLOR_MAKEFILE:BOOL=ON
-
-//CXX compiler.
-CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/c++
-
-//Flags used by the compiler during all build types.
-CMAKE_CXX_FLAGS:STRING=
-
-//Flags used by the compiler during debug builds.
-CMAKE_CXX_FLAGS_DEBUG:STRING=-g
-
-//Flags used by the compiler during release minsize builds.
-CMAKE_CXX_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG
-
-//Flags used by the compiler during release builds (/MD /Ob1 /Oi
-// /Ot /Oy /Gs will produce slightly less optimized but smaller
-// files).
-CMAKE_CXX_FLAGS_RELEASE:STRING=-O3 -DNDEBUG
-
-//Flags used by the compiler during Release with Debug Info builds.
-CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g
-
-//C compiler.
-CMAKE_C_COMPILER:FILEPATH=/usr/bin/gcc
-
-//Flags used by the compiler during all build types.
-CMAKE_C_FLAGS:STRING=
-
-//Flags used by the compiler during debug builds.
-CMAKE_C_FLAGS_DEBUG:STRING=-g
-
-//Flags used by the compiler during release minsize builds.
-CMAKE_C_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG
-
-//Flags used by the compiler during release builds (/MD /Ob1 /Oi
-// /Ot /Oy /Gs will produce slightly less optimized but smaller
-// files).
-CMAKE_C_FLAGS_RELEASE:STRING=-O3 -DNDEBUG
-
-//Flags used by the compiler during Release with Debug Info builds.
-CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=-O2 -g
-
-//Flags used by the linker.
-CMAKE_EXE_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during debug builds.
-CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during release minsize builds.
-CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during release builds.
-CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during Release with Debug Info builds.
-CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//Use HP pthreads.
-CMAKE_HP_PTHREADS:BOOL=
-
-//Path to a program.
-CMAKE_INSTALL_NAME_TOOL:FILEPATH=/usr/bin/install_name_tool
-
-//Install path prefix, prepended onto install directories.
-CMAKE_INSTALL_PREFIX:PATH=@PREFIX_PATH@
-
-//Path to a program.
-CMAKE_LINKER:FILEPATH=/usr/bin/ld
-
-//Path to a program.
-CMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/make
-
-//Flags used by the linker during the creation of modules.
-CMAKE_MODULE_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during debug builds.
-CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during release minsize builds.
-CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during release builds.
-CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during Release with Debug Info builds.
-CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//Path to a program.
-CMAKE_NM:FILEPATH=/usr/bin/nm
-
-//Path to a program.
-CMAKE_OBJCOPY:FILEPATH=CMAKE_OBJCOPY-NOTFOUND
-
-//Path to a program.
-CMAKE_OBJDUMP:FILEPATH=CMAKE_OBJDUMP-NOTFOUND
-
-//Build architectures for OSX
-CMAKE_OSX_ARCHITECTURES:STRING=
-
-//Minimum OS X version to target for deployment (at runtime); newer
-// APIs weak linked. Set to empty string for default value.
-CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.5
-
-//The product will be built against the headers and libraries located
-// inside the indicated SDK.
-CMAKE_OSX_SYSROOT:PATH=/Developer/SDKs/MacOSX10.5.sdk
-
-//Value Computed by CMake
-CMAKE_PROJECT_NAME:STATIC=VTK
-
-//Path to a program.
-CMAKE_RANLIB:FILEPATH=/usr/bin/ranlib
-
-//Flags used by the linker during the creation of dll's.
-CMAKE_SHARED_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during debug builds.
-CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during release minsize builds.
-CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during release builds.
-CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during Release with Debug Info builds.
-CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//Path to a program.
-CMAKE_STRIP:FILEPATH=/usr/bin/strip
-
-//Thread library used.
-CMAKE_THREAD_LIBS:STRING=-lpthread
-
-//Use the pthreads library.
-CMAKE_USE_PTHREADS:BOOL=1
-
-//If true, cmake will use relative paths in makefiles and projects.
-CMAKE_USE_RELATIVE_PATHS:BOOL=OFF
-
-//Use sproc libs.
-CMAKE_USE_SPROC:BOOL=
-
-//Use the win32 thread library.
-CMAKE_USE_WIN32_THREADS:BOOL=
-
-//If this value is on, makefiles will be generated without the
-// .SILENT directive, and all commands will be echoed to the console
-// during the make.  This is useful for debugging only. With Visual
-// Studio IDE projects all commands are done without /nologo.
-CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE
-
-//X11 extra flags.
-CMAKE_X_CFLAGS:STRING=
-
-//Libraries and options used in X11 programs.
-CMAKE_X_LIBS:STRING=/usr/X11R6/lib/libSM.dylib;/usr/X11R6/lib/libICE.dylib;/usr/X11R6/lib/libX11.dylib;/usr/X11R6/lib/libXext.dylib
-
-//Path to the coverage program that CTest uses for performing coverage
-// inspection
-COVERAGE_COMMAND:FILEPATH=/usr/bin/gcov
-
-//Path to a program.
-CVSCOMMAND:FILEPATH=/usr/bin/cvs
-
-//Options passed to the cvs update command.
-CVS_UPDATE_OPTIONS:STRING=-d -A -P
-
-//Maximum time allowed before CTest will kill the test.
-DART_TESTING_TIMEOUT:STRING=1500
-
-//Value Computed by CMake
-DICOMParser_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/DICOMParser
-
-//Value Computed by CMake
-DICOMParser_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/DICOMParser
-
-//Path to a program.
-HGCOMMAND:FILEPATH=HGCOMMAND-NOTFOUND
-
-//Command used to build entire project from the command line.
-MAKECOMMAND:STRING=/usr/bin/make -i
-
-//Path to the memory checking command, used for memory error detection.
-MEMORYCHECK_COMMAND:FILEPATH=/usr/local/bin/valgrind
-
-//File that contains suppressions for the memory checker
-MEMORYCHECK_SUPPRESSIONS_FILE:FILEPATH=
-
-//Value Computed by CMake
-MaterialLibrary_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/MaterialLibrary
-
-//Value Computed by CMake
-MaterialLibrary_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/MaterialLibrary
-
-//Include for OpenGL on OSX
-OPENGL_INCLUDE_DIR:PATH=/usr/X11R6/include
-
-//OpenGL lib for OSX
-OPENGL_gl_LIBRARY:FILEPATH=/usr/X11R6/lib/libGL.dylib
-
-//AGL lib for OSX
-OPENGL_glu_LIBRARY:FILEPATH=/usr/X11R6/lib/libGLU.dylib
-
-//Path to a file.
-OPENGL_xmesa_INCLUDE_DIR:PATH=/usr/X11R6/include
-
-//Does an external project define proj_list or should libproj4
-// define it?
-PROJ_LIST_EXTERNAL:BOOL=OFF
-
-//Should libproj4 include projection code that relies on GSL?
-PROJ_USE_GSL:BOOL=OFF
-
-//Should libproj4 be built as a thread-friendly library?
-PROJ_USE_PTHREADS:BOOL=OFF
-
-//Path to a library.
-PYTHON_DEBUG_LIBRARY:FILEPATH=/Library/Frameworks/python.framework
-
-//Add module vtkCommonPython
-PYTHON_ENABLE_MODULE_vtkCommonPython:BOOL=ON
-
-//Add module vtkFilteringPython
-PYTHON_ENABLE_MODULE_vtkFilteringPython:BOOL=ON
-
-//Add module vtkGenericFilteringPython
-PYTHON_ENABLE_MODULE_vtkGenericFilteringPython:BOOL=ON
-
-//Add module vtkGeovisPython
-PYTHON_ENABLE_MODULE_vtkGeovisPython:BOOL=ON
-
-//Add module vtkGraphicsPython
-PYTHON_ENABLE_MODULE_vtkGraphicsPython:BOOL=ON
-
-//Add module vtkHybridPython
-PYTHON_ENABLE_MODULE_vtkHybridPython:BOOL=ON
-
-//Add module vtkIOPython
-PYTHON_ENABLE_MODULE_vtkIOPython:BOOL=ON
-
-//Add module vtkImagingPython
-PYTHON_ENABLE_MODULE_vtkImagingPython:BOOL=ON
-
-//Add module vtkInfovisPython
-PYTHON_ENABLE_MODULE_vtkInfovisPython:BOOL=ON
-
-//Add module vtkRenderingPython
-PYTHON_ENABLE_MODULE_vtkRenderingPython:BOOL=ON
-
-//Add module vtkViewsPython
-PYTHON_ENABLE_MODULE_vtkViewsPython:BOOL=ON
-
-//Add module vtkVolumeRenderingPython
-PYTHON_ENABLE_MODULE_vtkVolumeRenderingPython:BOOL=ON
-
-//Add module vtkWidgetsPython
-PYTHON_ENABLE_MODULE_vtkWidgetsPython:BOOL=ON
-
-//Path to a program.
-PYTHON_EXECUTABLE:FILEPATH=@PREFIX_PATH@/bin/python@PYVER@
-
-//Extra libraries to link when linking to python (such as "z" for
-// zlib).  Separate multiple libraries with semicolons.
-PYTHON_EXTRA_LIBS:STRING=
-
-//Path to a file.
-PYTHON_INCLUDE_PATH:PATH=@PREFIX_PATH@/include/python@PYVER@
-
-//Path to a library.
-PYTHON_LIBRARY:FILEPATH=@PREFIX_PATH@/lib/libpython@PYVER@.dylib
-
-//Add module vtkCommonPython shared
-PYTHON_MODULE_vtkCommonPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkFilteringPython shared
-PYTHON_MODULE_vtkFilteringPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkGenericFilteringPython shared
-PYTHON_MODULE_vtkGenericFilteringPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkGeovisPython shared
-PYTHON_MODULE_vtkGeovisPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkGraphicsPython shared
-PYTHON_MODULE_vtkGraphicsPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkHybridPython shared
-PYTHON_MODULE_vtkHybridPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkIOPython shared
-PYTHON_MODULE_vtkIOPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkImagingPython shared
-PYTHON_MODULE_vtkImagingPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkInfovisPython shared
-PYTHON_MODULE_vtkInfovisPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkRenderingPython shared
-PYTHON_MODULE_vtkRenderingPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkViewsPython shared
-PYTHON_MODULE_vtkViewsPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkVolumeRenderingPython shared
-PYTHON_MODULE_vtkVolumeRenderingPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkWidgetsPython shared
-PYTHON_MODULE_vtkWidgetsPython_BUILD_SHARED:BOOL=ON
-
-//Utility library needed for vtkpython
-PYTHON_UTIL_LIBRARY:FILEPATH=/usr/lib/libutil.dylib
-
-//Path to scp command, used by CTest for submitting results to
-// a Dart server
-SCPCOMMAND:FILEPATH=/usr/bin/scp
-
-//Name of the computer/site where compile is being run
-SITE:STRING=omar
-
-//Path to the SLURM sbatch executable
-SLURM_SBATCH_COMMAND:FILEPATH=SLURM_SBATCH_COMMAND-NOTFOUND
-
-//Path to the SLURM srun executable
-SLURM_SRUN_COMMAND:FILEPATH=SLURM_SRUN_COMMAND-NOTFOUND
-
-//Path to a program.
-SVNCOMMAND:FILEPATH=svn
-
-//Path to a file.
-TCL_INCLUDE_PATH:PATH=@EXTERNALS@/include
-
-//Path to a library.
-TCL_LIBRARY:FILEPATH=@EXTERNALS@/lib/libtcl@TCLTK_VERSION@.dylib
-
-//Path to a program.
-TCL_TCLSH:FILEPATH=@EXTERNALS@/bin/tclsh@TCLTK_VERSION@
-
-//Path to a file.
-TK_INCLUDE_PATH:PATH=@EXTERNALS@/include
-
-//The path to the Tk internal headers (tkMacOSXDefault.h).
-TK_INTERNAL_PATH:PATH=@BUILD_DIR@/VTK/Utilities/TclTk/internals/tk8.4
-
-//Path to a library.
-TK_LIBRARY:FILEPATH=@EXTERNALS@/lib/libtk@TCLTK_VERSION@.dylib
-
-//Build the 2007 Verdict User Manual
-VERDICT_BUILD_DOC:BOOL=OFF
-
-//Should tests of the VERDICT library be built?
-VERDICT_ENABLE_TESTING:BOOL=OFF
-
-//Mangle verdict names for inclusion in a larger library?
-VERDICT_MANGLE:BOOL=ON
-
-//VTK requires the verdict prefix to be vtk
-VERDICT_MANGLE_PREFIX:STRING=vtk
-
-//VTK requires doubles
-VERDICT_USE_FLOAT:BOOL=OFF
-
-//Path to a library.
-VLI_LIBRARY_FOR_VP1000:FILEPATH=VLI_LIBRARY_FOR_VP1000-NOTFOUND
-
-//Value Computed by CMake
-VTKEXPAT_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtkexpat
-
-//Value Computed by CMake
-VTKEXPAT_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtkexpat
-
-//Value Computed by CMake
-VTKFREETYPE_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtkfreetype
-
-//Value Computed by CMake
-VTKFREETYPE_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtkfreetype
-
-//Value Computed by CMake
-VTKFTGL_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/ftgl
-
-//Value Computed by CMake
-VTKFTGL_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/ftgl
-
-//Value Computed by CMake
-VTKJPEG_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtkjpeg
-
-//Value Computed by CMake
-VTKJPEG_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtkjpeg
-
-//Value Computed by CMake
-VTKNETCDF_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtknetcdf
-
-//Value Computed by CMake
-VTKNETCDF_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtknetcdf
-
-//Value Computed by CMake
-VTKPNG_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtkpng
-
-//Value Computed by CMake
-VTKPNG_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtkpng
-
-//Value Computed by CMake
-VTKTIFF_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtktiff
-
-//Value Computed by CMake
-VTKTIFF_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtktiff
-
-//Value Computed by CMake
-VTKZLIB_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtkzlib
-
-//Value Computed by CMake
-VTKZLIB_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtkzlib
-
-//Value Computed by CMake
-VTK_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build
-
-//Path to a file.
-VTK_DATA_ROOT:PATH=@BUILD_DIR@/VTKData
-
-//Build leak checking support into VTK.
-VTK_DEBUG_LEAKS:BOOL=OFF
-
-//Location of the OpenGL extensions header file (glext.h).
-VTK_GLEXT_FILE:FILEPATH=@BUILD_DIR@/VTK/Utilities/ParseOGLExt/headers/glext.h
-
-//Location of the GLX extensions header file (glxext.h).
-VTK_GLXEXT_FILE:FILEPATH=@BUILD_DIR@/VTK/Utilities/ParseOGLExt/headers/glxext.h
-
-//Remove all legacy code completely.
-VTK_LEGACY_REMOVE:BOOL=OFF
-
-//Silence all legacy code messages.
-VTK_LEGACY_SILENT:BOOL=OFF
-
-//; separated directories to search for materials/shaders
-VTK_MATERIALS_DIRS:STRING=@BUILD_DIR@/VTK-build/Utilities/MaterialLibrary/Repository
-
-//Disable multithreading support in the Python bindings
-VTK_NO_PYTHON_THREADS:BOOL=OFF
-
-//The opengl library being used supports off screen Mesa calls.
-VTK_OPENGL_HAS_OSMESA:BOOL=OFF
-
-//Arguments passed to "python setup.py install ..." during installation.
-VTK_PYTHON_SETUP_ARGS:STRING=--prefix="${CMAKE_INSTALL_PREFIX}"
-
-//Value Computed by CMake
-VTK_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK
-
-//VTK tests call vtkFloatingPointExceptions::Enable()
-VTK_TESTING_USE_FPE:BOOL=ON
-
-//Build VTK with 64 bit ids
-VTK_USE_64BIT_IDS:BOOL=OFF
-
-//Use Boost libraries for graph algorithms - www.boost.org.
-VTK_USE_BOOST:BOOL=OFF
-
-//Build classes using Carbon API.
-VTK_USE_CARBON:BOOL=OFF
-
-//Build pixel and vertex shader support for Cg.
-VTK_USE_CG_SHADERS:BOOL=OFF
-
-//Build classes using Cocoa API.
-VTK_USE_COCOA:BOOL=OFF
-
-//Turn this option off and tests and warning/error macros will
-// not popup windows
-VTK_USE_DISPLAY:BOOL=ON
-
-//If the FFMPEG library is available, should VTK use it for saving
-// .avi animation files?
-VTK_USE_FFMPEG_ENCODER:BOOL=OFF
-
-//Build the vtkGeovis kit.  Needed for performing geographic visualization.
-VTK_USE_GEOVIS:BOOL=ON
-
-//Build VTK with gl2ps support.
-VTK_USE_GL2PS:BOOL=ON
-
-//Build pixel and vertex shader support for GLSL.
-VTK_USE_GLSL_SHADERS:BOOL=ON
-
-//Build VTK with GUI Support
-VTK_USE_GUISUPPORT:BOOL=OFF
-
-//Build the vtkInfovis kit.  Needed for performing information
-// visualization.
-VTK_USE_INFOVIS:BOOL=ON
-
-//Use mangled Mesa with OpenGL.
-VTK_USE_MANGLED_MESA:BOOL=OFF
-
-//Build metaio
-VTK_USE_METAIO:BOOL=ON
-
-//Enable use of the patented mpeg2 library. You are solely responsible
-// for any legal issues associated with using patented code in
-// your software.
-VTK_USE_MPEG2_ENCODER:BOOL=OFF
-
-//Build the MySQL driver for vtkSQLDatabase.
-VTK_USE_MYSQL:BOOL=OFF
-
-//Add support for arbitrary-dimension sparse and dense arrays.
-VTK_USE_N_WAY_ARRAYS:BOOL=OFF
-
-//Build the ODBC database interface
-VTK_USE_ODBC:BOOL=OFF
-
-//Build the vtkParallel kit.
-VTK_USE_PARALLEL:BOOL=OFF
-
-//Build the PostgreSQL driver for vtkSQLDatabase.
-VTK_USE_POSTGRES:BOOL=OFF
-
-//Build the vtkRendering kit.  Needed for displaying data or using
-// widgets.
-VTK_USE_RENDERING:BOOL=ON
-
-//Build shared libraries with rpath.  This makes it easy to run
-// executables from the build tree when using shared libraries,
-// but removes install support.
-VTK_USE_RPATH:BOOL=ON
-
-//Use the system's expat library.
-VTK_USE_SYSTEM_EXPAT:BOOL=OFF
-
-//Use the system's freetype library.
-VTK_USE_SYSTEM_FREETYPE:BOOL=OFF
-
-//Use the system's jpeg library.
-VTK_USE_SYSTEM_JPEG:BOOL=OFF
-
-//Use the system's proj4 library.
-VTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF
-
-//Use the system's libxml2 library.
-VTK_USE_SYSTEM_LIBXML2:BOOL=OFF
-
-//Use the system's png library.
-VTK_USE_SYSTEM_PNG:BOOL=OFF
-
-//Use the system's tiff library.
-VTK_USE_SYSTEM_TIFF:BOOL=OFF
-
-//Use the system's zlib library.
-VTK_USE_SYSTEM_ZLIB:BOOL=OFF
-
-//Build VTK with Tk support
-VTK_USE_TK:BOOL=ON
-
-//Build the vtkViews kit.  Needed for creating packaged and linked
-// views.
-VTK_USE_VIEWS:BOOL=ON
-
-//Enable support for VolumePro 1000.
-VTK_USE_VOLUMEPRO_1000:BOOL=OFF
-
-//Build classes for the X11 window system.
-VTK_USE_X:BOOL=ON
-
-//Location of the WGL extensions header file (wglext.h).
-VTK_WGLEXT_FILE:FILEPATH=@BUILD_DIR@/VTK/Utilities/ParseOGLExt/headers/wglext.h
-
-//Path to a file.
-VTK_WRAP_HINTS:FILEPATH=@BUILD_DIR@/VTK/Wrapping/hints
-
-//Wrap VTK classes into the Java language.
-VTK_WRAP_JAVA:BOOL=OFF
-
-//Wrap VTK classes into the Python language.
-VTK_WRAP_PYTHON:BOOL=ON
-
-//Wrap VTK classes into the TCL language.
-VTK_WRAP_TCL:BOOL=OFF
-
-//Path to a file.
-X11_ICE_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_ICE_LIB:FILEPATH=/usr/X11R6/lib/libICE.dylib
-
-//Path to a library.
-X11_SM_LIB:FILEPATH=/usr/X11R6/lib/libSM.dylib
-
-//Path to a file.
-X11_X11_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_X11_LIB:FILEPATH=/usr/X11R6/lib/libX11.dylib
-
-//Path to a file.
-X11_XShm_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_XTest_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_XTest_LIB:FILEPATH=/usr/X11R6/lib/libXtst.dylib
-
-//Path to a file.
-X11_Xaccessrules_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_Xaccessstr_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_Xau_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xau_LIB:FILEPATH=/usr/X11R6/lib/libXau.dylib
-
-//Path to a file.
-X11_Xcomposite_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xcomposite_LIB:FILEPATH=/usr/X11R6/lib/libXcomposite.dylib
-
-//Path to a file.
-X11_Xcursor_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xcursor_LIB:FILEPATH=/usr/X11R6/lib/libXcursor.dylib
-
-//Path to a file.
-X11_Xdamage_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xdamage_LIB:FILEPATH=/usr/X11R6/lib/libXdamage.dylib
-
-//Path to a file.
-X11_Xdmcp_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xdmcp_LIB:FILEPATH=/usr/X11R6/lib/libXdmcp.dylib
-
-//Path to a library.
-X11_Xext_LIB:FILEPATH=/usr/X11R6/lib/libXext.dylib
-
-//Path to a file.
-X11_Xfixes_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xfixes_LIB:FILEPATH=/usr/X11R6/lib/libXfixes.dylib
-
-//Path to a file.
-X11_Xft_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xft_LIB:FILEPATH=/usr/X11R6/lib/libXft.dylib
-
-//Path to a file.
-X11_Xinerama_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xinerama_LIB:FILEPATH=/usr/X11R6/lib/libXinerama.dylib
-
-//Path to a file.
-X11_Xinput_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xinput_LIB:FILEPATH=/usr/X11R6/lib/libXi.dylib
-
-//Path to a file.
-X11_Xkb_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_Xkblib_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_Xlib_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_Xpm_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xpm_LIB:FILEPATH=/usr/X11R6/lib/libXpm.dylib
-
-//Path to a file.
-X11_Xrandr_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xrandr_LIB:FILEPATH=/usr/X11R6/lib/libXrandr.dylib
-
-//Path to a file.
-X11_Xrender_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xrender_LIB:FILEPATH=/usr/X11R6/lib/libXrender.dylib
-
-//Path to a file.
-X11_Xscreensaver_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xscreensaver_LIB:FILEPATH=/usr/X11R6/lib/libXss.dylib
-
-//Path to a file.
-X11_Xshape_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_Xt_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xt_LIB:FILEPATH=/usr/X11R6/lib/libXt.dylib
-
-//Path to a file.
-X11_Xutil_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_Xv_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xv_LIB:FILEPATH=/usr/X11R6/lib/libXv.dylib
-
-//Path to a library.
-X11_Xxf86misc_LIB:FILEPATH=/usr/X11R6/lib/libXxf86misc.dylib
-
-//Path to a file.
-X11_dpms_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_fontconfig_LIB:FILEPATH=/usr/X11R6/lib/libfontconfig.dylib
-
-//Path to a file.
-X11_xf86misc_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_xf86vmode_INCLUDE_PATH:PATH=/usr/include
-
-//Value Computed by CMake
-alglib_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtkalglib
-
-//Value Computed by CMake
-alglib_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtkalglib
-
-//Value Computed by CMake
-libproj4_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtklibproj4
-
-//Value Computed by CMake
-libproj4_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtklibproj4
-
-//Value Computed by CMake
-verdict_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/verdict
-
-//Value Computed by CMake
-verdict_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/verdict
-
-//Dependencies for the target
-vtkCommonPythonD_LIB_DEPENDS:STATIC=general;vtkCommon;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkCommonPython_LIB_DEPENDS:STATIC=general;vtkCommonPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkCommon_LIB_DEPENDS:STATIC=general;vtksys;general;-lpthread;general;-lm;
-
-//Dependencies for target
-vtkDICOMParser_LIB_DEPENDS:STATIC=
-
-//Value Computed by CMake
-vtkExodus2_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtkexodus2
-
-//Value Computed by CMake
-vtkExodus2_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtkexodus2
-
-//Dependencies for the target
-vtkFilteringPythonD_LIB_DEPENDS:STATIC=general;vtkFiltering;general;vtkCommonPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkFilteringPython_LIB_DEPENDS:STATIC=general;vtkFilteringPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkFiltering_LIB_DEPENDS:STATIC=general;vtkCommon;
-
-//Dependencies for the target
-vtkGenericFilteringPythonD_LIB_DEPENDS:STATIC=general;vtkGenericFiltering;general;vtkFilteringPythonD;general;vtkGraphicsPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkGenericFilteringPython_LIB_DEPENDS:STATIC=general;vtkGenericFilteringPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkGenericFiltering_LIB_DEPENDS:STATIC=general;vtkFiltering;general;vtkGraphics;
-
-//Dependencies for the target
-vtkGeovisPythonD_LIB_DEPENDS:STATIC=general;vtkGeovis;general;vtkWidgetsPythonD;general;vtkViewsPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkGeovisPython_LIB_DEPENDS:STATIC=general;vtkGeovisPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkGeovis_LIB_DEPENDS:STATIC=general;vtkWidgets;general;vtkViews;general;vtkproj4;
-
-//Dependencies for the target
-vtkGraphicsPythonD_LIB_DEPENDS:STATIC=general;vtkGraphics;general;vtkFilteringPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkGraphicsPython_LIB_DEPENDS:STATIC=general;vtkGraphicsPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkGraphics_LIB_DEPENDS:STATIC=general;vtkFiltering;general;vtkverdict;
-
-//Dependencies for the target
-vtkHybridPythonD_LIB_DEPENDS:STATIC=general;vtkHybrid;general;vtkRenderingPythonD;general;vtkIOPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkHybridPython_LIB_DEPENDS:STATIC=general;vtkHybridPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkHybrid_LIB_DEPENDS:STATIC=general;vtkRendering;general;vtkIO;general;vtkexoIIc;
-
-//Dependencies for the target
-vtkIOPythonD_LIB_DEPENDS:STATIC=general;vtkIO;general;vtkFilteringPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkIOPython_LIB_DEPENDS:STATIC=general;vtkIOPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkIO_LIB_DEPENDS:STATIC=general;vtkFiltering;general;vtkDICOMParser;general;vtkNetCDF;general;vtkmetaio;general;vtksqlite;general;vtkpng;general;vtkzlib;general;vtkjpeg;general;vtktiff;general;vtkexpat;general;vtksys;
-
-//Dependencies for the target
-vtkImagingPythonD_LIB_DEPENDS:STATIC=general;vtkImaging;general;vtkFilteringPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkImagingPython_LIB_DEPENDS:STATIC=general;vtkImagingPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkImaging_LIB_DEPENDS:STATIC=general;vtkFiltering;
-
-//Dependencies for the target
-vtkInfovisPythonD_LIB_DEPENDS:STATIC=general;vtkInfovis;general;vtkWidgetsPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkInfovisPython_LIB_DEPENDS:STATIC=general;vtkInfovisPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkInfovis_LIB_DEPENDS:STATIC=general;vtkWidgets;general;vtklibxml2;general;vtkalglib;
-
-//Dependencies for target
-vtkNetCDF_LIB_DEPENDS:STATIC=
-
-//Dependencies for the target
-vtkRenderingPythonD_LIB_DEPENDS:STATIC=general;vtkRendering;general;vtkGraphicsPythonD;general;vtkImagingPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkRenderingPythonTkWidgets_LIB_DEPENDS:STATIC=general;vtkRendering;general;@EXTERNALS@/lib/libtk@TCLTK_VERSION@.dylib;general;@EXTERNALS@/lib/libtcl@TCLTK_VERSION@.dylib;general;m;
-
-//Dependencies for the target
-vtkRenderingPython_LIB_DEPENDS:STATIC=general;vtkRenderingPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkRendering_LIB_DEPENDS:STATIC=general;vtkGraphics;general;vtkImaging;general;vtkIO;general;vtkftgl;general;vtkfreetype;general;vtkzlib;general;vtkpng;general;/usr/X11R6/lib/libXt.dylib;general;/usr/X11R6/lib/libSM.dylib;general;/usr/X11R6/lib/libICE.dylib;general;/usr/X11R6/lib/libX11.dylib;general;/usr/X11R6/lib/libXext.dylib;general;/usr/X11R6/lib/libXss.dylib;general;/usr/X11R6/lib/libXft.dylib;general;/usr/X11R6/lib/libfontconfig.dylib;
-
-//Dependencies for the target
-vtkViewsPythonD_LIB_DEPENDS:STATIC=general;vtkViews;general;vtkInfovisPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkViewsPython_LIB_DEPENDS:STATIC=general;vtkViewsPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkViews_LIB_DEPENDS:STATIC=general;vtkInfovis;
-
-//Dependencies for the target
-vtkVolumeRenderingPythonD_LIB_DEPENDS:STATIC=general;vtkVolumeRendering;general;vtkRenderingPythonD;general;vtkIOPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkVolumeRenderingPython_LIB_DEPENDS:STATIC=general;vtkVolumeRenderingPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkVolumeRendering_LIB_DEPENDS:STATIC=general;vtkRendering;general;vtkIO;
-
-//Dependencies for the target
-vtkWidgetsPythonD_LIB_DEPENDS:STATIC=general;vtkWidgets;general;vtkRenderingPythonD;general;vtkHybridPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkWidgetsPython_LIB_DEPENDS:STATIC=general;vtkWidgetsPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkWidgets_LIB_DEPENDS:STATIC=general;vtkRendering;general;vtkHybrid;
-
-//Dependencies for target
-vtkalglib_LIB_DEPENDS:STATIC=
-
-//Dependencies for the target
-vtkexoIIc_LIB_DEPENDS:STATIC=general;vtkNetCDF;
-
-//Dependencies for target
-vtkexpat_LIB_DEPENDS:STATIC=
-
-//Dependencies for target
-vtkfreetype_LIB_DEPENDS:STATIC=
-
-//Dependencies for the target
-vtkftgl_LIB_DEPENDS:STATIC=general;/usr/X11R6/lib/libGL.dylib;general;vtkfreetype;
-
-//Dependencies for target
-vtkjpeg_LIB_DEPENDS:STATIC=
-
-//Value Computed by CMake
-vtklibxml2_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtklibxml2
-
-//Dependencies for the target
-vtklibxml2_LIB_DEPENDS:STATIC=general;vtkzlib;general;dl;general;-lpthread;general;m;
-
-//Value Computed by CMake
-vtklibxml2_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtklibxml2
-
-//Value Computed by CMake
-vtkmetaio_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtkmetaio
-
-//Dependencies for the target
-vtkmetaio_LIB_DEPENDS:STATIC=general;vtkzlib;general;vtksys;
-
-//Value Computed by CMake
-vtkmetaio_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtkmetaio
-
-//Dependencies for the target
-vtkpng_LIB_DEPENDS:STATIC=general;vtkzlib;
-
-//Dependencies for the target
-vtkproj4_LIB_DEPENDS:STATIC=general;m;
-
-//Dependencies for target
-vtksqlite_LIB_DEPENDS:STATIC=
-
-//Value Computed by CMake
-vtksys_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/kwsys
-
-//Dependencies for target
-vtksys_LIB_DEPENDS:STATIC=
-
-//Value Computed by CMake
-vtksys_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/kwsys
-
-//Dependencies for the target
-vtktiff_LIB_DEPENDS:STATIC=general;vtkzlib;general;vtkjpeg;
-
-//Dependencies for target
-vtkverdict_LIB_DEPENDS:STATIC=
-
-//Dependencies for target
-vtkzlib_LIB_DEPENDS:STATIC=
-
-
-########################
-# INTERNAL cache entries
-########################
-
-ALGLIB_SHARED_LIB:INTERNAL=ON
-//ADVANCED property for variable: BUILD_DOCUMENTATION
-BUILD_DOCUMENTATION-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: BUILD_EXAMPLES
-BUILD_EXAMPLES-MODIFIED:INTERNAL=ON
-//MODIFIED property for variable: BUILD_SHARED_LIBS
-BUILD_SHARED_LIBS-MODIFIED:INTERNAL=ON
-//MODIFIED property for variable: BUILD_TESTING
-BUILD_TESTING-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: BZRCOMMAND
-BZRCOMMAND-ADVANCED:INTERNAL=1
-//Result of TRY_COMPILE
-CMAKE_ANSI_FOR_SCOPE:INTERNAL=TRUE
-//Have include iostream
-CMAKE_ANSI_STREAM_HEADERS:INTERNAL=1
-//ADVANCED property for variable: CMAKE_AR
-CMAKE_AR-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_BUILD_TOOL
-CMAKE_BUILD_TOOL-ADVANCED:INTERNAL=1
-//What is the target build tool cmake is generating for.
-CMAKE_BUILD_TOOL:INTERNAL=/usr/bin/make
-//This is the directory where this CMakeCache.txt was created
-CMAKE_CACHEFILE_DIR:INTERNAL=@BUILD_DIR@/VTK-build
-//Major version of cmake used to create the current loaded cache
-CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2
-//Minor version of cmake used to create the current loaded cache
-CMAKE_CACHE_MINOR_VERSION:INTERNAL=8
-//Patch version of cmake used to create the current loaded cache
-CMAKE_CACHE_PATCH_VERSION:INTERNAL=0
-//ADVANCED property for variable: CMAKE_COLOR_MAKEFILE
-CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1
-//Path to CMake executable.
-CMAKE_COMMAND:INTERNAL=cmake
-//Path to cpack program executable.
-CMAKE_CPACK_COMMAND:INTERNAL=cpack
-//Path to ctest program executable.
-CMAKE_CTEST_COMMAND:INTERNAL=ctest
-//ADVANCED property for variable: CMAKE_CXX_COMPILER
-CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1
-CMAKE_CXX_COMPILER_WORKS:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS
-CMAKE_CXX_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS_DEBUG
-CMAKE_CXX_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS_MINSIZEREL
-CMAKE_CXX_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS_RELEASE
-CMAKE_CXX_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS_RELWITHDEBINFO
-CMAKE_CXX_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_COMPILER
-CMAKE_C_COMPILER-ADVANCED:INTERNAL=1
-CMAKE_C_COMPILER_WORKS:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS
-CMAKE_C_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_DEBUG
-CMAKE_C_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_MINSIZEREL
-CMAKE_C_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_RELEASE
-CMAKE_C_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_RELWITHDEBINFO
-CMAKE_C_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//Result of TRY_COMPILE
-CMAKE_DETERMINE_CXX_ABI_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-CMAKE_DETERMINE_C_ABI_COMPILED:INTERNAL=TRUE
-//Path to cache edit program executable.
-CMAKE_EDIT_COMMAND:INTERNAL=ccmake
-//Executable file format
-CMAKE_EXECUTABLE_FORMAT:INTERNAL=Unknown
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS
-CMAKE_EXE_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_DEBUG
-CMAKE_EXE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_MINSIZEREL
-CMAKE_EXE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELEASE
-CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
-CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//Name of generator.
-CMAKE_GENERATOR:INTERNAL=Unix Makefiles
-//Result of TRY_COMPILE
-CMAKE_HAS_ANSI_STRING_STREAM:INTERNAL=TRUE
-//Is X11 around.
-CMAKE_HAS_X:INTERNAL=1
-//Have function connect
-CMAKE_HAVE_CONNECT:INTERNAL=1
-//Have function gethostbyname
-CMAKE_HAVE_GETHOSTBYNAME:INTERNAL=1
-//Have include CMAKE_HAVE_LIMITS_H
-CMAKE_HAVE_LIMITS_H:INTERNAL=1
-//Have library pthreads
-CMAKE_HAVE_PTHREADS_CREATE:INTERNAL=
-//Have library pthread
-CMAKE_HAVE_PTHREAD_CREATE:INTERNAL=1
-//Have include CMAKE_HAVE_PTHREAD_H
-CMAKE_HAVE_PTHREAD_H:INTERNAL=1
-//Have function remove
-CMAKE_HAVE_REMOVE:INTERNAL=1
-//Have function shmat
-CMAKE_HAVE_SHMAT:INTERNAL=1
-//Have includes CMAKE_HAVE_SYS_PRCTL_H
-CMAKE_HAVE_SYS_PRCTL_H:INTERNAL=
-//Have include CMAKE_HAVE_UNISTD_H
-CMAKE_HAVE_UNISTD_H:INTERNAL=1
-//Start directory with the top level CMakeLists.txt file for this
-// project
-CMAKE_HOME_DIRECTORY:INTERNAL=@BUILD_DIR@/VTK
-//ADVANCED property for variable: CMAKE_HP_PTHREADS
-CMAKE_HP_PTHREADS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_INSTALL_NAME_TOOL
-CMAKE_INSTALL_NAME_TOOL-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: CMAKE_INSTALL_PREFIX
-CMAKE_INSTALL_PREFIX-MODIFIED:INTERNAL=ON
-//Have library ICE
-CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER:INTERNAL=1
-//ADVANCED property for variable: CMAKE_LINKER
-CMAKE_LINKER-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MAKE_PROGRAM
-CMAKE_MAKE_PROGRAM-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS
-CMAKE_MODULE_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_DEBUG
-CMAKE_MODULE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL
-CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELEASE
-CMAKE_MODULE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO
-CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_NM
-CMAKE_NM-ADVANCED:INTERNAL=1
-//Does the compiler support ansi for scope.
-CMAKE_NO_ANSI_FOR_SCOPE:INTERNAL=0
-//ADVANCED property for variable: CMAKE_NO_ANSI_STREAM_HEADERS
-CMAKE_NO_ANSI_STREAM_HEADERS-ADVANCED:INTERNAL=1
-//Does the compiler support headers like iostream.
-CMAKE_NO_ANSI_STREAM_HEADERS:INTERNAL=0
-//Does the compiler support sstream
-CMAKE_NO_ANSI_STRING_STREAM:INTERNAL=0
-//Does the compiler support std::.
-CMAKE_NO_STD_NAMESPACE:INTERNAL=0
-//number of local generators
-CMAKE_NUMBER_OF_LOCAL_GENERATORS:INTERNAL=44
-//ADVANCED property for variable: CMAKE_OBJCOPY
-CMAKE_OBJCOPY-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_OBJDUMP
-CMAKE_OBJDUMP-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_RANLIB
-CMAKE_RANLIB-ADVANCED:INTERNAL=1
-//Test Support for 64 bit file systems
-CMAKE_REQUIRE_LARGE_FILE_SUPPORT:INTERNAL=1
-//Path to CMake installation.
-CMAKE_ROOT:INTERNAL=@EXTERNALS@/share/cmake-2.8
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS
-CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG
-CMAKE_SHARED_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL
-CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELEASE
-CMAKE_SHARED_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO
-CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//Result of CHECK_TYPE_SIZE
-CMAKE_SIZEOF_CHAR:INTERNAL=1
-//Result of CHECK_TYPE_SIZE
-CMAKE_SIZEOF_DOUBLE:INTERNAL=8
-//Result of CHECK_TYPE_SIZE
-CMAKE_SIZEOF_FLOAT:INTERNAL=4
-//Result of CHECK_TYPE_SIZE
-CMAKE_SIZEOF_INT:INTERNAL=4
-//Result of CHECK_TYPE_SIZE
-CMAKE_SIZEOF_LONG:INTERNAL=4
-//Result of CHECK_TYPE_SIZE
-CMAKE_SIZEOF_SHORT:INTERNAL=2
-//Result of CHECK_TYPE_SIZE
-CMAKE_SIZEOF_UNSIGNED_SHORT:INTERNAL=2
-//Result of CHECK_TYPE_SIZE
-CMAKE_SIZEOF_VOID_P:INTERNAL=4
-//ADVANCED property for variable: CMAKE_SKIP_RPATH
-CMAKE_SKIP_RPATH-ADVANCED:INTERNAL=1
-//Whether to build with rpath.
-CMAKE_SKIP_RPATH:INTERNAL=0
-//Result of TRY_COMPILE
-CMAKE_STD_NAMESPACE:INTERNAL=TRUE
-//ADVANCED property for variable: CMAKE_STRIP
-CMAKE_STRIP-ADVANCED:INTERNAL=1
-//Suppress Warnings that are meant for the author of the CMakeLists.txt
-// files.
-CMAKE_SUPPRESS_DEVELOPER_WARNINGS:INTERNAL=TRUE
-//ADVANCED property for variable: CMAKE_THREAD_LIBS
-CMAKE_THREAD_LIBS-ADVANCED:INTERNAL=1
-//uname command
-CMAKE_UNAME:INTERNAL=/usr/bin/uname
-//ADVANCED property for variable: CMAKE_USE_PTHREADS
-CMAKE_USE_PTHREADS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_USE_RELATIVE_PATHS
-CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_USE_SPROC
-CMAKE_USE_SPROC-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_USE_WIN32_THREADS
-CMAKE_USE_WIN32_THREADS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE
-CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
-//Result of TEST_BIG_ENDIAN
-CMAKE_WORDS_BIGENDIAN:INTERNAL=0
-//ADVANCED property for variable: CMAKE_X_CFLAGS
-CMAKE_X_CFLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_X_LIBS
-CMAKE_X_LIBS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: COVERAGE_COMMAND
-COVERAGE_COMMAND-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CVSCOMMAND
-CVSCOMMAND-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CVS_UPDATE_OPTIONS
-CVS_UPDATE_OPTIONS-ADVANCED:INTERNAL=1
-//CXX compiler accepts flag -no-cpp-precomp
-CXX_HAS_CPP_PRECOMP_FLAG:INTERNAL=TRUE
-//ADVANCED property for variable: DART_TESTING_TIMEOUT
-DART_TESTING_TIMEOUT-ADVANCED:INTERNAL=1
-//Single output directory for building all executables.
-EXECUTABLE_OUTPUT_PATH:INTERNAL=@BUILD_DIR@/VTK-build/bin
-//Have include malloc.h
-EX_HAVE_MALLOC_H:INTERNAL=
-//Details about finding PythonInterp
-FIND_PACKAGE_MESSAGE_DETAILS_PythonInterp:INTERNAL=[@PREFIX_PATH@/bin/python@PYVER@]
-//Details about finding PythonLibs
-FIND_PACKAGE_MESSAGE_DETAILS_PythonLibs:INTERNAL=[@PREFIX_PATH@/lib/libpython@PYVER@.dylib][@PREFIX_PATH@/include/python@PYVER@]
-//Details about finding TCL
-FIND_PACKAGE_MESSAGE_DETAILS_TCL:INTERNAL=[@EXTERNALS@/lib/libtcl@TCLTK_VERSION@.dylib][@EXTERNALS@/include]
-//Details about finding TCLTK
-FIND_PACKAGE_MESSAGE_DETAILS_TCLTK:INTERNAL=[@EXTERNALS@/lib/libtcl@TCLTK_VERSION@.dylib][@EXTERNALS@/include][@EXTERNALS@/lib/libtk@TCLTK_VERSION@.dylib][@EXTERNALS@/include]
-//Details about finding TK
-FIND_PACKAGE_MESSAGE_DETAILS_TK:INTERNAL=[@EXTERNALS@/lib/libtk@TCLTK_VERSION@.dylib][@EXTERNALS@/include]
-//Details about finding Tclsh
-FIND_PACKAGE_MESSAGE_DETAILS_Tclsh:INTERNAL=[@EXTERNALS@/bin/tclsh@TCLTK_VERSION@]
-//Details about finding Threads
-FIND_PACKAGE_MESSAGE_DETAILS_Threads:INTERNAL=[TRUE]
-//Details about finding X11
-FIND_PACKAGE_MESSAGE_DETAILS_X11:INTERNAL=[/usr/X11R6/lib/libX11.dylib][/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include]
-//Have symbol alloca
-HAVE_ALLOCA:INTERNAL=1
-//Have include HAVE_ALLOCA_H
-HAVE_ALLOCA_H:INTERNAL=1
-//Have includes HAVE_ANSIDECL_H
-HAVE_ANSIDECL_H:INTERNAL=
-//Have include HAVE_ARPA_INET_H
-HAVE_ARPA_INET_H:INTERNAL=1
-//Have include HAVE_ARPA_NAMESER_H
-HAVE_ARPA_NAMESER_H:INTERNAL=1
-//Have include HAVE_ASSERT_H
-HAVE_ASSERT_H:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_CMAKE_REQUIRE_LARGE_FILE_SUPPORT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_CHAR:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_DOUBLE:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_FLOAT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_INT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_LONG:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_SHORT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_UNSIGNED_SHORT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_VOID_P:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_WORDS_BIGENDIAN:INTERNAL=TRUE
-//Have include HAVE_CTYPE_H
-HAVE_CTYPE_H:INTERNAL=1
-//Have include HAVE_DIRENT_H
-HAVE_DIRENT_H:INTERNAL=1
-//Have include HAVE_DLFCN_H
-HAVE_DLFCN_H:INTERNAL=1
-//Have library dl;-lpthread;m
-HAVE_DLOPEN:INTERNAL=1
-//Have includes HAVE_DL_H
-HAVE_DL_H:INTERNAL=
-//Have include HAVE_ERRNO_H
-HAVE_ERRNO_H:INTERNAL=1
-//Have include HAVE_FCNTL_H
-HAVE_FCNTL_H:INTERNAL=1
-//Have symbol finite
-HAVE_FINITE:INTERNAL=1
-//Have include HAVE_FLOAT_H
-HAVE_FLOAT_H:INTERNAL=1
-//Have function floor
-HAVE_FLOOR:INTERNAL=1
-//Have symbol fpclass
-HAVE_FPCLASS:INTERNAL=
-//Have symbol fprintf
-HAVE_FPRINTF:INTERNAL=1
-//Have symbol fp_class
-HAVE_FP_CLASS:INTERNAL=
-//Have includes HAVE_FP_CLASS_H
-HAVE_FP_CLASS_H:INTERNAL=
-//Have symbol ftime
-HAVE_FTIME:INTERNAL=1
-//NetCDF test 
-HAVE_FTRUNCATE:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_GETADDRINFO_COMPILED:INTERNAL=TRUE
-//Have function getopt
-HAVE_GETOPT:INTERNAL=1
-//Have symbol gettimeofday
-HAVE_GETTIMEOFDAY:INTERNAL=1
-//Have includes HAVE_IEEEFP_H
-HAVE_IEEEFP_H:INTERNAL=
-//Have include HAVE_INTTYPES_H
-HAVE_INTTYPES_H:INTERNAL=1
-//Have function isascii
-HAVE_ISASCII:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_KWSYS_SIZEOF_CHAR:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_KWSYS_SIZEOF_INT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_KWSYS_SIZEOF_LONG:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_KWSYS_SIZEOF_LONG_LONG:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_KWSYS_SIZEOF_SHORT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_KWSYS_SIZEOF___INT64:INTERNAL=FALSE
-//Have library dl;
-HAVE_LIBDL:INTERNAL=1
-//Have include HAVE_LIMITS_H
-HAVE_LIMITS_H:INTERNAL=1
-//Have symbol localtime
-HAVE_LOCALTIME:INTERNAL=1
-//Have includes HAVE_MALLOC_H
-HAVE_MALLOC_H:INTERNAL=
-//Have include HAVE_MATH_H
-HAVE_MATH_H:INTERNAL=1
-//Have function memmove
-HAVE_MEMMOVE:INTERNAL=1
-//Have include HAVE_MEMORY_H
-HAVE_MEMORY_H:INTERNAL=1
-//Have function memset
-HAVE_MEMSET:INTERNAL=1
-//Have function mmap
-HAVE_MMAP:INTERNAL=1
-//Have includes HAVE_NAN_H
-HAVE_NAN_H:INTERNAL=
-//Have includes HAVE_NDIR_H
-HAVE_NDIR_H:INTERNAL=
-//Have include HAVE_NETDB_H
-HAVE_NETDB_H:INTERNAL=1
-//Have include HAVE_NETINET_IN_H
-HAVE_NETINET_IN_H:INTERNAL=1
-//Have function pow
-HAVE_POW:INTERNAL=1
-//Have symbol printf
-HAVE_PRINTF:INTERNAL=1
-//Have include HAVE_PTHREAD_H
-HAVE_PTHREAD_H:INTERNAL=1
-//Have include HAVE_RESOLV_H
-HAVE_RESOLV_H:INTERNAL=1
-//Have library dld;dl
-HAVE_SHLLOAD:INTERNAL=
-//Have symbol signal
-HAVE_SIGNAL:INTERNAL=1
-//Have include HAVE_SIGNAL_H
-HAVE_SIGNAL_H:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_SIZEOF_DOUBLE:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_FLOAT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_INT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_LONG:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_OFF_T:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_PTRDIFF_T:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_SHORT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_SIZE_T:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_SSIZE_T:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_UCHAR:INTERNAL=FALSE
-//Have symbol snprintf
-HAVE_SNPRINTF:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_SOCKLEN_T_COMPILED:INTERNAL=TRUE
-//Have symbol sprintf
-HAVE_SPRINTF:INTERNAL=1
-//Have function sqrt
-HAVE_SQRT:INTERNAL=1
-//Have symbol sscanf
-HAVE_SSCANF:INTERNAL=1
-//Have symbol stat
-HAVE_STAT:INTERNAL=1
-//Have include HAVE_STDARG_H
-HAVE_STDARG_H:INTERNAL=1
-//Have include stddef.h
-HAVE_STDDEF_H:INTERNAL=1
-//Have include stdint.h
-HAVE_STDINT_H:INTERNAL=1
-//Have include HAVE_STDIO_H
-HAVE_STDIO_H:INTERNAL=1
-//Have include HAVE_STDLIB_H
-HAVE_STDLIB_H:INTERNAL=1
-//Have function strcasecmp
-HAVE_STRCASECMP:INTERNAL=1
-//Have function strchr
-HAVE_STRCHR:INTERNAL=1
-//Have symbol strdup
-HAVE_STRDUP:INTERNAL=1
-//Have symbol strerror
-HAVE_STRERROR:INTERNAL=1
-//Have symbol strftime
-HAVE_STRFTIME:INTERNAL=1
-//Have include HAVE_STRINGS_H
-HAVE_STRINGS_H:INTERNAL=1
-//Have include HAVE_STRING_H
-HAVE_STRING_H:INTERNAL=1
-//Have symbol strndup
-HAVE_STRNDUP:INTERNAL=
-//Have function strrchr
-HAVE_STRRCHR:INTERNAL=1
-//Have function strstr
-HAVE_STRSTR:INTERNAL=1
-//Have function strtol
-HAVE_STRTOL:INTERNAL=1
-//Have function areroul
-HAVE_STRTOUL:INTERNAL=
-//NetCDF test 
-HAVE_ST_BLKSIZE:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_SYS_DIR_H_COMPILED:INTERNAL=TRUE
-//Have include HAVE_SYS_MMAN_H
-HAVE_SYS_MMAN_H:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_SYS_NDIR_H_COMPILED:INTERNAL=FALSE
-//Have include HAVE_SYS_SELECT_H
-HAVE_SYS_SELECT_H:INTERNAL=1
-//Have include HAVE_SYS_SOCKET_H
-HAVE_SYS_SOCKET_H:INTERNAL=1
-//Have include HAVE_SYS_STAT_H
-HAVE_SYS_STAT_H:INTERNAL=1
-//Have include HAVE_SYS_TIMEB_H
-HAVE_SYS_TIMEB_H:INTERNAL=1
-//Have include HAVE_SYS_TIME_H
-HAVE_SYS_TIME_H:INTERNAL=1
-//Have include sys/types.h
-HAVE_SYS_TYPES_H:INTERNAL=1
-//Have include HAVE_TIME_H
-HAVE_TIME_H:INTERNAL=1
-//Have include HAVE_UNISTD_H
-HAVE_UNISTD_H:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_VA_COPY_COMPILED:INTERNAL=TRUE
-//Have symbol vfprintf
-HAVE_VFPRINTF:INTERNAL=1
-//Have symbol vsnprintf
-HAVE_VSNPRINTF:INTERNAL=1
-//Have symbol vsprintf
-HAVE_VSPRINTF:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_VTK_SIZEOF_LONG_LONG:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_VTK_SIZEOF___INT64:INTERNAL=FALSE
-//Have includes HAVE_WINDOWS_H
-HAVE_WINDOWS_H:INTERNAL=
-//Have symbol _stat
-HAVE__STAT:INTERNAL=
-//Result of TRY_COMPILE
-HAVE___VA_COPY_COMPILED:INTERNAL=TRUE
-//ADVANCED property for variable: HGCOMMAND
-HGCOMMAND-ADVANCED:INTERNAL=1
-//Result of TRY_RUN
-KWSYS_CHAR_IS_SIGNED:INTERNAL=0
-//Result of TRY_COMPILE
-KWSYS_CHAR_IS_SIGNED_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_CXX_HAS_ARGUMENT_DEPENDENT_LOOKUP_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_CXX_HAS_CSTDDEF_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_CXX_HAS_FULL_SPECIALIZATION_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_CXX_HAS_MEMBER_TEMPLATES_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_CXX_HAS_NULL_TEMPLATE_ARGS_COMPILED:INTERNAL=FALSE
-//Result of TRY_COMPILE
-KWSYS_C_HAS_PTRDIFF_T_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_C_HAS_SSIZE_T_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_IOS_HAVE_STD_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_IOS_USE_ANSI_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_IOS_USE_SSTREAM_COMPILED:INTERNAL=TRUE
-//Result of TRY_RUN
-KWSYS_LFS_WORKS:INTERNAL=0
-//Result of TRY_COMPILE
-KWSYS_LFS_WORKS_COMPILED:INTERNAL=TRUE
-//Result of CHECK_TYPE_SIZE
-KWSYS_SIZEOF_CHAR:INTERNAL=1
-//Result of CHECK_TYPE_SIZE
-KWSYS_SIZEOF_INT:INTERNAL=4
-//Result of CHECK_TYPE_SIZE
-KWSYS_SIZEOF_LONG:INTERNAL=4
-//Result of CHECK_TYPE_SIZE
-KWSYS_SIZEOF_LONG_LONG:INTERNAL=8
-//Result of CHECK_TYPE_SIZE
-KWSYS_SIZEOF_SHORT:INTERNAL=2
-//Result of CHECK_TYPE_SIZE
-KWSYS_SIZEOF___INT64:INTERNAL=
-//Result of TRY_COMPILE
-KWSYS_STAT_HAS_ST_MTIM_COMPILED:INTERNAL=FALSE
-//Result of TRY_COMPILE
-KWSYS_STL_HAS_ALLOCATOR_MAX_SIZE_ARGUMENT_COMPILED:INTERNAL=FALSE
-//Result of TRY_COMPILE
-KWSYS_STL_HAS_ALLOCATOR_OBJECTS_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_STL_HAS_ALLOCATOR_REBIND_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_STL_HAS_ALLOCATOR_TEMPLATE_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_STL_HAS_ITERATOR_TRAITS_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_STL_HAVE_STD_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_STL_STRING_HAVE_NEQ_CHAR_COMPILED:INTERNAL=TRUE
-//Single output directory for building all libraries.
-LIBRARY_OUTPUT_PATH:INTERNAL=@BUILD_DIR@/VTK-build/bin
-//ADVANCED property for variable: MAKECOMMAND
-MAKECOMMAND-ADVANCED:INTERNAL=1
-//Path to vtkMaterialLibraryMacro.h
-MATERIAL_LIBRARY_MATERIAL_MACRO_HEADER:INTERNAL=@BUILD_DIR@/VTK-build/Utilities/MaterialLibrary/vtkMaterialLibraryMacro.h
-//Path to vtkShaderCodeLibraryMacro.h
-MATERIAL_LIBRARY_SHADER_MACRO_HEADER:INTERNAL=@BUILD_DIR@/VTK-build/Utilities/MaterialLibrary/vtkShaderCodeLibraryMacro.h
-//ADVANCED property for variable: MEMORYCHECK_COMMAND
-MEMORYCHECK_COMMAND-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: MEMORYCHECK_SUPPRESSIONS_FILE
-MEMORYCHECK_SUPPRESSIONS_FILE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: OPENGL_INCLUDE_DIR
-OPENGL_INCLUDE_DIR-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: OPENGL_INCLUDE_DIR
-OPENGL_INCLUDE_DIR-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: OPENGL_gl_LIBRARY
-OPENGL_gl_LIBRARY-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: OPENGL_gl_LIBRARY
-OPENGL_gl_LIBRARY-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: OPENGL_glu_LIBRARY
-OPENGL_glu_LIBRARY-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: OPENGL_glu_LIBRARY
-OPENGL_glu_LIBRARY-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: OPENGL_xmesa_INCLUDE_DIR
-OPENGL_xmesa_INCLUDE_DIR-ADVANCED:INTERNAL=1
-//Have symbol atanh
-PROJ_HAVE_ATANH:INTERNAL=1
-//Have symbol csin
-PROJ_HAVE_COMPLEX:INTERNAL=1
-//ADVANCED property for variable: PROJ_LIST_EXTERNAL
-PROJ_LIST_EXTERNAL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PROJ_USE_GSL
-PROJ_USE_GSL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PROJ_USE_PTHREADS
-PROJ_USE_PTHREADS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_DEBUG_LIBRARY
-PYTHON_DEBUG_LIBRARY-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkCommonPython
-PYTHON_ENABLE_MODULE_vtkCommonPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkFilteringPython
-PYTHON_ENABLE_MODULE_vtkFilteringPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkGenericFilteringPython
-PYTHON_ENABLE_MODULE_vtkGenericFilteringPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkGeovisPython
-PYTHON_ENABLE_MODULE_vtkGeovisPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkGraphicsPython
-PYTHON_ENABLE_MODULE_vtkGraphicsPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkHybridPython
-PYTHON_ENABLE_MODULE_vtkHybridPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkIOPython
-PYTHON_ENABLE_MODULE_vtkIOPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkImagingPython
-PYTHON_ENABLE_MODULE_vtkImagingPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkInfovisPython
-PYTHON_ENABLE_MODULE_vtkInfovisPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkRenderingPython
-PYTHON_ENABLE_MODULE_vtkRenderingPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkViewsPython
-PYTHON_ENABLE_MODULE_vtkViewsPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkVolumeRenderingPython
-PYTHON_ENABLE_MODULE_vtkVolumeRenderingPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkWidgetsPython
-PYTHON_ENABLE_MODULE_vtkWidgetsPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_EXECUTABLE
-PYTHON_EXECUTABLE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_EXTRA_LIBS
-PYTHON_EXTRA_LIBS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_INCLUDE_PATH
-PYTHON_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: PYTHON_INCLUDE_PATH
-PYTHON_INCLUDE_PATH-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: PYTHON_LIBRARY
-PYTHON_LIBRARY-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: PYTHON_LIBRARY
-PYTHON_LIBRARY-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: PYTHON_MODULE_vtkCommonPython_BUILD_SHARED
-PYTHON_MODULE_vtkCommonPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkFilteringPython_BUILD_SHARED
-PYTHON_MODULE_vtkFilteringPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkGenericFilteringPython_BUILD_SHARED
-PYTHON_MODULE_vtkGenericFilteringPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkGeovisPython_BUILD_SHARED
-PYTHON_MODULE_vtkGeovisPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkGraphicsPython_BUILD_SHARED
-PYTHON_MODULE_vtkGraphicsPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkHybridPython_BUILD_SHARED
-PYTHON_MODULE_vtkHybridPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkIOPython_BUILD_SHARED
-PYTHON_MODULE_vtkIOPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkImagingPython_BUILD_SHARED
-PYTHON_MODULE_vtkImagingPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkInfovisPython_BUILD_SHARED
-PYTHON_MODULE_vtkInfovisPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkRenderingPython_BUILD_SHARED
-PYTHON_MODULE_vtkRenderingPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkViewsPython_BUILD_SHARED
-PYTHON_MODULE_vtkViewsPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkVolumeRenderingPython_BUILD_SHARED
-PYTHON_MODULE_vtkVolumeRenderingPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkWidgetsPython_BUILD_SHARED
-PYTHON_MODULE_vtkWidgetsPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_UTIL_LIBRARY
-PYTHON_UTIL_LIBRARY-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: SCPCOMMAND
-SCPCOMMAND-ADVANCED:INTERNAL=1
-//Result of TRY_COMPILE
-SHARED_LIBRARY_PATH_INFO_COMPILED:INTERNAL=TRUE
-//Result of TRY_RUN
-SHARED_LIBRARY_PATH_TYPE:INTERNAL=0
-//runtime library path variable name.
-SHARED_LIBRARY_PATH_VAR_NAME:INTERNAL=DYLD_LIBRARY_PATH
-//ADVANCED property for variable: SITE
-SITE-ADVANCED:INTERNAL=1
-//Result of CHECK_TYPE_SIZE
-SIZEOF_DOUBLE:INTERNAL=8
-//Result of CHECK_TYPE_SIZE
-SIZEOF_FLOAT:INTERNAL=4
-//Result of CHECK_TYPE_SIZE
-SIZEOF_INT:INTERNAL=4
-//Result of CHECK_TYPE_SIZE
-SIZEOF_LONG:INTERNAL=4
-//Result of CHECK_TYPE_SIZE
-SIZEOF_OFF_T:INTERNAL=8
-//Result of CHECK_TYPE_SIZE
-SIZEOF_PTRDIFF_T:INTERNAL=4
-//Result of CHECK_TYPE_SIZE
-SIZEOF_SHORT:INTERNAL=2
-//Result of CHECK_TYPE_SIZE
-SIZEOF_SIZE_T:INTERNAL=4
-//Result of CHECK_TYPE_SIZE
-SIZEOF_SSIZE_T:INTERNAL=4
-//Result of CHECK_TYPE_SIZE
-SIZEOF_UCHAR:INTERNAL=
-//ADVANCED property for variable: SLURM_SBATCH_COMMAND
-SLURM_SBATCH_COMMAND-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: SLURM_SRUN_COMMAND
-SLURM_SRUN_COMMAND-ADVANCED:INTERNAL=1
-//Have include STDC_HEADERS
-STDC_HEADERS:INTERNAL=1
-//Result of TRY_COMPILE
-SUPPORT_IP6_COMPILED:INTERNAL=TRUE
-//ADVANCED property for variable: SVNCOMMAND
-SVNCOMMAND-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: TCL_INCLUDE_PATH
-TCL_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: TCL_INCLUDE_PATH
-TCL_INCLUDE_PATH-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: TCL_LIBRARY
-TCL_LIBRARY-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: TCL_LIBRARY
-TCL_LIBRARY-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: TCL_TCLSH
-TCL_TCLSH-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: TCL_TCLSH
-TCL_TCLSH-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: TK_INCLUDE_PATH
-TK_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: TK_INCLUDE_PATH
-TK_INCLUDE_PATH-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: TK_INTERNAL_PATH
-TK_INTERNAL_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: TK_LIBRARY
-TK_LIBRARY-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: TK_LIBRARY
-TK_LIBRARY-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: TK_WISH
-TK_WISH-ADVANCED:INTERNAL=1
-//This value is not used by VTK.
-TK_WISH:INTERNAL=/usr/bin/wish
-//ADVANCED property for variable: VERDICT_BUILD_DOC
-VERDICT_BUILD_DOC-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VERDICT_ENABLE_TESTING
-VERDICT_ENABLE_TESTING-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VERDICT_MANGLE
-VERDICT_MANGLE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VERDICT_MANGLE_PREFIX
-VERDICT_MANGLE_PREFIX-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VERDICT_USE_FLOAT
-VERDICT_USE_FLOAT-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VLI_LIBRARY_FOR_VP1000
-VLI_LIBRARY_FOR_VP1000-ADVANCED:INTERNAL=1
-//Result of TRY_COMPILE
-VTK_ANSI_STREAM_EOF_COMPILED:INTERNAL=TRUE
-//Result of TRY_RUN
-VTK_ANSI_STREAM_EOF_RESULT:INTERNAL=0
-//Support for C++ type bool
-VTK_COMPILER_HAS_BOOL:INTERNAL=1
-//Support for full template specialization syntax
-VTK_COMPILER_HAS_FULL_SPECIALIZATION:INTERNAL=1
-//ADVANCED property for variable: VTK_DEBUG_LEAKS
-VTK_DEBUG_LEAKS-ADVANCED:INTERNAL=1
-//The directory in which code for Shaders is provided.
-VTK_DEFAULT_SHADERS_DIR:INTERNAL=@BUILD_DIR@/VTK-build/Utilities/MaterialLibrary/Repository
-//String encoder.
-VTK_ENCODESTRING_EXE:INTERNAL=@BUILD_DIR@/VTK-build/bin/vtkEncodeString
-//Support for C++ explict templates
-VTK_EXPLICIT_TEMPLATES:INTERNAL=1
-//ADVANCED property for variable: VTK_GLEXT_FILE
-VTK_GLEXT_FILE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_GLXEXT_FILE
-VTK_GLXEXT_FILE-ADVANCED:INTERNAL=1
-//Have include iosfwd
-VTK_HAVE_ANSI_STREAMS:INTERNAL=1
-//Support for getsockname with socklen_t
-VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T:INTERNAL=1
-//Have library socket
-VTK_HAVE_LIBSOCKET:INTERNAL=
-//Have include iostream.h
-VTK_HAVE_OLD_STREAMS:INTERNAL=1
-//Have include strstream.h
-VTK_HAVE_OLD_STRSTREAM_H:INTERNAL=
-//Have include strstrea.h
-VTK_HAVE_OLD_STRSTREA_H:INTERNAL=
-//Have symbol SO_REUSEADDR
-VTK_HAVE_SO_REUSEADDR:INTERNAL=1
-//Whether istream supports long long
-VTK_ISTREAM_SUPPORTS_LONG_LONG:INTERNAL=1
-//ADVANCED property for variable: VTK_LEGACY_REMOVE
-VTK_LEGACY_REMOVE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_LEGACY_SILENT
-VTK_LEGACY_SILENT-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_MATERIALS_DIRS
-VTK_MATERIALS_DIRS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_NO_PYTHON_THREADS
-VTK_NO_PYTHON_THREADS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_OPENGL_HAS_OSMESA
-VTK_OPENGL_HAS_OSMESA-ADVANCED:INTERNAL=1
-//Whether ostream supports long long
-VTK_OSTREAM_SUPPORTS_LONG_LONG:INTERNAL=1
-//OpenGL extensions parser.
-VTK_PARSEOGLEXT_EXE:INTERNAL=@BUILD_DIR@/VTK-build/bin/vtkParseOGLExt
-//Install directory for Python .py and .pyc files
-VTK_PYTHON_MODULE_INSTALL_DIR:INTERNAL=${CMAKE_INSTALL_PREFIX}/lib/python@PYVER@/site-packages
-//Install directory for Python binary modules
-VTK_PYTHON_MODULE_PLATFORM_INSTALL_DIR:INTERNAL=${CMAKE_INSTALL_PREFIX}/lib/python@PYVER@/site-packages
-//ADVANCED property for variable: VTK_PYTHON_SETUP_ARGS
-VTK_PYTHON_SETUP_ARGS-ADVANCED:INTERNAL=1
-//Result of CHECK_TYPE_SIZE
-VTK_SIZEOF_LONG_LONG:INTERNAL=8
-//Result of CHECK_TYPE_SIZE
-VTK_SIZEOF___INT64:INTERNAL=
-//Very few users should worry about this option. If VTK is built
-// against a static Tcl/Tk lib (see VTK_TCL_TK_STATIC) or a shared
-// Tcl/Tk bundled inside a project with no library support files
-// (ex: ParaViewComplete), this variable should be set to ON and
-// both VTK_TCL_SUPPORT_LIBRARY_PATH and VTK_TK_SUPPORT_LIBRARY_PATH
-// should point to the directories that hold those files (typically,
-// lib/tcl8.4 and lib/tk8.4 for a typical Tcl/Tk installation,
-// or tcl8.4.5/library and tk8.4.5/library for a Tcl/Tk source
-// repository). Once this variable is set to ON, support files
-// will automatically be copied to the build directory and the
-// executables will try to use that location to initialize Tcl/Tk.
-VTK_TCL_TK_COPY_SUPPORT_LIBRARY:INTERNAL=
-//ADVANCED property for variable: VTK_TESTING_USE_FPE
-VTK_TESTING_USE_FPE-ADVANCED:INTERNAL=1
-//Whether char is signed.
-VTK_TYPE_CHAR_IS_SIGNED:INTERNAL=1
-//Result of TRY_COMPILE
-VTK_TYPE_CHAR_IS_SIGNED_COMPILED:INTERNAL=TRUE
-//ADVANCED property for variable: VTK_USE_64BIT_IDS
-VTK_USE_64BIT_IDS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_BOOST
-VTK_USE_BOOST-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_CG_SHADERS
-VTK_USE_CG_SHADERS-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: VTK_USE_COCOA
-VTK_USE_COCOA-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: VTK_USE_DISPLAY
-VTK_USE_DISPLAY-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_FFMPEG_ENCODER
-VTK_USE_FFMPEG_ENCODER-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_GL2PS
-VTK_USE_GL2PS-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: VTK_USE_GL2PS
-VTK_USE_GL2PS-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: VTK_USE_GLSL_SHADERS
-VTK_USE_GLSL_SHADERS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_GUISUPPORT
-VTK_USE_GUISUPPORT-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_MANGLED_MESA
-VTK_USE_MANGLED_MESA-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_METAIO
-VTK_USE_METAIO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_MPEG2_ENCODER
-VTK_USE_MPEG2_ENCODER-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_MYSQL
-VTK_USE_MYSQL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_ODBC
-VTK_USE_ODBC-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_POSTGRES
-VTK_USE_POSTGRES-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_RPATH
-VTK_USE_RPATH-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: VTK_USE_RPATH
-VTK_USE_RPATH-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: VTK_USE_SYSTEM_EXPAT
-VTK_USE_SYSTEM_EXPAT-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_SYSTEM_FREETYPE
-VTK_USE_SYSTEM_FREETYPE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_SYSTEM_JPEG
-VTK_USE_SYSTEM_JPEG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_SYSTEM_LIBPROJ4
-VTK_USE_SYSTEM_LIBPROJ4-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_SYSTEM_LIBXML2
-VTK_USE_SYSTEM_LIBXML2-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_SYSTEM_PNG
-VTK_USE_SYSTEM_PNG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_SYSTEM_TIFF
-VTK_USE_SYSTEM_TIFF-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_SYSTEM_ZLIB
-VTK_USE_SYSTEM_ZLIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_TK
-VTK_USE_TK-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_VOLUMEPRO_1000
-VTK_USE_VOLUMEPRO_1000-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: VTK_USE_X
-VTK_USE_X-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: VTK_WGLEXT_FILE
-VTK_WGLEXT_FILE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_WRAP_HINTS
-VTK_WRAP_HINTS-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: VTK_WRAP_PYTHON
-VTK_WRAP_PYTHON-MODIFIED:INTERNAL=ON
-//Location of program to do Python wrapping
-VTK_WRAP_PYTHON_EXE:INTERNAL=@BUILD_DIR@/VTK-build/bin/vtkWrapPython
-//Location of program to do Python wrapping
-VTK_WRAP_PYTHON_INIT_EXE:INTERNAL=@BUILD_DIR@/VTK-build/bin/vtkWrapPythonInit
-//ADVANCED property for variable: X11_ICE_INCLUDE_PATH
-X11_ICE_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_ICE_LIB
-X11_ICE_LIB-ADVANCED:INTERNAL=1
-//Have library /usr/X11R6/lib/libX11.dylib;/usr/X11R6/lib/libXext.dylib
-X11_LIB_X11_SOLO:INTERNAL=1
-//ADVANCED property for variable: X11_SM_LIB
-X11_SM_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_X11_INCLUDE_PATH
-X11_X11_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_X11_LIB
-X11_X11_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_XShm_INCLUDE_PATH
-X11_XShm_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_XTest_INCLUDE_PATH
-X11_XTest_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_XTest_LIB
-X11_XTest_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xaccessrules_INCLUDE_PATH
-X11_Xaccessrules_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xaccessstr_INCLUDE_PATH
-X11_Xaccessstr_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xau_INCLUDE_PATH
-X11_Xau_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xau_LIB
-X11_Xau_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xcomposite_INCLUDE_PATH
-X11_Xcomposite_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xcomposite_LIB
-X11_Xcomposite_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xcursor_INCLUDE_PATH
-X11_Xcursor_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xcursor_LIB
-X11_Xcursor_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xdamage_INCLUDE_PATH
-X11_Xdamage_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xdamage_LIB
-X11_Xdamage_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xdmcp_INCLUDE_PATH
-X11_Xdmcp_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xdmcp_LIB
-X11_Xdmcp_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xext_LIB
-X11_Xext_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xfixes_INCLUDE_PATH
-X11_Xfixes_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xfixes_LIB
-X11_Xfixes_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xft_INCLUDE_PATH
-X11_Xft_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xft_LIB
-X11_Xft_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xinerama_INCLUDE_PATH
-X11_Xinerama_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xinerama_LIB
-X11_Xinerama_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xinput_INCLUDE_PATH
-X11_Xinput_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xinput_LIB
-X11_Xinput_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xkb_INCLUDE_PATH
-X11_Xkb_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xkblib_INCLUDE_PATH
-X11_Xkblib_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xlib_INCLUDE_PATH
-X11_Xlib_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xpm_INCLUDE_PATH
-X11_Xpm_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xpm_LIB
-X11_Xpm_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xrandr_INCLUDE_PATH
-X11_Xrandr_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xrandr_LIB
-X11_Xrandr_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xrender_INCLUDE_PATH
-X11_Xrender_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xrender_LIB
-X11_Xrender_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xscreensaver_INCLUDE_PATH
-X11_Xscreensaver_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xscreensaver_LIB
-X11_Xscreensaver_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xshape_INCLUDE_PATH
-X11_Xshape_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xt_INCLUDE_PATH
-X11_Xt_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xt_LIB
-X11_Xt_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xutil_INCLUDE_PATH
-X11_Xutil_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xv_INCLUDE_PATH
-X11_Xv_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xv_LIB
-X11_Xv_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xxf86misc_LIB
-X11_Xxf86misc_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_dpms_INCLUDE_PATH
-X11_dpms_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_fontconfig_LIB
-X11_fontconfig_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_xf86misc_INCLUDE_PATH
-X11_xf86misc_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_xf86vmode_INCLUDE_PATH
-X11_xf86vmode_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//Already complained about update type.
-__CTEST_UPDATE_TYPE_COMPLAINED:INTERNAL=1
-
diff --git a/exsrc/src/CMakeCache.txt.mac.Framework.in b/exsrc/src/CMakeCache.txt.mac.Framework.in
deleted file mode 100644
index 9764e5a52..000000000
--- a/exsrc/src/CMakeCache.txt.mac.Framework.in
+++ /dev/null
@@ -1,2066 +0,0 @@
-# This is the CMakeCache file.
-# For build in directory: @BUILD_DIR@/VTK-build
-# It was generated by CMake: @EXTERNALS@/bin/cmake
-# You can edit this file to change values found and used by cmake.
-# If you do not want to change any of the values, simply exit the editor.
-# If you do want to change a value, simply edit, save, and exit the editor.
-# The syntax for the file is as follows:
-# KEY:TYPE=VALUE
-# KEY is the name of a variable in the cache.
-# TYPE is a hint to GUI's for the type of VALUE, DO NOT EDIT TYPE!.
-# VALUE is the current value for the KEY.
-
-########################
-# EXTERNAL cache entries
-########################
-
-//Path to a library.
-ApplicationServices:FILEPATH=/System/Library/Frameworks/ApplicationServices.framework
-
-//Build the documentation (Doxygen).
-BUILD_DOCUMENTATION:BOOL=OFF
-
-//Build VTK examples.
-BUILD_EXAMPLES:BOOL=OFF
-
-//Build Verdict with shared libraries.
-BUILD_SHARED_LIBS:BOOL=ON
-
-//Build the testing tree.
-BUILD_TESTING:BOOL=ON
-
-//Path to a program.
-BZRCOMMAND:FILEPATH=BZRCOMMAND-NOTFOUND
-
-//Path to a program.
-CMAKE_AR:FILEPATH=/usr/bin/ar
-
-//For backwards compatibility, what version of CMake commands and
-// syntax should this version of CMake try to support.
-CMAKE_BACKWARDS_COMPATIBILITY:STRING=2.4
-
-//Choose the type of build, options are: None(CMAKE_CXX_FLAGS or
-// CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.
-CMAKE_BUILD_TYPE:STRING=
-
-//Enable/Disable color output during build.
-CMAKE_COLOR_MAKEFILE:BOOL=ON
-
-//CXX compiler.
-CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/c++
-
-//Flags used by the compiler during all build types.
-CMAKE_CXX_FLAGS:STRING=
-
-//Flags used by the compiler during debug builds.
-CMAKE_CXX_FLAGS_DEBUG:STRING=-g
-
-//Flags used by the compiler during release minsize builds.
-CMAKE_CXX_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG
-
-//Flags used by the compiler during release builds (/MD /Ob1 /Oi
-// /Ot /Oy /Gs will produce slightly less optimized but smaller
-// files).
-CMAKE_CXX_FLAGS_RELEASE:STRING=-O3 -DNDEBUG
-
-//Flags used by the compiler during Release with Debug Info builds.
-CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g
-
-//C compiler.
-CMAKE_C_COMPILER:FILEPATH=/usr/bin/gcc
-
-//Flags used by the compiler during all build types.
-CMAKE_C_FLAGS:STRING=
-
-//Flags used by the compiler during debug builds.
-CMAKE_C_FLAGS_DEBUG:STRING=-g
-
-//Flags used by the compiler during release minsize builds.
-CMAKE_C_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG
-
-//Flags used by the compiler during release builds (/MD /Ob1 /Oi
-// /Ot /Oy /Gs will produce slightly less optimized but smaller
-// files).
-CMAKE_C_FLAGS_RELEASE:STRING=-O3 -DNDEBUG
-
-//Flags used by the compiler during Release with Debug Info builds.
-CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=-O2 -g
-
-//Flags used by the linker.
-CMAKE_EXE_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during debug builds.
-CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during release minsize builds.
-CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during release builds.
-CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during Release with Debug Info builds.
-CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//Use HP pthreads.
-CMAKE_HP_PTHREADS:BOOL=
-
-//Path to a program.
-CMAKE_INSTALL_NAME_TOOL:FILEPATH=/usr/bin/install_name_tool
-
-//Install path prefix, prepended onto install directories.
-CMAKE_INSTALL_PREFIX:PATH=@PREFIX_PATH@
-
-//Path to a program.
-CMAKE_LINKER:FILEPATH=/usr/bin/ld
-
-//Path to a program.
-CMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/make
-
-//Flags used by the linker during the creation of modules.
-CMAKE_MODULE_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during debug builds.
-CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during release minsize builds.
-CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during release builds.
-CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during Release with Debug Info builds.
-CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//Path to a program.
-CMAKE_NM:FILEPATH=/usr/bin/nm
-
-//Path to a program.
-CMAKE_OBJCOPY:FILEPATH=CMAKE_OBJCOPY-NOTFOUND
-
-//Path to a program.
-CMAKE_OBJDUMP:FILEPATH=CMAKE_OBJDUMP-NOTFOUND
-
-//Build architectures for OSX
-CMAKE_OSX_ARCHITECTURES:STRING=
-
-//Minimum OS X version to target for deployment (at runtime); newer
-// APIs weak linked. Set to empty string for default value.
-CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.6
-
-//The product will be built against the headers and libraries located
-// inside the indicated SDK.
-CMAKE_OSX_SYSROOT:PATH=/Developer/SDKs/MacOSX10.6.sdk
-
-//Value Computed by CMake
-CMAKE_PROJECT_NAME:STATIC=VTK
-
-//Path to a program.
-CMAKE_RANLIB:FILEPATH=/usr/bin/ranlib
-
-//Flags used by the linker during the creation of dll's.
-CMAKE_SHARED_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during debug builds.
-CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during release minsize builds.
-CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during release builds.
-CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during Release with Debug Info builds.
-CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//Path to a program.
-CMAKE_STRIP:FILEPATH=/usr/bin/strip
-
-//Thread library used.
-CMAKE_THREAD_LIBS:STRING=-lpthread
-
-//Use the pthreads library.
-CMAKE_USE_PTHREADS:BOOL=1
-
-//If true, cmake will use relative paths in makefiles and projects.
-CMAKE_USE_RELATIVE_PATHS:BOOL=OFF
-
-//Use sproc libs.
-CMAKE_USE_SPROC:BOOL=
-
-//Use the win32 thread library.
-CMAKE_USE_WIN32_THREADS:BOOL=
-
-//If this value is on, makefiles will be generated without the
-// .SILENT directive, and all commands will be echoed to the console
-// during the make.  This is useful for debugging only. With Visual
-// Studio IDE projects all commands are done without /nologo.
-CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE
-
-//X11 extra flags.
-CMAKE_X_CFLAGS:STRING=
-
-//Libraries and options used in X11 programs.
-CMAKE_X_LIBS:STRING=/usr/X11R6/lib/libSM.dylib;/usr/X11R6/lib/libICE.dylib;/usr/X11R6/lib/libX11.dylib;/usr/X11R6/lib/libXext.dylib
-
-//Path to the coverage program that CTest uses for performing coverage
-// inspection
-COVERAGE_COMMAND:FILEPATH=/usr/bin/gcov
-
-//Path to a program.
-CVSCOMMAND:FILEPATH=/usr/bin/cvs
-
-//Options passed to the cvs update command.
-CVS_UPDATE_OPTIONS:STRING=-d -A -P
-
-//Maximum time allowed before CTest will kill the test.
-DART_TESTING_TIMEOUT:STRING=1500
-
-//Value Computed by CMake
-DICOMParser_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/DICOMParser
-
-//Value Computed by CMake
-DICOMParser_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/DICOMParser
-
-//Path to a program.
-HGCOMMAND:FILEPATH=HGCOMMAND-NOTFOUND
-
-//Path to a library.
-IOKit:FILEPATH=/System/Library/Frameworks/IOKit.framework
-
-//Command used to build entire project from the command line.
-MAKECOMMAND:STRING=/usr/bin/make -i -j 16
-
-//Value Computed by CMake
-MAPREDUCE_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/mrmpi
-
-//Value Computed by CMake
-MAPREDUCE_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/mrmpi
-
-//Path to the memory checking command, used for memory error detection.
-MEMORYCHECK_COMMAND:FILEPATH=MEMORYCHECK_COMMAND-NOTFOUND
-
-//File that contains suppressions for the memory checker
-MEMORYCHECK_SUPPRESSIONS_FILE:FILEPATH=
-
-//Dependencies for the target
-MapReduceMPI_LIB_DEPENDS:STATIC=general;mpistubs;
-
-//Value Computed by CMake
-MaterialLibrary_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/MaterialLibrary
-
-//Value Computed by CMake
-MaterialLibrary_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/MaterialLibrary
-
-//Include for OpenGL on OSX
-OPENGL_INCLUDE_DIR:PATH=/System/Library/Frameworks/OpenGL.framework
-
-//OpenGL lib for OSX
-OPENGL_gl_LIBRARY:FILEPATH=/System/Library/Frameworks/OpenGL.framework
-
-//AGL lib for OSX
-OPENGL_glu_LIBRARY:FILEPATH=/System/Library/Frameworks/AGL.framework
-
-//Does an external project define proj_list or should libproj4
-// define it?
-PROJ_LIST_EXTERNAL:BOOL=OFF
-
-//Should libproj4 include projection code that relies on GSL?
-PROJ_USE_GSL:BOOL=OFF
-
-//Should libproj4 be built as a thread-friendly library?
-PROJ_USE_PTHREADS:BOOL=OFF
-
-//Add module vtkChartsPython
-PYTHON_ENABLE_MODULE_vtkChartsPython:BOOL=ON
-
-//Add module vtkCommonPython
-PYTHON_ENABLE_MODULE_vtkCommonPython:BOOL=ON
-
-//Add module vtkFilteringPython
-PYTHON_ENABLE_MODULE_vtkFilteringPython:BOOL=ON
-
-//Add module vtkGenericFilteringPython
-PYTHON_ENABLE_MODULE_vtkGenericFilteringPython:BOOL=ON
-
-//Add module vtkGeovisPython
-PYTHON_ENABLE_MODULE_vtkGeovisPython:BOOL=ON
-
-//Add module vtkGraphicsPython
-PYTHON_ENABLE_MODULE_vtkGraphicsPython:BOOL=ON
-
-//Add module vtkHybridPython
-PYTHON_ENABLE_MODULE_vtkHybridPython:BOOL=ON
-
-//Add module vtkIOPython
-PYTHON_ENABLE_MODULE_vtkIOPython:BOOL=ON
-
-//Add module vtkImagingPython
-PYTHON_ENABLE_MODULE_vtkImagingPython:BOOL=ON
-
-//Add module vtkInfovisPython
-PYTHON_ENABLE_MODULE_vtkInfovisPython:BOOL=ON
-
-//Add module vtkRenderingPython
-PYTHON_ENABLE_MODULE_vtkRenderingPython:BOOL=ON
-
-//Add module vtkViewsPython
-PYTHON_ENABLE_MODULE_vtkViewsPython:BOOL=ON
-
-//Add module vtkVolumeRenderingPython
-PYTHON_ENABLE_MODULE_vtkVolumeRenderingPython:BOOL=ON
-
-//Add module vtkWidgetsPython
-PYTHON_ENABLE_MODULE_vtkWidgetsPython:BOOL=ON
-
-//Path to a program.
-PYTHON_EXECUTABLE:FILEPATH=@PREFIX_PATH@/bin/python@PYVER@
-
-//Extra libraries to link when linking to python (such as "z" for
-// zlib).  Separate multiple libraries with semicolons.
-PYTHON_EXTRA_LIBS:STRING=
-
-//Path to a file.
-PYTHON_INCLUDE_DIR:PATH=@PREFIX_PATH@/Python.framework/Headers
-
-//Path to a library.
-PYTHON_LIBRARY:FILEPATH=@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib
-
-//Add module vtkChartsPython shared
-PYTHON_MODULE_vtkChartsPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkCommonPython shared
-PYTHON_MODULE_vtkCommonPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkFilteringPython shared
-PYTHON_MODULE_vtkFilteringPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkGenericFilteringPython shared
-PYTHON_MODULE_vtkGenericFilteringPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkGeovisPython shared
-PYTHON_MODULE_vtkGeovisPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkGraphicsPython shared
-PYTHON_MODULE_vtkGraphicsPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkHybridPython shared
-PYTHON_MODULE_vtkHybridPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkIOPython shared
-PYTHON_MODULE_vtkIOPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkImagingPython shared
-PYTHON_MODULE_vtkImagingPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkInfovisPython shared
-PYTHON_MODULE_vtkInfovisPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkRenderingPython shared
-PYTHON_MODULE_vtkRenderingPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkViewsPython shared
-PYTHON_MODULE_vtkViewsPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkVolumeRenderingPython shared
-PYTHON_MODULE_vtkVolumeRenderingPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkWidgetsPython shared
-PYTHON_MODULE_vtkWidgetsPython_BUILD_SHARED:BOOL=ON
-
-//Utility library needed for vtkpython
-PYTHON_UTIL_LIBRARY:FILEPATH=/usr/lib/libutil.dylib
-
-//Path to scp command, used by CTest for submitting results to
-// a Dart server
-SCPCOMMAND:FILEPATH=/usr/bin/scp
-
-//Name of the computer/site where compile is being run
-SITE:STRING=meryem.llnl.gov
-
-//Path to the SLURM sbatch executable
-SLURM_SBATCH_COMMAND:FILEPATH=SLURM_SBATCH_COMMAND-NOTFOUND
-
-//Path to the SLURM srun executable
-SLURM_SRUN_COMMAND:FILEPATH=SLURM_SRUN_COMMAND-NOTFOUND
-
-//Path to a program.
-SVNCOMMAND:FILEPATH=/usr/bin/svn
-
-//Path to a file.
-TCL_INCLUDE_PATH:PATH=@EXTERNALS@/include
-
-//Path to a library.
-TCL_LIBRARY:FILEPATH=@EXTERNALS@/lib/libtcl@TCLTK_VERSION@.dylib
-
-//Path to a program.
-TCL_TCLSH:FILEPATH=@EXTERNALS@/bin/tclsh@TCLTK_VERSION@
-
-//Path to a file.
-TK_INCLUDE_PATH:PATH=@EXTERNALS@/include
-
-//The path to the Tk internal headers (tkMacOSXDefault.h).
-TK_INTERNAL_PATH:PATH=@EXTERNALS@/include
-
-//Path to a library.
-TK_LIBRARY:FILEPATH=@EXTERNALS@/lib/libtcl@TCLTK_VERSION@.dylib
-
-//Build the 2007 Verdict User Manual
-VERDICT_BUILD_DOC:BOOL=OFF
-
-//Should tests of the VERDICT library be built?
-VERDICT_ENABLE_TESTING:BOOL=OFF
-
-//Mangle verdict names for inclusion in a larger library?
-VERDICT_MANGLE:BOOL=ON
-
-//VTK requires the verdict prefix to be vtk
-VERDICT_MANGLE_PREFIX:STRING=vtk
-
-//VTK requires doubles
-VERDICT_USE_FLOAT:BOOL=OFF
-
-//Path to a library.
-VLI_LIBRARY_FOR_VP1000:FILEPATH=VLI_LIBRARY_FOR_VP1000-NOTFOUND
-
-//Value Computed by CMake
-VTKEXPAT_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtkexpat
-
-//Value Computed by CMake
-VTKEXPAT_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtkexpat
-
-//Value Computed by CMake
-VTKFREETYPE_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtkfreetype
-
-//Value Computed by CMake
-VTKFREETYPE_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtkfreetype
-
-//Value Computed by CMake
-VTKFTGL_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/ftgl
-
-//Value Computed by CMake
-VTKFTGL_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/ftgl
-
-//Value Computed by CMake
-VTKJPEG_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtkjpeg
-
-//Value Computed by CMake
-VTKJPEG_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtkjpeg
-
-//Value Computed by CMake
-VTKNETCDF_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtknetcdf
-
-//Value Computed by CMake
-VTKNETCDF_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtknetcdf
-
-//Value Computed by CMake
-VTKPNG_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtkpng
-
-//Value Computed by CMake
-VTKPNG_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtkpng
-
-//Value Computed by CMake
-VTKTIFF_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtktiff
-
-//Value Computed by CMake
-VTKTIFF_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtktiff
-
-//Value Computed by CMake
-VTKZLIB_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtkzlib
-
-//Value Computed by CMake
-VTKZLIB_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtkzlib
-
-//Value Computed by CMake
-VTK_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build
-
-//The repository for data used for testing.  To obtain from CVS:
-// "cvs -d :pserver:anoncvs@www.vtk.org:/cvsroot/VTK co VTKData"
-VTK_DATA_ROOT:PATH=VTK_DATA_ROOT-NOTFOUND
-
-//Build leak checking support into VTK.
-VTK_DEBUG_LEAKS:BOOL=OFF
-
-//Add compiler flags to do stricter checking when building debug.
-VTK_EXTRA_COMPILER_WARNINGS:BOOL=OFF
-
-//Location of the OpenGL extensions header file (glext.h).
-VTK_GLEXT_FILE:FILEPATH=@BUILD_DIR@/VTK/Utilities/ParseOGLExt/headers/glext.h
-
-//Location of the GLX extensions header file (glxext.h).
-VTK_GLXEXT_FILE:FILEPATH=@BUILD_DIR@/VTK/Utilities/ParseOGLExt/headers/glxext.h
-
-//The repository for large data used for testing.  To check out
-// this repository from CVS, first run
-//\n
-//\ncvs -d :pserver:anonymous@public.kitware.com:/cvsroot/VTK login
-//\n
-//\n(respond with password vtk) and then run
-//\n
-//\ncvs -d :pserver:anonymous@public.kitware.com:/cvsroot/VTK checkout
-// VTKLargeData
-VTK_LARGE_DATA_ROOT:PATH=VTK_LARGE_DATA_ROOT-NOTFOUND
-
-//Remove all legacy code completely.
-VTK_LEGACY_REMOVE:BOOL=OFF
-
-//Silence all legacy code messages.
-VTK_LEGACY_SILENT:BOOL=OFF
-
-//; separated directories to search for materials/shaders
-VTK_MATERIALS_DIRS:STRING=@BUILD_DIR@/VTK-build/Utilities/MaterialLibrary/Repository
-
-//Disable multithreading support in the Python bindings
-VTK_NO_PYTHON_THREADS:BOOL=OFF
-
-//The opengl library being used supports off screen Mesa calls.
-VTK_OPENGL_HAS_OSMESA:BOOL=OFF
-
-//Arguments passed to "python setup.py install ..." during installation.
-VTK_PYTHON_SETUP_ARGS:STRING=--prefix="${CMAKE_INSTALL_PREFIX}"
-
-//Extra flags for Objective C compilation
-VTK_REQUIRED_OBJCXX_FLAGS:STRING=-fobjc-gc
-
-//Value Computed by CMake
-VTK_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK
-
-//Locale for VTK C++ tests. Example fr_FR.utf8, empty string for
-// env variable.
-VTK_TESTING_LOCALE:STRING=
-
-//VTK tests call vtkFloatingPointExceptions::Enable()
-VTK_TESTING_USE_FPE:BOOL=ON
-
-//VTK c++ tests will start with specified locale.
-VTK_TESTING_USE_LOCALE:BOOL=OFF
-
-//Build VTK with 64 bit ids
-VTK_USE_64BIT_IDS:BOOL=ON
-
-//Use Boost libraries for graph algorithms - www.boost.org.
-VTK_USE_BOOST:BOOL=OFF
-
-//Build classes using Carbon API.
-VTK_USE_CARBON:BOOL=OFF
-
-//Build pixel and vertex shader support for Cg.
-VTK_USE_CG_SHADERS:BOOL=OFF
-
-//Build VTK chart support (OpenGL based)
-VTK_USE_CHARTS:BOOL=ON
-
-//Build classes using Cocoa API.
-VTK_USE_COCOA:BOOL=ON
-
-//Turn this option off and tests and warning/error macros will
-// not popup windows
-VTK_USE_DISPLAY:BOOL=ON
-
-//If the FFMPEG library is available, should VTK use it for saving
-// .avi animation files?
-VTK_USE_FFMPEG_ENCODER:BOOL=OFF
-
-//Use GCC visibility support if available.
-VTK_USE_GCC_VISIBILITY:BOOL=ON
-
-//Build the vtkGeovis kit.  Needed for performing geographic visualization.
-VTK_USE_GEOVIS:BOOL=ON
-
-//Build VTK with gl2ps support.
-VTK_USE_GL2PS:BOOL=ON
-
-//Build pixel and vertex shader support for GLSL.
-VTK_USE_GLSL_SHADERS:BOOL=ON
-
-//Use Gnu R interface for VTK.  Requires Gnu R installation.
-VTK_USE_GNU_R:BOOL=OFF
-
-//Build VTK with GUI Support
-VTK_USE_GUISUPPORT:BOOL=OFF
-
-//Build the vtkInfovis kit.  Needed for performing information
-// visualization.
-VTK_USE_INFOVIS:BOOL=ON
-
-//Use mangled Mesa with OpenGL.
-VTK_USE_MANGLED_MESA:BOOL=OFF
-
-//Use Matlab Engine and Matlab Mex files.  Requires valid Matlab
-// installation.
-VTK_USE_MATLAB_MEX:BOOL=OFF
-
-//Build metaio
-VTK_USE_METAIO:BOOL=ON
-
-//Enable use of the patented mpeg2 library. You are solely responsible
-// for any legal issues associated with using patented code in
-// your software.
-VTK_USE_MPEG2_ENCODER:BOOL=OFF
-
-//Build the MySQL driver for vtkSQLDatabase.
-VTK_USE_MYSQL:BOOL=OFF
-
-//Add support for arbitrary-dimension sparse and dense arrays.
-VTK_USE_N_WAY_ARRAYS:BOOL=ON
-
-//Build the ODBC database interface
-VTK_USE_ODBC:BOOL=OFF
-
-//Build experimental Ogg/Theora support
-VTK_USE_OGGTHEORA_ENCODER:BOOL=OFF
-
-//Build openfoam reader
-VTK_USE_OPENFOAM:BOOL=ON
-
-//Build the vtkParallel kit.
-VTK_USE_PARALLEL:BOOL=OFF
-
-//Build the PostgreSQL driver for vtkSQLDatabase.
-VTK_USE_POSTGRES:BOOL=OFF
-
-//Build Qt support
-VTK_USE_QT:BOOL=OFF
-
-//Build the vtkRendering kit.  Needed for displaying data or using
-// widgets.
-VTK_USE_RENDERING:BOOL=ON
-
-//Build shared libraries with rpath.  This makes it easy to run
-// executables from the build tree when using shared libraries,
-// but removes install support.
-VTK_USE_RPATH:BOOL=ON
-
-//Use the system's expat library.
-VTK_USE_SYSTEM_EXPAT:BOOL=OFF
-
-//Use the system's freetype library.
-VTK_USE_SYSTEM_FREETYPE:BOOL=OFF
-
-//Use the system's gl2ps library.
-VTK_USE_SYSTEM_GL2PS:BOOL=OFF
-
-//Use the system's jpeg library.
-VTK_USE_SYSTEM_JPEG:BOOL=OFF
-
-//Use the system's proj4 library.
-VTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF
-
-//Use the system's libxml2 library.
-VTK_USE_SYSTEM_LIBXML2:BOOL=OFF
-
-//Use the system's png library.
-VTK_USE_SYSTEM_PNG:BOOL=OFF
-
-//Use the system's tiff library.
-VTK_USE_SYSTEM_TIFF:BOOL=OFF
-
-//Use the system's zlib library.
-VTK_USE_SYSTEM_ZLIB:BOOL=OFF
-
-//Use 3Dconnexion device
-VTK_USE_TDX:BOOL=OFF
-
-//Build the vtkTextAnalysis kit.  Needed for performing text analysis.
-VTK_USE_TEXT_ANALYSIS:BOOL=OFF
-
-//Build VTK with Tk support
-VTK_USE_TK:BOOL=OFF
-
-//Build the vtkViews kit.  Needed for creating packaged and linked
-// views.
-VTK_USE_VIEWS:BOOL=ON
-
-//Enable support for VolumePro 1000.
-VTK_USE_VOLUMEPRO_1000:BOOL=OFF
-
-//Build classes for the X11 window system.
-VTK_USE_X:BOOL=OFF
-
-//Location of the WGL extensions header file (wglext.h).
-VTK_WGLEXT_FILE:FILEPATH=@BUILD_DIR@/VTK/Utilities/ParseOGLExt/headers/wglext.h
-
-//Path to a file.
-VTK_WRAP_HINTS:FILEPATH=@BUILD_DIR@/VTK/Wrapping/hints
-
-//Wrap VTK classes into the Java language.
-VTK_WRAP_JAVA:BOOL=OFF
-
-//Wrap VTK classes into the Python language.
-VTK_WRAP_PYTHON:BOOL=ON
-
-//Wrap VTK classes into the TCL language.
-VTK_WRAP_TCL:BOOL=OFF
-
-//Path to a file.
-X11_ICE_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_ICE_LIB:FILEPATH=/usr/X11R6/lib/libICE.dylib
-
-//Path to a library.
-X11_SM_LIB:FILEPATH=/usr/X11R6/lib/libSM.dylib
-
-//Path to a file.
-X11_X11_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_X11_LIB:FILEPATH=/usr/X11R6/lib/libX11.dylib
-
-//Path to a file.
-X11_XShm_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_XTest_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_XTest_LIB:FILEPATH=/usr/X11R6/lib/libXtst.dylib
-
-//Path to a file.
-X11_Xaccessrules_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_Xaccessstr_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_Xau_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xau_LIB:FILEPATH=/usr/X11R6/lib/libXau.dylib
-
-//Path to a file.
-X11_Xcomposite_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xcomposite_LIB:FILEPATH=/usr/X11R6/lib/libXcomposite.dylib
-
-//Path to a file.
-X11_Xcursor_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xcursor_LIB:FILEPATH=/usr/X11R6/lib/libXcursor.dylib
-
-//Path to a file.
-X11_Xdamage_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xdamage_LIB:FILEPATH=/usr/X11R6/lib/libXdamage.dylib
-
-//Path to a file.
-X11_Xdmcp_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xdmcp_LIB:FILEPATH=/usr/X11R6/lib/libXdmcp.dylib
-
-//Path to a library.
-X11_Xext_LIB:FILEPATH=/usr/X11R6/lib/libXext.dylib
-
-//Path to a file.
-X11_Xfixes_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xfixes_LIB:FILEPATH=/usr/X11R6/lib/libXfixes.dylib
-
-//Path to a file.
-X11_Xft_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xft_LIB:FILEPATH=/usr/X11R6/lib/libXft.dylib
-
-//Path to a file.
-X11_Xinerama_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xinerama_LIB:FILEPATH=/usr/X11R6/lib/libXinerama.dylib
-
-//Path to a file.
-X11_Xinput_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xinput_LIB:FILEPATH=/usr/X11R6/lib/libXi.dylib
-
-//Path to a file.
-X11_Xkb_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_Xkblib_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_Xlib_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_Xpm_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xpm_LIB:FILEPATH=/usr/X11R6/lib/libXpm.dylib
-
-//Path to a file.
-X11_Xrandr_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xrandr_LIB:FILEPATH=/usr/X11R6/lib/libXrandr.dylib
-
-//Path to a file.
-X11_Xrender_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xrender_LIB:FILEPATH=/usr/X11R6/lib/libXrender.dylib
-
-//Path to a file.
-X11_Xscreensaver_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xscreensaver_LIB:FILEPATH=/usr/X11R6/lib/libXss.dylib
-
-//Path to a file.
-X11_Xshape_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_Xt_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xt_LIB:FILEPATH=/usr/X11R6/lib/libXt.dylib
-
-//Path to a file.
-X11_Xutil_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_Xv_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xv_LIB:FILEPATH=/usr/X11R6/lib/libXv.dylib
-
-//Path to a library.
-X11_Xxf86misc_LIB:FILEPATH=/usr/X11R6/lib/libXxf86misc.dylib
-
-//Path to a file.
-X11_dpms_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_xf86misc_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_xf86vmode_INCLUDE_PATH:PATH=/usr/include
-
-//Value Computed by CMake
-alglib_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtkalglib
-
-//Value Computed by CMake
-alglib_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtkalglib
-
-//Value Computed by CMake
-libproj4_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtklibproj4
-
-//Value Computed by CMake
-libproj4_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtklibproj4
-
-//Dependencies for the target
-mpistubs_LIB_DEPENDS:STATIC=general;vtksys;
-
-//Value Computed by CMake
-verdict_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/verdict
-
-//Value Computed by CMake
-verdict_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/verdict
-
-//Dependencies for the target
-vtkChartsPythonD_LIB_DEPENDS:STATIC=general;vtkCharts;general;vtkHybridPythonD;general;vtkViewsPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkChartsPython_LIB_DEPENDS:STATIC=general;vtkChartsPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkCharts_LIB_DEPENDS:STATIC=general;vtkHybrid;general;vtkViews;general;vtkIO;general;vtkftgl;general;vtkfreetype;
-
-//Dependencies for the target
-vtkCommonPythonD_LIB_DEPENDS:STATIC=general;vtkCommon;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkCommonPython_LIB_DEPENDS:STATIC=general;vtkCommonPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkCommon_LIB_DEPENDS:STATIC=general;vtksys;general;-lm;general;-lpthread;
-
-//Dependencies for target
-vtkDICOMParser_LIB_DEPENDS:STATIC=
-
-//Value Computed by CMake
-vtkExodus2_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtkexodus2
-
-//Value Computed by CMake
-vtkExodus2_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtkexodus2
-
-//Dependencies for the target
-vtkFilteringPythonD_LIB_DEPENDS:STATIC=general;vtkFiltering;general;vtkCommonPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkFilteringPython_LIB_DEPENDS:STATIC=general;vtkFilteringPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkFiltering_LIB_DEPENDS:STATIC=general;vtkCommon;
-
-//Dependencies for the target
-vtkGenericFilteringPythonD_LIB_DEPENDS:STATIC=general;vtkGenericFiltering;general;vtkFilteringPythonD;general;vtkGraphicsPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkGenericFilteringPython_LIB_DEPENDS:STATIC=general;vtkGenericFilteringPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkGenericFiltering_LIB_DEPENDS:STATIC=general;vtkFiltering;general;vtkGraphics;
-
-//Dependencies for the target
-vtkGeovisPythonD_LIB_DEPENDS:STATIC=general;vtkGeovis;general;vtkWidgetsPythonD;general;vtkViewsPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkGeovisPython_LIB_DEPENDS:STATIC=general;vtkGeovisPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkGeovis_LIB_DEPENDS:STATIC=general;vtkWidgets;general;vtkViews;general;vtkproj4;general;/System/Library/Frameworks/AGL.framework;general;/System/Library/Frameworks/OpenGL.framework;
-
-//Dependencies for the target
-vtkGraphicsPythonD_LIB_DEPENDS:STATIC=general;vtkGraphics;general;vtkFilteringPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkGraphicsPython_LIB_DEPENDS:STATIC=general;vtkGraphicsPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkGraphics_LIB_DEPENDS:STATIC=general;vtkFiltering;general;vtkverdict;
-
-//Dependencies for the target
-vtkHybridPythonD_LIB_DEPENDS:STATIC=general;vtkHybrid;general;vtkRenderingPythonD;general;vtkIOPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkHybridPython_LIB_DEPENDS:STATIC=general;vtkHybridPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkHybrid_LIB_DEPENDS:STATIC=general;vtkRendering;general;vtkIO;general;vtkexoIIc;general;vtkftgl;
-
-//Dependencies for the target
-vtkIOPythonD_LIB_DEPENDS:STATIC=general;vtkIO;general;vtkFilteringPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkIOPython_LIB_DEPENDS:STATIC=general;vtkIOPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkIO_LIB_DEPENDS:STATIC=general;vtkFiltering;general;vtkDICOMParser;general;vtkNetCDF;general;vtkmetaio;general;vtksqlite;general;vtkpng;general;vtkzlib;general;vtkjpeg;general;vtktiff;general;vtkexpat;general;vtksys;
-
-//Dependencies for the target
-vtkImagingPythonD_LIB_DEPENDS:STATIC=general;vtkImaging;general;vtkFilteringPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkImagingPython_LIB_DEPENDS:STATIC=general;vtkImagingPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkImaging_LIB_DEPENDS:STATIC=general;vtkFiltering;
-
-//Dependencies for the target
-vtkInfovisPythonD_LIB_DEPENDS:STATIC=general;vtkInfovis;general;vtkWidgetsPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkInfovisPython_LIB_DEPENDS:STATIC=general;vtkInfovisPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkInfovis_LIB_DEPENDS:STATIC=general;vtkWidgets;general;vtklibxml2;general;vtkalglib;
-
-//Dependencies for target
-vtkNetCDF_LIB_DEPENDS:STATIC=
-
-//Dependencies for the target
-vtkRenderingPythonD_LIB_DEPENDS:STATIC=general;vtkRendering;general;vtkGraphicsPythonD;general;vtkImagingPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkRenderingPythonTkWidgets_LIB_DEPENDS:STATIC=general;vtkRendering;general;@EXTERNALS@/lib/libtcl@TCLTK_VERSION@.dylib;general;@EXTERNALS@/lib/libtcl@TCLTK_VERSION@.dylib;general;m;
-
-//Dependencies for the target
-vtkRenderingPython_LIB_DEPENDS:STATIC=general;vtkRenderingPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkRendering_LIB_DEPENDS:STATIC=general;vtkGraphics;general;vtkImaging;general;objc;general;vtkIO;general;vtkftgl;general;vtkfreetype;general;vtkzlib;general;vtkpng;general;/System/Library/Frameworks/OpenGL.framework;general;-framework Cocoa;general;/System/Library/Frameworks/ApplicationServices.framework;general;/System/Library/Frameworks/IOKit.framework;
-
-//Dependencies for the target
-vtkViewsPythonD_LIB_DEPENDS:STATIC=general;vtkViews;general;vtkInfovisPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkViewsPython_LIB_DEPENDS:STATIC=general;vtkViewsPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkViews_LIB_DEPENDS:STATIC=general;vtkInfovis;
-
-//Dependencies for the target
-vtkVolumeRenderingPythonD_LIB_DEPENDS:STATIC=general;vtkVolumeRendering;general;vtkRenderingPythonD;general;vtkIOPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkVolumeRenderingPython_LIB_DEPENDS:STATIC=general;vtkVolumeRenderingPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkVolumeRendering_LIB_DEPENDS:STATIC=general;vtkRendering;general;vtkIO;general;/System/Library/Frameworks/OpenGL.framework;
-
-//Dependencies for the target
-vtkWidgetsPythonD_LIB_DEPENDS:STATIC=general;vtkWidgets;general;vtkRenderingPythonD;general;vtkHybridPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkWidgetsPython_LIB_DEPENDS:STATIC=general;vtkWidgetsPythonD;general;@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib;
-
-//Dependencies for the target
-vtkWidgets_LIB_DEPENDS:STATIC=general;vtkRendering;general;vtkHybrid;general;/System/Library/Frameworks/OpenGL.framework;
-
-//Dependencies for target
-vtkalglib_LIB_DEPENDS:STATIC=
-
-//Dependencies for the target
-vtkexoIIc_LIB_DEPENDS:STATIC=general;vtkNetCDF;
-
-//Dependencies for target
-vtkexpat_LIB_DEPENDS:STATIC=
-
-//Dependencies for the target
-vtkfreetype_LIB_DEPENDS:STATIC=general;-framework ApplicationServices -framework CoreServices;
-
-//Dependencies for the target
-vtkftgl_LIB_DEPENDS:STATIC=general;/System/Library/Frameworks/OpenGL.framework;general;vtkfreetype;
-
-//Dependencies for target
-vtkjpeg_LIB_DEPENDS:STATIC=
-
-//Value Computed by CMake
-vtklibxml2_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtklibxml2
-
-//Dependencies for the target
-vtklibxml2_LIB_DEPENDS:STATIC=general;vtkzlib;general;dl;general;-lpthread;general;m;
-
-//Value Computed by CMake
-vtklibxml2_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtklibxml2
-
-//Value Computed by CMake
-vtkmetaio_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtkmetaio
-
-//Dependencies for the target
-vtkmetaio_LIB_DEPENDS:STATIC=general;vtkzlib;general;vtksys;
-
-//Value Computed by CMake
-vtkmetaio_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtkmetaio
-
-//Dependencies for the target
-vtkpng_LIB_DEPENDS:STATIC=general;vtkzlib;general;-lm;
-
-//Dependencies for the target
-vtkproj4_LIB_DEPENDS:STATIC=general;m;
-
-//Dependencies for the target
-vtksqlite_LIB_DEPENDS:STATIC=general;-lpthread;
-
-//Value Computed by CMake
-vtksys_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/kwsys
-
-//Dependencies for target
-vtksys_LIB_DEPENDS:STATIC=
-
-//Value Computed by CMake
-vtksys_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/kwsys
-
-//Dependencies for the target
-vtktiff_LIB_DEPENDS:STATIC=general;vtkzlib;general;vtkjpeg;general;-lm;
-
-//Dependencies for target
-vtkverdict_LIB_DEPENDS:STATIC=
-
-//Dependencies for target
-vtkzlib_LIB_DEPENDS:STATIC=
-
-
-########################
-# INTERNAL cache entries
-########################
-
-ALGLIB_SHARED_LIB:INTERNAL=ON
-//ADVANCED property for variable: BUILD_DOCUMENTATION
-BUILD_DOCUMENTATION-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: BUILD_SHARED_LIBS
-BUILD_SHARED_LIBS-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: BZRCOMMAND
-BZRCOMMAND-ADVANCED:INTERNAL=1
-//Result of TRY_COMPILE
-CMAKE_ANSI_FOR_SCOPE:INTERNAL=TRUE
-//Have include iostream
-CMAKE_ANSI_STREAM_HEADERS:INTERNAL=1
-//ADVANCED property for variable: CMAKE_AR
-CMAKE_AR-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_BUILD_TOOL
-CMAKE_BUILD_TOOL-ADVANCED:INTERNAL=1
-//What is the target build tool cmake is generating for.
-CMAKE_BUILD_TOOL:INTERNAL=/usr/bin/make
-//This is the directory where this CMakeCache.txt was created
-CMAKE_CACHEFILE_DIR:INTERNAL=@BUILD_DIR@/VTK-build
-//Major version of cmake used to create the current loaded cache
-CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2
-//Minor version of cmake used to create the current loaded cache
-CMAKE_CACHE_MINOR_VERSION:INTERNAL=8
-//Patch version of cmake used to create the current loaded cache
-CMAKE_CACHE_PATCH_VERSION:INTERNAL=0
-//ADVANCED property for variable: CMAKE_COLOR_MAKEFILE
-CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1
-//Path to CMake executable.
-CMAKE_COMMAND:INTERNAL=@EXTERNALS@/bin/cmake
-//Path to cpack program executable.
-CMAKE_CPACK_COMMAND:INTERNAL=@EXTERNALS@/bin/cpack
-//ADVANCED property for variable: CMAKE_CTEST_COMMAND
-CMAKE_CTEST_COMMAND-ADVANCED:INTERNAL=1
-//Path to ctest program executable.
-CMAKE_CTEST_COMMAND:INTERNAL=@EXTERNALS@/bin/ctest
-//ADVANCED property for variable: CMAKE_CXX_COMPILER
-CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1
-CMAKE_CXX_COMPILER_WORKS:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS
-CMAKE_CXX_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS_DEBUG
-CMAKE_CXX_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS_MINSIZEREL
-CMAKE_CXX_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS_RELEASE
-CMAKE_CXX_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS_RELWITHDEBINFO
-CMAKE_CXX_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_COMPILER
-CMAKE_C_COMPILER-ADVANCED:INTERNAL=1
-CMAKE_C_COMPILER_WORKS:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS
-CMAKE_C_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_DEBUG
-CMAKE_C_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_MINSIZEREL
-CMAKE_C_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_RELEASE
-CMAKE_C_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_RELWITHDEBINFO
-CMAKE_C_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//Result of TRY_COMPILE
-CMAKE_DETERMINE_CXX_ABI_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-CMAKE_DETERMINE_C_ABI_COMPILED:INTERNAL=TRUE
-//Path to cache edit program executable.
-CMAKE_EDIT_COMMAND:INTERNAL=@EXTERNALS@/bin/ccmake
-//Executable file format
-CMAKE_EXECUTABLE_FORMAT:INTERNAL=Unknown
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS
-CMAKE_EXE_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_DEBUG
-CMAKE_EXE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_MINSIZEREL
-CMAKE_EXE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELEASE
-CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
-CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//Name of generator.
-CMAKE_GENERATOR:INTERNAL=Unix Makefiles
-//Result of TRY_COMPILE
-CMAKE_HAS_ANSI_STRING_STREAM:INTERNAL=TRUE
-//Is X11 around.
-CMAKE_HAS_X:INTERNAL=1
-//Have function connect
-CMAKE_HAVE_CONNECT:INTERNAL=1
-//Have function gethostbyname
-CMAKE_HAVE_GETHOSTBYNAME:INTERNAL=1
-//Have include CMAKE_HAVE_LIMITS_H
-CMAKE_HAVE_LIMITS_H:INTERNAL=1
-//Have library pthreads
-CMAKE_HAVE_PTHREADS_CREATE:INTERNAL=
-//Have library pthread
-CMAKE_HAVE_PTHREAD_CREATE:INTERNAL=1
-//Have include CMAKE_HAVE_PTHREAD_H
-CMAKE_HAVE_PTHREAD_H:INTERNAL=1
-//Have function remove
-CMAKE_HAVE_REMOVE:INTERNAL=1
-//Have function shmat
-CMAKE_HAVE_SHMAT:INTERNAL=1
-//Have includes CMAKE_HAVE_SYS_PRCTL_H
-CMAKE_HAVE_SYS_PRCTL_H:INTERNAL=
-//Have include CMAKE_HAVE_UNISTD_H
-CMAKE_HAVE_UNISTD_H:INTERNAL=1
-//Start directory with the top level CMakeLists.txt file for this
-// project
-CMAKE_HOME_DIRECTORY:INTERNAL=@BUILD_DIR@/VTK
-//ADVANCED property for variable: CMAKE_HP_PTHREADS
-CMAKE_HP_PTHREADS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_INSTALL_NAME_TOOL
-CMAKE_INSTALL_NAME_TOOL-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: CMAKE_INSTALL_PREFIX
-CMAKE_INSTALL_PREFIX-MODIFIED:INTERNAL=ON
-//Have library ICE
-CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER:INTERNAL=1
-//ADVANCED property for variable: CMAKE_LINKER
-CMAKE_LINKER-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MAKE_PROGRAM
-CMAKE_MAKE_PROGRAM-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS
-CMAKE_MODULE_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_DEBUG
-CMAKE_MODULE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL
-CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELEASE
-CMAKE_MODULE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO
-CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_NM
-CMAKE_NM-ADVANCED:INTERNAL=1
-//Does the compiler support ansi for scope.
-CMAKE_NO_ANSI_FOR_SCOPE:INTERNAL=0
-//ADVANCED property for variable: CMAKE_NO_ANSI_STREAM_HEADERS
-CMAKE_NO_ANSI_STREAM_HEADERS-ADVANCED:INTERNAL=1
-//Does the compiler support headers like iostream.
-CMAKE_NO_ANSI_STREAM_HEADERS:INTERNAL=0
-//Does the compiler support sstream
-CMAKE_NO_ANSI_STRING_STREAM:INTERNAL=0
-//Does the compiler support std::.
-CMAKE_NO_STD_NAMESPACE:INTERNAL=0
-//number of local generators
-CMAKE_NUMBER_OF_LOCAL_GENERATORS:INTERNAL=83
-//ADVANCED property for variable: CMAKE_OBJCOPY
-CMAKE_OBJCOPY-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_OBJDUMP
-CMAKE_OBJDUMP-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_RANLIB
-CMAKE_RANLIB-ADVANCED:INTERNAL=1
-//Test Support for 64 bit file systems
-CMAKE_REQUIRE_LARGE_FILE_SUPPORT:INTERNAL=1
-//Path to CMake installation.
-CMAKE_ROOT:INTERNAL=@EXTERNALS@/share/cmake-2.8
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS
-CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG
-CMAKE_SHARED_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL
-CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELEASE
-CMAKE_SHARED_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO
-CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//Result of CHECK_TYPE_SIZE
-CMAKE_SIZEOF_CHAR:INTERNAL=1
-//Result of CHECK_TYPE_SIZE
-CMAKE_SIZEOF_DOUBLE:INTERNAL=8
-//Result of CHECK_TYPE_SIZE
-CMAKE_SIZEOF_FLOAT:INTERNAL=4
-//Result of CHECK_TYPE_SIZE
-CMAKE_SIZEOF_INT:INTERNAL=4
-//Result of CHECK_TYPE_SIZE
-CMAKE_SIZEOF_LONG:INTERNAL=8
-//Result of CHECK_TYPE_SIZE
-CMAKE_SIZEOF_SHORT:INTERNAL=2
-//Result of CHECK_TYPE_SIZE
-CMAKE_SIZEOF_UNSIGNED_SHORT:INTERNAL=2
-//Result of CHECK_TYPE_SIZE
-CMAKE_SIZEOF_VOID_P:INTERNAL=8
-//ADVANCED property for variable: CMAKE_SKIP_RPATH
-CMAKE_SKIP_RPATH-ADVANCED:INTERNAL=1
-//Whether to build with rpath.
-CMAKE_SKIP_RPATH:INTERNAL=0
-//Result of TRY_COMPILE
-CMAKE_STD_NAMESPACE:INTERNAL=TRUE
-//ADVANCED property for variable: CMAKE_STRIP
-CMAKE_STRIP-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_THREAD_LIBS
-CMAKE_THREAD_LIBS-ADVANCED:INTERNAL=1
-//uname command
-CMAKE_UNAME:INTERNAL=/usr/bin/uname
-//ADVANCED property for variable: CMAKE_USE_PTHREADS
-CMAKE_USE_PTHREADS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_USE_RELATIVE_PATHS
-CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_USE_SPROC
-CMAKE_USE_SPROC-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_USE_WIN32_THREADS
-CMAKE_USE_WIN32_THREADS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE
-CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
-//Result of TEST_BIG_ENDIAN
-CMAKE_WORDS_BIGENDIAN:INTERNAL=0
-//ADVANCED property for variable: CMAKE_X_CFLAGS
-CMAKE_X_CFLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_X_LIBS
-CMAKE_X_LIBS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: COVERAGE_COMMAND
-COVERAGE_COMMAND-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CVSCOMMAND
-CVSCOMMAND-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CVS_UPDATE_OPTIONS
-CVS_UPDATE_OPTIONS-ADVANCED:INTERNAL=1
-//CXX compiler accepts flag -no-cpp-precomp
-CXX_HAS_CPP_PRECOMP_FLAG:INTERNAL=TRUE
-//ADVANCED property for variable: DART_TESTING_TIMEOUT
-DART_TESTING_TIMEOUT-ADVANCED:INTERNAL=1
-//Single output directory for building all executables.
-EXECUTABLE_OUTPUT_PATH:INTERNAL=@BUILD_DIR@/VTK-build/bin
-//Have include malloc.h
-EX_HAVE_MALLOC_H:INTERNAL=
-//Details about finding PythonLibs
-FIND_PACKAGE_MESSAGE_DETAILS_PythonLibs:INTERNAL=[@PREFIX_PATH@/Python.framework/Versions/Current/lib/python@PYVER@/config/libpython@PYVER@.dylib][@PREFIX_PATH@/Python.framework/Headers]
-//Details about finding TCL
-FIND_PACKAGE_MESSAGE_DETAILS_TCL:INTERNAL=[@EXTERNALS@/lib/libtcl@TCLTK_VERSION@.dylib][@EXTERNALS@/include]
-//Details about finding TCLTK
-FIND_PACKAGE_MESSAGE_DETAILS_TCLTK:INTERNAL=[@EXTERNALS@/lib/libtcl@TCLTK_VERSION@.dylib][@EXTERNALS@/include][@EXTERNALS@/lib/libtcl@TCLTK_VERSION@.dylib][@EXTERNALS@/include]
-//Details about finding TK
-FIND_PACKAGE_MESSAGE_DETAILS_TK:INTERNAL=[@EXTERNALS@/lib/libtcl@TCLTK_VERSION@.dylib][@EXTERNALS@/include]
-//Details about finding Tclsh
-FIND_PACKAGE_MESSAGE_DETAILS_Tclsh:INTERNAL=[@EXTERNALS@/bin/tclsh@TCLTK_VERSION@]
-//Details about finding Threads
-FIND_PACKAGE_MESSAGE_DETAILS_Threads:INTERNAL=[TRUE]
-//Details about finding X11
-FIND_PACKAGE_MESSAGE_DETAILS_X11:INTERNAL=[/usr/X11R6/lib/libX11.dylib][/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include]
-//Have symbol alloca
-HAVE_ALLOCA:INTERNAL=1
-//Have include HAVE_ALLOCA_H
-HAVE_ALLOCA_H:INTERNAL=1
-//Have includes HAVE_ANSIDECL_H
-HAVE_ANSIDECL_H:INTERNAL=
-//Have include HAVE_ARPA_INET_H
-HAVE_ARPA_INET_H:INTERNAL=1
-//Have include HAVE_ARPA_NAMESER_H
-HAVE_ARPA_NAMESER_H:INTERNAL=1
-//Have include HAVE_ASSERT_H
-HAVE_ASSERT_H:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_CMAKE_REQUIRE_LARGE_FILE_SUPPORT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_CHAR:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_DOUBLE:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_FLOAT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_INT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_LONG:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_SHORT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_UNSIGNED_SHORT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_VOID_P:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_WORDS_BIGENDIAN:INTERNAL=TRUE
-//Have include HAVE_CTYPE_H
-HAVE_CTYPE_H:INTERNAL=1
-//Have include HAVE_DIRENT_H
-HAVE_DIRENT_H:INTERNAL=1
-//Have include HAVE_DLFCN_H
-HAVE_DLFCN_H:INTERNAL=1
-//Have library dl;-lpthread;m
-HAVE_DLOPEN:INTERNAL=1
-//Have includes HAVE_DL_H
-HAVE_DL_H:INTERNAL=
-//Have include HAVE_ERRNO_H
-HAVE_ERRNO_H:INTERNAL=1
-//Have include HAVE_FCNTL_H
-HAVE_FCNTL_H:INTERNAL=1
-//Have include fenv.h
-HAVE_FENV_H:INTERNAL=1
-//Have symbol finite
-HAVE_FINITE:INTERNAL=1
-//Have include HAVE_FLOAT_H
-HAVE_FLOAT_H:INTERNAL=1
-//Have function floor
-HAVE_FLOOR:INTERNAL=1
-//Have symbol fpclass
-HAVE_FPCLASS:INTERNAL=
-//Have symbol fprintf
-HAVE_FPRINTF:INTERNAL=1
-//Have symbol fp_class
-HAVE_FP_CLASS:INTERNAL=
-//Have includes HAVE_FP_CLASS_H
-HAVE_FP_CLASS_H:INTERNAL=
-//Have symbol ftime
-HAVE_FTIME:INTERNAL=1
-//NetCDF test 
-HAVE_FTRUNCATE:INTERNAL=1
-//Test HAVE_GCC_ERROR_RETURN_TYPE
-HAVE_GCC_ERROR_RETURN_TYPE:INTERNAL=1
-//Test HAVE_GCC_VISIBILITY
-HAVE_GCC_VISIBILITY:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_GETADDRINFO_COMPILED:INTERNAL=TRUE
-//Have function getopt
-HAVE_GETOPT:INTERNAL=1
-//Have symbol gettimeofday
-HAVE_GETTIMEOFDAY:INTERNAL=1
-//Have includes HAVE_IEEEFP_H
-HAVE_IEEEFP_H:INTERNAL=
-//Have include HAVE_INTTYPES_H
-HAVE_INTTYPES_H:INTERNAL=1
-//Have function isascii
-HAVE_ISASCII:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_KWSYS_SIZEOF_CHAR:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_KWSYS_SIZEOF_SHORT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_KWSYS_SIZEOF___INT64:INTERNAL=FALSE
-//Have library dl;
-HAVE_LIBDL:INTERNAL=1
-//Have include HAVE_LIMITS_H
-HAVE_LIMITS_H:INTERNAL=1
-//Have symbol localtime
-HAVE_LOCALTIME:INTERNAL=1
-//Have includes HAVE_MALLOC_H
-HAVE_MALLOC_H:INTERNAL=
-//Have include HAVE_MATH_H
-HAVE_MATH_H:INTERNAL=1
-//Have function memmove
-HAVE_MEMMOVE:INTERNAL=1
-//Have include HAVE_MEMORY_H
-HAVE_MEMORY_H:INTERNAL=1
-//Have function memset
-HAVE_MEMSET:INTERNAL=1
-//Have function mmap
-HAVE_MMAP:INTERNAL=1
-//Have includes HAVE_NAN_H
-HAVE_NAN_H:INTERNAL=
-//Have includes HAVE_NDIR_H
-HAVE_NDIR_H:INTERNAL=
-//Have include HAVE_NETDB_H
-HAVE_NETDB_H:INTERNAL=1
-//Have include HAVE_NETINET_IN_H
-HAVE_NETINET_IN_H:INTERNAL=1
-//Have function pow
-HAVE_POW:INTERNAL=1
-//Have symbol printf
-HAVE_PRINTF:INTERNAL=1
-//Have include HAVE_PTHREAD_H
-HAVE_PTHREAD_H:INTERNAL=1
-//Have include HAVE_RESOLV_H
-HAVE_RESOLV_H:INTERNAL=1
-//Have library dld;dl
-HAVE_SHLLOAD:INTERNAL=
-//Have symbol signal
-HAVE_SIGNAL:INTERNAL=1
-//Have include HAVE_SIGNAL_H
-HAVE_SIGNAL_H:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_SIZEOF_DOUBLE:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_FLOAT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_INT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_LONG:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_OFF_T:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_PTRDIFF_T:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_SHORT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_SIZE_T:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_SSIZE_T:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_UCHAR:INTERNAL=FALSE
-//Have symbol snprintf
-HAVE_SNPRINTF:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_SOCKLEN_T_COMPILED:INTERNAL=TRUE
-//Have symbol sprintf
-HAVE_SPRINTF:INTERNAL=1
-//Have function sqrt
-HAVE_SQRT:INTERNAL=1
-//Have symbol sscanf
-HAVE_SSCANF:INTERNAL=1
-//Have symbol stat
-HAVE_STAT:INTERNAL=1
-//Have include HAVE_STDARG_H
-HAVE_STDARG_H:INTERNAL=1
-//Have include stddef.h
-HAVE_STDDEF_H:INTERNAL=1
-//Have include stdint.h
-HAVE_STDINT_H:INTERNAL=1
-//Have include HAVE_STDIO_H
-HAVE_STDIO_H:INTERNAL=1
-//Have include HAVE_STDLIB_H
-HAVE_STDLIB_H:INTERNAL=1
-//Have function strcasecmp
-HAVE_STRCASECMP:INTERNAL=1
-//Have function strchr
-HAVE_STRCHR:INTERNAL=1
-//Have symbol strdup
-HAVE_STRDUP:INTERNAL=1
-//Have symbol strerror
-HAVE_STRERROR:INTERNAL=1
-//Have symbol strftime
-HAVE_STRFTIME:INTERNAL=1
-//Have include HAVE_STRINGS_H
-HAVE_STRINGS_H:INTERNAL=1
-//Have include HAVE_STRING_H
-HAVE_STRING_H:INTERNAL=1
-//Have symbol strndup
-HAVE_STRNDUP:INTERNAL=
-//Have function strrchr
-HAVE_STRRCHR:INTERNAL=1
-//Have function strstr
-HAVE_STRSTR:INTERNAL=1
-//Have function strtol
-HAVE_STRTOL:INTERNAL=1
-//Have function areroul
-HAVE_STRTOUL:INTERNAL=
-//NetCDF test 
-HAVE_ST_BLKSIZE:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_SYS_DIR_H_COMPILED:INTERNAL=TRUE
-//Have include HAVE_SYS_MMAN_H
-HAVE_SYS_MMAN_H:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_SYS_NDIR_H_COMPILED:INTERNAL=FALSE
-//Have include HAVE_SYS_SELECT_H
-HAVE_SYS_SELECT_H:INTERNAL=1
-//Have include HAVE_SYS_SOCKET_H
-HAVE_SYS_SOCKET_H:INTERNAL=1
-//Have include HAVE_SYS_STAT_H
-HAVE_SYS_STAT_H:INTERNAL=1
-//Have include HAVE_SYS_TIMEB_H
-HAVE_SYS_TIMEB_H:INTERNAL=1
-//Have include HAVE_SYS_TIME_H
-HAVE_SYS_TIME_H:INTERNAL=1
-//Have include sys/types.h
-HAVE_SYS_TYPES_H:INTERNAL=1
-//Have include HAVE_TIME_H
-HAVE_TIME_H:INTERNAL=1
-//Have include HAVE_UNISTD_H
-HAVE_UNISTD_H:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_VA_COPY_COMPILED:INTERNAL=TRUE
-//Have symbol vfprintf
-HAVE_VFPRINTF:INTERNAL=1
-//Have symbol vsnprintf
-HAVE_VSNPRINTF:INTERNAL=1
-//Have symbol vsprintf
-HAVE_VSPRINTF:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_VTK_SIZEOF_LONG_LONG:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_VTK_SIZEOF___INT64:INTERNAL=FALSE
-//Result of TRY_COMPILE
-HAVE_VTK_UINTPTR_T:INTERNAL=TRUE
-//Have includes HAVE_WINDOWS_H
-HAVE_WINDOWS_H:INTERNAL=
-//Have symbol _stat
-HAVE__STAT:INTERNAL=
-//Result of TRY_COMPILE
-HAVE___VA_COPY_COMPILED:INTERNAL=TRUE
-//ADVANCED property for variable: HGCOMMAND
-HGCOMMAND-ADVANCED:INTERNAL=1
-//Result of TRY_RUN
-KWSYS_CHAR_IS_SIGNED:INTERNAL=0
-//Result of TRY_COMPILE
-KWSYS_CHAR_IS_SIGNED_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_CXX_HAS_ARGUMENT_DEPENDENT_LOOKUP_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_CXX_HAS_CSTDDEF_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_CXX_HAS_CSTDIO_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_CXX_HAS_FULL_SPECIALIZATION_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_CXX_HAS_MEMBER_TEMPLATES_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_CXX_HAS_NULL_TEMPLATE_ARGS_COMPILED:INTERNAL=FALSE
-//Result of TRY_COMPILE
-KWSYS_C_HAS_PTRDIFF_T_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_C_HAS_SSIZE_T_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_C_TYPE_MACROS_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_IOS_HAVE_BINARY_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_IOS_HAVE_STD_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_IOS_USE_ANSI_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_IOS_USE_SSTREAM_COMPILED:INTERNAL=TRUE
-//Result of TRY_RUN
-KWSYS_LFS_WORKS:INTERNAL=0
-//Result of TRY_COMPILE
-KWSYS_LFS_WORKS_COMPILED:INTERNAL=TRUE
-//Result of CHECK_TYPE_SIZE
-KWSYS_SIZEOF_CHAR:INTERNAL=1
-//Result of CHECK_TYPE_SIZE
-KWSYS_SIZEOF_SHORT:INTERNAL=2
-//Result of CHECK_TYPE_SIZE
-KWSYS_SIZEOF___INT64:INTERNAL=
-//Result of TRY_COMPILE
-KWSYS_STAT_HAS_ST_MTIM_COMPILED:INTERNAL=FALSE
-//Result of TRY_COMPILE
-KWSYS_STL_HAS_ALLOCATOR_MAX_SIZE_ARGUMENT_COMPILED:INTERNAL=FALSE
-//Result of TRY_COMPILE
-KWSYS_STL_HAS_ALLOCATOR_OBJECTS_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_STL_HAS_ALLOCATOR_REBIND_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_STL_HAS_ALLOCATOR_TEMPLATE_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_STL_HAS_ITERATOR_TRAITS_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_STL_HAVE_STD_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_STL_STRING_HAVE_NEQ_CHAR_COMPILED:INTERNAL=TRUE
-//Single output directory for building all libraries.
-LIBRARY_OUTPUT_PATH:INTERNAL=@BUILD_DIR@/VTK-build/bin
-//ADVANCED property for variable: MAKECOMMAND
-MAKECOMMAND-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: MAKECOMMAND
-MAKECOMMAND-MODIFIED:INTERNAL=ON
-//Path to vtkMaterialLibraryMacro.h
-MATERIAL_LIBRARY_MATERIAL_MACRO_HEADER:INTERNAL=@BUILD_DIR@/VTK-build/Utilities/MaterialLibrary/vtkMaterialLibraryMacro.h
-//Path to vtkShaderCodeLibraryMacro.h
-MATERIAL_LIBRARY_SHADER_MACRO_HEADER:INTERNAL=@BUILD_DIR@/VTK-build/Utilities/MaterialLibrary/vtkShaderCodeLibraryMacro.h
-//ADVANCED property for variable: MEMORYCHECK_COMMAND
-MEMORYCHECK_COMMAND-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: MEMORYCHECK_SUPPRESSIONS_FILE
-MEMORYCHECK_SUPPRESSIONS_FILE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: OPENGL_INCLUDE_DIR
-OPENGL_INCLUDE_DIR-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: OPENGL_gl_LIBRARY
-OPENGL_gl_LIBRARY-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: OPENGL_glu_LIBRARY
-OPENGL_glu_LIBRARY-ADVANCED:INTERNAL=1
-//Have symbol atanh
-PROJ_HAVE_ATANH:INTERNAL=1
-//Have symbol csin
-PROJ_HAVE_COMPLEX:INTERNAL=1
-//ADVANCED property for variable: PROJ_LIST_EXTERNAL
-PROJ_LIST_EXTERNAL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PROJ_USE_GSL
-PROJ_USE_GSL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PROJ_USE_PTHREADS
-PROJ_USE_PTHREADS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkChartsPython
-PYTHON_ENABLE_MODULE_vtkChartsPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkCommonPython
-PYTHON_ENABLE_MODULE_vtkCommonPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkFilteringPython
-PYTHON_ENABLE_MODULE_vtkFilteringPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkGenericFilteringPython
-PYTHON_ENABLE_MODULE_vtkGenericFilteringPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkGeovisPython
-PYTHON_ENABLE_MODULE_vtkGeovisPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkGraphicsPython
-PYTHON_ENABLE_MODULE_vtkGraphicsPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkHybridPython
-PYTHON_ENABLE_MODULE_vtkHybridPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkIOPython
-PYTHON_ENABLE_MODULE_vtkIOPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkImagingPython
-PYTHON_ENABLE_MODULE_vtkImagingPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkInfovisPython
-PYTHON_ENABLE_MODULE_vtkInfovisPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkRenderingPython
-PYTHON_ENABLE_MODULE_vtkRenderingPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkViewsPython
-PYTHON_ENABLE_MODULE_vtkViewsPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkVolumeRenderingPython
-PYTHON_ENABLE_MODULE_vtkVolumeRenderingPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkWidgetsPython
-PYTHON_ENABLE_MODULE_vtkWidgetsPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_EXECUTABLE
-PYTHON_EXECUTABLE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_EXTRA_LIBS
-PYTHON_EXTRA_LIBS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_INCLUDE_DIR
-PYTHON_INCLUDE_DIR-ADVANCED:INTERNAL=1
-//Path to where Python.h is found (deprecated)
-PYTHON_INCLUDE_PATH:INTERNAL=@PREFIX_PATH@/Python.framework/Headers
-//ADVANCED property for variable: PYTHON_LIBRARY
-PYTHON_LIBRARY-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: PYTHON_LIBRARY
-PYTHON_LIBRARY-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: PYTHON_MODULE_vtkChartsPython_BUILD_SHARED
-PYTHON_MODULE_vtkChartsPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkCommonPython_BUILD_SHARED
-PYTHON_MODULE_vtkCommonPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkFilteringPython_BUILD_SHARED
-PYTHON_MODULE_vtkFilteringPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkGenericFilteringPython_BUILD_SHARED
-PYTHON_MODULE_vtkGenericFilteringPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkGeovisPython_BUILD_SHARED
-PYTHON_MODULE_vtkGeovisPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkGraphicsPython_BUILD_SHARED
-PYTHON_MODULE_vtkGraphicsPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkHybridPython_BUILD_SHARED
-PYTHON_MODULE_vtkHybridPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkIOPython_BUILD_SHARED
-PYTHON_MODULE_vtkIOPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkImagingPython_BUILD_SHARED
-PYTHON_MODULE_vtkImagingPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkInfovisPython_BUILD_SHARED
-PYTHON_MODULE_vtkInfovisPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkRenderingPython_BUILD_SHARED
-PYTHON_MODULE_vtkRenderingPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkViewsPython_BUILD_SHARED
-PYTHON_MODULE_vtkViewsPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkVolumeRenderingPython_BUILD_SHARED
-PYTHON_MODULE_vtkVolumeRenderingPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkWidgetsPython_BUILD_SHARED
-PYTHON_MODULE_vtkWidgetsPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_UTIL_LIBRARY
-PYTHON_UTIL_LIBRARY-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: SCPCOMMAND
-SCPCOMMAND-ADVANCED:INTERNAL=1
-//Result of TRY_COMPILE
-SHARED_LIBRARY_PATH_INFO_COMPILED:INTERNAL=TRUE
-//Result of TRY_RUN
-SHARED_LIBRARY_PATH_TYPE:INTERNAL=0
-//runtime library path variable name.
-SHARED_LIBRARY_PATH_VAR_NAME:INTERNAL=DYLD_LIBRARY_PATH
-//ADVANCED property for variable: SITE
-SITE-ADVANCED:INTERNAL=1
-//Result of CHECK_TYPE_SIZE
-SIZEOF_DOUBLE:INTERNAL=8
-//Result of CHECK_TYPE_SIZE
-SIZEOF_FLOAT:INTERNAL=4
-//Result of CHECK_TYPE_SIZE
-SIZEOF_INT:INTERNAL=4
-//Result of CHECK_TYPE_SIZE
-SIZEOF_LONG:INTERNAL=8
-//Result of CHECK_TYPE_SIZE
-SIZEOF_OFF_T:INTERNAL=8
-//Result of CHECK_TYPE_SIZE
-SIZEOF_PTRDIFF_T:INTERNAL=8
-//Result of CHECK_TYPE_SIZE
-SIZEOF_SHORT:INTERNAL=2
-//Result of CHECK_TYPE_SIZE
-SIZEOF_SIZE_T:INTERNAL=8
-//Result of CHECK_TYPE_SIZE
-SIZEOF_SSIZE_T:INTERNAL=8
-//Result of CHECK_TYPE_SIZE
-SIZEOF_UCHAR:INTERNAL=
-//ADVANCED property for variable: SLURM_SBATCH_COMMAND
-SLURM_SBATCH_COMMAND-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: SLURM_SRUN_COMMAND
-SLURM_SRUN_COMMAND-ADVANCED:INTERNAL=1
-//Have include STDC_HEADERS
-STDC_HEADERS:INTERNAL=1
-//Result of TRY_COMPILE
-SUPPORT_IP6_COMPILED:INTERNAL=TRUE
-//ADVANCED property for variable: SVNCOMMAND
-SVNCOMMAND-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: TCL_INCLUDE_PATH
-TCL_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: TCL_INCLUDE_PATH
-TCL_INCLUDE_PATH-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: TCL_LIBRARY
-TCL_LIBRARY-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: TCL_LIBRARY
-TCL_LIBRARY-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: TCL_TCLSH
-TCL_TCLSH-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: TCL_TCLSH
-TCL_TCLSH-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: TK_INCLUDE_PATH
-TK_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: TK_INCLUDE_PATH
-TK_INCLUDE_PATH-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: TK_INTERNAL_PATH
-TK_INTERNAL_PATH-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: TK_INTERNAL_PATH
-TK_INTERNAL_PATH-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: TK_LIBRARY
-TK_LIBRARY-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: TK_LIBRARY
-TK_LIBRARY-MODIFIED:INTERNAL=ON
-//This value is not used by VTK.
-TK_WISH:INTERNAL=/usr/bin/wish
-//ADVANCED property for variable: VERDICT_BUILD_DOC
-VERDICT_BUILD_DOC-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VERDICT_ENABLE_TESTING
-VERDICT_ENABLE_TESTING-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VERDICT_MANGLE
-VERDICT_MANGLE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VERDICT_MANGLE_PREFIX
-VERDICT_MANGLE_PREFIX-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VERDICT_USE_FLOAT
-VERDICT_USE_FLOAT-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VLI_LIBRARY_FOR_VP1000
-VLI_LIBRARY_FOR_VP1000-ADVANCED:INTERNAL=1
-//Result of TRY_COMPILE
-VTK_ANSI_STREAM_EOF_COMPILED:INTERNAL=TRUE
-//Result of TRY_RUN
-VTK_ANSI_STREAM_EOF_RESULT:INTERNAL=0
-//Support for C++ type bool
-VTK_COMPILER_HAS_BOOL:INTERNAL=1
-//Support for full template specialization syntax
-VTK_COMPILER_HAS_FULL_SPECIALIZATION:INTERNAL=1
-//ADVANCED property for variable: VTK_DEBUG_LEAKS
-VTK_DEBUG_LEAKS-ADVANCED:INTERNAL=1
-//The directory in which code for Shaders is provided.
-VTK_DEFAULT_SHADERS_DIR:INTERNAL=@BUILD_DIR@/VTK-build/Utilities/MaterialLibrary/Repository
-//String encoder.
-VTK_ENCODESTRING_EXE:INTERNAL=@BUILD_DIR@/VTK-build/bin/vtkEncodeString
-//Support for C++ explict templates
-VTK_EXPLICIT_TEMPLATES:INTERNAL=1
-//ADVANCED property for variable: VTK_GLEXT_FILE
-VTK_GLEXT_FILE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_GLXEXT_FILE
-VTK_GLXEXT_FILE-ADVANCED:INTERNAL=1
-//Have symbol feenableexcept
-VTK_HAS_FEENABLEEXCEPT:INTERNAL=
-//Have symbol isinf
-VTK_HAS_ISINF:INTERNAL=
-//Have symbol isnan
-VTK_HAS_ISNAN:INTERNAL=
-//Have symbol _isnan
-VTK_HAS__ISNAN:INTERNAL=
-//Have include iosfwd
-VTK_HAVE_ANSI_STREAMS:INTERNAL=1
-//Support for getsockname with socklen_t
-VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T:INTERNAL=1
-//Have library socket
-VTK_HAVE_LIBSOCKET:INTERNAL=
-//Have include iostream.h
-VTK_HAVE_OLD_STREAMS:INTERNAL=1
-//Have include strstream.h
-VTK_HAVE_OLD_STRSTREAM_H:INTERNAL=
-//Have include strstrea.h
-VTK_HAVE_OLD_STRSTREA_H:INTERNAL=
-//Have symbol SO_REUSEADDR
-VTK_HAVE_SO_REUSEADDR:INTERNAL=1
-//Whether istream supports long long
-VTK_ISTREAM_SUPPORTS_LONG_LONG:INTERNAL=1
-//ADVANCED property for variable: VTK_LEGACY_REMOVE
-VTK_LEGACY_REMOVE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_LEGACY_SILENT
-VTK_LEGACY_SILENT-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_MATERIALS_DIRS
-VTK_MATERIALS_DIRS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_NO_PYTHON_THREADS
-VTK_NO_PYTHON_THREADS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_OPENGL_HAS_OSMESA
-VTK_OPENGL_HAS_OSMESA-ADVANCED:INTERNAL=1
-//Whether ostream supports long long
-VTK_OSTREAM_SUPPORTS_LONG_LONG:INTERNAL=1
-//OpenGL extensions parser.
-VTK_PARSEOGLEXT_EXE:INTERNAL=@BUILD_DIR@/VTK-build/bin/vtkParseOGLExt
-//Install directory for Python .py and .pyc files
-VTK_PYTHON_MODULE_INSTALL_DIR:INTERNAL=${CMAKE_INSTALL_PREFIX}/lib/python@PYVER@/site-packages
-//Install directory for Python binary modules
-VTK_PYTHON_MODULE_PLATFORM_INSTALL_DIR:INTERNAL=${CMAKE_INSTALL_PREFIX}/lib/python@PYVER@/site-packages
-//ADVANCED property for variable: VTK_PYTHON_SETUP_ARGS
-VTK_PYTHON_SETUP_ARGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_REQUIRED_OBJCXX_FLAGS
-VTK_REQUIRED_OBJCXX_FLAGS-ADVANCED:INTERNAL=1
-//Result of CHECK_TYPE_SIZE
-VTK_SIZEOF_LONG_LONG:INTERNAL=8
-//Result of CHECK_TYPE_SIZE
-VTK_SIZEOF___INT64:INTERNAL=
-//Very few users should worry about this option. If VTK is built
-// against a static Tcl/Tk lib (see VTK_TCL_TK_STATIC) or a shared
-// Tcl/Tk bundled inside a project with no library support files
-// (ex: ParaViewComplete), this variable should be set to ON and
-// both VTK_TCL_SUPPORT_LIBRARY_PATH and VTK_TK_SUPPORT_LIBRARY_PATH
-// should point to the directories that hold those files (typically,
-// lib/tcl8.4 and lib/tk8.4 for a typical Tcl/Tk installation,
-// or tcl8.4.5/library and tk8.4.5/library for a Tcl/Tk source
-// repository). Once this variable is set to ON, support files
-// will automatically be copied to the build directory and the
-// executables will try to use that location to initialize Tcl/Tk.
-VTK_TCL_TK_COPY_SUPPORT_LIBRARY:INTERNAL=
-//ADVANCED property for variable: VTK_TESTING_LOCALE
-VTK_TESTING_LOCALE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_TESTING_USE_FPE
-VTK_TESTING_USE_FPE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_TESTING_USE_LOCALE
-VTK_TESTING_USE_LOCALE-ADVANCED:INTERNAL=1
-//Whether char is signed.
-VTK_TYPE_CHAR_IS_SIGNED:INTERNAL=1
-//Result of TRY_COMPILE
-VTK_TYPE_CHAR_IS_SIGNED_COMPILED:INTERNAL=TRUE
-//Result of CHECK_TYPE_SIZE
-VTK_UINTPTR_T:INTERNAL=8
-//ADVANCED property for variable: VTK_USE_64BIT_IDS
-VTK_USE_64BIT_IDS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_BOOST
-VTK_USE_BOOST-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_CG_SHADERS
-VTK_USE_CG_SHADERS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_DISPLAY
-VTK_USE_DISPLAY-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_FFMPEG_ENCODER
-VTK_USE_FFMPEG_ENCODER-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_GCC_VISIBILITY
-VTK_USE_GCC_VISIBILITY-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_GL2PS
-VTK_USE_GL2PS-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: VTK_USE_GL2PS
-VTK_USE_GL2PS-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: VTK_USE_GLSL_SHADERS
-VTK_USE_GLSL_SHADERS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_GNU_R
-VTK_USE_GNU_R-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_GUISUPPORT
-VTK_USE_GUISUPPORT-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_MANGLED_MESA
-VTK_USE_MANGLED_MESA-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_MATLAB_MEX
-VTK_USE_MATLAB_MEX-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_METAIO
-VTK_USE_METAIO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_MPEG2_ENCODER
-VTK_USE_MPEG2_ENCODER-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_MYSQL
-VTK_USE_MYSQL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_ODBC
-VTK_USE_ODBC-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_OGGTHEORA_ENCODER
-VTK_USE_OGGTHEORA_ENCODER-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_OPENFOAM
-VTK_USE_OPENFOAM-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_POSTGRES
-VTK_USE_POSTGRES-ADVANCED:INTERNAL=1
-//Build QVTK widget and plugin for Qt
-VTK_USE_QVTK:INTERNAL=OFF
-//ADVANCED property for variable: VTK_USE_RPATH
-VTK_USE_RPATH-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: VTK_USE_RPATH
-VTK_USE_RPATH-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: VTK_USE_SYSTEM_EXPAT
-VTK_USE_SYSTEM_EXPAT-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_SYSTEM_FREETYPE
-VTK_USE_SYSTEM_FREETYPE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_SYSTEM_GL2PS
-VTK_USE_SYSTEM_GL2PS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_SYSTEM_JPEG
-VTK_USE_SYSTEM_JPEG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_SYSTEM_LIBPROJ4
-VTK_USE_SYSTEM_LIBPROJ4-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_SYSTEM_LIBXML2
-VTK_USE_SYSTEM_LIBXML2-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_SYSTEM_PNG
-VTK_USE_SYSTEM_PNG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_SYSTEM_TIFF
-VTK_USE_SYSTEM_TIFF-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_SYSTEM_ZLIB
-VTK_USE_SYSTEM_ZLIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_TDX
-VTK_USE_TDX-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_TK
-VTK_USE_TK-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: VTK_USE_TK
-VTK_USE_TK-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: VTK_USE_VOLUMEPRO_1000
-VTK_USE_VOLUMEPRO_1000-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_WGLEXT_FILE
-VTK_WGLEXT_FILE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_WRAP_HINTS
-VTK_WRAP_HINTS-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: VTK_WRAP_PYTHON
-VTK_WRAP_PYTHON-MODIFIED:INTERNAL=ON
-//Location of program to do Python wrapping
-VTK_WRAP_PYTHON_EXE:INTERNAL=@BUILD_DIR@/VTK-build/bin/vtkWrapPython
-//Location of program to do Python wrapping
-VTK_WRAP_PYTHON_INIT_EXE:INTERNAL=@BUILD_DIR@/VTK-build/bin/vtkWrapPythonInit
-//ADVANCED property for variable: X11_ICE_INCLUDE_PATH
-X11_ICE_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_ICE_LIB
-X11_ICE_LIB-ADVANCED:INTERNAL=1
-//Have library /usr/X11R6/lib/libX11.dylib;/usr/X11R6/lib/libXext.dylib
-X11_LIB_X11_SOLO:INTERNAL=1
-//ADVANCED property for variable: X11_SM_LIB
-X11_SM_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_X11_INCLUDE_PATH
-X11_X11_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_X11_LIB
-X11_X11_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_XShm_INCLUDE_PATH
-X11_XShm_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_XTest_INCLUDE_PATH
-X11_XTest_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_XTest_LIB
-X11_XTest_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xaccessrules_INCLUDE_PATH
-X11_Xaccessrules_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xaccessstr_INCLUDE_PATH
-X11_Xaccessstr_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xau_INCLUDE_PATH
-X11_Xau_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xau_LIB
-X11_Xau_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xcomposite_INCLUDE_PATH
-X11_Xcomposite_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xcomposite_LIB
-X11_Xcomposite_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xcursor_INCLUDE_PATH
-X11_Xcursor_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xcursor_LIB
-X11_Xcursor_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xdamage_INCLUDE_PATH
-X11_Xdamage_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xdamage_LIB
-X11_Xdamage_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xdmcp_INCLUDE_PATH
-X11_Xdmcp_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xdmcp_LIB
-X11_Xdmcp_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xext_LIB
-X11_Xext_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xfixes_INCLUDE_PATH
-X11_Xfixes_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xfixes_LIB
-X11_Xfixes_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xft_INCLUDE_PATH
-X11_Xft_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xft_LIB
-X11_Xft_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xinerama_INCLUDE_PATH
-X11_Xinerama_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xinerama_LIB
-X11_Xinerama_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xinput_INCLUDE_PATH
-X11_Xinput_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xinput_LIB
-X11_Xinput_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xkb_INCLUDE_PATH
-X11_Xkb_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xkblib_INCLUDE_PATH
-X11_Xkblib_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xlib_INCLUDE_PATH
-X11_Xlib_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xpm_INCLUDE_PATH
-X11_Xpm_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xpm_LIB
-X11_Xpm_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xrandr_INCLUDE_PATH
-X11_Xrandr_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xrandr_LIB
-X11_Xrandr_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xrender_INCLUDE_PATH
-X11_Xrender_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xrender_LIB
-X11_Xrender_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xscreensaver_INCLUDE_PATH
-X11_Xscreensaver_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xscreensaver_LIB
-X11_Xscreensaver_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xshape_INCLUDE_PATH
-X11_Xshape_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xt_INCLUDE_PATH
-X11_Xt_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xt_LIB
-X11_Xt_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xutil_INCLUDE_PATH
-X11_Xutil_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xv_INCLUDE_PATH
-X11_Xv_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xv_LIB
-X11_Xv_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xxf86misc_LIB
-X11_Xxf86misc_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_dpms_INCLUDE_PATH
-X11_dpms_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_xf86misc_INCLUDE_PATH
-X11_xf86misc_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_xf86vmode_INCLUDE_PATH
-X11_xf86vmode_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//Already complained about update type.
-__CTEST_UPDATE_TYPE_COMPLAINED:INTERNAL=1
-//Have function _isinf
-float.h:INTERNAL=
-
diff --git a/exsrc/src/CMakeCache.txt.mac.in b/exsrc/src/CMakeCache.txt.mac.in
deleted file mode 100644
index 15a056b28..000000000
--- a/exsrc/src/CMakeCache.txt.mac.in
+++ /dev/null
@@ -1,1965 +0,0 @@
-# This is the CMakeCache file.
-# For build in directory: @BUILD_DIR@/VTK-build
-# It was generated by CMake: cmake
-# You can edit this file to change values found and used by cmake.
-# If you do not want to change any of the values, simply exit the editor.
-# If you do want to change a value, simply edit, save, and exit the editor.
-# The syntax for the file is as follows:
-# KEY:TYPE=VALUE
-# KEY is the name of a variable in the cache.
-# TYPE is a hint to GUI's for the type of VALUE, DO NOT EDIT TYPE!.
-# VALUE is the current value for the KEY.
-
-########################
-# EXTERNAL cache entries
-########################
-
-//Build the documentation (Doxygen).
-BUILD_DOCUMENTATION:BOOL=OFF
-
-//Build VTK examples.
-BUILD_EXAMPLES:BOOL=ON
-
-//Build Verdict with shared libraries.
-BUILD_SHARED_LIBS:BOOL=ON
-
-//Build the testing tree.
-BUILD_TESTING:BOOL=OFF
-
-//Path to a program.
-BZRCOMMAND:FILEPATH=BZRCOMMAND-NOTFOUND
-
-//Path to a program.
-CMAKE_AR:FILEPATH=/usr/bin/ar
-
-//For backwards compatibility, what version of CMake commands and
-// syntax should this version of CMake try to support.
-CMAKE_BACKWARDS_COMPATIBILITY:STRING=2.4
-
-//Choose the type of build, options are: None(CMAKE_CXX_FLAGS or
-// CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.
-CMAKE_BUILD_TYPE:STRING=
-
-//Enable/Disable color output during build.
-CMAKE_COLOR_MAKEFILE:BOOL=ON
-
-//CXX compiler.
-CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/c++
-
-//Flags used by the compiler during all build types.
-CMAKE_CXX_FLAGS:STRING=
-
-//Flags used by the compiler during debug builds.
-CMAKE_CXX_FLAGS_DEBUG:STRING=-g
-
-//Flags used by the compiler during release minsize builds.
-CMAKE_CXX_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG
-
-//Flags used by the compiler during release builds (/MD /Ob1 /Oi
-// /Ot /Oy /Gs will produce slightly less optimized but smaller
-// files).
-CMAKE_CXX_FLAGS_RELEASE:STRING=-O3 -DNDEBUG
-
-//Flags used by the compiler during Release with Debug Info builds.
-CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g
-
-//C compiler.
-CMAKE_C_COMPILER:FILEPATH=/usr/bin/gcc
-
-//Flags used by the compiler during all build types.
-CMAKE_C_FLAGS:STRING=
-
-//Flags used by the compiler during debug builds.
-CMAKE_C_FLAGS_DEBUG:STRING=-g
-
-//Flags used by the compiler during release minsize builds.
-CMAKE_C_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG
-
-//Flags used by the compiler during release builds (/MD /Ob1 /Oi
-// /Ot /Oy /Gs will produce slightly less optimized but smaller
-// files).
-CMAKE_C_FLAGS_RELEASE:STRING=-O3 -DNDEBUG
-
-//Flags used by the compiler during Release with Debug Info builds.
-CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=-O2 -g
-
-//Flags used by the linker.
-CMAKE_EXE_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during debug builds.
-CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during release minsize builds.
-CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during release builds.
-CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during Release with Debug Info builds.
-CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//Use HP pthreads.
-CMAKE_HP_PTHREADS:BOOL=
-
-//Path to a program.
-CMAKE_INSTALL_NAME_TOOL:FILEPATH=/usr/bin/install_name_tool
-
-//Install path prefix, prepended onto install directories.
-CMAKE_INSTALL_PREFIX:PATH=@PREFIX_PATH@
-
-//Path to a program.
-CMAKE_LINKER:FILEPATH=/usr/bin/ld
-
-//Path to a program.
-CMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/make
-
-//Flags used by the linker during the creation of modules.
-CMAKE_MODULE_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during debug builds.
-CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during release minsize builds.
-CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during release builds.
-CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during Release with Debug Info builds.
-CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//Path to a program.
-CMAKE_NM:FILEPATH=/usr/bin/nm
-
-//Path to a program.
-CMAKE_OBJCOPY:FILEPATH=CMAKE_OBJCOPY-NOTFOUND
-
-//Path to a program.
-CMAKE_OBJDUMP:FILEPATH=CMAKE_OBJDUMP-NOTFOUND
-
-//Build architectures for OSX
-CMAKE_OSX_ARCHITECTURES:STRING=
-
-//Minimum OS X version to target for deployment (at runtime); newer
-// APIs weak linked. Set to empty string for default value.
-CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.5
-
-//The product will be built against the headers and libraries located
-// inside the indicated SDK.
-CMAKE_OSX_SYSROOT:PATH=/Developer/SDKs/MacOSX10.5.sdk
-
-//Value Computed by CMake
-CMAKE_PROJECT_NAME:STATIC=VTK
-
-//Path to a program.
-CMAKE_RANLIB:FILEPATH=/usr/bin/ranlib
-
-//Flags used by the linker during the creation of dll's.
-CMAKE_SHARED_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during debug builds.
-CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during release minsize builds.
-CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during release builds.
-CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during Release with Debug Info builds.
-CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//Path to a program.
-CMAKE_STRIP:FILEPATH=/usr/bin/strip
-
-//Thread library used.
-CMAKE_THREAD_LIBS:STRING=-lpthread
-
-//Use the pthreads library.
-CMAKE_USE_PTHREADS:BOOL=1
-
-//If true, cmake will use relative paths in makefiles and projects.
-CMAKE_USE_RELATIVE_PATHS:BOOL=OFF
-
-//Use sproc libs.
-CMAKE_USE_SPROC:BOOL=
-
-//Use the win32 thread library.
-CMAKE_USE_WIN32_THREADS:BOOL=
-
-//If this value is on, makefiles will be generated without the
-// .SILENT directive, and all commands will be echoed to the console
-// during the make.  This is useful for debugging only. With Visual
-// Studio IDE projects all commands are done without /nologo.
-CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE
-
-//X11 extra flags.
-CMAKE_X_CFLAGS:STRING=
-
-//Libraries and options used in X11 programs.
-CMAKE_X_LIBS:STRING=/usr/X11R6/lib/libSM.dylib;/usr/X11R6/lib/libICE.dylib;/usr/X11R6/lib/libX11.dylib;/usr/X11R6/lib/libXext.dylib
-
-//Path to the coverage program that CTest uses for performing coverage
-// inspection
-COVERAGE_COMMAND:FILEPATH=/usr/bin/gcov
-
-//Path to a program.
-CVSCOMMAND:FILEPATH=/usr/bin/cvs
-
-//Options passed to the cvs update command.
-CVS_UPDATE_OPTIONS:STRING=-d -A -P
-
-//Maximum time allowed before CTest will kill the test.
-DART_TESTING_TIMEOUT:STRING=1500
-
-//Value Computed by CMake
-DICOMParser_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/DICOMParser
-
-//Value Computed by CMake
-DICOMParser_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/DICOMParser
-
-//Path to a program.
-HGCOMMAND:FILEPATH=HGCOMMAND-NOTFOUND
-
-//Command used to build entire project from the command line.
-MAKECOMMAND:STRING=/usr/bin/make -i
-
-//Path to the memory checking command, used for memory error detection.
-MEMORYCHECK_COMMAND:FILEPATH=/usr/local/bin/valgrind
-
-//File that contains suppressions for the memory checker
-MEMORYCHECK_SUPPRESSIONS_FILE:FILEPATH=
-
-//Value Computed by CMake
-MaterialLibrary_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/MaterialLibrary
-
-//Value Computed by CMake
-MaterialLibrary_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/MaterialLibrary
-
-//Include for OpenGL on OSX
-OPENGL_INCLUDE_DIR:PATH=/usr/X11R6/include
-
-//OpenGL lib for OSX
-OPENGL_gl_LIBRARY:FILEPATH=/usr/X11R6/lib/libGL.dylib
-
-//AGL lib for OSX
-OPENGL_glu_LIBRARY:FILEPATH=/usr/X11R6/lib/libGLU.dylib
-
-//Path to a file.
-OPENGL_xmesa_INCLUDE_DIR:PATH=/usr/X11R6/include
-
-//Does an external project define proj_list or should libproj4
-// define it?
-PROJ_LIST_EXTERNAL:BOOL=OFF
-
-//Should libproj4 include projection code that relies on GSL?
-PROJ_USE_GSL:BOOL=OFF
-
-//Should libproj4 be built as a thread-friendly library?
-PROJ_USE_PTHREADS:BOOL=OFF
-
-//Path to a library.
-PYTHON_DEBUG_LIBRARY:FILEPATH=/Library/Frameworks/python.framework
-
-//Add module vtkCommonPython
-PYTHON_ENABLE_MODULE_vtkCommonPython:BOOL=ON
-
-//Add module vtkFilteringPython
-PYTHON_ENABLE_MODULE_vtkFilteringPython:BOOL=ON
-
-//Add module vtkGenericFilteringPython
-PYTHON_ENABLE_MODULE_vtkGenericFilteringPython:BOOL=ON
-
-//Add module vtkGeovisPython
-PYTHON_ENABLE_MODULE_vtkGeovisPython:BOOL=ON
-
-//Add module vtkGraphicsPython
-PYTHON_ENABLE_MODULE_vtkGraphicsPython:BOOL=ON
-
-//Add module vtkHybridPython
-PYTHON_ENABLE_MODULE_vtkHybridPython:BOOL=ON
-
-//Add module vtkIOPython
-PYTHON_ENABLE_MODULE_vtkIOPython:BOOL=ON
-
-//Add module vtkImagingPython
-PYTHON_ENABLE_MODULE_vtkImagingPython:BOOL=ON
-
-//Add module vtkInfovisPython
-PYTHON_ENABLE_MODULE_vtkInfovisPython:BOOL=ON
-
-//Add module vtkRenderingPython
-PYTHON_ENABLE_MODULE_vtkRenderingPython:BOOL=ON
-
-//Add module vtkViewsPython
-PYTHON_ENABLE_MODULE_vtkViewsPython:BOOL=ON
-
-//Add module vtkVolumeRenderingPython
-PYTHON_ENABLE_MODULE_vtkVolumeRenderingPython:BOOL=ON
-
-//Add module vtkWidgetsPython
-PYTHON_ENABLE_MODULE_vtkWidgetsPython:BOOL=ON
-
-//Path to a program.
-PYTHON_EXECUTABLE:FILEPATH=@PREFIX_PATH@/bin/python@PYVER@
-
-//Extra libraries to link when linking to python (such as "z" for
-// zlib).  Separate multiple libraries with semicolons.
-PYTHON_EXTRA_LIBS:STRING=
-
-//Path to a file.
-PYTHON_INCLUDE_PATH:PATH=@PREFIX_PATH@/include/python@PYVER@
-
-//Path to a library.
-PYTHON_LIBRARY:FILEPATH=@PREFIX_PATH@/lib/libpython@PYVER@.dylib
-
-//Add module vtkCommonPython shared
-PYTHON_MODULE_vtkCommonPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkFilteringPython shared
-PYTHON_MODULE_vtkFilteringPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkGenericFilteringPython shared
-PYTHON_MODULE_vtkGenericFilteringPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkGeovisPython shared
-PYTHON_MODULE_vtkGeovisPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkGraphicsPython shared
-PYTHON_MODULE_vtkGraphicsPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkHybridPython shared
-PYTHON_MODULE_vtkHybridPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkIOPython shared
-PYTHON_MODULE_vtkIOPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkImagingPython shared
-PYTHON_MODULE_vtkImagingPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkInfovisPython shared
-PYTHON_MODULE_vtkInfovisPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkRenderingPython shared
-PYTHON_MODULE_vtkRenderingPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkViewsPython shared
-PYTHON_MODULE_vtkViewsPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkVolumeRenderingPython shared
-PYTHON_MODULE_vtkVolumeRenderingPython_BUILD_SHARED:BOOL=ON
-
-//Add module vtkWidgetsPython shared
-PYTHON_MODULE_vtkWidgetsPython_BUILD_SHARED:BOOL=ON
-
-//Utility library needed for vtkpython
-PYTHON_UTIL_LIBRARY:FILEPATH=/usr/lib/libutil.dylib
-
-//Path to scp command, used by CTest for submitting results to
-// a Dart server
-SCPCOMMAND:FILEPATH=/usr/bin/scp
-
-//Name of the computer/site where compile is being run
-SITE:STRING=omar
-
-//Path to the SLURM sbatch executable
-SLURM_SBATCH_COMMAND:FILEPATH=SLURM_SBATCH_COMMAND-NOTFOUND
-
-//Path to the SLURM srun executable
-SLURM_SRUN_COMMAND:FILEPATH=SLURM_SRUN_COMMAND-NOTFOUND
-
-//Path to a program.
-SVNCOMMAND:FILEPATH=svn
-
-//Path to a file.
-TCL_INCLUDE_PATH:PATH=@EXTERNALS@/include
-
-//Path to a library.
-TCL_LIBRARY:FILEPATH=@EXTERNALS@/lib/libtcl@TCLTK_VERSION@.dylib
-
-//Path to a program.
-TCL_TCLSH:FILEPATH=@EXTERNALS@/bin/tclsh@TCLTK_VERSION@
-
-//Path to a file.
-TK_INCLUDE_PATH:PATH=@EXTERNALS@/include
-
-//The path to the Tk internal headers (tkMacOSXDefault.h).
-TK_INTERNAL_PATH:PATH=@BUILD_DIR@/VTK/Utilities/TclTk/internals/tk8.4
-
-//Path to a library.
-TK_LIBRARY:FILEPATH=@EXTERNALS@/lib/libtk@TCLTK_VERSION@.dylib
-
-//Build the 2007 Verdict User Manual
-VERDICT_BUILD_DOC:BOOL=OFF
-
-//Should tests of the VERDICT library be built?
-VERDICT_ENABLE_TESTING:BOOL=OFF
-
-//Mangle verdict names for inclusion in a larger library?
-VERDICT_MANGLE:BOOL=ON
-
-//VTK requires the verdict prefix to be vtk
-VERDICT_MANGLE_PREFIX:STRING=vtk
-
-//VTK requires doubles
-VERDICT_USE_FLOAT:BOOL=OFF
-
-//Path to a library.
-VLI_LIBRARY_FOR_VP1000:FILEPATH=VLI_LIBRARY_FOR_VP1000-NOTFOUND
-
-//Value Computed by CMake
-VTKEXPAT_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtkexpat
-
-//Value Computed by CMake
-VTKEXPAT_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtkexpat
-
-//Value Computed by CMake
-VTKFREETYPE_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtkfreetype
-
-//Value Computed by CMake
-VTKFREETYPE_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtkfreetype
-
-//Value Computed by CMake
-VTKFTGL_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/ftgl
-
-//Value Computed by CMake
-VTKFTGL_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/ftgl
-
-//Value Computed by CMake
-VTKJPEG_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtkjpeg
-
-//Value Computed by CMake
-VTKJPEG_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtkjpeg
-
-//Value Computed by CMake
-VTKNETCDF_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtknetcdf
-
-//Value Computed by CMake
-VTKNETCDF_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtknetcdf
-
-//Value Computed by CMake
-VTKPNG_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtkpng
-
-//Value Computed by CMake
-VTKPNG_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtkpng
-
-//Value Computed by CMake
-VTKTIFF_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtktiff
-
-//Value Computed by CMake
-VTKTIFF_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtktiff
-
-//Value Computed by CMake
-VTKZLIB_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtkzlib
-
-//Value Computed by CMake
-VTKZLIB_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtkzlib
-
-//Value Computed by CMake
-VTK_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build
-
-//Path to a file.
-VTK_DATA_ROOT:PATH=@BUILD_DIR@/VTKData
-
-//Build leak checking support into VTK.
-VTK_DEBUG_LEAKS:BOOL=OFF
-
-//Location of the OpenGL extensions header file (glext.h).
-VTK_GLEXT_FILE:FILEPATH=@BUILD_DIR@/VTK/Utilities/ParseOGLExt/headers/glext.h
-
-//Location of the GLX extensions header file (glxext.h).
-VTK_GLXEXT_FILE:FILEPATH=@BUILD_DIR@/VTK/Utilities/ParseOGLExt/headers/glxext.h
-
-//Remove all legacy code completely.
-VTK_LEGACY_REMOVE:BOOL=OFF
-
-//Silence all legacy code messages.
-VTK_LEGACY_SILENT:BOOL=OFF
-
-//; separated directories to search for materials/shaders
-VTK_MATERIALS_DIRS:STRING=@BUILD_DIR@/VTK-build/Utilities/MaterialLibrary/Repository
-
-//Disable multithreading support in the Python bindings
-VTK_NO_PYTHON_THREADS:BOOL=OFF
-
-//The opengl library being used supports off screen Mesa calls.
-VTK_OPENGL_HAS_OSMESA:BOOL=OFF
-
-//Arguments passed to "python setup.py install ..." during installation.
-VTK_PYTHON_SETUP_ARGS:STRING=--prefix="${CMAKE_INSTALL_PREFIX}"
-
-//Value Computed by CMake
-VTK_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK
-
-//VTK tests call vtkFloatingPointExceptions::Enable()
-VTK_TESTING_USE_FPE:BOOL=ON
-
-//Build VTK with 64 bit ids
-VTK_USE_64BIT_IDS:BOOL=OFF
-
-//Use Boost libraries for graph algorithms - www.boost.org.
-VTK_USE_BOOST:BOOL=OFF
-
-//Build classes using Carbon API.
-VTK_USE_CARBON:BOOL=OFF
-
-//Build pixel and vertex shader support for Cg.
-VTK_USE_CG_SHADERS:BOOL=OFF
-
-//Build classes using Cocoa API.
-VTK_USE_COCOA:BOOL=OFF
-
-//Turn this option off and tests and warning/error macros will
-// not popup windows
-VTK_USE_DISPLAY:BOOL=ON
-
-//If the FFMPEG library is available, should VTK use it for saving
-// .avi animation files?
-VTK_USE_FFMPEG_ENCODER:BOOL=OFF
-
-//Build the vtkGeovis kit.  Needed for performing geographic visualization.
-VTK_USE_GEOVIS:BOOL=ON
-
-//Build VTK with gl2ps support.
-VTK_USE_GL2PS:BOOL=ON
-
-//Build pixel and vertex shader support for GLSL.
-VTK_USE_GLSL_SHADERS:BOOL=ON
-
-//Build VTK with GUI Support
-VTK_USE_GUISUPPORT:BOOL=OFF
-
-//Build the vtkInfovis kit.  Needed for performing information
-// visualization.
-VTK_USE_INFOVIS:BOOL=ON
-
-//Use mangled Mesa with OpenGL.
-VTK_USE_MANGLED_MESA:BOOL=OFF
-
-//Build metaio
-VTK_USE_METAIO:BOOL=ON
-
-//Enable use of the patented mpeg2 library. You are solely responsible
-// for any legal issues associated with using patented code in
-// your software.
-VTK_USE_MPEG2_ENCODER:BOOL=OFF
-
-//Build the MySQL driver for vtkSQLDatabase.
-VTK_USE_MYSQL:BOOL=OFF
-
-//Add support for arbitrary-dimension sparse and dense arrays.
-VTK_USE_N_WAY_ARRAYS:BOOL=OFF
-
-//Build the ODBC database interface
-VTK_USE_ODBC:BOOL=OFF
-
-//Build the vtkParallel kit.
-VTK_USE_PARALLEL:BOOL=OFF
-
-//Build the PostgreSQL driver for vtkSQLDatabase.
-VTK_USE_POSTGRES:BOOL=OFF
-
-//Build the vtkRendering kit.  Needed for displaying data or using
-// widgets.
-VTK_USE_RENDERING:BOOL=ON
-
-//Build shared libraries with rpath.  This makes it easy to run
-// executables from the build tree when using shared libraries,
-// but removes install support.
-VTK_USE_RPATH:BOOL=ON
-
-//Use the system's expat library.
-VTK_USE_SYSTEM_EXPAT:BOOL=OFF
-
-//Use the system's freetype library.
-VTK_USE_SYSTEM_FREETYPE:BOOL=OFF
-
-//Use the system's jpeg library.
-VTK_USE_SYSTEM_JPEG:BOOL=OFF
-
-//Use the system's proj4 library.
-VTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF
-
-//Use the system's libxml2 library.
-VTK_USE_SYSTEM_LIBXML2:BOOL=OFF
-
-//Use the system's png library.
-VTK_USE_SYSTEM_PNG:BOOL=OFF
-
-//Use the system's tiff library.
-VTK_USE_SYSTEM_TIFF:BOOL=OFF
-
-//Use the system's zlib library.
-VTK_USE_SYSTEM_ZLIB:BOOL=OFF
-
-//Build VTK with Tk support
-VTK_USE_TK:BOOL=ON
-
-//Build the vtkViews kit.  Needed for creating packaged and linked
-// views.
-VTK_USE_VIEWS:BOOL=ON
-
-//Enable support for VolumePro 1000.
-VTK_USE_VOLUMEPRO_1000:BOOL=OFF
-
-//Build classes for the X11 window system.
-VTK_USE_X:BOOL=ON
-
-//Location of the WGL extensions header file (wglext.h).
-VTK_WGLEXT_FILE:FILEPATH=@BUILD_DIR@/VTK/Utilities/ParseOGLExt/headers/wglext.h
-
-//Path to a file.
-VTK_WRAP_HINTS:FILEPATH=@BUILD_DIR@/VTK/Wrapping/hints
-
-//Wrap VTK classes into the Java language.
-VTK_WRAP_JAVA:BOOL=OFF
-
-//Wrap VTK classes into the Python language.
-VTK_WRAP_PYTHON:BOOL=ON
-
-//Wrap VTK classes into the TCL language.
-VTK_WRAP_TCL:BOOL=OFF
-
-//Path to a file.
-X11_ICE_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_ICE_LIB:FILEPATH=/usr/X11R6/lib/libICE.dylib
-
-//Path to a library.
-X11_SM_LIB:FILEPATH=/usr/X11R6/lib/libSM.dylib
-
-//Path to a file.
-X11_X11_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_X11_LIB:FILEPATH=/usr/X11R6/lib/libX11.dylib
-
-//Path to a file.
-X11_XShm_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_XTest_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_XTest_LIB:FILEPATH=/usr/X11R6/lib/libXtst.dylib
-
-//Path to a file.
-X11_Xaccessrules_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_Xaccessstr_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_Xau_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xau_LIB:FILEPATH=/usr/X11R6/lib/libXau.dylib
-
-//Path to a file.
-X11_Xcomposite_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xcomposite_LIB:FILEPATH=/usr/X11R6/lib/libXcomposite.dylib
-
-//Path to a file.
-X11_Xcursor_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xcursor_LIB:FILEPATH=/usr/X11R6/lib/libXcursor.dylib
-
-//Path to a file.
-X11_Xdamage_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xdamage_LIB:FILEPATH=/usr/X11R6/lib/libXdamage.dylib
-
-//Path to a file.
-X11_Xdmcp_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xdmcp_LIB:FILEPATH=/usr/X11R6/lib/libXdmcp.dylib
-
-//Path to a library.
-X11_Xext_LIB:FILEPATH=/usr/X11R6/lib/libXext.dylib
-
-//Path to a file.
-X11_Xfixes_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xfixes_LIB:FILEPATH=/usr/X11R6/lib/libXfixes.dylib
-
-//Path to a file.
-X11_Xft_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xft_LIB:FILEPATH=/usr/X11R6/lib/libXft.dylib
-
-//Path to a file.
-X11_Xinerama_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xinerama_LIB:FILEPATH=/usr/X11R6/lib/libXinerama.dylib
-
-//Path to a file.
-X11_Xinput_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xinput_LIB:FILEPATH=/usr/X11R6/lib/libXi.dylib
-
-//Path to a file.
-X11_Xkb_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_Xkblib_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_Xlib_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_Xpm_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xpm_LIB:FILEPATH=/usr/X11R6/lib/libXpm.dylib
-
-//Path to a file.
-X11_Xrandr_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xrandr_LIB:FILEPATH=/usr/X11R6/lib/libXrandr.dylib
-
-//Path to a file.
-X11_Xrender_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xrender_LIB:FILEPATH=/usr/X11R6/lib/libXrender.dylib
-
-//Path to a file.
-X11_Xscreensaver_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xscreensaver_LIB:FILEPATH=/usr/X11R6/lib/libXss.dylib
-
-//Path to a file.
-X11_Xshape_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_Xt_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xt_LIB:FILEPATH=/usr/X11R6/lib/libXt.dylib
-
-//Path to a file.
-X11_Xutil_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_Xv_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_Xv_LIB:FILEPATH=/usr/X11R6/lib/libXv.dylib
-
-//Path to a library.
-X11_Xxf86misc_LIB:FILEPATH=/usr/X11R6/lib/libXxf86misc.dylib
-
-//Path to a file.
-X11_dpms_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a library.
-X11_fontconfig_LIB:FILEPATH=/usr/X11R6/lib/libfontconfig.dylib
-
-//Path to a file.
-X11_xf86misc_INCLUDE_PATH:PATH=/usr/include
-
-//Path to a file.
-X11_xf86vmode_INCLUDE_PATH:PATH=/usr/include
-
-//Value Computed by CMake
-alglib_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtkalglib
-
-//Value Computed by CMake
-alglib_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtkalglib
-
-//Value Computed by CMake
-libproj4_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtklibproj4
-
-//Value Computed by CMake
-libproj4_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtklibproj4
-
-//Value Computed by CMake
-verdict_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/verdict
-
-//Value Computed by CMake
-verdict_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/verdict
-
-//Dependencies for the target
-vtkCommonPythonD_LIB_DEPENDS:STATIC=general;vtkCommon;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkCommonPython_LIB_DEPENDS:STATIC=general;vtkCommonPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkCommon_LIB_DEPENDS:STATIC=general;vtksys;general;-lpthread;general;-lm;
-
-//Dependencies for target
-vtkDICOMParser_LIB_DEPENDS:STATIC=
-
-//Value Computed by CMake
-vtkExodus2_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtkexodus2
-
-//Value Computed by CMake
-vtkExodus2_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtkexodus2
-
-//Dependencies for the target
-vtkFilteringPythonD_LIB_DEPENDS:STATIC=general;vtkFiltering;general;vtkCommonPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkFilteringPython_LIB_DEPENDS:STATIC=general;vtkFilteringPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkFiltering_LIB_DEPENDS:STATIC=general;vtkCommon;
-
-//Dependencies for the target
-vtkGenericFilteringPythonD_LIB_DEPENDS:STATIC=general;vtkGenericFiltering;general;vtkFilteringPythonD;general;vtkGraphicsPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkGenericFilteringPython_LIB_DEPENDS:STATIC=general;vtkGenericFilteringPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkGenericFiltering_LIB_DEPENDS:STATIC=general;vtkFiltering;general;vtkGraphics;
-
-//Dependencies for the target
-vtkGeovisPythonD_LIB_DEPENDS:STATIC=general;vtkGeovis;general;vtkWidgetsPythonD;general;vtkViewsPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkGeovisPython_LIB_DEPENDS:STATIC=general;vtkGeovisPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkGeovis_LIB_DEPENDS:STATIC=general;vtkWidgets;general;vtkViews;general;vtkproj4;
-
-//Dependencies for the target
-vtkGraphicsPythonD_LIB_DEPENDS:STATIC=general;vtkGraphics;general;vtkFilteringPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkGraphicsPython_LIB_DEPENDS:STATIC=general;vtkGraphicsPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkGraphics_LIB_DEPENDS:STATIC=general;vtkFiltering;general;vtkverdict;
-
-//Dependencies for the target
-vtkHybridPythonD_LIB_DEPENDS:STATIC=general;vtkHybrid;general;vtkRenderingPythonD;general;vtkIOPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkHybridPython_LIB_DEPENDS:STATIC=general;vtkHybridPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkHybrid_LIB_DEPENDS:STATIC=general;vtkRendering;general;vtkIO;general;vtkexoIIc;
-
-//Dependencies for the target
-vtkIOPythonD_LIB_DEPENDS:STATIC=general;vtkIO;general;vtkFilteringPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkIOPython_LIB_DEPENDS:STATIC=general;vtkIOPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkIO_LIB_DEPENDS:STATIC=general;vtkFiltering;general;vtkDICOMParser;general;vtkNetCDF;general;vtkmetaio;general;vtksqlite;general;vtkpng;general;vtkzlib;general;vtkjpeg;general;vtktiff;general;vtkexpat;general;vtksys;
-
-//Dependencies for the target
-vtkImagingPythonD_LIB_DEPENDS:STATIC=general;vtkImaging;general;vtkFilteringPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkImagingPython_LIB_DEPENDS:STATIC=general;vtkImagingPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkImaging_LIB_DEPENDS:STATIC=general;vtkFiltering;
-
-//Dependencies for the target
-vtkInfovisPythonD_LIB_DEPENDS:STATIC=general;vtkInfovis;general;vtkWidgetsPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkInfovisPython_LIB_DEPENDS:STATIC=general;vtkInfovisPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkInfovis_LIB_DEPENDS:STATIC=general;vtkWidgets;general;vtklibxml2;general;vtkalglib;
-
-//Dependencies for target
-vtkNetCDF_LIB_DEPENDS:STATIC=
-
-//Dependencies for the target
-vtkRenderingPythonD_LIB_DEPENDS:STATIC=general;vtkRendering;general;vtkGraphicsPythonD;general;vtkImagingPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkRenderingPythonTkWidgets_LIB_DEPENDS:STATIC=general;vtkRendering;general;@EXTERNALS@/lib/libtk@TCLTK_VERSION@.dylib;general;@EXTERNALS@/lib/libtcl@TCLTK_VERSION@.dylib;general;m;
-
-//Dependencies for the target
-vtkRenderingPython_LIB_DEPENDS:STATIC=general;vtkRenderingPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkRendering_LIB_DEPENDS:STATIC=general;vtkGraphics;general;vtkImaging;general;vtkIO;general;vtkftgl;general;vtkfreetype;general;vtkzlib;general;vtkpng;general;/usr/X11R6/lib/libXt.dylib;general;/usr/X11R6/lib/libSM.dylib;general;/usr/X11R6/lib/libICE.dylib;general;/usr/X11R6/lib/libX11.dylib;general;/usr/X11R6/lib/libXext.dylib;general;/usr/X11R6/lib/libXss.dylib;general;/usr/X11R6/lib/libXft.dylib;general;/usr/X11R6/lib/libfontconfig.dylib;
-
-//Dependencies for the target
-vtkViewsPythonD_LIB_DEPENDS:STATIC=general;vtkViews;general;vtkInfovisPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkViewsPython_LIB_DEPENDS:STATIC=general;vtkViewsPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkViews_LIB_DEPENDS:STATIC=general;vtkInfovis;
-
-//Dependencies for the target
-vtkVolumeRenderingPythonD_LIB_DEPENDS:STATIC=general;vtkVolumeRendering;general;vtkRenderingPythonD;general;vtkIOPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkVolumeRenderingPython_LIB_DEPENDS:STATIC=general;vtkVolumeRenderingPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkVolumeRendering_LIB_DEPENDS:STATIC=general;vtkRendering;general;vtkIO;
-
-//Dependencies for the target
-vtkWidgetsPythonD_LIB_DEPENDS:STATIC=general;vtkWidgets;general;vtkRenderingPythonD;general;vtkHybridPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkWidgetsPython_LIB_DEPENDS:STATIC=general;vtkWidgetsPythonD;optimized;@PREFIX_PATH@/lib/libpython@PYVER@.dylib;debug;/Library/Frameworks/python.framework;
-
-//Dependencies for the target
-vtkWidgets_LIB_DEPENDS:STATIC=general;vtkRendering;general;vtkHybrid;
-
-//Dependencies for target
-vtkalglib_LIB_DEPENDS:STATIC=
-
-//Dependencies for the target
-vtkexoIIc_LIB_DEPENDS:STATIC=general;vtkNetCDF;
-
-//Dependencies for target
-vtkexpat_LIB_DEPENDS:STATIC=
-
-//Dependencies for target
-vtkfreetype_LIB_DEPENDS:STATIC=
-
-//Dependencies for the target
-vtkftgl_LIB_DEPENDS:STATIC=general;/usr/X11R6/lib/libGL.dylib;general;vtkfreetype;
-
-//Dependencies for target
-vtkjpeg_LIB_DEPENDS:STATIC=
-
-//Value Computed by CMake
-vtklibxml2_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtklibxml2
-
-//Dependencies for the target
-vtklibxml2_LIB_DEPENDS:STATIC=general;vtkzlib;general;dl;general;-lpthread;general;m;
-
-//Value Computed by CMake
-vtklibxml2_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtklibxml2
-
-//Value Computed by CMake
-vtkmetaio_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/vtkmetaio
-
-//Dependencies for the target
-vtkmetaio_LIB_DEPENDS:STATIC=general;vtkzlib;general;vtksys;
-
-//Value Computed by CMake
-vtkmetaio_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/vtkmetaio
-
-//Dependencies for the target
-vtkpng_LIB_DEPENDS:STATIC=general;vtkzlib;
-
-//Dependencies for the target
-vtkproj4_LIB_DEPENDS:STATIC=general;m;
-
-//Dependencies for target
-vtksqlite_LIB_DEPENDS:STATIC=
-
-//Value Computed by CMake
-vtksys_BINARY_DIR:STATIC=@BUILD_DIR@/VTK-build/Utilities/kwsys
-
-//Dependencies for target
-vtksys_LIB_DEPENDS:STATIC=
-
-//Value Computed by CMake
-vtksys_SOURCE_DIR:STATIC=@BUILD_DIR@/VTK/Utilities/kwsys
-
-//Dependencies for the target
-vtktiff_LIB_DEPENDS:STATIC=general;vtkzlib;general;vtkjpeg;
-
-//Dependencies for target
-vtkverdict_LIB_DEPENDS:STATIC=
-
-//Dependencies for target
-vtkzlib_LIB_DEPENDS:STATIC=
-
-
-########################
-# INTERNAL cache entries
-########################
-
-ALGLIB_SHARED_LIB:INTERNAL=ON
-//ADVANCED property for variable: BUILD_DOCUMENTATION
-BUILD_DOCUMENTATION-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: BUILD_EXAMPLES
-BUILD_EXAMPLES-MODIFIED:INTERNAL=ON
-//MODIFIED property for variable: BUILD_SHARED_LIBS
-BUILD_SHARED_LIBS-MODIFIED:INTERNAL=ON
-//MODIFIED property for variable: BUILD_TESTING
-BUILD_TESTING-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: BZRCOMMAND
-BZRCOMMAND-ADVANCED:INTERNAL=1
-//Result of TRY_COMPILE
-CMAKE_ANSI_FOR_SCOPE:INTERNAL=TRUE
-//Have include iostream
-CMAKE_ANSI_STREAM_HEADERS:INTERNAL=1
-//ADVANCED property for variable: CMAKE_AR
-CMAKE_AR-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_BUILD_TOOL
-CMAKE_BUILD_TOOL-ADVANCED:INTERNAL=1
-//What is the target build tool cmake is generating for.
-CMAKE_BUILD_TOOL:INTERNAL=/usr/bin/make
-//This is the directory where this CMakeCache.txt was created
-CMAKE_CACHEFILE_DIR:INTERNAL=@BUILD_DIR@/VTK-build
-//Major version of cmake used to create the current loaded cache
-CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2
-//Minor version of cmake used to create the current loaded cache
-CMAKE_CACHE_MINOR_VERSION:INTERNAL=8
-//Patch version of cmake used to create the current loaded cache
-CMAKE_CACHE_PATCH_VERSION:INTERNAL=0
-//ADVANCED property for variable: CMAKE_COLOR_MAKEFILE
-CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1
-//Path to CMake executable.
-CMAKE_COMMAND:INTERNAL=cmake
-//Path to cpack program executable.
-CMAKE_CPACK_COMMAND:INTERNAL=cpack
-//Path to ctest program executable.
-CMAKE_CTEST_COMMAND:INTERNAL=ctest
-//ADVANCED property for variable: CMAKE_CXX_COMPILER
-CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1
-CMAKE_CXX_COMPILER_WORKS:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS
-CMAKE_CXX_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS_DEBUG
-CMAKE_CXX_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS_MINSIZEREL
-CMAKE_CXX_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS_RELEASE
-CMAKE_CXX_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS_RELWITHDEBINFO
-CMAKE_CXX_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_COMPILER
-CMAKE_C_COMPILER-ADVANCED:INTERNAL=1
-CMAKE_C_COMPILER_WORKS:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS
-CMAKE_C_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_DEBUG
-CMAKE_C_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_MINSIZEREL
-CMAKE_C_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_RELEASE
-CMAKE_C_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_RELWITHDEBINFO
-CMAKE_C_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//Result of TRY_COMPILE
-CMAKE_DETERMINE_CXX_ABI_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-CMAKE_DETERMINE_C_ABI_COMPILED:INTERNAL=TRUE
-//Path to cache edit program executable.
-CMAKE_EDIT_COMMAND:INTERNAL=ccmake
-//Executable file format
-CMAKE_EXECUTABLE_FORMAT:INTERNAL=Unknown
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS
-CMAKE_EXE_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_DEBUG
-CMAKE_EXE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_MINSIZEREL
-CMAKE_EXE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELEASE
-CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
-CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//Name of generator.
-CMAKE_GENERATOR:INTERNAL=Unix Makefiles
-//Result of TRY_COMPILE
-CMAKE_HAS_ANSI_STRING_STREAM:INTERNAL=TRUE
-//Is X11 around.
-CMAKE_HAS_X:INTERNAL=1
-//Have function connect
-CMAKE_HAVE_CONNECT:INTERNAL=1
-//Have function gethostbyname
-CMAKE_HAVE_GETHOSTBYNAME:INTERNAL=1
-//Have include CMAKE_HAVE_LIMITS_H
-CMAKE_HAVE_LIMITS_H:INTERNAL=1
-//Have library pthreads
-CMAKE_HAVE_PTHREADS_CREATE:INTERNAL=
-//Have library pthread
-CMAKE_HAVE_PTHREAD_CREATE:INTERNAL=1
-//Have include CMAKE_HAVE_PTHREAD_H
-CMAKE_HAVE_PTHREAD_H:INTERNAL=1
-//Have function remove
-CMAKE_HAVE_REMOVE:INTERNAL=1
-//Have function shmat
-CMAKE_HAVE_SHMAT:INTERNAL=1
-//Have includes CMAKE_HAVE_SYS_PRCTL_H
-CMAKE_HAVE_SYS_PRCTL_H:INTERNAL=
-//Have include CMAKE_HAVE_UNISTD_H
-CMAKE_HAVE_UNISTD_H:INTERNAL=1
-//Start directory with the top level CMakeLists.txt file for this
-// project
-CMAKE_HOME_DIRECTORY:INTERNAL=@BUILD_DIR@/VTK
-//ADVANCED property for variable: CMAKE_HP_PTHREADS
-CMAKE_HP_PTHREADS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_INSTALL_NAME_TOOL
-CMAKE_INSTALL_NAME_TOOL-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: CMAKE_INSTALL_PREFIX
-CMAKE_INSTALL_PREFIX-MODIFIED:INTERNAL=ON
-//Have library ICE
-CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER:INTERNAL=1
-//ADVANCED property for variable: CMAKE_LINKER
-CMAKE_LINKER-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MAKE_PROGRAM
-CMAKE_MAKE_PROGRAM-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS
-CMAKE_MODULE_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_DEBUG
-CMAKE_MODULE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL
-CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELEASE
-CMAKE_MODULE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO
-CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_NM
-CMAKE_NM-ADVANCED:INTERNAL=1
-//Does the compiler support ansi for scope.
-CMAKE_NO_ANSI_FOR_SCOPE:INTERNAL=0
-//ADVANCED property for variable: CMAKE_NO_ANSI_STREAM_HEADERS
-CMAKE_NO_ANSI_STREAM_HEADERS-ADVANCED:INTERNAL=1
-//Does the compiler support headers like iostream.
-CMAKE_NO_ANSI_STREAM_HEADERS:INTERNAL=0
-//Does the compiler support sstream
-CMAKE_NO_ANSI_STRING_STREAM:INTERNAL=0
-//Does the compiler support std::.
-CMAKE_NO_STD_NAMESPACE:INTERNAL=0
-//number of local generators
-CMAKE_NUMBER_OF_LOCAL_GENERATORS:INTERNAL=44
-//ADVANCED property for variable: CMAKE_OBJCOPY
-CMAKE_OBJCOPY-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_OBJDUMP
-CMAKE_OBJDUMP-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_RANLIB
-CMAKE_RANLIB-ADVANCED:INTERNAL=1
-//Test Support for 64 bit file systems
-CMAKE_REQUIRE_LARGE_FILE_SUPPORT:INTERNAL=1
-//Path to CMake installation.
-CMAKE_ROOT:INTERNAL=@EXTERNALS@/share/cmake-2.8
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS
-CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG
-CMAKE_SHARED_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL
-CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELEASE
-CMAKE_SHARED_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO
-CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//Result of CHECK_TYPE_SIZE
-CMAKE_SIZEOF_CHAR:INTERNAL=1
-//Result of CHECK_TYPE_SIZE
-CMAKE_SIZEOF_DOUBLE:INTERNAL=8
-//Result of CHECK_TYPE_SIZE
-CMAKE_SIZEOF_FLOAT:INTERNAL=4
-//Result of CHECK_TYPE_SIZE
-CMAKE_SIZEOF_INT:INTERNAL=4
-//Result of CHECK_TYPE_SIZE
-CMAKE_SIZEOF_LONG:INTERNAL=4
-//Result of CHECK_TYPE_SIZE
-CMAKE_SIZEOF_SHORT:INTERNAL=2
-//Result of CHECK_TYPE_SIZE
-CMAKE_SIZEOF_UNSIGNED_SHORT:INTERNAL=2
-//Result of CHECK_TYPE_SIZE
-CMAKE_SIZEOF_VOID_P:INTERNAL=4
-//ADVANCED property for variable: CMAKE_SKIP_RPATH
-CMAKE_SKIP_RPATH-ADVANCED:INTERNAL=1
-//Whether to build with rpath.
-CMAKE_SKIP_RPATH:INTERNAL=0
-//Result of TRY_COMPILE
-CMAKE_STD_NAMESPACE:INTERNAL=TRUE
-//ADVANCED property for variable: CMAKE_STRIP
-CMAKE_STRIP-ADVANCED:INTERNAL=1
-//Suppress Warnings that are meant for the author of the CMakeLists.txt
-// files.
-CMAKE_SUPPRESS_DEVELOPER_WARNINGS:INTERNAL=TRUE
-//ADVANCED property for variable: CMAKE_THREAD_LIBS
-CMAKE_THREAD_LIBS-ADVANCED:INTERNAL=1
-//uname command
-CMAKE_UNAME:INTERNAL=/usr/bin/uname
-//ADVANCED property for variable: CMAKE_USE_PTHREADS
-CMAKE_USE_PTHREADS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_USE_RELATIVE_PATHS
-CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_USE_SPROC
-CMAKE_USE_SPROC-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_USE_WIN32_THREADS
-CMAKE_USE_WIN32_THREADS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE
-CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
-//Result of TEST_BIG_ENDIAN
-CMAKE_WORDS_BIGENDIAN:INTERNAL=0
-//ADVANCED property for variable: CMAKE_X_CFLAGS
-CMAKE_X_CFLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_X_LIBS
-CMAKE_X_LIBS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: COVERAGE_COMMAND
-COVERAGE_COMMAND-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CVSCOMMAND
-CVSCOMMAND-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CVS_UPDATE_OPTIONS
-CVS_UPDATE_OPTIONS-ADVANCED:INTERNAL=1
-//CXX compiler accepts flag -no-cpp-precomp
-CXX_HAS_CPP_PRECOMP_FLAG:INTERNAL=TRUE
-//ADVANCED property for variable: DART_TESTING_TIMEOUT
-DART_TESTING_TIMEOUT-ADVANCED:INTERNAL=1
-//Single output directory for building all executables.
-EXECUTABLE_OUTPUT_PATH:INTERNAL=@BUILD_DIR@/VTK-build/bin
-//Have include malloc.h
-EX_HAVE_MALLOC_H:INTERNAL=
-//Details about finding PythonInterp
-FIND_PACKAGE_MESSAGE_DETAILS_PythonInterp:INTERNAL=[@PREFIX_PATH@/bin/python@PYVER@]
-//Details about finding PythonLibs
-FIND_PACKAGE_MESSAGE_DETAILS_PythonLibs:INTERNAL=[@PREFIX_PATH@/lib/libpython@PYVER@.dylib][@PREFIX_PATH@/include/python@PYVER@]
-//Details about finding TCL
-FIND_PACKAGE_MESSAGE_DETAILS_TCL:INTERNAL=[@EXTERNALS@/lib/libtcl@TCLTK_VERSION@.dylib][@EXTERNALS@/include]
-//Details about finding TCLTK
-FIND_PACKAGE_MESSAGE_DETAILS_TCLTK:INTERNAL=[@EXTERNALS@/lib/libtcl@TCLTK_VERSION@.dylib][@EXTERNALS@/include][@EXTERNALS@/lib/libtk@TCLTK_VERSION@.dylib][@EXTERNALS@/include]
-//Details about finding TK
-FIND_PACKAGE_MESSAGE_DETAILS_TK:INTERNAL=[@EXTERNALS@/lib/libtk@TCLTK_VERSION@.dylib][@EXTERNALS@/include]
-//Details about finding Tclsh
-FIND_PACKAGE_MESSAGE_DETAILS_Tclsh:INTERNAL=[@EXTERNALS@/bin/tclsh@TCLTK_VERSION@]
-//Details about finding Threads
-FIND_PACKAGE_MESSAGE_DETAILS_Threads:INTERNAL=[TRUE]
-//Details about finding X11
-FIND_PACKAGE_MESSAGE_DETAILS_X11:INTERNAL=[/usr/X11R6/lib/libX11.dylib][/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include]
-//Have symbol alloca
-HAVE_ALLOCA:INTERNAL=1
-//Have include HAVE_ALLOCA_H
-HAVE_ALLOCA_H:INTERNAL=1
-//Have includes HAVE_ANSIDECL_H
-HAVE_ANSIDECL_H:INTERNAL=
-//Have include HAVE_ARPA_INET_H
-HAVE_ARPA_INET_H:INTERNAL=1
-//Have include HAVE_ARPA_NAMESER_H
-HAVE_ARPA_NAMESER_H:INTERNAL=1
-//Have include HAVE_ASSERT_H
-HAVE_ASSERT_H:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_CMAKE_REQUIRE_LARGE_FILE_SUPPORT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_CHAR:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_DOUBLE:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_FLOAT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_INT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_LONG:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_SHORT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_UNSIGNED_SHORT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_SIZEOF_VOID_P:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_CMAKE_WORDS_BIGENDIAN:INTERNAL=TRUE
-//Have include HAVE_CTYPE_H
-HAVE_CTYPE_H:INTERNAL=1
-//Have include HAVE_DIRENT_H
-HAVE_DIRENT_H:INTERNAL=1
-//Have include HAVE_DLFCN_H
-HAVE_DLFCN_H:INTERNAL=1
-//Have library dl;-lpthread;m
-HAVE_DLOPEN:INTERNAL=1
-//Have includes HAVE_DL_H
-HAVE_DL_H:INTERNAL=
-//Have include HAVE_ERRNO_H
-HAVE_ERRNO_H:INTERNAL=1
-//Have include HAVE_FCNTL_H
-HAVE_FCNTL_H:INTERNAL=1
-//Have symbol finite
-HAVE_FINITE:INTERNAL=1
-//Have include HAVE_FLOAT_H
-HAVE_FLOAT_H:INTERNAL=1
-//Have function floor
-HAVE_FLOOR:INTERNAL=1
-//Have symbol fpclass
-HAVE_FPCLASS:INTERNAL=
-//Have symbol fprintf
-HAVE_FPRINTF:INTERNAL=1
-//Have symbol fp_class
-HAVE_FP_CLASS:INTERNAL=
-//Have includes HAVE_FP_CLASS_H
-HAVE_FP_CLASS_H:INTERNAL=
-//Have symbol ftime
-HAVE_FTIME:INTERNAL=1
-//NetCDF test 
-HAVE_FTRUNCATE:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_GETADDRINFO_COMPILED:INTERNAL=TRUE
-//Have function getopt
-HAVE_GETOPT:INTERNAL=1
-//Have symbol gettimeofday
-HAVE_GETTIMEOFDAY:INTERNAL=1
-//Have includes HAVE_IEEEFP_H
-HAVE_IEEEFP_H:INTERNAL=
-//Have include HAVE_INTTYPES_H
-HAVE_INTTYPES_H:INTERNAL=1
-//Have function isascii
-HAVE_ISASCII:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_KWSYS_SIZEOF_CHAR:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_KWSYS_SIZEOF_INT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_KWSYS_SIZEOF_LONG:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_KWSYS_SIZEOF_LONG_LONG:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_KWSYS_SIZEOF_SHORT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_KWSYS_SIZEOF___INT64:INTERNAL=FALSE
-//Have library dl;
-HAVE_LIBDL:INTERNAL=1
-//Have include HAVE_LIMITS_H
-HAVE_LIMITS_H:INTERNAL=1
-//Have symbol localtime
-HAVE_LOCALTIME:INTERNAL=1
-//Have includes HAVE_MALLOC_H
-HAVE_MALLOC_H:INTERNAL=
-//Have include HAVE_MATH_H
-HAVE_MATH_H:INTERNAL=1
-//Have function memmove
-HAVE_MEMMOVE:INTERNAL=1
-//Have include HAVE_MEMORY_H
-HAVE_MEMORY_H:INTERNAL=1
-//Have function memset
-HAVE_MEMSET:INTERNAL=1
-//Have function mmap
-HAVE_MMAP:INTERNAL=1
-//Have includes HAVE_NAN_H
-HAVE_NAN_H:INTERNAL=
-//Have includes HAVE_NDIR_H
-HAVE_NDIR_H:INTERNAL=
-//Have include HAVE_NETDB_H
-HAVE_NETDB_H:INTERNAL=1
-//Have include HAVE_NETINET_IN_H
-HAVE_NETINET_IN_H:INTERNAL=1
-//Have function pow
-HAVE_POW:INTERNAL=1
-//Have symbol printf
-HAVE_PRINTF:INTERNAL=1
-//Have include HAVE_PTHREAD_H
-HAVE_PTHREAD_H:INTERNAL=1
-//Have include HAVE_RESOLV_H
-HAVE_RESOLV_H:INTERNAL=1
-//Have library dld;dl
-HAVE_SHLLOAD:INTERNAL=
-//Have symbol signal
-HAVE_SIGNAL:INTERNAL=1
-//Have include HAVE_SIGNAL_H
-HAVE_SIGNAL_H:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_SIZEOF_DOUBLE:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_FLOAT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_INT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_LONG:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_OFF_T:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_PTRDIFF_T:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_SHORT:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_SIZE_T:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_SSIZE_T:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_SIZEOF_UCHAR:INTERNAL=FALSE
-//Have symbol snprintf
-HAVE_SNPRINTF:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_SOCKLEN_T_COMPILED:INTERNAL=TRUE
-//Have symbol sprintf
-HAVE_SPRINTF:INTERNAL=1
-//Have function sqrt
-HAVE_SQRT:INTERNAL=1
-//Have symbol sscanf
-HAVE_SSCANF:INTERNAL=1
-//Have symbol stat
-HAVE_STAT:INTERNAL=1
-//Have include HAVE_STDARG_H
-HAVE_STDARG_H:INTERNAL=1
-//Have include stddef.h
-HAVE_STDDEF_H:INTERNAL=1
-//Have include stdint.h
-HAVE_STDINT_H:INTERNAL=1
-//Have include HAVE_STDIO_H
-HAVE_STDIO_H:INTERNAL=1
-//Have include HAVE_STDLIB_H
-HAVE_STDLIB_H:INTERNAL=1
-//Have function strcasecmp
-HAVE_STRCASECMP:INTERNAL=1
-//Have function strchr
-HAVE_STRCHR:INTERNAL=1
-//Have symbol strdup
-HAVE_STRDUP:INTERNAL=1
-//Have symbol strerror
-HAVE_STRERROR:INTERNAL=1
-//Have symbol strftime
-HAVE_STRFTIME:INTERNAL=1
-//Have include HAVE_STRINGS_H
-HAVE_STRINGS_H:INTERNAL=1
-//Have include HAVE_STRING_H
-HAVE_STRING_H:INTERNAL=1
-//Have symbol strndup
-HAVE_STRNDUP:INTERNAL=
-//Have function strrchr
-HAVE_STRRCHR:INTERNAL=1
-//Have function strstr
-HAVE_STRSTR:INTERNAL=1
-//Have function strtol
-HAVE_STRTOL:INTERNAL=1
-//Have function areroul
-HAVE_STRTOUL:INTERNAL=
-//NetCDF test 
-HAVE_ST_BLKSIZE:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_SYS_DIR_H_COMPILED:INTERNAL=TRUE
-//Have include HAVE_SYS_MMAN_H
-HAVE_SYS_MMAN_H:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_SYS_NDIR_H_COMPILED:INTERNAL=FALSE
-//Have include HAVE_SYS_SELECT_H
-HAVE_SYS_SELECT_H:INTERNAL=1
-//Have include HAVE_SYS_SOCKET_H
-HAVE_SYS_SOCKET_H:INTERNAL=1
-//Have include HAVE_SYS_STAT_H
-HAVE_SYS_STAT_H:INTERNAL=1
-//Have include HAVE_SYS_TIMEB_H
-HAVE_SYS_TIMEB_H:INTERNAL=1
-//Have include HAVE_SYS_TIME_H
-HAVE_SYS_TIME_H:INTERNAL=1
-//Have include sys/types.h
-HAVE_SYS_TYPES_H:INTERNAL=1
-//Have include HAVE_TIME_H
-HAVE_TIME_H:INTERNAL=1
-//Have include HAVE_UNISTD_H
-HAVE_UNISTD_H:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_VA_COPY_COMPILED:INTERNAL=TRUE
-//Have symbol vfprintf
-HAVE_VFPRINTF:INTERNAL=1
-//Have symbol vsnprintf
-HAVE_VSNPRINTF:INTERNAL=1
-//Have symbol vsprintf
-HAVE_VSPRINTF:INTERNAL=1
-//Result of TRY_COMPILE
-HAVE_VTK_SIZEOF_LONG_LONG:INTERNAL=TRUE
-//Result of TRY_COMPILE
-HAVE_VTK_SIZEOF___INT64:INTERNAL=FALSE
-//Have includes HAVE_WINDOWS_H
-HAVE_WINDOWS_H:INTERNAL=
-//Have symbol _stat
-HAVE__STAT:INTERNAL=
-//Result of TRY_COMPILE
-HAVE___VA_COPY_COMPILED:INTERNAL=TRUE
-//ADVANCED property for variable: HGCOMMAND
-HGCOMMAND-ADVANCED:INTERNAL=1
-//Result of TRY_RUN
-KWSYS_CHAR_IS_SIGNED:INTERNAL=0
-//Result of TRY_COMPILE
-KWSYS_CHAR_IS_SIGNED_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_CXX_HAS_ARGUMENT_DEPENDENT_LOOKUP_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_CXX_HAS_CSTDDEF_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_CXX_HAS_FULL_SPECIALIZATION_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_CXX_HAS_MEMBER_TEMPLATES_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_CXX_HAS_NULL_TEMPLATE_ARGS_COMPILED:INTERNAL=FALSE
-//Result of TRY_COMPILE
-KWSYS_C_HAS_PTRDIFF_T_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_C_HAS_SSIZE_T_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_IOS_HAVE_STD_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_IOS_USE_ANSI_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_IOS_USE_SSTREAM_COMPILED:INTERNAL=TRUE
-//Result of TRY_RUN
-KWSYS_LFS_WORKS:INTERNAL=0
-//Result of TRY_COMPILE
-KWSYS_LFS_WORKS_COMPILED:INTERNAL=TRUE
-//Result of CHECK_TYPE_SIZE
-KWSYS_SIZEOF_CHAR:INTERNAL=1
-//Result of CHECK_TYPE_SIZE
-KWSYS_SIZEOF_INT:INTERNAL=4
-//Result of CHECK_TYPE_SIZE
-KWSYS_SIZEOF_LONG:INTERNAL=4
-//Result of CHECK_TYPE_SIZE
-KWSYS_SIZEOF_LONG_LONG:INTERNAL=8
-//Result of CHECK_TYPE_SIZE
-KWSYS_SIZEOF_SHORT:INTERNAL=2
-//Result of CHECK_TYPE_SIZE
-KWSYS_SIZEOF___INT64:INTERNAL=
-//Result of TRY_COMPILE
-KWSYS_STAT_HAS_ST_MTIM_COMPILED:INTERNAL=FALSE
-//Result of TRY_COMPILE
-KWSYS_STL_HAS_ALLOCATOR_MAX_SIZE_ARGUMENT_COMPILED:INTERNAL=FALSE
-//Result of TRY_COMPILE
-KWSYS_STL_HAS_ALLOCATOR_OBJECTS_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_STL_HAS_ALLOCATOR_REBIND_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_STL_HAS_ALLOCATOR_TEMPLATE_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_STL_HAS_ITERATOR_TRAITS_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_STL_HAVE_STD_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-KWSYS_STL_STRING_HAVE_NEQ_CHAR_COMPILED:INTERNAL=TRUE
-//Single output directory for building all libraries.
-LIBRARY_OUTPUT_PATH:INTERNAL=@BUILD_DIR@/VTK-build/bin
-//ADVANCED property for variable: MAKECOMMAND
-MAKECOMMAND-ADVANCED:INTERNAL=1
-//Path to vtkMaterialLibraryMacro.h
-MATERIAL_LIBRARY_MATERIAL_MACRO_HEADER:INTERNAL=@BUILD_DIR@/VTK-build/Utilities/MaterialLibrary/vtkMaterialLibraryMacro.h
-//Path to vtkShaderCodeLibraryMacro.h
-MATERIAL_LIBRARY_SHADER_MACRO_HEADER:INTERNAL=@BUILD_DIR@/VTK-build/Utilities/MaterialLibrary/vtkShaderCodeLibraryMacro.h
-//ADVANCED property for variable: MEMORYCHECK_COMMAND
-MEMORYCHECK_COMMAND-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: MEMORYCHECK_SUPPRESSIONS_FILE
-MEMORYCHECK_SUPPRESSIONS_FILE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: OPENGL_INCLUDE_DIR
-OPENGL_INCLUDE_DIR-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: OPENGL_INCLUDE_DIR
-OPENGL_INCLUDE_DIR-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: OPENGL_gl_LIBRARY
-OPENGL_gl_LIBRARY-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: OPENGL_gl_LIBRARY
-OPENGL_gl_LIBRARY-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: OPENGL_glu_LIBRARY
-OPENGL_glu_LIBRARY-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: OPENGL_glu_LIBRARY
-OPENGL_glu_LIBRARY-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: OPENGL_xmesa_INCLUDE_DIR
-OPENGL_xmesa_INCLUDE_DIR-ADVANCED:INTERNAL=1
-//Have symbol atanh
-PROJ_HAVE_ATANH:INTERNAL=1
-//Have symbol csin
-PROJ_HAVE_COMPLEX:INTERNAL=1
-//ADVANCED property for variable: PROJ_LIST_EXTERNAL
-PROJ_LIST_EXTERNAL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PROJ_USE_GSL
-PROJ_USE_GSL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PROJ_USE_PTHREADS
-PROJ_USE_PTHREADS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_DEBUG_LIBRARY
-PYTHON_DEBUG_LIBRARY-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkCommonPython
-PYTHON_ENABLE_MODULE_vtkCommonPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkFilteringPython
-PYTHON_ENABLE_MODULE_vtkFilteringPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkGenericFilteringPython
-PYTHON_ENABLE_MODULE_vtkGenericFilteringPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkGeovisPython
-PYTHON_ENABLE_MODULE_vtkGeovisPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkGraphicsPython
-PYTHON_ENABLE_MODULE_vtkGraphicsPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkHybridPython
-PYTHON_ENABLE_MODULE_vtkHybridPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkIOPython
-PYTHON_ENABLE_MODULE_vtkIOPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkImagingPython
-PYTHON_ENABLE_MODULE_vtkImagingPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkInfovisPython
-PYTHON_ENABLE_MODULE_vtkInfovisPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkRenderingPython
-PYTHON_ENABLE_MODULE_vtkRenderingPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkViewsPython
-PYTHON_ENABLE_MODULE_vtkViewsPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkVolumeRenderingPython
-PYTHON_ENABLE_MODULE_vtkVolumeRenderingPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_ENABLE_MODULE_vtkWidgetsPython
-PYTHON_ENABLE_MODULE_vtkWidgetsPython-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_EXECUTABLE
-PYTHON_EXECUTABLE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_EXTRA_LIBS
-PYTHON_EXTRA_LIBS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_INCLUDE_PATH
-PYTHON_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: PYTHON_INCLUDE_PATH
-PYTHON_INCLUDE_PATH-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: PYTHON_LIBRARY
-PYTHON_LIBRARY-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: PYTHON_LIBRARY
-PYTHON_LIBRARY-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: PYTHON_MODULE_vtkCommonPython_BUILD_SHARED
-PYTHON_MODULE_vtkCommonPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkFilteringPython_BUILD_SHARED
-PYTHON_MODULE_vtkFilteringPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkGenericFilteringPython_BUILD_SHARED
-PYTHON_MODULE_vtkGenericFilteringPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkGeovisPython_BUILD_SHARED
-PYTHON_MODULE_vtkGeovisPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkGraphicsPython_BUILD_SHARED
-PYTHON_MODULE_vtkGraphicsPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkHybridPython_BUILD_SHARED
-PYTHON_MODULE_vtkHybridPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkIOPython_BUILD_SHARED
-PYTHON_MODULE_vtkIOPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkImagingPython_BUILD_SHARED
-PYTHON_MODULE_vtkImagingPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkInfovisPython_BUILD_SHARED
-PYTHON_MODULE_vtkInfovisPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkRenderingPython_BUILD_SHARED
-PYTHON_MODULE_vtkRenderingPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkViewsPython_BUILD_SHARED
-PYTHON_MODULE_vtkViewsPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkVolumeRenderingPython_BUILD_SHARED
-PYTHON_MODULE_vtkVolumeRenderingPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_MODULE_vtkWidgetsPython_BUILD_SHARED
-PYTHON_MODULE_vtkWidgetsPython_BUILD_SHARED-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PYTHON_UTIL_LIBRARY
-PYTHON_UTIL_LIBRARY-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: SCPCOMMAND
-SCPCOMMAND-ADVANCED:INTERNAL=1
-//Result of TRY_COMPILE
-SHARED_LIBRARY_PATH_INFO_COMPILED:INTERNAL=TRUE
-//Result of TRY_RUN
-SHARED_LIBRARY_PATH_TYPE:INTERNAL=0
-//runtime library path variable name.
-SHARED_LIBRARY_PATH_VAR_NAME:INTERNAL=DYLD_LIBRARY_PATH
-//ADVANCED property for variable: SITE
-SITE-ADVANCED:INTERNAL=1
-//Result of CHECK_TYPE_SIZE
-SIZEOF_DOUBLE:INTERNAL=8
-//Result of CHECK_TYPE_SIZE
-SIZEOF_FLOAT:INTERNAL=4
-//Result of CHECK_TYPE_SIZE
-SIZEOF_INT:INTERNAL=4
-//Result of CHECK_TYPE_SIZE
-SIZEOF_LONG:INTERNAL=4
-//Result of CHECK_TYPE_SIZE
-SIZEOF_OFF_T:INTERNAL=8
-//Result of CHECK_TYPE_SIZE
-SIZEOF_PTRDIFF_T:INTERNAL=4
-//Result of CHECK_TYPE_SIZE
-SIZEOF_SHORT:INTERNAL=2
-//Result of CHECK_TYPE_SIZE
-SIZEOF_SIZE_T:INTERNAL=4
-//Result of CHECK_TYPE_SIZE
-SIZEOF_SSIZE_T:INTERNAL=4
-//Result of CHECK_TYPE_SIZE
-SIZEOF_UCHAR:INTERNAL=
-//ADVANCED property for variable: SLURM_SBATCH_COMMAND
-SLURM_SBATCH_COMMAND-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: SLURM_SRUN_COMMAND
-SLURM_SRUN_COMMAND-ADVANCED:INTERNAL=1
-//Have include STDC_HEADERS
-STDC_HEADERS:INTERNAL=1
-//Result of TRY_COMPILE
-SUPPORT_IP6_COMPILED:INTERNAL=TRUE
-//ADVANCED property for variable: SVNCOMMAND
-SVNCOMMAND-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: TCL_INCLUDE_PATH
-TCL_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: TCL_INCLUDE_PATH
-TCL_INCLUDE_PATH-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: TCL_LIBRARY
-TCL_LIBRARY-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: TCL_LIBRARY
-TCL_LIBRARY-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: TCL_TCLSH
-TCL_TCLSH-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: TCL_TCLSH
-TCL_TCLSH-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: TK_INCLUDE_PATH
-TK_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: TK_INCLUDE_PATH
-TK_INCLUDE_PATH-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: TK_INTERNAL_PATH
-TK_INTERNAL_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: TK_LIBRARY
-TK_LIBRARY-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: TK_LIBRARY
-TK_LIBRARY-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: TK_WISH
-TK_WISH-ADVANCED:INTERNAL=1
-//This value is not used by VTK.
-TK_WISH:INTERNAL=/usr/bin/wish
-//ADVANCED property for variable: VERDICT_BUILD_DOC
-VERDICT_BUILD_DOC-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VERDICT_ENABLE_TESTING
-VERDICT_ENABLE_TESTING-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VERDICT_MANGLE
-VERDICT_MANGLE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VERDICT_MANGLE_PREFIX
-VERDICT_MANGLE_PREFIX-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VERDICT_USE_FLOAT
-VERDICT_USE_FLOAT-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VLI_LIBRARY_FOR_VP1000
-VLI_LIBRARY_FOR_VP1000-ADVANCED:INTERNAL=1
-//Result of TRY_COMPILE
-VTK_ANSI_STREAM_EOF_COMPILED:INTERNAL=TRUE
-//Result of TRY_RUN
-VTK_ANSI_STREAM_EOF_RESULT:INTERNAL=0
-//Support for C++ type bool
-VTK_COMPILER_HAS_BOOL:INTERNAL=1
-//Support for full template specialization syntax
-VTK_COMPILER_HAS_FULL_SPECIALIZATION:INTERNAL=1
-//ADVANCED property for variable: VTK_DEBUG_LEAKS
-VTK_DEBUG_LEAKS-ADVANCED:INTERNAL=1
-//The directory in which code for Shaders is provided.
-VTK_DEFAULT_SHADERS_DIR:INTERNAL=@BUILD_DIR@/VTK-build/Utilities/MaterialLibrary/Repository
-//String encoder.
-VTK_ENCODESTRING_EXE:INTERNAL=@BUILD_DIR@/VTK-build/bin/vtkEncodeString
-//Support for C++ explict templates
-VTK_EXPLICIT_TEMPLATES:INTERNAL=1
-//ADVANCED property for variable: VTK_GLEXT_FILE
-VTK_GLEXT_FILE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_GLXEXT_FILE
-VTK_GLXEXT_FILE-ADVANCED:INTERNAL=1
-//Have include iosfwd
-VTK_HAVE_ANSI_STREAMS:INTERNAL=1
-//Support for getsockname with socklen_t
-VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T:INTERNAL=1
-//Have library socket
-VTK_HAVE_LIBSOCKET:INTERNAL=
-//Have include iostream.h
-VTK_HAVE_OLD_STREAMS:INTERNAL=1
-//Have include strstream.h
-VTK_HAVE_OLD_STRSTREAM_H:INTERNAL=
-//Have include strstrea.h
-VTK_HAVE_OLD_STRSTREA_H:INTERNAL=
-//Have symbol SO_REUSEADDR
-VTK_HAVE_SO_REUSEADDR:INTERNAL=1
-//Whether istream supports long long
-VTK_ISTREAM_SUPPORTS_LONG_LONG:INTERNAL=1
-//ADVANCED property for variable: VTK_LEGACY_REMOVE
-VTK_LEGACY_REMOVE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_LEGACY_SILENT
-VTK_LEGACY_SILENT-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_MATERIALS_DIRS
-VTK_MATERIALS_DIRS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_NO_PYTHON_THREADS
-VTK_NO_PYTHON_THREADS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_OPENGL_HAS_OSMESA
-VTK_OPENGL_HAS_OSMESA-ADVANCED:INTERNAL=1
-//Whether ostream supports long long
-VTK_OSTREAM_SUPPORTS_LONG_LONG:INTERNAL=1
-//OpenGL extensions parser.
-VTK_PARSEOGLEXT_EXE:INTERNAL=@BUILD_DIR@/VTK-build/bin/vtkParseOGLExt
-//Install directory for Python .py and .pyc files
-VTK_PYTHON_MODULE_INSTALL_DIR:INTERNAL=${CMAKE_INSTALL_PREFIX}/lib/python@PYVER@/site-packages
-//Install directory for Python binary modules
-VTK_PYTHON_MODULE_PLATFORM_INSTALL_DIR:INTERNAL=${CMAKE_INSTALL_PREFIX}/lib/python@PYVER@/site-packages
-//ADVANCED property for variable: VTK_PYTHON_SETUP_ARGS
-VTK_PYTHON_SETUP_ARGS-ADVANCED:INTERNAL=1
-//Result of CHECK_TYPE_SIZE
-VTK_SIZEOF_LONG_LONG:INTERNAL=8
-//Result of CHECK_TYPE_SIZE
-VTK_SIZEOF___INT64:INTERNAL=
-//Very few users should worry about this option. If VTK is built
-// against a static Tcl/Tk lib (see VTK_TCL_TK_STATIC) or a shared
-// Tcl/Tk bundled inside a project with no library support files
-// (ex: ParaViewComplete), this variable should be set to ON and
-// both VTK_TCL_SUPPORT_LIBRARY_PATH and VTK_TK_SUPPORT_LIBRARY_PATH
-// should point to the directories that hold those files (typically,
-// lib/tcl8.4 and lib/tk8.4 for a typical Tcl/Tk installation,
-// or tcl8.4.5/library and tk8.4.5/library for a Tcl/Tk source
-// repository). Once this variable is set to ON, support files
-// will automatically be copied to the build directory and the
-// executables will try to use that location to initialize Tcl/Tk.
-VTK_TCL_TK_COPY_SUPPORT_LIBRARY:INTERNAL=
-//ADVANCED property for variable: VTK_TESTING_USE_FPE
-VTK_TESTING_USE_FPE-ADVANCED:INTERNAL=1
-//Whether char is signed.
-VTK_TYPE_CHAR_IS_SIGNED:INTERNAL=1
-//Result of TRY_COMPILE
-VTK_TYPE_CHAR_IS_SIGNED_COMPILED:INTERNAL=TRUE
-//ADVANCED property for variable: VTK_USE_64BIT_IDS
-VTK_USE_64BIT_IDS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_BOOST
-VTK_USE_BOOST-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_CG_SHADERS
-VTK_USE_CG_SHADERS-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: VTK_USE_COCOA
-VTK_USE_COCOA-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: VTK_USE_DISPLAY
-VTK_USE_DISPLAY-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_FFMPEG_ENCODER
-VTK_USE_FFMPEG_ENCODER-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_GL2PS
-VTK_USE_GL2PS-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: VTK_USE_GL2PS
-VTK_USE_GL2PS-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: VTK_USE_GLSL_SHADERS
-VTK_USE_GLSL_SHADERS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_GUISUPPORT
-VTK_USE_GUISUPPORT-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_MANGLED_MESA
-VTK_USE_MANGLED_MESA-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_METAIO
-VTK_USE_METAIO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_MPEG2_ENCODER
-VTK_USE_MPEG2_ENCODER-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_MYSQL
-VTK_USE_MYSQL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_ODBC
-VTK_USE_ODBC-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_POSTGRES
-VTK_USE_POSTGRES-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_RPATH
-VTK_USE_RPATH-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: VTK_USE_RPATH
-VTK_USE_RPATH-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: VTK_USE_SYSTEM_EXPAT
-VTK_USE_SYSTEM_EXPAT-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_SYSTEM_FREETYPE
-VTK_USE_SYSTEM_FREETYPE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_SYSTEM_JPEG
-VTK_USE_SYSTEM_JPEG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_SYSTEM_LIBPROJ4
-VTK_USE_SYSTEM_LIBPROJ4-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_SYSTEM_LIBXML2
-VTK_USE_SYSTEM_LIBXML2-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_SYSTEM_PNG
-VTK_USE_SYSTEM_PNG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_SYSTEM_TIFF
-VTK_USE_SYSTEM_TIFF-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_SYSTEM_ZLIB
-VTK_USE_SYSTEM_ZLIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_TK
-VTK_USE_TK-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_USE_VOLUMEPRO_1000
-VTK_USE_VOLUMEPRO_1000-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: VTK_USE_X
-VTK_USE_X-MODIFIED:INTERNAL=ON
-//ADVANCED property for variable: VTK_WGLEXT_FILE
-VTK_WGLEXT_FILE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VTK_WRAP_HINTS
-VTK_WRAP_HINTS-ADVANCED:INTERNAL=1
-//MODIFIED property for variable: VTK_WRAP_PYTHON
-VTK_WRAP_PYTHON-MODIFIED:INTERNAL=ON
-//Location of program to do Python wrapping
-VTK_WRAP_PYTHON_EXE:INTERNAL=@BUILD_DIR@/VTK-build/bin/vtkWrapPython
-//Location of program to do Python wrapping
-VTK_WRAP_PYTHON_INIT_EXE:INTERNAL=@BUILD_DIR@/VTK-build/bin/vtkWrapPythonInit
-//ADVANCED property for variable: X11_ICE_INCLUDE_PATH
-X11_ICE_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_ICE_LIB
-X11_ICE_LIB-ADVANCED:INTERNAL=1
-//Have library /usr/X11R6/lib/libX11.dylib;/usr/X11R6/lib/libXext.dylib
-X11_LIB_X11_SOLO:INTERNAL=1
-//ADVANCED property for variable: X11_SM_LIB
-X11_SM_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_X11_INCLUDE_PATH
-X11_X11_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_X11_LIB
-X11_X11_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_XShm_INCLUDE_PATH
-X11_XShm_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_XTest_INCLUDE_PATH
-X11_XTest_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_XTest_LIB
-X11_XTest_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xaccessrules_INCLUDE_PATH
-X11_Xaccessrules_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xaccessstr_INCLUDE_PATH
-X11_Xaccessstr_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xau_INCLUDE_PATH
-X11_Xau_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xau_LIB
-X11_Xau_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xcomposite_INCLUDE_PATH
-X11_Xcomposite_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xcomposite_LIB
-X11_Xcomposite_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xcursor_INCLUDE_PATH
-X11_Xcursor_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xcursor_LIB
-X11_Xcursor_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xdamage_INCLUDE_PATH
-X11_Xdamage_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xdamage_LIB
-X11_Xdamage_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xdmcp_INCLUDE_PATH
-X11_Xdmcp_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xdmcp_LIB
-X11_Xdmcp_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xext_LIB
-X11_Xext_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xfixes_INCLUDE_PATH
-X11_Xfixes_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xfixes_LIB
-X11_Xfixes_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xft_INCLUDE_PATH
-X11_Xft_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xft_LIB
-X11_Xft_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xinerama_INCLUDE_PATH
-X11_Xinerama_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xinerama_LIB
-X11_Xinerama_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xinput_INCLUDE_PATH
-X11_Xinput_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xinput_LIB
-X11_Xinput_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xkb_INCLUDE_PATH
-X11_Xkb_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xkblib_INCLUDE_PATH
-X11_Xkblib_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xlib_INCLUDE_PATH
-X11_Xlib_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xpm_INCLUDE_PATH
-X11_Xpm_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xpm_LIB
-X11_Xpm_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xrandr_INCLUDE_PATH
-X11_Xrandr_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xrandr_LIB
-X11_Xrandr_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xrender_INCLUDE_PATH
-X11_Xrender_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xrender_LIB
-X11_Xrender_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xscreensaver_INCLUDE_PATH
-X11_Xscreensaver_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xscreensaver_LIB
-X11_Xscreensaver_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xshape_INCLUDE_PATH
-X11_Xshape_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xt_INCLUDE_PATH
-X11_Xt_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xt_LIB
-X11_Xt_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xutil_INCLUDE_PATH
-X11_Xutil_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xv_INCLUDE_PATH
-X11_Xv_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xv_LIB
-X11_Xv_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_Xxf86misc_LIB
-X11_Xxf86misc_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_dpms_INCLUDE_PATH
-X11_dpms_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_fontconfig_LIB
-X11_fontconfig_LIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_xf86misc_INCLUDE_PATH
-X11_xf86misc_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: X11_xf86vmode_INCLUDE_PATH
-X11_xf86vmode_INCLUDE_PATH-ADVANCED:INTERNAL=1
-//Already complained about update type.
-__CTEST_UPDATE_TYPE_COMPLAINED:INTERNAL=1
-
diff --git a/exsrc/src/cmake/multi.c b/exsrc/src/cmake/multi.c
deleted file mode 100644
index e4edb4d46..000000000
--- a/exsrc/src/cmake/multi.c
+++ /dev/null
@@ -1,1978 +0,0 @@
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- * $Id: multi.c,v 1.2 2007-03-15 19:22:13 andy Exp $
- ***************************************************************************/
-
-#include "setup.h"
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <curl/curl.h>
-
-#include "urldata.h"
-#include "transfer.h"
-#include "url.h"
-#include "connect.h"
-#include "progress.h"
-#include "memory.h"
-#include "easyif.h"
-#include "multiif.h"
-#include "sendf.h"
-#include "timeval.h"
-
-/* The last #include file should be: */
-#include "memdebug.h"
-
-struct Curl_message {
-  /* the 'CURLMsg' is the part that is visible to the external user */
-  struct CURLMsg extmsg;
-  struct Curl_message *next;
-};
-
-typedef enum {
-  CURLM_STATE_INIT,        /* start in this state */
-  CURLM_STATE_CONNECT,     /* resolve/connect has been sent off */
-  CURLM_STATE_WAITRESOLVE, /* awaiting the resolve to finalize */
-  CURLM_STATE_WAITCONNECT, /* awaiting the connect to finalize */
-  CURLM_STATE_PROTOCONNECT, /* completing the protocol-specific connect
-                               phase */
-  CURLM_STATE_WAITDO,      /* wait for our turn to send the request */
-  CURLM_STATE_DO,          /* start send off the request (part 1) */
-  CURLM_STATE_DOING,       /* sending off the request (part 1) */
-  CURLM_STATE_DO_MORE,     /* send off the request (part 2) */
-  CURLM_STATE_DO_DONE,     /* done sending off request */
-  CURLM_STATE_WAITPERFORM, /* wait for our turn to read the response */
-  CURLM_STATE_PERFORM,     /* transfer data */
-  CURLM_STATE_TOOFAST,     /* wait because limit-rate exceeded */
-  CURLM_STATE_DONE,        /* post data transfer operation */
-  CURLM_STATE_COMPLETED,   /* operation complete */
-  CURLM_STATE_CANCELLED,   /* cancelled */
-
-  CURLM_STATE_LAST /* not a true state, never use this */
-} CURLMstate;
-
-/* we support N sockets per easy handle. Set the corresponding bit to what
-   action we should wait for */
-#define MAX_SOCKSPEREASYHANDLE 5
-#define GETSOCK_READABLE (0x00ff)
-#define GETSOCK_WRITABLE (0xff00)
-
-struct closure {
-  struct closure *next; /* a simple one-way list of structs */
-  struct SessionHandle *easy_handle;
-};
-
-struct Curl_one_easy {
-  /* first, two fields for the linked list of these */
-  struct Curl_one_easy *next;
-  struct Curl_one_easy *prev;
-
-  struct SessionHandle *easy_handle; /* the easy handle for this unit */
-  struct connectdata *easy_conn;     /* the "unit's" connection */
-
-  CURLMstate state;  /* the handle's state */
-  CURLcode result;   /* previous result */
-
-  struct Curl_message *msg; /* A pointer to one single posted message.
-                               Cleanup should be done on this pointer NOT on
-                               the linked list in Curl_multi.  This message
-                               will be deleted when this handle is removed
-                               from the multi-handle */
-  int msg_num; /* number of messages left in 'msg' to return */
-
-  /* Array with the plain socket numbers this handle takes care of, in no
-     particular order. Note that all sockets are added to the sockhash, where
-     the state etc are also kept. This array is mostly used to detect when a
-     socket is to be removed from the hash. See singlesocket(). */
-  curl_socket_t sockets[MAX_SOCKSPEREASYHANDLE];
-  int numsocks;
-};
-
-#define CURL_MULTI_HANDLE 0x000bab1e
-
-#define GOOD_MULTI_HANDLE(x) \
-  ((x)&&(((struct Curl_multi *)x)->type == CURL_MULTI_HANDLE))
-#define GOOD_EASY_HANDLE(x) \
- (((struct SessionHandle *)x)->magic == CURLEASY_MAGIC_NUMBER)
-
-/* This is the struct known as CURLM on the outside */
-struct Curl_multi {
-  /* First a simple identifier to easier detect if a user mix up
-     this multi handle with an easy handle. Set this to CURL_MULTI_HANDLE. */
-  long type;
-
-  /* We have a linked list with easy handles */
-  struct Curl_one_easy easy;
-
-  int num_easy; /* amount of entries in the linked list above. */
-  int num_msgs; /* amount of messages in the easy handles */
-  int num_alive; /* amount of easy handles that are added but have not yet
-                    reached COMPLETE state */
-
-  /* callback function and user data pointer for the *socket() API */
-  curl_socket_callback socket_cb;
-  void *socket_userp;
-
-  /* Hostname cache */
-  struct curl_hash *hostcache;
-
-  /* timetree points to the splay-tree of time nodes to figure out expire
-     times of all currently set timers */
-  struct Curl_tree *timetree;
-
-  /* 'sockhash' is the lookup hash for socket descriptor => easy handles (note
-     the pluralis form, there can be more than one easy handle waiting on the
-     same actual socket) */
-  struct curl_hash *sockhash;
-
-  /* Whether pipelining is enabled for this multi handle */
-  bool pipelining_enabled;
-
-  /* shared connection cache */
-  struct conncache *connc;
-
-  /* list of easy handles kept around for doing nice connection closures */
-  struct closure *closure;
-
-  /* timer callback and user data pointer for the *socket() API */
-  curl_multi_timer_callback timer_cb;
-  void *timer_userp;
-  time_t timer_lastcall; /* the fixed time for the timeout for the previous
-                            callback */
-};
-
-static bool multi_conn_using(struct Curl_multi *multi,
-                             struct SessionHandle *data);
-static void singlesocket(struct Curl_multi *multi,
-                         struct Curl_one_easy *easy);
-static void add_closure(struct Curl_multi *multi,
-                        struct SessionHandle *data);
-static int update_timer(struct Curl_multi *multi);
-
-#ifdef CURLDEBUG
-static const char *statename[]={
-  "INIT",
-  "CONNECT",
-  "WAITRESOLVE",
-  "WAITCONNECT",
-  "PROTOCONNECT",
-  "WAITDO",
-  "DO",
-  "DOING",
-  "DO_MORE",
-  "DO_DONE",
-  "WAITPERFORM",
-  "PERFORM",
-  "TOOFAST",
-  "DONE",
-  "COMPLETED",
-  "CANCELLED"
-};
-
-void curl_multi_dump(CURLM *multi_handle);
-#endif
-
-/* always use this function to change state, to make debugging easier */
-static void multistate(struct Curl_one_easy *easy, CURLMstate state)
-{
-#ifdef CURLDEBUG
-  long index = -1;
-#endif
-  CURLMstate oldstate = easy->state;
-
-  if(oldstate == state)
-    /* don't bother when the new state is the same as the old state */
-    return;
-
-  easy->state = state;
-
-#ifdef CURLDEBUG
-  if(easy->state > CURLM_STATE_CONNECT &&
-     easy->state < CURLM_STATE_COMPLETED)
-    index = easy->easy_conn->connectindex;
-
-  infof(easy->easy_handle,
-        "STATE: %s => %s handle %p; (connection #%ld) \n",
-        statename[oldstate], statename[easy->state],
-        (char *)easy, index);
-#endif
-  if(state == CURLM_STATE_COMPLETED)
-    /* changing to COMPLETED means there's one less easy handle 'alive' */
-    easy->easy_handle->multi->num_alive--;
-}
-
-/*
- * We add one of these structs to the sockhash for a particular socket
- */
-
-struct Curl_sh_entry {
-  struct SessionHandle *easy;
-  time_t timestamp;
-  long inuse;
-  int action;  /* what action READ/WRITE this socket waits for */
-  curl_socket_t socket; /* mainly to ease debugging */
-  void *socketp; /* settable by users with curl_multi_assign() */
-};
-/* bits for 'action' having no bits means this socket is not expecting any
-   action */
-#define SH_READ  1
-#define SH_WRITE 2
-
-/* make sure this socket is present in the hash for this handle */
-static struct Curl_sh_entry *sh_addentry(struct curl_hash *sh,
-                                         curl_socket_t s,
-                                         struct SessionHandle *data)
-{
-  struct Curl_sh_entry *there =
-    Curl_hash_pick(sh, (char *)&s, sizeof(curl_socket_t));
-  struct Curl_sh_entry *check;
-
-  if(there)
-    /* it is present, return fine */
-    return there;
-
-  /* not present, add it */
-  check = calloc(sizeof(struct Curl_sh_entry), 1);
-  if(!check)
-    return NULL; /* major failure */
-  check->easy = data;
-  check->socket = s;
-
-  /* make/add new hash entry */
-  if(NULL == Curl_hash_add(sh, (char *)&s, sizeof(curl_socket_t), check)) {
-    free(check);
-    return NULL; /* major failure */
-  }
-
-  return check; /* things are good in sockhash land */
-}
-
-
-/* delete the given socket + handle from the hash */
-static void sh_delentry(struct curl_hash *sh, curl_socket_t s)
-{
-  struct Curl_sh_entry *there =
-    Curl_hash_pick(sh, (char *)&s, sizeof(curl_socket_t));
-
-  if(there) {
-    /* this socket is in the hash */
-    /* We remove the hash entry. (This'll end up in a call to
-       sh_freeentry().) */
-    Curl_hash_delete(sh, (char *)&s, sizeof(curl_socket_t));
-  }
-}
-
-/*
- * free a sockhash entry
- */
-static void sh_freeentry(void *freethis)
-{
-  struct Curl_sh_entry *p = (struct Curl_sh_entry *) freethis;
-
-  free(p);
-}
-
-/*
- * sh_init() creates a new socket hash and returns the handle for it.
- *
- * Quote from README.multi_socket:
- *
- * "Some tests at 7000 and 9000 connections showed that the socket hash lookup
- * is somewhat of a bottle neck. Its current implementation may be a bit too
- * limiting. It simply has a fixed-size array, and on each entry in the array
- * it has a linked list with entries. So the hash only checks which list to
- * scan through. The code I had used so for used a list with merely 7 slots
- * (as that is what the DNS hash uses) but with 7000 connections that would
- * make an average of 1000 nodes in each list to run through. I upped that to
- * 97 slots (I believe a prime is suitable) and noticed a significant speed
- * increase.  I need to reconsider the hash implementation or use a rather
- * large default value like this. At 9000 connections I was still below 10us
- * per call."
- *
- */
-static struct curl_hash *sh_init(void)
-{
-  return Curl_hash_alloc(97, sh_freeentry);
-}
-
-CURLM *curl_multi_init(void)
-{
-  struct Curl_multi *multi = (void *)calloc(sizeof(struct Curl_multi), 1);
-
-  if(!multi)
-    return NULL;
-
-  multi->type = CURL_MULTI_HANDLE;
-
-  multi->hostcache = Curl_mk_dnscache();
-  if(!multi->hostcache) {
-    /* failure, free mem and bail out */
-    free(multi);
-    return NULL;
-  }
-
-  multi->sockhash = sh_init();
-  if(!multi->sockhash) {
-    /* failure, free mem and bail out */
-    Curl_hash_destroy(multi->hostcache);
-    free(multi);
-    return NULL;
-  }
-
-  multi->connc = Curl_mk_connc(CONNCACHE_MULTI, -1);
-  if(!multi->connc) {
-    Curl_hash_destroy(multi->hostcache);
-    free(multi);
-    return NULL;
-  }
-
-  return (CURLM *) multi;
-}
-
-CURLMcode curl_multi_add_handle(CURLM *multi_handle,
-                                CURL *easy_handle)
-{
-  struct Curl_multi *multi=(struct Curl_multi *)multi_handle;
-  struct Curl_one_easy *easy;
-  struct closure *cl;
-  struct closure *prev=NULL;
-
-  /* First, make some basic checks that the CURLM handle is a good handle */
-  if(!GOOD_MULTI_HANDLE(multi))
-    return CURLM_BAD_HANDLE;
-
-  /* Verify that we got a somewhat good easy handle too */
-  if(!GOOD_EASY_HANDLE(easy_handle))
-    return CURLM_BAD_EASY_HANDLE;
-
-  /* Prevent users to add the same handle more than once! */
-  if(((struct SessionHandle *)easy_handle)->multi)
-    /* possibly we should create a new unique error code for this condition */
-    return CURLM_BAD_EASY_HANDLE;
-
-  /* Now, time to add an easy handle to the multi stack */
-  easy = (struct Curl_one_easy *)calloc(sizeof(struct Curl_one_easy), 1);
-  if(!easy)
-    return CURLM_OUT_OF_MEMORY;
-
-  cl = multi->closure;
-  while(cl) {
-    struct closure *next = cl->next;
-    if(cl->easy_handle == (struct SessionHandle *)easy_handle) {
-      /* remove this handle from the closure list */
-      free(cl);
-      if(prev)
-        prev->next = next;
-      else
-        multi->closure = next;
-      break; /* no need to continue since this handle can only be present once
-                in the list */
-    }
-    cl = next;
-  }
-
-  /* set the easy handle */
-  easy->easy_handle = easy_handle;
-  multistate(easy, CURLM_STATE_INIT);
-
-  /* for multi interface connections, we share DNS cache automatically if the
-     easy handle's one is currently private. */
-  if (easy->easy_handle->dns.hostcache &&
-      (easy->easy_handle->dns.hostcachetype == HCACHE_PRIVATE)) {
-    Curl_hash_destroy(easy->easy_handle->dns.hostcache);
-    easy->easy_handle->dns.hostcache = NULL;
-    easy->easy_handle->dns.hostcachetype = HCACHE_NONE;
-  }
-
-  if (!easy->easy_handle->dns.hostcache ||
-      (easy->easy_handle->dns.hostcachetype == HCACHE_NONE)) {
-    easy->easy_handle->dns.hostcache = multi->hostcache;
-    easy->easy_handle->dns.hostcachetype = HCACHE_MULTI;
-  }
-
-  if(easy->easy_handle->state.connc) {
-    if(easy->easy_handle->state.connc->type == CONNCACHE_PRIVATE) {
-      /* kill old private version */
-      Curl_rm_connc(easy->easy_handle->state.connc);
-      /* point out our shared one instead */
-      easy->easy_handle->state.connc = multi->connc;
-    }
-    /* else it is already using multi? */
-  }
-  else
-    /* point out our shared one */
-    easy->easy_handle->state.connc = multi->connc;
-
-  /* Make sure the type is setup correctly */
-  easy->easy_handle->state.connc->type = CONNCACHE_MULTI;
-
-  /* We add this new entry first in the list. We make our 'next' point to the
-     previous next and our 'prev' point back to the 'first' struct */
-  easy->next = multi->easy.next;
-  easy->prev = &multi->easy;
-
-  /* make 'easy' the first node in the chain */
-  multi->easy.next = easy;
-
-  /* if there was a next node, make sure its 'prev' pointer links back to
-     the new node */
-  if(easy->next)
-    easy->next->prev = easy;
-
-  Curl_easy_addmulti(easy_handle, multi_handle);
-
-  /* make the SessionHandle struct refer back to this struct */
-  easy->easy_handle->set.one_easy = easy;
-
-  /* increase the node-counter */
-  multi->num_easy++;
-
-  if((multi->num_easy * 4) > multi->connc->num) {
-    /* We want the connection cache to have plenty room. Before we supported
-       the shared cache every single easy handle had 5 entries in their cache
-       by default. */
-    CURLcode res = Curl_ch_connc(easy_handle, multi->connc,
-                                 multi->connc->num*4);
-    if(res != CURLE_OK)
-      /* TODO: we need to do some cleaning up here! */
-      return CURLM_OUT_OF_MEMORY;
-  }
-
-  /* increase the alive-counter */
-  multi->num_alive++;
-
-  update_timer(multi);
-  return CURLM_OK;
-}
-
-#if 0
-/* Debug-function, used like this:
- *
- * Curl_hash_print(multi->sockhash, debug_print_sock_hash);
- *
- * Enable the hash print function first by editing hash.c
- */
-static void debug_print_sock_hash(void *p)
-{
-  struct Curl_sh_entry *sh = (struct Curl_sh_entry *)p;
-
-  fprintf(stderr, " [easy %p/magic %x/socket %d]",
-          (void *)sh->easy, sh->easy->magic, sh->socket);
-}
-#endif
-
-CURLMcode curl_multi_remove_handle(CURLM *multi_handle,
-                                   CURL *curl_handle)
-{
-  struct Curl_multi *multi=(struct Curl_multi *)multi_handle;
-  struct Curl_one_easy *easy;
-
-  /* First, make some basic checks that the CURLM handle is a good handle */
-  if(!GOOD_MULTI_HANDLE(multi))
-    return CURLM_BAD_HANDLE;
-
-  /* Verify that we got a somewhat good easy handle too */
-  if(!GOOD_EASY_HANDLE(curl_handle))
-    return CURLM_BAD_EASY_HANDLE;
-
-  /* scan through the list and remove the 'curl_handle' */
-  easy = multi->easy.next;
-  while(easy) {
-    if(easy->easy_handle == (struct SessionHandle *)curl_handle)
-      break;
-    easy=easy->next;
-  }
-
-  if(easy) {
-    bool premature = (bool)(easy->state != CURLM_STATE_COMPLETED);
-
-    /* If the 'state' is not INIT or COMPLETED, we might need to do something
-       nice to put the easy_handle in a good known state when this returns. */
-    if(premature)
-      /* this handle is "alive" so we need to count down the total number of
-         alive connections when this is removed */
-      multi->num_alive--;
-
-    if (easy->easy_handle->state.is_in_pipeline &&
-        easy->state > CURLM_STATE_DO) {
-      /* If the handle is in a pipeline and has finished sending off its
-         request, we need to remember the fact that we want to remove this
-         handle but do the actual removal at a later time */
-      easy->easy_handle->state.cancelled = TRUE;
-      return CURLM_OK;
-    }
-
-    /* The timer must be shut down before easy->multi is set to NULL,
-       else the timenode will remain in the splay tree after
-       curl_easy_cleanup is called. */
-    Curl_expire(easy->easy_handle, 0);
-
-    if(easy->easy_handle->dns.hostcachetype == HCACHE_MULTI) {
-      /* clear out the usage of the shared DNS cache */
-      easy->easy_handle->dns.hostcache = NULL;
-      easy->easy_handle->dns.hostcachetype = HCACHE_NONE;
-    }
-
-    /* if we have a connection we must call Curl_done() here so that we
-       don't leave a half-baked one around */
-    if(easy->easy_conn) {
-      /* Set up the association right */
-      easy->easy_conn->data = easy->easy_handle;
-
-      /* Curl_done() clears the conn->data field to lose the association
-         between the easy handle and the connection */
-      Curl_done(&easy->easy_conn, easy->result, premature);
-
-      if(easy->easy_conn)
-        /* the connection is still alive, set back the association to enable
-           the check below to trigger TRUE */
-        easy->easy_conn->data = easy->easy_handle;
-    }
-
-    /* If this easy_handle was the last one in charge for one or more
-       connections a the shared connection cache, we might need to keep this
-       handle around until either A) the connection is closed and killed
-       properly, or B) another easy_handle uses the connection.
-
-       The reason why we need to have a easy_handle associated with a live
-       connection is simply that some connections will need a handle to get
-       closed down properly. Currently, the only connections that need to keep
-       a easy_handle handle around are using FTP(S). Such connections have
-       the PROT_CLOSEACTION bit set.
-
-       Thus, we need to check for all connections in the shared cache that
-       points to this handle and are using PROT_CLOSEACTION. If there's any,
-       we need to add this handle to the list of "easy handles kept around for
-       nice connection closures".
-     */
-    if(multi_conn_using(multi, easy->easy_handle)) {
-      /* There's at least one connection using this handle so we must keep
-         this handle around. We also keep the connection cache pointer
-         pointing to the shared one since that will be used on close as
-         well. */
-      easy->easy_handle->state.shared_conn = multi;
-
-      /* this handle is still being used by a shared connection cache and
-         thus we leave it around for now */
-      add_closure(multi, easy->easy_handle);
-    }
-
-    if(easy->easy_handle->state.connc->type == CONNCACHE_MULTI) {
-      /* if this was using the shared connection cache we clear the pointer
-         to that since we're not part of that handle anymore */
-      easy->easy_handle->state.connc = NULL;
-
-      /* and modify the connectindex since this handle can't point to the
-         connection cache anymore */
-      if(easy->easy_conn)
-        easy->easy_conn->connectindex = -1;
-    }
-
-    /* change state without using multistate(), only to make singlesocket() do
-       what we want */
-    easy->state = CURLM_STATE_COMPLETED;
-    singlesocket(multi, easy); /* to let the application know what sockets
-                                  that vanish with this handle */
-
-    Curl_easy_addmulti(easy->easy_handle, NULL); /* clear the association
-                                                    to this multi handle */
-
-    /* make the previous node point to our next */
-    if(easy->prev)
-      easy->prev->next = easy->next;
-    /* make our next point to our previous node */
-    if(easy->next)
-      easy->next->prev = easy->prev;
-
-    easy->easy_handle->set.one_easy = NULL; /* detached */
-
-    /* NOTE NOTE NOTE
-       We do not touch the easy handle here! */
-    if (easy->msg)
-      free(easy->msg);
-    free(easy);
-
-    multi->num_easy--; /* one less to care about now */
-
-    update_timer(multi);
-    return CURLM_OK;
-  }
-  else
-    return CURLM_BAD_EASY_HANDLE; /* twasn't found */
-}
-
-bool Curl_multi_canPipeline(struct Curl_multi* multi)
-{
-  return multi->pipelining_enabled;
-}
-
-static int waitconnect_getsock(struct connectdata *conn,
-                               curl_socket_t *sock,
-                               int numsocks)
-{
-  if(!numsocks)
-    return GETSOCK_BLANK;
-
-  sock[0] = conn->sock[FIRSTSOCKET];
-  return GETSOCK_WRITESOCK(0);
-}
-
-static int domore_getsock(struct connectdata *conn,
-                          curl_socket_t *sock,
-                          int numsocks)
-{
-  if(!numsocks)
-    return GETSOCK_BLANK;
-
-  /* When in DO_MORE state, we could be either waiting for us
-     to connect to a remote site, or we could wait for that site
-     to connect to us. It makes a difference in the way: if we
-     connect to the site we wait for the socket to become writable, if
-     the site connects to us we wait for it to become readable */
-  sock[0] = conn->sock[SECONDARYSOCKET];
-
-  return GETSOCK_WRITESOCK(0);
-}
-
-/* returns bitmapped flags for this handle and its sockets */
-static int multi_getsock(struct Curl_one_easy *easy,
-                         curl_socket_t *socks, /* points to numsocks number
-                                                 of sockets */
-                         int numsocks)
-{
-  if (easy->easy_handle->state.pipe_broke) {
-    return 0;
-  }
-
-  if (easy->state > CURLM_STATE_CONNECT &&
-      easy->state < CURLM_STATE_COMPLETED) {
-    /* Set up ownership correctly */
-    easy->easy_conn->data = easy->easy_handle;
-  }
-
-  switch(easy->state) {
-  case CURLM_STATE_TOOFAST:  /* returns 0, so will not select. */
-  default:
-    /* this will get called with CURLM_STATE_COMPLETED when a handle is
-       removed */
-    return 0;
-
-  case CURLM_STATE_WAITRESOLVE:
-    return Curl_resolv_getsock(easy->easy_conn, socks, numsocks);
-
-  case CURLM_STATE_PROTOCONNECT:
-    return Curl_protocol_getsock(easy->easy_conn, socks, numsocks);
-
-  case CURLM_STATE_DOING:
-    return Curl_doing_getsock(easy->easy_conn, socks, numsocks);
-
-  case CURLM_STATE_WAITCONNECT:
-    return waitconnect_getsock(easy->easy_conn, socks, numsocks);
-
-  case CURLM_STATE_DO_MORE:
-    return domore_getsock(easy->easy_conn, socks, numsocks);
-
-  case CURLM_STATE_PERFORM:
-  case CURLM_STATE_WAITPERFORM:
-    return Curl_single_getsock(easy->easy_conn, socks, numsocks);
-  }
-
-}
-
-CURLMcode curl_multi_fdset(CURLM *multi_handle,
-                           fd_set *read_fd_set, fd_set *write_fd_set,
-                           fd_set *exc_fd_set, int *max_fd)
-{
-  /* Scan through all the easy handles to get the file descriptors set.
-     Some easy handles may not have connected to the remote host yet,
-     and then we must make sure that is done. */
-  struct Curl_multi *multi=(struct Curl_multi *)multi_handle;
-  struct Curl_one_easy *easy;
-  int this_max_fd=-1;
-  curl_socket_t sockbunch[MAX_SOCKSPEREASYHANDLE];
-  int bitmap;
-  int i;
-  (void)exc_fd_set; /* not used */
-
-  if(!GOOD_MULTI_HANDLE(multi))
-    return CURLM_BAD_HANDLE;
-
-  easy=multi->easy.next;
-  while(easy) {
-    bitmap = multi_getsock(easy, sockbunch, MAX_SOCKSPEREASYHANDLE);
-
-    for(i=0; i< MAX_SOCKSPEREASYHANDLE; i++) {
-      curl_socket_t s = CURL_SOCKET_BAD;
-
-      if(bitmap & GETSOCK_READSOCK(i)) {
-        FD_SET(sockbunch[i], read_fd_set);
-        s = sockbunch[i];
-      }
-      if(bitmap & GETSOCK_WRITESOCK(i)) {
-        FD_SET(sockbunch[i], write_fd_set);
-        s = sockbunch[i];
-      }
-      if(s == CURL_SOCKET_BAD)
-        /* this socket is unused, break out of loop */
-        break;
-      else {
-        if((int)s > this_max_fd)
-          this_max_fd = (int)s;
-      }
-    }
-
-    easy = easy->next; /* check next handle */
-  }
-
-  *max_fd = this_max_fd;
-
-  return CURLM_OK;
-}
-
-static CURLMcode multi_runsingle(struct Curl_multi *multi,
-                                 struct Curl_one_easy *easy)
-{
-  struct Curl_message *msg = NULL;
-  bool connected;
-  bool async;
-  bool protocol_connect;
-  bool dophase_done;
-  bool done;
-  CURLMcode result = CURLM_OK;
-  struct Curl_transfer_keeper *k;
-
-  do {
-
-    if(!GOOD_EASY_HANDLE(easy->easy_handle))
-      return CURLM_BAD_EASY_HANDLE;
-
-    if (easy->easy_handle->state.pipe_broke) {
-      infof(easy->easy_handle, "Pipe broke: handle 0x%x, url = %s\n",
-            easy, easy->easy_handle->reqdata.path);
-      if(easy->easy_handle->state.is_in_pipeline) {
-        /* Head back to the CONNECT state */
-        multistate(easy, CURLM_STATE_CONNECT);
-        result = CURLM_CALL_MULTI_PERFORM;
-        easy->result = CURLE_OK;
-      } else {
-        easy->result = CURLE_COULDNT_CONNECT;
-        multistate(easy, CURLM_STATE_COMPLETED);
-      }
-
-      easy->easy_handle->state.pipe_broke = FALSE;
-      easy->easy_conn = NULL;
-      break;
-    }
-
-    if (easy->state > CURLM_STATE_CONNECT &&
-        easy->state < CURLM_STATE_COMPLETED) {
-      /* Make sure we set the connection's current owner */
-      easy->easy_conn->data = easy->easy_handle;
-    }
-
-    if (CURLM_STATE_WAITCONNECT <= easy->state &&
-        easy->state <= CURLM_STATE_DO &&
-        easy->easy_handle->change.url_changed) {
-      char *gotourl;
-      Curl_posttransfer(easy->easy_handle);
-
-      easy->result = Curl_done(&easy->easy_conn, CURLE_OK, FALSE);
-      /* We make sure that the pipe broken flag is reset
-         because in this case, it isn't an actual break */
-      easy->easy_handle->state.pipe_broke = FALSE;
-      if(CURLE_OK == easy->result) {
-        gotourl = strdup(easy->easy_handle->change.url);
-        if(gotourl) {
-          easy->easy_handle->change.url_changed = FALSE;
-          easy->result = Curl_follow(easy->easy_handle, gotourl, FALSE);
-          if(CURLE_OK == easy->result)
-            multistate(easy, CURLM_STATE_CONNECT);
-          else
-            free(gotourl);
-        }
-        else {
-          easy->result = CURLE_OUT_OF_MEMORY;
-          multistate(easy, CURLM_STATE_COMPLETED);
-          break;
-        }
-      }
-    }
-
-    easy->easy_handle->change.url_changed = FALSE;
-
-    switch(easy->state) {
-    case CURLM_STATE_INIT:
-      /* init this transfer. */
-      easy->result=Curl_pretransfer(easy->easy_handle);
-
-      if(CURLE_OK == easy->result) {
-        /* after init, go CONNECT */
-        multistate(easy, CURLM_STATE_CONNECT);
-        result = CURLM_CALL_MULTI_PERFORM;
-
-        easy->easy_handle->state.used_interface = Curl_if_multi;
-      }
-      break;
-
-    case CURLM_STATE_CONNECT:
-      /* Connect. We get a connection identifier filled in. */
-      Curl_pgrsTime(easy->easy_handle, TIMER_STARTSINGLE);
-      easy->result = Curl_connect(easy->easy_handle, &easy->easy_conn,
-                                  &async, &protocol_connect);
-
-      if(CURLE_OK == easy->result) {
-        /* Add this handle to the send pipeline */
-        Curl_addHandleToPipeline(easy->easy_handle,
-                                 easy->easy_conn->send_pipe);
-
-        if(async)
-          /* We're now waiting for an asynchronous name lookup */
-          multistate(easy, CURLM_STATE_WAITRESOLVE);
-        else {
-          /* after the connect has been sent off, go WAITCONNECT unless the
-             protocol connect is already done and we can go directly to
-             WAITDO! */
-          result = CURLM_CALL_MULTI_PERFORM;
-
-          if(protocol_connect) {
-            multistate(easy, CURLM_STATE_WAITDO);
-          } else {
-            multistate(easy, CURLM_STATE_WAITCONNECT);
-          }
-        }
-      }
-      break;
-
-    case CURLM_STATE_WAITRESOLVE:
-      /* awaiting an asynch name resolve to complete */
-    {
-      struct Curl_dns_entry *dns = NULL;
-
-      /* check if we have the name resolved by now */
-      easy->result = Curl_is_resolved(easy->easy_conn, &dns);
-
-      if(dns) {
-        /* Perform the next step in the connection phase, and then move on
-           to the WAITCONNECT state */
-        easy->result = Curl_async_resolved(easy->easy_conn,
-                                           &protocol_connect);
-
-        if(CURLE_OK != easy->result)
-          /* if Curl_async_resolved() returns failure, the connection struct
-             is already freed and gone */
-          easy->easy_conn = NULL;           /* no more connection */
-        else {
-          /* call again please so that we get the next socket setup */
-          result = CURLM_CALL_MULTI_PERFORM;
-          if(protocol_connect)
-            multistate(easy, CURLM_STATE_DO);
-          else
-            multistate(easy, CURLM_STATE_WAITCONNECT);
-        }
-      }
-
-      if(CURLE_OK != easy->result) {
-        /* failure detected */
-        Curl_disconnect(easy->easy_conn); /* disconnect properly */
-        easy->easy_conn = NULL;           /* no more connection */
-        break;
-      }
-    }
-    break;
-
-    case CURLM_STATE_WAITCONNECT:
-      /* awaiting a completion of an asynch connect */
-      easy->result = Curl_is_connected(easy->easy_conn,
-                                       FIRSTSOCKET,
-                                       &connected);
-      if(connected)
-        easy->result = Curl_protocol_connect(easy->easy_conn,
-                                             &protocol_connect);
-
-      if(CURLE_OK != easy->result) {
-        /* failure detected */
-        Curl_disconnect(easy->easy_conn); /* close the connection */
-        easy->easy_conn = NULL;           /* no more connection */
-        break;
-      }
-
-      if(connected) {
-        if(!protocol_connect) {
-          /* We have a TCP connection, but 'protocol_connect' may be false
-             and then we continue to 'STATE_PROTOCONNECT'. If protocol
-             connect is TRUE, we move on to STATE_DO. */
-          multistate(easy, CURLM_STATE_PROTOCONNECT);
-        }
-        else {
-          /* after the connect has completed, go WAITDO */
-          multistate(easy, CURLM_STATE_WAITDO);
-
-          result = CURLM_CALL_MULTI_PERFORM;
-        }
-      }
-      break;
-
-    case CURLM_STATE_PROTOCONNECT:
-      /* protocol-specific connect phase */
-      easy->result = Curl_protocol_connecting(easy->easy_conn,
-                                              &protocol_connect);
-      if(protocol_connect) {
-        /* after the connect has completed, go WAITDO */
-        multistate(easy, CURLM_STATE_WAITDO);
-        result = CURLM_CALL_MULTI_PERFORM;
-      }
-      else if(easy->result) {
-        /* failure detected */
-        Curl_posttransfer(easy->easy_handle);
-        Curl_done(&easy->easy_conn, easy->result, FALSE);
-        Curl_disconnect(easy->easy_conn); /* close the connection */
-        easy->easy_conn = NULL;           /* no more connection */
-      }
-      break;
-
-    case CURLM_STATE_WAITDO:
-      /* Wait for our turn to DO when we're pipelining requests */
-#ifdef CURLDEBUG
-      infof(easy->easy_handle, "Conn %d send pipe %d inuse %d athead %d\n",
-            easy->easy_conn->connectindex,
-            easy->easy_conn->send_pipe->size,
-            easy->easy_conn->writechannel_inuse,
-            Curl_isHandleAtHead(easy->easy_handle,
-                                easy->easy_conn->send_pipe));
-#endif
-      if (!easy->easy_conn->writechannel_inuse &&
-          Curl_isHandleAtHead(easy->easy_handle,
-                              easy->easy_conn->send_pipe)) {
-        /* Grab the channel */
-        easy->easy_conn->writechannel_inuse = TRUE;
-        multistate(easy, CURLM_STATE_DO);
-        result = CURLM_CALL_MULTI_PERFORM;
-      }
-      break;
-
-    case CURLM_STATE_DO:
-      if(easy->easy_handle->set.connect_only) {
-        /* keep connection open for application to use the socket */
-        easy->easy_conn->bits.close = FALSE;
-        multistate(easy, CURLM_STATE_DONE);
-        easy->result = CURLE_OK;
-        result = CURLM_OK;
-      }
-      else {
-        /* Perform the protocol's DO action */
-        easy->result = Curl_do(&easy->easy_conn,
-                               &dophase_done);
-
-        if(CURLE_OK == easy->result) {
-
-          if(!dophase_done) {
-            /* DO was not completed in one function call, we must continue
-               DOING... */
-            multistate(easy, CURLM_STATE_DOING);
-            result = CURLM_OK;
-          }
-
-          /* after DO, go DO_DONE... or DO_MORE */
-          else if(easy->easy_conn->bits.do_more) {
-            /* we're supposed to do more, but we need to sit down, relax
-               and wait a little while first */
-            multistate(easy, CURLM_STATE_DO_MORE);
-            result = CURLM_OK;
-          }
-          else {
-            /* we're done with the DO, now DO_DONE */
-            easy->result = Curl_readwrite_init(easy->easy_conn);
-            if(CURLE_OK == easy->result) {
-              multistate(easy, CURLM_STATE_DO_DONE);
-              result = CURLM_CALL_MULTI_PERFORM;
-            }
-          }
-        }
-        else {
-          /* failure detected */
-          Curl_posttransfer(easy->easy_handle);
-          Curl_done(&easy->easy_conn, easy->result, FALSE);
-          Curl_disconnect(easy->easy_conn); /* close the connection */
-          easy->easy_conn = NULL;           /* no more connection */
-        }
-      }
-      break;
-
-    case CURLM_STATE_DOING:
-      /* we continue DOING until the DO phase is complete */
-      easy->result = Curl_protocol_doing(easy->easy_conn,
-                                         &dophase_done);
-      if(CURLE_OK == easy->result) {
-        if(dophase_done) {
-          /* after DO, go PERFORM... or DO_MORE */
-          if(easy->easy_conn->bits.do_more) {
-            /* we're supposed to do more, but we need to sit down, relax
-               and wait a little while first */
-            multistate(easy, CURLM_STATE_DO_MORE);
-            result = CURLM_OK;
-          }
-          else {
-            /* we're done with the DO, now DO_DONE */
-            easy->result = Curl_readwrite_init(easy->easy_conn);
-            if(CURLE_OK == easy->result) {
-              multistate(easy, CURLM_STATE_DO_DONE);
-              result = CURLM_CALL_MULTI_PERFORM;
-            }
-          }
-        } /* dophase_done */
-      }
-      else {
-        /* failure detected */
-        Curl_posttransfer(easy->easy_handle);
-        Curl_done(&easy->easy_conn, easy->result, FALSE);
-        Curl_disconnect(easy->easy_conn); /* close the connection */
-        easy->easy_conn = NULL;           /* no more connection */
-      }
-      break;
-
-    case CURLM_STATE_DO_MORE:
-      /* Ready to do more? */
-      easy->result = Curl_is_connected(easy->easy_conn,
-                                       SECONDARYSOCKET,
-                                       &connected);
-      if(connected) {
-        /*
-         * When we are connected, DO MORE and then go DO_DONE
-         */
-        easy->result = Curl_do_more(easy->easy_conn);
-
-        if(CURLE_OK == easy->result)
-          easy->result = Curl_readwrite_init(easy->easy_conn);
-        else
-          /* Remove ourselves from the send pipeline */
-          Curl_removeHandleFromPipeline(easy->easy_handle,
-                                        easy->easy_conn->send_pipe);
-
-        if(CURLE_OK == easy->result) {
-          multistate(easy, CURLM_STATE_DO_DONE);
-          result = CURLM_CALL_MULTI_PERFORM;
-        }
-      }
-      break;
-
-    case CURLM_STATE_DO_DONE:
-      /* Remove ourselves from the send pipeline */
-      Curl_removeHandleFromPipeline(easy->easy_handle,
-                                    easy->easy_conn->send_pipe);
-      /* Add ourselves to the recv pipeline */
-      Curl_addHandleToPipeline(easy->easy_handle,
-                               easy->easy_conn->recv_pipe);
-      multistate(easy, CURLM_STATE_WAITPERFORM);
-      result = CURLM_CALL_MULTI_PERFORM;
-      break;
-
-    case CURLM_STATE_WAITPERFORM:
-#ifdef CURLDEBUG
-      infof(easy->easy_handle, "Conn %d recv pipe %d inuse %d athead %d\n",
-            easy->easy_conn->connectindex,
-            easy->easy_conn->recv_pipe->size,
-            easy->easy_conn->readchannel_inuse,
-            Curl_isHandleAtHead(easy->easy_handle,
-                                easy->easy_conn->recv_pipe));
-#endif
-      /* Wait for our turn to PERFORM */
-      if (!easy->easy_conn->readchannel_inuse &&
-          Curl_isHandleAtHead(easy->easy_handle,
-                              easy->easy_conn->recv_pipe)) {
-        /* Grab the channel */
-        easy->easy_conn->readchannel_inuse = TRUE;
-        multistate(easy, CURLM_STATE_PERFORM);
-        result = CURLM_CALL_MULTI_PERFORM;
-      }
-      break;
-
-    case CURLM_STATE_TOOFAST: /* limit-rate exceeded in either direction */
-      /* if both rates are within spec, resume transfer */
-      Curl_pgrsUpdate(easy->easy_conn);
-      if ( ( ( easy->easy_handle->set.max_send_speed == 0 ) ||
-             ( easy->easy_handle->progress.ulspeed <
-               easy->easy_handle->set.max_send_speed ) )  &&
-           ( ( easy->easy_handle->set.max_recv_speed == 0 ) ||
-             ( easy->easy_handle->progress.dlspeed <
-               easy->easy_handle->set.max_recv_speed ) )
-        )
-      multistate(easy, CURLM_STATE_PERFORM);
-      break;
-
-    case CURLM_STATE_PERFORM:
-      /* check if over speed */
-      if ( (  ( easy->easy_handle->set.max_send_speed > 0 ) &&
-              ( easy->easy_handle->progress.ulspeed >
-                easy->easy_handle->set.max_send_speed ) )  ||
-           (  ( easy->easy_handle->set.max_recv_speed > 0 ) &&
-              ( easy->easy_handle->progress.dlspeed >
-                easy->easy_handle->set.max_recv_speed ) )
-        ) {
-        /* Transfer is over the speed limit. Change state.  TODO: Call
-         * Curl_expire() with the time left until we're targeted to be below
-         * the speed limit again. */
-        multistate(easy, CURLM_STATE_TOOFAST );
-        break;
-      }
-
-      /* read/write data if it is ready to do so */
-      easy->result = Curl_readwrite(easy->easy_conn, &done);
-
-      k = &easy->easy_handle->reqdata.keep;
-
-      if (!(k->keepon & KEEP_READ)) {
-          /* We're done reading */
-          easy->easy_conn->readchannel_inuse = FALSE;
-      }
-
-      if (!(k->keepon & KEEP_WRITE)) {
-          /* We're done writing */
-          easy->easy_conn->writechannel_inuse = FALSE;
-      }
-
-      if(easy->result)  {
-        /* The transfer phase returned error, we mark the connection to get
-         * closed to prevent being re-used. This is becasue we can't
-         * possibly know if the connection is in a good shape or not now. */
-        easy->easy_conn->bits.close = TRUE;
-
-        if(CURL_SOCKET_BAD != easy->easy_conn->sock[SECONDARYSOCKET]) {
-          /* if we failed anywhere, we must clean up the secondary socket if
-             it was used */
-          sclose(easy->easy_conn->sock[SECONDARYSOCKET]);
-          easy->easy_conn->sock[SECONDARYSOCKET] = CURL_SOCKET_BAD;
-        }
-        Curl_posttransfer(easy->easy_handle);
-        Curl_done(&easy->easy_conn, easy->result, FALSE);
-      }
-      else if(TRUE == done) {
-        char *newurl;
-        bool retry = Curl_retry_request(easy->easy_conn, &newurl);
-
-        /* call this even if the readwrite function returned error */
-        Curl_posttransfer(easy->easy_handle);
-
-        /* When we follow redirects, must to go back to the CONNECT state */
-        if(easy->easy_handle->reqdata.newurl || retry) {
-          Curl_removeHandleFromPipeline(easy->easy_handle,
-                                        easy->easy_conn->recv_pipe);
-          if(!retry) {
-            /* if the URL is a follow-location and not just a retried request
-               then figure out the URL here */
-            newurl = easy->easy_handle->reqdata.newurl;
-            easy->easy_handle->reqdata.newurl = NULL;
-          }
-          easy->result = Curl_done(&easy->easy_conn, CURLE_OK, FALSE);
-          if(easy->result == CURLE_OK)
-            easy->result = Curl_follow(easy->easy_handle, newurl, retry);
-          if(CURLE_OK == easy->result) {
-            multistate(easy, CURLM_STATE_CONNECT);
-            result = CURLM_CALL_MULTI_PERFORM;
-          }
-          else
-            /* Since we "took it", we are in charge of freeing this on
-               failure */
-            free(newurl);
-        }
-        else {
-          /* after the transfer is done, go DONE */
-          multistate(easy, CURLM_STATE_DONE);
-          result = CURLM_CALL_MULTI_PERFORM;
-        }
-      }
-
-      break;
-
-    case CURLM_STATE_DONE:
-      /* Remove ourselves from the receive pipeline */
-      Curl_removeHandleFromPipeline(easy->easy_handle,
-                                    easy->easy_conn->recv_pipe);
-      easy->easy_handle->state.is_in_pipeline = FALSE;
-
-      if (easy->easy_conn->bits.stream_was_rewound) {
-          /* This request read past its response boundary so we quickly
-             let the other requests consume those bytes since there is no
-             guarantee that the socket will become active again */
-          result = CURLM_CALL_MULTI_PERFORM;
-      }
-
-      if (!easy->easy_handle->state.cancelled) {
-        /* post-transfer command */
-        easy->result = Curl_done(&easy->easy_conn, CURLE_OK, FALSE);
-
-        /* after we have DONE what we're supposed to do, go COMPLETED, and
-           it doesn't matter what the Curl_done() returned! */
-        multistate(easy, CURLM_STATE_COMPLETED);
-      }
-
-      break;
-
-    case CURLM_STATE_COMPLETED:
-      if (easy->easy_handle->state.cancelled)
-        /* Go into the CANCELLED state if we were cancelled */
-        multistate(easy, CURLM_STATE_CANCELLED);
-
-      /* this is a completed transfer, it is likely to still be connected */
-
-      /* This node should be delinked from the list now and we should post
-         an information message that we are complete. */
-      break;
-
-    case CURLM_STATE_CANCELLED:
-      /* Cancelled transfer, wait to be cleaned up */
-      break;
-
-    default:
-      return CURLM_INTERNAL_ERROR;
-    }
-
-    if(CURLM_STATE_COMPLETED != easy->state) {
-      if(CURLE_OK != easy->result) {
-        /*
-         * If an error was returned, and we aren't in completed state now,
-         * then we go to completed and consider this transfer aborted.
-         */
-        easy->easy_handle->state.is_in_pipeline = FALSE;
-        easy->easy_handle->state.pipe_broke = FALSE;
-
-        if(easy->easy_conn) {
-          /* if this has a connection, unsubscribe from the pipelines */
-          easy->easy_conn->writechannel_inuse = FALSE;
-          easy->easy_conn->readchannel_inuse = FALSE;
-        }
-        multistate(easy, CURLM_STATE_COMPLETED);
-      }
-    }
-
-  } while (easy->easy_handle->change.url_changed);
-
-  if ((CURLM_STATE_COMPLETED == easy->state) && !easy->msg) {
-    if(easy->easy_handle->dns.hostcachetype == HCACHE_MULTI) {
-      /* clear out the usage of the shared DNS cache */
-      easy->easy_handle->dns.hostcache = NULL;
-      easy->easy_handle->dns.hostcachetype = HCACHE_NONE;
-    }
-
-    /* now add a node to the Curl_message linked list with this info */
-    msg = (struct Curl_message *)malloc(sizeof(struct Curl_message));
-
-    if(!msg)
-      return CURLM_OUT_OF_MEMORY;
-
-    msg->extmsg.msg = CURLMSG_DONE;
-    msg->extmsg.easy_handle = easy->easy_handle;
-    msg->extmsg.data.result = easy->result;
-    msg->next = NULL;
-
-    easy->msg = msg;
-    easy->msg_num = 1; /* there is one unread message here */
-
-    multi->num_msgs++; /* increase message counter */
-  }
-
-  return result;
-}
-
-
-CURLMcode curl_multi_perform(CURLM *multi_handle, int *running_handles)
-{
-  struct Curl_multi *multi=(struct Curl_multi *)multi_handle;
-  struct Curl_one_easy *easy;
-  CURLMcode returncode=CURLM_OK;
-  struct Curl_tree *t;
-
-  if(!GOOD_MULTI_HANDLE(multi))
-    return CURLM_BAD_HANDLE;
-
-  easy=multi->easy.next;
-  while(easy) {
-    CURLMcode result;
-
-    if (easy->easy_handle->state.cancelled &&
-        easy->state == CURLM_STATE_CANCELLED) {
-      /* Remove cancelled handles once it's safe to do so */
-      Curl_multi_rmeasy(multi_handle, easy->easy_handle);
-      easy->easy_handle = NULL;
-      easy = easy->next;
-      continue;
-    }
-
-    result = multi_runsingle(multi, easy);
-    if(result)
-      returncode = result;
-
-    easy = easy->next; /* operate on next handle */
-  }
-
-  /*
-   * Simply remove all expired timers from the splay since handles are dealt
-   * with unconditionally by this function and curl_multi_timeout() requires
-   * that already passed/handled expire times are removed from the splay.
-   */
-  do {
-    struct timeval now = Curl_tvnow();
-    int key = now.tv_sec; /* drop the usec part */
-
-    multi->timetree = Curl_splaygetbest(key, multi->timetree, &t);
-    if (t) {
-      struct SessionHandle *d = t->payload;
-      struct timeval* tv = &d->state.expiretime;
-
-      /* clear the expire times within the handles that we remove from the
-         splay tree */
-      tv->tv_sec = 0;
-      tv->tv_usec = 0;
-    }
-
-  } while(t);
-
-  *running_handles = multi->num_alive;
-
-  if ( CURLM_OK == returncode )
-    update_timer(multi);
-  return returncode;
-}
-
-/* This is called when an easy handle is cleanup'ed that is part of a multi
-   handle */
-void Curl_multi_rmeasy(void *multi_handle, CURL *easy_handle)
-{
-  curl_multi_remove_handle(multi_handle, easy_handle);
-}
-
-
-CURLMcode curl_multi_cleanup(CURLM *multi_handle)
-{
-  struct Curl_multi *multi=(struct Curl_multi *)multi_handle;
-  struct Curl_one_easy *easy;
-  struct Curl_one_easy *nexteasy;
-  int i;
-  struct closure *cl;
-  struct closure *n;
-
-  if(GOOD_MULTI_HANDLE(multi)) {
-    multi->type = 0; /* not good anymore */
-    Curl_hash_destroy(multi->hostcache);
-    Curl_hash_destroy(multi->sockhash);
-
-    /* go over all connections that have close actions */
-    for(i=0; i< multi->connc->num; i++) {
-      if(multi->connc->connects[i] &&
-         multi->connc->connects[i]->protocol & PROT_CLOSEACTION) {
-        Curl_disconnect(multi->connc->connects[i]);
-        multi->connc->connects[i] = NULL;
-      }
-    }
-    /* now walk through the list of handles we kept around only to be
-       able to close connections "properly" */
-    cl = multi->closure;
-    while(cl) {
-      cl->easy_handle->state.shared_conn = NULL; /* no more shared */
-      if(cl->easy_handle->state.closed)
-        /* close handle only if curl_easy_cleanup() already has been called
-           for this easy handle */
-        Curl_close(cl->easy_handle);
-      n = cl->next;
-      free(cl);
-      cl= n;
-    }
-
-    Curl_rm_connc(multi->connc);
-
-    /* remove all easy handles */
-    easy = multi->easy.next;
-    while(easy) {
-      nexteasy=easy->next;
-      if(easy->easy_handle->dns.hostcachetype == HCACHE_MULTI) {
-        /* clear out the usage of the shared DNS cache */
-        easy->easy_handle->dns.hostcache = NULL;
-        easy->easy_handle->dns.hostcachetype = HCACHE_NONE;
-      }
-
-      /* Clear the pointer to the connection cache */
-      easy->easy_handle->state.connc = NULL;
-
-      Curl_easy_addmulti(easy->easy_handle, NULL); /* clear the association */
-
-      if (easy->msg)
-        free(easy->msg);
-      free(easy);
-      easy = nexteasy;
-    }
-
-    free(multi);
-
-    return CURLM_OK;
-  }
-  else
-    return CURLM_BAD_HANDLE;
-}
-
-CURLMsg *curl_multi_info_read(CURLM *multi_handle, int *msgs_in_queue)
-{
-  struct Curl_multi *multi=(struct Curl_multi *)multi_handle;
-
-  *msgs_in_queue = 0; /* default to none */
-
-  if(GOOD_MULTI_HANDLE(multi)) {
-    struct Curl_one_easy *easy;
-
-    if(!multi->num_msgs)
-      return NULL; /* no messages left to return */
-
-    easy=multi->easy.next;
-    while(easy) {
-      if(easy->msg_num) {
-        easy->msg_num--;
-        break;
-      }
-      easy = easy->next;
-    }
-    if(!easy)
-      return NULL; /* this means internal count confusion really */
-
-    multi->num_msgs--;
-    *msgs_in_queue = multi->num_msgs;
-
-    return &easy->msg->extmsg;
-  }
-  else
-    return NULL;
-}
-
-/*
- * singlesocket() checks what sockets we deal with and their "action state"
- * and if we have a different state in any of those sockets from last time we
- * call the callback accordingly.
- */
-static void singlesocket(struct Curl_multi *multi,
-                         struct Curl_one_easy *easy)
-{
-  curl_socket_t socks[MAX_SOCKSPEREASYHANDLE];
-  int i;
-  struct Curl_sh_entry *entry;
-  curl_socket_t s;
-  int num;
-  unsigned int curraction;
-
-  memset(&socks, 0, sizeof(socks));
-  for(i=0; i< MAX_SOCKSPEREASYHANDLE; i++)
-    socks[i] = CURL_SOCKET_BAD;
-
-  /* Fill in the 'current' struct with the state as it is now: what sockets to
-     supervise and for what actions */
-  curraction = multi_getsock(easy, socks, MAX_SOCKSPEREASYHANDLE);
-
-  /* We have 0 .. N sockets already and we get to know about the 0 .. M
-     sockets we should have from now on. Detect the differences, remove no
-     longer supervised ones and add new ones */
-
-  /* walk over the sockets we got right now */
-  for(i=0; (i< MAX_SOCKSPEREASYHANDLE) &&
-        (curraction & (GETSOCK_READSOCK(i) | GETSOCK_WRITESOCK(i)));
-      i++) {
-    int action = CURL_POLL_NONE;
-
-    s = socks[i];
-
-    /* get it from the hash */
-    entry = Curl_hash_pick(multi->sockhash, (char *)&s, sizeof(s));
-
-    if(curraction & GETSOCK_READSOCK(i))
-      action |= CURL_POLL_IN;
-    if(curraction & GETSOCK_WRITESOCK(i))
-      action |= CURL_POLL_OUT;
-
-    if(entry) {
-      /* yeps, already present so check if it has the same action set */
-      if(entry->action == action)
-        /* same, continue */
-        continue;
-    }
-    else {
-      /* this is a socket we didn't have before, add it! */
-      entry = sh_addentry(multi->sockhash, s, easy->easy_handle);
-      if(!entry)
-        /* fatal */
-        return;
-    }
-
-    multi->socket_cb(easy->easy_handle,
-                     s,
-                     action,
-                     multi->socket_userp,
-                     entry ? entry->socketp : NULL);
-
-    entry->action = action; /* store the current action state */
-  }
-
-  num = i; /* number of sockets */
-
-  /* when we've walked over all the sockets we should have right now, we must
-     make sure to detect sockets that are removed */
-  for(i=0; i< easy->numsocks; i++) {
-    int j;
-    s = easy->sockets[i];
-    for(j=0; j<num; j++) {
-      if(s == socks[j]) {
-        /* this is still supervised */
-        s = CURL_SOCKET_BAD;
-        break;
-      }
-    }
-    if(s != CURL_SOCKET_BAD) {
-      /* this socket has been removed. Remove it */
-
-      entry = Curl_hash_pick(multi->sockhash, (char *)&s, sizeof(s));
-      if(entry) {
-        /* just a precaution, this socket really SHOULD be in the hash already
-           but in case it isn't, we don't have to tell the app to remove it
-           either since it never got to know about it */
-        multi->socket_cb(easy->easy_handle,
-                         s,
-                         CURL_POLL_REMOVE,
-                         multi->socket_userp,
-                         entry ? entry->socketp : NULL);
-
-        sh_delentry(multi->sockhash, s);
-      }
-    }
-  }
-
-  memcpy(easy->sockets, socks, num*sizeof(curl_socket_t));
-  easy->numsocks = num;
-}
-
-static CURLMcode multi_socket(struct Curl_multi *multi,
-                              bool checkall,
-                              curl_socket_t s,
-                              int *running_handles)
-{
-  CURLMcode result = CURLM_OK;
-  struct SessionHandle *data = NULL;
-  struct Curl_tree *t;
-
-  if(checkall) {
-    struct Curl_one_easy *easyp;
-    /* *perform() deals with running_handles on its own */
-    result = curl_multi_perform(multi, running_handles);
-
-    /* walk through each easy handle and do the socket state change magic
-       and callbacks */
-    easyp=multi->easy.next;
-    while(easyp) {
-      singlesocket(multi, easyp);
-      easyp = easyp->next;
-    }
-
-    /* or should we fall-through and do the timer-based stuff? */
-    return result;
-  }
-  else if (s != CURL_SOCKET_TIMEOUT) {
-
-    struct Curl_sh_entry *entry =
-      Curl_hash_pick(multi->sockhash, (char *)&s, sizeof(s));
-
-    if(!entry)
-      /* unmatched socket, major problemo! */
-      return CURLM_BAD_SOCKET; /* better return code? */
-
-    data = entry->easy;
-
-    if(data->magic != CURLEASY_MAGIC_NUMBER)
-      /* bad bad bad bad bad bad bad */
-      return CURLM_INTERNAL_ERROR;
-
-    result = multi_runsingle(multi, data->set.one_easy);
-
-    if(result == CURLM_OK)
-      /* get the socket(s) and check if the state has been changed since
-         last */
-      singlesocket(multi, data->set.one_easy);
-
-    /* Now we fall-through and do the timer-based stuff, since we don't want
-       to force the user to have to deal with timeouts as long as at least one
-       connection in fact has traffic. */
-
-    data = NULL; /* set data to NULL again to avoid calling multi_runsingle()
-                    in case there's no need to */
-  }
-
-  /*
-   * The loop following here will go on as long as there are expire-times left
-   * to process in the splay and 'data' will be re-assigned for every expired
-   * handle we deal with.
-   */
-  do {
-    int key;
-    struct timeval now;
-
-    /* the first loop lap 'data' can be NULL */
-    if(data) {
-      result = multi_runsingle(multi, data->set.one_easy);
-
-      if(result == CURLM_OK)
-        /* get the socket(s) and check if the state has been changed since
-           last */
-        singlesocket(multi, data->set.one_easy);
-    }
-
-    /* Check if there's one (more) expired timer to deal with! This function
-       extracts a matching node if there is one */
-
-    now = Curl_tvnow();
-    key = now.tv_sec; /* drop the usec part */
-
-    multi->timetree = Curl_splaygetbest(key, multi->timetree, &t);
-    if(t) {
-      /* assign 'data' to be the easy handle we just removed from the splay
-         tree */
-      data = t->payload;
-      /* clear the expire time within the handle we removed from the
-         splay tree */
-      data->state.expiretime.tv_sec = 0;
-      data->state.expiretime.tv_usec = 0;
-    }
-
-  } while(t);
-
-  *running_handles = multi->num_alive;
-  return result;
-}
-
-CURLMcode curl_multi_setopt(CURLM *multi_handle,
-                            CURLMoption option, ...)
-{
-  struct Curl_multi *multi=(struct Curl_multi *)multi_handle;
-  CURLMcode res = CURLM_OK;
-  va_list param;
-
-  if(!GOOD_MULTI_HANDLE(multi))
-    return CURLM_BAD_HANDLE;
-
-  va_start(param, option);
-
-  switch(option) {
-  case CURLMOPT_SOCKETFUNCTION:
-    multi->socket_cb = va_arg(param, curl_socket_callback);
-    break;
-  case CURLMOPT_SOCKETDATA:
-    multi->socket_userp = va_arg(param, void *);
-    break;
-  case CURLMOPT_PIPELINING:
-    multi->pipelining_enabled = (bool)(0 != va_arg(param, long));
-    break;
-  case CURLMOPT_TIMERFUNCTION:
-    multi->timer_cb = va_arg(param, curl_multi_timer_callback);
-    break;
-  case CURLMOPT_TIMERDATA:
-    multi->timer_userp = va_arg(param, void *);
-    break;
-  default:
-    res = CURLM_UNKNOWN_OPTION;
-    break;
-  }
-  va_end(param);
-  return res;
-}
-
-
-CURLMcode curl_multi_socket_all(CURLM *multi_handle, int *running_handles)
-
-{
-  CURLMcode result = multi_socket((struct Curl_multi *)multi_handle,
-                                  TRUE, CURL_SOCKET_BAD, running_handles);
-  if (CURLM_OK == result)
-    update_timer((struct Curl_multi *)multi_handle);
-  return result;
-}
-
-static CURLMcode multi_timeout(struct Curl_multi *multi,
-                               long *timeout_ms)
-{
-  if(multi->timetree) {
-    /* we have a tree of expire times */
-    struct timeval now = Curl_tvnow();
-
-    /* splay the lowest to the bottom */
-    multi->timetree = Curl_splay(0, multi->timetree);
-
-    /* At least currently, the splay key is a time_t for the expire time */
-    *timeout_ms = (multi->timetree->key - now.tv_sec) * 1000 -
-      now.tv_usec/1000;
-    if(*timeout_ms < 0)
-      /* 0 means immediately */
-      *timeout_ms = 0;
-  }
-  else
-    *timeout_ms = -1;
-
-  return CURLM_OK;
-}
-
-CURLMcode curl_multi_timeout(CURLM *multi_handle,
-                             long *timeout_ms)
-{
-  struct Curl_multi *multi=(struct Curl_multi *)multi_handle;
-
-  /* First, make some basic checks that the CURLM handle is a good handle */
-  if(!GOOD_MULTI_HANDLE(multi))
-    return CURLM_BAD_HANDLE;
-
-  return multi_timeout(multi, timeout_ms);
-}
-
-/*
- * Tell the application it should update its timers, if it subscribes to the
- * update timer callback.
- */
-static int update_timer(struct Curl_multi *multi)
-{
-  long timeout_ms;
-  if (!multi->timer_cb)
-    return 0;
-  if ( multi_timeout(multi, &timeout_ms) != CURLM_OK )
-    return -1;
-  if ( timeout_ms < 0 )
-    return 0;
-
-  /* When multi_timeout() is done, multi->timetree points to the node with the
-   * timeout we got the (relative) time-out time for. We can thus easily check
-   * if this is the same (fixed) time as we got in a previous call and then
-   * avoid calling the callback again. */
-  if(multi->timetree->key == multi->timer_lastcall)
-    return 0;
-
-  multi->timer_lastcall = multi->timetree->key;
-
-  return multi->timer_cb((CURLM*)multi, timeout_ms, multi->timer_userp);
-}
-
-/* given a number of milliseconds from now to use to set the 'act before
-   this'-time for the transfer, to be extracted by curl_multi_timeout() */
-void Curl_expire(struct SessionHandle *data, long milli)
-{
-  struct Curl_multi *multi = data->multi;
-  struct timeval *nowp = &data->state.expiretime;
-  int rc;
-
-  /* this is only interesting for multi-interface using libcurl, and only
-     while there is still a multi interface struct remaining! */
-  if(!multi)
-    return;
-
-  if(!milli) {
-    /* No timeout, clear the time data. */
-    if(nowp->tv_sec) {
-      /* Since this is an cleared time, we must remove the previous entry from
-         the splay tree */
-      rc = Curl_splayremovebyaddr(multi->timetree,
-                                  &data->state.timenode,
-                                  &multi->timetree);
-      if(rc)
-        infof(data, "Internal error clearing splay node = %d\n", rc);
-      infof(data, "Expire cleared\n");
-      nowp->tv_sec = 0;
-      nowp->tv_usec = 0;
-    }
-  }
-  else {
-    struct timeval set;
-    int rest;
-
-    set = Curl_tvnow();
-    set.tv_sec += milli/1000;
-    set.tv_usec += (milli%1000)*1000;
-
-    rest = (int)(set.tv_usec - 1000000);
-    if(rest > 0) {
-      /* bigger than a full microsec */
-      set.tv_sec++;
-      set.tv_usec -= 1000000;
-    }
-
-    if(nowp->tv_sec) {
-      /* This means that the struct is added as a node in the splay tree.
-         Compare if the new time is earlier, and only remove-old/add-new if it
-         is. */
-      long diff = curlx_tvdiff(set, *nowp);
-      if(diff > 0)
-        /* the new expire time was later so we don't change this */
-        return;
-
-      /* Since this is an updated time, we must remove the previous entry from
-         the splay tree first and then re-add the new value */
-      rc = Curl_splayremovebyaddr(multi->timetree,
-                                  &data->state.timenode,
-                                  &multi->timetree);
-      if(rc)
-        infof(data, "Internal error removing splay node = %d\n", rc);
-    }
-
-    *nowp = set;
-#if 0
-    infof(data, "Expire at %ld / %ld (%ldms)\n",
-          (long)nowp->tv_sec, (long)nowp->tv_usec, milli);
-#endif
-    data->state.timenode.payload = data;
-    multi->timetree = Curl_splayinsert((int)nowp->tv_sec,
-                                       multi->timetree,
-                                       &data->state.timenode);
-  }
-#if 0
-  Curl_splayprint(multi->timetree, 0, TRUE);
-#endif
-}
-
-CURLMcode curl_multi_assign(CURLM *multi_handle,
-                            curl_socket_t s, void *hashp)
-{
-  struct Curl_sh_entry *there = NULL;
-  struct Curl_multi *multi = (struct Curl_multi *)multi_handle;
-
-  if(s != CURL_SOCKET_BAD)
-    there = Curl_hash_pick(multi->sockhash, (char *)&s, sizeof(curl_socket_t));
-
-  if(!there)
-    return CURLM_BAD_SOCKET;
-
-  there->socketp = hashp;
-
-  return CURLM_OK;
-}
-
-static bool multi_conn_using(struct Curl_multi *multi,
-                             struct SessionHandle *data)
-{
-  /* any live CLOSEACTION-connections pointing to the give 'data' ? */
-  int i;
-
-  for(i=0; i< multi->connc->num; i++) {
-    if(multi->connc->connects[i] &&
-       (multi->connc->connects[i]->data == data) &&
-       multi->connc->connects[i]->protocol & PROT_CLOSEACTION)
-      return TRUE;
-  }
-
-  return FALSE;
-}
-
-/* Add the given data pointer to the list of 'closure handles' that are kept
-   around only to be able to close some connections nicely - just make sure
-   that this handle isn't already added, like for the cases when an easy
-   handle is removed, added and removed again... */
-static void add_closure(struct Curl_multi *multi,
-                        struct SessionHandle *data)
-{
-  int i;
-  struct closure *cl = (struct closure *)calloc(sizeof(struct closure), 1);
-  struct closure *p=NULL;
-  struct closure *n;
-  if(cl) {
-    cl->easy_handle = data;
-    cl->next = multi->closure;
-    multi->closure = cl;
-  }
-
-  p = multi->closure;
-  cl = p->next; /* start immediately on the second since the first is the one
-                   we just added and it is _very_ likely to actually exist
-                   used in the cache since that's the whole purpose of adding
-                   it to this list! */
-
-  /* When adding, scan through all the other currently kept handles and see if
-     there are any connections still referring to them and kill them if not. */
-  while(cl) {
-    bool inuse = FALSE;
-    for(i=0; i< multi->connc->num; i++) {
-      if(multi->connc->connects[i] &&
-         (multi->connc->connects[i]->data == cl->easy_handle)) {
-        inuse = TRUE;
-        break;
-      }
-    }
-
-    n = cl->next;
-
-    if(!inuse) {
-      /* cl->easy_handle is now killable */
-      infof(data, "Delayed kill of easy handle %p\n", cl->easy_handle);
-      /* unmark it as not having a connection around that uses it anymore */
-      cl->easy_handle->state.shared_conn= NULL;
-      Curl_close(cl->easy_handle);
-      if(p)
-        p->next = n;
-      else
-        multi->closure = n;
-      free(cl);
-    }
-    else
-      p = cl;
-
-    cl = n;
-  }
-
-}
-
-#ifdef CURLDEBUG
-void curl_multi_dump(CURLM *multi_handle)
-{
-  struct Curl_multi *multi=(struct Curl_multi *)multi_handle;
-  struct Curl_one_easy *easy;
-  int i;
-  fprintf(stderr, "* Multi status: %d handles, %d alive\n",
-          multi->num_easy, multi->num_alive);
-  for(easy=multi->easy.next; easy; easy = easy->next) {
-    if(easy->state != CURLM_STATE_COMPLETED) {
-      /* only display handles that are not completed */
-      fprintf(stderr, "handle %p, state %s, %d sockets\n",
-              (void *)easy->easy_handle,
-              statename[easy->state], easy->numsocks);
-      for(i=0; i < easy->numsocks; i++) {
-        curl_socket_t s = easy->sockets[i];
-        struct Curl_sh_entry *entry =
-          Curl_hash_pick(multi->sockhash, (char *)&s, sizeof(s));
-
-        fprintf(stderr, "%d ", (int)s);
-        if(!entry) {
-          fprintf(stderr, "INTERNAL CONFUSION\n");
-          continue;
-        }
-        fprintf(stderr, "[%s %s] ",
-                entry->action&CURL_POLL_IN?"RECVING":"",
-                entry->action&CURL_POLL_OUT?"SENDING":"");
-      }
-      if(easy->numsocks)
-        fprintf(stderr, "\n");
-    }
-  }
-}
-#endif
diff --git a/exsrc/src/h5diff_correct_ansi.c b/exsrc/src/h5diff_correct_ansi.c
deleted file mode 100644
index a15e3ff27..000000000
--- a/exsrc/src/h5diff_correct_ansi.c
+++ /dev/null
@@ -1,2222 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include <stdlib.h>
-
-#include "H5private.h"
-#include "h5tools.h"
-#include "h5tools_utils.h"
-#include "h5diff.h"
-#include "ph5diff.h"
-
-/*
- * Debug printf macros. The prefix allows output filtering by test scripts.
- */
-#ifdef H5DIFF_DEBUG
-#define h5diffdebug(x) fprintf(stderr, "h5diff debug: " x)
-#define h5diffdebug2(x1, x2) fprintf(stderr, "h5diff debug: " x1, x2)
-#define h5diffdebug3(x1, x2, x3) fprintf(stderr, "h5diff debug: " x1, x2, x3)
-#define h5diffdebug4(x1, x2, x3, x4) fprintf(stderr, "h5diff debug: " x1, x2, x3, x4)
-#define h5diffdebug5(x1, x2, x3, x4, x5) fprintf(stderr, "h5diff debug: " x1, x2, x3, x4, x5)
-#else
-#define h5diffdebug(x)
-#define h5diffdebug2(x1, x2)
-#define h5diffdebug3(x1, x2, x3)
-#define h5diffdebug4(x1, x2, x3, x4)
-#define h5diffdebug5(x1, x2, x3, x4, x5)
-#endif
-
-
-/*-------------------------------------------------------------------------
- * Function: print_objname
- *
- * Purpose: check if object name is to be printed, only when:
- *  1) verbose mode
- *  2) when diff was found (normal mode)
- *-------------------------------------------------------------------------
- */
-int print_objname (diff_opt_t * options, hsize_t nfound)
-{
-    return ((options->m_verbose || nfound) && !options->m_quiet) ? 1 : 0;
-}
-
-/*-------------------------------------------------------------------------
- * Function: do_print_objname
- *
- * Purpose: print object name
- *
- *-------------------------------------------------------------------------
- */
-void do_print_objname (const char *OBJ, const char *path1, const char *path2, diff_opt_t * opts)
-{
-    /* if verbose level is higher than 0, put space line before
-     * displaying any object or symbolic links. This improves
-     * readability of the output. 
-     */
-    if (opts->m_verbose_level >= 1)
-        parallel_print("\n");
-    parallel_print("%-7s: <%s> and <%s>\n", OBJ, path1, path2);
-}
-
-/*-------------------------------------------------------------------------
- * Function: do_print_attrname
- *
- * Purpose: print attribute name
- *
- *-------------------------------------------------------------------------
- */
-void
-do_print_attrname (const char *attr, const char *path1, const char *path2)
-{
-    parallel_print("%-7s: <%s> and <%s>\n", attr, path1, path2);
-}
-
-/*-------------------------------------------------------------------------
- * Function: print_warn
- *
- * Purpose: check print warning condition.
- * Return: 
- *    1 if verbose mode
- *    0 if not verbos mode
- * Programmer: Jonathan Kim
- * Date: Feb 4, 2010
- *-------------------------------------------------------------------------
- */
-static int print_warn(diff_opt_t *options)
-{
-    return ((options->m_verbose))?1:0;
-}
-
-
-#ifdef H5_HAVE_PARALLEL
-/*-------------------------------------------------------------------------
- * Function: phdiff_dismiss_workers
- *
- * Purpose: tell all workers to end.
- *
- * Return: none
- *
- * Programmer: Albert Cheng
- *
- * Date: Feb 6, 2005
- *
- *-------------------------------------------------------------------------
- */
-void phdiff_dismiss_workers(void)
-{
-    int i;
-    for(i=1; i<g_nTasks; i++)
-        MPI_Send(NULL, 0, MPI_BYTE, i, MPI_TAG_END, MPI_COMM_WORLD);
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: print_manager_output
- *
- * Purpose: special function that prints any output accumulated by the
- *      manager task.
- *
- * Return: none
- *
- * Programmer: Leon Arber
- *
- * Date: Feb 7, 2005
- *
- *-------------------------------------------------------------------------
- */
-void print_manager_output(void)
-{
-    /* If there was something we buffered, let's print it now */
-    if( (outBuffOffset>0) && g_Parallel)
-    {
-        printf("%s", outBuff);
-
-        if(overflow_file)
-        {
-            int     tmp;
-            rewind(overflow_file);
-            while((tmp = getc(overflow_file)) >= 0)
-                putchar(tmp);
-            fclose(overflow_file);
-            overflow_file = NULL;
-        }
-
-        fflush(stdout);
-        memset(outBuff, 0, OUTBUFF_SIZE);
-        outBuffOffset = 0;
-    }
-    else if( (outBuffOffset>0) && !g_Parallel)
-    {
-        fprintf(stderr, "h5diff error: outBuffOffset>0, but we're not in parallel!\n");
-    }
-}
-
-/*-------------------------------------------------------------------------
- * Function: print_incoming_data
- *
- * Purpose: special function that prints any output that has been sent to the manager
- *      and is currently sitting in the incoming message queue
- *
- * Return: none
- *
- * Programmer: Leon Arber
- *
- * Date: March 7, 2005
- *
- *-------------------------------------------------------------------------
- */
-
-static void print_incoming_data(void)
-{
-    char data[PRINT_DATA_MAX_SIZE+1];
-    int  incomingMessage;
-    MPI_Status Status;
-
-    do
-    {
-        MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_PRINT_DATA, MPI_COMM_WORLD, &incomingMessage, &Status);
-        if(incomingMessage)
-        {
-            memset(data, 0, PRINT_DATA_MAX_SIZE+1);
-            MPI_Recv(data, PRINT_DATA_MAX_SIZE, MPI_CHAR, Status.MPI_SOURCE, MPI_TAG_PRINT_DATA, MPI_COMM_WORLD, &Status);
-
-            printf("%s", data);
-        }
-    } while(incomingMessage);
-}
-#endif
-
-/*-------------------------------------------------------------------------
- * Function: is_valid_options
- *
- * Purpose: check if options are valid
- *
- * Return: 
- *  1 : Valid
- *  0 : Not valid
- *
- * Programmer: Jonathan Kim
- *
- * Date: Feb 17, 2010
- *
- *------------------------------------------------------------------------*/
-static int is_valid_options(diff_opt_t *options)
-{
-    int ret=1; /* init to valid */
-
-    /*-----------------------------------------------
-     * no -q(quiet) with -v (verbose) or -r (report) */
-    if(options->m_quiet && (options->m_verbose || options->m_report))
-    {
-        parallel_print("Error: -q (quiet mode) cannot be added to verbose or report modes\n");
-        options->err_stat=1;
-        ret = 0;
-        goto out;
-    }
-
-    /* -------------------------------------------------------
-     * only allow --no-dangling-links along with --follow-symlinks */
-    if(options->no_dangle_links && !options->follow_links)
-    {
-        parallel_print("Error: --no-dangling-links must be used along with --follow-symlinks option.\n");
-        options->err_stat=1;
-        ret = 0;
-        goto out;
-    }
-
-out:
-
-    return ret;
-}
-
-/*-------------------------------------------------------------------------
- * Function: is_exclude_path
- *
- * Purpose: check if 'paths' are part of exclude path list
- *
- * Return:  
- *   1 - excluded path
- *   0 - not excluded path
- * 
- * Programmer: Jonathan Kim
- * Date: Aug 23, 2010
- *------------------------------------------------------------------------*/
-static int is_exclude_path (char * path, h5trav_type_t type, diff_opt_t *options)
-{
-    struct exclude_path_list * exclude_path_ptr;
-    int ret_cmp;
-    int ret = 0;
-    int len_grp;
-
-    /* check if exclude path option is given */
-    if (!options->exclude_path)
-        goto out;
-
-    /* assign to local exclude list pointer */
-    exclude_path_ptr = options->exclude;
-
-    /* search objects in exclude list */
-    while (NULL != exclude_path_ptr)
-    {
-        /* if given object is group, exclude its members as well */
-        if (exclude_path_ptr->obj_type == H5TRAV_TYPE_GROUP)
-        {
-            ret_cmp = HDstrncmp(exclude_path_ptr->obj_path, path,
-                                strlen(exclude_path_ptr->obj_path));
-            if (ret_cmp == 0)
-            {
-                /* check if given path belong to an excluding group, if so 
-                 * exclude it as well.
-                 * This verifies if “/grp1/dset1” is only under “/grp1”, but
-                 * not under “/grp1xxx/” group.  
-                 */ 
-                len_grp = HDstrlen(exclude_path_ptr->obj_path);
-                if (path[len_grp] == '/')
-                {
-                    /* belong to excluded group! */
-                    ret = 1;
-                    break;  /* while */
-                }
-            }
-        }
-        /* exclude target is not group, just exclude the object */
-        else  
-        {
-            ret_cmp = HDstrcmp(exclude_path_ptr->obj_path, path);
-            if (ret_cmp == 0)
-            {
-                /* excluded non-group object */
-                ret = 1;
-                /* assign type as scan progress, which is sufficient to 
-                 * determine type for excluding groups from the above if. */
-                exclude_path_ptr->obj_type = type;
-                break; /* while */
-            }
-        }
-        exclude_path_ptr = exclude_path_ptr->next;
-    }
-
-out:
-    return  ret;
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: free_exclude_path_list
- *
- * Purpose: free exclud object list from diff options
- *
- * Programmer: Jonathan Kim
- * Date: Aug 23, 2010
- *------------------------------------------------------------------------*/
-static void free_exclude_path_list(diff_opt_t *options)
-{
-    struct exclude_path_list * curr = options->exclude;
-    struct exclude_path_list * next;
-
-    while (NULL != curr)
-    {
-        next = curr->next;
-        HDfree(curr);
-        curr = next;
-    }
-}
-
-/*-------------------------------------------------------------------------
- * Function: build_match_list
- *
- * Purpose: get list of matching path_name from info1 and info2
- *
- * Note:
- *  Find common objects; the algorithm used for this search is the
- *  cosequential match algorithm and is described in
- *  Folk, Michael; Zoellick, Bill. (1992). File Structures. Addison-Wesley.
- *  Moved out from diff_match() to make code more flexible.
- *
- * Parameter:
- *  table_out [OUT] : return the list
- *
- * Programmer: Jonathan Kim
- *
- * Date: Aug 18, 2010
- *------------------------------------------------------------------------*/
-static void build_match_list (const char *objname1, trav_info_t *info1, const char *objname2, trav_info_t *info2, trav_table_t ** table_out, diff_opt_t *options)
-{
-    unsigned i;
-    size_t curr1 = 0;
-    size_t curr2 = 0;
-    unsigned infile[2];
-    char * path1_lp;
-    char * path2_lp;
-    h5trav_type_t type1_l;
-    h5trav_type_t type2_l;
-    int path1_offset = 0;
-    int path2_offset = 0;
-    int cmp;
-    trav_table_t *table;
-    size_t  idx;
-
-    /* init */
-    trav_table_init( &table );
-
-    /*
-     * This is necessary for the case that given objects are group and
-     * have different names (ex: obj1 is /grp1 and obj2 is /grp5).
-     * All the objects belong to given groups are the cadidates.
-     * So prepare to compare paths without the group names.
-     */
-    /* if obj1 is not root */
-    if (HDstrcmp (objname1,"/") != 0)
-        path1_offset = HDstrlen(objname1);
-    /* if obj2 is not root */
-    if (HDstrcmp (objname2,"/") != 0)
-        path2_offset = HDstrlen(objname2);
-
-    /*--------------------------------------------------
-    * build the list
-    */
-    while(curr1 < info1->nused && curr2 < info2->nused)
-    {
-        
-        path1_lp = (info1->paths[curr1].path) + path1_offset;
-        path2_lp = (info2->paths[curr2].path) + path2_offset;
-        type1_l = info1->paths[curr1].type;
-        type2_l = info2->paths[curr2].type;
-        
-        /* criteria is string compare */
-        cmp = HDstrcmp(path1_lp, path2_lp);
-
-        if(cmp == 0) {
-            if(!is_exclude_path(path1_lp, type1_l, options))
-            {
-                infile[0] = 1;
-                infile[1] = 1;
-                trav_table_addflags(infile, path1_lp, info1->paths[curr1].type, table);
-                /* if the two point to the same target object,
-                 * mark that in table */
-                if (info1->paths[curr1].fileno == info2->paths[curr2].fileno &&
-                    info1->paths[curr1].objno == info2->paths[curr2].objno )
-                {
-                    idx = table->nobjs - 1;
-                    table->objs[idx].is_same_trgobj = 1;
-                }
-            }
-            curr1++;
-            curr2++;
-        } /* end if */
-        else if(cmp < 0)
-        {
-            if(!is_exclude_path(path1_lp, type1_l, options))
-            {
-                infile[0] = 1;
-                infile[1] = 0;
-                trav_table_addflags(infile, path1_lp, info1->paths[curr1].type, table);
-            }
-            curr1++;
-        } /* end else-if */
-        else
-        {
-            if (!is_exclude_path(path2_lp, type2_l, options))
-            {
-                infile[0] = 0;
-                infile[1] = 1;
-                trav_table_addflags(infile, path2_lp, info2->paths[curr2].type, table);
-            }
-            curr2++;
-        } /* end else */
-    } /* end while */
-
-    /* list1 did not end */
-    infile[0] = 1;
-    infile[1] = 0;
-    while(curr1 < info1->nused)
-    {
-        if(!is_exclude_path(path1_lp, type1_l, options))
-        {
-            path1_lp = (info1->paths[curr1].path) + path1_offset;
-            trav_table_addflags(infile, path1_lp, info1->paths[curr1].type, table);
-        }
-        curr1++;
-    } /* end while */
-
-    /* list2 did not end */
-    infile[0] = 0;
-    infile[1] = 1;
-    while(curr2 < info2->nused)
-    {
-        if (!is_exclude_path(path2_lp, type2_l, options))
-        {
-            path2_lp = (info2->paths[curr2].path) + path2_offset;
-            trav_table_addflags(infile, path2_lp, info2->paths[curr2].type, table);
-        } 
-        curr2++;
-    } /* end while */
-
-    free_exclude_path_list (options);
-   /*------------------------------------------------------
-    * print the list
-    */
-    if(options->m_verbose)
-    {
-        parallel_print("\n");
-        /* if given objects is group under root */
-        if (HDstrcmp (objname1,"/") || HDstrcmp (objname2,"/"))
-            parallel_print("group1   group2\n");
-        else
-            parallel_print("file1     file2\n");
-        parallel_print("---------------------------------------\n");
-        for(i = 0; i < table->nobjs; i++) 
-        {
-            char c1, c2;
-            c1 = (table->objs[i].flags[0]) ? 'x' : ' ';
-            c2 = (table->objs[i].flags[1]) ? 'x' : ' ';
-            parallel_print("%5c %6c    %-15s\n", c1, c2, table->objs[i].name);
-        } /* end for */
-        parallel_print ("\n");
-    } /* end if */
-
-    *table_out = table;
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: trav_grp_objs
- *
- * Purpose: 
- *  Call back function from h5trav_visit(). 
- *
- * Programmer: Jonathan Kim
- *
- * Date: Aug 16, 2010
- *------------------------------------------------------------------------*/
-static herr_t trav_grp_objs(const char *path, const H5O_info_t *oinfo,
-    const char *already_visited, void *udata)
-{
-    trav_info_visit_obj(path, oinfo, already_visited, udata);
-
-    return 0;
-} 
-
-/*-------------------------------------------------------------------------
- * Function: trav_grp_symlinks
- *
- * Purpose: 
- *  Call back function from h5trav_visit(). 
- *  Track and extra checkings while visiting all symbolic-links.
- *
- * Programmer: Jonathan Kim
- *
- * Date: Aug 16, 2010
- *------------------------------------------------------------------------*/
-static herr_t trav_grp_symlinks(const char *path, const H5L_info_t *linfo, 
-                               void *udata)
-{                               
-    trav_info_t *tinfo = (trav_info_t *)udata;
-    diff_opt_t *opts = (diff_opt_t *)tinfo->opts;
-    int ret;
-    h5tool_link_info_t lnk_info;
-    const char *ext_fname;
-    const char *ext_path;
-
-    /* init linkinfo struct */
-    memset(&lnk_info, 0, sizeof(h5tool_link_info_t));
-
-    if (!opts->follow_links)
-    {
-        trav_info_visit_lnk(path, linfo, tinfo);
-        goto done;
-    }
-
-    switch(linfo->type)
-    {
-    case H5L_TYPE_SOFT:
-        ret = H5tools_get_symlink_info(tinfo->fid, path, &lnk_info, opts->follow_links);
-        /* error */
-        if (ret < 0)
-            goto done;
-        /* no dangling link option given and detect dangling link */
-        else if (ret == 0)
-        {
-            tinfo->symlink_visited.dangle_link = TRUE;
-            trav_info_visit_lnk(path, linfo, tinfo);
-            if (opts->no_dangle_links)
-                opts->err_stat = 1; /* make dgangling link is error */
-            goto done;
-        }
-
-        /* check if already visit the target object */        
-        if(symlink_is_visited( &(tinfo->symlink_visited), linfo->type, NULL, lnk_info.trg_path)) 
-            goto done;
-
-        /* add this link as visited link */
-        if(symlink_visit_add( &(tinfo->symlink_visited), linfo->type, NULL, lnk_info.trg_path) < 0) 
-            goto done;
-                
-        if(h5trav_visit(tinfo->fid, path, TRUE, TRUE,
-                     trav_grp_objs,trav_grp_symlinks, tinfo) < 0)
-        {
-            parallel_print("Error: Could not get file contents\n");
-            opts->err_stat = 1;
-            goto done;
-        }
-        break;
-    
-    case H5L_TYPE_EXTERNAL:    
-        ret = H5tools_get_symlink_info(tinfo->fid, path, &lnk_info, opts->follow_links);
-        /* error */
-        if (ret < 0)
-            goto done;
-        /* no dangling link option given and detect dangling link */
-        else if (ret == 0)
-        {
-            tinfo->symlink_visited.dangle_link = TRUE;
-            trav_info_visit_lnk(path, linfo, tinfo);
-            if (opts->no_dangle_links)
-                opts->err_stat = 1; /* make dgangling link is error */
-            goto done;
-        }
-
-        if(H5Lunpack_elink_val(lnk_info.trg_path, linfo->u.val_size, NULL, &ext_fname, &ext_path) < 0) 
-            goto done;
-
-        /* check if already visit the target object */        
-        if(symlink_is_visited( &(tinfo->symlink_visited), linfo->type, ext_fname, ext_path)) 
-            goto done;
-
-        /* add this link as visited link */
-        if(symlink_visit_add( &(tinfo->symlink_visited), linfo->type, ext_fname, ext_path) < 0) 
-            goto done;
-                
-        if(h5trav_visit(tinfo->fid, path, TRUE, TRUE,
-                        trav_grp_objs,trav_grp_symlinks, tinfo) < 0)
-        {
-            parallel_print("Error: Could not get file contents\n");
-            opts->err_stat = 1;
-            goto done;
-        }
-        break;
-    default:
-        ;
-        break;
-    } /* end of switch */
-
-done:    
-    if (lnk_info.trg_path)
-        HDfree(lnk_info.trg_path);
-    return 0;
-}    
-
-
-/*-------------------------------------------------------------------------
- * Function: h5diff
- *
- * Purpose: public function, can be called in an application program.
- *   return differences between 2 HDF5 files
- *
- * Return: Number of differences found.
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: October 22, 2003
- *
- *-------------------------------------------------------------------------
- */
-hsize_t h5diff(const char *fname1,
-               const char *fname2,
-               const char *objname1,
-               const char *objname2,
-               diff_opt_t *options)
-{
-    hid_t        file1_id = (-1);
-    hid_t        file2_id = (-1);
-    char         filenames[2][MAX_FILENAME];
-    hsize_t      nfound = 0;
-    int i;
-    int l_ret;
-    const char * obj1fullname = NULL;
-    const char * obj2fullname = NULL;
-    /* init to group type */
-    h5trav_type_t obj1type = H5TRAV_TYPE_GROUP;
-    h5trav_type_t obj2type = H5TRAV_TYPE_GROUP;
-    /* for single object */
-    H5O_info_t oinfo1, oinfo2; /* object info */
-    trav_info_t  *info1_obj = NULL;
-    trav_info_t  *info2_obj = NULL;
-    /* for group object */
-    trav_info_t  *info1_grp = NULL;
-    trav_info_t  *info2_grp = NULL;
-    /* local pointer */
-    trav_info_t  *info1_lp;
-    trav_info_t  *info2_lp;
-    /* link info from specified object */
-    H5L_info_t src_linfo1;
-    H5L_info_t src_linfo2;
-    /* link info from member object */
-    h5tool_link_info_t trg_linfo1;
-    h5tool_link_info_t trg_linfo2;
-    /* list for common objects */
-    trav_table_t *match_list = NULL;
-
-    /* init filenames */
-    HDmemset(filenames, 0, MAX_FILENAME * 2);
-    /* init link info struct */
-    HDmemset(&trg_linfo1, 0, sizeof(h5tool_link_info_t));
-    HDmemset(&trg_linfo2, 0, sizeof(h5tool_link_info_t));
-
-   /*-------------------------------------------------------------------------
-    * check invalid combination of options
-    *-----------------------------------------------------------------------*/
-    if(!is_valid_options(options))
-        goto out;
-
-    options->cmn_objs = 1; /* eliminate warning */
-
-    /*-------------------------------------------------------------------------
-    * open the files first; if they are not valid, no point in continuing
-    *-------------------------------------------------------------------------
-    */
-
-    /* disable error reporting */
-    H5E_BEGIN_TRY
-    {
-        /* open file 1 */
-        if((file1_id = h5tools_fopen(fname1, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0) 
-        {
-            parallel_print("h5diff: <%s>: unable to open file\n", fname1);
-            options->err_stat = 1;
-            goto out;
-        } /* end if */
-
-
-        /* open file 2 */
-        if((file2_id = h5tools_fopen(fname2, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0) 
-        {
-            parallel_print("h5diff: <%s>: unable to open file\n", fname2);
-            options->err_stat = 1;
-            goto out;
-        } /* end if */
-    /* enable error reporting */
-    } H5E_END_TRY;
-
-    /*-------------------------------------------------------------------------
-    * Initialize the info structs
-    *-------------------------------------------------------------------------
-    */
-    trav_info_init(fname1, file1_id, &info1_obj);
-    trav_info_init(fname2, file2_id, &info2_obj);
-
-    /* if any object is specified */
-    if (objname1)
-    {
-        /* malloc 2 more for "/" and end-of-line */
-        obj1fullname = (char*)HDcalloc(HDstrlen(objname1) + 2, sizeof(char));
-        obj2fullname = (char*)HDcalloc(HDstrlen(objname2) + 2, sizeof(char));
-
-        /* make the given object1 fullpath, start with "/"  */
-        if (HDstrncmp(objname1, "/", 1))
-        {
-            HDstrcpy(obj1fullname, "/");
-            HDstrcat(obj1fullname, objname1);
-        }
-        else
-            HDstrcpy(obj1fullname, objname1);
-
-        /* make the given object2 fullpath, start with "/" */
-        if (HDstrncmp(objname2, "/", 1))
-        {
-            HDstrcpy(obj2fullname, "/");
-            HDstrcat(obj2fullname, objname2);
-        }
-        else
-            HDstrcpy(obj2fullname, objname2);
-
-        /*----------------------------------------------------------
-         * check if obj1 is root, group, single object or symlink
-         */
-        if(!HDstrcmp(obj1fullname, "/"))
-        {
-            obj1type = H5TRAV_TYPE_GROUP;
-        }
-        else
-        {
-            /* check if link itself exist */
-            if(H5Lexists(file1_id, obj1fullname, H5P_DEFAULT) <= 0) 
-            {
-                parallel_print ("Object <%s> could not be found in <%s>\n", obj1fullname, fname1);
-                options->err_stat = 1;
-                goto out;
-            }
-            /* get info from link */
-            if(H5Lget_info(file1_id, obj1fullname, &src_linfo1, H5P_DEFAULT) < 0) 
-            {
-                parallel_print("Unable to get link info from <%s>\n", obj1fullname);
-                goto out;
-            }
-
-            info1_lp = info1_obj;
-
-            /* 
-             * check the type of specified path for hard and symbolic links
-             */
-            if(src_linfo1.type == H5L_TYPE_HARD)
-            {
-                /* optional data pass */
-                info1_obj->opts = (diff_opt_t*)options;
-
-                if(H5Oget_info_by_name(file1_id, obj1fullname, &oinfo1, H5P_DEFAULT) < 0)
-                {
-                    parallel_print("Error: Could not get file contents\n");
-                    options->err_stat = 1;
-                    goto out;
-                }
-                obj1type = oinfo1.type;
-                trav_info_add(info1_obj, obj1fullname, obj1type);
-            }
-            else if (src_linfo1.type == H5L_TYPE_SOFT)
-            {
-                obj1type = H5TRAV_TYPE_LINK;
-                trav_info_add(info1_obj, obj1fullname, obj1type);
-            }
-            else if (src_linfo1.type == H5L_TYPE_EXTERNAL)
-            {
-                obj1type = H5TRAV_TYPE_UDLINK;
-                trav_info_add(info1_obj, obj1fullname, obj1type);
-            }
-        }
-
-        /*----------------------------------------------------------
-         * check if obj2 is root, group, single object or symlink
-         */
-        if(!HDstrcmp(obj2fullname, "/"))
-        {
-            obj2type = H5TRAV_TYPE_GROUP;
-        }
-        else
-        {
-            /* check if link itself exist */
-            if(H5Lexists(file2_id, obj2fullname, H5P_DEFAULT) <= 0) 
-            {
-                parallel_print ("Object <%s> could not be found in <%s>\n", obj2fullname, fname2);
-                options->err_stat = 1;
-                goto out;
-            }
-            /* get info from link */
-            if(H5Lget_info(file2_id, obj2fullname, &src_linfo2, H5P_DEFAULT) < 0) 
-            {
-                parallel_print("Unable to get link info from <%s>\n", obj2fullname);
-                goto out;
-            }
-
-            info2_lp = info2_obj;
-
-            /* 
-             * check the type of specified path for hard and symbolic links
-             */
-            if(src_linfo2.type == H5L_TYPE_HARD)
-            {
-                /* optional data pass */
-                info2_obj->opts = (diff_opt_t*)options;
-
-                if(H5Oget_info_by_name(file2_id, obj2fullname, &oinfo2, H5P_DEFAULT) < 0)
-                {
-                    parallel_print("Error: Could not get file contents\n");
-                    options->err_stat = 1;
-                    goto out;
-                }
-                obj2type = oinfo2.type;
-                trav_info_add(info2_obj, obj2fullname, obj2type);
-            }
-            else if (src_linfo2.type == H5L_TYPE_SOFT)
-            {
-                obj2type = H5TRAV_TYPE_LINK;
-                trav_info_add(info2_obj, obj2fullname, obj2type);
-            }
-            else if (src_linfo2.type == H5L_TYPE_EXTERNAL)
-            {
-                obj2type = H5TRAV_TYPE_UDLINK;
-                trav_info_add(info2_obj, obj2fullname, obj2type);
-            }
-        }           
-    }
-    /* if no object specified */
-    else
-    {
-        /* set root group */
-        obj1fullname = (char*)HDcalloc(2, sizeof(char));
-        HDstrcat(obj1fullname, "/");
-        obj2fullname = (char*)HDcalloc(2, sizeof(char));
-        HDstrcat(obj2fullname, "/");
-    }
-
-   /* 
-    * If verbose options is used, need to traverse thorugh the list of objects 
-    * in the group to print out objects information.
-    * Use h5tools_is_obj_same() to improve performance by skipping 
-    * comparing details of same objects. 
-    */
-    if(!(options->m_verbose || options->m_report))
-    {
-        if (h5tools_is_obj_same(file1_id,obj1fullname,file2_id,obj2fullname)!=0)
-            goto out;
-    }
-
-    /*---------------------------------------------
-     * check for following symlinks 
-     */
-    if (options->follow_links)
-    {
-        /* pass how to handle printing warning to linkinfo option */
-        if(print_warn(options))
-            trg_linfo1.opt.msg_mode = trg_linfo2.opt.msg_mode = 1;
-
-        /*-------------------------------
-         * check symbolic link (object1)
-         */
-        l_ret = H5tools_get_symlink_info(file1_id, obj1fullname, &trg_linfo1, TRUE);
-        /* dangling link */
-        if (l_ret == 0)
-        {
-            if (options->no_dangle_links)
-            {
-                /* gangling link is error */
-                if(options->m_verbose)
-                    parallel_print("Warning: <%s> is a dangling link.\n", obj1fullname);
-                options->err_stat = 1;
-                goto out;
-            }
-            else
-            {
-                if(options->m_verbose)
-                    parallel_print("obj1 <%s> is a dangling link.\n", obj1fullname);
-                nfound++;
-                print_found(nfound);
-                goto out;
-            }
-        }
-        else if(l_ret < 0) /* fail */
-        {
-            parallel_print ("Object <%s> could not be found in <%s>\n", obj1fullname, fname1);
-            options->err_stat = 1;
-            goto out;
-        }
-        else if(l_ret != 2) /* symbolic link */
-            obj1type = trg_linfo1.trg_type;
-
-        /*-------------------------------
-         * check symbolic link (object2)
-         */
-        l_ret = H5tools_get_symlink_info(file2_id, obj2fullname, &trg_linfo2, TRUE);
-        /* dangling link */
-        if (l_ret == 0)
-        {
-            if (options->no_dangle_links)
-            {
-                /* gangling link is error */
-                if(options->m_verbose)
-                    parallel_print("Warning: <%s> is a dangling link.\n", obj2fullname);
-                options->err_stat = 1;
-                goto out;
-            }
-            else
-            {
-                if(options->m_verbose)
-                    parallel_print("obj2 <%s> is a dangling link.\n", obj2fullname);
-                nfound++;
-                print_found(nfound);
-                goto out;
-            }
-        }
-        else if(l_ret < 0) /* fail */ 
-        {
-            parallel_print ("Object <%s> could not be found in <%s>\n", obj2fullname, fname2);
-            options->err_stat = 1;
-            goto out;
-        }
-        else if(l_ret != 2)  /* symbolic link */
-            obj2type = trg_linfo2.trg_type;
-    } /* end of if follow symlinks */
-
-
-    /* if both obj1 and obj2 are group */
-    if (obj1type == H5TRAV_TYPE_GROUP && obj2type == H5TRAV_TYPE_GROUP)
-    {
-
-        /* 
-         * traverse group1 
-         */
-        trav_info_init(fname1, file1_id, &info1_grp);
-        /* optional data pass */
-        info1_grp->opts = (diff_opt_t*)options;
-
-        if(h5trav_visit(file1_id,obj1fullname,TRUE,TRUE,
-                        trav_grp_objs,trav_grp_symlinks, info1_grp) < 0)
-        {
-            parallel_print("Error: Could not get file contents\n");
-            options->err_stat = 1;
-            goto out;
-        }
-        info1_lp = info1_grp;
-
-        /* 
-         * traverse group2 
-         */
-        trav_info_init(fname2, file2_id, &info2_grp);
-        /* optional data pass */
-        info2_grp->opts = (diff_opt_t*)options;
-
-        if(h5trav_visit(file2_id,obj2fullname,TRUE,TRUE,
-                        trav_grp_objs,trav_grp_symlinks, info2_grp) < 0)
-        {
-            parallel_print("Error: Could not get file contents\n");
-            options->err_stat = 1;
-            goto out;
-        } /* end if */
-        info2_lp = info2_grp;
-
-
-#ifdef H5_HAVE_PARALLEL
-        if(g_Parallel)
-        {
-            if((HDstrlen(fname1) > MAX_FILENAME) || 
-               (HDstrlen(fname2) > MAX_FILENAME))
-            {
-                fprintf(stderr, "The parallel diff only supports path names up to %d characters\n", MAX_FILENAME);
-                MPI_Abort(MPI_COMM_WORLD, 0);
-            } /* end if */
-
-            HDstrcpy(filenames[0], fname1);
-            HDstrcpy(filenames[1], fname2);
-
-            /* Alert the worker tasks that there's going to be work. */
-            for(i = 1; i < g_nTasks; i++)
-                MPI_Send(filenames, (MAX_FILENAME * 2), MPI_CHAR, i, MPI_TAG_PARALLEL, MPI_COMM_WORLD);
-        } /* end if */
-#endif
-        build_match_list (obj1fullname, info1_lp, obj2fullname, info2_lp, 
-                         &match_list, options);
-        nfound = diff_match(file1_id, obj1fullname, info1_lp, 
-                            file2_id, obj2fullname, info2_lp, 
-                            match_list, options); 
-    }
-    else
-    {
-#ifdef H5_HAVE_PARALLEL
-        if(g_Parallel)
-            /* Only single object diff, parallel workers won't be needed */
-            phdiff_dismiss_workers();
-#endif
-
-        nfound = diff_compare(file1_id, fname1, obj1fullname, info1_lp,
-                              file2_id, fname2, obj2fullname, info2_lp,
-                              options);
-    }
-
-out:
-#ifdef H5_HAVE_PARALLEL
-    if(g_Parallel)
-        /* All done at this point, let tasks know that they won't be needed */
-        phdiff_dismiss_workers();
-#endif
-    /* free buffers in trav_info structures */
-    if (info1_obj)
-        trav_info_free(info1_obj);
-    if (info2_obj)
-        trav_info_free(info2_obj);
-
-    if (info1_grp)
-        trav_info_free(info1_grp);
-    if (info2_grp)
-        trav_info_free(info2_grp);
-
-    /* free buffers */
-    if (obj1fullname)
-        HDfree(obj1fullname);
-    if (obj2fullname)
-        HDfree(obj2fullname);
-
-    /* free link info buffer */
-    if (trg_linfo1.trg_path)
-        HDfree(trg_linfo1.trg_path);
-    if (trg_linfo2.trg_path)
-        HDfree(trg_linfo2.trg_path);
-
-    /* close */
-    H5E_BEGIN_TRY
-    {
-        H5Fclose(file1_id);
-        H5Fclose(file2_id);
-    } H5E_END_TRY;
-
-    return nfound;
-}
-
-
-
-/*-------------------------------------------------------------------------
- * Function: diff_match
- *
- * Purpose: 
- *  Compare common objects in given groups according to table structure. 
- *  The table structure has flags which can be used to find common objects 
- *  and will be compared. 
- *  Common object means same name (absolute path) objects in both location.
- *
- * Return: Number of differences found
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: May 9, 2003
- *
- * Modifications: Jan 2005 Leon Arber, larber@uiuc.edu
- *    Added support for parallel diffing
- *
- * Pedro Vicente, pvn@hdfgroup.org, Nov 4, 2008
- *    Compare the graph and make h5diff return 1 for difference if
- * 1) the number of objects in file1 is not the same as in file2
- * 2) the graph does not match, i.e same names (absolute path)
- * 3) objects with the same name are not of the same type
- *-------------------------------------------------------------------------
- */
-hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
-                   hid_t file2_id, const char *grp2, trav_info_t *info2,
-                   trav_table_t *table, diff_opt_t *options)
-{
-    hsize_t      nfound = 0;
-    unsigned     i;
-
-    char * grp1_path = "";
-    char * grp2_path = "";
-    char * obj1_fullpath = NULL;
-    char * obj2_fullpath = NULL;
-    h5trav_type_t objtype;
-    diff_args_t argdata;
-
-
-    /* 
-     * if not root, prepare object name to be pre-appended to group path to
-     * make full path
-     */
-    if (HDstrcmp (grp1, "/"))
-        grp1_path = grp1;
-    if (HDstrcmp (grp2, "/"))
-        grp2_path = grp2;
-
-    /*-------------------------------------------------------------------------
-    * regarding the return value of h5diff (0, no difference in files, 1 difference )
-    * 1) the number of objects in file1 must be the same as in file2
-    * 2) the graph must match, i.e same names (absolute path)
-    * 3) objects with the same name must be of the same type
-    *-------------------------------------------------------------------------
-    */     
-       
-    /* not valid compare nused when --exclude-path option is used */
-    if (!options->exclude_path)
-    {
-        /* number of different objects */
-        if ( info1->nused != info2->nused )
-        {
-            options->contents = 0;
-        }
-    }
-    
-    /* objects in one file and not the other */
-    for( i = 0; i < table->nobjs; i++)
-    {
-        if( table->objs[i].flags[0] != table->objs[i].flags[1] )
-        {
-            options->contents = 0;
-            break;
-        }
-    }
-
-    /* objects with the same name but different HDF5 types */
-    for( i = 0; i < table->nobjs; i++) 
-    {
-        if ( table->objs[i].flags[0] && table->objs[i].flags[1] )
-        {
-            if ( table->objs[i].type != table->objs[i].type )
-            {
-                options->contents = 0;
-            }
-        }
-    }
-
-    /*-------------------------------------------------------------------------
-    * do the diff for common objects
-    *-------------------------------------------------------------------------
-    */
-#ifdef H5_HAVE_PARALLEL
-    {
-    char *workerTasks = (char*)HDmalloc((g_nTasks - 1) * sizeof(char));
-    int n;
-    int busyTasks = 0;
-    struct diffs_found nFoundbyWorker;
-    struct diff_mpi_args args;
-    int havePrintToken = 1;
-    MPI_Status Status;
-
-    /*set all tasks as free */
-    HDmemset(workerTasks, 1, (g_nTasks - 1));
-#endif
-
-    for(i = 0; i < table->nobjs; i++)
-    {
-        if( table->objs[i].flags[0] && table->objs[i].flags[1])
-        {
-            objtype = table->objs[i].type;
-            /* make full path for obj1 */
-            obj1_fullpath = (char*)HDcalloc (strlen(grp1_path) + strlen (table->objs[i].name) + 1, sizeof (char));
-            HDstrcpy(obj1_fullpath, grp1_path);
-            HDstrcat(obj1_fullpath, table->objs[i].name);
-
-            /* make full path for obj2 */
-            obj2_fullpath = (char*)HDcalloc (strlen(grp2_path) + strlen (table->objs[i].name) + 1, sizeof (char));
-            HDstrcpy(obj2_fullpath, grp2_path);
-            HDstrcat(obj2_fullpath, table->objs[i].name);
-
-            /* Set argdata to pass other args into diff() */
-            argdata.type = objtype;
-            argdata.is_same_trgobj = table->objs[i].is_same_trgobj;
-
-            options->cmn_objs = 1;
-            if(!g_Parallel)
-            {
-                nfound += diff(file1_id, obj1_fullpath,
-                               file2_id, obj2_fullpath, 
-                               options, &argdata);
-            } /* end if */
-#ifdef H5_HAVE_PARALLEL
-            else
-            {
-                int workerFound = 0;
-
-                h5diffdebug("beginning of big else block\n");
-                /* We're in parallel mode */
-                /* Since the data type of diff value is hsize_t which can
-                * be arbitary large such that there is no MPI type that
-                * matches it, the value is passed between processes as
-                * an array of bytes in order to be portable.  But this
-                * may not work in non-homogeneous MPI environments.
-                */
-
-                /*Set up args to pass to worker task. */
-                if(HDstrlen(obj1_fullpath) > 255 || 
-                   HDstrlen(obj2_fullpath) > 255)
-                {
-                    printf("The parallel diff only supports object names up to 255 characters\n");
-                    MPI_Abort(MPI_COMM_WORLD, 0);
-                } /* end if */
-
-                /* set args struct to pass */
-                HDstrcpy(args.name1, obj1_fullpath);
-                HDstrcpy(args.name2, obj2_fullpath);
-                args.options = *options;
-                args.argdata.type = objtype;
-                args.argdata.is_same_trgobj = table->objs[i].is_same_trgobj;
-
-                h5diffdebug2("busyTasks=%d\n", busyTasks);
-                /* if there are any outstanding print requests, let's handle one. */
-                if(busyTasks > 0)
-                {
-                    int incomingMessage;
-
-                    /* check if any tasks freed up, and didn't need to print. */
-                    MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_DONE, MPI_COMM_WORLD, &incomingMessage, &Status);
-
-                    /* first block*/
-                    if(incomingMessage)
-                    {
-                        workerTasks[Status.MPI_SOURCE - 1] = 1;
-                        MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_DONE, MPI_COMM_WORLD, &Status);
-                        nfound += nFoundbyWorker.nfound;
-                        options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
-                        busyTasks--;
-                    } /* end if */
-
-                    /* check to see if the print token was returned. */
-                    if(!havePrintToken)
-                    {
-                        /* If we don't have the token, someone is probably sending us output */
-                        print_incoming_data();
-
-                        /* check incoming queue for token */
-                        MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &incomingMessage, &Status);
-
-                        /* incoming token implies free task. */
-                        if(incomingMessage) {
-                            workerTasks[Status.MPI_SOURCE - 1] = 1;
-                            MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &Status);
-                            nfound += nFoundbyWorker.nfound;
-                            options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
-                            busyTasks--;
-                            havePrintToken = 1;
-                        } /* end if */
-                    } /* end if */
-
-                    /* check to see if anyone needs the print token. */
-                    if(havePrintToken)
-                    {
-                        /* check incoming queue for print token requests */
-                        MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_TOK_REQUEST, MPI_COMM_WORLD, &incomingMessage, &Status);
-                        if(incomingMessage)
-                        {
-                            MPI_Recv(NULL, 0, MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_TOK_REQUEST, MPI_COMM_WORLD, &Status);
-                            MPI_Send(NULL, 0, MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_PRINT_TOK, MPI_COMM_WORLD);
-                            havePrintToken = 0;
-                        } /* end if */
-                    } /* end if */
-                } /* end if */
-
-                /* check array of tasks to see which ones are free.
-                * Manager task never does work, so freeTasks[0] is really
-                * worker task 0. */
-                for(n = 1; (n < g_nTasks) && !workerFound; n++)
-                {
-                    if(workerTasks[n-1])
-                    {
-                        /* send file id's and names to first free worker */
-                        MPI_Send(&args, sizeof(args), MPI_BYTE, n, MPI_TAG_ARGS, MPI_COMM_WORLD);
-
-                        /* increment counter for total number of prints. */
-                        busyTasks++;
-
-                        /* mark worker as busy */
-                        workerTasks[n - 1] = 0;
-                        workerFound = 1;
-                    } /* end if */
-                } /* end for */
-
-                h5diffdebug2("workerfound is %d \n", workerFound);
-                if(!workerFound)
-                {
-                    /* if they were all busy, we've got to wait for one free up
-                     *  before we can move on.  If we don't have the token, some
-                     * task is currently printing so we'll wait for that task to
-                     * return it.
-                     */
-
-                    if(!havePrintToken)
-                    {
-                        while(!havePrintToken)
-                        {
-                            int incomingMessage;
-
-                            print_incoming_data();
-                            MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &incomingMessage, &Status);
-                            if(incomingMessage)
-                            {
-                                MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, MPI_ANY_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &Status);
-                                havePrintToken = 1;
-                                nfound += nFoundbyWorker.nfound;
-                                options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
-                                /* send this task the work unit. */
-                                MPI_Send(&args, sizeof(args), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_ARGS, MPI_COMM_WORLD);
-                            } /* end if */
-                        } /* end while */
-                    } /* end if */
-                    /* if we do have the token, check for task to free up, or wait for a task to request it */
-                    else
-                    {
-                        /* But first print all the data in our incoming queue */
-                        print_incoming_data();
-                        MPI_Probe(MPI_ANY_SOURCE, MPI_ANY_TAG, MPI_COMM_WORLD, &Status);
-                        if(Status.MPI_TAG == MPI_TAG_DONE)
-                        {
-                            MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_DONE, MPI_COMM_WORLD, &Status);
-                            nfound += nFoundbyWorker.nfound;
-                            options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
-                            MPI_Send(&args, sizeof(args), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_ARGS, MPI_COMM_WORLD);
-                        } /* end if */
-                        else if(Status.MPI_TAG == MPI_TAG_TOK_REQUEST)
-                        {
-                            int incomingMessage;
-
-                            MPI_Recv(NULL, 0, MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_TOK_REQUEST, MPI_COMM_WORLD, &Status);
-                            MPI_Send(NULL, 0, MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_PRINT_TOK, MPI_COMM_WORLD);
-
-                            do
-                            {
-                                MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &incomingMessage, &Status);
-
-                                print_incoming_data();
-                            } while(!incomingMessage);
-
-                            MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &Status);
-                            nfound += nFoundbyWorker.nfound;
-                            options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
-                            MPI_Send(&args, sizeof(args), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_ARGS, MPI_COMM_WORLD);
-                        } /* end else-if */
-                        else
-                        {
-                            printf("ERROR: Invalid tag (%d) received \n", Status.MPI_TAG);
-                            MPI_Abort(MPI_COMM_WORLD, 0);
-                            MPI_Finalize();
-                        } /* end else */
-                    } /* end else */
-                } /* end if */
-            } /* end else */
-#endif /* H5_HAVE_PARALLEL */
-            if (obj1_fullpath)
-                HDfree (obj1_fullpath);
-            if (obj2_fullpath)                
-                HDfree (obj2_fullpath);
-        } /* end if */
-    } /* end for */
-    h5diffdebug("done with for loop\n");
-
-#ifdef H5_HAVE_PARALLEL
-    if(g_Parallel)
-    {
-        /* make sure all tasks are done */
-        while(busyTasks > 0)
-        {
-            MPI_Probe(MPI_ANY_SOURCE, MPI_ANY_TAG, MPI_COMM_WORLD, &Status);
-            if(Status.MPI_TAG == MPI_TAG_DONE)
-            {
-                MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_DONE, MPI_COMM_WORLD, &Status);
-                nfound += nFoundbyWorker.nfound;
-                options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
-                busyTasks--;
-            } /* end if */
-            else if(Status.MPI_TAG == MPI_TAG_TOK_RETURN)
-            {
-                MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_DONE, MPI_COMM_WORLD, &Status);
-                nfound += nFoundbyWorker.nfound;
-                options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
-                busyTasks--;
-                havePrintToken = 1;
-            } /* end else-if */
-            else if(Status.MPI_TAG == MPI_TAG_TOK_REQUEST)
-            {
-                MPI_Recv(NULL, 0, MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_TOK_REQUEST, MPI_COMM_WORLD, &Status);
-                if(havePrintToken)
-                {
-                    int incomingMessage;
-
-                    MPI_Send(NULL, 0, MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_PRINT_TOK, MPI_COMM_WORLD);
-
-                    do {
-                        MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &incomingMessage, &Status);
-
-                        print_incoming_data();
-                    } while(!incomingMessage);
-
-                    MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &Status);
-                    nfound += nFoundbyWorker.nfound;
-                    options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
-                    busyTasks--;
-                } /* end if */
-                /* someone else must have it...wait for them to return it, then give it to the task that just asked for it. */
-                else
-                {
-                    int source = Status.MPI_SOURCE;
-                    int incomingMessage;
-
-                    do
-                    {
-                        MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &incomingMessage, &Status);
-
-                        print_incoming_data();
-                    } while(!incomingMessage);
-
-
-                    MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, MPI_ANY_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &Status);
-                    nfound += nFoundbyWorker.nfound;
-                    options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
-                    busyTasks--;
-                    MPI_Send(NULL, 0, MPI_BYTE, source, MPI_TAG_PRINT_TOK, MPI_COMM_WORLD);
-                } /* end else */
-            } /* end else-if */
-            else if(Status.MPI_TAG == MPI_TAG_TOK_RETURN)
-            {
-                MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &Status);
-                nfound += nFoundbyWorker.nfound;
-                options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
-                busyTasks--;
-                havePrintToken = 1;
-            } /* end else-if */
-            else if(Status.MPI_TAG == MPI_TAG_PRINT_DATA)
-            {
-                char  data[PRINT_DATA_MAX_SIZE + 1];
-                HDmemset(data, 0, PRINT_DATA_MAX_SIZE + 1);
-
-                MPI_Recv(data, PRINT_DATA_MAX_SIZE, MPI_CHAR, Status.MPI_SOURCE, MPI_TAG_PRINT_DATA, MPI_COMM_WORLD, &Status);
-
-                printf("%s", data);
-            } /* end else-if */
-            else
-            {
-                printf("ph5diff-manager: ERROR!! Invalid tag (%d) received \n", Status.MPI_TAG);
-                MPI_Abort(MPI_COMM_WORLD, 0);
-            } /* end else */
-        } /* end while */
-
-        for(i = 1; i < g_nTasks; i++)
-            MPI_Send(NULL, 0, MPI_BYTE, i, MPI_TAG_END, MPI_COMM_WORLD);
-
-        /* Print any final data waiting in our queue */
-        print_incoming_data();
-    } /* end if */
-    h5diffdebug("done with if block\n");
-
-    free(workerTasks);
-    }
-#endif /* H5_HAVE_PARALLEL */
-
-    /* free table */
-    if (table)
-        trav_table_free(table);
-
-    return nfound;
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: diff_compare
- *
- * Purpose: get objects from list, and check for the same type
- *
- * Return: Number of differences found
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- * Date: May 9, 2003
- *
- * Programmer: Jonathan Kim
- *  - add following links feature (Feb 11,2010)
- *-------------------------------------------------------------------------
- */
-
-hsize_t diff_compare(hid_t file1_id,
-                     const char *file1_name,
-                     const char *obj1_name,
-                     trav_info_t *info1,
-                     hid_t file2_id,
-                     const char *file2_name,
-                     const char *obj2_name,
-                     trav_info_t *info2,
-                     diff_opt_t *options)
-{
-    int     f1 = 0;
-    int     f2 = 0;
-    hsize_t nfound = 0;
-    ssize_t i,j;
-    int l_ret;
-    int is_dangle_link1 = 0;
-    int is_dangle_link2 = 0;
-    const char *obj1name = obj1_name;
-    const char *obj2name = obj2_name;
-    diff_args_t argdata;
-
-    /* local variables for diff() */
-    h5trav_type_t obj1type, obj2type;
-
-    /* to get link info */
-    h5tool_link_info_t linkinfo1;
-    h5tool_link_info_t linkinfo2;
-
-    /* init link info struct */
-    HDmemset(&linkinfo1, 0, sizeof(h5tool_link_info_t));
-    HDmemset(&linkinfo2, 0, sizeof(h5tool_link_info_t));
-
-    i = h5trav_getindex (info1, obj1name);
-    j = h5trav_getindex (info2, obj2name);
-
-    if (i == -1)
-    {
-        parallel_print ("Object <%s> could not be found in <%s>\n", obj1name,
-            file1_name);
-        f1 = 1;
-    }
-    if (j == -1)
-    {
-        parallel_print ("Object <%s> could not be found in <%s>\n", obj2name,
-            file2_name);
-        f2 = 1;
-    }
-    if (f1 || f2)
-    {
-        options->err_stat = 1;
-        return 0;
-    }
-    /* use the name with "/" first, as obtained by iterator function */
-    obj1name = info1->paths[i].path;
-    obj2name = info2->paths[j].path;
-
-    obj1type = info1->paths[i].type;
-    obj2type = info2->paths[j].type;
-
-    /*-----------------------------------------------------------------
-     * follow link option, compare with target object 
-    */
-    if (options->follow_links)
-    {
-        /* pass how to handle printing warning to linkinfo option */
-        if(print_warn(options))
-            linkinfo1.opt.msg_mode = linkinfo2.opt.msg_mode = 1;
-
-        /*------------------------------------------------------------
-         * Soft links
-         *------------------------------------------------------------*/
-
-        /*--------------------------
-         * if object1 soft link   */
-        if (obj1type == H5TRAV_TYPE_LINK)
-        {
-            /* get type of target object */
-            l_ret = H5tools_get_symlink_info(file1_id, obj1name, &linkinfo1, TRUE);
-            /* dangling link */
-            if (l_ret == 0)
-            {
-                if (options->no_dangle_links)
-                {
-                    /* gangling link is error */
-                    if(options->m_verbose)
-                        parallel_print("Warning: <%s> is a dangling link.\n", obj1name);
-                    options->err_stat = 1;
-                    goto out;
-                }
-                else
-                    is_dangle_link1 = 1;
-            }
-            /* fail */
-            else if(l_ret < 0)
-            {
-                options->err_stat = 1;
-                goto out;
-            }
-            else /* OK */
-            {
-                /* target type for diff() */
-                obj1type = linkinfo1.trg_type;
-            }
-        }
-        
-        /*-----------------------------
-         * if object2 is soft link   */
-        if (obj2type == H5TRAV_TYPE_LINK)
-        {
-            /* get type target object */
-            l_ret = H5tools_get_symlink_info(file2_id, obj2name, &linkinfo2, TRUE);
-            /* dangling link */
-            if (l_ret == 0)
-            {
-                if (options->no_dangle_links)
-                {
-                    /* gangling link is error */
-                    if(options->m_verbose)
-                        parallel_print("Warning: <%s> is a dangling link.\n", obj2name);
-                    options->err_stat = 1;
-                    goto out;
-                }
-                else
-                    is_dangle_link2=1;
-            }
-            /* fail */
-            else if(l_ret < 0)
-            {
-                options->err_stat = 1;
-                goto out;
-            }
-            else /* OK */
-            {
-                /* target type for diff() */
-                obj2type = linkinfo2.trg_type;
-            }
-        }
-
-        /*------------------------------------------------------------
-         * External links
-         *------------------------------------------------------------*/
-
-        /*--------------------------------
-         * if object1 is external link  */
-        if (obj1type == H5TRAV_TYPE_UDLINK)
-        {
-            /* get type and name of target object */
-            l_ret = H5tools_get_symlink_info(file1_id, obj1name, &linkinfo1, TRUE);
-            /* dangling link */
-            if (l_ret == 0)
-            {
-                if (options->no_dangle_links)
-                {
-                    /* gangling link is error */
-                    if(options->m_verbose)
-                        parallel_print("Warning: <%s> is a dangling link.\n", obj1name);
-                    options->err_stat = 1;
-                    goto out;
-                }
-                else
-                    is_dangle_link1 = 1;
-            }
-            /* fail */
-            else if(l_ret < 0)
-            {
-                options->err_stat = 1;
-                goto out;
-            }
-            else /* OK */
-            {
-                /* for external link */
-                if(linkinfo1.linfo.type == H5L_TYPE_EXTERNAL)
-                    obj1type = linkinfo1.trg_type;
-            }
-        }
-
-        /*--------------------------------
-         * if object2 is external link  */
-        if (obj2type == H5TRAV_TYPE_UDLINK)
-        {
-            /* get type and name of target object */
-            l_ret = H5tools_get_symlink_info(file2_id, obj2name, &linkinfo2, TRUE);
-            /* dangling link */
-            if (l_ret == 0)
-            {
-                if (options->no_dangle_links)
-                {
-                    /* gangling link is error */
-                    if(options->m_verbose)
-                        parallel_print("Warning: <%s> is a dangling link.\n", obj2name);
-                    options->err_stat = 1;
-                    goto out;
-                }
-                else
-                    is_dangle_link2 = 1;
-            }
-            /* fail */
-            else if(l_ret < 0)
-            {
-                options->err_stat = 1;
-                goto out;
-            }
-            else /* OK */
-            {
-                /* for external link */
-                if(linkinfo2.linfo.type == H5L_TYPE_EXTERNAL)
-                    obj2type = linkinfo2.trg_type;
-            }
-        }
-        /* found dangling link */
-        if (is_dangle_link1 || is_dangle_link2)
-            goto out;
-    } /* end of follow_links */
-    
-    /* objects are not the same type */
-    if (obj1type != obj2type)
-    {
-        if (options->m_verbose||options->m_list_not_cmp)
-        {
-            parallel_print("<%s> is of type %s and <%s> is of type %s\n",
-            obj1name, get_type(obj1type), 
-            obj2name, get_type(obj2type));
-        }
-        options->not_cmp=1;
-        goto out;
-    }
-
-    /* Set argdata to pass other args into diff() */
-    argdata.type = obj1type;
-    argdata.is_same_trgobj = 0;
-
-    nfound = diff(file1_id, obj1name,
-                  file2_id, obj2name,
-                  options, &argdata);
-
-out:
-    /*-------------------------------
-     * handle dangling link(s) */
-    /* both obj1 and obj2 are dangling links */
-    if(is_dangle_link1 && is_dangle_link2)
-    {
-        if(print_objname(options, nfound))
-        {
-            do_print_objname("dangling link", obj1name, obj2name, options);
-            print_found(nfound);
-        }
-    }
-    /* obj1 is dangling link */
-    else if (is_dangle_link1)
-    {
-        if(options->m_verbose)
-           parallel_print("obj1 <%s> is a dangling link.\n", obj1name);
-        nfound++;
-        if(print_objname(options, nfound))
-            print_found(nfound);
-    }
-    /* obj2 is dangling link */
-    else if (is_dangle_link2)
-    {
-        if(options->m_verbose)
-            parallel_print("obj2 <%s> is a dangling link.\n", obj2name);
-        nfound++;
-        if(print_objname(options, nfound))
-            print_found(nfound);
-    }
-
-    /* free link info buffer */
-    if (linkinfo1.trg_path)
-        HDfree(linkinfo1.trg_path);
-    if (linkinfo2.trg_path)
-        HDfree(linkinfo2.trg_path);
-
-    return nfound;
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: diff
- *
- * Purpose: switch between types and choose the diff function
- * TYPE is either
- *  H5G_GROUP         Object is a group
- *  H5G_DATASET       Object is a dataset
- *  H5G_TYPE          Object is a named data type
- *  H5G_LINK          Object is a symbolic link
- *
- * Return: Number of differences found
- *
- * Programmer: Jonathan Kim
- *  - add following links feature (Feb 11,2010)
- *  - Change to use diff_args_t to pass the rest of args.
- *    Passing through it instead of individual args provides smoother
- *    extensibility through its members along with MPI code update for ph5diff
- *    as it doesn't require interface change.
- *    (May 6,2011)
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- * Date: May 9, 2003
- *-------------------------------------------------------------------------
- */
-
-hsize_t diff(hid_t file1_id,
-              const char *path1,
-              hid_t file2_id,
-              const char *path2,
-              diff_opt_t * options,
-              diff_args_t *argdata)
-{
-    hid_t   type1_id = (-1);
-    hid_t   type2_id = (-1);
-    hid_t   grp1_id = (-1);
-    hid_t   grp2_id = (-1);
-    int     ret;
-    int     is_dangle_link1 = 0;
-    int     is_dangle_link2 = 0;
-    int     is_hard_link = 0;
-    hsize_t nfound = 0;
-
-
-    /* to get link info */
-    h5tool_link_info_t linkinfo1;
-    h5tool_link_info_t linkinfo2;
-
-    /*init link info struct */
-    HDmemset(&linkinfo1,0,sizeof(h5tool_link_info_t));
-    HDmemset(&linkinfo2,0,sizeof(h5tool_link_info_t));
-
-    /* pass how to handle printing warnings to linkinfo option */
-    if(print_warn(options))
-        linkinfo1.opt.msg_mode = linkinfo2.opt.msg_mode = 1;
-
-    /* 
-     * Get target object info for obj1 and obj2 and check dangling links.
-     * (for hard-linked-objects, because diff() only get the obj1's type, 
-     *  so obj2's type should be check here when diff() is called from 
-     *  diff_match() for same-named objects with dangling link only one side.)
-     */
-
-    /* target object1 - get type and name */
-    ret = H5tools_get_symlink_info(file1_id, path1, &linkinfo1, TRUE);
-    /* dangling link */
-    if (ret == 0)
-    {
-        if (options->no_dangle_links)
-        {
-            /* gangling link is error */
-            if(options->m_verbose)
-                parallel_print("Warning: <%s> is a dangling link.\n", path1);
-            goto out;
-        }
-        else
-            is_dangle_link1 = 1;
-    }
-    else if (ret < 0)
-        goto out;
-
-    /* target object2 - get type and name */
-    ret = H5tools_get_symlink_info(file2_id, path2, &linkinfo2, TRUE);
-    /* dangling link */
-    if (ret == 0)
-    {
-        if (options->no_dangle_links)
-        {
-            /* gangling link is error */
-            if(options->m_verbose)
-                parallel_print("Warning: <%s> is a dangling link.\n", path2);
-            goto out;
-        }
-        else
-            is_dangle_link2 = 1;
-    }
-    else if (ret < 0)
-        goto out;
-                
-    /* found dangling link */
-    if (is_dangle_link1 || is_dangle_link2)
-        goto out2;
-  
-    /* 
-     * If both points to the same target object, skip comparing details inside
-     * of the objects to improve performance.
-     * Always check for the hard links, otherwise if follow symlink option is 
-     * specified.
-     *
-     * Perform this to match the outputs as bypassing.
-     */
-     is_hard_link = (argdata->type == H5TRAV_TYPE_DATASET ||
-                     argdata->type == H5TRAV_TYPE_NAMED_DATATYPE ||
-                     argdata->type == H5TRAV_TYPE_GROUP);
-     if (options->follow_links || is_hard_link)
-     {
-        if (argdata->is_same_trgobj)
-        {
-            /* print information is only verbose option is used */
-            if(options->m_verbose || options->m_report)
-            {
-                switch(argdata->type)
-                {
-                case H5TRAV_TYPE_DATASET:
-                    do_print_objname("dataset", path1, path2, options);
-                    break; 
-                case H5TRAV_TYPE_NAMED_DATATYPE:
-                    do_print_objname("datatype", path1, path2, options);
-                    break;
-                case H5TRAV_TYPE_GROUP:
-                    do_print_objname("group", path1, path2, options);
-                    break;
-                case H5TRAV_TYPE_LINK:
-                    do_print_objname("link", path1, path2, options);
-                    break;
-                case H5TRAV_TYPE_UDLINK:
-                    if(linkinfo1.linfo.type == H5L_TYPE_EXTERNAL && linkinfo2.linfo.type == H5L_TYPE_EXTERNAL)
-                        do_print_objname("external link", path1, path2, options);
-                    else
-                        do_print_objname ("user defined link", path1, path2, options);
-                    break; 
-                default:
-                    parallel_print("Comparison not supported: <%s> and <%s> are of type %s\n",
-                        path1, path2, get_type(argdata->type) );
-                    options->not_cmp = 1;
-                    break;
-                } /* switch(type)*/
-
-                print_found(nfound);
-            } /* if(options->m_verbose || options->m_report) */
-
-            goto out2;
-        }
-    }
-
-    switch(argdata->type)
-    {
-       /*----------------------------------------------------------------------
-        * H5TRAV_TYPE_DATASET
-        *----------------------------------------------------------------------
-        */
-        case H5TRAV_TYPE_DATASET:
-			/* verbose (-v) and report (-r) mode */
-            if(options->m_verbose || options->m_report)
-            {
-                do_print_objname("dataset", path1, path2, options);
-                nfound = diff_dataset(file1_id, file2_id, path1, path2, options);
-                print_found(nfound);
-            }
-            /* quiet mode (-q), just count differences */
-            else if(options->m_quiet)
-            {
-                nfound = diff_dataset(file1_id, file2_id, path1, path2, options);
-            }
-			/* the rest (-c, none, ...) */
-            else
-            {
-                nfound = diff_dataset(file1_id, file2_id, path1, path2, options);
-                /* print info if difference found  */
-                if (nfound)
-                {
-                    do_print_objname("dataset", path1, path2, options);
-                    print_found(nfound);	
-                }
-            }
-            break;
-
-       /*----------------------------------------------------------------------
-        * H5TRAV_TYPE_NAMED_DATATYPE
-        *----------------------------------------------------------------------
-        */
-        case H5TRAV_TYPE_NAMED_DATATYPE:
-            if((type1_id = H5Topen2(file1_id, path1, H5P_DEFAULT)) < 0)
-                goto out;
-            if((type2_id = H5Topen2(file2_id, path2, H5P_DEFAULT)) < 0)
-                goto out;
-
-            if((ret = H5Tequal(type1_id, type2_id)) < 0)
-                goto out;
-
-            /* if H5Tequal is > 0 then the datatypes refer to the same datatype */
-            nfound = (ret > 0) ? 0 : 1;
-
-            if(print_objname(options,nfound))
-                do_print_objname("datatype", path1, path2, options);
-
-            /* always print the number of differences found in verbose mode */
-            if(options->m_verbose)
-                print_found(nfound);
-
-            /*-----------------------------------------------------------------
-             * compare attributes
-             * the if condition refers to cases when the dataset is a 
-             * referenced object
-             *-----------------------------------------------------------------
-             */
-            if(path1)
-                nfound += diff_attr(type1_id, type2_id, path1, path2, options);
-
-            if(H5Tclose(type1_id) < 0)
-                goto out;
-            if(H5Tclose(type2_id) < 0)
-                goto out;
-            break;
-
-       /*----------------------------------------------------------------------
-        * H5TRAV_TYPE_GROUP
-        *----------------------------------------------------------------------
-        */
-        case H5TRAV_TYPE_GROUP:
-            if(print_objname(options, nfound))
-                do_print_objname("group", path1, path2, options);
-
-            /* always print the number of differences found in verbose mode */
-            if(options->m_verbose)
-                print_found(nfound);
-
-            if((grp1_id = H5Gopen2(file1_id, path1, H5P_DEFAULT)) < 0)
-                goto out;
-            if((grp2_id = H5Gopen2(file2_id, path2, H5P_DEFAULT)) < 0)
-                goto out;
-
-            /*-----------------------------------------------------------------
-             * compare attributes
-             * the if condition refers to cases when the dataset is a 
-             * referenced object
-             *-----------------------------------------------------------------
-             */
-            if(path1)
-                nfound += diff_attr(grp1_id, grp2_id, path1, path2, options);
-
-            if(H5Gclose(grp1_id) < 0)
-                goto out;
-            if(H5Gclose(grp2_id) < 0)
-                goto out;
-            break;
-
-
-       /*----------------------------------------------------------------------
-        * H5TRAV_TYPE_LINK
-        *----------------------------------------------------------------------
-        */
-        case H5TRAV_TYPE_LINK:
-            {
-            ret = HDstrcmp(linkinfo1.trg_path, linkinfo2.trg_path);
-
-            /* if the target link name is not same then the links are "different" */
-            nfound = (ret != 0) ? 1 : 0;
-
-            if(print_objname(options, nfound))
-                do_print_objname("link", path1, path2, options);
-
-            if (options->follow_links)
-            {
-                /* objects are not the same type */
-                if (linkinfo1.trg_type != linkinfo2.trg_type)
-                {
-                    if (options->m_verbose||options->m_list_not_cmp)
-                    {
-                        parallel_print("<%s> is of type %s and <%s> is of type %s\n", path1, get_type(linkinfo1.trg_type), path2, get_type(linkinfo2.trg_type));
-                    }
-                    options->not_cmp=1;
-                    goto out;
-                }
-
-                /* Renew type in argdata to pass into diff(). 
-                 * For recursive call, argdata.is_same_trgobj is already
-                 * set from initial call, so don't reset here */
-                argdata->type = linkinfo1.trg_type;
-
-                /* call self to compare target object */
-                nfound += diff(file1_id, path1, 
-                               file2_id, path2, 
-                               options, argdata);
-            }
-
-            /* always print the number of differences found in verbose mode */
-            if(options->m_verbose)
-                print_found(nfound);
-
-            }
-            break;
-
-       /*----------------------------------------------------------------------
-        * H5TRAV_TYPE_UDLINK
-        *----------------------------------------------------------------------
-        */
-        case H5TRAV_TYPE_UDLINK:
-            {
-            /* Only external links will have a query function registered */
-            if(linkinfo1.linfo.type == H5L_TYPE_EXTERNAL && linkinfo2.linfo.type == H5L_TYPE_EXTERNAL) 
-            {
-                /* If the buffers are the same size, compare them */
-                if(linkinfo1.linfo.u.val_size == linkinfo2.linfo.u.val_size) 
-                {
-                    ret = HDmemcmp(linkinfo1.trg_path, linkinfo2.trg_path, linkinfo1.linfo.u.val_size);
-                }
-                else
-                    ret = 1;
-
-                /* if "linkinfo1.trg_path" != "linkinfo2.trg_path" then the links
-                 * are "different" extlinkinfo#.path is combination string of 
-                 * file_name and obj_name
-                 */
-                nfound = (ret != 0) ? 1 : 0;
-
-                if(print_objname(options, nfound))
-                    do_print_objname("external link", path1, path2, options);
-
-                if (options->follow_links)
-                {
-                    /* objects are not the same type */
-                    if (linkinfo1.trg_type != linkinfo2.trg_type)
-                    {
-                        if (options->m_verbose||options->m_list_not_cmp)
-                        {
-                            parallel_print("<%s> is of type %s and <%s> is of type %s\n", path1, get_type(linkinfo1.trg_type), path2, get_type(linkinfo2.trg_type));
-                        }
-                        options->not_cmp=1;
-                        goto out;
-                    }
-
-                    /* Renew type in argdata to pass into diff(). 
-                     * For recursive call, argdata.is_same_trgobj is already
-                     * set from initial call, so don't reset here */
-                    argdata->type = linkinfo1.trg_type;
-
-                    nfound = diff(file1_id, path1,  
-                                  file2_id, path2, 
-                                  options, argdata);
-                } 
-            } /* end if */
-            else 
-            {
-                /* If one or both of these links isn't an external link, we can only
-                 * compare information from H5Lget_info since we don't have a query
-                 * function registered for them.
-                 *
-                 * If the link classes or the buffer length are not the
-                 * same, the links are "different"
-                 */
-                if((linkinfo1.linfo.type != linkinfo2.linfo.type) || 
-                   (linkinfo1.linfo.u.val_size != linkinfo2.linfo.u.val_size))
-                    nfound = 1;
-                else
-                    nfound = 0;
-
-                if (print_objname (options, nfound))
-                    do_print_objname ("user defined link", path1, path2, options);
-            } /* end else */
-
-            /* always print the number of differences found in verbose mode */
-            if(options->m_verbose)
-                print_found(nfound);
-            }
-            break;
-
-        default:
-            if(options->m_verbose)
-                parallel_print("Comparison not supported: <%s> and <%s> are of type %s\n",
-                    path1, path2, get_type(argdata->type) );
-            options->not_cmp = 1;
-            break;
-     }
-
-    /* free link info buffer */
-    if (linkinfo1.trg_path)
-        HDfree(linkinfo1.trg_path);
-    if (linkinfo2.trg_path)
-        HDfree(linkinfo2.trg_path);
-
-    return nfound;
-
-out:
-    options->err_stat = 1;
-
-out2:
-    /*-----------------------------------
-     * handle dangling link(s) 
-     */
-    /* both path1 and path2 are dangling links */
-    if(is_dangle_link1 && is_dangle_link2)
-    {
-        if(print_objname(options, nfound))
-        {
-            do_print_objname("dangling link", path1, path2, options);
-            print_found(nfound);
-        }
-    }
-    /* path1 is dangling link */
-    else if (is_dangle_link1)
-    {
-        if(options->m_verbose)
-           parallel_print("obj1 <%s> is a dangling link.\n", path1);
-        nfound++;
-        if(print_objname(options, nfound))
-            print_found(nfound);
-    }
-    /* path2 is dangling link */
-    else if (is_dangle_link2)
-    {
-        if(options->m_verbose)
-            parallel_print("obj2 <%s> is a dangling link.\n", path2);
-        nfound++;
-        if(print_objname(options, nfound))
-            print_found(nfound);
-    }
-
-    /* free link info buffer */
-    if (linkinfo1.trg_path)
-        HDfree(linkinfo1.trg_path);
-    if (linkinfo2.trg_path)
-        HDfree(linkinfo2.trg_path);
-
-    /* close */
-    /* disable error reporting */
-    H5E_BEGIN_TRY {
-        H5Tclose(type1_id);
-        H5Tclose(type2_id);
-        H5Gclose(grp1_id);
-        H5Tclose(grp2_id);
-        /* enable error reporting */
-    } H5E_END_TRY;
-
-    return nfound;
-}
-
diff --git a/exsrc/src/o.txt b/exsrc/src/o.txt
deleted file mode 100644
index 47eb655e1..000000000
--- a/exsrc/src/o.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-o
-yes
-
diff --git a/exsrc/src/pbmplus/Makefile.in b/exsrc/src/pbmplus/Makefile.in
deleted file mode 100644
index da35176c8..000000000
--- a/exsrc/src/pbmplus/Makefile.in
+++ /dev/null
@@ -1,134 +0,0 @@
-# Makefile for pbmplus tools.
-#
-# Copyright (C) 1989, 1991 by Jef Poskanzer.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose and without fee is hereby granted, provided
-# that the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation.  This software is provided "as is" without express or
-# implied warranty.
-
-# CONFIGURE: gcc makes things go faster on some machines, but not everyone
-# has it.  Warning: do not use gcc's -finline-functions or -fstrength-reduce
-# flags, they can produce incorrect code.  (This is with gcc versions 1.35,
-# 1.36, and 1.37, later versions may fix these bugs.)  Also, on some systems
-# gcc can't compile pnmconvol - dunno why.  And on some systems you can't
-# use the -ansi flag, it gives compilation errors in <math.h>.
-CC =		cc
-#CC =		gcc
-#CC =		gcc -fcombine-regs -fpcc-struct-return
-#CC =		gcc -ansi -pedantic -fcombine-regs -fpcc-struct-return
-
-# CONFIGURE: cc flags go here.
-CFLAGS =	-O -w
-#CFLAGS =	-g
-#CFLAGS =	-g -O
-
-# CONFIGURE: ld flags go here.  Eunice users may want to use -noshare so that
-# the binaries can run standalone.
-LDFLAGS =	-s
-#LDFLAGS =	
-#LDFLAGS =	-noshare
-
-# CONFIGURE: If you have an X11-style rgb color names file, define its
-# path here.  This is used by PPM to parse color names into rgb values.
-# If you don't have such a file, comment this out and use the alternative
-# hex and decimal forms to specify colors (see ppm/pgmtoppm.1 for details).
-RGBDEF =	-DRGB_DB=\"/usr/lib/X11/rgb\"
-
-# CONFIGURE: PBMPLUS's support for TIFF files depends on the library from
-# Sam Leffler's TIFF Software package - see the OTHER.SYSTEMS file for a
-# full description and access information.  To configure PBMPLUS to use the
-# library: first, if necessary, fetch the TIFF Software, unpack it in a
-# scratch directory somewhere, and move the libtiff subdirectory right here
-# into the PBMPLUS top-level directory.  Configure and "make" in the
-# libtiff directory.  Yes, you do have to do the TIFF make by hand, the
-# general PBMPLUS make will *not* make libtiff.  Finally, uncomment the
-# following five definitions.
-#
-# Libtiff is pretty good about portability, but there are some machines
-# it has problems on.  If you run into problems, you may wish to contact
-# Sam directly, at the address listed in the OTHER.SYSTEMS file.
-#
-# By the way, you must have at least version 2.4 of libtiff.  Earlier
-# versions will not work.
-TIFFDEF =	-DLIBTIFF
-TIFFINC =	-I@EXTERNALS@/include
-TIFFLIB =	@EXTERNALS@/lib/libtiff.a
-#TIFFBINARIES =	tifftopnm pnmtotiff
-#TIFFOBJECTS =	tifftopnm.o pnmtotiff.o
-
-# CONFIGURE: Define the directory that you want the binaries copied to.
-# If you need scripts and binaries to be in different directories, you
-# can set that up too.
-INSTALLBINARIES =	@EXTERNALS@/bin
-INSTALLSCRIPTS =	$(INSTALLBINARIES)
-
-# CONFIGURE: Define the directories that you want the manual sources copied to,
-# plus the suffix you want them to have.
-INSTALLMANUALS1 =	@EXTERNALS@/man/mann
-SUFFIXMANUALS1 =	n
-INSTALLMANUALS3 =	@EXTERNALS@/man/mann
-SUFFIXMANUALS3 =	n
-INSTALLMANUALS5 =	@EXTERNALS@/man/mann
-SUFFIXMANUALS5 =	n
-
-# CONFIGURE: Normally the man pages are installed using "cp".  By changing
-# this define you can use something else, for example a script that calls
-# compress or pack.
-MANCP =			cp
-
-# CONFIGURE: Normally the Makefiles build and install separate binaries for
-# each program.  However, on some systems (especially those without shared
-# libraries) this can mean a lot of space.  In this case you might try
-# building a "merge" instead.  The idea here is to link all the binaries
-# together into one huge executable, with a tiny dispatch program as the
-# main.  Then the merged binary is installed with file-system links for
-# each program it includes.  The dispatch routine can tell which program
-# to run by looking at argv[0].  On a Sun3 under SunOS 3.5 the space for
-# executables went from 2.9 meg to .36 meg.
-#
-# Note that if you make a "merge", the executables don't get created
-# until you do the install.
-all:		binaries
-install:	install.bin install.man
-#all:		merge
-#install:	install.merge install.man
-
-# End of configurable definitions.
-
-SHELL =		/bin/sh
-MAKE =		make
-SUBDIRS =	pbm pgm ppm pnm
-
-binaries:
-	for i in $(SUBDIRS) ; do \
-	    ( echo $$i ; cd $$i ; $(MAKE) $(MFLAGS) 'CC=$(CC)' 'CFLAGS=$(CFLAGS)' 'RGBDEF=$(RGBDEF)' 'TIFFDEF=$(TIFFDEF)' 'TIFFINC=$(TIFFINC)' 'TIFFLIB=$(TIFFLIB)' 'TIFFBINARIES=$(TIFFBINARIES)' 'TIFFOBJECTS=$(TIFFOBJECTS)' 'LDFLAGS=$(LDFLAGS)' binaries ); \
-	done
-
-merge:
-	for i in $(SUBDIRS) ; do \
-	    ( echo $$i ; cd $$i ; $(MAKE) $(MFLAGS) 'CC=$(CC)' 'CFLAGS=$(CFLAGS)' 'RGBDEF=$(RGBDEF)' 'TIFFDEF=$(TIFFDEF)' 'TIFFINC=$(TIFFINC)' 'TIFFLIB=$(TIFFLIB)' 'TIFFBINARIES=$(TIFFBINARIES)' 'TIFFOBJECTS=$(TIFFOBJECTS)' 'LDFLAGS=$(LDFLAGS)' merge ); \
-	done
-
-install.bin:
-	for i in $(SUBDIRS) ; do \
-	    ( echo $$i ; cd $$i ; $(MAKE) $(MFLAGS) 'CC=$(CC)' 'CFLAGS=$(CFLAGS)' 'RGBDEF=$(RGBDEF)' 'TIFFDEF=$(TIFFDEF)' 'TIFFINC=$(TIFFINC)' 'TIFFLIB=$(TIFFLIB)' 'TIFFBINARIES=$(TIFFBINARIES)' 'TIFFOBJECTS=$(TIFFOBJECTS)' 'LDFLAGS=$(LDFLAGS)' 'INSTALLBINARIES=$(INSTALLBINARIES)' 'INSTALLSCRIPTS=$(INSTALLSCRIPTS)' install.bin ); \
-	done
-
-install.merge:
-	for i in $(SUBDIRS) ; do \
-	    ( echo $$i ; cd $$i ; $(MAKE) $(MFLAGS) 'CC=$(CC)' 'CFLAGS=$(CFLAGS)' 'RGBDEF=$(RGBDEF)' 'TIFFDEF=$(TIFFDEF)' 'TIFFINC=$(TIFFINC)' 'TIFFLIB=$(TIFFLIB)' 'TIFFBINARIES=$(TIFFBINARIES)' 'TIFFOBJECTS=$(TIFFOBJECTS)' 'LDFLAGS=$(LDFLAGS)' 'INSTALLBINARIES=$(INSTALLBINARIES)' 'INSTALLSCRIPTS=$(INSTALLSCRIPTS)' install.merge ); \
-	done
-
-install.man:
-	for i in $(SUBDIRS) ; do \
-	    ( echo $$i ; cd $$i ; $(MAKE) $(MFLAGS) 'TIFFBINARIES=$(TIFFBINARIES)' 'INSTALLMANUALS1=$(INSTALLMANUALS1)' 'SUFFIXMANUALS1=$(SUFFIXMANUALS1)' 'INSTALLMANUALS3=$(INSTALLMANUALS3)' 'SUFFIXMANUALS3=$(SUFFIXMANUALS3)' 'INSTALLMANUALS5=$(INSTALLMANUALS5)' 'SUFFIXMANUALS5=$(SUFFIXMANUALS5)' 'MANCP=$(MANCP)' install.man ); \
-	done
-
-clean:
-	-rm -f *.shar *.shar? art.*
-	for i in $(SUBDIRS) ; do \
-	    ( echo $$i ; cd $$i ; $(MAKE) $(MFLAGS) clean ); \
-	done
diff --git a/exsrc/src/pbmplus/libpbm1.c b/exsrc/src/pbmplus/libpbm1.c
deleted file mode 100644
index 00f3e31b2..000000000
--- a/exsrc/src/pbmplus/libpbm1.c
+++ /dev/null
@@ -1,674 +0,0 @@
-/* libpbm1.c - pbm utility library part 1
-**
-** Copyright (C) 1988 by Jef Poskanzer.
-**
-** Permission to use, copy, modify, and distribute this software and its
-** documentation for any purpose and without fee is hereby granted, provided
-** that the above copyright notice appear in all copies and that both that
-** copyright notice and this permission notice appear in supporting
-** documentation.  This software is provided "as is" without express or
-** implied warranty.
-*/
-
-#include "pbm.h"
-#include "version.h"
-#include "libpbm.h"
-#if __STDC__
-#include <stdarg.h>
-#else /*__STDC__*/
-#include <varargs.h>
-#endif /*__STDC__*/
-
-
-/* Forward routines. */
-
-#if defined(NEED_VFPRINTF1) || defined(NEED_VFPRINTF2)
-int vfprintf ARGS(( FILE* stream, char* format, va_list args ));
-#endif /*NEED_VFPRINTF*/
-
-
-/* Variable-sized arrays. */
-
-char*
-pm_allocrow( cols, size )
-    int cols;
-    int size;
-    {
-    register char* itrow;
-
-    itrow = (char*) malloc( cols * size );
-    if ( itrow == (char*) 0 )
-	pm_error( "out of memory allocating a row" );
-    return itrow;
-    }
-
-void
-pm_freerow( itrow )
-    char* itrow;
-    {
-    free( itrow );
-    }
-
-
-char**
-pm_allocarray( cols, rows, size )
-    int cols, rows;
-    int size;
-    {
-    char** its;
-    int i;
-
-    its = (char**) malloc( rows * sizeof(char*) );
-    if ( its == (char**) 0 )
-	pm_error( "out of memory allocating an array" );
-    its[0] = (char*) malloc( rows * cols * size );
-    if ( its[0] == (char*) 0 )
-	pm_error( "out of memory allocating an array" );
-    for ( i = 1; i < rows; ++i )
-	its[i] = &(its[0][i * cols * size]);
-    return its;
-    }
-
-void
-pm_freearray( its, rows )
-    char** its;
-    int rows;
-    {
-    free( its[0] );
-    free( its );
-    }
-
-
-/* Case-insensitive keyword matcher. */
-
-int
-pm_keymatch( str, keyword, minchars )
-    char* str;
-    char* keyword;
-    int minchars;
-    {
-    register int len;
-
-    len = strlen( str );
-    if ( len < minchars )
-	return 0;
-    while ( --len >= 0 )
-	{
-	register char c1, c2;
-
-	c1 = *str++;
-	c2 = *keyword++;
-	if ( c2 == '\0' )
-	    return 0;
-	if ( isupper( c1 ) )
-	    c1 = tolower( c1 );
-	if ( isupper( c2 ) )
-	    c1 = tolower( c2 );
-	if ( c1 != c2 )
-	    return 0;
-	}
-    return 1;
-    }
-
-
-/* Log base two hacks. */
-
-int
-pm_maxvaltobits( maxval )
-    int maxval;
-    {
-    if ( maxval <= 1 )
-	return 1;
-    else if ( maxval <= 3 )
-	return 2;
-    else if ( maxval <= 7 )
-	return 3;
-    else if ( maxval <= 15 )
-	return 4;
-    else if ( maxval <= 31 )
-	return 5;
-    else if ( maxval <= 63 )
-	return 6;
-    else if ( maxval <= 127 )
-	return 7;
-    else if ( maxval <= 255 )
-	return 8;
-    else if ( maxval <= 511 )
-	return 9;
-    else if ( maxval <= 1023 )
-	return 10;
-    else if ( maxval <= 2047 )
-	return 11;
-    else if ( maxval <= 4095 )
-	return 12;
-    else if ( maxval <= 8191 )
-	return 13;
-    else if ( maxval <= 16383 )
-	return 14;
-    else if ( maxval <= 32767 )
-	return 15;
-    else if ( (long) maxval <= 65535L )
-	return 16;
-    else
-	pm_error( "maxval of %d is too large!", maxval );
-    }
-
-int
-pm_bitstomaxval( bits )
-    int bits;
-    {
-    return ( 1 << bits ) - 1;
-    }
-
-
-/* Initialization. */
-
-static char* progname;
-static int showmessages;
-
-void
-pm_init( argcP, argv )
-    int* argcP;
-    char* argv[];
-    {
-    int argn, i;
-
-    /* Extract program name. */
-    progname = rindex( argv[0], '/');
-    if ( progname == NULL )
-	progname = argv[0];
-    else
-	++progname;
-
-    /* Check for any global args. */
-    showmessages = 1;
-    for ( argn = 1; argn < *argcP; ++argn )
-	{
-	if ( pm_keymatch( argv[argn], "-quiet", 6 ) )
-	    {
-	    showmessages = 0;
-	    }
-	else if ( pm_keymatch( argv[argn], "-version", 7 ) )
-	    {
-	    pm_message( "Version of %s", PBMPLUS_VERSION );
-#ifdef BSD
-	    pm_message( "BSD defined" );
-#endif /*BSD*/
-#ifdef SYSV
-	    pm_message( "SYSV defined" );
-#endif /*SYSV*/
-#ifdef MSDOS
-	    pm_message( "MSDOS defined" );
-#endif /*MSDOS*/
-#ifdef PBMPLUS_RAWBITS
-	    pm_message( "PBMPLUS_RAWBITS defined" );
-#endif /*PBMPLUS_RAWBITS*/
-#ifdef PBMPLUS_BROKENPUTC1
-	    pm_message( "PBMPLUS_BROKENPUTC1 defined" );
-#endif /*PBMPLUS_BROKENPUTC1*/
-#ifdef PBMPLUS_BROKENPUTC2
-	    pm_message( "PBMPLUS_BROKENPUTC2 defined" );
-#endif /*PBMPLUS_BROKENPUTC2*/
-#ifdef PGM_BIGGRAYS
-	    pm_message( "PGM_BIGGRAYS defined" );
-#endif /*PGM_BIGGRAYS*/
-#ifdef PPM_PACKCOLORS
-	    pm_message( "PPM_PACKCOLORS defined" );
-#endif /*PPM_PACKCOLORS*/
-#ifdef DEBUG
-	    pm_message( "DEBUG defined" );
-#endif /*DEBUG*/
-#ifdef NEED_VFPRINTF1
-	    pm_message( "NEED_VFPRINTF1 defined" );
-#endif /*NEED_VFPRINTF1*/
-#ifdef NEED_VFPRINTF2
-	    pm_message( "NEED_VFPRINTF2 defined" );
-#endif /*NEED_VFPRINTF2*/
-#ifdef RGB_DB
-	    pm_message( "RGB_DB=\"%s\"", RGB_DB );
-#endif /*RGB_DB*/
-#ifdef LIBTIFF
-	    pm_message( "LIBTIFF defined" );
-#endif /*LIBTIFF*/
-	    exit( 0 );
-	    }
-	else
-	    continue;
-	for ( i = argn + 1; i <= *argcP; ++i )
-	    argv[i - 1] = argv[i];
-	--(*argcP);
-	}
-    }
-
-void
-pbm_init( argcP, argv )
-    int* argcP;
-    char* argv[];
-    {
-    pm_init( argcP, argv );
-    }
-
-
-/* Error handling. */
-
-void
-pm_usage( usage )
-    char* usage;
-    {
-    fprintf( stderr, "usage:  %s %s\n", progname, usage );
-    exit( 1 );
-    }
-
-void
-pm_perror( reason )
-    char* reason;
-    {
-    extern int errno;
-    char* e;
-
-    e = sys_errlist[errno];
-
-    if ( reason != 0 && reason[0] != '\0' )
-	pm_error( "%s - %s", reason, e );
-    else
-	pm_error( "%s", e );
-    }
-
-#if __STDC__
-void
-pm_message( char* format, ... )
-    {
-    va_list args;
-
-    va_start( args, format );
-#else /*__STDC__*/
-/*VARARGS1*/
-void
-pm_message( va_alist )
-    va_dcl
-    { /*}*/
-    va_list args;
-    char* format;
-
-    va_start( args );
-    format = va_arg( args, char* );
-#endif /*__STDC__*/
-
-    if ( showmessages )
-	{
-	fprintf( stderr, "%s: ", progname );
-	(void) vfprintf( stderr, format, args );
-	fputc( '\n', stderr );
-	}
-    va_end( args );
-    }
-
-#if __STDC__
-void
-pm_error( char* format, ... )
-    {
-    va_list args;
-
-    va_start( args, format );
-#else /*__STDC__*/
-/*VARARGS1*/
-void
-pm_error( va_alist )
-    va_dcl
-    { /*}*/
-    va_list args;
-    char* format;
-
-    va_start( args );
-    format = va_arg( args, char* );
-#endif /*__STDC__*/
-
-    fprintf( stderr, "%s: ", progname );
-    (void) vfprintf( stderr, format, args );
-    fputc( '\n', stderr );
-    va_end( args );
-    exit( 1 );
-    }
-
-#ifdef NEED_VFPRINTF1
-
-/* Micro-vfprintf, for systems that don't have vfprintf but do have _doprnt.
-*/
-
-int
-vfprintf( stream, format, args )
-    FILE* stream;
-    char* format;
-    va_list args;
-    {
-    return _doprnt( format, args, stream );
-    }
-#endif /*NEED_VFPRINTF1*/
-
-#ifdef NEED_VFPRINTF2
-
-/* Portable mini-vfprintf, for systems that don't have either vfprintf or
-** _doprnt.  This depends only on fprintf.  If you don't have fprintf,
-** you might consider getting a new stdio library.
-*/
-
-int
-vfprintf( stream, format, args )
-    FILE* stream;
-    char* format;
-    va_list args;
-    {
-    int n;
-    char* ep;
-    char fchar;
-    char tformat[512];
-    int do_long;
-    int i;
-    long l;
-    unsigned u;
-    unsigned long ul;
-    char* s;
-    double d;
-
-    n = 0;
-    while ( *format != '\0' )
-	{
-	if ( *format != '%' )
-	    { /* Not special, just write out the char. */
-	    (void) putc( *format, stream );
-	    ++n;
-	    ++format;
-	    }
-	else
-	    {
-	    do_long = 0;
-	    ep = format + 1;
-
-	    /* Skip over all the field width and precision junk. */
-	    if ( *ep == '-' )
-		++ep;
-	    if ( *ep == '0' )
-		++ep;
-	    while ( isdigit( *ep ) )
-		++ep;
-	    if ( *ep == '.' )
-		{
-		++ep;
-		while ( isdigit( *ep ) )
-		    ++ep;
-		}
-	    if ( *ep == '#' )
-		++ep;
-	    if ( *ep == 'l' )
-		{
-		do_long = 1;
-		++ep;
-		}
-
-	    /* Here's the field type.  Extract it, and copy this format
-	    ** specifier to a temp string so we can add an end-of-string.
-	    */
-	    fchar = *ep;
-	    (void) strncpy( tformat, format, ep - format + 1 );
-	    tformat[ep - format + 1] = '\0';
-
-	    /* Now do a one-argument fprintf with the format string we have
-	    ** isolated.
-	    */
-	    switch ( fchar )
-		{
-		case 'd':
-		if ( do_long )
-		    {
-		    l = va_arg( args, long );
-		    n += fprintf( stream, tformat, l );
-		    }
-		else
-		    {
-		    i = va_arg( args, int );
-		    n += fprintf( stream, tformat, i );
-		    }
-		break;
-
-	        case 'o':
-	        case 'x':
-	        case 'X':
-	        case 'u':
-		if ( do_long )
-		    {
-		    ul = va_arg( args, unsigned long );
-		    n += fprintf( stream, tformat, ul );
-		    }
-		else
-		    {
-		    u = va_arg( args, unsigned );
-		    n += fprintf( stream, tformat, u );
-		    }
-		break;
-
-	        case 'c':
-		i = (char) va_arg( args, int );
-		n += fprintf( stream, tformat, i );
-		break;
-
-	        case 's':
-		s = va_arg( args, char* );
-		n += fprintf( stream, tformat, s );
-		break;
-
-	        case 'e':
-	        case 'E':
-	        case 'f':
-	        case 'g':
-	        case 'G':
-		d = va_arg( args, double );
-		n += fprintf( stream, tformat, d );
-		break;
-
-	        case '%':
-		(void) putc( '%', stream );
-		++n;
-		break;
-
-		default:
-		return -1;
-		}
-
-	    /* Resume formatting on the next character. */
-	    format = ep + 1;
-	    }
-	}
-    return nc;
-    }
-#endif /*NEED_VFPRINTF2*/
-
-
-/* File open/close that handles "-" as stdin and checks errors. */
-
-FILE*
-pm_openr( name )
-    char* name;
-    {
-    FILE* f;
-
-    if ( strcmp( name, "-" ) == 0 )
-	f = stdin;
-    else
-	{
-#ifdef MSDOS
-	f = fopen( name, "rb" );
-#else /*MSDOS*/
-	f = fopen( name, "r" );
-#endif /*MSDOS*/
-	if ( f == NULL )
-	    {
-	    pm_perror( name );
-	    exit( 1 );
-	    }
-	}
-    return f;
-    }
-
-FILE*
-pm_openw( name )
-    char* name;
-    {
-    FILE* f;
-
-#ifdef MSDOS
-    f = fopen( name, "wb" );
-#else /*MSDOS*/
-    f = fopen( name, "w" );
-#endif /*MSDOS*/
-    if ( f == NULL )
-	{
-	pm_perror( name );
-	exit( 1 );
-	}
-    return f;
-    }
-
-void
-pm_close( f )
-    FILE* f;
-    {
-    fflush( f );
-    if ( ferror( f ) )
-	pm_message( "a file read or write error occurred at some point" );
-    if ( f != stdin )
-	if ( fclose( f ) != 0 )
-	    pm_perror( "fclose" );
-    }
-
-/* Endian I/O.
-*/
-
-int
-pm_readbigshort( in, sP )
-    FILE* in;
-    short* sP;
-    {
-    int c;
-
-    if ( (c = getc( in )) == EOF )
-	return -1;
-    *sP = ( c & 0xff ) << 8;
-    if ( (c = getc( in )) == EOF )
-	return -1;
-    *sP |= c & 0xff;
-    return 0;
-    }
-
-#if __STDC__
-int
-pm_writebigshort( FILE* out, short s )
-#else /*__STDC__*/
-int
-pm_writebigshort( out, s )
-    FILE* out;
-    short s;
-#endif /*__STDC__*/
-    {
-    (void) putc( ( s >> 8 ) & 0xff, out );
-    (void) putc( s & 0xff, out );
-    return 0;
-    }
-
-int
-pm_readbiglong( in, lP )
-    FILE* in;
-    long* lP;
-    {
-    int c;
-
-    if ( (c = getc( in )) == EOF )
-	return -1;
-    *lP = ( c & 0xff ) << 24;
-    if ( (c = getc( in )) == EOF )
-	return -1;
-    *lP |= ( c & 0xff ) << 16;
-    if ( (c = getc( in )) == EOF )
-	return -1;
-    *lP |= ( c & 0xff ) << 8;
-    if ( (c = getc( in )) == EOF )
-	return -1;
-    *lP |= c & 0xff;
-    return 0;
-    }
-
-int
-pm_writebiglong( out, l )
-    FILE* out;
-    long l;
-    {
-    (void) putc( ( l >> 24 ) & 0xff, out );
-    (void) putc( ( l >> 16 ) & 0xff, out );
-    (void) putc( ( l >> 8 ) & 0xff, out );
-    (void) putc( l & 0xff, out );
-    return 0;
-    }
-
-int
-pm_readlittleshort( in, sP )
-    FILE* in;
-    short* sP;
-    {
-    int c;
-
-    if ( (c = getc( in )) == EOF )
-	return -1;
-    *sP = c & 0xff;
-    if ( (c = getc( in )) == EOF )
-	return -1;
-    *sP |= ( c & 0xff ) << 8;
-    return 0;
-    }
-
-#if __STDC__
-int
-pm_writelittleshort( FILE* out, short s )
-#else /*__STDC__*/
-int
-pm_writelittleshort( out, s )
-    FILE* out;
-    short s;
-#endif /*__STDC__*/
-    {
-    (void) putc( s & 0xff, out );
-    (void) putc( ( s >> 8 ) & 0xff, out );
-    return 0;
-    }
-
-int
-pm_readlittlelong( in, lP )
-    FILE* in;
-    long* lP;
-    {
-    int c;
-
-    if ( (c = getc( in )) == EOF )
-	return -1;
-    *lP = c & 0xff;
-    if ( (c = getc( in )) == EOF )
-	return -1;
-    *lP |= ( c & 0xff ) << 8;
-    if ( (c = getc( in )) == EOF )
-	return -1;
-    *lP |= ( c & 0xff ) << 16;
-    if ( (c = getc( in )) == EOF )
-	return -1;
-    *lP |= ( c & 0xff ) << 24;
-    return 0;
-    }
-
-int
-pm_writelittlelong( out, l )
-    FILE* out;
-    long l;
-    {
-    (void) putc( l & 0xff, out );
-    (void) putc( ( l >> 8 ) & 0xff, out );
-    (void) putc( ( l >> 16 ) & 0xff, out );
-    (void) putc( ( l >> 24 ) & 0xff, out );
-    return 0;
-    }
diff --git a/exsrc/src/pbmplus/pbmplus.h b/exsrc/src/pbmplus/pbmplus.h
deleted file mode 100644
index 7f868c83c..000000000
--- a/exsrc/src/pbmplus/pbmplus.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/* pbmplus.h - header file for PBM, PGM, PPM, and PNM
-**
-** Copyright (C) 1988, 1989, 1991 by Jef Poskanzer.
-**
-** Permission to use, copy, modify, and distribute this software and its
-** documentation for any purpose and without fee is hereby granted, provided
-** that the above copyright notice appear in all copies and that both that
-** copyright notice and this permission notice appear in supporting
-** documentation.  This software is provided "as is" without express or
-** implied warranty.
-*/
-
-#ifndef _PBMPLUS_H_
-#define _PBMPLUS_H_
-
-#include <sys/types.h>
-#include <ctype.h>
-#include <stdio.h>
-
-#if defined(USG) || defined(SVR4)
-#define SYSV
-#endif
-#if ! ( defined(BSD) || defined(SYSV) || defined(MSDOS) )
-/* CONFIGURE: If your system is >= 4.2BSD, set the BSD option; if you're a
-** System V site, set the SYSV option; and if you're IBM-compatible, set
-** MSDOS.  If your compiler is ANSI C, you're probably better off setting
-** SYSV - all it affects is string handling.
-*/
-#define BSD
-/* #define SYSV */
-/* #define MSDOS */
-#endif
-
-/* CONFIGURE: If you want to enable writing "raw" files, set this option.
-** "Raw" files are smaller, and much faster to read and write, but you
-** must have a filesystem that allows all 256 ASCII characters to be read
-** and written.  You will no longer be able to mail P?M files without 
-** using uuencode or the equivalent, or running the files through pnmnoraw.
-** Note that reading "raw" files works whether writing is enabled or not.
-*/
-#define PBMPLUS_RAWBITS
-
-/* CONFIGURE: PGM can store gray values as either bytes or shorts.  For most
-** applications, bytes will be big enough, and the memory savings can be
-** substantial.  However, if you need more than 8 bits of grayscale resolution,
-** then define this symbol.
-*/
-/* #define PGM_BIGGRAYS */
-
-/* CONFIGURE: Normally, PPM handles a pixel as a struct of three grays.
-** If grays are stored in bytes, that's 24 bits per color pixel; if
-** grays are stored as shorts, that's 48 bits per color pixel.  PPM
-** can also be configured to pack the three grays into a single longword,
-** 10 bits each, 30 bits per pixel.
-**
-** If you have configured PGM with the PGM_BIGGRAYS option, AND you don't
-** need more than 10 bits for each color component, AND you care more about
-** memory use than speed, then this option might be a win.  Under these
-** circumstances it will make some of the programs use 1.5 times less space,
-** but all of the programs will run about 1.4 times slower.
-**
-** If you are not using PGM_BIGGRAYS, then this option is useless -- it
-** doesn't save any space, but it still slows things down.
-*/
-/* #define PPM_PACKCOLORS */
-
-/* CONFIGURE: uncomment this to enable debugging checks. */
-/* #define DEBUG */
-
-#ifdef SYSV
-
-#include <string.h>
-#define index(s,c) strchr(s,c)
-#define rindex(s,c) strrchr(s,c)
-#define srandom(s) srand(s)
-#define random rand
-#define bzero(dst,len) memset(dst,0,len)
-#define bcopy(src,dst,len) memcpy(dst,src,len)
-#define bcmp memcmp
-extern void srand();
-extern int rand();
-
-#else /*SYSV*/
-
-#include <strings.h>
-extern void srandom();
-extern long random();
-
-#endif /*SYSV*/
-
-extern int atoi();
-extern void exit();
-extern long time();
-extern int write();
-
-/* CONFIGURE: On some systems, malloc.h doesn't declare these, so we have
-** to do it.  On other systems, for example HP/UX, it declares them
-** incompatibly.  And some systems, for example Dynix, don't have a
-** malloc.h at all.  A sad situation.  If you have compilation problems
-** that point here, feel free to tweak or remove these declarations.
-*/
-#include <sys/malloc.h>
-//extern char* malloc();
-//extern char* realloc();
-//extern char* calloc();
-
-/* CONFIGURE: Some systems don't have vfprintf(), which we need for the
-** error-reporting routines.  If you compile and get a link error about
-** this routine, uncomment the first define, which gives you a vfprintf
-** that uses the theoretically non-portable but fairly common routine
-** _doprnt().  If you then get a link error about _doprnt, or
-** message-printing doesn't look like it's working, try the second
-** define instead.
-*/
-/* #define NEED_VFPRINTF1 */
-/* #define NEED_VFPRINTF2 */
-
-/* End of configurable definitions. */
-
-
-#undef max
-#define max(a,b) ((a) > (b) ? (a) : (b))
-#undef min
-#define min(a,b) ((a) < (b) ? (a) : (b))
-#undef abs
-#define abs(a) ((a) >= 0 ? (a) : -(a))
-#undef odd
-#define odd(n) ((n) & 1)
-
-
-/* Definitions to make PBMPLUS work with either ANSI C or C Classic. */
-
-#if __STDC__
-#define ARGS(alist) alist
-#else /*__STDC__*/
-#define ARGS(alist) ()
-#define const
-#endif /*__STDC__*/
-
-
-/* Initialization. */
-
-void pm_init ARGS(( int* argcP, char* argv[] ));
-
-
-/* Variable-sized arrays definitions. */
-
-char** pm_allocarray ARGS(( int cols, int rows, int size ));
-char* pm_allocrow ARGS(( int cols, int size ));
-void pm_freearray ARGS(( char** its, int rows ));
-void pm_freerow ARGS(( char* itrow ));
-
-
-/* Case-insensitive keyword matcher. */
-
-int pm_keymatch ARGS(( char* str, char* keyword, int minchars ));
-
-
-/* Log base two hacks. */
-
-int pm_maxvaltobits ARGS(( int maxval ));
-int pm_bitstomaxval ARGS(( int bits ));
-
-
-/* Error handling definitions. */
-
-void pm_message ARGS(( char*, ... ));
-void pm_error ARGS(( char*, ... ));			/* doesn't return */
-void pm_perror ARGS(( char* reason ));			/* doesn't return */
-void pm_usage ARGS(( char* usage ));			/* doesn't return */
-
-
-/* File open/close that handles "-" as stdin and checks errors. */
-
-FILE* pm_openr ARGS(( char* name ));
-FILE* pm_openw ARGS(( char* name ));
-void pm_close ARGS(( FILE* f ));
-
-
-/* Endian I/O. */
-
-int pm_readbigshort ARGS(( FILE* in, short* sP ));
-int pm_writebigshort ARGS(( FILE* out, short s ));
-int pm_readbiglong ARGS(( FILE* in, long* lP ));
-int pm_writebiglong ARGS(( FILE* out, long l ));
-int pm_readlittleshort ARGS(( FILE* in, short* sP ));
-int pm_writelittleshort ARGS(( FILE* out, short s ));
-int pm_readlittlelong ARGS(( FILE* in, long* lP ));
-int pm_writelittlelong ARGS(( FILE* out, long l ));
-
-
-#endif /*_PBMPLUS_H_*/
diff --git a/exsrc/src/pbmplus/pnm/Makefile.in b/exsrc/src/pbmplus/pnm/Makefile.in
deleted file mode 100644
index e14ff6d7b..000000000
--- a/exsrc/src/pbmplus/pnm/Makefile.in
+++ /dev/null
@@ -1,188 +0,0 @@
-# Makefile for pnm tools.
-#
-# Copyright (C) 1989, 1991 by Jef Poskanzer.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose and without fee is hereby granted, provided
-# that the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation.  This software is provided "as is" without express or
-# implied warranty.
-
-# Default values, usually overridden by top-level Makefile.
-#CC =		cc
-CC =		gcc -ansi -pedantic -fcombine-regs -fpcc-struct-return
-#CFLAGS =	-O
-CFLAGS =	-g -w
-#CFLAGS =	-g -O
-TIFFDEF =	-DLIBTIFF
-TIFFINC =	-I@EXTERNALS@/include
-TIFFLIB =	@EXTERNALS@/lib/libtiff.a
-TIFFBINARIES =  tifftopnm pnmtotiff
-TIFFOBJECTS =   tifftopnm.o pnmtotiff.o
-#LDFLAGS =	-s
-LDFLAGS =	
-INSTALLBINARIES =	@EXTERNALS@/bin
-INSTALLSCRIPTS =	$(INSTALLBINARIES)
-INSTALLMANUALS1 =	@EXTERNALS@/man/mann
-SUFFIXMANUALS1 =	1
-INSTALLMANUALS3 =	@EXTERNALS@/man/mann
-SUFFIXMANUALS3 =	3
-INSTALLMANUALS5 =	@EXTERNALS@/man/mann
-SUFFIXMANUALS5 =	5
-MANCP =			cp
-
-PPMDIR =	../ppm
-INCLUDEPPM =	-I$(PPMDIR)
-LIBPPM =	$(PPMDIR)/libppm.a
-DEFPPM =	$(PPMDIR)/ppm.h
-DEFLIBPPM =	$(PPMDIR)/libppm.h
-
-PGMDIR =	../pgm
-INCLUDEPGM =	-I$(PGMDIR)
-LIBPGM =	$(PGMDIR)/libpgm.a
-DEFPGM =	$(PGMDIR)/pgm.h
-DEFLIBPGM =	$(PGMDIR)/libpgm.h
-
-PBMDIR =	../pbm
-INCLUDEPBM =	-I$(PBMDIR)
-LIBPBM =	$(PBMDIR)/libpbm.a
-DEFPBM =	$(PBMDIR)/pbm.h ../pbmplus.h
-DEFLIBPBM =	$(PBMDIR)/libpbm.h
-
-SHELL =		/bin/sh
-INCLUDE =	-I.. $(INCLUDEPPM) $(INCLUDEPGM) $(INCLUDEPBM)
-ALLCFLAGS =	$(CFLAGS) $(INCLUDE) $(TIFFDEF) $(TIFFINC)
-LIBPNM =	libpnm.a
-
-PORTBINARIES =	pnmarith pnmcat pnmconvol pnmcrop pnmcut \
-		pnmdepth pnmenlarge pnmfile pnmflip pnminvert \
-		pnmnoraw pnmpaste pnmscale pnmtile pnmtops \
-		pnmtorast pnmtoxwd rasttopnm xwdtopnm
-MATHBINARIES =	pnmgamma pnmrotate pnmshear
-BINARIES =      $(PORTBINARIES) $(MATHBINARIES) $(TIFFBINARIES)
-SCRIPTS =	anytopnm pnmindex pnmmargin pnmsmooth
-
-PORTOBJECTS =	pnmarith.o pnmcat.o pnmconvol.o pnmcrop.o pnmcut.o \
-		pnmdepth.o pnmenlarge.o pnmfile.o pnmflip.o pnminvert.o \
-		pnmnoraw.o pnmpaste.o pnmscale.o pnmtile.o pnmtops.o \
-		pnmtorast.o pnmtoxwd.o rasttopnm.o xwdtopnm.o \
-		pnmgamma.o pnmrotate.o pnmshear.o
-OBJECTS =	$(PORTOBJECTS) $(TIFFOBJECTS)
-
-MANUALS1 =	$(BINARIES) $(SCRIPTS)
-MANUALS3 =	libpnm
-MANUALS5 =	pnm
-
-
-#all:		binaries
-all:		merge
-#install:	install.bin
-install:	install.merge
-
-
-binaries:	$(BINARIES)
-
-install.bin:	binaries $(SCRIPTS)
-	cd $(INSTALLBINARIES) ; rm -f $(BINARIES)
-	cp $(BINARIES) $(INSTALLBINARIES)
-	cd $(INSTALLSCRIPTS) ; rm -f $(SCRIPTS)
-	cp $(SCRIPTS) $(INSTALLSCRIPTS)
-	cd $(INSTALLSCRIPTS) ; chmod +x $(SCRIPTS)
-
-
-merge:		pnmmerge
-pnmmerge:	pnmmerge.c $(OBJECTS) $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM)
-	$(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@ $@.c $(OBJECTS) -lm $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) $(TIFFLIB)
-
-install.merge:	install.pnmmerge $(SCRIPTS)
-install.pnmmerge:	pnmmerge
-	cd $(INSTALLBINARIES) ; rm -f $(BINARIES)
-	cp pnmmerge $(INSTALLBINARIES)
-	cd $(INSTALLBINARIES) ; for i in $(BINARIES) ; do ln pnmmerge $$i ; done
-	rm $(INSTALLBINARIES)/pnmmerge
-	cd $(INSTALLSCRIPTS) ; rm -f $(SCRIPTS)
-	cp $(SCRIPTS) $(INSTALLSCRIPTS)
-	cd $(INSTALLSCRIPTS) ; chmod +x $(SCRIPTS)
-
-
-install.man:
-	for i in $(MANUALS1) ; do \
-	    rm -f $(INSTALLMANUALS1)/$$i.$(SUFFIXMANUALS1) ; \
-	    $(MANCP) $$i.1 $(INSTALLMANUALS1)/$$i.$(SUFFIXMANUALS1) ; \
-	done
-	for i in $(MANUALS3) ; do \
-	    rm -f $(INSTALLMANUALS3)/$$i.$(SUFFIXMANUALS3) ; \
-	    $(MANCP) $$i.3 $(INSTALLMANUALS3)/$$i.$(SUFFIXMANUALS3) ; \
-	done
-	for i in $(MANUALS5) ; do \
-	    rm -f $(INSTALLMANUALS5)/$$i.$(SUFFIXMANUALS5) ; \
-	    $(MANCP) $$i.5 $(INSTALLMANUALS5)/$$i.$(SUFFIXMANUALS5) ; \
-	done
-
-
-# Rules for plain programs.
-$(PORTBINARIES) $(TIFFBINARIES):	pnm.h $(DEFPPM) $(DEFPGM) $(DEFPBM) $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) $(TIFFLIB)
-	$(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@ $@.c $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) $(TIFFLIB)
-
-# Rule for math-dependent programs.
-$(MATHBINARIES):        pnm.h $(DEFPPM) $(DEFPGM) $(DEFPBM) $(LIBPNM) \
-			$(LIBPPM) $(LIBPGM) $(LIBPBM)
-	$(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@ $@.c -lm $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM)
-
-# Rule for objects.
-$(OBJECTS):	pnm.h $(DEFPPM) $(DEFPGM) $(DEFPBM)
-	$(CC) $(ALLCFLAGS) "-Dmain=$*_main" -c $*.c
-
-# And libraries.
-$(LIBPBM):
-	cd $(PBMDIR) ; make lib
-$(LIBPGM) FOO:
-	cd $(PGMDIR) ; make lib
-$(LIBPPM) BAR:
-	cd $(PPMDIR) ; make lib
-lib:		$(LIBPNM)
-$(LIBPNM):	libpnm1.o libpnm2.o libpnm3.o libpnm4.o
-	-rm -f $(LIBPNM)
-	ar rc $(LIBPNM) libpnm1.o libpnm2.o libpnm3.o libpnm4.o
-	-ranlib $(LIBPNM)
-
-libpnm1.o:	pnm.h $(DEFPPM) $(DEFPGM) $(DEFPBM) libpnm1.c
-	$(CC) $(ALLCFLAGS) -c libpnm1.c
-libpnm2.o:	pnm.h $(DEFPPM) $(DEFPGM) $(DEFPBM) libpnm2.c $(DEFLIBPPM) \
-		$(DEFLIBPGM) $(DEFLIBPBM)
-	$(CC) $(ALLCFLAGS) -c libpnm2.c
-libpnm3.o:	pnm.h $(DEFPPM) $(DEFPGM) $(DEFPBM) libpnm3.c $(DEFLIBPPM) \
-		$(DEFLIBPGM) $(DEFLIBPBM)
-	$(CC) $(ALLCFLAGS) -c libpnm3.c
-libpnm4.o:	pnm.h $(DEFPPM) $(DEFPGM) $(DEFPBM) rast.h libpnm4.c
-	$(CC) $(ALLCFLAGS) -c libpnm4.c
-
-# Other dependencies.
-pnmarith pnmarith.o:		pnmarith.c
-pnmcat pnmcat.o:		pnmcat.c
-pnmconvol pnmconvol.o:		pnmconvol.c
-pnmcrop pnmcrop.o:		pnmcrop.c
-pnmcut pnmcut.o:		pnmcut.c
-pnmdepth pnmdepth.o:		pnmdepth.c
-pnmenlarge pnmenlarge.o:	pnmenlarge.c
-pnmfile pnmfile.o:		pnmfile.c
-pnmflip pnmflip.o:		pnmflip.c
-pnmgamma pnmgamma.o:		pnmgamma.c
-pnminvert pnminvert.o:		pnminvert.c
-pnmnoraw pnmnoraw.o:		pnmnoraw.c
-pnmpaste pnmpaste.o:		pnmpaste.c
-pnmrotate pnmrotate.o:		pnmrotate.c
-pnmscale pnmscale.o:		pnmscale.c
-pnmshear pnmshear.o:		pnmshear.c
-pnmtile pnmtile.o:		pnmtile.c
-pnmtops pnmtops.o:		pnmtops.c
-pnmtorast pnmtorast.o:		pnmtorast.c rast.h
-pnmtotiff pnmtotiff.o:		pnmtotiff.c
-pnmtoxwd pnmtoxwd.o:		pnmtoxwd.c x11wd.h
-rasttopnm rasttopnm.o:		rasttopnm.c rast.h
-tifftopnm tifftopnm.o:		tifftopnm.c
-xwdtopnm xwdtopnm.o:		xwdtopnm.c x10wd.h x11wd.h
-
-clean:
-	-rm -f *.o *.a *.cat core $(BINARIES) pnmmerge
diff --git a/exsrc/src/png/pngconf.h b/exsrc/src/png/pngconf.h
deleted file mode 100644
index e185438ca..000000000
--- a/exsrc/src/png/pngconf.h
+++ /dev/null
@@ -1,632 +0,0 @@
-
-/* pngconf.h - machine configurable file for libpng
- *
- * libpng version 1.5.1 - February 3, 2011
- *
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- */
-
-/* Any machine specific code is near the front of this file, so if you
- * are configuring libpng for a machine, you may want to read the section
- * starting here down to where it starts to typedef png_color, png_text,
- * and png_info.
- */
-
-#ifndef PNGCONF_H
-#define PNGCONF_H
-
-/* PNG_NO_LIMITS_H may be used to turn off the use of the standard C
- * definition file for  machine specific limits, this may impact the
- * correctness of the definitons below (see uses of INT_MAX).
- */
-#ifndef PNG_NO_LIMITS_H
-#  include <limits.h>
-#endif
-
-/* For the memory copy APIs (i.e. the standard definitions of these),
- * because this file defines png_memcpy and so on the base APIs must
- * be defined here.
- */
-#ifdef BSD
-#  include <strings.h>
-#else
-#  include <string.h>
-#endif
-
-/* For png_FILE_p - this provides the standard definition of a
- * FILE
- */
-#ifdef PNG_STDIO_SUPPORTED
-#  include <stdio.h>
-#endif
-
-/* This controls optimization of the reading of 16 and 32 bit values
- * from PNG files.  It can be set on a per-app-file basis - it
- * just changes whether a macro is used to the function is called.
- * The library builder sets the default, if read functions are not
- * built into the library the macro implementation is forced on.
- */
-#ifndef PNG_READ_INT_FUNCTIONS_SUPPORTED
-#  define PNG_USE_READ_MACROS
-#endif
-#if !defined(PNG_NO_USE_READ_MACROS) && !defined(PNG_USE_READ_MACROS)
-#  if PNG_DEFAULT_READ_MACROS
-#    define PNG_USE_READ_MACROS
-#  endif
-#endif
-
-/* COMPILER SPECIFIC OPTIONS.
- *
- * These options are provided so that a variety of difficult compilers
- * can be used.  Some are fixed at build time (e.g. PNG_API_RULE
- * below) but still have compiler specific implementations, others
- * may be changed on a per-file basis when compiling against libpng.
- */
-
-/* The PNGARG macro protects us against machines that don't have function
- * prototypes (ie K&R style headers).  If your compiler does not handle
- * function prototypes, define this macro and use the included ansi2knr.
- * I've always been able to use _NO_PROTO as the indicator, but you may
- * need to drag the empty declaration out in front of here, or change the
- * ifdef to suit your own needs.
- */
-#ifndef PNGARG
-
-#  ifdef OF /* zlib prototype munger */
-#    define PNGARG(arglist) OF(arglist)
-#  else
-
-#    ifdef _NO_PROTO
-#      define PNGARG(arglist) ()
-#    else
-#      define PNGARG(arglist) arglist
-#    endif /* _NO_PROTO */
-
-#  endif /* OF */
-
-#endif /* PNGARG */
-
-/* Function calling conventions.
- * =============================
- * Normally it is not necessary to specify to the compiler how to call
- * a function - it just does it - however on x86 systems derived from
- * Microsoft and Borland C compilers ('IBM PC', 'DOS', 'Windows' systems
- * and some others) there are multiple ways to call a function and the
- * default can be changed on the compiler command line.  For this reason
- * libpng specifies the calling convention of every exported function and
- * every function called via a user supplied function pointer.  This is
- * done in this file by defining the following macros:
- *
- * PNGAPI    Calling convention for exported functions.
- * PNGCBAPI  Calling convention for user provided (callback) functions.
- * PNGCAPI   Calling convention used by the ANSI-C library (required
- *           for longjmp callbacks and sometimes used internally to
- *           specify the calling convention for zlib).
- *
- * These macros should never be overridden.  If it is necessary to
- * change calling convention in a private build this can be done
- * by setting PNG_API_RULE (which defaults to 0) to one of the values
- * below to select the correct 'API' variants.
- *
- * PNG_API_RULE=0 Use PNGCAPI - the 'C' calling convention - throughout.
- *                This is correct in every known environment.
- * PNG_API_RULE=1 Use the operating system convention for PNGAPI and
- *                the 'C' calling convention (from PNGCAPI) for
- *                callbacks (PNGCBAPI).  This is no longer required
- *                in any known environment - if it has to be used
- *                please post an explanation of the problem to the
- *                libpng mailing list.
- *
- * These cases only differ if the operating system does not use the C
- * calling convention, at present this just means the above cases
- * (x86 DOS/Windows sytems) and, even then, this does not apply to
- * Cygwin running on those systems.
- *
- * Note that the value must be defined in pnglibconf.h so that what
- * the application uses to call the library matches the conventions
- * set when building the library.
- */
-
-/* Symbol export
- * =============
- * When building a shared library it is almost always necessary to tell
- * the compiler which symbols to export.  The png.h macro 'PNG_EXPORT'
- * is used to mark the symbols.  On some systems these symbols can be
- * extracted at link time and need no special processing by the compiler,
- * on other systems the symbols are flagged by the compiler and just
- * the declaration requires a special tag applied (unfortunately) in a
- * compiler dependent way.  Some systems can do either.
- *
- * A small number of older systems also require a symbol from a DLL to
- * be flagged to the program that calls it.  This is a problem because
- * we do not know in the header file included by application code that
- * the symbol will come from a shared library, as opposed to a statically
- * linked one.  For this reason the application must tell us by setting
- * the magic flag PNG_USE_DLL to turn on the special processing before
- * it includes png.h.
- *
- * Four additional macros are used to make this happen:
- *
- * PNG_IMPEXP The magic (if any) to cause a symbol to be exported from
- *            the build or imported if PNG_USE_DLL is set - compiler
- *            and system specific.
- *
- * PNG_EXPORT_TYPE(type) A macro that pre or appends PNG_IMPEXP to
- *                       'type', compiler specific.
- *
- * PNG_DLL_EXPORT Set to the magic to use during a libpng build to
- *                make a symbol exported from the DLL.
- *
- * PNG_DLL_IMPORT Set to the magic to force the libpng symbols to come
- *                from a DLL - used to define PNG_IMPEXP when
- *                PNG_USE_DLL is set.
- */
-
-/* System specific discovery.
- * ==========================
- * This code is used at build time to find PNG_IMPEXP, the API settings
- * and PNG_EXPORT_TYPE(), it may also set a macro to indicate the DLL
- * import processing is possible.  On Windows/x86 systems it also sets
- * compiler-specific macros to the values required to change the calling
- * conventions of the various functions.
- */
-#if ( defined(_Windows) || defined(_WINDOWS) || defined(WIN32) ||\
-      defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) ) &&\
-    ( defined(_X86_) || defined(_X64_) || defined(_M_IX86) ||\
-      defined(_M_X64) || defined(_M_IA64) )
-  /* Windows system (DOS doesn't support DLLs) running on x86/x64.  Includes
-   * builds under Cygwin or MinGW.  Also includes Watcom builds but these need
-   * special treatment because they are not compatible with GCC or Visual C
-   * because of different calling conventions.
-   */
-#  if PNG_API_RULE == 2
-    /* If this line results in an error, either because __watcall is not
-     * understood or because of a redefine just below you cannot use *this*
-     * build of the library with the compiler you are using.  *This* build was
-     * build using Watcom and applications must also be built using Watcom!
-     */
-#    define PNGCAPI __watcall
-#  endif
-
-#  if defined(__GNUC__) || (defined (_MSC_VER) && (_MSC_VER >= 800))
-#    define PNGCAPI __cdecl
-#    if PNG_API_RULE == 1
-#      define PNGAPI __stdcall
-#    endif
-#  else
-    /* An older compiler, or one not detected (erroneously) above,
-     * if necessary override on the command line to get the correct
-     * variants for the compiler.
-     */
-#    ifndef PNGCAPI
-#      define PNGCAPI _cdecl
-#    endif
-#    if PNG_API_RULE == 1 && !defined(PNGAPI)
-#      define PNGAPI _stdcall
-#    endif
-#  endif /* compiler/api */
-  /* NOTE: PNGCBAPI always defaults to PNGCAPI. */
-
-#  if defined(PNGAPI) && !defined(PNG_USER_PRIVATEBUILD)
-   ERROR: PNG_USER_PRIVATEBUILD must be defined if PNGAPI is changed
-#  endif
-
-#  if (defined(_MSC_VER) && _MSC_VER < 800) ||\
-      (defined(__BORLANDC__) && __BORLANDC__ < 0x500)
-    /* older Borland and MSC
-     * compilers used '__export' and required this to be after
-     * the type.
-     */
-#    ifndef PNG_EXPORT_TYPE
-#      define PNG_EXPORT_TYPE(type) type PNG_IMPEXP
-#    endif
-#    define PNG_DLL_EXPORT __export
-#  else /* newer compiler */
-#    define PNG_DLL_EXPORT __declspec(dllexport)
-#    ifndef PNG_DLL_IMPORT
-#      define PNG_DLL_IMPORT __declspec(dllimport)
-#    endif
-#  endif /* compiler */
-
-#else /* !Windows/x86 */
-#  if (defined(__IBMC__) || defined(__IBMCPP__)) && defined(__OS2__)
-#    define PNGAPI _System
-#  else /* !Windows/x86 && !OS/2 */
-    /* Use the defaults, or define PNG*API on the command line (but
-     * this will have to be done for every compile!)
-     */
-#  endif /* other system, !OS/2 */
-#endif /* !Windows/x86 */
-
-/* Now do all the defaulting . */
-#ifndef PNGCAPI
-#  define PNGCAPI
-#endif
-#ifndef PNGCBAPI
-#  define PNGCBAPI PNGCAPI
-#endif
-#ifndef PNGAPI
-#  define PNGAPI PNGCAPI
-#endif
-
-/* The default for PNG_IMPEXP depends on whether the library is
- * being built or used.
- */
-#ifndef PNG_IMPEXP
-#  ifdef PNGLIB_BUILD
-    /* Building the library */
-#    if (defined(DLL_EXPORT)/*from libtool*/ ||\
-        defined(_WINDLL) || defined(_DLL) || defined(__DLL__) ||\
-        defined(_USRDLL) ||\
-        defined(PNG_BUILD_DLL)) && defined(PNG_DLL_EXPORT)
-      /* Building a DLL. */
-#      define PNG_IMPEXP PNG_DLL_EXPORT
-#    endif /* DLL */
-#  else
-    /* Using the library */
-#    if defined(PNG_USE_DLL) && defined(PNG_DLL_IMPORT)
-      /* This forces use of a DLL, disallowing static linking */
-#      define PNG_IMPEXP PNG_DLL_IMPORT
-#    endif
-#  endif
-
-#  ifndef PNG_IMPEXP
-#    define PNG_IMPEXP
-#  endif
-#endif
-
-/* THe following complexity is concerned with getting the 'attributes' of the
- * declared function in the correct place.  This potentially requires a separate
- * PNG_EXPORT function for every compiler.
- */
-#ifndef PNG_FUNCTION
-#  if defined (__GNUC__) && !defined(__clang__)
-#     define PNG_FUNCTION(type, name, args, attributes)\
-         attributes type name args
-#  else /* !GNUC */
-#     ifdef _MSC_VER
-#        define PNG_FUNCTION(type, name, args, attributes)\
-         attributes type name args
-#     else /* !MSC */
-#        define PNG_FUNCTION(type, name, args, attributes)\
-            type name args
-#     endif
-#  endif
-#endif
-
-#ifndef PNG_EXPORT_TYPE
-#  define PNG_EXPORT_TYPE(type) PNG_IMPEXP type
-#endif
-
-   /* The ordinal value is only relevant when preprocessing png.h for symbol
-    * table entries, so we discard it here.  See the .dfn files in the
-    * scripts directory.
-    */
-#ifndef PNG_EXPORTA
-#  define PNG_EXPORTA(ordinal, type, name, args, attributes)\
-      extern PNG_FUNCTION(PNG_EXPORT_TYPE(type),(PNGAPI name),PNGARG(args),\
-         attributes)
-#endif
-
-#define PNG_EXPORT(ordinal, type, name, args)\
-   PNG_EXPORTA(ordinal, type, name, args, )
-
-/* Use PNG_REMOVED to comment out a removed interface. */
-#ifndef PNG_REMOVED
-#  define PNG_REMOVED(ordinal, type, name, args, attributes)
-#endif
-
-#ifndef PNG_CALLBACK
-#  define PNG_CALLBACK(type, name, args, attributes)\
-   type (PNGCBAPI name) PNGARG(args) attributes
-#endif
-
-/* Support for compiler specific function attributes.  These are used
- * so that where compiler support is available incorrect use of API
- * functions in png.h will generate compiler warnings.
- *
- * Added at libpng-1.2.41.
- */
-
-#ifndef PNG_NO_PEDANTIC_WARNINGS
-#  ifndef PNG_PEDANTIC_WARNINGS_SUPPORTED
-#    define PNG_PEDANTIC_WARNINGS_SUPPORTED
-#  endif
-#endif
-
-#ifdef PNG_PEDANTIC_WARNINGS_SUPPORTED
-  /* Support for compiler specific function attributes.  These are used
-   * so that where compiler support is available incorrect use of API
-   * functions in png.h will generate compiler warnings.  Added at libpng
-   * version 1.2.41.
-   */
-#  if defined (__GNUC__) && !defined(__clang__)
-#    ifndef PNG_USE_RESULT
-#      define PNG_USE_RESULT __attribute__((__warn_unused_result__))
-#    endif
-#    ifndef PNG_NORETURN
-#      define PNG_NORETURN   __attribute__((__noreturn__))
-#    endif
-#    ifndef PNG_PTR_NORETURN
-#      define PNG_PTR_NORETURN   __attribute__((__noreturn__))
-#    endif
-#    ifndef PNG_ALLOCATED
-#      define PNG_ALLOCATED  __attribute__((__malloc__))
-#    endif
-
-    /* This specifically protects structure members that should only be
-     * accessed from within the library, therefore should be empty during
-     * a library build.
-     */
-#    ifndef PNGLIB_BUILD
-#      ifndef PNG_DEPRECATED
-#        define PNG_DEPRECATED __attribute__((__deprecated__))
-#      endif
-#      ifndef PNG_DEPSTRUCT
-#        define PNG_DEPSTRUCT  __attribute__((__deprecated__))
-#      endif
-#      ifndef PNG_PRIVATE
-#        if 0 /* Doesn't work so we use deprecated instead*/
-#          define PNG_PRIVATE \
-            __attribute__((warning("This function is not exported by libpng.")))
-#        else
-#          define PNG_PRIVATE \
-            __attribute__((__deprecated__))
-#        endif
-#      endif /* PNG_PRIVATE */
-#    endif /* PNGLIB_BUILD */
-#  endif /* __GNUC__ */
-#  ifdef _MSC_VER /* may need to check value */
-#    ifndef PNG_USE_RESULT
-#      define PNG_USE_RESULT /*not supported*/
-#    endif
-#    ifndef PNG_NORETURN
-#      define PNG_NORETURN   __declspec(noreturn)
-#    endif
-#    ifndef PNG_PTR_NORETURN
-#      define PNG_PTR_NORETURN /*not supported*/
-#    endif
-#    ifndef PNG_ALLOCATED
-#      define PNG_ALLOCATED __declspec(restrict)
-#    endif
-
-    /* This specifically protects structure members that should only be
-     * accessed from within the library, therefore should be empty during
-     * a library build.
-     */
-#    ifndef PNGLIB_BUILD
-#      ifndef PNG_DEPRECATED
-#        define PNG_DEPRECATED __declspec(deprecated)
-#      endif
-#      ifndef PNG_DEPSTRUCT
-#        define PNG_DEPSTRUCT  __declspec(deprecated)
-#      endif
-#      ifndef PNG_PRIVATE
-#        define PNG_PRIVATE __declspec(deprecated)
-#      endif /* PNG_PRIVATE */
-#    endif /* PNGLIB_BUILD */
-#  endif /* __GNUC__ */
-#endif /* PNG_PEDANTIC_WARNINGS */
-
-#ifndef PNG_DEPRECATED
-#  define PNG_DEPRECATED  /* Use of this function is deprecated */
-#endif
-#ifndef PNG_USE_RESULT
-#  define PNG_USE_RESULT  /* The result of this function must be checked */
-#endif
-#ifndef PNG_NORETURN
-#  define PNG_NORETURN    /* This function does not return */
-#endif
-#ifndef PNG_ALLOCATED
-#  define PNG_ALLOCATED   /* The result of the function is new memory */
-#endif
-#ifndef PNG_DEPSTRUCT
-#  define PNG_DEPSTRUCT   /* Access to this struct member is deprecated */
-#endif
-#ifndef PNG_PRIVATE
-#  define PNG_PRIVATE     /* This is a private libpng function */
-#endif
-#ifndef PNG_FP_EXPORT     /* A floating point API. */
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-#     define PNG_FP_EXPORT(ordinal, type, name, args)\
-         PNG_EXPORT(ordinal, type, name, args)
-#  else                   /* No floating point APIs */
-#     define PNG_FP_EXPORT(ordinal, type, name, args)
-#  endif
-#endif
-#ifndef PNG_FIXED_EXPORT  /* A fixed point API. */
-#  ifdef PNG_FIXED_POINT_SUPPORTED
-#     define PNG_FIXED_EXPORT(ordinal, type, name, args)\
-         PNG_EXPORT(ordinal, type, name, args)
-#  else                   /* No fixed point APIs */
-#     define PNG_FIXED_EXPORT(ordinal, type, name, args)
-#  endif
-#endif
-
-/* The following uses const char * instead of char * for error
- * and warning message functions, so some compilers won't complain.
- * If you do not want to use const, define PNG_NO_CONST here.
- *
- * This should not change how the APIs are called, so it can be done
- * on a per-file basis in the application.
- */
-#ifndef PNG_CONST
-#  ifndef PNG_NO_CONST
-#    define PNG_CONST const
-#  else
-#    define PNG_CONST
-#  endif
-#endif
-
-/* Some typedefs to get us started.  These should be safe on most of the
- * common platforms.  The typedefs should be at least as large as the
- * numbers suggest (a png_uint_32 must be at least 32 bits long), but they
- * don't have to be exactly that size.  Some compilers dislike passing
- * unsigned shorts as function parameters, so you may be better off using
- * unsigned int for png_uint_16.
- */
-
-#if defined(INT_MAX) && (INT_MAX > 0x7ffffffeL)
-typedef unsigned int png_uint_32;
-typedef int png_int_32;
-#else
-typedef unsigned long png_uint_32;
-typedef long png_int_32;
-#endif
-typedef unsigned short png_uint_16;
-typedef short png_int_16;
-typedef unsigned char png_byte;
-
-#ifdef PNG_NO_SIZE_T
-typedef unsigned int png_size_t;
-#else
-typedef size_t png_size_t;
-#endif
-#define png_sizeof(x) (sizeof (x))
-
-/* The following is needed for medium model support.  It cannot be in the
- * pngpriv.h header.  Needs modification for other compilers besides
- * MSC.  Model independent support declares all arrays and pointers to be
- * large using the far keyword.  The zlib version used must also support
- * model independent data.  As of version zlib 1.0.4, the necessary changes
- * have been made in zlib.  The USE_FAR_KEYWORD define triggers other
- * changes that are needed. (Tim Wegner)
- */
-
-/* Separate compiler dependencies (problem here is that zlib.h always
- * defines FAR. (SJT)
- */
-#ifdef __BORLANDC__
-#  if defined(__LARGE__) || defined(__HUGE__) || defined(__COMPACT__)
-#    define LDATA 1
-#  else
-#    define LDATA 0
-#  endif
-  /* GRR:  why is Cygwin in here?  Cygwin is not Borland C... */
-#  if !defined(__WIN32__) && !defined(__FLAT__) && !defined(__CYGWIN__)
-#    define PNG_MAX_MALLOC_64K /* only used in build */
-#    if (LDATA != 1)
-#      ifndef FAR
-#        define FAR __far
-#      endif
-#      define USE_FAR_KEYWORD
-#    endif   /* LDATA != 1 */
-         /* Possibly useful for moving data out of default segment.
-          * Uncomment it if you want. Could also define FARDATA as
-          * const if your compiler supports it. (SJT)
-#        define FARDATA FAR
-          */
-#  endif  /* __WIN32__, __FLAT__, __CYGWIN__ */
-#endif   /* __BORLANDC__ */
-
-
-/* Suggest testing for specific compiler first before testing for
- * FAR.  The Watcom compiler defines both __MEDIUM__ and M_I86MM,
- * making reliance oncertain keywords suspect. (SJT)
- */
-
-/* MSC Medium model */
-#ifdef FAR
-#  ifdef M_I86MM
-#    define USE_FAR_KEYWORD
-#    define FARDATA FAR
-#    include <dos.h>
-#  endif
-#endif
-
-/* SJT: default case */
-#ifndef FAR
-#  define FAR
-#endif
-
-/* At this point FAR is always defined */
-#ifndef FARDATA
-#  define FARDATA
-#endif
-
-/* Typedef for floating-point numbers that are converted
- * to fixed-point with a multiple of 100,000, e.g., gamma
- */
-typedef png_int_32 png_fixed_point;
-
-/* Add typedefs for pointers */
-typedef void                      FAR * png_voidp;
-typedef PNG_CONST void            FAR * png_const_voidp;
-typedef png_byte                  FAR * png_bytep;
-typedef PNG_CONST png_byte        FAR * png_const_bytep;
-typedef png_uint_32               FAR * png_uint_32p;
-typedef PNG_CONST png_uint_32     FAR * png_const_uint_32p;
-typedef png_int_32                FAR * png_int_32p;
-typedef PNG_CONST png_int_32      FAR * png_const_int_32p;
-typedef png_uint_16               FAR * png_uint_16p;
-typedef PNG_CONST png_uint_16     FAR * png_const_uint_16p;
-typedef png_int_16                FAR * png_int_16p;
-typedef PNG_CONST png_int_16      FAR * png_const_int_16p;
-typedef char                      FAR * png_charp;
-typedef PNG_CONST char            FAR * png_const_charp;
-typedef png_fixed_point           FAR * png_fixed_point_p;
-typedef PNG_CONST png_fixed_point FAR * png_const_fixed_point_p;
-typedef png_size_t                FAR * png_size_tp;
-typedef PNG_CONST png_size_t      FAR * png_const_size_tp;
-
-#ifdef PNG_STDIO_SUPPORTED
-typedef FILE            * png_FILE_p;
-#endif
-
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-typedef double           FAR * png_doublep;
-typedef PNG_CONST double FAR * png_const_doublep;
-#endif
-
-/* Pointers to pointers; i.e. arrays */
-typedef png_byte        FAR * FAR * png_bytepp;
-typedef png_uint_32     FAR * FAR * png_uint_32pp;
-typedef png_int_32      FAR * FAR * png_int_32pp;
-typedef png_uint_16     FAR * FAR * png_uint_16pp;
-typedef png_int_16      FAR * FAR * png_int_16pp;
-typedef PNG_CONST char  FAR * FAR * png_const_charpp;
-typedef char            FAR * FAR * png_charpp;
-typedef png_fixed_point FAR * FAR * png_fixed_point_pp;
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-typedef double          FAR * FAR * png_doublepp;
-#endif
-
-/* Pointers to pointers to pointers; i.e., pointer to array */
-typedef char            FAR * FAR * FAR * png_charppp;
-
-/* png_alloc_size_t is guaranteed to be no smaller than png_size_t,
- * and no smaller than png_uint_32.  Casts from png_size_t or png_uint_32
- * to png_alloc_size_t are not necessary; in fact, it is recommended
- * not to use them at all so that the compiler can complain when something
- * turns out to be problematic.
- * Casts in the other direction (from png_alloc_size_t to png_size_t or
- * png_uint_32) should be explicitly applied; however, we do not expect
- * to encounter practical situations that require such conversions.
- */
-#if defined(__TURBOC__) && !defined(__FLAT__)
-   typedef unsigned long png_alloc_size_t;
-#else
-#  if defined(_MSC_VER) && defined(MAXSEG_64K)
-     typedef unsigned long    png_alloc_size_t;
-#  else
-     /* This is an attempt to detect an old Windows system where (int) is
-      * actually 16 bits, in that case png_malloc must have an argument with a
-      * bigger size to accomodate the requirements of the library.
-      */
-#    if (defined(_Windows) || defined(_WINDOWS) || defined(_WINDOWS_)) && \
-        (!defined(INT_MAX) || INT_MAX <= 0x7ffffffeL)
-       typedef DWORD         png_alloc_size_t;
-#    else
-       typedef png_size_t    png_alloc_size_t;
-#    endif
-#  endif
-#endif
-
-#endif /* PNGCONF_H */
diff --git a/exsrc/src/readline/shobj-conf b/exsrc/src/readline/shobj-conf
deleted file mode 100644
index 663869a81..000000000
--- a/exsrc/src/readline/shobj-conf
+++ /dev/null
@@ -1,579 +0,0 @@
-#! /bin/sh
-#
-# shobj-conf -- output a series of variable assignments to be substituted
-#		into a Makefile by configure which specify system-dependent
-#		information for creating shared objects that may be loaded
-#		into bash with `enable -f'
-#
-# usage: shobj-conf [-C compiler] -c host_cpu -o host_os -v host_vendor
-#
-# Chet Ramey
-# chet@po.cwru.edu
-
-#   Copyright (C) 1996-2009 Free Software Foundation, Inc.
-#
-#   This file is part of GNU Bash, the Bourne Again SHell.
-#
-#   This program is free software: you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-#
-# defaults
-#
-SHOBJ_STATUS=supported
-SHLIB_STATUS=supported
-
-SHOBJ_CC=cc
-SHOBJ_CFLAGS=
-SHOBJ_LD=
-SHOBJ_LDFLAGS=
-SHOBJ_XLDFLAGS=
-SHOBJ_LIBS=
-
-SHLIB_XLDFLAGS=
-SHLIB_LIBS='-ltermcap'
-
-SHLIB_DOT='.'
-SHLIB_LIBPREF='lib'
-SHLIB_LIBSUFF='so'
-
-SHLIB_LIBVERSION='$(SHLIB_LIBSUFF)'
-SHLIB_DLLVERSION='$(SHLIB_MAJOR)'
-
-PROGNAME=`basename $0`
-USAGE="$PROGNAME [-C compiler] -c host_cpu -o host_os -v host_vendor"
-
-while [ $# -gt 0 ]; do
-	case "$1" in
-	-C)	shift; SHOBJ_CC="$1"; shift ;;
-	-c)	shift; host_cpu="$1"; shift ;;
-	-o)	shift; host_os="$1"; shift ;;
-	-v)	shift; host_vendor="$1"; shift ;;
-	*)	echo "$USAGE" >&2 ; exit 2;;
-	esac
-done
-
-case "${host_os}-${SHOBJ_CC}-${host_vendor}" in
-sunos4*-*gcc*)
-	SHOBJ_CFLAGS=-fpic
-	SHOBJ_LD=/usr/bin/ld
-	SHOBJ_LDFLAGS='-assert pure-text'
-
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
-	;;
-
-sunos4*)
-	SHOBJ_CFLAGS=-pic
-	SHOBJ_LD=/usr/bin/ld
-	SHOBJ_LDFLAGS='-assert pure-text'
-
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
-	;;
-
-sunos5*-*gcc*|solaris2*-*gcc*)
-	SHOBJ_LD='${CC}'
-	ld_used=`gcc -print-prog-name=ld`
-	if ${ld_used} -V 2>&1 | grep GNU >/dev/null 2>&1; then
-		# This line works for the GNU ld
-		SHOBJ_LDFLAGS='-shared -Wl,-h,$@'
-		# http://sourceware.org/ml/binutils/2001-08/msg00361.html
-		SHOBJ_CFLAGS=-fPIC
-	else
-		# This line works for the Solaris linker in /usr/ccs/bin/ld
-		SHOBJ_LDFLAGS='-shared -Wl,-i -Wl,-h,$@'
-		SHOBJ_CFLAGS=-fpic
-	fi
-
-#	SHLIB_XLDFLAGS='-R $(libdir)'
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-	;;
-
-sunos5*|solaris2*)
-	SHOBJ_CFLAGS='-K pic'
-	SHOBJ_LD=/usr/ccs/bin/ld
-	SHOBJ_LDFLAGS='-G -dy -z text -i -h $@'
-
-#	SHLIB_XLDFLAGS='-R $(libdir)'
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-	;;
-
-# All versions of Linux (including Gentoo/FreeBSD) or the semi-mythical GNU Hurd.
-linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo)
-	SHOBJ_CFLAGS=-fPIC
-	SHOBJ_LD='${CC}'
-	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
-
-	SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
-	;;
-
-freebsd2*)
-	SHOBJ_CFLAGS=-fpic
-	SHOBJ_LD=ld
-	SHOBJ_LDFLAGS='-x -Bshareable'
-
-	SHLIB_XLDFLAGS='-R$(libdir)'
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
-	;;
-
-# FreeBSD-3.x ELF
-freebsd3*|freebsdaout*)
-	SHOBJ_CFLAGS=-fPIC
-	SHOBJ_LD='${CC}'
-
-	if [ -x /usr/bin/objformat ] && [ "`/usr/bin/objformat`" = "elf" ]; then
-		SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
-
-		SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir)'
-		SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-	else
-		SHOBJ_LDFLAGS='-shared'
-
-		SHLIB_XLDFLAGS='-R$(libdir)'
-		SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
-	fi
-	;;
-
-# FreeBSD-4.x and later have only ELF
-freebsd[4-9]*|freebsdelf*|dragonfly*)
-	SHOBJ_CFLAGS=-fPIC
-	SHOBJ_LD='${CC}'
-
-	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
-	SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir)'
-
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-	;;
-
-# Darwin/MacOS X
-darwin[89]*|darwin10*)
-	SHOBJ_STATUS=supported
-	SHLIB_STATUS=supported
-	
-	SHOBJ_CFLAGS='-fno-common'
-
-	SHOBJ_LD='MACOSX_DEPLOYMENT_TARGET=10.3 ${CC}'
-
-	SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)'
-	SHLIB_LIBSUFF='dylib'
-
-	SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup -arch_only `/usr/bin/arch`'
-	SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
-
-	SHLIB_LIBS='-lncurses'	# see if -lcurses works on MacOS X 10.1 
-	;;
-
-darwin*|macosx*)
-	SHOBJ_STATUS=unsupported
-	SHLIB_STATUS=supported
-
-	SHOBJ_CFLAGS='-fno-common'
-
-	SHOBJ_LD='${CC}'
-
-	SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)'
-	SHLIB_LIBSUFF='dylib'
-
-	case "${host_os}" in
-	darwin[789]*|darwin10*)	SHOBJ_LDFLAGS=''
-			SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
-			;;
-	*)		SHOBJ_LDFLAGS='-dynamic'
-			SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
-			;;
-	esac
-
-	SHLIB_LIBS='-lncurses'	# see if -lcurses works on MacOS X 10.1 
-	;;
-
-openbsd*|netbsd*)
-	SHOBJ_CFLAGS=-fPIC
-	SHOBJ_LD='${CC}'
-	SHOBJ_LDFLAGS='-shared'
-
-	SHLIB_XLDFLAGS='-R$(libdir)'
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
-	;;
-
-bsdi2*)
-	SHOBJ_CC=shlicc2
-	SHOBJ_CFLAGS=
-	SHOBJ_LD=ld
-	SHOBJ_LDFLAGS=-r
-	SHOBJ_LIBS=-lc_s.2.1.0
-
-	# BSD/OS 2.x and 3.x `shared libraries' are too much of a pain in
-	# the ass -- they require changing {/usr/lib,etc}/shlib.map on
-	# each system, and the library creation process is byzantine
-	SHLIB_STATUS=unsupported
-	;;
-
-bsdi3*)
-	SHOBJ_CC=shlicc2
-	SHOBJ_CFLAGS=
-	SHOBJ_LD=ld
-	SHOBJ_LDFLAGS=-r
-	SHOBJ_LIBS=-lc_s.3.0.0
-
-	# BSD/OS 2.x and 3.x `shared libraries' are too much of a pain in
-	# the ass -- they require changing {/usr/lib,etc}/shlib.map on
-	# each system, and the library creation process is byzantine
-	SHLIB_STATUS=unsupported
-	;;
-
-bsdi4*)
-	# BSD/OS 4.x now supports ELF and SunOS-style dynamically-linked
-	# shared libraries.  gcc 2.x is the standard compiler, and the
-	# `normal' gcc options should work as they do in Linux.
-
-	SHOBJ_CFLAGS=-fPIC
-	SHOBJ_LD='${CC}'
-	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
-
-	SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
-	;;
-
-osf*-*gcc*)
-	# Fix to use gcc linker driver from bfischer@TechFak.Uni-Bielefeld.DE
-	SHOBJ_LD='${CC}'
-	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
-
-	SHLIB_XLDFLAGS='-rpath $(libdir)'
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-	;;
-
-osf*)
-	SHOBJ_LD=ld
-	SHOBJ_LDFLAGS='-shared -soname $@ -expect_unresolved "*"'
-
-	SHLIB_XLDFLAGS='-rpath $(libdir)'
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-	;;
-
-aix4.[2-9]*-*gcc*|aix[5-9].*-*gcc*)		# lightly tested by jik@cisco.com
-	SHOBJ_CFLAGS=-fpic
-	SHOBJ_LD='ld'
-	SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall'
-	SHOBJ_XLDFLAGS='-G'
-
-	SHLIB_XLDFLAGS='-bM:SRE'
-	SHLIB_LIBS='-lcurses -lc'
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-	;;
-
-aix4.[2-9]*|aix[5-9].*)
-	SHOBJ_CFLAGS=-K
-	SHOBJ_LD='ld'
-	SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall'
-	SHOBJ_XLDFLAGS='-G'
-
-	SHLIB_XLDFLAGS='-bM:SRE'
-	SHLIB_LIBS='-lcurses -lc'
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-	;;
-
-#
-# THE FOLLOWING ARE UNTESTED -- and some may not support the dlopen interface
-#
-irix[56]*-*gcc*)
-	SHOBJ_CFLAGS='-fpic'
-	SHOBJ_LD='${CC}'
-	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
-
-	SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir)'
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-	;;
-
-irix[56]*)
-	SHOBJ_CFLAGS='-K PIC'
-	SHOBJ_LD=ld
-#	SHOBJ_LDFLAGS='-call_shared -hidden_symbol -no_unresolved -soname $@'
-#	Change from David Kaelbling <drk@sgi.com>.  If you have problems,
-#	remove the `-no_unresolved'
-	SHOBJ_LDFLAGS='-shared -no_unresolved -soname $@'
-
-	SHLIB_XLDFLAGS='-rpath $(libdir)'
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-	;;
-
-hpux9*-*gcc*)
-	# must use gcc; the bundled cc cannot compile PIC code
-	SHOBJ_CFLAGS='-fpic'
-	SHOBJ_LD='${CC}'
-	SHOBJ_LDFLAGS='-shared -Wl,-b -Wl,+s'
-
-	SHLIB_XLDFLAGS='-Wl,+b,$(libdir)'
-	SHLIB_LIBSUFF='sl'
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-	;;
-
-hpux9*)
-	SHOBJ_STATUS=unsupported
-	SHLIB_STATUS=unsupported
-
-	# If you are using the HP ANSI C compiler, you can uncomment and use
-	# this code (I have not tested it)
-#	SHOBJ_STATUS=supported
-#	SHLIB_STATUS=supported
-#
-#	SHOBJ_CFLAGS='+z'
-#	SHOBJ_LD='ld'
-#	SHOBJ_LDFLAGS='-b +s'
-#
-#	SHLIB_XLDFLAGS='+b $(libdir)'
-#	SHLIB_LIBSUFF='sl'
-#	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'	
-
-	;;
-
-hpux10*-*gcc*)
-	# must use gcc; the bundled cc cannot compile PIC code
-	SHOBJ_CFLAGS='-fpic'
-	SHOBJ_LD='${CC}'
-	# if you have problems linking here, moving the `-Wl,+h,$@' from
-	# SHLIB_XLDFLAGS to SHOBJ_LDFLAGS has been reported to work
-	SHOBJ_LDFLAGS='-shared -fpic -Wl,-b -Wl,+s'
-
-	SHLIB_XLDFLAGS='-Wl,+h,$@ -Wl,+b,$(libdir)'
-	SHLIB_LIBSUFF='sl'
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-	;;
-
-hpux10*)
-	SHOBJ_STATUS=unsupported
-	SHLIB_STATUS=unsupported
-
-	# If you are using the HP ANSI C compiler, you can uncomment and use
-	# this code (I have not tested it)
-#	SHOBJ_STATUS=supported
-#	SHLIB_STATUS=supported
-#
-#	SHOBJ_CFLAGS='+z'
-#	SHOBJ_LD='ld'
-#	SHOBJ_LDFLAGS='-b +s +h $@'
-#
-#	SHLIB_XLDFLAGS='+b $(libdir)'
-#	SHLIB_LIBSUFF='sl'
-#	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'	
-
-	;;
-
-hpux11*-*gcc*)
-	# must use gcc; the bundled cc cannot compile PIC code
-	SHOBJ_CFLAGS='-fpic'
-	SHOBJ_LD='${CC}'
-#	SHOBJ_LDFLAGS='-shared -Wl,-b -Wl,-B,symbolic -Wl,+s -Wl,+std -Wl,+h,$@'
-	SHOBJ_LDFLAGS='-shared -fpic -Wl,-b -Wl,+s -Wl,+h,$@'
-
-	SHLIB_XLDFLAGS='-Wl,+b,$(libdir)'
-	SHLIB_LIBSUFF='sl'
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-	;;
-
-hpux11*)
-	SHOBJ_STATUS=unsupported
-	SHLIB_STATUS=unsupported
-
-	# If you are using the HP ANSI C compiler, you can uncomment and use
-	# this code (I have not tested it)
-#	SHOBJ_STATUS=supported
-#	SHLIB_STATUS=supported
-#
-#	SHOBJ_CFLAGS='+z'
-#	SHOBJ_LD='ld'
-#	SHOBJ_LDFLAGS='-b +s +h $@'
-#
-#	SHLIB_XLDFLAGS='+b $(libdir)'
-#	SHLIB_LIBSUFF='sl'
-#	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'	
-
-	;;
-
-sysv4*-*gcc*)
-	SHOBJ_CFLAGS=-shared
-	SHOBJ_LDFLAGS='-shared -h $@'
-	SHOBJ_LD='${CC}'
-
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-	;;
-
-sysv4*)
-	SHOBJ_CFLAGS='-K PIC'
-	SHOBJ_LD=ld
-	SHOBJ_LDFLAGS='-dy -z text -G -h $@'
-
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-	;;
-
-sco3.2v5*-*gcc*)
-	SHOBJ_CFLAGS='-fpic'		# DEFAULTS TO ELF
-	SHOBJ_LD='${CC}'
-	SHOBJ_LDFLAGS='-shared'
-
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-	;;
-
-sco3.2v5*)
-	SHOBJ_CFLAGS='-K pic -b elf'
-	SHOBJ_LD=ld
-	SHOBJ_LDFLAGS='-G -b elf -dy -z text -h $@'
-
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-	;;
-
-sysv5uw7*-*gcc*)
-	SHOBJ_CFLAGS='-fpic'
-	SHOBJ_LD='${CC}'
-	SHOBJ_LDFLAGS='-shared'
-
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-	;;
-
-sysv5uw7*)
-	SHOBJ_CFLAGS='-K PIC'
-	SHOBJ_LD=ld
-	SHOBJ_LDFLAGS='-G -dy -z text -h $@'
-
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-	;;
-
-sysv5UnixWare*-*gcc*)
-	SHOBJ_CFLAGS=-fpic
-	SHOBJ_LD='${CC}'
-	SHOBJ_LDFLAGS='-shared'
-
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-	;;
-
-sysv5UnixWare*)
-	SHOBJ_CFLAGS='-K PIC'
-	SHOBJ_LD=ld
-	SHOBJ_LDFLAGS='-G -dy -z text -h $@'
-
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-	;;
-
-sysv5OpenUNIX*-*gcc*)
-	SHOBJ_CFLAGS=-fpic
-	SHOBJ_LD='${CC}'
-	SHOBJ_LDFLAGS='-shared'
-
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-	;;
-
-sysv5OpenUNIX*)
-	SHOBJ_CFLAGS='-K PIC'
-	SHOBJ_LD=ld
-	SHOBJ_LDFLAGS='-G -dy -z text -h $@'
-
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-	;;
-
-dgux*-*gcc*)
-	SHOBJ_CFLAGS=-fpic
-	SHOBJ_LD='${CC}'
-	SHOBJ_LDFLAGS='-shared'
-
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-	;;
-
-dgux*)
-	SHOBJ_CFLAGS='-K pic'
-	SHOBJ_LD=ld
-	SHOBJ_LDFLAGS='-G -dy -h $@'
-
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-	;;
-
-msdos*)
-	SHOBJ_STATUS=unsupported
-	SHLIB_STATUS=unsupported
-	;;
-
-cygwin*)
-	SHOBJ_LD='$(CC)'
-	SHOBJ_LDFLAGS='-shared -Wl,--enable-auto-import -Wl,--enable-auto-image-base -Wl,--export-all -Wl,--out-implib=$(@).a'
-	SHLIB_LIBPREF='cyg'
-	SHLIB_LIBSUFF='dll'
-	SHLIB_LIBVERSION='$(SHLIB_DLLVERSION).$(SHLIB_LIBSUFF)'
-	SHLIB_LIBS='$(TERMCAP_LIB)'
-
-	SHLIB_DOT=
-	# For official cygwin releases, DLLVERSION will be defined in the
-	# environment of configure, and will be incremented any time the API
-	# changes in a non-backwards compatible manner.  Otherwise, it is just
-	# SHLIB_MAJOR.
-	if [ -n "$DLLVERSION" ] ; then
-		SHLIB_DLLVERSION="$DLLVERSION"
-	fi
-	;;
-
-mingw*)
-	SHOBJ_LD='$(CC)'
-	SHOBJ_LDFLAGS='-shared -Wl,--enable-auto-import -Wl,--enable-auto-image-base -Wl,--export-all -Wl,--out-implib=$(@).a'
-	SHLIB_LIBSUFF='dll'
-	SHLIB_LIBVERSION='$(SHLIB_DLLVERSION).$(SHLIB_LIBSUFF)'
-	SHLIB_LIBS='$(TERMCAP_LIB)'
-
-	SHLIB_DOT=
-	# For official cygwin releases, DLLVERSION will be defined in the
-	# environment of configure, and will be incremented any time the API
-	# changes in a non-backwards compatible manner.  Otherwise, it is just
-	# SHLIB_MAJOR.
-	if [ -n "$DLLVERSION" ] ; then
-		SHLIB_DLLVERSION="$DLLVERSION"
-	fi
-	;;
-
-#
-# Rely on correct gcc configuration for everything else
-#
-*-*gcc*)
-	SHOBJ_CFLAGS=-fpic
-	SHOBJ_LD='${CC}'
-	SHOBJ_LDFLAGS='-shared'
-
-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-	;;
-
-*)
-	SHOBJ_STATUS=unsupported
-	SHLIB_STATUS=unsupported
-	;;
-
-esac
-
-echo SHOBJ_CC=\'"$SHOBJ_CC"\'
-echo SHOBJ_CFLAGS=\'"$SHOBJ_CFLAGS"\'
-echo SHOBJ_LD=\'"$SHOBJ_LD"\'
-echo SHOBJ_LDFLAGS=\'"$SHOBJ_LDFLAGS"\'
-echo SHOBJ_XLDFLAGS=\'"$SHOBJ_XLDFLAGS"\'
-echo SHOBJ_LIBS=\'"$SHOBJ_LIBS"\'
-
-echo SHLIB_XLDFLAGS=\'"$SHLIB_XLDFLAGS"\'
-echo SHLIB_LIBS=\'"$SHLIB_LIBS"\'
-
-echo SHLIB_DOT=\'"$SHLIB_DOT"\'
-
-echo SHLIB_LIBPREF=\'"$SHLIB_LIBPREF"\'
-echo SHLIB_LIBSUFF=\'"$SHLIB_LIBSUFF"\'
-
-echo SHLIB_LIBVERSION=\'"$SHLIB_LIBVERSION"\'
-echo SHLIB_DLLVERSION=\'"$SHLIB_DLLVERSION"\'
-
-echo SHOBJ_STATUS=\'"$SHOBJ_STATUS"\'
-echo SHLIB_STATUS=\'"$SHLIB_STATUS"\'
-
-exit 0
diff --git a/exsrc/src/yes.txt b/exsrc/src/yes.txt
deleted file mode 100644
index c6991e8fe..000000000
--- a/exsrc/src/yes.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-yes
-
diff --git a/exsrc/twisted.sh b/exsrc/twisted.sh
deleted file mode 100755
index fafb9ea76..000000000
--- a/exsrc/twisted.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-PACKAGE="Twisted"
-. ./prolog.sh 
-# Twisted.
-(cd Twisted-*/zope.interface*; ${prefix}/${version}/bin/python setup.py build ${D} install; cd .. ; ${prefix}/${version}/bin/python setup.py build ${D} install)
-
diff --git a/exsrc/vtk.sh b/exsrc/vtk.sh
deleted file mode 100755
index 7f15b4f50..000000000
--- a/exsrc/vtk.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-PACKAGE="VTK"
-. ./prolog.sh
-(  BUILD_DIR=`pwd`;\
-   cd VTK*; \
-   sed -e 's@CDAT_PREFIX@'${prefix}'/Externals@g' \
-       -e 's/PY_VERSION/2.4/g' \
-       -e 's@CDAT_BUILD_DIR@'${BUILD_DIR}'@g' \
-       -e 's/TCLTK_VERSION/8.4/g' ../../VTK_BUILD_ANSWERS.core > VTK_BUILD_ANSWERS.feed ; \
-   mkdir -p ${prefix}/Externals/VTK;\
-   cp VTK_BUILD_ANSWERS.feed ${prefix}/Externals/VTK/CMakeCache.txt ;
-   cd ${prefix}/Externals/VTK ;\
-   ${prefix}/Externals/bin/cmake CMakeCache.txt ;\
-   make; make install ; \
-   cd Wrapping/Python ; \
-   ${prefix}/${version}/bin/python setup.py install; \
-)
diff --git a/exsrc/xgks.sh b/exsrc/xgks.sh
deleted file mode 100755
index 5061fb541..000000000
--- a/exsrc/xgks.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-PACKAGE="xgks"
-OS=`uname`
-. ./prolog.sh
-# xgks
-if ( test "${OS}" = 'Darwin' ) then
-    CPP_X11="-I/usr/X11R6/include"; export CPP_X11
-fi
-LD_X11=""; export LD_X11
-FC='';export FC
-# The configure step will make a header file udposix.h that vcs needs
-cd xgks 
-./configure --prefix=${prefix}/Externals || exit 1
-echo "Installing udposix.h"
-/bin/rm -fr ${prefix}/Externals/include/udposix.h || exit 1
-/bin/cp port/misc/udposix.h ${prefix}/Externals/include/udposix.h || exit 1
-make port/all || exit 1
-make port/install || exit 1
-# added the CXX define for MacOS
-make CXX=cc fontdb/all || exit 1
-make CXX=cc fontdb/install || exit 1
diff --git a/images/2leftarrow.gif b/images/2leftarrow.gif
deleted file mode 100644
index 0f42224dad68b601ac86e3ef71cf1bb89bc7f85d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1180
zcmZ?wbhEHblwwd|_};|;0)EW=9>T)@(h|{p649bOfvOUo#!|7G(qTr7=`73@44j1$
z;%O36rILKf$|9L+vT24gm0A)d#+qT$8gUldDYEJn(n`6CN}0B5)#{4HX6ChanqH2E
zQC=FE?uIFW21Pzrg+Xz3q5KVevaL$W-IAsqGWOF1)jQSIJ57wHE7{FAF<vO8zd*}m
znY!g-L)(o;j<d~!=I92kl5k(9>aoP!Ww(a=4)etI=80Q1Gk2JUw0XI0atdAS7Pu}r
zXt!hH#Guky5t*}+3T7te?C`E!o>I9z(dW31?@@FA%jywl^@0yuMqSknzhRnwM>^rQ
zM(Q2Yq-T<8FSPO=+El#IEBT~X@!cZoluPU-ul&<-Y1dq;js}(9@T|HUQ*}DE{AP0A
zqsWS9?xhc-YhM@jtgY+ZliRwnV#3zCj$^4k_bM9Rd$&A~X#45W^*MUd&&c*C*_|)S
zdw$l;e4aD&b@9}%X>-4puX<j+_-DnelWjBaHP3w2y5RDJr7zl7|7zRxwtv%)j%~kZ
z?E1ds(EoWS|1UrHf7|u{yB`1FdF}s^=l_rW|NkEpL8F*vA)xq^g^_`wi$Mou11L{0
zaQtHs<&^Q*u;5@bhp<-6i46-6x22yF==l+lFu^X3jqhReGNpc}#!DPe8a)E$wYvy>
zeW`q@!>fm{Rpr-Zc7f?8O-zitlqV@pbS`gV(qi(MAZt@vr6p4I;=HUwLz)0rOZ(Z`
z=3atQnk=P!^JJR;D8znVc9yTzndR$FXZG_v4t1}tXx>ii?Q5}Nd3%$Y&5zf<Y{!Gb
z%g;_t)hg#_6a1pu_gJ*(LBqkzu4krb2F<%*VWD(>o<;nDJqpU{J>vSYD;#$6u(CRF
zxj$<7I4Om3nnB`*oK7LvPGL25p{NfFS-B_cY}=gTxoJt~BozxijU@@rYyvVCVn-?_
zK4F_AZJ1DH65-*{%p;~#rJ?X~(a|z-&13pH4G$0Tv#WY(7&I!ma&oeos5o%2W-MT0
z=CODX&nc|%Ab^d-f#Dzv4+}#ho3u~BL1)pL2?tsDHH;isBvT3;T-jSbG%_-&eqiKK
iU-YAqgISiLiCvVlgrU#0Y{KJy2R6+o6D-+S7_0$|M@)GD

diff --git a/images/2rightarrow.gif b/images/2rightarrow.gif
deleted file mode 100644
index befbdfad31ef374dcea72afb17a1442ca726ad88..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1180
zcmZ?wbhEHblw?p~_&$k&fq{Y7gM%TEkv&{mJWP-;Mu9)dSi)0B%EL?~R8uU<j3Jwq
zp_oB9Swg5zkUK?3EZsz;TvNQ<M9tYwHAYc6%1AjwMyXI*Db+@|Qc*6#Nyo=gCBnhP
z+f^goUA4l^J|)OGGtRj<)+r}}rHMhZi%q^?UZPE1W~!ofzpT{^Iki?rwKi*w>B>4Y
zjf@-B4OYr&E>$#Nu4b{u+;*qB>wI0W`4%qQR9&{3hpg8LUTqn$N87*I*>jFVbZbcT
zBrm_Uu0Gq`W7Y=;?sZG(4M~|ES}-r6bXsM?GMDs);puxE^0y>cF3zr7R^)q7!}EY$
z)M<@~<L1dXG}5nG6y7q=eWH{6#H9SGdD$mRpJVQ!C){!lxFnqq%DCZIdeo!lctG)0
zr?MN-IcE|}Zl#vL@T&giT>Lb-Wl3$%*4oDRcFo75+7G3*-Og&gRXXit-Sm4E9dCTP
zUq-cm_wN24GVyn0$D`EF=jBu0=S+QGHtT2VjIY&;Uso^vUD>j#xo=a`lr=M_o#>r@
zqjkp9);T}hR@|Dg<W=X==aX0eYG3nl+J=99+y748^?3W<--{0aU3=>P)=U3)pZ$N}
z&i|AD|NjTY+$g3v1QdU=FfuSqV$cDZ1j-W(9RC<pIb}RHEI8QAA*>a1VuRvg<2sIi
zmX8V)q?}yY{$;8xTBKs$BO@qygFR?*58uT%H-$Bo7dW)a{ViD0#xL*MJBg(#m_vPX
zTl}XdJ8yEFRJ5xWv9vmTfm_zfSyZ#@&~m>;ZWCr`-7#`M7i`xq^wgroeZnGlHxVtx
zV7ES*h2?xNFElR~STvclbc1g*tDlT*Ios8W=H+^eX0n(1Y;0P}HPs^LjYpW^%w7d&
zS>9V0l9qZ+H3_-WBAJ{%q06A`)*eNZO%J-&!<Kj~G*a!7H1_w(cxbfjtPmHw@q-2@
z8LugNQJW@QSd`i^Lq$x$ti$ne=VTf4v<C?jQr*N9Z1t*CaxN&j@kkm)ZAmaVd~|}S
zK8Hq50TXMN1Yekr#lu6cZETD>Ar36+A`*=ZLK`L|Fn`jW(!e6*B5;s_-{!+Xc9xI}
z0ZbAO3<sGfWqfF4l*qVofl;m^p}|2W;{hYPXsf~@M&@1vCMLPk4UCRfRZkxGJFsa!
LnZU-%!e9*mxVl-S

diff --git a/images/ASD.scr b/images/ASD.scr
deleted file mode 100755
index dfc4be3e4..000000000
--- a/images/ASD.scr
+++ /dev/null
@@ -1,1268 +0,0 @@
-Tt_ASD1(3,1,1,0.2,1)
-Tt_ASD2(3,1,1,0.2,1)
-To_ASD1(0.03,0,r,c,h)
-To_ASD2(0.019,0,r,c,h)
-P_ASD(
-  File(p=1,x=0.0725,y=0.02125,Tt=default,To=default),
-  Function(p=1,x=0.0725,y=0.02125,Tt=default,To=default),
-  LogicalMask(p=1,x=0.0725,y=0.03625,Tt=default,To=default),
-  Transform(p=1,x=0.0725,y=0.05125,Tt=default,To=default),
-  source(p=1,x=0.0725,y=0.70375,Tt=default,To=default),
-  name(p=1,x=0.0725,y=0.68875,Tt=default,To=default),
-  title(p=1,x=0.1675,y=0.68875,Tt=default,To=default),
-  units(p=1,x=0.6615,y=0.68875,Tt=default,To=default),
-  crdate(p=1,x=0.7375,y=0.68875,Tt=default,To=default),
-  crtime(p=1,x=0.8325,y=0.68875,Tt=default,To=default),
-  comment#1(p=1,x=0.909091,y=0.0466611,Tt=default,To=default),
-  comment#2(p=1,x=0.12,y=0.72875,Tt=default,To=default),
-  comment#3(p=1,x=0.12,y=0.74375,Tt=default,To=default),
-  comment#4(p=1,x=0.85,y=0.070,Tt=default,To=default),
-  xname(p=1,x=0.499345,y=0.17035,Tt=default,To=defcenter),
-  yname(p=1,x=0.0169,y=0.420034,Tt=default,To=defcentup),
-  zname(p=1,x=0.025,y=0.80875,Tt=default,To=default),
-  tname(p=1,x=0.025,y=0.80875,Tt=default,To=default),
-  xunits(p=0,x=0.595,y=0.22125,Tt=default,To=default),
-  yunits(p=0,x=0.044,y=0.48875,Tt=default,To=defcentup),
-  zunits(p=1,x=0.025,y=0.80875,Tt=default,To=default),
-  tunits(p=1,x=0.025,y=0.80875,Tt=default,To=default),
-  xvalue(p=1,x=0.785,y=0.70375,Th=default,Tt=default,To=default),
-  yvalue(p=1,x=0.785,y=0.68875,Th=default,Tt=default,To=default),
-  zvalue(p=1,x=0.785,y=0.67375,Th=default,Tt=default,To=default),
-  tvalue(p=1,x=0.785,y=0.65875,Th=default,Tt=default,To=default),
-  mean(p=1,x=0.0725,y=0.66875,Th=default,Tt=default,To=default),
-  max(p=1,x=0.2625,y=0.66875,Th=default,Tt=default,To=default),
-  min(p=1,x=0.4525,y=0.66875,Th=default,Tt=default,To=default),
-  xtic#1(p=1,y1=0.21125,y2=0.20175,Tl=default),
-  xtic#2(p=1,y1=0.63875,y2=0.64825,Tl=default),
-  xmintic#a(p=1,y1=0.21125,y2=0.2065,Tl=default),
-  xmintic#b(p=1,y1=0.64825,y2=0.6535,Tl=default),
-  ytic#1(p=1,x1=0.0725,x2=0.063,Tl=default),
-  ytic#2(p=1,x1=0.9275,x2=0.937,Tl=default),
-  ymintic#a(p=1,x1=0.0725,x2=0.06775,Tl=default),
-  ymintic#b(p=1,x1=0.9275,x2=0.93225,Tl=default),
-  xlabel#1(p=1,y=0.19035,Tt=default,To=defcenter),
-  xlabel#2(p=1,y=0.66152,Tt=default,To=defcenter),
-  ylabel#1(p=1,x=0.063,Tt=default,To=defright),
-  ylabel#2(p=1,x=0.937,Tt=default,To=default),
-  box#1(p=1,x1=0.0725,y1=0.21125,x2=0.9275,y2=0.63875,Tl=default),
-  box#2(p=0,x1=0.025,y1=0.23975,x2=0.899,y2=0.65775,Tl=default),
-  box#3(p=0,x1=0.025,y1=0.24925,x2=0.8895,y2=0.64825,Tl=default),
-  box#4(p=0,x1=0.025,y1=0.02125,x2=0.025,y2=0.02125,Tl=default),
-  line#1(p=0,x1=0.0725,y1=0.425,x2=0.9275,y2=0.425,Tl=default),
-  line#2(p=0,x1=0.5,y1=0.21125,x2=0.5,y2=0.63875,Tl=default),
-  line#3(p=0,x1=0.025,y1=0.78125,x2=0.88,y2=0.78125,Tl=default),
-  line#4(p=0,x1=0,y1=0.8,x2=0.9,y2=0.8,Tl=default),
-  legend(p=1,x1=0.0725,y1=0.11625,x2=0.9275,y2=0.13525,Tt=default,To=defcenter,Tl=default),
-  data(p=1,x1=0.0725,y1=0.21125,x2=0.9275,y2=0.63875)  )
-P_ASD_dud(
-  File(p=0,x=0.025,y=0.0112546,Tt=default,To=default),
-  Function(p=0,x=0.025,y=0.0112546,Tt=default,To=default),
-  LogicalMask(p=0,x=0.025,y=0.0112546,Tt=default,To=default),
-  Transform(p=0,x=0.025,y=0.0112546,Tt=default,To=default),
-  source(p=0,x=0.025,y=0.0112546,Tt=default,To=default),
-  name(p=0,x=0.025,y=0.0112546,Tt=default,To=default),
-  title(p=0,x=0.025,y=0.0112546,Tt=default,To=default),
-  units(p=0,x=0.025,y=0.0112546,Tt=default,To=default),
-  crdate(p=0,x=0.025,y=0.0112546,Tt=default,To=default),
-  crtime(p=0,x=0.025,y=0.0112546,Tt=default,To=default),
-  comment#1(p=0,x=0.025,y=0.0112546,Tt=default,To=default),
-  comment#2(p=0,x=0.025,y=0.0112546,Tt=default,To=default),
-  comment#3(p=0,x=0.025,y=0.0112546,Tt=default,To=default),
-  comment#4(p=0,x=0.025,y=0.0112546,Tt=default,To=default),
-  xname(p=0,x=0.025,y=0.0112546,Tt=default,To=defcenter),
-  yname(p=0,x=0.025,y=0.01125,Tt=default,To=defcentup),
-  zname(p=0,x=0.025,y=0.0112546,Tt=default,To=default),
-  tname(p=0,x=0.025,y=0.0112546,Tt=default,To=default),
-  xunits(p=0,x=0.025,y=0.01125,Tt=default,To=default),
-  yunits(p=0,x=0.025,y=0.01125,Tt=default,To=defcentup),
-  zunits(p=0,x=0.025,y=0.0112546,Tt=default,To=default),
-  tunits(p=0,x=0.025,y=0.0112546,Tt=default,To=default),
-  xvalue(p=0,x=0.025,y=0.0112546,Th=default,Tt=default,To=default),
-  yvalue(p=0,x=0.025,y=0.0112546,Th=default,Tt=default,To=default),
-  zvalue(p=0,x=0.025,y=0.0112546,Th=default,Tt=default,To=default),
-  tvalue(p=0,x=0.025,y=0.0112546,Th=default,Tt=default,To=default),
-  mean(p=0,x=0.025,y=0.0112546,Th=default,Tt=default,To=default),
-  max(p=0,x=0.025,y=0.0112546,Th=default,Tt=default,To=default),
-  min(p=0,x=0.025,y=0.0112546,Th=default,Tt=default,To=default),
-  xtic#1(p=0,y1=0.0212495,y2=0.0212495,Tl=default),
-  xtic#2(p=0,y1=0.0212495,y2=0.0212495,Tl=default),
-  xmintic#a(p=0,y1=0.0212495,y2=0.0212495,Tl=default),
-  xmintic#b(p=0,y1=0.0212495,y2=0.0212495,Tl=default),
-  ytic#1(p=0,x1=0.025,x2=0.025,Tl=default),
-  ytic#2(p=0,x1=0.025,x2=0.025,Tl=default),
-  ymintic#a(p=0,x1=0.025,x2=0.025,Tl=default),
-  ymintic#b(p=0,x1=0.025,x2=0.025,Tl=default),
-  xlabel#1(p=0,y=0.0212495,Tt=default,To=defcenter),
-  xlabel#2(p=0,y=0.02125,Tt=default,To=defcenter),
-  ylabel#1(p=0,x=0.025,Tt=default,To=defright),
-  ylabel#2(p=0,x=0.025,Tt=default,To=default),
-  box#1(p=0,x1=0.025,y1=0.0212495,x2=0.025,y2=0.0212495,Tl=default),
-  box#2(p=0,x1=0.025,y1=0.02125,x2=0.025,y2=0.02125,Tl=default),
-  box#3(p=0,x1=0.025,y1=0.02125,x2=0.025,y2=0.02125,Tl=default),
-  box#4(p=0,x1=0.025,y1=0.02125,x2=0.025,y2=0.02125,Tl=default),
-  line#1(p=0,x1=0.025,y1=0.0212495,x2=0.025,y2=0.0212495,Tl=default),
-  line#2(p=0,x1=0.025,y1=0.0212495,x2=0.025,y2=0.0212495,Tl=default),
-  line#3(p=0,x1=0.025,y1=0.02125,x2=0.025,y2=0.02125,Tl=default),
-  line#4(p=0,x1=0,y1=0,x2=0,y2=0,Tl=default),
-  legend(p=0,x1=0.025,y1=0.0212495,x2=0.025,y2=0.0212495,Tt=default,To=defcenter,Tl=default),
-  data(p=1,x1=0.0725,y1=0.21125,x2=0.9275,y2=0.63875)  )
-P_ASD1(
-  File(p=0,x=0.0669935,y=0.0152291,Tt=default,To=default),
-  Function(p=0,x=0.0669935,y=0.0152291,Tt=default,To=default),
-  LogicalMask(p=1,x=0.0780229,y=0.00653595,Tt=default,To=default),
-  Transform(p=1,x=0.0780229,y=0.0163235,Tt=default,To=default),
-  source(p=0,x=0.0669935,y=0.717229,Tt=default,To=default),
-  name(p=0,x=0.0669935,y=0.705229,Tt=default,To=default),
-  title(p=1,x=0.348809,y=0.705235,Tt=ASD1,To=ASD1),
-  units(p=0,x=0.686993,y=0.705229,Tt=default,To=default),
-  crdate(p=0,x=0.766993,y=0.705229,Tt=default,To=default),
-  crtime(p=0,x=0.866993,y=0.705229,Tt=default,To=default),
-  comment#1(p=1,x=0.2,y=0.025,Tt=ASD2,To=ASD2),
-  comment#2(p=1,x=0.1,y=0.025,Tt=ASD2,To=ASD2),
-  comment#3(p=0,x=0.139052,y=0.711242,Tt=default,To=default),
-  comment#4(p=1,x=0.0339869,y=0.360785,Tt=default,To=defcentup),
-  xname(p=1,x=0.431373,y=0.0300658,Tt=default,To=defcenter),
-  yname(p=1,x=0.0221,y=0.327701,Tt=default,To=defcentup),
-  zname(p=1,x=0.0169935,y=0.789542,Tt=default,To=default),
-  tname(p=1,x=0.0169935,y=0.789542,Tt=default,To=default),
-  xunits(p=0,x=0.616993,y=0.215229,Tt=default,To=default),
-  yunits(p=0,x=0.0369935,y=0.505229,Tt=default,To=defcentup),
-  zunits(p=1,x=0.0169935,y=0.789542,Tt=default,To=default),
-  tunits(p=1,x=0.0169935,y=0.789542,Tt=default,To=default),
-  xvalue(p=1,x=0.993464,y=0.672091,Th=default,Tt=default,To=default),
-  yvalue(p=0,x=0.816993,y=0.695229,Th=default,Tt=default,To=default),
-  zvalue(p=0,x=0.816993,y=0.685229,Th=default,Tt=default,To=default),
-  tvalue(p=1,x=0.993464,y=0.642729,Th=default,Tt=default,To=default),
-  mean(p=0,x=0.0669935,y=0.685229,Th=default,Tt=default,To=default),
-  max(p=0,x=0.266993,y=0.685229,Th=default,Tt=default,To=default),
-  min(p=0,x=0.466993,y=0.685229,Th=default,Tt=default,To=default),
-  xtic#1(p=1,y1=0.0640523,y2=0.0724123,Tl=default),
-  xtic#2(p=1,y1=0.624837,y2=0.616477,Tl=default),
-  xmintic#a(p=0,y1=0.0640523, y2=0.067996695,Tl=default),
-  xmintic#b(p=0,y1=0.620657,y2=0.624837,Tl=default),
-  ytic#1(p=1,x1=0.1071242,x2=0.115306,Tl=default),
-  ytic#2(p=1,x1=0.819543,x2=0.811361,Tl=default),
-  ymintic#a(p=0,x1=0.1071242,x2=0.1112151,Tl=default),
-  ymintic#b(p=0,x1=0.819543,x2=0.815452,Tl=default),
-  xlabel#1(p=1,y=0.0522873,Tt=default,To=defcenter),
-  xlabel#2(p=0,y=0.64152,Tt=default,To=defcenter),
-  ylabel#1(p=1,x=0.0979738,Tt=default,To=defright),
-  ylabel#2(p=0,x=0.827,Tt=default,To=default),
-  box#1(p=1,x1=0.1071242,y1=0.0640523,x2=0.819543,y2=0.624837,Tl=default),
-  box#2(p=0,x1=0.0169935,y1=0.235229,x2=0.936993,y2=0.675229,Tl=default),
-  box#3(p=0,x1=0.0169935,y1=0.245229,x2=0.926993,y2=0.665229,Tl=default),
-  box#4(p=0,x1=0.0169935,y1=0.00522876,x2=0.0169935,y2=0.00522876,Tl=default),
-  line#1(p=0,x1=0.0669935,y1=0.430229,x2=0.966993,y2=0.430229,Tl=default),
-  line#2(p=0,x1=0.516993,y1=0.205229,x2=0.516993,y2=0.655229,Tl=default),
-  line#3(p=0,x1=0.0169935,y1=0.405229,x2=0.916993,y2=0.405229,Tl=default),
-  line#4(p=0,x1=0.0169935,y1=0.805229,x2=0.916993,y2=0.805229,Tl=default),
-  legend(p=1,x1=0.863636,y1=0.617701,x2=0.909091,y2=0.617701,Tt=std,To=left,Tl=default),
-  data(p=1,x1=0.1071242,y1=0.0640523,x2=0.819543,y2=0.624837)  )
-Tt_std(1,1,1,0.2,241)
-To_left(0.01,0,r,l,h)
-P_ASD2(
-  File(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  Function(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  LogicalMask(p=1,x=0.05,y=0.02,Tt=default,To=default),
-  Transform(p=1,x=0.05,y=0.03,Tt=default,To=default),
-  source(p=0,x=0.05,y=0.712,Tt=default,To=default),
-  name(p=0,x=0.05,y=0.7,Tt=default,To=default),
-  title(p=0,x=0.15,y=0.7,Tt=default,To=default),
-  units(p=0,x=0.67,y=0.7,Tt=default,To=default),
-  crdate(p=0,x=0.75,y=0.7,Tt=default,To=default),
-  crtime(p=0,x=0.85,y=0.7,Tt=default,To=default),
-  comment#1(p=0,x=0.1,y=0.72,Tt=default,To=default),
-  comment#2(p=0,x=0.1,y=0.73,Tt=default,To=default),
-  comment#3(p=0,x=0.1,y=0.74,Tt=default,To=default),
-  comment#4(p=1,x=0.1,y=0.75,Tt=default,To=default),
-  xname(p=0,x=0.3,y=0.15,Tt=default,To=defcenter),
-  yname(p=0,x=0.02,y=0.4,Tt=default,To=defcentup),
-  zname(p=1,x=0,y=0.82,Tt=default,To=default),
-  tname(p=1,x=0,y=0.82,Tt=default,To=default),
-  xunits(p=0,x=0.3,y=0.15,Tt=default,To=default),
-  yunits(p=0,x=0.02,y=0.5,Tt=default,To=defcentup),
-  zunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  tunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  xvalue(p=1,x=0.8,y=0.7,Th=default,Tt=default,To=default),
-  yvalue(p=0,x=0.8,y=0.69,Th=default,Tt=default,To=default),
-  zvalue(p=0,x=0.8,y=0.68,Th=default,Tt=default,To=default),
-  tvalue(p=1,x=0.8,y=0.67,Th=default,Tt=default,To=default),
-  mean(p=0,x=0.05,y=0.68,Th=default,Tt=default,To=default),
-  max(p=0,x=0.25,y=0.68,Th=default,Tt=default,To=default),
-  min(p=0,x=0.45,y=0.68,Th=default,Tt=default,To=default),
-  xtic#1(p=0,y1=0.2,y2=0.19,Tl=default),
-  xtic#2(p=0,y1=0.65,y2=0.66,Tl=default),
-  xmintic#a(p=0,y1=0.2,y2=0.195,Tl=default),
-  xmintic#b(p=0,y1=0.65,y2=0.655,Tl=default),
-  ytic#1(p=0,x1=0.05,x2=0.04,Tl=default),
-  ytic#2(p=0,x1=0.55,x2=0.56,Tl=default),
-  ymintic#a(p=0,x1=0.05,x2=0.045,Tl=default),
-  ymintic#b(p=0,x1=0.55,x2=0.555,Tl=default),
-  xlabel#1(p=0,y=0.18,Tt=default,To=defcenter),
-  xlabel#2(p=0,y=0,Tt=default,To=defcenter),
-  ylabel#1(p=0,x=0.035,Tt=default,To=defright),
-  ylabel#2(p=0,x=0,Tt=default,To=default),
-  box#1(p=0,x1=0.05,y1=0.2,x2=0.55,y2=0.65,Tl=default),
-  box#2(p=0,x1=0,y1=0.23,x2=0.92,y2=0.67,Tl=default),
-  box#3(p=0,x1=0,y1=0.24,x2=0.91,y2=0.66,Tl=default),
-  box#4(p=0,x1=0,y1=0,x2=0,y2=0,Tl=default),
-  line#1(p=0,x1=0.05,y1=0.425,x2=0.95,y2=0.425,Tl=default),
-  line#2(p=0,x1=0.5,y1=0.2,x2=0.5,y2=0.65,Tl=default),
-  line#3(p=0,x1=0,y1=0.4,x2=0.9,y2=0.4,Tl=default),
-  line#4(p=0,x1=0,y1=0.8,x2=0.9,y2=0.8,Tl=default),
-  legend(p=1,x1=0.863636,y1=0.599123,x2=0.909091,y2=0.599123,Tt=std,To=left,Tl=default),
-  data(p=1,x1=0.1071242,y1=0.0640523,x2=0.819543,y2=0.624837)  )
-Tt_std(1,1,1,0.2,241)
-To_left(0.01,0,r,l,h)
-P_ASD3(
-  File(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  Function(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  LogicalMask(p=1,x=0.05,y=0.02,Tt=default,To=default),
-  Transform(p=1,x=0.05,y=0.03,Tt=default,To=default),
-  source(p=0,x=0.05,y=0.712,Tt=default,To=default),
-  name(p=0,x=0.05,y=0.7,Tt=default,To=default),
-  title(p=0,x=0.15,y=0.7,Tt=default,To=default),
-  units(p=0,x=0.67,y=0.7,Tt=default,To=default),
-  crdate(p=0,x=0.75,y=0.7,Tt=default,To=default),
-  crtime(p=0,x=0.85,y=0.7,Tt=default,To=default),
-  comment#1(p=1,x=0.5,y=0.726797,Tt=ASD1,To=ASD1),
-  comment#2(p=1,x=0.5,y=0.691504,Tt=ASD2,To=ASD2),
-  comment#3(p=0,x=0.1,y=0.74,Tt=default,To=default),
-  comment#4(p=1,x=0.0104575,y=0.360785,Tt=default,To=defcentup),
-  xname(p=1,x=0.431373,y=0.0300658,Tt=default,To=defcenter),
-  yname(p=0,x=0.02,y=0.4,Tt=default,To=defcentup),
-  zname(p=1,x=0,y=0.82,Tt=default,To=default),
-  tname(p=1,x=0,y=0.82,Tt=default,To=default),
-  xunits(p=0,x=0.6,y=0.21,Tt=default,To=default),
-  yunits(p=0,x=0.02,y=0.5,Tt=default,To=defcentup),
-  zunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  tunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  xvalue(p=1,x=0.8,y=0.7,Th=default,Tt=default,To=default),
-  yvalue(p=0,x=0.8,y=0.69,Th=default,Tt=default,To=default),
-  zvalue(p=0,x=0.8,y=0.68,Th=default,Tt=default,To=default),
-  tvalue(p=1,x=0.8,y=0.67,Th=default,Tt=default,To=default),
-  mean(p=0,x=0.05,y=0.68,Th=default,Tt=default,To=default),
-  max(p=0,x=0.25,y=0.68,Th=default,Tt=default,To=default),
-  min(p=0,x=0.45,y=0.68,Th=default,Tt=default,To=default),
-  xtic#1(p=0,y1=0.0640523,y2=0.0724123,Tl=default),
-  xtic#2(p=0,y1=0.624837,y2=0.616477,Tl=default),
-  xmintic#a(p=1,y1=0.2,y2=0.195,Tl=default),
-  xmintic#b(p=1,y1=0.65,y2=0.655,Tl=default),
-  ytic#1(p=0,x1=0.1071242,x2=0.085306,Tl=default),
-  ytic#2(p=0,x1=0.819543,x2=0.781361,Tl=default),
-  ymintic#a(p=0,x1=0.05,x2=0.045,Tl=default),
-  ymintic#b(p=0,x1=0.55,x2=0.555,Tl=default),
-  xlabel#1(p=0,y=0.0522873,Tt=default,To=defcenter),
-  xlabel#2(p=0,y=0,Tt=default,To=defcenter),
-  ylabel#1(p=0,x=0.0679738,Tt=default,To=defright),
-  ylabel#2(p=0,x=0,Tt=default,To=default),
-  box#1(p=0,x1=0.1071242,y1=0.0640523,x2=0.819543,y2=0.624837,Tl=default),
-  box#2(p=0,x1=0,y1=0.23,x2=0.92,y2=0.67,Tl=default),
-  box#3(p=0,x1=0,y1=0.24,x2=0.91,y2=0.66,Tl=default),
-  box#4(p=0,x1=0,y1=0,x2=0,y2=0,Tl=default),
-  line#1(p=0,x1=0.05,y1=0.425,x2=0.95,y2=0.425,Tl=default),
-  line#2(p=0,x1=0.5,y1=0.2,x2=0.5,y2=0.65,Tl=default),
-  line#3(p=0,x1=0,y1=0.4,x2=0.9,y2=0.4,Tl=default),
-  line#4(p=0,x1=0,y1=0.8,x2=0.9,y2=0.8,Tl=default),
-  legend(p=1,x1=0.863636,y1=0.580546,x2=0.909091,y2=0.580546,Tt=std,To=left,Tl=default),
-  data(p=1,x1=0.1071242,y1=0.0640523,x2=0.819543,y2=0.624837)  )
-Tt_std(1,1,1,0.2,241)
-To_left(0.01,0,r,l,h)
-P_ASD4(
-  File(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  Function(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  LogicalMask(p=1,x=0.05,y=0.02,Tt=default,To=default),
-  Transform(p=1,x=0.05,y=0.03,Tt=default,To=default),
-  source(p=0,x=0.05,y=0.712,Tt=default,To=default),
-  name(p=0,x=0.05,y=0.7,Tt=default,To=default),
-  title(p=0,x=0.15,y=0.7,Tt=default,To=default),
-  units(p=0,x=0.67,y=0.7,Tt=default,To=default),
-  crdate(p=0,x=0.75,y=0.7,Tt=default,To=default),
-  crtime(p=0,x=0.85,y=0.7,Tt=default,To=default),
-  comment#1(p=1,x=0.5,y=0.726797,Tt=ASD1,To=ASD1),
-  comment#2(p=1,x=0.5,y=0.691504,Tt=ASD1,To=ASD1),
-  comment#3(p=0,x=0.1,y=0.74,Tt=default,To=default),
-  comment#4(p=1,x=0.0104575,y=0.360785,Tt=default,To=defcentup),
-  xname(p=1,x=0.431373,y=0.0300658,Tt=default,To=defcenter),
-  yname(p=0,x=0.02,y=0.4,Tt=default,To=defcentup),
-  zname(p=1,x=0,y=0.82,Tt=default,To=default),
-  tname(p=1,x=0,y=0.82,Tt=default,To=default),
-  xunits(p=0,x=0.6,y=0.21,Tt=default,To=default),
-  yunits(p=0,x=0.02,y=0.5,Tt=default,To=defcentup),
-  zunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  tunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  xvalue(p=1,x=0.8,y=0.7,Th=default,Tt=default,To=default),
-  yvalue(p=0,x=0.8,y=0.69,Th=default,Tt=default,To=default),
-  zvalue(p=0,x=0.8,y=0.68,Th=default,Tt=default,To=default),
-  tvalue(p=1,x=0.8,y=0.67,Th=default,Tt=default,To=default),
-  mean(p=0,x=0.05,y=0.68,Th=default,Tt=default,To=default),
-  max(p=0,x=0.25,y=0.68,Th=default,Tt=default,To=default),
-  min(p=0,x=0.45,y=0.68,Th=default,Tt=default,To=default),
-  xtic#1(p=0,y1=0.0640523,y2=0.0724123,Tl=default),
-  xtic#2(p=0,y1=0.624837,y2=0.616477,Tl=default),
-  xmintic#a(p=0,y1=0.2,y2=0.195,Tl=default),
-  xmintic#b(p=0,y1=0.65,y2=0.655,Tl=default),
-  ytic#1(p=0,x1=0.1071242,x2=0.085306,Tl=default),
-  ytic#2(p=0,x1=0.819543,x2=0.781361,Tl=default),
-  ymintic#a(p=0,x1=0.05,x2=0.045,Tl=default),
-  ymintic#b(p=0,x1=0.55,x2=0.555,Tl=default),
-  xlabel#1(p=0,y=0.0522873,Tt=default,To=defcenter),
-  xlabel#2(p=0,y=0,Tt=default,To=defcenter),
-  ylabel#1(p=0,x=0.0679738,Tt=default,To=defright),
-  ylabel#2(p=0,x=0,Tt=default,To=default),
-  box#1(p=0,x1=0.1071242,y1=0.0640523,x2=0.819543,y2=0.624837,Tl=default),
-  box#2(p=0,x1=0,y1=0.23,x2=0.92,y2=0.67,Tl=default),
-  box#3(p=0,x1=0,y1=0.24,x2=0.91,y2=0.66,Tl=default),
-  box#4(p=0,x1=0,y1=0,x2=0,y2=0,Tl=default),
-  line#1(p=0,x1=0.05,y1=0.425,x2=0.95,y2=0.425,Tl=default),
-  line#2(p=0,x1=0.5,y1=0.2,x2=0.5,y2=0.65,Tl=default),
-  line#3(p=0,x1=0,y1=0.4,x2=0.9,y2=0.4,Tl=default),
-  line#4(p=0,x1=0,y1=0.8,x2=0.9,y2=0.8,Tl=default),
-  legend(p=1,x1=0.863636,y1=0.557324,x2=0.909091,y2=0.557324,Tt=std,To=left,Tl=default),
-  data(p=1,x1=0.1071242,y1=0.0640523,x2=0.819543,y2=0.624837)  )
-Tt_std(1,1,1,0.2,241)
-To_left(0.01,0,r,l,h)
-P_ASD5(
-  File(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  Function(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  LogicalMask(p=1,x=0.05,y=0.02,Tt=default,To=default),
-  Transform(p=1,x=0.05,y=0.03,Tt=default,To=default),
-  source(p=0,x=0.05,y=0.712,Tt=default,To=default),
-  name(p=0,x=0.05,y=0.7,Tt=default,To=default),
-  title(p=0,x=0.15,y=0.7,Tt=default,To=default),
-  units(p=0,x=0.67,y=0.7,Tt=default,To=default),
-  crdate(p=0,x=0.75,y=0.7,Tt=default,To=default),
-  crtime(p=0,x=0.85,y=0.7,Tt=default,To=default),
-  comment#1(p=0,x=0.1,y=0.72,Tt=default,To=default),
-  comment#2(p=0,x=0.1,y=0.73,Tt=default,To=default),
-  comment#3(p=0,x=0.1,y=0.74,Tt=default,To=default),
-  comment#4(p=1,x=0.1,y=0.75,Tt=default,To=default),
-  xname(p=0,x=0.5,y=0.21,Tt=default,To=defcenter),
-  yname(p=0,x=0.02,y=0.4,Tt=default,To=defcentup),
-  zname(p=1,x=0,y=0.82,Tt=default,To=default),
-  tname(p=1,x=0,y=0.82,Tt=default,To=default),
-  xunits(p=0,x=0.6,y=0.21,Tt=default,To=default),
-  yunits(p=0,x=0.02,y=0.5,Tt=default,To=defcentup),
-  zunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  tunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  xvalue(p=1,x=0.8,y=0.7,Th=default,Tt=default,To=default),
-  yvalue(p=0,x=0.8,y=0.69,Th=default,Tt=default,To=default),
-  zvalue(p=0,x=0.8,y=0.68,Th=default,Tt=default,To=default),
-  tvalue(p=1,x=0.8,y=0.67,Th=default,Tt=default,To=default),
-  mean(p=0,x=0.05,y=0.68,Th=default,Tt=default,To=default),
-  max(p=0,x=0.25,y=0.68,Th=default,Tt=default,To=default),
-  min(p=0,x=0.45,y=0.68,Th=default,Tt=default,To=default),
-  xtic#1(p=0,y1=0.2,y2=0.19,Tl=default),
-  xtic#2(p=0,y1=0.65,y2=0.66,Tl=default),
-  xmintic#a(p=0,y1=0.2,y2=0.195,Tl=default),
-  xmintic#b(p=0,y1=0.65,y2=0.655,Tl=default),
-  ytic#1(p=0,x1=0.05,x2=0.04,Tl=default),
-  ytic#2(p=0,x1=0.55,x2=0.56,Tl=default),
-  ymintic#a(p=0,x1=0.05,x2=0.045,Tl=default),
-  ymintic#b(p=0,x1=0.55,x2=0.555,Tl=default),
-  xlabel#1(p=0,y=0.18,Tt=default,To=defcenter),
-  xlabel#2(p=0,y=0,Tt=default,To=defcenter),
-  ylabel#1(p=0,x=0.035,Tt=default,To=defright),
-  ylabel#2(p=0,x=0,Tt=default,To=default),
-  box#1(p=0,x1=0.05,y1=0.2,x2=0.55,y2=0.65,Tl=default),
-  box#2(p=0,x1=0,y1=0.23,x2=0.92,y2=0.67,Tl=default),
-  box#3(p=0,x1=0,y1=0.24,x2=0.91,y2=0.66,Tl=default),
-  box#4(p=0,x1=0,y1=0,x2=0,y2=0,Tl=default),
-  line#1(p=0,x1=0.05,y1=0.425,x2=0.95,y2=0.425,Tl=default),
-  line#2(p=0,x1=0.5,y1=0.2,x2=0.5,y2=0.65,Tl=default),
-  line#3(p=0,x1=0,y1=0.4,x2=0.9,y2=0.4,Tl=default),
-  line#4(p=0,x1=0,y1=0.8,x2=0.9,y2=0.8,Tl=default),
-  legend(p=1,x1=0.863636,y1=0.538747,x2=0.909091,y2=0.538747,Tt=std,To=left,Tl=default),
-  data(p=1,x1=0.1071242,y1=0.0640523,x2=0.819543,y2=0.624837)  )
-Tt_std(1,1,1,0.2,241)
-To_left(0.01,0,r,l,h)
-P_ASD6(
-  File(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  Function(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  LogicalMask(p=1,x=0.05,y=0.02,Tt=default,To=default),
-  Transform(p=1,x=0.05,y=0.03,Tt=default,To=default),
-  source(p=0,x=0.05,y=0.712,Tt=default,To=default),
-  name(p=0,x=0.05,y=0.7,Tt=default,To=default),
-  title(p=0,x=0.15,y=0.7,Tt=default,To=default),
-  units(p=0,x=0.67,y=0.7,Tt=default,To=default),
-  crdate(p=0,x=0.75,y=0.7,Tt=default,To=default),
-  crtime(p=0,x=0.85,y=0.7,Tt=default,To=default),
-  comment#1(p=0,x=0.1,y=0.72,Tt=default,To=default),
-  comment#2(p=0,x=0.1,y=0.73,Tt=default,To=default),
-  comment#3(p=0,x=0.1,y=0.74,Tt=default,To=default),
-  comment#4(p=1,x=0.1,y=0.75,Tt=default,To=default),
-  xname(p=0,x=0.5,y=0.21,Tt=default,To=defcenter),
-  yname(p=0,x=0.02,y=0.4,Tt=default,To=defcentup),
-  zname(p=1,x=0,y=0.82,Tt=default,To=default),
-  tname(p=1,x=0,y=0.82,Tt=default,To=default),
-  xunits(p=0,x=0.6,y=0.21,Tt=default,To=default),
-  yunits(p=0,x=0.02,y=0.5,Tt=default,To=defcentup),
-  zunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  tunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  xvalue(p=1,x=0.8,y=0.7,Th=default,Tt=default,To=default),
-  yvalue(p=0,x=0.8,y=0.69,Th=default,Tt=default,To=default),
-  zvalue(p=0,x=0.8,y=0.68,Th=default,Tt=default,To=default),
-  tvalue(p=1,x=0.8,y=0.67,Th=default,Tt=default,To=default),
-  mean(p=0,x=0.05,y=0.68,Th=default,Tt=default,To=default),
-  max(p=0,x=0.25,y=0.68,Th=default,Tt=default,To=default),
-  min(p=0,x=0.45,y=0.68,Th=default,Tt=default,To=default),
-  xtic#1(p=0,y1=0.2,y2=0.19,Tl=default),
-  xtic#2(p=0,y1=0.65,y2=0.66,Tl=default),
-  xmintic#a(p=0,y1=0.2,y2=0.195,Tl=default),
-  xmintic#b(p=0,y1=0.65,y2=0.655,Tl=default),
-  ytic#1(p=0,x1=0.05,x2=0.04,Tl=default),
-  ytic#2(p=0,x1=0.55,x2=0.56,Tl=default),
-  ymintic#a(p=0,x1=0.05,x2=0.045,Tl=default),
-  ymintic#b(p=0,x1=0.55,x2=0.555,Tl=default),
-  xlabel#1(p=0,y=0.18,Tt=default,To=defcenter),
-  xlabel#2(p=0,y=0,Tt=default,To=defcenter),
-  ylabel#1(p=0,x=0.035,Tt=default,To=defright),
-  ylabel#2(p=0,x=0,Tt=default,To=default),
-  box#1(p=0,x1=0.05,y1=0.2,x2=0.55,y2=0.65,Tl=default),
-  box#2(p=0,x1=0,y1=0.23,x2=0.92,y2=0.67,Tl=default),
-  box#3(p=0,x1=0,y1=0.24,x2=0.91,y2=0.66,Tl=default),
-  box#4(p=0,x1=0,y1=0,x2=0,y2=0,Tl=default),
-  line#1(p=0,x1=0.05,y1=0.425,x2=0.95,y2=0.425,Tl=default),
-  line#2(p=0,x1=0.5,y1=0.2,x2=0.5,y2=0.65,Tl=default),
-  line#3(p=0,x1=0,y1=0.4,x2=0.9,y2=0.4,Tl=default),
-  line#4(p=0,x1=0,y1=0.8,x2=0.9,y2=0.8,Tl=default),
-  legend(p=1,x1=0.863636,y1=0.520169,x2=0.909091,y2=0.520169,Tt=std,To=left,Tl=default),
-  data(p=1,x1=0.1071242,y1=0.0640523,x2=0.819543,y2=0.624837)  )
-Tt_std(1,1,1,0.2,241)
-To_left(0.01,0,r,l,h)
-P_ASD7(
-  File(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  Function(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  LogicalMask(p=1,x=0.05,y=0.02,Tt=default,To=default),
-  Transform(p=1,x=0.05,y=0.03,Tt=default,To=default),
-  source(p=0,x=0.05,y=0.712,Tt=default,To=default),
-  name(p=0,x=0.05,y=0.7,Tt=default,To=default),
-  title(p=0,x=0.15,y=0.7,Tt=default,To=default),
-  units(p=0,x=0.67,y=0.7,Tt=default,To=default),
-  crdate(p=0,x=0.75,y=0.7,Tt=default,To=default),
-  crtime(p=0,x=0.85,y=0.7,Tt=default,To=default),
-  comment#1(p=0,x=0.1,y=0.72,Tt=default,To=default),
-  comment#2(p=0,x=0.1,y=0.73,Tt=default,To=default),
-  comment#3(p=0,x=0.1,y=0.74,Tt=default,To=default),
-  comment#4(p=1,x=0.1,y=0.75,Tt=default,To=default),
-  xname(p=0,x=0.5,y=0.21,Tt=default,To=defcenter),
-  yname(p=0,x=0.02,y=0.4,Tt=default,To=defcentup),
-  zname(p=1,x=0,y=0.82,Tt=default,To=default),
-  tname(p=1,x=0,y=0.82,Tt=default,To=default),
-  xunits(p=0,x=0.6,y=0.21,Tt=default,To=default),
-  yunits(p=0,x=0.02,y=0.5,Tt=default,To=defcentup),
-  zunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  tunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  xvalue(p=1,x=0.8,y=0.7,Th=default,Tt=default,To=default),
-  yvalue(p=0,x=0.8,y=0.69,Th=default,Tt=default,To=default),
-  zvalue(p=0,x=0.8,y=0.68,Th=default,Tt=default,To=default),
-  tvalue(p=1,x=0.8,y=0.67,Th=default,Tt=default,To=default),
-  mean(p=0,x=0.05,y=0.68,Th=default,Tt=default,To=default),
-  max(p=0,x=0.25,y=0.68,Th=default,Tt=default,To=default),
-  min(p=0,x=0.45,y=0.68,Th=default,Tt=default,To=default),
-  xtic#1(p=0,y1=0.2,y2=0.19,Tl=default),
-  xtic#2(p=0,y1=0.65,y2=0.66,Tl=default),
-  xmintic#a(p=0,y1=0.2,y2=0.195,Tl=default),
-  xmintic#b(p=0,y1=0.65,y2=0.655,Tl=default),
-  ytic#1(p=0,x1=0.05,x2=0.04,Tl=default),
-  ytic#2(p=0,x1=0.55,x2=0.56,Tl=default),
-  ymintic#a(p=0,x1=0.05,x2=0.045,Tl=default),
-  ymintic#b(p=0,x1=0.55,x2=0.555,Tl=default),
-  xlabel#1(p=0,y=0.18,Tt=default,To=defcenter),
-  xlabel#2(p=0,y=0,Tt=default,To=defcenter),
-  ylabel#1(p=0,x=0.035,Tt=default,To=defright),
-  ylabel#2(p=0,x=0,Tt=default,To=default),
-  box#1(p=0,x1=0.05,y1=0.2,x2=0.55,y2=0.65,Tl=default),
-  box#2(p=0,x1=0,y1=0.23,x2=0.92,y2=0.67,Tl=default),
-  box#3(p=0,x1=0,y1=0.24,x2=0.91,y2=0.66,Tl=default),
-  box#4(p=0,x1=0,y1=0,x2=0,y2=0,Tl=default),
-  line#1(p=0,x1=0.05,y1=0.425,x2=0.95,y2=0.425,Tl=default),
-  line#2(p=0,x1=0.5,y1=0.2,x2=0.5,y2=0.65,Tl=default),
-  line#3(p=0,x1=0,y1=0.4,x2=0.9,y2=0.4,Tl=default),
-  line#4(p=0,x1=0,y1=0.8,x2=0.9,y2=0.8,Tl=default),
-  legend(p=1,x1=0.863636,y1=0.501592,x2=0.909091,y2=0.501592,Tt=std,To=left,Tl=default),
-  data(p=1,x1=0.1071242,y1=0.0640523,x2=0.819543,y2=0.624837)  )
-Tt_std(1,1,1,0.2,241)
-To_left(0.01,0,r,l,h)
-P_ASD8(
-  File(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  Function(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  LogicalMask(p=1,x=0.05,y=0.02,Tt=default,To=default),
-  Transform(p=1,x=0.05,y=0.03,Tt=default,To=default),
-  source(p=0,x=0.05,y=0.712,Tt=default,To=default),
-  name(p=0,x=0.05,y=0.7,Tt=default,To=default),
-  title(p=0,x=0.15,y=0.7,Tt=default,To=default),
-  units(p=0,x=0.67,y=0.7,Tt=default,To=default),
-  crdate(p=0,x=0.75,y=0.7,Tt=default,To=default),
-  crtime(p=0,x=0.85,y=0.7,Tt=default,To=default),
-  comment#1(p=0,x=0.1,y=0.72,Tt=default,To=default),
-  comment#2(p=0,x=0.1,y=0.73,Tt=default,To=default),
-  comment#3(p=0,x=0.1,y=0.74,Tt=default,To=default),
-  comment#4(p=1,x=0.1,y=0.75,Tt=default,To=default),
-  xname(p=0,x=0.5,y=0.21,Tt=default,To=defcenter),
-  yname(p=0,x=0.02,y=0.4,Tt=default,To=defcentup),
-  zname(p=1,x=0,y=0.82,Tt=default,To=default),
-  tname(p=1,x=0,y=0.82,Tt=default,To=default),
-  xunits(p=0,x=0.6,y=0.21,Tt=default,To=default),
-  yunits(p=0,x=0.02,y=0.5,Tt=default,To=defcentup),
-  zunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  tunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  xvalue(p=1,x=0.8,y=0.7,Th=default,Tt=default,To=default),
-  yvalue(p=0,x=0.8,y=0.69,Th=default,Tt=default,To=default),
-  zvalue(p=0,x=0.8,y=0.68,Th=default,Tt=default,To=default),
-  tvalue(p=1,x=0.8,y=0.67,Th=default,Tt=default,To=default),
-  mean(p=0,x=0.05,y=0.68,Th=default,Tt=default,To=default),
-  max(p=0,x=0.25,y=0.68,Th=default,Tt=default,To=default),
-  min(p=0,x=0.45,y=0.68,Th=default,Tt=default,To=default),
-  xtic#1(p=0,y1=0.2,y2=0.19,Tl=default),
-  xtic#2(p=0,y1=0.65,y2=0.66,Tl=default),
-  xmintic#a(p=0,y1=0.2,y2=0.195,Tl=default),
-  xmintic#b(p=0,y1=0.65,y2=0.655,Tl=default),
-  ytic#1(p=0,x1=0.05,x2=0.04,Tl=default),
-  ytic#2(p=0,x1=0.55,x2=0.56,Tl=default),
-  ymintic#a(p=0,x1=0.05,x2=0.045,Tl=default),
-  ymintic#b(p=0,x1=0.55,x2=0.555,Tl=default),
-  xlabel#1(p=0,y=0.18,Tt=default,To=defcenter),
-  xlabel#2(p=0,y=0,Tt=default,To=defcenter),
-  ylabel#1(p=0,x=0.035,Tt=default,To=defright),
-  ylabel#2(p=0,x=0,Tt=default,To=default),
-  box#1(p=0,x1=0.05,y1=0.2,x2=0.55,y2=0.65,Tl=default),
-  box#2(p=0,x1=0,y1=0.23,x2=0.92,y2=0.67,Tl=default),
-  box#3(p=0,x1=0,y1=0.24,x2=0.91,y2=0.66,Tl=default),
-  box#4(p=0,x1=0,y1=0,x2=0,y2=0,Tl=default),
-  line#1(p=0,x1=0.05,y1=0.425,x2=0.95,y2=0.425,Tl=default),
-  line#2(p=0,x1=0.5,y1=0.2,x2=0.5,y2=0.65,Tl=default),
-  line#3(p=0,x1=0,y1=0.4,x2=0.9,y2=0.4,Tl=default),
-  line#4(p=0,x1=0,y1=0.8,x2=0.9,y2=0.8,Tl=default),
-  legend(p=1,x1=0.863636,y1=0.483014,x2=0.909091,y2=0.483014,Tt=std,To=left,Tl=default),
-  data(p=1,x1=0.1071242,y1=0.0640523,x2=0.819543,y2=0.624837)  )
-Tt_std(1,1,1,0.2,241)
-To_left(0.01,0,r,l,h)
-P_ASD9(
-  File(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  Function(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  LogicalMask(p=1,x=0.05,y=0.02,Tt=default,To=default),
-  Transform(p=1,x=0.05,y=0.03,Tt=default,To=default),
-  source(p=0,x=0.05,y=0.712,Tt=default,To=default),
-  name(p=0,x=0.05,y=0.7,Tt=default,To=default),
-  title(p=0,x=0.15,y=0.7,Tt=default,To=default),
-  units(p=0,x=0.67,y=0.7,Tt=default,To=default),
-  crdate(p=0,x=0.75,y=0.7,Tt=default,To=default),
-  crtime(p=0,x=0.85,y=0.7,Tt=default,To=default),
-  comment#1(p=0,x=0.1,y=0.72,Tt=default,To=default),
-  comment#2(p=0,x=0.1,y=0.73,Tt=default,To=default),
-  comment#3(p=0,x=0.1,y=0.74,Tt=default,To=default),
-  comment#4(p=1,x=0.1,y=0.75,Tt=default,To=default),
-  xname(p=0,x=0.5,y=0.21,Tt=default,To=defcenter),
-  yname(p=0,x=0.02,y=0.4,Tt=default,To=defcentup),
-  zname(p=1,x=0,y=0.82,Tt=default,To=default),
-  tname(p=1,x=0,y=0.82,Tt=default,To=default),
-  xunits(p=0,x=0.6,y=0.21,Tt=default,To=default),
-  yunits(p=0,x=0.02,y=0.5,Tt=default,To=defcentup),
-  zunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  tunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  xvalue(p=1,x=0.8,y=0.7,Th=default,Tt=default,To=default),
-  yvalue(p=0,x=0.8,y=0.69,Th=default,Tt=default,To=default),
-  zvalue(p=0,x=0.8,y=0.68,Th=default,Tt=default,To=default),
-  tvalue(p=1,x=0.8,y=0.67,Th=default,Tt=default,To=default),
-  mean(p=0,x=0.05,y=0.68,Th=default,Tt=default,To=default),
-  max(p=0,x=0.25,y=0.68,Th=default,Tt=default,To=default),
-  min(p=0,x=0.45,y=0.68,Th=default,Tt=default,To=default),
-  xtic#1(p=0,y1=0.2,y2=0.19,Tl=default),
-  xtic#2(p=0,y1=0.65,y2=0.66,Tl=default),
-  xmintic#a(p=0,y1=0.2,y2=0.195,Tl=default),
-  xmintic#b(p=0,y1=0.65,y2=0.655,Tl=default),
-  ytic#1(p=0,x1=0.05,x2=0.04,Tl=default),
-  ytic#2(p=0,x1=0.55,x2=0.56,Tl=default),
-  ymintic#a(p=0,x1=0.05,x2=0.045,Tl=default),
-  ymintic#b(p=0,x1=0.55,x2=0.555,Tl=default),
-  xlabel#1(p=0,y=0.18,Tt=default,To=defcenter),
-  xlabel#2(p=0,y=0,Tt=default,To=defcenter),
-  ylabel#1(p=0,x=0.035,Tt=default,To=defright),
-  ylabel#2(p=0,x=0,Tt=default,To=default),
-  box#1(p=0,x1=0.05,y1=0.2,x2=0.55,y2=0.65,Tl=default),
-  box#2(p=0,x1=0,y1=0.23,x2=0.92,y2=0.67,Tl=default),
-  box#3(p=0,x1=0,y1=0.24,x2=0.91,y2=0.66,Tl=default),
-  box#4(p=0,x1=0,y1=0,x2=0,y2=0,Tl=default),
-  line#1(p=0,x1=0.05,y1=0.425,x2=0.95,y2=0.425,Tl=default),
-  line#2(p=0,x1=0.5,y1=0.2,x2=0.5,y2=0.65,Tl=default),
-  line#3(p=0,x1=0,y1=0.4,x2=0.9,y2=0.4,Tl=default),
-  line#4(p=0,x1=0,y1=0.8,x2=0.9,y2=0.8,Tl=default),
-  legend(p=1,x1=0.863636,y1=0.464437,x2=0.909091,y2=0.464437,Tt=std,To=left,Tl=default),
-  data(p=1,x1=0.1071242,y1=0.0640523,x2=0.819543,y2=0.624837)  )
-Tt_std(1,1,1,0.2,241)
-To_left(0.01,0,r,l,h)
-P_ASD10(
-  File(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  Function(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  LogicalMask(p=1,x=0.05,y=0.02,Tt=default,To=default),
-  Transform(p=1,x=0.05,y=0.03,Tt=default,To=default),
-  source(p=0,x=0.05,y=0.712,Tt=default,To=default),
-  name(p=0,x=0.05,y=0.7,Tt=default,To=default),
-  title(p=0,x=0.15,y=0.7,Tt=default,To=default),
-  units(p=0,x=0.67,y=0.7,Tt=default,To=default),
-  crdate(p=0,x=0.75,y=0.7,Tt=default,To=default),
-  crtime(p=0,x=0.85,y=0.7,Tt=default,To=default),
-  comment#1(p=0,x=0.1,y=0.72,Tt=default,To=default),
-  comment#2(p=0,x=0.1,y=0.73,Tt=default,To=default),
-  comment#3(p=0,x=0.1,y=0.74,Tt=default,To=default),
-  comment#4(p=1,x=0.1,y=0.75,Tt=default,To=default),
-  xname(p=0,x=0.5,y=0.21,Tt=default,To=defcenter),
-  yname(p=0,x=0.02,y=0.4,Tt=default,To=defcentup),
-  zname(p=1,x=0,y=0.82,Tt=default,To=default),
-  tname(p=1,x=0,y=0.82,Tt=default,To=default),
-  xunits(p=0,x=0.6,y=0.21,Tt=default,To=default),
-  yunits(p=0,x=0.02,y=0.5,Tt=default,To=defcentup),
-  zunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  tunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  xvalue(p=1,x=0.8,y=0.7,Th=default,Tt=default,To=default),
-  yvalue(p=0,x=0.8,y=0.69,Th=default,Tt=default,To=default),
-  zvalue(p=0,x=0.8,y=0.68,Th=default,Tt=default,To=default),
-  tvalue(p=1,x=0.8,y=0.67,Th=default,Tt=default,To=default),
-  mean(p=0,x=0.05,y=0.68,Th=default,Tt=default,To=default),
-  max(p=0,x=0.25,y=0.68,Th=default,Tt=default,To=default),
-  min(p=0,x=0.45,y=0.68,Th=default,Tt=default,To=default),
-  xtic#1(p=0,y1=0.2,y2=0.19,Tl=default),
-  xtic#2(p=0,y1=0.65,y2=0.66,Tl=default),
-  xmintic#a(p=0,y1=0.2,y2=0.195,Tl=default),
-  xmintic#b(p=0,y1=0.65,y2=0.655,Tl=default),
-  ytic#1(p=0,x1=0.05,x2=0.04,Tl=default),
-  ytic#2(p=0,x1=0.55,x2=0.56,Tl=default),
-  ymintic#a(p=0,x1=0.05,x2=0.045,Tl=default),
-  ymintic#b(p=0,x1=0.55,x2=0.555,Tl=default),
-  xlabel#1(p=0,y=0.18,Tt=default,To=defcenter),
-  xlabel#2(p=0,y=0,Tt=default,To=defcenter),
-  ylabel#1(p=0,x=0.035,Tt=default,To=defright),
-  ylabel#2(p=0,x=0,Tt=default,To=default),
-  box#1(p=0,x1=0.05,y1=0.2,x2=0.55,y2=0.65,Tl=default),
-  box#2(p=0,x1=0,y1=0.23,x2=0.92,y2=0.67,Tl=default),
-  box#3(p=0,x1=0,y1=0.24,x2=0.91,y2=0.66,Tl=default),
-  box#4(p=0,x1=0,y1=0,x2=0,y2=0,Tl=default),
-  line#1(p=0,x1=0.05,y1=0.425,x2=0.95,y2=0.425,Tl=default),
-  line#2(p=0,x1=0.5,y1=0.2,x2=0.5,y2=0.65,Tl=default),
-  line#3(p=0,x1=0,y1=0.4,x2=0.9,y2=0.4,Tl=default),
-  line#4(p=0,x1=0,y1=0.8,x2=0.9,y2=0.8,Tl=default),
-  legend(p=1,x1=0.863636,y1=0.445859,x2=0.909091,y2=0.445859,Tt=std,To=left,Tl=default),
-  data(p=1,x1=0.1071242,y1=0.0640523,x2=0.819543,y2=0.624837)  )
-Tt_std(1,1,1,0.2,241)
-To_left(0.01,0,r,l,h)
-P_ASD11(
-  File(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  Function(p=0,x=0.402615,y=0.104575,Tt=default,To=default),
-  LogicalMask(p=1,x=0.05,y=0.02,Tt=default,To=default),
-  Transform(p=1,x=0.05,y=0.03,Tt=default,To=default),
-  source(p=0,x=0.05,y=0.712,Tt=default,To=default),
-  name(p=0,x=0.05,y=0.7,Tt=default,To=default),
-  title(p=0,x=0.15,y=0.7,Tt=default,To=default),
-  units(p=0,x=0.67,y=0.7,Tt=default,To=default),
-  crdate(p=0,x=0.75,y=0.7,Tt=default,To=default),
-  crtime(p=0,x=0.85,y=0.7,Tt=default,To=default),
-  comment#1(p=0,x=0.1,y=0.72,Tt=default,To=default),
-  comment#2(p=0,x=0.1,y=0.73,Tt=default,To=default),
-  comment#3(p=0,x=0.1,y=0.74,Tt=default,To=default),
-  comment#4(p=1,x=0.1,y=0.75,Tt=default,To=default),
-  xname(p=0,x=0.5,y=0.21,Tt=default,To=defcenter),
-  yname(p=0,x=0.02,y=0.4,Tt=default,To=defcentup),
-  zname(p=1,x=0,y=0.82,Tt=default,To=default),
-  tname(p=1,x=0,y=0.82,Tt=default,To=default),
-  xunits(p=0,x=0.6,y=0.21,Tt=default,To=default),
-  yunits(p=0,x=0.02,y=0.5,Tt=default,To=defcentup),
-  zunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  tunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  xvalue(p=1,x=0.8,y=0.7,Th=default,Tt=default,To=default),
-  yvalue(p=0,x=0.8,y=0.69,Th=default,Tt=default,To=default),
-  zvalue(p=0,x=0.8,y=0.68,Th=default,Tt=default,To=default),
-  tvalue(p=1,x=0.8,y=0.67,Th=default,Tt=default,To=default),
-  mean(p=0,x=0.05,y=0.68,Th=default,Tt=default,To=default),
-  max(p=0,x=0.25,y=0.68,Th=default,Tt=default,To=default),
-  min(p=0,x=0.45,y=0.68,Th=default,Tt=default,To=default),
-  xtic#1(p=0,y1=0.2,y2=0.19,Tl=default),
-  xtic#2(p=0,y1=0.65,y2=0.66,Tl=default),
-  xmintic#a(p=0,y1=0.2,y2=0.195,Tl=default),
-  xmintic#b(p=0,y1=0.65,y2=0.655,Tl=default),
-  ytic#1(p=0,x1=0.05,x2=0.04,Tl=default),
-  ytic#2(p=0,x1=0.55,x2=0.56,Tl=default),
-  ymintic#a(p=0,x1=0.05,x2=0.045,Tl=default),
-  ymintic#b(p=0,x1=0.55,x2=0.555,Tl=default),
-  xlabel#1(p=0,y=0.18,Tt=default,To=defcenter),
-  xlabel#2(p=0,y=0,Tt=default,To=defcenter),
-  ylabel#1(p=0,x=0.035,Tt=default,To=defright),
-  ylabel#2(p=0,x=0,Tt=default,To=default),
-  box#1(p=0,x1=0.05,y1=0.2,x2=0.55,y2=0.65,Tl=default),
-  box#2(p=0,x1=0,y1=0.23,x2=0.92,y2=0.67,Tl=default),
-  box#3(p=0,x1=0,y1=0.24,x2=0.91,y2=0.66,Tl=default),
-  box#4(p=0,x1=0,y1=0,x2=0,y2=0,Tl=default),
-  line#1(p=0,x1=0.05,y1=0.425,x2=0.95,y2=0.425,Tl=default),
-  line#2(p=0,x1=0.5,y1=0.2,x2=0.5,y2=0.65,Tl=default),
-  line#3(p=0,x1=0,y1=0.4,x2=0.9,y2=0.4,Tl=default),
-  line#4(p=0,x1=0,y1=0.8,x2=0.9,y2=0.8,Tl=default),
-  legend(p=1,x1=0.863636,y1=0.427282,x2=0.909091,y2=0.427282,Tt=std,To=left,Tl=default),
-  data(p=1,x1=0.1071242,y1=0.0640523,x2=0.819543,y2=0.624837)  )
-Tt_std(1,1,1,0.2,241)
-To_left(0.01,0,r,l,h)
-P_ASD12(
-  File(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  Function(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  LogicalMask(p=1,x=0.05,y=0.02,Tt=default,To=default),
-  Transform(p=1,x=0.05,y=0.03,Tt=default,To=default),
-  source(p=0,x=0.05,y=0.712,Tt=default,To=default),
-  name(p=0,x=0.05,y=0.7,Tt=default,To=default),
-  title(p=0,x=0.15,y=0.7,Tt=default,To=default),
-  units(p=0,x=0.67,y=0.7,Tt=default,To=default),
-  crdate(p=0,x=0.75,y=0.7,Tt=default,To=default),
-  crtime(p=0,x=0.85,y=0.7,Tt=default,To=default),
-  comment#1(p=0,x=0.1,y=0.72,Tt=default,To=default),
-  comment#2(p=0,x=0.1,y=0.73,Tt=default,To=default),
-  comment#3(p=0,x=0.1,y=0.74,Tt=default,To=default),
-  comment#4(p=1,x=0.1,y=0.75,Tt=default,To=default),
-  xname(p=0,x=0.5,y=0.21,Tt=default,To=defcenter),
-  yname(p=0,x=0.02,y=0.4,Tt=default,To=defcentup),
-  zname(p=1,x=0,y=0.82,Tt=default,To=default),
-  tname(p=1,x=0,y=0.82,Tt=default,To=default),
-  xunits(p=0,x=0.6,y=0.21,Tt=default,To=default),
-  yunits(p=0,x=0.02,y=0.5,Tt=default,To=defcentup),
-  zunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  tunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  xvalue(p=1,x=0.8,y=0.7,Th=default,Tt=default,To=default),
-  yvalue(p=0,x=0.8,y=0.69,Th=default,Tt=default,To=default),
-  zvalue(p=0,x=0.8,y=0.68,Th=default,Tt=default,To=default),
-  tvalue(p=1,x=0.8,y=0.67,Th=default,Tt=default,To=default),
-  mean(p=0,x=0.05,y=0.68,Th=default,Tt=default,To=default),
-  max(p=0,x=0.25,y=0.68,Th=default,Tt=default,To=default),
-  min(p=0,x=0.45,y=0.68,Th=default,Tt=default,To=default),
-  xtic#1(p=0,y1=0.2,y2=0.19,Tl=default),
-  xtic#2(p=0,y1=0.65,y2=0.66,Tl=default),
-  xmintic#a(p=0,y1=0.2,y2=0.195,Tl=default),
-  xmintic#b(p=0,y1=0.65,y2=0.655,Tl=default),
-  ytic#1(p=0,x1=0.05,x2=0.04,Tl=default),
-  ytic#2(p=0,x1=0.55,x2=0.56,Tl=default),
-  ymintic#a(p=0,x1=0.05,x2=0.045,Tl=default),
-  ymintic#b(p=0,x1=0.55,x2=0.555,Tl=default),
-  xlabel#1(p=0,y=0.18,Tt=default,To=defcenter),
-  xlabel#2(p=0,y=0,Tt=default,To=defcenter),
-  ylabel#1(p=0,x=0.035,Tt=default,To=defright),
-  ylabel#2(p=0,x=0,Tt=default,To=default),
-  box#1(p=0,x1=0.05,y1=0.2,x2=0.55,y2=0.65,Tl=default),
-  box#2(p=0,x1=0,y1=0.23,x2=0.92,y2=0.67,Tl=default),
-  box#3(p=0,x1=0,y1=0.24,x2=0.91,y2=0.66,Tl=default),
-  box#4(p=0,x1=0,y1=0,x2=0,y2=0,Tl=default),
-  line#1(p=0,x1=0.05,y1=0.425,x2=0.95,y2=0.425,Tl=default),
-  line#2(p=0,x1=0.5,y1=0.2,x2=0.5,y2=0.65,Tl=default),
-  line#3(p=0,x1=0,y1=0.4,x2=0.9,y2=0.4,Tl=default),
-  line#4(p=0,x1=0,y1=0.8,x2=0.9,y2=0.8,Tl=default),
-  legend(p=1,x1=0.863636,y1=0.408704,x2=0.909091,y2=0.408704,Tt=std,To=left,Tl=default),
-  data(p=1,x1=0.1071242,y1=0.0640523,x2=0.819543,y2=0.624837)  )
-Tt_std(1,1,1,0.2,241)
-To_left(0.01,0,r,l,h)
-P_ASD13(
-  File(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  Function(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  LogicalMask(p=1,x=0.05,y=0.02,Tt=default,To=default),
-  Transform(p=1,x=0.05,y=0.03,Tt=default,To=default),
-  source(p=0,x=0.05,y=0.712,Tt=default,To=default),
-  name(p=0,x=0.05,y=0.7,Tt=default,To=default),
-  title(p=0,x=0.15,y=0.7,Tt=default,To=default),
-  units(p=0,x=0.67,y=0.7,Tt=default,To=default),
-  crdate(p=0,x=0.75,y=0.7,Tt=default,To=default),
-  crtime(p=0,x=0.85,y=0.7,Tt=default,To=default),
-  comment#1(p=0,x=0.1,y=0.72,Tt=default,To=default),
-  comment#2(p=0,x=0.1,y=0.73,Tt=default,To=default),
-  comment#3(p=0,x=0.1,y=0.74,Tt=default,To=default),
-  comment#4(p=1,x=0.1,y=0.75,Tt=default,To=default),
-  xname(p=0,x=0.5,y=0.21,Tt=default,To=defcenter),
-  yname(p=0,x=0.02,y=0.4,Tt=default,To=defcentup),
-  zname(p=1,x=0,y=0.82,Tt=default,To=default),
-  tname(p=1,x=0,y=0.82,Tt=default,To=default),
-  xunits(p=0,x=0.6,y=0.21,Tt=default,To=default),
-  yunits(p=0,x=0.02,y=0.5,Tt=default,To=defcentup),
-  zunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  tunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  xvalue(p=1,x=0.8,y=0.7,Th=default,Tt=default,To=default),
-  yvalue(p=0,x=0.8,y=0.69,Th=default,Tt=default,To=default),
-  zvalue(p=0,x=0.8,y=0.68,Th=default,Tt=default,To=default),
-  tvalue(p=1,x=0.8,y=0.67,Th=default,Tt=default,To=default),
-  mean(p=0,x=0.05,y=0.68,Th=default,Tt=default,To=default),
-  max(p=0,x=0.25,y=0.68,Th=default,Tt=default,To=default),
-  min(p=0,x=0.45,y=0.68,Th=default,Tt=default,To=default),
-  xtic#1(p=0,y1=0.2,y2=0.19,Tl=default),
-  xtic#2(p=0,y1=0.65,y2=0.66,Tl=default),
-  xmintic#a(p=0,y1=0.2,y2=0.195,Tl=default),
-  xmintic#b(p=0,y1=0.65,y2=0.655,Tl=default),
-  ytic#1(p=0,x1=0.05,x2=0.04,Tl=default),
-  ytic#2(p=0,x1=0.55,x2=0.56,Tl=default),
-  ymintic#a(p=0,x1=0.05,x2=0.045,Tl=default),
-  ymintic#b(p=0,x1=0.55,x2=0.555,Tl=default),
-  xlabel#1(p=0,y=0.18,Tt=default,To=defcenter),
-  xlabel#2(p=0,y=0,Tt=default,To=defcenter),
-  ylabel#1(p=0,x=0.035,Tt=default,To=defright),
-  ylabel#2(p=0,x=0,Tt=default,To=default),
-  box#1(p=0,x1=0.05,y1=0.2,x2=0.55,y2=0.65,Tl=default),
-  box#2(p=0,x1=0,y1=0.23,x2=0.92,y2=0.67,Tl=default),
-  box#3(p=0,x1=0,y1=0.24,x2=0.91,y2=0.66,Tl=default),
-  box#4(p=0,x1=0,y1=0,x2=0,y2=0,Tl=default),
-  line#1(p=0,x1=0.05,y1=0.425,x2=0.95,y2=0.425,Tl=default),
-  line#2(p=0,x1=0.5,y1=0.2,x2=0.5,y2=0.65,Tl=default),
-  line#3(p=0,x1=0,y1=0.4,x2=0.9,y2=0.4,Tl=default),
-  line#4(p=0,x1=0,y1=0.8,x2=0.9,y2=0.8,Tl=default),
-  legend(p=1,x1=0.863636,y1=0.390127,x2=0.909091,y2=0.390127,Tt=std,To=left,Tl=default),
-  data(p=1,x1=0.1071242,y1=0.0640523,x2=0.819543,y2=0.624837)  )
-Tt_std(1,1,1,0.2,241)
-To_left(0.01,0,r,l,h)
-P_ASD14(
-  File(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  Function(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  LogicalMask(p=1,x=0.05,y=0.02,Tt=default,To=default),
-  Transform(p=1,x=0.05,y=0.03,Tt=default,To=default),
-  source(p=0,x=0.05,y=0.712,Tt=default,To=default),
-  name(p=0,x=0.05,y=0.7,Tt=default,To=default),
-  title(p=0,x=0.15,y=0.7,Tt=default,To=default),
-  units(p=0,x=0.67,y=0.7,Tt=default,To=default),
-  crdate(p=0,x=0.75,y=0.7,Tt=default,To=default),
-  crtime(p=0,x=0.85,y=0.7,Tt=default,To=default),
-  comment#1(p=0,x=0.1,y=0.72,Tt=default,To=default),
-  comment#2(p=0,x=0.1,y=0.73,Tt=default,To=default),
-  comment#3(p=1,x=0.1,y=0.74,Tt=default,To=default),
-  comment#4(p=1,x=0.1,y=0.75,Tt=default,To=default),
-  xname(p=0,x=0.5,y=0.21,Tt=default,To=defcenter),
-  yname(p=0,x=0.02,y=0.4,Tt=default,To=defcentup),
-  zname(p=1,x=0,y=0.82,Tt=default,To=default),
-  tname(p=1,x=0,y=0.82,Tt=default,To=default),
-  xunits(p=0,x=0.6,y=0.21,Tt=default,To=default),
-  yunits(p=0,x=0.02,y=0.5,Tt=default,To=defcentup),
-  zunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  tunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  xvalue(p=1,x=0.8,y=0.7,Th=default,Tt=default,To=default),
-  yvalue(p=0,x=0.8,y=0.69,Th=default,Tt=default,To=default),
-  zvalue(p=0,x=0.8,y=0.68,Th=default,Tt=default,To=default),
-  tvalue(p=1,x=0.8,y=0.67,Th=default,Tt=default,To=default),
-  mean(p=0,x=0.05,y=0.68,Th=default,Tt=default,To=default),
-  max(p=0,x=0.25,y=0.68,Th=default,Tt=default,To=default),
-  min(p=0,x=0.45,y=0.68,Th=default,Tt=default,To=default),
-  xtic#1(p=0,y1=0.2,y2=0.19,Tl=default),
-  xtic#2(p=0,y1=0.65,y2=0.66,Tl=default),
-  xmintic#a(p=0,y1=0.2,y2=0.195,Tl=default),
-  xmintic#b(p=0,y1=0.65,y2=0.655,Tl=default),
-  ytic#1(p=0,x1=0.05,x2=0.04,Tl=default),
-  ytic#2(p=0,x1=0.55,x2=0.56,Tl=default),
-  ymintic#a(p=0,x1=0.05,x2=0.045,Tl=default),
-  ymintic#b(p=0,x1=0.55,x2=0.555,Tl=default),
-  xlabel#1(p=0,y=0.18,Tt=default,To=defcenter),
-  xlabel#2(p=0,y=0,Tt=default,To=defcenter),
-  ylabel#1(p=0,x=0.035,Tt=default,To=defright),
-  ylabel#2(p=0,x=0,Tt=default,To=default),
-  box#1(p=0,x1=0.05,y1=0.2,x2=0.55,y2=0.65,Tl=default),
-  box#2(p=0,x1=0,y1=0.23,x2=0.92,y2=0.67,Tl=default),
-  box#3(p=0,x1=0,y1=0.24,x2=0.91,y2=0.66,Tl=default),
-  box#4(p=0,x1=0,y1=0,x2=0,y2=0,Tl=default),
-  line#1(p=0,x1=0.05,y1=0.425,x2=0.95,y2=0.425,Tl=default),
-  line#2(p=0,x1=0.5,y1=0.2,x2=0.5,y2=0.65,Tl=default),
-  line#3(p=0,x1=0,y1=0.4,x2=0.9,y2=0.4,Tl=default),
-  line#4(p=0,x1=0,y1=0.8,x2=0.9,y2=0.8,Tl=default),
-  legend(p=1,x1=0.863636,y1=0.371549,x2=0.909091,y2=0.371549,Tt=std,To=left,Tl=default),
-  data(p=1,x1=0.1071242,y1=0.0640523,x2=0.819543,y2=0.624837)  )
-Tt_std(1,1,1,0.2,241)
-To_left(0.01,0,r,l,h)
-P_ASD15(
-  File(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  Function(p=0,x=0.05,y=0.0100003,Tt=default,To=default),
-  LogicalMask(p=1,x=0.05,y=0.02,Tt=default,To=default),
-  Transform(p=1,x=0.05,y=0.03,Tt=default,To=default),
-  source(p=0,x=0.05,y=0.712,Tt=default,To=default),
-  name(p=0,x=0.05,y=0.7,Tt=default,To=default),
-  title(p=0,x=0.15,y=0.7,Tt=default,To=default),
-  units(p=0,x=0.67,y=0.7,Tt=default,To=default),
-  crdate(p=0,x=0.75,y=0.7,Tt=default,To=default),
-  crtime(p=0,x=0.85,y=0.7,Tt=default,To=default),
-  comment#1(p=0,x=0.1,y=0.72,Tt=default,To=default),
-  comment#2(p=0,x=0.1,y=0.73,Tt=default,To=default),
-  comment#3(p=0,x=0.1,y=0.74,Tt=default,To=default),
-  comment#4(p=1,x=0.1,y=0.75,Tt=default,To=default),
-  xname(p=0,x=0.5,y=0.21,Tt=default,To=defcenter),
-  yname(p=0,x=0.02,y=0.4,Tt=default,To=defcentup),
-  zname(p=1,x=0,y=0.82,Tt=default,To=default),
-  tname(p=1,x=0,y=0.82,Tt=default,To=default),
-  xunits(p=0,x=0.6,y=0.21,Tt=default,To=default),
-  yunits(p=0,x=0.02,y=0.5,Tt=default,To=defcentup),
-  zunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  tunits(p=1,x=0,y=0.82,Tt=default,To=default),
-  xvalue(p=1,x=0.8,y=0.7,Th=default,Tt=default,To=default),
-  yvalue(p=0,x=0.8,y=0.69,Th=default,Tt=default,To=default),
-  zvalue(p=0,x=0.8,y=0.68,Th=default,Tt=default,To=default),
-  tvalue(p=1,x=0.8,y=0.67,Th=default,Tt=default,To=default),
-  mean(p=0,x=0.05,y=0.68,Th=default,Tt=default,To=default),
-  max(p=0,x=0.25,y=0.68,Th=default,Tt=default,To=default),
-  min(p=0,x=0.45,y=0.68,Th=default,Tt=default,To=default),
-  xtic#1(p=0,y1=0.2,y2=0.19,Tl=default),
-  xtic#2(p=0,y1=0.65,y2=0.66,Tl=default),
-  xmintic#a(p=0,y1=0.2,y2=0.195,Tl=default),
-  xmintic#b(p=0,y1=0.65,y2=0.655,Tl=default),
-  ytic#1(p=0,x1=0.05,x2=0.04,Tl=default),
-  ytic#2(p=0,x1=0.55,x2=0.56,Tl=default),
-  ymintic#a(p=0,x1=0.05,x2=0.045,Tl=default),
-  ymintic#b(p=0,x1=0.55,x2=0.555,Tl=default),
-  xlabel#1(p=0,y=0.18,Tt=default,To=defcenter),
-  xlabel#2(p=0,y=0,Tt=default,To=defcenter),
-  ylabel#1(p=0,x=0.035,Tt=default,To=defright),
-  ylabel#2(p=0,x=0,Tt=default,To=default),
-  box#1(p=0,x1=0.05,y1=0.2,x2=0.55,y2=0.65,Tl=default),
-  box#2(p=0,x1=0,y1=0.23,x2=0.92,y2=0.67,Tl=default),
-  box#3(p=0,x1=0,y1=0.24,x2=0.91,y2=0.66,Tl=default),
-  box#4(p=0,x1=0,y1=0,x2=0,y2=0,Tl=default),
-  line#1(p=0,x1=0.05,y1=0.425,x2=0.95,y2=0.425,Tl=default),
-  line#2(p=0,x1=0.5,y1=0.2,x2=0.5,y2=0.65,Tl=default),
-  line#3(p=0,x1=0,y1=0.4,x2=0.9,y2=0.4,Tl=default),
-  line#4(p=0,x1=0,y1=0.8,x2=0.9,y2=0.8,Tl=default),
-  legend(p=1,x1=0.863636,y1=0.352972,x2=0.909091,y2=0.352972,Tt=std,To=left,Tl=default),
-  data(p=1,x1=0.1071242,y1=0.0640523,x2=0.819543,y2=0.624837)  )
-Tt_mwbotcenter(1,1,1,0.2,1)
-To_mwbotcenter(0.01,0,r,c,b)
-Tt_std(1,1,1,0.2,241)
-To_left(0.01,0,r,l,h)
-Gfb_ASD(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1e+20,1e+20,1e+20,1e+20),
-   xaxisconvert=linear,
-   yaxisconvert=linear,
-   level_1=1e+20,level_2=1e+20,color_1=16,color_2=239,legend_type=0,
-   legend=(),
-   ext_1=n,ext_2=n,missing=241)
-Gcon_ASD(
-   projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,yticlabels#1=lat20,
-   yticlabels#2=lat20,
-   datawc(-180,-90,180,90),
-   Tl=ASDCont,
-   Type=1,
-  )
-Tl_ASDCont(1,2.8,241)
-Gfi_ASD(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,xmtics#1=*,xmtics#2=*,
-   yticlabels#1=*,yticlabels#2=*,ymtics#1=*,ymtics#2=*,
-   datawc(1e+20,1e+20,1e+20,1e+20),
-   xaxisconvert=linear,
-   yaxisconvert=linear,
-   missing=1e+20,
-   range
-   (id=0,level1=1e+20,level2=1e+20,Tf=default)  )
-Gi_ASD(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1e+20,1e+20,1e+20,1e+20),
-   xaxisconvert=linear,
-   yaxisconvert=linear,
-   make_labels=n,
-   lines
-   (id=0,priority=1,level=0,increment=1e+20,hilite_ci=0,
-    label=*,Tl=default,Tt=default,To=default)
-  )
-Gfo_ASD(
-   projection=linear,xticlabels#1=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1e+20,1e+20,1e+20,1e+20),
-   xaxisconvert=linear,
-   yaxisconvert=linear,
-   Tf=default,
-   outline(1, 2, 3, 4, 5, 6, 7))
-Go_ASD(
-   projection=linear,xticlabels#1=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1e+20,1e+20,1e+20,1e+20),
-   xaxisconvert=linear,
-   yaxisconvert=linear,
-   Tl=default,
-   outline(1, 2, 3, 4, 5, 6, 7))
-GXy_ASD1(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1e+20,1e+20,1e+20,1e+20),
-   Tl=ASD1,Tm=None)
-Tl_ASD1(1,4.9,241)
-Tm_ASD1(1,4.9,241)
-GXy_ASD2(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1e+20,1e+20,1e+20,1e+20),
-   Tl=ASD2,Tm=None)
-Tl_ASD2(1,4.9,242)
-Tm_ASD2(2,4.9,242)
-GXy_ASD3(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1e+20,1e+20,1e+20,1e+20),
-   Tl=ASD3,Tm=None)
-Tl_ASD3(1,4.9,243)
-Tm_ASD3(3,4.9,243)
-GXy_ASD4(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1e+20,1e+20,1e+20,1e+20),
-   Tl=ASD4,Tm=None)
-Tl_ASD4(1,4.9,244)
-Tm_ASD4(4,4.9,244)
-GXy_ASD5(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1e+20,1e+20,1e+20,1e+20),
-   Tl=ASD5,Tm=None)
-Tl_ASD5(1,4.9,245)
-Tm_ASD5(5,4.9,245)
-GXy_ASD6(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1e+20,1e+20,1e+20,1e+20),
-   Tl=ASD6,Tm=None)
-Tl_ASD6(1,4.9,246)
-Tm_ASD6(6,4.9,246)
-GXy_ASD7(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1e+20,1e+20,1e+20,1e+20),
-   Tl=ASD7,Tm=None)
-Tl_ASD7(1,4.9,247)
-Tm_ASD7(7,4.9,247)
-GXy_ASD8(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1e+20,1e+20,1e+20,1e+20),
-   Tl=ASD8,Tm=None)
-Tl_ASD8(1,4.9,248)
-Tm_ASD8(8,4.9,248)
-GXy_ASD9(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1e+20,1e+20,1e+20,1e+20),
-   Tl=ASD9,Tm=None)
-Tl_ASD9(1,4.9,249)
-Tm_ASD9(9,4.9,249)
-GXy_ASD10(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1e+20,1e+20,1e+20,1e+20),
-   Tl=ASD10,Tm=None)
-Tl_ASD10(1,4.9,250)
-Tm_ASD10(10,4.9,250)
-GXy_ASD11(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1e+20,1e+20,1e+20,1e+20),
-   Tl=ASD11,Tm=None)
-Tl_ASD11(1,4.9,251)
-Tm_ASD11(11,4.9,251)
-GXy_ASD12(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1e+20,1e+20,1e+20,1e+20),
-   Tl=ASD12,Tm=None)
-Tl_ASD12(1,4.9,252)
-Tm_ASD12(12,4.9,252)
-GXy_ASD13(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1e+20,1e+20,1e+20,1e+20),
-   Tl=ASD13,Tm=None)
-Tl_ASD13(1,4.9,253)
-Tm_ASD13(13,4.9,253)
-GXy_ASD14(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1e+20,1e+20,1e+20,1e+20),
-   Tl=ASD14,Tm=None)
-Tl_ASD14(1,4.9,254)
-Tm_ASD14(14,4.9,254)
-GXy_ASD15(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1e+20,1e+20,1e+20,1e+20),
-   Tl=ASD15,Tm=None)
-Tl_ASD15(1,4.9,255)
-Tm_ASD15(15,4.9,255)
-GYx_ASD1(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1e+20,1e+20,1e+20,1e+20),
-   xaxisconvert=linear,
-   Tl=ASD1,Tm=none)
-GYx_ASD2(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1,40,120,100),
-   xaxisconvert=linear,
-   Tl=ASD2,Tm=none)
-GYx_ASD3(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1,40,120,100),
-   xaxisconvert=linear,
-   Tl=ASD3,Tm=none)
-GYx_ASD4(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1,1e+20,120,1e+20),
-   xaxisconvert=linear,
-   Tl=ASD4,Tm=none)
-GYx_ASD5(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1,1e+20,120,1e+20),
-   xaxisconvert=linear,
-   Tl=ASD5,Tm=none)
-GYx_ASD6(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1,1e+20,120,1e+20),
-   xaxisconvert=linear,
-   Tl=ASD6,Tm=none)
-GYx_ASD7(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1,1e+20,120,1e+20),
-   xaxisconvert=linear,
-   Tl=ASD7,Tm=none)
-GYx_ASD8(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1,1e+20,120,1e+20),
-   xaxisconvert=linear,
-   Tl=ASD8,Tm=none)
-GYx_ASD9(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1,1e+20,120,1e+20),
-   xaxisconvert=linear,
-   Tl=ASD9,Tm=none)
-GYx_ASD10(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1,1e+20,120,1e+20),
-   xaxisconvert=linear,
-   Tl=ASD10,Tm=none)
-GYx_ASD11(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1,1e+20,120,1e+20),
-   xaxisconvert=linear,
-   Tl=ASD11,Tm=none)
-GYx_ASD12(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1,1e+20,120,1e+20),
-   xaxisconvert=linear,
-   Tl=ASD12,Tm=none)
-GYx_ASD13(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1,1e+20,120,1e+20),
-   xaxisconvert=linear,
-   Tl=ASD13,Tm=none)
-GYx_ASD14(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1,1e+20,120,1e+20),
-   xaxisconvert=linear,
-   Tl=ASD14,Tm=none)
-GYx_ASD15(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1,1e+20,120,1e+20),
-   xaxisconvert=linear,
-   Tl=ASD15,Tm=none)
-GSp_ASD(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1e+20,1e+20,1e+20,1e+20),
-   xaxisconvert=linear,
-   yaxisconvert=linear,
-   Tm=default)
-Gv_ASD(
-   projection=linear,xticlabels#1=*,xticlabels#2=*,yticlabels#1=*,
-   yticlabels#2=*,
-   datawc(1e+20,1e+20,1e+20,1e+20),
-   xaxisconvert=linear,
-   yaxisconvert=linear,
-   Tl=default,vector_scale=1,vector_align=c,vector_type=2,ref_vector=1e+20)
-C_ASD(
-   100,100,100,   0,0,0,   84.7059,84.7059,84.7059,   31.7647,31.7647,31.7647,   100,100,100,   100,100,0,
-   0,2.7451,100,   0,5.4902,100,   0,9.01961,100,   0,11.3725,100,   0,14.902,100,   0,17.6471,100,
-   0,21.1765,100,   0,23.9216,100,   0,26.6667,100,   0,30.1961,100,   0,32.9412,100,   0,35.6863,100,
-   0,39.2157,100,   0,41.9608,100,   0,44.7059,100,   0,48.2353,100,   0,50.9804,100,   0,54.1176,100,
-   0,56.8627,100,   0,60.3922,100,   0,63.1373,100,   0,66.6667,100,   0,69.4118,100,   0,72.1569,100,
-   0,75.6863,100,   0,78.4314,100,   0,81.1765,100,   0,84.7059,100,   0,87.451,100,   0,90.1961,100,
-   0,93.7255,100,   0,96.4706,100,   0,100,100,   0,100,96.4706,   0,100,93.7255,   0,100,90.1961,
-   0,100,87.451,   0,100,84.7059,   0,100,81.1765,   0,100,78.4314,   0,100,75.6863,   0,100,72.1569,
-   0,100,69.4118,   0,100,66.6667,   0,100,63.1373,   0,100,60.3922,   0,100,56.8627,   0,100,54.1176,
-   0,100,50.9804,   0,100,48.2353,   0,100,44.7059,   0,100,41.9608,   0,100,39.2157,   0,100,35.6863,
-   0,100,32.9412,   0,100,30.1961,   0,100,26.6667,   0,100,23.9216,   0,100,21.1765,   0,100,17.6471,
-   0,100,14.902,   0,100,11.3725,   0,100,9.01961,   0,100,5.4902,   0,100,2.7451,   0,100,0,
-   2.7451,100,0,   5.4902,100,0,   9.01961,100,0,   11.3725,100,0,   14.902,100,0,   17.6471,100,0,
-   21.1765,100,0,   23.9216,100,0,   26.6667,100,0,   30.1961,100,0,   32.9412,100,0,   35.6863,100,0,
-   39.2157,100,0,   41.9608,100,0,   44.7059,100,0,   48.2353,100,0,   50.9804,100,0,   54.1176,100,0,
-   56.8627,100,0,   60.3922,100,0,   63.1373,100,0,   66.6667,100,0,   69.4118,100,0,   72.1569,100,0,
-   75.6863,100,0,   78.4314,100,0,   81.1765,100,0,   84.7059,100,0,   87.451,100,0,   90.1961,100,0,
-   93.7255,100,0,   96.4706,100,0,   100,100,0,   100,97.6471,0,   100,95.6863,0,   100,93.7255,0,
-   100,91.3726,0,   100,89.4118,0,   100,87.451,0,   100,85.4902,0,   100,83.1373,0,   100,81.1765,0,
-   100,79.2157,0,   100,77.6471,0,   100,75.6863,0,   100,73.7255,0,   100,71.3726,0,   100,69.4118,0,
-   100,67.451,0,   100,65.4902,0,   100,63.1373,0,   100,61.1765,0,   100,59.2157,0,   100,56.8627,0,
-   100,54.902,0,   100,52.9412,0,   100,50.9804,0,   100,49.4118,0,   100,47.451,0,   100,44.7059,0,
-   100,43.1373,0,   100,41.1765,0,   100,39.2157,0,   100,36.8627,0,   100,34.902,0,   100,32.9412,0,
-   100,32.1569,0,   100,30.9804,0,   100,30.1961,0,   100,28.6275,0,   100,28.2353,0,   100,26.6667,0,
-   100,25.8824,0,   100,24.7059,0,   100,23.9216,0,   100,23.1373,0,   100,21.9608,0,   100,21.1765,0,
-   100,20,0,   100,18.4314,0,   100,17.6471,0,   100,16.4706,0,   100,15.6863,0,   100,14.902,0,
-   100,13.7255,0,   100,12.9412,0,   100,11.3725,0,   100,10.9804,0,   100,9.41177,0,   100,9.01961,0,
-   100,7.84314,0,   100,6.66667,0,   100,5.4902,0,   100,4.31373,0,   100,3.92157,0,   100,2.7451,0,
-   100,1.56863,0,   100,0.784314,0,   100,0,0,   97.6471,0,0,   95.6863,0,0,   93.7255,0,0,
-   92.1569,0,0,   90.1961,0,0,   88.2353,0,0,   86.6667,0,0,   84.7059,0,0,   82.7451,0,0,
-   80.3922,0,0,   79.2157,0,0,   76.8627,0,0,   74.902,0,0,   72.9412,0,0,   71.3726,0,0,
-   69.4118,0,0,   67.451,0,0,   65.8824,0,0,   63.9216,0,0,   61.9608,0,0,   60,0,0,
-   58.4314,0,0,   56.4706,0,0,   54.1176,0,0,   52.1569,0,0,   50.1961,0,0,   48.6275,0,0,
-   46.6667,0,0,   44.7059,0,0,   43.1373,0,0,   41.1765,0,0,   39.2157,0,0,   37.6471,0,0,
-   38.4314,0,1.56863,   39.2157,0,3.92157,   40.3922,0,5.4902,   41.1765,0,7.84314,   41.9608,0,10.1961,   43.1373,0,12.1569,
-   43.9216,0,13.7255,   44.7059,0,15.6863,   45.8824,0,18.4314,   46.6667,0,20.3922,   48.2353,0,21.9608,   48.6275,0,23.9216,
-   50.1961,0,25.8824,   50.9804,0,28.6275,   52.1569,0,30.1961,   52.9412,0,32.1569,   53.7255,0,34.1176,   54.902,0,36.4706,
-   55.6863,0,38.4314,   56.4706,0,40.3922,   57.6471,0,42.7451,   58.4314,0,44.7059,   59.2157,0,46.6667,   60.3922,0,48.6275,
-   61.1765,0,50.9804,   62.7451,0,52.9412,   63.1373,0,54.902,   64.7059,0,56.8627,   65.4902,0,59.2157,   66.6667,0,61.1765,
-   67.451,0,63.1373,   68.2353,0,65.4902,   69.4118,0,67.451,   70.1961,0,69.4118,   71.3726,0,71.3726,   72.1569,0,73.7255)
-
-Gtd_ASD(
-detail = 50;
-max = None;
-quadrans = 1;
-skillValues = [0.10000000000000001, 0.20000000000000001, 0.29999999999999999, 0.40000000000000002, 0.5, 0.59999999999999998, 0.69999999999999996, 0.80000000000000004, 0.90000000000000002, 0.94999999999999996];
-referencevalue = 1.0;
-arrowlength = 0.05;
-arrowangle = 20.0;
-arrowbase = 0.75;
-Marker;
-    status = [];
-    line = [];
-    id = [];
-    id_size = [];
-    id_color = [];
-    id_font = [];
-    symbol = [];
-    color = [];
-    size = [];
-    xoffset = [];
-    yoffset = [];
-    line_color = [];
-    line_size = [];
-    line_type = [];
-)
-Gfm_ASD(
-   projection=linear,xticlabels#1=*,
-   xticlabels#2=*,
-   xmtics#1=*,
-   xmtics#2=*,
-   yticlabels#1=*,
-   yticlabels#2=*,
-   ymtics#1=*,
-   ymtics#2=*,
-   datawc(1e+20,1e+20,1e+20,1e+20),
-   xaxisconvert=linear,
-   yaxisconvert=linear,
-   missing=241,
-   mesh=0,
-   wrap
-   (0, 0),
-   range
-   (id=0,level1=1e+20,level2=1e+20,Tf=default)  )
-
diff --git a/images/HARD_COPY b/images/HARD_COPY
deleted file mode 100755
index 048305957..000000000
--- a/images/HARD_COPY
+++ /dev/null
@@ -1,76 +0,0 @@
-#######################################################################
-########################## H A R D   C O P Y ##########################
-#######################################################################
-#                                                                     #
-# This file contains the user specified printer names located on      #
-# their network!  See the "/etc/printcap" file for a list of          #
-# active printers. It is important to read this entire file for       #
-# instructions!!!!                                                    #
-#                                                                     #
-# The '#' at the start of a line indicates a comment or statement by  #
-# the user.                                                           #
-#                                                                     #
-# I M P O R T A N T    N O T I C E ! ! ! !                            #
-# - - - - - - - - -    - - - - - - - - - -                            #
-# VCS has no way of knowing which print manager your system is using. #
-# That is, 'lpr' (the BSD print spooler) or 'lp'. If the set          #
-# environment variable 'PRINTER' is unset, then VCS will use 'lp'.    #
-# If the set environment variable 'PRINTER' is set to 'printer',      #
-# then VCS will use 'lpr'.                                            #
-#                                                                     #
-#                                                                     #
-# If sending a CGM file to the printer from VCS results in an error   #
-# message (e.g., 'Error - In sending CGM file to printer.'), then     #
-# set or unset the 'PRINTER' environment variable.                    #
-#                                                                     #
-#######################################################################
-#######################################################################
-#######################################################################
-
-#######################################################################
-#######################################################################
-#######################################################################
-#             I M P O R T A N T    N O T I C E ! ! ! !                #
-#             - - - - - - - - -    - - - - - - - - - -                #
-# The lines below are used for GPLOT.  GPLOT is a graphics utility    #
-# program designed for the processing of CGM metafiles.  We use       #
-# GPLOT to convert the cgm file(s) to postscript output and send it   #
-# directly to a postscript printer. The absolute gplot path must be   #
-# set properly (below). That is:                                      #
-# landscape = /absolute_path/gplot -dPSC -r90 ...                     #
-# portrait  = /absolute_path/gplot -dPSC -D ...                       #
-#                                                                     #
-#######################################################################
-#######################################################################
-#######################################################################
-
-############################################################################
-# PRINTER ORIENTATION: Landscape                                           #
-# OUTPUT TYPE: Postscript       COLOR: YES                                 #
-# NOTE: THIS IS FOR SENDING TO THE PRINTER                                 #
-#                                                                          #
-# .cshrc file:                                                             #
-# In your .cshrc file you can set up an alias for converting your          #
-# landscape .cgm files. That is,                                           #
-# alias landscape '/absolute_path/gplot -dPSC -r90 -x-1.75 -D -X12.5 -Y10' #
-#                                                                          #
-############################################################################
-#landscape = /usr/local/bin/gplot -dPSC -r90 -x-1.75 -D -X12.5 -Y10
-
-#######################################################################
-# PRINTER ORIENTATION: Portrait                                       #
-# OUTPUT TYPE: Postscript       COLOR: YES                            #
-# NOTE: THIS IS FOR SENDING TO THE PRINTER                            #
-#                                                                     #
-# .cshrc file:                                                        #
-# In your .cshrc file you can set up an alias for converting your     #
-# portscript .cgm files. That is,                                     #
-# alias portrait '/absolute_path/gplot -dPSC -D -X10 -Y12.5'          #
-#                                                                     #
-#######################################################################
-#portrait = /usr/local/bin/gplot -dPSC -D -X10 -Y12.5
-
-#######################################################################
-###################  P R I N T E R   N A M E S  #######################
-#######################################################################
-
diff --git a/images/PCM_isofill.scr b/images/PCM_isofill.scr
deleted file mode 100644
index c42b94f24..000000000
--- a/images/PCM_isofill.scr
+++ /dev/null
@@ -1,976 +0,0 @@
-L_PCM_p_levels(1000,"1000",900,"900",800,"800",700,"700",600,"600",
-   500,"500",400,"400",300,"300",200,"200",100,"100",50,"50",
-   10,"10")
-
-L_PCM_height(1000,"0",795,"2",616.6,"4",472.2,"6",356.5,"8",
-   265,"10",121.1,"15",55.3,"20",12,"30")
-
-Tf_PCM16(
-   1, fais(1),
-   1, fasi(1),
-   1, faci(16),
-   0,0,0.1,0.1,1,
-   vp(0,1,0,1),
-   wc(0,1,0,1)
-  )
-Tf_PCM17(
-   1, fais(1),
-   1, fasi(1),
-   1, faci(17),
-   0,0,0.1,0.1,1,
-   vp(0,1,0,1),
-   wc(0,1,0,1)
-  )
-Tf_PCM18(
-   1, fais(1),
-   1, fasi(1),
-   1, faci(18),
-   0,0,0.1,0.1,1,
-   vp(0,1,0,1),
-   wc(0,1,0,1)
-  )
-Tf_PCM19(
-   1, fais(1),
-   1, fasi(1),
-   1, faci(19),
-   0,0,0.1,0.1,1,
-   vp(0,1,0,1),
-   wc(0,1,0,1)
-  )
-Tf_PCM20(
-   1, fais(1),
-   1, fasi(1),
-   1, faci(20),
-   0,0,0.1,0.1,1,
-   vp(0,1,0,1),
-   wc(0,1,0,1)
-  )
-Tf_PCM21(
-   1, fais(1),
-   1, fasi(1),
-   1, faci(21),
-   0,0,0.1,0.1,1,
-   vp(0,1,0,1),
-   wc(0,1,0,1)
-  )
-Tf_PCM22(
-   1, fais(1),
-   1, fasi(1),
-   1, faci(22),
-   0,0,0.1,0.1,1,
-   vp(0,1,0,1),
-   wc(0,1,0,1)
-  )
-Tf_PCM23(
-   1, fais(1),
-   1, fasi(1),
-   1, faci(23),
-   0,0,0.1,0.1,1,
-   vp(0,1,0,1),
-   wc(0,1,0,1)
-  )
-Tf_PCM24(
-   1, fais(1),
-   1, fasi(1),
-   1, faci(24),
-   0,0,0.1,0.1,1,
-   vp(0,1,0,1),
-   wc(0,1,0,1)
-  )
-Tf_PCM25(
-   1, fais(1),
-   1, fasi(1),
-   1, faci(25),
-   0,0,0.1,0.1,1,
-   vp(0,1,0,1),
-   wc(0,1,0,1)
-  )
-Tf_PCM26(
-   1, fais(1),
-   1, fasi(1),
-   1, faci(26),
-   0,0,0.1,0.1,1,
-   vp(0,1,0,1),
-   wc(0,1,0,1)
-  )
-Tf_PCM27(
-   1, fais(1),
-   1, fasi(1),
-   1, faci(27),
-   0,0,0.1,0.1,1,
-   vp(0,1,0,1),
-   wc(0,1,0,1)
-  )
-Tf_PCM28(
-   1, fais(1),
-   1, fasi(1),
-   1, faci(28),
-   0,0,0.1,0.1,1,
-   vp(0,1,0,1),
-   wc(0,1,0,1)
-  )
-Tf_PCM29(
-   1, fais(1),
-   1, fasi(1),
-   1, faci(29),
-   0,0,0.1,0.1,1,
-   vp(0,1,0,1),
-   wc(0,1,0,1)
-  )
-Tf_PCM30(
-   1, fais(1),
-   1, fasi(1),
-   1, faci(30),
-   0,0,0.1,0.1,1,
-   vp(0,1,0,1),
-   wc(0,1,0,1)
-  )
-Tf_PCM31(
-   1, fais(1),
-   1, fasi(1),
-   1, faci(31),
-   0,0,0.1,0.1,1,
-   vp(0,1,0,1),
-   wc(0,1,0,1)
-  )
-Tf_PCM32(
-   1, fais(1),
-   1, fasi(1),
-   1, faci(32),
-   0,0,0.1,0.1,1,
-   vp(0,1,0,1),
-   wc(0,1,0,1)
-  )
-Tf_PCM33(
-   1, fais(1),
-   1, fasi(1),
-   1, faci(33),
-   0,0,0.1,0.1,1,
-   vp(0,1,0,1),
-   wc(0,1,0,1)
-  )
-Tf_PCM34(
-   1, fais(1),
-   1, fasi(1),
-   1, faci(34),
-   0,0,0.1,0.1,1,
-   vp(0,1,0,1),
-   wc(0,1,0,1)
-  )
-Tf_PCM35(
-   1, fais(1),
-   1, fasi(1),
-   1, faci(35),
-   0,0,0.1,0.1,1,
-   vp(0,1,0,1),
-   wc(0,1,0,1)
-  )
-Tf_PCM36(
-   1, fais(1),
-   1, fasi(1),
-   1, faci(36),
-   0,0,0.1,0.1,1,
-   vp(0,1,0,1),
-   wc(0,1,0,1)
-  )
-Tf_PCM241(
-   1, fais(1),
-   1, fasi(1),
-   1, faci(241),
-   0,0,0.1,0.1,1,
-   vp(0,1,0,1),
-   wc(0,1,0,1)
-  )
-
-
-Gfi_PCM_clt(
-projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,xmtics#1=lon5,
-xmtics#2=lon5,yticlabels#1=lat20,yticlabels#2=lat20,ymtics#1=lat5,
-ymtics#2=lat5,
-datawc(-180,-90,180,90),
-missing=1e+20,
-range
-(id=1,level1=0.,level2=.10,Tf=PCM16)
-(id=2,level1=.10,level2=.20,Tf=PCM22)
-(id=3,level1=.20,level2=.30,Tf=PCM23)
-(id=4,level1=.30,level2=.40,Tf=PCM32)
-(id=5,level1=.40,level2=.50,Tf=PCM33)
-(id=6,level1=.50,level2=.60,Tf=PCM34)
-(id=7,level1=.60,level2=.70,Tf=PCM27)
-(id=8,level1=.70,level2=.80,Tf=PCM28)
-(id=9,level1=.80,level2=.90,Tf=PCM29)
-(id=10,level1=.90,level2=1.00,Tf=PCM30) )
-
-Gfi_PCM_hfls(
-projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,xmtics#1=lon5,
-xmtics#2=lon5,yticlabels#1=lat20,yticlabels#2=lat20,ymtics#1=lat5,
-ymtics#2=lat5,
-datawc(-180,-90,180,90),
-missing=1e+20,
-range
-(id=1,level1=-1e+20,level2=0,Tf=PCM16)
-(id=2,level1=0,level2=25,Tf=PCM18)
-(id=3,level1=25,level2=50,Tf=PCM19)
-(id=4,level1=50,level2=75,Tf=PCM20)
-(id=5,level1=75,level2=100,Tf=PCM21)
-(id=6,level1=100,level2=125,Tf=PCM22)
-(id=7,level1=125,level2=150,Tf=PCM23)
-(id=8,level1=150,level2=175,Tf=PCM24)
-(id=9,level1=175,level2=200,Tf=PCM25)
-(id=10,level1=200,level2=225,Tf=PCM26)
-(id=11,level1=225,level2=250,Tf=PCM27)
-(id=12,level1=250,level2=275,Tf=PCM28)
-(id=13,level1=275,level2=300,Tf=PCM29)
-(id=14,level1=300,level2=1e+20,Tf=PCM30) )
-
-Gfi_PCM_hfss(
-projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,xmtics#1=lon5,
-xmtics#2=lon5,yticlabels#1=lat20,yticlabels#2=lat20,ymtics#1=lat5,
-ymtics#2=lat5,
-datawc(-180,-90,180,90),
-missing=1e+20,
-range
-(id=1,level1=-1e+20,level2=-100,Tf=PCM16)
-(id=2,level1=-100,level2=-50,Tf=PCM18)
-(id=3,level1=-50,level2=-25,Tf=PCM19)
-(id=4,level1=-25,level2=-15,Tf=PCM20)
-(id=5,level1=-15,level2=-10,Tf=PCM21)
-(id=6,level1=-10,level2=-5,Tf=PCM22)
-(id=7,level1=-5,level2=0,Tf=PCM23)
-(id=8,level1=0,level2=5,Tf=PCM24)
-(id=9,level1=5,level2=10,Tf=PCM25)
-(id=10,level1=10,level2=15,Tf=PCM26)
-(id=11,level1=15,level2=25,Tf=PCM27)
-(id=12,level1=25,level2=50,Tf=PCM28)
-(id=13,level1=50,level2=100,Tf=PCM29)
-(id=14,level1=100,level2=1e+20,Tf=PCM30) )
-
-Gfi_PCM_hus(
-projection=linear,xticlabels#1=lat20,xticlabels#2=lat20,yticlabels#1=PCM_p_levels,
-yticlabels#2=PCM_height,
-datawc(90,1000,-90,10),
-missing=1e+20,
-range
-(id=1,level1=0,level2=0.0005,Tf=PCM20)
-(id=2,level1=0.0005,level2=0.001,Tf=PCM21)
-(id=3,level1=0.001,level2=0.002,Tf=PCM22)
-(id=4,level1=0.002,level2=0.004,Tf=PCM23)
-(id=5,level1=0.004,level2=0.006,Tf=PCM24)
-(id=6,level1=0.006,level2=0.008,Tf=PCM25)
-(id=7,level1=0.008,level2=0.01,Tf=PCM26)
-(id=8,level1=0.01,level2=0.012,Tf=PCM27)
-(id=9,level1=0.012,level2=0.014,Tf=PCM28)
-(id=10,level1=0.014,level2=0.016,Tf=PCM29)
-(id=11,level1=0.016,level2=0.018,Tf=PCM30)
-(id=12,level1=0.018,level2=0.02,Tf=PCM31) )
-
-
-Gfi_PCM_hur(
-projection=linear,xticlabels#1=lat20,xticlabels#2=lat20,yticlabels#1=PCM_p_levels,
-yticlabels#2=PCM_height,
-datawc(90,1000,-90,10),
-missing=1e+20,
-range
-(id=1,level1=0,level2=10,Tf=PCM20)
-(id=2,level1=10,level2=20,Tf=PCM21)
-(id=3,level1=20,level2=30,Tf=PCM22)
-(id=4,level1=30,level2=40,Tf=PCM23)
-(id=5,level1=40,level2=50,Tf=PCM24)
-(id=6,level1=50,level2=60,Tf=PCM25)
-(id=7,level1=60,level2=70,Tf=PCM26)
-(id=8,level1=70,level2=80,Tf=PCM27)
-(id=9,level1=80,level2=90,Tf=PCM28)
-(id=10,level1=90,level2=100,Tf=PCM29)
-(id=11,level1=1e+20,level2=1e+20,Tf=PCM241) )
-
-Gfi_PCM_pr(
-projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,xmtics#1=lon5,
-xmtics#2=lon5,yticlabels#1=lat20,yticlabels#2=lat20,ymtics#1=lat5,
-ymtics#2=lat5,
-datawc(-180,-90,180,90),
-missing=1e+20,
-range
-(id=1,level1=0,level2=1e-09,Tf=PCM16)
-(id=2,level1=1e-09,level2=2e-09,Tf=PCM18)
-(id=3,level1=2e-09,level2=5e-09,Tf=PCM19)
-(id=4,level1=5e-09,level2=1e-08,Tf=PCM20)
-(id=5,level1=1e-08,level2=1.5e-08,Tf=PCM21)
-(id=6,level1=1.5e-08,level2=2e-08,Tf=PCM22)
-(id=7,level1=2e-08,level2=3e-08,Tf=PCM23)
-(id=8,level1=3e-08,level2=5e-08,Tf=PCM24)
-(id=9,level1=5e-08,level2=7.5e-08,Tf=PCM25)
-(id=10,level1=7.5e-08,level2=1e-07,Tf=PCM26)
-(id=11,level1=1e-07,level2=1.5e-07,Tf=PCM27)
-(id=12,level1=1.5e-07,level2=2e-07,Tf=PCM28)
-(id=13,level1=2e-07,level2=3e-07,Tf=PCM29)
-(id=14,level1=3e-07,level2=1e+20,Tf=PCM30)
-(id=15,level1=1e+20,level2=1e+20,Tf=PCM241) )
-
-
-Gfi_PCM_prc(
-projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,xmtics#1=lon5,
-xmtics#2=lon5,yticlabels#1=lat20,yticlabels#2=lat20,ymtics#1=lat5,
-ymtics#2=lat5,
-datawc(-180,-90,180,90),
-missing=1e+20,
-range
-(id=1,level1=0,level2=1e-09,Tf=PCM16)
-(id=2,level1=1e-09,level2=2e-09,Tf=PCM18)
-(id=3,level1=2e-09,level2=5e-09,Tf=PCM19)
-(id=4,level1=5e-09,level2=1e-08,Tf=PCM20)
-(id=5,level1=1e-08,level2=1.5e-08,Tf=PCM21)
-(id=6,level1=1.5e-08,level2=2e-08,Tf=PCM22)
-(id=7,level1=2e-08,level2=3e-08,Tf=PCM23)
-(id=8,level1=3e-08,level2=5e-08,Tf=PCM24)
-(id=9,level1=5e-08,level2=7.5e-08,Tf=PCM25)
-(id=10,level1=7.5e-08,level2=1e-07,Tf=PCM26)
-(id=11,level1=1e-07,level2=1.5e-07,Tf=PCM27)
-(id=12,level1=1.5e-07,level2=2e-07,Tf=PCM28)
-(id=13,level1=2e-07,level2=3e-07,Tf=PCM29)
-(id=14,level1=3e-07,level2=1e+20,Tf=PCM30)
-(id=15,level1=1e+20,level2=1e+20,Tf=PCM241) )
-
-
-Gfi_PCM_prsnc(
-projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,xmtics#1=lon5,
-xmtics#2=lon5,yticlabels#1=lat20,yticlabels#2=lat20,ymtics#1=lat5,
-ymtics#2=lat5,
-datawc(-180,-90,180,90),
-missing=1e+20,
-range
-(id=1,level1=0,level2=1e-09,Tf=PCM16)
-(id=2,level1=1e-09,level2=2e-09,Tf=PCM18)
-(id=3,level1=2e-09,level2=5e-09,Tf=PCM19)
-(id=4,level1=5e-09,level2=1e-08,Tf=PCM20)
-(id=5,level1=1e-08,level2=1.5e-08,Tf=PCM21)
-(id=6,level1=1.5e-08,level2=2e-08,Tf=PCM22)
-(id=7,level1=2e-08,level2=3e-08,Tf=PCM23)
-(id=8,level1=3e-08,level2=5e-08,Tf=PCM24)
-(id=9,level1=5e-08,level2=7.5e-08,Tf=PCM25)
-(id=10,level1=7.5e-08,level2=1e-07,Tf=PCM26)
-(id=11,level1=1e-07,level2=1.5e-07,Tf=PCM27)
-(id=12,level1=1.5e-07,level2=2e-07,Tf=PCM28)
-(id=13,level1=2e-07,level2=3e-07,Tf=PCM29)
-(id=14,level1=3e-07,level2=1e+20,Tf=PCM30)
-(id=15,level1=1e+20,level2=1e+20,Tf=PCM241) )
-
-
-Gfi_PCM_prsnl(
-projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,xmtics#1=lon5,
-xmtics#2=lon5,yticlabels#1=lat20,yticlabels#2=lat20,ymtics#1=lat5,
-ymtics#2=lat5,
-datawc(-180,-90,180,90),
-missing=1e+20,
-range
-(id=1,level1=0,level2=1e-09,Tf=PCM16)
-(id=2,level1=1e-09,level2=2e-09,Tf=PCM18)
-(id=3,level1=2e-09,level2=5e-09,Tf=PCM19)
-(id=4,level1=5e-09,level2=1e-08,Tf=PCM20)
-(id=5,level1=1e-08,level2=1.5e-08,Tf=PCM21)
-(id=6,level1=1.5e-08,level2=2e-08,Tf=PCM22)
-(id=7,level1=2e-08,level2=3e-08,Tf=PCM23)
-(id=8,level1=3e-08,level2=5e-08,Tf=PCM24)
-(id=9,level1=5e-08,level2=7.5e-08,Tf=PCM25)
-(id=10,level1=7.5e-08,level2=1e-07,Tf=PCM26)
-(id=11,level1=1e-07,level2=1.5e-07,Tf=PCM27)
-(id=12,level1=1.5e-07,level2=2e-07,Tf=PCM28)
-(id=13,level1=2e-07,level2=3e-07,Tf=PCM29)
-(id=14,level1=3e-07,level2=1e+20,Tf=PCM30)
-(id=15,level1=1e+20,level2=1e+20,Tf=PCM241) )
-
-
-Gfi_PCM_ps(
-projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,xmtics#1=lon5,
-xmtics#2=lon5,yticlabels#1=lat20,yticlabels#2=lat20,ymtics#1=lat5,
-ymtics#2=lat5,
-datawc(-180,-90,180,90),
-missing=1e+20,
-range
-(id=1,level1=-1e+20,level2=97000,Tf=PCM30)
-(id=2,level1=97000,level2=97500,Tf=PCM29)
-(id=3,level1=97500,level2=98000,Tf=PCM28)
-(id=4,level1=98000,level2=98500,Tf=PCM27)
-(id=5,level1=98500,level2=99000,Tf=PCM26)
-(id=6,level1=99000,level2=99500,Tf=PCM25)
-(id=7,level1=99500,level2=100000,Tf=PCM24)
-(id=8,level1=100000,level2=100500,Tf=PCM23)
-(id=9,level1=100500,level2=101000,Tf=PCM22)
-(id=10,level1=101000,level2=101500,Tf=PCM21)
-(id=11,level1=101500,level2=102000,Tf=PCM20)
-(id=12,level1=102000,level2=102500,Tf=PCM19)
-(id=13,level1=102500,level2=103000,Tf=PCM18)
-(id=14,level1=103000,level2=103500,Tf=PCM17)
-(id=15,level1=103500,level2=104000,Tf=PCM35)
-(id=16,level1=104000,level2=1e+20,Tf=PCM36) )
-
-
-Gfi_PCM_psl(
-projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,xmtics#1=lon5,
-xmtics#2=lon5,yticlabels#1=lat20,yticlabels#2=lat20,ymtics#1=lat5,
-ymtics#2=lat5,
-datawc(-180,-90,180,90),
-missing=1e+20,
-range
-(id=1,level1=-1e+20,level2=97000,Tf=PCM30)
-(id=2,level1=97000,level2=97500,Tf=PCM29)
-(id=3,level1=97500,level2=98000,Tf=PCM28)
-(id=4,level1=98000,level2=98500,Tf=PCM27)
-(id=5,level1=98500,level2=99000,Tf=PCM26)
-(id=6,level1=99000,level2=99500,Tf=PCM25)
-(id=7,level1=99500,level2=100000,Tf=PCM24)
-(id=8,level1=100000,level2=100500,Tf=PCM23)
-(id=9,level1=100500,level2=101000,Tf=PCM22)
-(id=10,level1=101000,level2=101500,Tf=PCM21)
-(id=11,level1=101500,level2=102000,Tf=PCM20)
-(id=12,level1=102000,level2=102500,Tf=PCM19)
-(id=13,level1=102500,level2=103000,Tf=PCM18)
-(id=14,level1=103000,level2=103500,Tf=PCM17)
-(id=15,level1=103500,level2=104000,Tf=PCM35)
-(id=16,level1=104000,level2=1e+20,Tf=PCM36) )
-
-Gfi_PCM_rlut(
-projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,xmtics#1=lon5,
-xmtics#2=lon5,yticlabels#1=lat20,yticlabels#2=lat20,ymtics#1=lat5,
-ymtics#2=lat5,
-datawc(-180,-90,180,90),
-missing=1e+20,
-range
-(id=1,level1=-1e+20,level2=100,Tf=PCM16)
-(id=2,level1=100,level2=120,Tf=PCM30)
-(id=3,level1=120,level2=140,Tf=PCM29)
-(id=4,level1=140,level2=160,Tf=PCM28)
-(id=5,level1=160,level2=180,Tf=PCM27)
-(id=6,level1=180,level2=200,Tf=PCM26)
-(id=7,level1=200,level2=220,Tf=PCM25)
-(id=8,level1=220,level2=240,Tf=PCM24)
-(id=9,level1=240,level2=260,Tf=PCM23)
-(id=10,level1=260,level2=280,Tf=PCM22)
-(id=11,level1=280,level2=300,Tf=PCM21)
-(id=12,level1=300,level2=320,Tf=PCM20)
-(id=13,level1=320,level2=340,Tf=PCM19)
-(id=14,level1=340,level2=1e+20,Tf=PCM18) )
-
-Gfi_PCM_rlutcs(
-projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,xmtics#1=lon5,
-xmtics#2=lon5,yticlabels#1=lat20,yticlabels#2=lat20,ymtics#1=lat5,
-ymtics#2=lat5,
-datawc(-180,-90,180,90),
-missing=1e+20,
-range
-(id=1,level1=-1e+20,level2=100,Tf=PCM16)
-(id=2,level1=100,level2=120,Tf=PCM30)
-(id=3,level1=120,level2=140,Tf=PCM29)
-(id=4,level1=140,level2=160,Tf=PCM28)
-(id=5,level1=160,level2=180,Tf=PCM27)
-(id=6,level1=180,level2=200,Tf=PCM26)
-(id=7,level1=200,level2=220,Tf=PCM25)
-(id=8,level1=220,level2=240,Tf=PCM24)
-(id=9,level1=240,level2=260,Tf=PCM23)
-(id=10,level1=260,level2=280,Tf=PCM22)
-(id=11,level1=280,level2=300,Tf=PCM21)
-(id=12,level1=300,level2=320,Tf=PCM20)
-(id=13,level1=320,level2=340,Tf=PCM19)
-(id=14,level1=340,level2=1e+20,Tf=PCM18) )
-
-Gfi_PCM_rsds(
-projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,xmtics#1=lon5,
-xmtics#2=lon5,yticlabels#1=lat20,yticlabels#2=lat20,ymtics#1=lat5,
-ymtics#2=lat5,
-datawc(-180,-90,180,90),
-missing=1e+20,
-range
-(id=1,level1=0,level2=25,Tf=PCM16)
-(id=2,level1=25,level2=50,Tf=PCM30)
-(id=3,level1=50,level2=75,Tf=PCM29)
-(id=4,level1=75,level2=100,Tf=PCM28)
-(id=5,level1=100,level2=125,Tf=PCM27)
-(id=6,level1=125,level2=150,Tf=PCM34)
-(id=7,level1=150,level2=175,Tf=PCM33)
-(id=8,level1=175,level2=200,Tf=PCM32)
-(id=9,level1=200,level2=225,Tf=PCM23)
-(id=10,level1=225,level2=250,Tf=PCM22)
-(id=11,level1=250,level2=275,Tf=PCM21)
-(id=12,level1=275,level2=300,Tf=PCM20)
-(id=13,level1=300,level2=325,Tf=PCM19)
-(id=14,level1=325,level2=350,Tf=PCM18)
-(id=15,level1=350,level2=1e+20,Tf=PCM17) )
-
-Gfi_PCM_rsdscs(
-projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,xmtics#1=lon5,
-xmtics#2=lon5,yticlabels#1=lat20,yticlabels#2=lat20,ymtics#1=lat5,
-ymtics#2=lat5,
-datawc(-180,-90,180,90),
-missing=1e+20,
-range
-(id=1,level1=0,level2=25,Tf=PCM16)
-(id=2,level1=25,level2=50,Tf=PCM30)
-(id=3,level1=50,level2=75,Tf=PCM29)
-(id=4,level1=75,level2=100,Tf=PCM28)
-(id=5,level1=100,level2=125,Tf=PCM27)
-(id=6,level1=125,level2=150,Tf=PCM34)
-(id=7,level1=150,level2=175,Tf=PCM33)
-(id=8,level1=175,level2=200,Tf=PCM32)
-(id=9,level1=200,level2=225,Tf=PCM23)
-(id=10,level1=225,level2=250,Tf=PCM22)
-(id=11,level1=250,level2=275,Tf=PCM21)
-(id=12,level1=275,level2=300,Tf=PCM20)
-(id=13,level1=300,level2=325,Tf=PCM19)
-(id=14,level1=325,level2=350,Tf=PCM18)
-(id=15,level1=350,level2=1e+20,Tf=PCM17) )
-
-Gfi_PCM_rsus(
-projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,xmtics#1=lon5,
-xmtics#2=lon5,yticlabels#1=lat20,yticlabels#2=lat20,ymtics#1=lat5,
-ymtics#2=lat5,
-datawc(-180,-90,180,90),
-missing=1e+20,
-range
-(id=1,level1=0,level2=-25,Tf=PCM16)
-(id=2,level1=-25,level2=-50,Tf=PCM30)
-(id=3,level1=-50,level2=-75,Tf=PCM29)
-(id=4,level1=-75,level2=-100,Tf=PCM28)
-(id=5,level1=-100,level2=-125,Tf=PCM27)
-(id=6,level1=-125,level2=-150,Tf=PCM34)
-(id=7,level1=-150,level2=-175,Tf=PCM33)
-(id=8,level1=-175,level2=-200,Tf=PCM32)
-(id=9,level1=-200,level2=-225,Tf=PCM23)
-(id=10,level1=-225,level2=-250,Tf=PCM22)
-(id=11,level1=-250,level2=-275,Tf=PCM21)
-(id=12,level1=-275,level2=-300,Tf=PCM20)
-(id=13,level1=-300,level2=-325,Tf=PCM19)
-(id=14,level1=-325,level2=-350,Tf=PCM18)
-(id=15,level1=-350,level2=-400,Tf=PCM17)
-(id=16,level1=-400,level2=-1e+20,Tf=PCM35) )
-
-Gfi_PCM_rsut(
-projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,xmtics#1=lon5,
-xmtics#2=lon5,yticlabels#1=lat20,yticlabels#2=lat20,ymtics#1=lat5,
-ymtics#2=lat5,
-datawc(-180,-90,180,90),
-missing=1e+20,
-range
-(id=1,level1=0,level2=-25,Tf=PCM16)
-(id=2,level1=-25,level2=-50,Tf=PCM30)
-(id=3,level1=-50,level2=-75,Tf=PCM29)
-(id=4,level1=-75,level2=-100,Tf=PCM28)
-(id=5,level1=-100,level2=-125,Tf=PCM27)
-(id=6,level1=-125,level2=-150,Tf=PCM34)
-(id=7,level1=-150,level2=-175,Tf=PCM33)
-(id=8,level1=-175,level2=-200,Tf=PCM32)
-(id=9,level1=-200,level2=-225,Tf=PCM23)
-(id=10,level1=-225,level2=-250,Tf=PCM22)
-(id=11,level1=-250,level2=-275,Tf=PCM21)
-(id=12,level1=-275,level2=-300,Tf=PCM20)
-(id=13,level1=-300,level2=-325,Tf=PCM19)
-(id=14,level1=-325,level2=-350,Tf=PCM18)
-(id=15,level1=-350,level2=-400,Tf=PCM17)
-(id=16,level1=-400,level2=-1e+20,Tf=PCM35) )
-
-
-Gfi_PCM_rsutcs(
-projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,xmtics#1=lon5,
-xmtics#2=lon5,yticlabels#1=lat20,yticlabels#2=lat20,ymtics#1=lat5,
-ymtics#2=lat5,
-datawc(-180,-90,180,90),
-missing=1e+20,
-range
-(id=1,level1=0,level2=-25,Tf=PCM16)
-(id=2,level1=-25,level2=-50,Tf=PCM30)
-(id=3,level1=-50,level2=-75,Tf=PCM29)
-(id=4,level1=-75,level2=-100,Tf=PCM28)
-(id=5,level1=-100,level2=-125,Tf=PCM27)
-(id=6,level1=-125,level2=-150,Tf=PCM34)
-(id=7,level1=-150,level2=-175,Tf=PCM33)
-(id=8,level1=-175,level2=-200,Tf=PCM32)
-(id=9,level1=-200,level2=-225,Tf=PCM23)
-(id=10,level1=-225,level2=-250,Tf=PCM22)
-(id=11,level1=-250,level2=-275,Tf=PCM21)
-(id=12,level1=-275,level2=-300,Tf=PCM20)
-(id=13,level1=-300,level2=-325,Tf=PCM19)
-(id=14,level1=-325,level2=-350,Tf=PCM18)
-(id=15,level1=-350,level2=-400,Tf=PCM17)
-(id=16,level1=-400,level2=-1e+20,Tf=PCM35) )
-
-
-Gfi_PCM_ta(
-projection=linear,xticlabels#1=lat20,xticlabels#2=lat20,yticlabels#1=PCM_p_levels,
-yticlabels#2=PCM_height,
-datawc(90,1000,-90,1),
-yaxisconvert=linear,
-missing=1e+20,
-range(id=1,level1=-1e+20,level2=203,Tf=PCM16)
-(id=2,level1=203,level2=213,Tf=PCM30)
-(id=3,level1=213,level2=223,Tf=PCM29)
-(id=4,level1=223,level2=233,Tf=PCM28)
-(id=5,level1=233,level2=243,Tf=PCM27)
-(id=6,level1=243,level2=253,Tf=PCM34)
-(id=7,level1=253,level2=263,Tf=PCM33)
-(id=8,level1=263,level2=273,Tf=PCM32)
-(id=9,level1=273,level2=278,Tf=PCM23)
-(id=10,level1=278,level2=283,Tf=PCM22)
-(id=11,level1=283,level2=288,Tf=PCM21)
-(id=12,level1=288,level2=293,Tf=PCM20)
-(id=13,level1=293,level2=298,Tf=PCM19)
-(id=14,level1=298,level2=303,Tf=PCM18)
-(id=15,level1=303,level2=308,Tf=PCM17)
-(id=16,level1=308,level2=1e+20,Tf=PCM35) )
-
-Gfi_PCM_tas(
-projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,xmtics#1=lon5,
-xmtics#2=lon5,yticlabels#1=lat20,yticlabels#2=lat20,ymtics#1=lat5,
-ymtics#2=lat5,
-datawc(-180,-90,180,90),
-missing=1e+20,
-range
-(id=1,level1=-1e+20,level2=238,Tf=PCM16)
-(id=2,level1=238,level2=243,Tf=PCM30)
-(id=3,level1=243,level2=248,Tf=PCM29)
-(id=4,level1=248,level2=253,Tf=PCM28)
-(id=5,level1=253,level2=258,Tf=PCM27)
-(id=6,level1=258,level2=263,Tf=PCM34)
-(id=7,level1=263,level2=268,Tf=PCM33)
-(id=8,level1=268,level2=273,Tf=PCM32)
-(id=9,level1=273,level2=278,Tf=PCM23)
-(id=10,level1=278,level2=283,Tf=PCM22)
-(id=11,level1=283,level2=288,Tf=PCM21)
-(id=12,level1=288,level2=293,Tf=PCM20)
-(id=13,level1=293,level2=298,Tf=PCM19)
-(id=14,level1=298,level2=303,Tf=PCM18)
-(id=15,level1=303,level2=308,Tf=PCM17)
-(id=16,level1=308,level2=1e+20,Tf=PCM35) )
-
-Gfi_PCM_tasmax(
-projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,xmtics#1=lon5,
-xmtics#2=lon5,yticlabels#1=lat20,yticlabels#2=lat20,ymtics#1=lat5,
-ymtics#2=lat5,
-datawc(-180,-90,180,90),
-missing=1e+20,
-range
-(id=1,level1=-1e+20,level2=238,Tf=PCM16)
-(id=2,level1=238,level2=243,Tf=PCM30)
-(id=3,level1=243,level2=248,Tf=PCM29)
-(id=4,level1=248,level2=253,Tf=PCM28)
-(id=5,level1=253,level2=258,Tf=PCM27)
-(id=6,level1=258,level2=263,Tf=PCM34)
-(id=7,level1=263,level2=268,Tf=PCM33)
-(id=8,level1=268,level2=273,Tf=PCM32)
-(id=9,level1=273,level2=278,Tf=PCM23)
-(id=10,level1=278,level2=283,Tf=PCM22)
-(id=11,level1=283,level2=288,Tf=PCM21)
-(id=12,level1=288,level2=293,Tf=PCM20)
-(id=13,level1=293,level2=298,Tf=PCM19)
-(id=14,level1=298,level2=303,Tf=PCM18)
-(id=15,level1=303,level2=308,Tf=PCM17)
-(id=16,level1=308,level2=1e+20,Tf=PCM35) )
-
-Gfi_PCM_tasmin(
-projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,xmtics#1=lon5,
-xmtics#2=lon5,yticlabels#1=lat20,yticlabels#2=lat20,ymtics#1=lat5,
-ymtics#2=lat5,
-datawc(-180,-90,180,90),
-missing=1e+20,
-range
-(id=1,level1=-1e+20,level2=238,Tf=PCM16)
-(id=2,level1=238,level2=243,Tf=PCM30)
-(id=3,level1=243,level2=248,Tf=PCM29)
-(id=4,level1=248,level2=253,Tf=PCM28)
-(id=5,level1=253,level2=258,Tf=PCM27)
-(id=6,level1=258,level2=263,Tf=PCM34)
-(id=7,level1=263,level2=268,Tf=PCM33)
-(id=8,level1=268,level2=273,Tf=PCM32)
-(id=9,level1=273,level2=278,Tf=PCM23)
-(id=10,level1=278,level2=283,Tf=PCM22)
-(id=11,level1=283,level2=288,Tf=PCM21)
-(id=12,level1=288,level2=293,Tf=PCM20)
-(id=13,level1=293,level2=298,Tf=PCM19)
-(id=14,level1=298,level2=303,Tf=PCM18)
-(id=15,level1=303,level2=308,Tf=PCM17)
-(id=16,level1=308,level2=1e+20,Tf=PCM35) )
-
-Gfi_PCM_ts(
-projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,xmtics#1=lon5,
-xmtics#2=lon5,yticlabels#1=lat20,yticlabels#2=lat20,ymtics#1=lat5,
-ymtics#2=lat5,
-datawc(-180,-90,180,90),
-missing=1e+20,
-range
-(id=1,level1=-1e+20,level2=238,Tf=PCM16)
-(id=2,level1=238,level2=243,Tf=PCM30)
-(id=3,level1=243,level2=248,Tf=PCM29)
-(id=4,level1=248,level2=253,Tf=PCM28)
-(id=5,level1=253,level2=258,Tf=PCM27)
-(id=6,level1=258,level2=263,Tf=PCM34)
-(id=7,level1=263,level2=268,Tf=PCM33)
-(id=8,level1=268,level2=273,Tf=PCM32)
-(id=9,level1=273,level2=278,Tf=PCM23)
-(id=10,level1=278,level2=283,Tf=PCM22)
-(id=11,level1=283,level2=288,Tf=PCM21)
-(id=12,level1=288,level2=293,Tf=PCM20)
-(id=13,level1=293,level2=298,Tf=PCM19)
-(id=14,level1=298,level2=303,Tf=PCM18)
-(id=15,level1=303,level2=308,Tf=PCM17)
-(id=16,level1=308,level2=1e+20,Tf=PCM35) )
-
-Gfi_PCM_tauu(
-projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,xmtics#1=lon5,
-xmtics#2=lon5,yticlabels#1=lat20,yticlabels#2=lat20,ymtics#1=lat5,
-ymtics#2=lat5,
-datawc(-180,-90,180,90),
-missing=1e+20,
-range
-(id=1,level1=-1e+20,level2=-1,Tf=PCM29)
-(id=2,level1=-1,level2=-0.5,Tf=PCM28)
-(id=3,level1=-0.5,level2=-0.1,Tf=PCM27)
-(id=4,level1=-0.1,level2=-0.05,Tf=PCM26)
-(id=5,level1=-0.05,level2=-0.01,Tf=PCM25)
-(id=6,level1=-0.01,level2=0,Tf=PCM24)
-(id=7,level1=0,level2=0.01,Tf=PCM23)
-(id=8,level1=0.01,level2=0.05,Tf=PCM22)
-(id=9,level1=0.05,level2=0.1,Tf=PCM21)
-(id=10,level1=0.1,level2=0.5,Tf=PCM20)
-(id=11,level1=0.5,level2=1,Tf=PCM19)
-(id=12,level1=1,level2=1e+20,Tf=PCM18) )
-
-Gfi_PCM_tauugwd(
-projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,xmtics#1=lon5,
-xmtics#2=lon5,yticlabels#1=lat20,yticlabels#2=lat20,ymtics#1=lat5,
-ymtics#2=lat5,
-datawc(-180,-90,180,90),
-missing=1e+20,
-range
-(id=1,level1=-1e+20,level2=-1,Tf=PCM29)
-(id=2,level1=-1,level2=-0.5,Tf=PCM28)
-(id=3,level1=-0.5,level2=-0.1,Tf=PCM27)
-(id=4,level1=-0.1,level2=-0.05,Tf=PCM26)
-(id=5,level1=-0.05,level2=-0.01,Tf=PCM25)
-(id=6,level1=-0.01,level2=0,Tf=PCM24)
-(id=7,level1=0,level2=0.01,Tf=PCM23)
-(id=8,level1=0.01,level2=0.05,Tf=PCM22)
-(id=9,level1=0.05,level2=0.1,Tf=PCM21)
-(id=10,level1=0.1,level2=0.5,Tf=PCM20)
-(id=11,level1=0.5,level2=1,Tf=PCM19)
-(id=12,level1=1,level2=1e+20,Tf=PCM18) )
-
-Gfi_PCM_tauv(
-projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,xmtics#1=lon5,
-xmtics#2=lon5,yticlabels#1=lat20,yticlabels#2=lat20,ymtics#1=lat5,
-ymtics#2=lat5,
-datawc(-180,-90,180,90),
-missing=1e+20,
-range
-(id=1,level1=-1e+20,level2=-1,Tf=PCM29)
-(id=2,level1=-1,level2=-0.5,Tf=PCM28)
-(id=3,level1=-0.5,level2=-0.1,Tf=PCM27)
-(id=4,level1=-0.1,level2=-0.05,Tf=PCM26)
-(id=5,level1=-0.05,level2=-0.01,Tf=PCM25)
-(id=6,level1=-0.01,level2=0,Tf=PCM24)
-(id=7,level1=0,level2=0.01,Tf=PCM23)
-(id=8,level1=0.01,level2=0.05,Tf=PCM22)
-(id=9,level1=0.05,level2=0.1,Tf=PCM21)
-(id=10,level1=0.1,level2=0.5,Tf=PCM20)
-(id=11,level1=0.5,level2=1,Tf=PCM19)
-(id=12,level1=1,level2=1e+20,Tf=PCM18) )
-
-Gfi_PCM_tauvgwd(
-projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,xmtics#1=lon5,
-xmtics#2=lon5,yticlabels#1=lat20,yticlabels#2=lat20,ymtics#1=lat5,
-ymtics#2=lat5,
-datawc(-180,-90,180,90),
-missing=1e+20,
-range
-(id=1,level1=-1e+20,level2=-1,Tf=PCM29)
-(id=2,level1=-1,level2=-0.5,Tf=PCM28)
-(id=3,level1=-0.5,level2=-0.1,Tf=PCM27)
-(id=4,level1=-0.1,level2=-0.05,Tf=PCM26)
-(id=5,level1=-0.05,level2=-0.01,Tf=PCM25)
-(id=6,level1=-0.01,level2=0,Tf=PCM24)
-(id=7,level1=0,level2=0.01,Tf=PCM23)
-(id=8,level1=0.01,level2=0.05,Tf=PCM22)
-(id=9,level1=0.05,level2=0.1,Tf=PCM21)
-(id=10,level1=0.1,level2=0.5,Tf=PCM20)
-(id=11,level1=0.5,level2=1,Tf=PCM19)
-(id=12,level1=1,level2=1e+20,Tf=PCM18) )
-
-Gfi_PCM_ua(
-projection=linear,xticlabels#1=lat20,xticlabels#2=lat20,yticlabels#1=PCM_p_levels,
-yticlabels#2=PCM_height,
-datawc(90,1000,-90,1),
-missing=1e+20,
-range
-(id=1,level1=-1e+20,level2=-25,Tf=PCM29)
-(id=2,level1=-25,level2=-20,Tf=PCM28)
-(id=3,level1=-20,level2=-15,Tf=PCM27)
-(id=4,level1=-15,level2=-10,Tf=PCM26)
-(id=5,level1=-10,level2=-5,Tf=PCM25)
-(id=6,level1=-5,level2=0,Tf=PCM24)
-(id=7,level1=0,level2=5,Tf=PCM23)
-(id=8,level1=5,level2=10,Tf=PCM22)
-(id=9,level1=10,level2=15,Tf=PCM21)
-(id=10,level1=15,level2=20,Tf=PCM20)
-(id=11,level1=20,level2=25,Tf=PCM19)
-(id=12,level1=25,level2=30,Tf=PCM17)
-(id=13,level1=30,level2=35,Tf=PCM35)
-(id=14,level1=35,level2=1e+20,Tf=PCM36) )
-
-
-Gfi_PCM_uas(
-projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,xmtics#1=lon5,
-xmtics#2=lon5,yticlabels#1=lat20,yticlabels#2=lat20,ymtics#1=lat5,
-ymtics#2=lat5,
-datawc(-180,-90,180,90),
-missing=1e+20,
-range
-(id=1,level1=-1e+20,level2=-21,Tf=PCM16)
-(id=2,level1=-21,level2=-18,Tf=PCM30)
-(id=3,level1=-18,level2=-15,Tf=PCM29)
-(id=4,level1=-15,level2=-12,Tf=PCM28)
-(id=5,level1=-12,level2=-9,Tf=PCM27)
-(id=6,level1=-9,level2=-6,Tf=PCM34)
-(id=7,level1=-6,level2=-3,Tf=PCM33)
-(id=8,level1=-3,level2=0,Tf=PCM32)
-(id=9,level1=0,level2=3,Tf=PCM23)
-(id=10,level1=3,level2=6,Tf=PCM22)
-(id=11,level1=6,level2=9,Tf=PCM21)
-(id=12,level1=9,level2=12,Tf=PCM20)
-(id=13,level1=12,level2=15,Tf=PCM19)
-(id=14,level1=15,level2=18,Tf=PCM18)
-(id=15,level1=18,level2=21,Tf=PCM17)
-(id=16,level1=21,level2=1e+20,Tf=PCM35)
-(id=17,level1=1e+20,level2=1e+20,Tf=PCM241) )
-
-Gfi_PCM_vas(
-projection=linear,xticlabels#1=lon30,xticlabels#2=lon30,xmtics#1=lon5,
-xmtics#2=lon5,yticlabels#1=lat20,yticlabels#2=lat20,ymtics#1=lat5,
-ymtics#2=lat5,
-datawc(-180,-90,180,90),
-missing=1e+20,
-range
-(id=1,level1=-1e+20,level2=-10,Tf=PCM29)
-(id=2,level1=-10,level2=-8,Tf=PCM28)
-(id=3,level1=-8,level2=-6,Tf=PCM27)
-(id=4,level1=-6,level2=-4,Tf=PCM26)
-(id=5,level1=-4,level2=-2,Tf=PCM25)
-(id=6,level1=-2,level2=0,Tf=PCM24)
-(id=7,level1=0,level2=2,Tf=PCM23)
-(id=8,level1=2,level2=4,Tf=PCM22)
-(id=9,level1=4,level2=6,Tf=PCM21)
-(id=10,level1=6,level2=8,Tf=PCM20)
-(id=11,level1=8,level2=10,Tf=PCM19)
-(id=12,level1=10,level2=12,Tf=PCM18)
-(id=13,level1=12,level2=14,Tf=PCM17)
-(id=14,level1=14,level2=1e+20,Tf=PCM35)
-(id=17,level1=1e+20,level2=1e+20,Tf=PCM241) )
-
-Gfi_PCM_va(
-projection=linear,xticlabels#1=lat20,xticlabels#2=lat20,yticlabels#1=PCM_p_levels,
-yticlabels#2=PCM_height,
-datawc(90,1000,-90,1),
-xaxisconvert=linear,
-yaxisconvert=linear,
-missing=1e+20,
-range
-(id=1,level1=-1e+20,level2=-3,Tf=PCM29)
-(id=2,level1=-3,level2=-2.5,Tf=PCM28)
-(id=3,level1=-2.5,level2=-2,Tf=PCM27)
-(id=4,level1=-2,level2=-1.5,Tf=PCM26)
-(id=5,level1=-1.5,level2=-1,Tf=PCM25)
-(id=6,level1=-1,level2=-0.5,Tf=PCM24)
-(id=7,level1=-0.5,level2=0,Tf=PCM23)
-(id=8,level1=0,level2=0.5,Tf=PCM22)
-(id=9,level1=0.5,level2=1,Tf=PCM21)
-(id=10,level1=1,level2=1.5,Tf=PCM20)
-(id=11,level1=1.5,level2=2,Tf=PCM19)
-(id=12,level1=2,level2=2.5,Tf=PCM17)
-(id=13,level1=2.5,level2=3,Tf=PCM35)
-(id=14,level1=3,level2=1e+20,Tf=PCM36) )
-
-Gfi_PCM_wap(
-projection=linear,xticlabels#1=lat20,xticlabels#2=lat20,yticlabels#1=PCM_p_levels,
-yticlabels#2=PCM_height,
-datawc(90,1000,-90,1),
-xaxisconvert=linear,
-yaxisconvert=linear,
-missing=1e+20,
-range
-(id=1,level1=-1e+20,level2=-0.03,Tf=PCM29)
-(id=2,level1=-0.03,level2=-0.025,Tf=PCM28)
-(id=3,level1=-0.025,level2=-0.02,Tf=PCM27)
-(id=4,level1=-0.02,level2=-0.015,Tf=PCM26)
-(id=5,level1=-0.015,level2=-0.01,Tf=PCM25)
-(id=6,level1=-0.01,level2=-0.005,Tf=PCM24)
-(id=7,level1=-0.005,level2=0,Tf=PCM23)
-(id=8,level1=0,level2=0.005,Tf=PCM22)
-(id=9,level1=0.005,level2=0.01,Tf=PCM21)
-(id=10,level1=0.01,level2=0.015,Tf=PCM20)
-(id=11,level1=0.015,level2=0.02,Tf=PCM19)
-(id=12,level1=0.02,level2=0.025,Tf=PCM17)
-(id=13,level1=0.025,level2=0.03,Tf=PCM35)
-(id=14,level1=0.03,level2=1e+20,Tf=PCM36) )
-
-
-
-Gfi_PCM_zg(
-projection=linear,xticlabels#1=lat20,xticlabels#2=lat20,yticlabels#1=PCM_p_levels,
-yticlabels#2=PCM_height,
-datawc(90,1000,-90,1),
-xaxisconvert=linear,
-yaxisconvert=linear,
-missing=1e+20,
-range
-(id=0,level1=-1e+20,level2=0,Tf=PCM241)
-(id=1,level1=0,level2=3000,Tf=PCM29)
-(id=2,level1=3000,level2=6000,Tf=PCM28)
-(id=3,level1=6000,level2=9000,Tf=PCM27)
-(id=4,level1=9000,level2=12000,Tf=PCM26)
-(id=5,level1=12000,level2=15000,Tf=PCM25)
-(id=6,level1=15000,level2=18000,Tf=PCM24)
-(id=7,level1=18000,level2=21000,Tf=PCM23)
-(id=8,level1=21000,level2=24000,Tf=PCM22)
-(id=9,level1=24000,level2=27000,Tf=PCM21)
-(id=10,level1=27000,level2=30000,Tf=PCM20)
-(id=11,level1=30000,level2=33000,Tf=PCM19)
-(id=12,level1=33000,level2=36000,Tf=PCM17)
-(id=13,level1=36000,level2=39000,Tf=PCM35)
-(id=14,level1=39000,level2=1e+20,Tf=PCM36) )
-
-C_PCM(
-   100,100,100,   0,0,0,   44.7,62.4,100,   29.8,44.3,62,   76.9,84.3,100,   100,100,0,
-   100,55.6863,16.4706,   0,0,0,   100,100,100,   0,0,0,   100,0,0,   0,100,0,
-   0,0,100,   100,100,0,   0,100,100,   100,0,100,   98.4314,98.4314,100,   78.4314,12.549,3.1373,
-   88.6274,20,5.4902,   94.5098,33.3333,12.549,   100,55.6863,16.4706,   99.6078,80,24.7059,   97.6471,87.8431,24.7059,   95.6863,100,24.3137,
-   79.2157,100,83.5294,   52.549,100,94.5098,   36.4706,100,94.5098,   7.0588,78.4314,100,   23.5294,52.9412,100,   57.6471,20.7843,99.6078,
-   84.7059,6.6667,99.6078,   100,0,100,   80.7843,100,15.6863,   44.3137,100,14.1176,   23.1373,85.098,56.8627,   65.8824,0,0,
-   47.451,8.2353,11.3725,   0,50,100,   0,40,100,   0,30,100,   0,20,100,   0,10,100,
-   0,0,100,   10,0,100,   20,0,100,   30,0,100,   40,0,100,   50,0,100,
-   60,0,100,   70,0,100,   80,0,100,   90,0,100,   100,0,100,   100,0,90,
-   100,0,80,   100,0,70,   100,0,60,   100,0,50,   100,0,40,   100,0,30,
-   100,0,20,   100,0,10,   100,0,0,   95,10,10,   90,20,20,   85,30,30,
-   80,40,40,   75,50,50,   70,60,60,   65,70,70,   60,80,80,   55,90,90,
-   50,100,100,   45,100,90,   40,100,80,   35,100,70,   30,100,60,   25,100,50,
-   20,100,40,   15,100,30,   10,100,20,   5,100,10,   0,100,0,   10,95,10,
-   20,90,20,   30,85,30,   40,80,40,   50,75,50,   60,70,60,   70,65,70,
-   80,60,80,   90,55,90,   100,50,100,   90,45,100,   80,40,100,   70,35,100,
-   60,30,100,   50,25,100,   40,20,100,   30,15,100,   20,10,100,   10,5,100,
-   0,0,100,   10,10,95,   20,20,90,   30,30,85,   40,40,80,   50,50,75,
-   60,60,70,   70,70,65,   80,80,60,   90,90,55,   100,100,50,   100,90,45,
-   100,80,40,   100,70,35,   100,60,30,   100,50,25,   100,40,20,   100,30,15,
-   100,20,10,   100,10,5,   100,0,0,   95,0,0,   90,0,0,   85,0,0,
-   80,0,0,   75,0,0,   70,0,0,   65,0,0,   60,0,0,   55,0,0,
-   50,0,0,   45,0,0,   40,0,0,   35,0,0,   30,0,0,   25,0,0,
-   20,0,0,   15,0,0,   10,0,0,   5,0,0,   0,0,0,   0,5,0,
-   0,10,0,   0,15,0,   0,20,0,   0,25,0,   0,30,0,   0,35,0,
-   0,40,0,   0,45,0,   0,50,0,   0,55,0,   0,60,0,   0,65,0,
-   0,70,0,   0,75,0,   0,80,0,   0,85,0,   0,90,0,   0,95,0,
-   0,100,0,   0,95,5,   0,90,10,   0,85,15,   0,80,20,   0,75,25,
-   0,70,30,   0,65,35,   0,60,40,   0,55,45,   0,50,50,   0,45,55,
-   0,40,60,   0,35,65,   0,30,70,   0,25,75,   0,20,80,   0,15,85,
-   0,10,90,   0,5,95,   0,0,100,   0,0,95,   0,0,90,   0,0,85,
-   0,0,80,   0,0,75,   0,0,70,   0,0,65,   0,0,60,   0,0,55,
-   0,0,50,   0,0,45,   0,0,40,   0,0,35,   0,0,30,   0,0,25,
-   0,0,20,   0,0,15,   0,0,10,   0,0,5,   0,0,0,   5,5,5,
-   10,10,10,   15,15,15,   20,20,20,   25,25,25,   30,30,30,   35,35,35,
-   40,40,40,   45,45,45,   50,50,50,   55,55,55,   60,60,60,   65,65,65,
-   70,70,70,   75,75,75,   80,80,80,   85,85,85,   90,90,90,   95,95,95,
-   100,100,100,   100,95,95,   100,90,90,   100,85,85,   100,80,80,   100,75,75,
-   100,70,70,   100,65,65,   100,60,60,   100,55,55,   100,50,50,   100,45,45,
-   100,40,40,   100,35,35,   100,30,30,   100,25,25,   100,20,20,   100,15,15)
diff --git a/images/UV-CDAT_logo.png b/images/UV-CDAT_logo.png
deleted file mode 100644
index 17f40d09e09f3347e2a80a16800fb7a6621ac509..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 31325
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

diff --git a/images/UV-CDAT_logo_sites.png b/images/UV-CDAT_logo_sites.png
deleted file mode 100644
index 6d568b8256795e70a9f578a17d96bc36d256f09f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 116663
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

diff --git a/images/add.gif b/images/add.gif
deleted file mode 100644
index 3f40d591d10f17eab54fefed078985c9d339dff3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 986
zcmZ?wbh9u|RA5kG_|5<VjEs!T%*-q-EUc`oY;0^C92}gSoLpR7JUl$Syu3m}LJ|@Z
z4Gazc|NrMGVX!Hd_@IC6e<H*F6o#4<o&>#Afph_mOpYyS0vFX&1?&YJ7&w-(A9~yH
zj-BPdgTsF28;=+)m>EQ*88{pwT-eRtHHiFY;n?pG!&1S-V8*~8!oa}M!tP_)@Ro<=
zKZnD9rYr0WW(^D?EL+$eE;g78u!uM~aO5aNyf=UQU*!LOj{VnTSbn@?VE@nHu%F=q
zi=!z+od^R92ZKX|BZFBTg9r-)hXX^51OwAChP4q431$oeA`BcH4Al(#5;&3s7}$9j
zIDW7jhBvHXVG*74#Phwyn*SoA`#Cu7)@;yz_m=Jde~111FD!{Oea9;DUpj)F!>l1y
zghhbEfg>hFfXO_SK}3LogJVO_7VUQz+5QVS>~~0DVX%XEgMop;@xrmXw^}U!85lM*
zFlaC^urV+=Y++%!$iN`Lz~I2Z@MFsb{flo!1pa?uVR+BL@SlNUKLdl}4+aN)1`ZL1
zITsk*-!bs~XW-b+!0?BKp^1Tk1*9$I$CeNJ7ypY0?B{TBNO)Lor!FeO#=+shu;2%S
zg+7Cb$h~<C?M)0UEDR0~44(7;Ff}zjU}0f(a7fs~{NW<Qe*uR54h$(w3?F(K{<APR
zY~d)sXf7%s!k{^i0c?l(59TI)26hpK@{0_j0t}2S3=F>*7;ZB#$TKiJVPM?Jz@Wvz
zP|d)Q0QLqCgQJK)^ZPP}|EUc7ix|F@GdwS1kk4drC}HqPWq7af|9|TK{S^yqGJhu&
z^9z(PaAYp2&TC9aXAn?e;7Ma-$Yfy1VPHsQU{DCFQD;feXAmf0;7Hc>$z^z-!tg(n
zVZS~DOF6@bOosnC4Eu8!o@6rYOk~i?WpF5FsL^LgC}$8TV&KTW;iJ#|K80a_87Ku)
zfOSB6L3sfb=!_gP9vc=MY-W|!h&i!g;o){}Mu#~b6Bi!ol8}!(b0YBJu|7%rrZpNx
zPmWAdGhOzDqoL8YQ<{B~%gIZP2RaPWnJg3*G&D0vOPh2=Y*stND#xp^p)z=3K)dha
zTPYn69vxq<zgFnOjSVlI7A71N+bY@c`gB|3;l8O=-xR|ZWiP*VhwJ0o!1XLMqxM>D
z$-Xy}PlU(A!!V7hyNXe~&x)b&)C#4{Hjxa5S6-8*bEn(wlw9=W%zXX!ILlv!&)XRp
G8LR=v6d}L>

diff --git a/images/animate_load.gif b/images/animate_load.gif
deleted file mode 100644
index a6563b031e0578d30a723f0a4aca512aecb3292e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1893
zcmZ?wbhEHblw(j}_&%3`m6er`UxY!FfnQKah)+;ZfKyyloI{gAK#^P4o=3`5NK8pr
zQ9@E#Mpa2sUeQoORaI4A%TUo)$w=44+}xa3!=K%gK_HVs#Y;phSj^7R&N|jWJC$26
zQ^=@7%+fi~F1jj>fuVwd!NJ}k)Xmnt($w42%gaC5C(tLzFDNk3KRi4<HX$w{CN4QH
zDKkAYr!c=TBdfk5zr3VWIC_R~{3408d0OeSEz<hUvSz8|uF$XCW{|nWq->>S^(KeB
znXyGp9@Q&rsvG577!2Cj-RCI#&om9}u?=c;N}B7DzS1pYlSjq2=$Zqu?#;VGJ6DBv
zZI7C`ufDl6r+=Gw=i$gHC!=TG$eMjTW6qU=d8e`#UMgOEu4LJ@7FO0iaq(IDdNV96
zriO(z)s`)Fb6Xgfv?V2FTUl94O?%JL!mf^<8PjI;&0oJ{?u><V7p_@2Z_Uyb>o=_5
zv~tnLH5+$rTDN1{j>gsJ+cw{vwEcGL_LnpFJzjrl?*2pjmmR#n{lxXPC!X%T@^=5N
zk0<wRKEMCqxkGy|9oTmE<mr=VFI+x(;>x+pS1+EsarOF<>u)aHetq-dtDDciKR<Em
z_4&)suU&m`=fUg8cc1*a_2Su!C$B!f{_*t9r?21My!!n1^Pf-e{{H>@|Nno6Q9wip
zDE?$&WMr7jpaW71$`cG6{}?O_A06owR`;7@fs;{^c4h{n^097l?T{4?3zJ$qz2=yp
zD(2xzkK0plG0BxnM8r*iA%VeF5!FBwXI^z*h!w%AepwtRIuo1(Q7k<>;~>l#OFDz4
znM;HmXB>cufL&;iRPgA_Q>ZQ#cBiFYSsD%xj&Q;qf0<iz!m$np;mqKfK65NCDmHcs
zt6OP?X&^lK#Oc&xeI=(UhRTbC)cso3{w---tag^0A<H5Yrf6-&!A@Zb!C04yi$^*q
zD>Z2Q1SB{xFf>R^g$Gc~kq1XQFG~n2?MZobq;v8zul8pfIvEpMm0*5eE~;mdDy8hy
z(xEpSqHDS5#48LSlc9e0Y~}Wwd1{8Ca2t=3YnOnemP&@7j06MQnu?E)j&@5HSQG|5
zYyx@AKr*RBBXE&(E0-*nh(~WHr+|z_0|Vm$7N0o*J05_-#kCb;1=M6{kj+YD;8PdY
z21#)SD*5@(acN{?<(i@qy6wr&$0r0ASkFo03HW#T<Pk2Aqn)O3T;`Rw%KGx*Ve)Z4
z_2@q)o1Ua|t4lK9DNvdSc87rCBaxP4)2z%_WvmQxJw4ZchJo&`!=7vh7;-IYJ-|`d
zA(U8ksCnWtd8-v63!RSk&3EnobLF8)@&Rc-k)Q%l_%3pp(WG;#g+sVcI&{vH6GiI&
zayAhbCnYYl3A2iTQb&l##AU47_qJ$0;qY%2?yIwSc!;%I*w2V*%R?7MR*(;6gQlEh
zU{y3uV__0%a9L;<yry7hQtRX%#(axFh%?&x3Y$JM9qSU|<(eZfN$s+fK=22LgDT1m
zQhv%{XIx(3IOocO84ivAm>5KiuUtsnc<4a8wV=pS&I@hAts-;Ga&Ni35Lhn3${=Bo
z$i&touEFMzVBp}?<ekp30_2Y6J~Pc&xsI%CX<`$OIa1+x(1DqO!yw_ogNK(SnQ|=x
zBMxR>Ugq1vm1}f}F@cShje|#k;lTk$Zt)HgNvD@SjHYumd?cP6^OZ5ov3Qwyh~*>;
zmvo;>;HH$5lhiV%BzPG+@T!Y~@@N1<11BhYKw$^+JS@{C@B|!Qd10owcEo`K1_q}V
z4nd`W1rCW$Eu4aCE*%1iPAm+3R|+mISrMRU)p})3$A$xpEbM$TCIt|Nf<*&E;-M}#
zlQ~+7K}$R)D!O(tU0mqg&L?YC^5P7PabcpeJKu7z4lT`~5YLH9uB|+xS|KL{7CE(Y
UDQbnR2vBtH;F1gy5n!+e05jB+i~s-t

diff --git a/images/animate_save.gif b/images/animate_save.gif
deleted file mode 100644
index 8b1081c5433266032db537c41285962a9226ebce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1966
zcmZ?wbhEHbRA5kG_}<6B&c>>$p`oZ}rfy<mYGJ`38p&(nCS>Eypq|2DlE!3KsA1vA
z=jg}d8X@2pFBF<>>f&SU6J-&WZW~`_mQ&~AVCU`Y>mME-77^~9kQJAZm=+zHmYJDb
zR#sL~!R9xYGi)xK-%_s7WxU~=grc_brcakn+N+Z@N3*2guDsW}ZkAg53eD1uR%MF~
z>bD4`9aPFXq+5E-w)UiRd1pv%cW~Ww_lk8Ml^ZJS8yxFTlsDEHw=A`2*=aZVxKq<S
z-<CxI9ScLItxE5nUe(f4*)^?x!i2P*r72TaW=!8!IcrV*+zsi=ca|?)Tef1aTgwU0
z-b)_SPWVl_8a(q{+@i}#3y){6yk5HUYUS1wmD_K&c6PK+pFVlktgbnWn&xfjU%sMs
z>E0PDR!m;KY1Y=QOV_Mfwtn-9?K?KES+Qg1&i3U8T6SHXzUkzIJrCFJJG5Z$<<0vK
zbRNDo{mlLDLr><OdNS+M>lFu%FF$i{$I%meE?iiC_SuTdFV|lEvg^j%t+zgJfAHq$
zi4zCUT|RZ?_SIXrPu_ZR@Xm*8_n)19^77QnpEsU9zxC?NvsZ6ly#Mg(!}~X%zx?_8
z_y7O@45NVBA)xq^g^`h=k3k1yFepzjaQtJCHqE-SB5<)=uN1|MBOQXuZaor)cntJP
zIo?0lzU<u&%O$uh)no#h<J!p~`%9QjK+&m%Lr}@ZV}gQX6AP!%5s0pvi6R;T3+&5p
zOi?`S=FzL-HKpWb(-K#1QM0Hm78jR+y>pS1MdQMJ`@AD9FOyP^@kpEH-Pw_te6&kc
zJ8VtF$Aew7+<K+{wJto|;yFpht>wau#z&1^a(*dKCQMXrpDbfp^yGx%VHd`RPAOBa
zrbh>v*?A=-3=T9L?6U;<@W_flWw$mSNu!huKT+0BDbuVb77hV<yP6*#1XDQYI732H
zP}!yV8_%uH>V6_1H9^fQ{N`E}Ja}^Q^6~&Bw;o7{E4wta@!r~;epZ;ZQ_9e(nFHii
zE>W$L6&Dt{_DGl}f$VZ={`ThP=5${^mQE?tT}>Pl6r9?bWUWeG1T1pt7Sl{RvO-YV
zrTWX8gNxI9c|dl(Y61mWJD;r86pf1@a}2Y<=G6Rnaj}`*n}?-S%JA1erW3ug=IO_J
z7&oVSPt$QOsrc~VU^6?Pj8y^0;^kf-MW(-)Ui8hiPk1wBqwz9k1=&W65{4&=0jx?f
z9RiArmUB5sa0r<uiLgzOHqSfNBe~htTTDjIs^G$bM&@>2F|&*V2Uz_@B{)P(v#zKF
zC_2=i+hO@d{epmf_n#jZH)sSb(3O*7{B$|(tcVcEoG+{w=31AZ+QIqc_;~^Q#y4|r
zPB_s&Uq?pbr{UtXUa*?1FRT}2t@DoT;Cyndzt6bw+>DI^C(cXCND0j}Y(92M7;4T0
zS+kr2Q+^&k=F4tfcdlonz>71I{2(=-k9JKK1i7b$?canMMoD`bBsa7AwChA!m8@u3
z%*@WsvZ>&P!V<530g$3EtP>;*llD|xJhYUfT}iw|K;eKQ13Lq^n2vzMLN0!gK}jV~
z`y}*}wt&^J>56v=a6C|SU}s=a;1N(@Oc0e*6wt`J@}gV8FzHAKBQqP1ghAAn7bg}i
zJ}kgzVdODEU?JO7Sw$h0tScP63lzMk=|pZ?a&nSd_^g<nMXJ8DOu`p@X}HwP&MyX0
z!^th6>NQ0paFI)=5S*dl(7*u6DPVH~7+E+36g(Oj7@0r}2V_PQ69<<{)|C~43jK~C
raTN{$1&1aEMj;W7319}33W(9jKyh(EOtHeU0i0J&v#w|;FjxZsT|%lO

diff --git a/images/base10.gif b/images/base10.gif
deleted file mode 100644
index d3069446b6d24a350879a3821746fc0d388af4f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 978
zcmZ?wbh9u|RA5kG_|5<VjEs!T%*-q-EUc`oY;0^C92}gSoLpR7yu7?ZLP8A;4gdfD
zw`4fR!@$77z+l5J@uA_^e-?)Q4h%H{ED0720wN3?91L45R$P3SB=DczVL!(*_J+3&
zZ`oP?J2>oTzOj$NB8fqSoq>ZR!iC-JU4zJf7LNT6F)S5K3}y@rA`A>1E$lv)4R3i^
z{&P6&XS%}9VAjAO!otAeu!Y^>VuQH=i->~*M~*_od-J#dMgH&S*nd5S<;Ob)_WukH
z`x!2<IGQrli7>EmFgQdwGMLptv@*m<Ffbis*bu>xV8&3*@FjucodCms9)|rt*crkb
z7+6>s92^+tJn?yNk@{amU_S@P-5Lk&cd2au1uiUkV)|~U$bYQ}b{4Y+hM15QOy)@&
zdbVi4yXdgrA%TU#4(w<K#|y{m-fFS@XJFXOz@Wjvz{bGfu!V)?A_Ic}1A_wt!;dW&
z^e?^@5%~Xsh2cE|!+!>b{R|9>KNuYJ88}23=3HQKf5*V{pMhgP1H&H{h9(9E7Lc}-
zA6q`?U);~(;E?dJ+)iCogpGs4fnmW91`B-#5s`cI7}}c{Jm>vkYHE7G!oup{kg$dM
z!$pSw0t_ik3?F(K9JX+jUo;mL5aDp(V9=b$05(_r2Xm7?1G@-A`9%g%0R~1E28Le@
z47V8=<QW*AFfi_9V9;V<sAgbD06U$BAxDJa!+VDR{~7l0XUO=*@ZmYbe|d%!ANCLL
z8~*=i*}vaGp{C$Ng2jIUk-%#9ri2D|0TvD(2M2~V<qQ_03?dv1911lY3<>WT1VG+X
z@ImrFizCB_ItFm+5qKi;dFQeJS_}*|5)28)KxxZIg5mu!P>Q4@)&bcC$_oq}+Zh-+
zWIQ%3IM~c8sS$Hx!@|Su+>8!$JSHwY(j~yIb!CU(W9KGz7Lf#j2ajC)1x0gA8X6dn
zPu7Sva!D{sI@52EdoM@h!(+dBme%h~JQW^an5Xa0w)Tec!G;#Ae6_QZB?p<>!qy%;
zGqZGI7+bvIp)*yX53jFFlARYDJ#FQ!O&J$=<({~f6VVm=@S3l8`1<(%%D4ZXc9(95
o*^|Hbm8<2nH&?gza8DM!Gwp-_k?GIV=Itmc4mr=q%*0>~03!w*`v3p{

diff --git a/images/bookmark_folder.gif b/images/bookmark_folder.gif
deleted file mode 100644
index 28ffc21d1d71469dde82dd93f5af2bc5fd074f5b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1302
zcmZ?wbh9u|lxC1-_|5<VjEsy-OiawoOf1YyENW(~EX=Ix7OXQ4v9U6-u`;u1+p;B0
z<}mZ&WM}5I4dZlA=duam@+;)FkKj(7!8`ASFdw^E^G5NqHPTT{3i0iVt*ew9=c}c3
zsQ0eZ?BAf3H&t6fP`hxNZqY2=@_BlCdipU1`ZY_8nwDFyy<~4^XFp+;>)c&|i}!`u
zE5x@gN=r-4&d$!s$;r>l$<NO(EG#UXysD_EsA$#Rva+&@ii*mLvdYTJnwpy0UFYiS
z>+4V6Yiw+6YHDh3Zf<FAY-wp}Yi;RhZ|m&r?CNaq>gww5?(XUC?CI(0*?*z$(B=OA
z{s|K%OjxyZ!tN83CQX_=X~N{mlc!9XGIi?IY15`nzw&J6jA=7x&YZdN(Cpc>XCFR4
zZ{EClCvVR?b9>>!g^Ly~TD*Aik|j%)p1-qf*|O!!m#<j9bj6AlD_5>uwQ~8YRjbyn
zUAun$`VAX4Y}~kU)5i6iH*emuWy_W`SGI58zWv;-?Kht6*uHhgjvYI9?%a9#_O2b<
zcJ11=>&DaFJGbxIwPVkoJ$rZW+`D)0-t#y1@7=wB@16tu_8z$L^uWunhYsvJa`@np
zBS((je{t;S;p4}S96x^i#POpiPMkP-^5m(L$4{R+apv^NvuDqqJ9qB<xija_pTBtF
z+@*`>E?v5G`O<~UmoHtpbm7{SOV_VnzJBfM_3PJeUcY+l#<g2FZ`^wH?Doy;w{P9N
zbL+<4+c)puy?y`Qod@^tKD>YT(Zl<X9zA;e=)vPh4<A2%{P@F{CyyUKdGh4x)2Gj#
zK7RJ>+4JYmpMUuB{Ntw=&!4_{@#5u+XD{D<diC=8>sK${zJ2@d?dy;4-+uY@;oFx_
z-@bnS|NlRO00RRLgJXz4^ZPP}|EUc7ix|F@GdwS1kk4drC}HSHWq7af|9|TK{S_~3
zG7S=n6$MHdI5L-1=QSpzGYBX!@T4&^WHK=1FfgPtFerr8sIw&KGYAwga3t&Y<TAWZ
zVfdfPuwS3SrJUhICd2<6hW$AVPcj*HCNgN{GB^}7)aWxLlrsnvF>qvy_vo{}PiFX^
z!mvM42b2Rqd4YlB9|I$YjK_ur2b<3dX~mo{Sa_iAEQ3J}hoKUKyMU^m%Zm?-=JW`+
zc8Wa9zHZpq_hiCE=YWN7(^YD}-dg%vOqW3`d{xiKO{p%EjLYxtDxKI9XyjYrR=ATx
zd|l(As<T&0jh_Y@*|f$~Y6x%$=tlkeGwZ_vmIkZr13iYbLXJ&!n)Q!k!wjX?>ze6r
z{`?X>$R(neFyYgdppMJxcEzk=D+0ui3-76H_$ctHob$YVfo1Bg$regYN429Y>X=rv
z^(lpL$v6nP1}*iP@~(u<f$=b_poT@wj{{B<SFv&Lds6B0hJU_&^Q)4+6Ae!7f;-GB
z9>}uwPgYOrIN7MYoNw+^hG~C18z(%p>=eFKzCGjN<CDy0dH0Smp3j-NDdmZ2gGGPR
z;XE;2n}9aSj6EA;jJGNz`xx$dVsu(N$YVkyoAQVB6U;Fc6OT1+;}Pc3-+JVem-dp5
zOPwOZO$JWl{4tHKl8i1(CU9*%5yY*tZc9^_#=M*+P8Gqlgu^U>4iAqus!B}c&{(mi
z=#++ST#~19kBm|Wi$22w7cq9dlm@0~1tU(Ci6%uHigg=|j`J|E7#?9T3R7ud41E!(
zs@S+;l8dIxhMUezg<)5C7~_o|x@)<gadeT+dG^3zL6e$G1Czmu#4f3Y8!DSwC%B!u
bFx~o$gEPn6s#5|B^(<0etvbuX!e9*m_?L%V

diff --git a/images/cdatdemo.gif b/images/cdatdemo.gif
deleted file mode 100644
index f8ca3e6bda59a9fdc35d1a5557c8787dc9a0cce6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 413
zcmZ?wbhEHb6k!lySSrV``tTK<$hJ9KPQUs4uW!X6!=x!o_g-vUw7+Wh9{<WE=^ZP#
zpS?3>?Xm6Kw`=JcJ$v@7cjhv+;D*niKc7B*+CFzyQs;)M)(J69EAu97I(p|>&E!?_
z83md_RSXOa|NsBredg|e8Uw|jEQ|~cQVco_3=9k)KQXZFI?x}`v6F*^hl$DgAkX|m
zM?Rjg(9!Q?3CWnF#y`WWDQJg-I6K?cT{7bL8q%LQC>W^qW<UDdXQMB{(Znw&$1f~V
z!^r3_+Sk|8I;mT*&N(ttWMV51ql}E8jDJnO(42YmR~9Xi>t<ZIazTLLx)mGePxEJ3
zw_&>sTeLje-tB@14mxoi5%fE8?!2@tpS<kVD^9ZVe6oek(oQlrZ-|M>F1mit>9&Bt
cm8+L-_)AOkvB`eE@>%wq%>DEK9T^y`0TAfsT>t<8

diff --git a/images/cdatnews b/images/cdatnews
deleted file mode 100755
index 277b2d9ae..000000000
--- a/images/cdatnews
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/env P4PORT=stargate.llnl.gov:1666 P4USER=p4review p4 changes -l | more
diff --git a/images/cos.gif b/images/cos.gif
deleted file mode 100644
index 32fde08a86176a89114e17bb003fe09c5e3dd7db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 964
zcmZ?wbh9u|RA5kG_|5<V4Gazc{~y?&&cKxB=#*I}U%}##>M*BR;=TT{|G^CVlNr7j
zNmync<0)X^C}HR+miVB5?0+)D{(Od-Vul1g27z=2j!cFvX$lwB83gPZ92gjuv9r8w
zU|?rqaByH?zVU#;;vIv?e+G{I5o_7at~7{9vT!&!#60O?+G)n1CBopq(ZW8*vf(Wc
z%YP1s{Y+Qb8O$0OL|7O&9Ja8BTx>8GU=eX};Mk+E;=TFX|04hQbL_vqhULdQ2KN69
z4*MA{usE7B)QK>#a4<MTI5L>kL9{Z&NH8-UV_3@^k-%Ukz#ziGz)`)0A>ks2fB*xJ
z1H%u7DdERbS+oS+TsZLFH1)rTz<v&nyAQT#zq`oxU%+9%!v(e{rtjX0u>X%>zi!s>
zLxhDrCgcK>xhaE)2m=SlhC5plSQzXW7(^HtI2afh9M>MJyQ0M+>EPhN!0?2DVJ8EF
z76XIB76yTf@81dh|L?GW{}1se`agGyuxmM7VEACl@Lz;sKL>+i27|+U1`bfzFw9|M
zaA#oPVPIhR!@$sVjDbaq!NFn64~7r=3?~wHXxhCK75UG>v7cc9GsAlZhW`u<`x)*r
zZE3f<$igPzd4Yk+^q7K(77K^NhKvgz-kbjaFS36>#}+1o4-D`AGyLDru>ZsZHciWS
zqHOF8n#|%qb~Nd~V;A{<VhfYzMFvp;21X_ZhF=T}w;34Z89-6^WDDcYiws%<4AlV)
z3GWyL{xk6GcTDkTeqYA$Kb2vB5yQ7~hUY~L@|g?{B@A;?8Qv@W|DU>lf5nNK%-;#c
z`~oEm9GOe1^BNP<83Ys<c+wadG8q_h7#LC+7!<;4)L9br83YO#IFfbe<TAWZVfdfP
zuwS1cq@3YHCd2<6hW$AVPcj*HCNgN{GB^}7)aWxLlrsnvF>qubo}<tFK80a_87SdW
z1M7ec0p$e-j+G3I95Nmo794D5Wz~o|v0>ric5X(8IUW-i9_f;hk2`ZB@ZqsON&BWX
z8bOH-la+O?Y)%?2J>I6ldc;T5=-HWx^7(89nhMYT=4tu<i?N*i^g^3-zMjdhElZCr
z<FCJE!fE*O;?juJI9D#wX8|jto3m7BmF8Ss$J1ZO`#b1`*A^r7XDZp#Ufo<5{P<Ps
mZQ*6N_m=&fb|v!4%isk?g6d&4GYrFz_ba+jIb)!}U=09aO*mr!

diff --git a/images/cosh.gif b/images/cosh.gif
deleted file mode 100644
index 977887a1174029e8e7dbaef1c09c2fb0929fca2e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 978
zcmZ?wbh9u|RA5kG_|5<V4Gazc{~y?&&cKxB=#*I}U%}##>JU>b@m~Mf|6qpw$qe6%
zBrG$J@f0v{lrZ=dOMK8j_CJ|ne?CJ^@q&bmQ~^B!j&zPKnHw&qr3$DEIM{P6W5{^h
zpvTTq;NXzQJm(RE1v7()Gy{i2L<qaty9SZ}EFAkCVpx_iF_<$jh%hj4w6MomHoWCw
z`Oo37pXmxagINQE2+J1soQn+>0xTj94jeTK8Sl;C{ulYbpJV^^9F`yN7})<aIP7P*
zz~X4iP$$B`!olDW;mBZC#~{MOz~R6UBf-FQjA0!!a{>c{00RRD14DI0M1q-_fQSeW
z2gi>;4B_k?EDQ_|3=C_Q1-^e9`=4EOzXQiz<^$RcZ`m0BJ233Ouw{$s#fu^W0vrww
z5$r3>8s3Vq{ErE_&Sd_BL4<w7oGse#F0%a>aM<sVz`|e$_6CFFgJX4XwOIZ;IP7O&
z*v!D7!N9=Az~Hcjh2<gx!;dWw^e?^@5%|x*!tjBC;Xebzeg+1`9}Euq3>+d192^XD
z9x%ASW8nGEz_Fi!;SUQ#6UcofKel|(zxZE7U_XaLL&8IAJ9SYJHVzI4hLj%+7Wxb#
zAf5N-F|;=^u&^*VI52q5`@_`Kw19<$$-$vu3-gDI4F3ff_B$|?Ffn}SW%$p+(6GhC
z`l5xXfCz^J2ZQE329Px@;y;+1^cmPi7#g;4SYKoi6<}awVPN>hz;K&^L7su(2?OI!
z1_mt#hH3@|NPzM%II8$Fzb|9>pUSYmh~Zl~!}B5r`Ai0f5{8&mhW85p|EKQXUvaJ`
z^LIiqzd#8CN9L01yvBrd1_1>Io-{^=Oa_J=28L7y28FO1b(REu27v+wj%3}KT!!~4
z4F5A3_Uki<lrwzDWcZ)Mus?_4NhZV2L<X%~28UvX8hwU@at47S29E4YG5XB!QyBJ_
zff6yfSO=sLlouE{wlgqt$arj6aIl$`RU_uahJ}aQxfvbicuZV)q)S3R?#zk6hsXLP
z?VHwU7&V-n$Y(z*rt{LHLz9^jwux*IT;|im7^Jml=Hz7m>4x=vBCiZJT&7u1Ja(n>
z^U_OG?K>}-yxOq*>|DQzUO8P`vx8UIZugp+IW^<TqL`CbsTE~eQQNZPPnBAm<z3&M
z`2N^a&h4*VXNT>5l^bom^1;%Mk78S;O|&i@uS^dT(cG!{^pv2X^PV*`jnmFgWoBZq
F1^{)ZF@695

diff --git a/images/cycle.gif b/images/cycle.gif
deleted file mode 100644
index d472dcd90c27f838885b355f0dbcb80b5f5cf5b1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1119
zcmZ?wbh9u|lwy!(_|5<V%6`f!e#$ETDyjjhnt_^{;hNfh+B)vqIzc)*vAVjxI=Vr+
z`l<ScDaJ;bMrO%oR%O;UMb<VAHg-97_Ko(ARSr&N&dx2)&b=-!Ev~Lb?ymi=Zmk|}
zU2g8p9_}rk?j0WPQ#?ExJv`dHJUTo*+r7N{y?knXeWv^P%?<FM>K~XJ7+4z^xF9H`
zAvAP$Xz2X#$fl_1*|9Orv9aso;#VZ3)}^IxNlRaynZ70~V{2CCmaMGRIoX@DbGGN?
z&&$u>U0ATKuxLkN(az%Hoy8@4OUw3^SL~>+*jrJ#r?PTiRptJwngeyU2kYv0HPs(%
zs6W)yxT>-7P*c;EmgarU%}1JB_P4YgX=ypy+Pc5B^-z23q0ZK0t*yt}+xEA&9c*tq
z(%yckqy1=S`_b->105X)J3EebbR6&K+}GK4q_6v6clY7$?i0N|hkJUC_w}#t??2f;
zVdI1erzTD~HEF`BDU)_jo^)#R<av{)oS8Cp)wHR{rcOOEb?WJ<Q_swtc4o%(71L)P
zn>}motU2fB&)Yd~{)Pqf4=$L0VbOx~OBP&QxbVorg=gn4-m!S`@g+;nELn1C+0x5P
zmtI-EY{Rl;8<#C#w|x2fWy{wuUw&f6iqk7rTwK2L(u$SW*RI;JYVC!!>rSm(cV)x6
z>+9BC-?;wl`VBWWY`D2;^Np=ru5R7BXY2Mu+js2WvFqZl-3NE?xwL2Rg}nzJ>_7P6
zz~L*04?j3|<l*6CCypIEbL_<9Q)jQAJ%9be`R5m|-MV)3_RU+jZ@v2R>i_@$prkYO
zu@1-!QVdcI3>^O%7&&A-HY{*#-YcXPb7I3oCk8%cuQ#lPi(Fep^`p+*Sbb`iQT&#e
zm5ZLVFY4v~`C(P)s|zwZE;&5{CKDIWj_8>8r9)BaFgsU6mY#_)mnS<r7mr9p14Dm6
zYl7U%iUUcLmUvCmI9oL<;LHLU-n@(>H?&Wxdj!0w$P`}A(av2ZbjxdVQ^4V_5TB<T
zo7m1y5Z2&QZQ1%Fbec$!MB0|e99Jae<>CswR%lJu@rW&0G2v6e!i5fV4Nf>r4Va=9
z-g#(G=BC4}0-Lxca~C*jD=xEM{7dKO=G0>x+(J<*PhJE}Ul+UUo694irUNU_3FdE2
za-AzG9h73i;lX-$p}L~a93L0SV)p6tg_w67F01G~K2gDK(UqG^j=B7L$18oc!7$N@
sl~<)fz>(n<uX><ffy0CYO*}>g2ef|lJ{2ew(h6JXA`&+vz=6RU0H@i?qyPW_

diff --git a/images/devel_20.gif b/images/devel_20.gif
deleted file mode 100644
index 2e1e1aa9b92fe0b6d21197ba35df8072300caf75..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 825
zcmZ?wbhEHb6k!ly_!h{($jHbcDkj9sA|=8mE-o%FuOO-@!=s`qrm8BhZy;i3rYX&C
zrNOPPu3>IrX>aeO9vNlg<7*xfsg;&)l96FvT;i<5<7&w7X(AM4BOK{05frGO;;)q(
zY*-p)mYHZ#l%i3UZ&g=h=<eYa;O`L}9uXg(;E|pdmXi}%RG5|OnwgzlUS1L2(HTCu
zH)+b0n#q$BSFg_8vZZ+Mp8A6a8`HEqb4|O7EGL%O&Z==-+~R$3N&e9lRUI9j)2C1G
z-?3xjqD9M>FW<RyXXoitD^8zUas9@&>(`I3Za%%S{o<z1OFJf?JTT?bk;%u7AHRM3
z_K~Mg-@bkK|Nno6K?4+jvM@3-1TyG=Tm*^}2KIjqAT|aL1Or<gM@Jn#CI&DEOgcI0
zI612F@^NrF*g6IVg2Wu{Y_)Y%Sr`~K^|=^yz+z600lqrQtPG4A_9Bc7f~v|4fq`~T
z0d`ulObm?rx{M4Wx{M4Ae!h0Lb`3f{ic$=W`pzOkE+R|}3_3c>swxUTK8jMBu13Zt
zqU;O|48Bg<e7wwxmNw?{dIDTr3=9l>40cZ1$_xxFG9Dfl(rh5-3;HtfYisi|@G5J|
zdwH6RGqC9BI0Z5=v9K^Oa2U9%%X)g4i8JX02132B?q)2^Bs;yq%f^g{$u=;M!Ozdv
zSH#Uwl#zi+*3(9ThsoBDAu!Na)89xK<On7?Pis>i23v-}Ky5c8kh_>vc$wrpt)!S4
z7y<)Tbp<#W7#MT{9eJ5d&BT~MV#<t6V4=W3M;2}gZU&H;6DtD)gSIayL>(EJ7(k&P
Y7#Qg5<m=)G5(^BpV_;x#Y-F$o0L2Qb6#xJL

diff --git a/images/devel_menu.gif b/images/devel_menu.gif
deleted file mode 100644
index c6448aa2569cee7d65e5dd16646eca64f6948cc6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1493
zcmZ?wbhEHb)L|51IL5&6|NsA;J9jQ$zP!A=A~-xkU0uW6!ct6CRbJm<;-W<z9i7vs
zPtVNG78e(1WMt$J6^kq?Oqw!9#LVpN+jqx~A9wfgl9yKq%gO2AvBM-I!^FooE7dhO
z*ieX<CA_2a_U+r3j!dq~w~BO@=sbPOJR)+%=~Dsz9z`h{E3V(j+_I&3@1FXD2hEF1
zcvMuSMA&B4I38V5)m3DfnP?F{xmP_h>ha^pt5&T#e*Acfzt-uE?GsCEg97zM6=f_f
zEki>?i;9Zu?VT>|n0#?lr>h}90|P_N<jEfCX`Q*Iva+&$eSO=mU)M@Yx6<HFT)q0p
z)2F3TW(Sw#H>PPXZt-^3;n9?4_cRguKcGN|fq{Vm6c-Ha{~8#Y7#NwDTUl7y*f}`4
zn3^X}nmlFdwCOWu&YC@E?!5U67A{)6WEK-Q7Y{QFFCV{vpb#JP(yiOJ@7TF(_ny72
z!XnI~V(Y{uB>DNISVZ@pJAdKgrOUgy8HKr}Wn|Y0%AJ(F&v)g?(`V0LY?BvR!Og6o
zsB~9ZQbkqr&dXoF|NMQze28O)1tZfu4i1f=6%hv)wKf+{%DS;3&^e%2dU00F8jBNb
z4c&r<dAkl4UgDjkWLwGOI!Wk+hi>KGFW38>7}(gjc5r-Ta^sOS&hVJ<^+JP+w5^&N
zYr^5<E96aU)`+;Yti0^uYw5YPg!yFen)$2RZdq}@QP?zR(vl-7)1KL7|KriJ$!Sn_
z=aaRru&G(m*rcK)lO2-#`=n+RL(=KEt0g-gCk1ro3+Bz~EK)s`cabsiz=DQmCQ*qK
z97-z31lV~Q*k-t-ta4vsSEKMT;<0<boIQg|q1KJZc?{;07%XgNl=t7*XfGGv^>s)8
z(hb!iZyHrRuPxiYRJ(rPrEUH46KgrHzumGjr{~ecBg<rWTLnMg+<rOk-rur!j<MAf
zw)93{;QbYrdpsuXNy!BVZ9bU*7B05}1s6Vdo{NmSQ&b#T@|12eNK`WXF^CH?RX8Xj
zv@@6WYJt6vNnqjO+80y8<quk%Xxm$=+QF+77e23pL5DTDBmS#GN9$S6Me+<b|Nf~(
zyGH+Pn3&*`oAEfzzN&SKLjTF@58LGw0|lo<cCz28U<ool5XUF6u!YOJ<bb1qfy_Y{
zcCLt|!~7l`oMB;|sZXDlJLOeeE!WDDNSJT;W!aSMZqKPMLE3C9l&6Vo-KG&WQISoi
zUw-EDr^|f=GsA*{G`pto#;!Cy8P+jNH8gBnU`U#!{2FIRHZPNdPDXiLjE6akwLUni
z7=N|67+Pa>O|j48pSjx7i5ogz@J{m!nY6mx$!g+~r@UQRTSXGJIz!}+{kY5Dw)V=C
z!nP!B(XFjvCCxc;ZiiMS-)Pz@Ef{%DikDTuV&WkoKHDn?g`FG(S%vwobjmNct!rHq
z?EbH8hIEjVo%$VqB|-58JukAfIF9r48%ak57D_Le)>-)HaP1YjtxrxRu6iAq)Li)M
z`Pt@zIY%nmb3;F#R-C2tu|O&HmA(m&#zZG)w%Gv(4mx=#HgOBgWqnz0@;<{^=&Mqh
zp`ZjO=i8o1=h(_BJs(=G3)xiZl2JdoY3tRMdF>go{9f@d=HIGxOEsQUJ$dcIkiU2D
zZtIAxU3)h&;Ng$by{}c-wRis2d&|QpccI`w+!hXlQW1BbiTx_^Cx1=!(DyVEEr?$?
zCCJBoUEalQ%{$JCt}^(TXYHYXbV;@Qs>N|ZuY7W!#J>@l`(*z6Lyzxee%x++-}<$Z
z;`*N^qBaN4I@^gbDL62Pgg72`zP)_?zhC<VJ_|6{@hUYi-%mgL@9&T2=R18xrWmYI
e;l9DG^2PlClhlU>4xa@~;wKKU-P0Ffum%8RxW7dJ

diff --git a/images/divide.gif b/images/divide.gif
deleted file mode 100644
index 8e540dc04c054fe9128d8950dbe316b3d58a364a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 987
zcmZ?wbh9u|RA5kG_|5<VjEs!T%*-q-EUc`oY;0^C92}gSoLpR7JUl$Syu3m}LJ|@Z
z4Gazc|NrMGVX!Hd_@IC6e+t9?Ooo~=mV`_OffNRgRE8~jD=wxd31qT6q;V`$Z+L6}
zmYw0hgTsF28~Ye6k{CqT88|p1T-eRtHHiFY;n?pG!&1S-V8*~8!oa}M!tP_)@Ro<=
zKZnD9rYr0WW(^D?EDRhDTi6{gHkb>rh&VWK<S0bEH-GzI<o|w-{nukye!OE~|IgsC
zpWy<FqbWn32m=cTgF}QPgIOI!D?^L~1Jf~v4G|0pW()!%3>+K`)eIjJINk{`{O4iV
z|AU<&yn%s*g~7prVNOWEdyCZnA_Dt4IPTUsXunHk`!C?IpX0)kC#LUqiu~7#U}rIF
zV2BA>!DODap=XQsyNeF{9THd=>>#dZU|?{(aIEgF7R!GIhRqBN8Vn3<3=9riSXeGH
zFbFU(I505$*m6Pt;#(1c{~uTw-ZL=#XJFXRz@Yep!9kyaLxf?@1qSzb3_SlCIQBCz
z{9$2eVqjnaX-oOB<%9mk{TvPs2@lKd)I~+uI5->_7W`na&}R@4xi^oYy@|nd-XEr>
zrUxu6tPTzdTbMswWcV+@u-}0pg^A%qFT;Np28S&i<rmFG1w=R;I2bhNF@Q}M|H0g(
z&%iFiP=1j?RDgkzg@NH01H)|w26+aCCk%``85pz}7^)c<62KndVQ>`jXMSJC@IRGd
ze-XpCa)#$c4Dy)_4kZjesSNKG{{K(izrSK-P3G@}Vt#=V29C@n)p?Bx=?nr23_NL!
z44DiJISdS`3=9fkHR>!0`V0aE3>?Y2KDi9<QyBhdGVIr9U@2$#kjd~rhhcvX!;?&g
zorw%uxeN})3^n=;3FQm|MGPF-cYXAk-={F_F9Ri6>R}y_QJ}oQz;S?qkweB~!-9j&
ztg;$0CpIiR+|JGDFvnx!!XsT0@^NQQ1U@|0Cu!fbMx*G-kx6Q%%X&B(8eJQ8^!ZwD
zEMWARAy+75qp+Z%nL#!C))~pmj18=Eyb1<g#S1S?cTuf#QP}+O@*+1*iQF4kvV7M`
zGqT*^y87_yCZCg=OnzTYys^q?YgI18$7Sbc8qb_})x%)93oA3%yQflyjxNiLSozpq
r7amBQRpPI<ZO5hcjEAQBr(N3<nVP<RzGM3`n_q>QTbD93F<1it@0uR0

diff --git a/images/edit.gif b/images/edit.gif
deleted file mode 100644
index 1e6858c6610207f5a52f97ea5d09d394f6de3d26..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1500
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

diff --git a/images/edit_20.gif b/images/edit_20.gif
deleted file mode 100644
index f853cc7a04bde3cebb64ab02224f8688d7447c88..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1258
zcmZ?wbhEHb6k!ly_<oszfq{`nR6>e@L0nv1OiEf(PF9JR-;|d@RaI3(O~cI0%*M>h
z*22`%!XlWD+gC>_ScSQmfuT;8!Nb)m*TE*&*QCx*&&9>r&(|X~$SWqoKPV_HCOSGa
zH6tc5JvGudB{4cPEvBj@Iw>hJH8VRaEj24EIWsdezqqg@uduivt+2SL$B<*X9pgj`
zktvQ0^IX{GxpMRdXg3EMPYTkV5Ma2-jcu_z$3hRzEiMcTeKi(FYHv)nYAlQIElTOB
zOPx_yv^m>-YmUdJ`qVSYe76%AZWPI%t}(uyr+m9o^J<;lqcp}RISdbTIbP?ozARvW
zR4(1unAO@`G_g5rYJb&+mgqIz#S3QC{cq#=GR5xKWb=c~As70JuP!OSzq<7Q+~EHU
zeSR$p`Mo6S_sZC(8>;`TO8CFGuB)fFZ{pOxsdFYz=$JHh($pC<=g*%%ZQkMqb30ee
zZ(T5N+LpQVS1p^pe$~`Xt6O$2>fg1oclXw5Yga8=xoYjY4V$;`Sh-{C>fO7SY}&YS
z`;OhacJ0`E@X)n+jRzNZU0&68XLI-SCCv|4w7pv1{$OMC>#bd{cl5p7KJneYX&+a$
z|J~93egFK2dsZDjxZ>!cZ3hnQzjbcatpoe7URZJK%BriEHr%<g_0H8DcW&(YdwS0M
zv+Ez;-1_YP&Yy=C|39|!=cP5@uWtEyZR?9iyAB>YeBkJbqo>cFJ$~Tkxyv`N9lmk>
z+O6AnZr*?T{q~_Jcb+|ac;ey1`|qCK{r>vEmv^WBJwEsI?a_ZP&i;FO_5a(u-#?!F
z`}y>jk2ijOx%B(noxi^>|NnpE*|VolpS^tg;`NK?FJHZW|Ng_rPwyZ6ef#k5*QdWf
zzWMj}(Z7FhzJ2@p_1lmC|G)kH`<G!50L7myU{~mXNKl?&;P}TNI7h-T=}3p5vRjXY
zVNz=&vjB^U!@<NOTQV;%^PO#$duvPP<tG~yKCyQ4MP7FEX%@?s+LC#3nd|JbWiE1N
z(FZIF4`v<Nl5u&NZ?$Q=*A~<Cu7gfTpK(kR%XIVUHtUU$u~^_2x>5K|u%csA(36CR
zX-7=Li|?Hgde+mU9J}OLis2JAM;5M&76FScd)?Zc9w+uzD^$%#Qbp9vBEmG+X<fpl
z8NR_sGN!LIOgyEcnRL*3Y35}Eo7bW~vlhDT_Uh#fR^yzk${*r8+w85={P@c!Om3xS
z@ysyvoMBP9F+FNa=4C&J=*z7a^@5WR^>`jS;>jbg*5^ChtoN{qg7ujbDVoY@K0<1K
zNiH)>)Lk}aUUu_Yy@_MGx^D6$gF+!?F1d!8Eva0MIZ~ZzP6dY1Y@A-g>V}IRJWSD^
zZs4QUGjT#ohvYhs&M7(@1&{hKkK0%CvntG;xzllDS!dOeR`x#4I*Y$d&(7S`6jWy7
zjd+lJMN!c-t>yvqt7+>KXD!LN!JI4Az{i+!VM9{7l%eVVIjusBPUk^EFQ{=LA#^P$
g4i-;+?#1SC5*!(`n(X1RvgMW!G<ue?vM^W!04J0|5&!@I

diff --git a/images/edit_menu.gif b/images/edit_menu.gif
deleted file mode 100644
index 913c12821be01a5cfea7f314f577bda7fd3165aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1781
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
Kp)M5#25SIew$O9{

diff --git a/images/editdelete.gif b/images/editdelete.gif
deleted file mode 100644
index f0a0da26f4b6ba50f29f1b628e2eab8c135296c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1313
zcmZ?wbh9u|RA5kG_|5<V%*@PeY;2sIoV>ie0s;cU!ouR>;!;vlva+&@ii#>KD(dR$
z+S=NBdU^&128M=)rlzK5W@Z)^7S`6*_V)HpPEIZ^F0QVw?(XiMo}NBFKK}mx!NI|$
z`MFI@Or4#b-K~vtrcT(hWy_BBD|T&NeeBq=;|rUPFKIimtn1{;-jn;bo;-Q-)ar?+
z*G)aMVaC}_bIxsDaBkb&^V=6+*tz`Tp4FH3uDG;s-KB$@E+5`{`P88+$97&lvG>}6
z_1BK?ymsoqwbMtgUAuPu?2+r2&)htH;O4pGH!q&PdFkZ6d-opPy!PP1gNF|vK6-HP
z`JqKG4ljOjblHpN4__W#{_@!JmnT-eynpT0iPf)8ta){E&8z!YUY}b3`t<tOr#HMl
zv+>Q@&2P?aeRF>6n>TOXUfBNj;?B31cD=i_>)qwu@2>27cXi*pYx~|^JM{kQ{`c1o
ze7Ju2!;QlqZXEgW{Qie`Z$92S{_*ySPq&VJx^?Q)-7}x=o%wX{+^0w9K0Uhh>Dj%{
z*A9PvaN+aAi=W@W{_^<Bm&aGXJh}Sy*^RHyZhn1!>)Wb@-yU81_UPKTXV<<xyY=nG
zoo_GietUWE+pBxuUqAfu=JAhrPk+37_T$HopC4cT{P^nEy2ZaPo%{9a^{-FwetmiO
z>)X3uzkdDx^8WYN55K>E`t$wspYLD({`&s+*N=ZpO#ebd|K;WVtE%`{SM_h#u7CUX
z{rmR$->+}~e*OCQ_s_q7zyAIE_y7O@J7#7gA|f0d91QI97#y4!SXdYw9K^RUH<>Z8
zi!g9-Flg9t-1)#D@}GfYKLaBR1H&%{hS>}Z@(c_P3=B^g7%LeVv=|tw85j~67z7v?
zco-Z@{Fy(LG5k+u*k8o(t(;+b5rcdtgF^|!npB1l3jhD7?%!Y0T9f%Zp_ogcgn=V-
zNp)UhLOO$h0s~JPBSR(wLk<H&Dg%Q;SdBVMf<A*l3Ij)??wS&Y4~Y!_^%?d%GNc4E
zd~{*>AJ4GAoZ(46LuC<zRyKo!K0{41LqZCJKq3Q2$;LJMY##y`{wFf*PX;A=7}fzX
zKzV_I;~xVfhm6OD1qYj16E$0oGIkzr7igX#p;)lcwVOdF&!Om}(hOA&hm<!v3YIwW
z%6RIrG&i(*Ox@sf=+FcqH66AMF{h4XTy*lCAtdrjMRW5Z|Ec0rIBF{c)mj&;SkDNU
zH96C>TX;d)n+uA}t?b-vpJF5&v)wHM+NKBy9%}ZPDR8E23QK!u-`0Fxs|nQ`r)t<o
zluS6Wdjn&9Yn@~1t}kt;xDIhiUXe+CIrZu3Y2l$trLO{&<t8NRuK1Z4qIG6{%vvkg
ztSjtpEoCiX0l}UxgQkbh&iecC!~zFPC-oISPkqz4v&ww8-Xx9yd6|WR0{U^YuB>ue
zJk9*l;p69eFR(BB7kqx+U*=-l%2y{=3f^j{2=nyP_b+*IVXj4PMvI<7?Nv3OwW;Br
zwG|f*9+Na~adYrmyXTR7!@AJ$ld>ge5|2q3wwN)v*KOR?skT(d-KBK-nT_od@dpHE
zF?ehdI;Fm<VTX)T$B%%ynkf|rk8&?$Z8*|BC!y(7(Tk^r?)+CpHyst#Yhhy$nwR3#
zsk)A_(L=87j^S|`vyk*w5nYSUmMIf=xV6ZA3!K3wm2u+3LCrvmg-tUiJ3Km})coh-
zT$#Kzfo>A98G)`Mz9ti!W|V0ub<BIUb>Xr3u_=Z}g<H)Un<l$)d}QXge$sH5*Ytvc
hGmpWZ2Tt5tOBxPws#|nkSk1v1n|gVT0V@lGH2^Fdo9+Mr

diff --git a/images/editdelete_20.gif b/images/editdelete_20.gif
deleted file mode 100644
index 8bd6e28d0bd14b070e93e57f9b19ae4f74a01daf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 825
zcmZ?wbhEHb6k!ly_{IPN9Bizrs;b7u##UBVG0ys~F3!Qh!4Y90F)=YoNl7``Syd(Z
zB_$<QRaFZO^xJd7JMyC^l*D$GCihn7^wk%w_48gA=({d5Y=fuE#)5>ijEwgf7_JNO
zUsI5K%*gnJoBNHV<ZlLs$2vOytt@VMxLhnReHs?}CO+nWV*J0%wEx9<{f%X_8`3AX
z*Dh$yThvj!xVLg`PvO!D_1l_CceL02Z>w)<Y3}Li?d_k?H(}D`?w0A(r!Sk*x@=nK
z%2|E;CQVwkVA`@}%MSMS{qJb~KYh~wdGr6TU;qBpj<*;0e!0Hw`>nmduWb8wXV1~2
zN6(!*ck$$bOP4O)zJ2@st>f=*p8R+0=%=g4zT7?g>)z4-S1&(*bnorcTOXdD`TO9=
z|EK4^KD_+>?d^Y0FZ_FX_0Q|uPoF-0`{~)c&oAHqe)ImrhwpEne0=lb|MSNmKR*BW
z>B;{uum1mj^Y!c3?>~P0{r2V0ug`z~{so0EUaa_&1uU-vB0+J&!2Yj+iJOy|9RgSw
zxVSmFK%k`1q67l`n9U&!u95=20tnO3!iK%1q_D7rtE9lZ5F!?6Q)0mdVuRFy=#r9>
zAl{S$UXGFykUCzdSb>E(HwU9RNUV^zu%rQ^yQCy4fQPT7kgKGC7ivjKNl9_0HAIZN
zphP_sq_W6WJ<pLBtd6^&#97+Cq@>VAUOdm94`g5gcVS71gS1<Ti@Zc?t{p@#*ip{X
zDl!tO@kzD_v7!<+CAsMh(a9lk#t_|{ASZ?@^2=(6g+v%aRB{v)mqaRvrJG7?dPEq&
z#j=&f(!vu=q_w>DA$r-fiZvut!-G9zq*Q%$A?i3wiu3Z5lj351W4(Nh!0HOwto8JC
ibVNjig#`tKSos=2UMX?1u!H~$D=RAt|B{kM25SI)0bE`H

diff --git a/images/editdelete_menu.gif b/images/editdelete_menu.gif
deleted file mode 100644
index e6b4f3cbe5ed2fda84455f5f2853ba0868256a85..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1568
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
XiWRiW=`rwco3K!zy<&m`1A{dHJEQkf

diff --git a/images/equal.gif b/images/equal.gif
deleted file mode 100644
index 3aa6e64035a58aa6243a57c8735f9926bb30980e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 194
zcmZ?wbhEHbRA5kGc+3C-jEs!T%*-q-EUc`oY;0^C92}gSoLpR7JUl$Syu3m}LJ|@Z
z4Gazc!9WM31EiOMrToH4&((V^UZ36lKS84}C3D^iHU^%pVcH5uZ~i{_NrbsQz@l-E
zYI(5;WA{wPM4hBOzlF?>B_```X!m(kc&&}p@e}`0*B2kVYgyabT~jygxH;ughFfRM
o?%q=(%+}d@R-DcOe&Q7j%$gmV(QFeYPnkMx`iz;gGz1x}0Y17w8~^|S

diff --git a/images/exp.gif b/images/exp.gif
deleted file mode 100644
index af87ff8a84c1aa33e8a7897bf9de93eca2080da2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 991
zcmZ?wbh9u|RA5kG_|5<VjEs!T%*-q-EUc`oY;0^C92}gSoLpR7yu7?ZLP7@^4*dWB
z-?H`?4<iGI1A`5_#D|7s|5+IJJ22D;uq0S82#7Fna4>AKSaI=PlE8m<hy5JO*c;w9
zyk%$k@8GbX`Nlp5izEgSb_NcP2p4v<cMT%{SvdAP#IRH_F_<whh%hj4w6ObFHoWCw
z`Oo37pXmxagINQE2nz#;!xnajiw))iEFumL961UR@6F%-7x}-RWB>ISmLKmJ*#9#)
z>}R;Z;%LfHC&IwO!Qc?#$Y53n(i$Vdz;ujZZ3IJt8ACP0hXjsy0u29o820~QX9#a#
zU}0f!aA24d;_}`i^}mR~eh!YiHI3Tu=CFYbbhxnOiRrtYBLB4_*jdaP7-B+JFqtQ9
z=-HzE?jqZNfdm!?JBXth7#JKc9IJb)#qytlVKW1R1_J{d1B1gB7M6<)3<3-c4h#%G
zwp`G^_*O*V{|6R^_Y4gG85s66Fev_ranOIqA@ZMtWB;5B4DRn3c>XhR>}O#3!@|(S
zz`z31net=H2mOotIUF1k9+umwi;A#ua5yk5_`zVI&mbalZyrN?6NBfxKTJ(c4_H`O
z9UKz2Fn_qn@Lzx-g^A%qFN4Dtj`EA<q5>iu4jc@c^BBP9ivM74(q~{7VJN@IAS%GX
z$il$zi-F-b1A{yR!xIL^oeT_G3=Gu_3<+S@^DyLyFnoB=@c%!<{{0LY-xxkTXZSDA
zkmAGs;eEsZ|1A6WJ1Eo?d`PhPFCY?F&EAyIz%IbT!Q<e-u%?{BLX<&-gMmY#hJzvD
z9fJVKdkQ{CLBQh3@S%<YoQ4FRNPOOT?7tQRLyZJO!Z8L81_mDqhWE!n>5?v32V@H<
zFEDT%VPNEt@z}87U^A<vM$Cx~3lFz*Gdj$<QLw<NTSzlVrNY61k&TfhYYvCQL04uD
z2>}^S!^KW4lB&B>ZWb-`nkAik>&VG~6#selp+W^aK0j<)%&ph8Wkt|3w<Q6yjXVq#
z9{P3!ipqsbU49<g?jhMG8(FgE+FG6RS*aVs7N6akd$-HA+Dy}bdcn&_N4(ARZtV*A
zdXIIE=nL0vO}ziVa9?}pcBD_;C~nS<hbgBfN~fzuif2EaHrJG2O{QY=oz|uL&0%W{
H6&S1m#jPIK

diff --git a/images/fabs.gif b/images/fabs.gif
deleted file mode 100644
index c39cf67954189fb90472d22c77f148b05a7de505..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 988
zcmZ?wbh9u|RA5kG_|5<Vf`Wn#3=RMP|7T)wbYiHJXJBz)aPVP}c+YU`KLf*l28Qnp
z5|#|dco-Ns7#M8WB|bD9`_IC#-+`e<z#+kcQ9y)&gM(p<h0n!z?*#t;ci6vw8T+BP
z4e!`l{yRAAXTA}|V8Os30@57e!fy7iLF7LR$9{(xmI@{YGl)bByN_kVTOOAG91i=L
zuCOzhH86;<FmO0*VRyLLU@pKS;^4rMqY&}l{Ox~{|NA-iUyot=@s5H0KZC=5h6^l?
zrVMo=3@jWB4iSzFW_1v)3^5W6Ovf13Mld9pF;p`=O5k7?V36ivaQML<7v8|c!ouL-
zz%b_t!+Q&c{~`?gIT-HNFlxVJVEfN-VF{z@I|h;e3>^CzBG?<v8s=~~IK+goGnqGR
z=-HzE?jqZN0f+q#2`mhDVAnG^UN~0wR*U671H)zp1`P%VHU<WVEi5b-85jf@7#tWF
zer&m*fAOt|!2b^{4DT5j6n`){=reGLFwD8Y;Qo$*=RX6(9~Oot1_l<8>XaW_KImWk
zFCws?!@(ipVY!{Us0bSehXccc9}E`y3?iVgzBiAdy@|nd-XEr>rUNW2tPTzdTbMsw
zWcV+@kix|9p_jp73rG1yb5Q{i4hIef&3O!9)5U)<H|aC5i!hX5WDpf#U}Rxn_{G3*
zn}I=|f#C@Q<4y(!Ee3{a28IN%yLlLLL>NB2XZZi0VgG)HjBgAdo-_QHXGrm3|M0%y
z|9_VK`yCW&3O*!Q{1*_}&%qH`&EAyIz%IbT!Q<e-u%?{BLX<&-gMmY#hJzvD9fJTU
zG!=Zn{)Z$f7Dt8;bqwHSB=AJy^Uh=cwHO#`Bp4EoG5AO@ygvp?mvq58AX`9rfq~;7
z10#ow$A$$5n_1a4Voq#Wc(|RLkw-v*VbRfc5mB!*6&n{j^+{`2z2PWYbYh~IcaaNc
z;8V|Oe6da{HwqM-XY%o8`TPh>IWb45oNt3=NP>T_S~gp+$CR{73;mUuVqb|Y4{39m
zskg;S*rB02Mn3K63*)TtNvYvord(!kz1taYEGt<px;kcw`Ae~>)?)9&_WI4e_P1L^
zC3<$vbfLCgLC^2)bC=xzMtetM#EkCxq`sBq#rF>7+s5CExm4_abeTLG3xhQPlM@_H

diff --git a/images/function.gif b/images/function.gif
deleted file mode 100644
index c60f72277df2b0bd21e3591365e1c86649e1d317..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 957
zcmZ?wbh9u|RA5kG_|5<V4Gawj4*cJr&cKxB=#*I}U%}##>R?kW@m~Mf|6qpw$qe6%
zBrG$J@f0v{lrZQNOMK8j_CJkbe<?#vo<l-1qd*A*M<&CTe4C4T?*#PzJEZSlmdWup
zje%XA!NHz^nPCHi#XAO({|p@aBTU%M-ZhB)XW`iI5W`Zz#9+q2Ai}`F(ZX(H+3=Q!
z<v)kRex@tz3}y`sA}kCX4qMnAE;g78u!uM~aKtEhyf=UQU*!LOj{VntSbn@?VE@nH
zu%F=qi=!z+od^R92ZKX|BZFBTL@Ps#1OwAChD{L+31$oeA`BcH4Al&A2^_2f4AMLd
z4nNp4!W&XqSOj`Pa^72{{udG0&%tpwhf(_-1KWRw3sWAMzGD{oFCD?&Xx1=?!@(gY
zgq_K}VMEOp?ROX1{tGzlcSvAiu!Fdsfq}vCz_GfwS}gw^9QHFXY-V84U|?WlU~t&N
z!g7&;L4bk5fq~)2mIL}1---zQf55`<o`K;%1H*m>2E`u?4*ConA`Ej5Fu1>C-~j~^
z1H&H{h9(9E7Lc}(A6q`?U);~(;E?dJ+)iCogpGs4fnmW91`B-#5s<I$&0}b9Vqjrm
zaByJoocD*Rsp$a=3yXt8z!v5Y7a9HwFzk0=2w`IQ(97_jg~4G9NBKo_Q2`MS2Mz|!
zc?@7{#D6e1=`*m4FqB_p5EWoxWMN?V#lUczfkB>u;RyrdP6h@o28L<|h6J!rco-a6
z{F&dEG5k+u*k8o(t(@U`5rcdtgF^{}O)A5Ch5!Fk_wTRRRg?KUp_m_>GL}^5H72Ap
z2q-Y{q%ksNGBD&YFr+dtD1_Chvn1#<2ox}IB<tGbGQ3Y=_@BwJU!UPiIm7!*hW|MX
z`*RqcWHRhbWYEfGa42S|(Pu~~XAmf2;K<%<qtE<4g<*dgDEU%`bwJudd4Yjr5d$NK
zjK_ur2b)=0HDXR|Sa`Udo6%v8$Haw4x+LV|&YTE*c&ty-zG;m{(UT*Sc$irXG#Qp2
znyTfytLNo}XNRWpra$uGEL?tko*gTT@5{|gPA#@>|J3v2!n4y|uCv)fcYR4eyHaGX
z)LgHxsaM+kTFXSUKWg3B=(xS9b=Kz`-)*U#`{r7Nq(p48mCb9Jxqaoa*%^2LrFu>(
SNIa}As2*lBqwsJ8gEasa+9M7C

diff --git a/images/getmask.gif b/images/getmask.gif
deleted file mode 100644
index f448b1aa22839cbcc903502dc9782d627f1f4fed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1096
zcmZ?wbhEHbRA5kGc+SAU#Ka^gC+FtoR+dz@O=wqBQ&SsX+p=ZLPVG7s#1(Yz)VW1+
z%fy((u3fu!N$i@JlGme0kF40NlGKuJiQRkk>Q$dxUmagvAK#=$V$a^adsoI+c4*Nt
zFE6iIa`QfY`t(Zgos^W+ETLJiq+Y2psg?Paef#z;&n&O5tnQTDsVuInI;A=%Hm7+)
zi?qbFqJp9hi5*)uZy6sS-#e*KYHDhWtQMWxbSjA}$xqAg*RNkjY)0$Wt>a_jTPC#X
zlhn6KM$^iSs;0$FOY=+9Q_?$Rbj;4ot|+a@kIS#Ct1C$=DNHX+jZZ5pEN_$0raq-f
z)7qv*iA8;r`qh-xWF%y?Z{NPSusALzE<ZcJD6Xh7rK*4b{#j{RNij*~<>k3qxz$<K
zX-R1v6FYV4*r`pMHr={)tEsBVOwVkY)T&FDE_tzesd1^vG0DZn#np*5adC026Ixdm
zSGG^;P?%fTq)C&C@`^S|ZDV6&%TmfZC3bES-?U#+zjkfgRi#yz6_<7F*s)zgyR_J}
z{(bv*N$T1;v2$f+Ws~|Qg>i-1vDvw?xs?@_O%s~N#>8gEX0}Rb)w*Tt?up$q5;K}*
zHY+JA$w|%W(Y;4OPC-g+N{^(TRS8x3@%il&+gDdtC&VNa#}#+(+&Mo#KQ%TrAt9k{
z+qT`icW<58rfXu?o=H8c;;U-nYf9rvTO_nhiAgEXDz8edN=r!V(4j+7QBnVX{p;fE
z`t<Honp##KSJ5x2e|l_2?_Rwt%PX74H?66z>73Z5RYL1lEnBrrZq==8w~j43)>PJ%
z$CVdk7vyE-b?(@?Jf*y<qAEYGAU8Izdt#5GxZ>>CoZ9%hoY>rE3C#=RirOc3sEV)7
zi_Pzv*sW($ubTMU(zvo-NxeHIcW#r=HYp~#bwZo8*z~3e&0?TEQ2fcl$i?uVK?h_N
zC{HkO{A1Y6A>$FCpc7tXBNB6BL!wwjk&WZ4CmWOw`_0Q(x=8i-qT@Q-m6laa)SBMV
z&tqKD<?*`Jd(zGfO&3n1MMtJvcwbuNarx?m`3{Abw1hV+pY_|)@UO;`n_+FtPMeE0
z8V`<M>Q$b<OiQzL)sgu-8Kz{uoWyX&D0p+i7O5|(>x?E`@H?x(E_8dTUi&fM*{aRU
zL!3Q!-LWXsh~GLdW}j~GG0lgEBVRqLo$2*1kw0Gjy)1`<ZtQN0-CQgTD~qGTB{MGy
zDRddDL@ec=_00R%HC=~|?&s%4?Pl9>d!y%jx0}@*jrVtC^Q*7>*j$*fU-2%}wmFqr
z&yP3$JXd>T<LBLXcB|R{by#52_~B9SZ1?%w%natd$=ucMvcK+YKf|Zj_vg!R`v0Gy
JPDFsg8UX)IvzY(@

diff --git a/images/gohome.gif b/images/gohome.gif
deleted file mode 100644
index a6cfab3dd368225d45aa4b7703f5c9702ebe7204..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1206
zcmZ?wbh9u|lwy!(_|5<VA|fIN1_s8)#wI2@mX?-IPEKxaZl0c={``yqf{Z}|j6p#`
z!9t9|!NDQIj3FT*VPRq6;o%Vx5s{IRQBhIR(b4ho@d@ILi4u&-$;qjbjH#)qnfgXK
zIXSs<jD>}TMMXtr`T`Xd6_u5h)f&w8hCKE4^-V7B&CShiZEYRaGCe&#y}iBt{rwZ-
zQYXfzO|oE`WXU$!ifytL`{c=!r%jtSGu~$A%$c+7SZCR@&6+i9c7oj;2ex_h<}F;f
za9N!3ic<eot5&UEy?X81wd*I=uV24@LjcEy4I4HFac$nbd26xf_HecxJ9g}h;@B0*
zu{(-=Pc+A#miWD?a{Kr1Ka{|6Xl~QtM9w3re8*BakEL>-IC0|ioT}5OPoFK4J6kM&
z_Uzen6JjrPdR^@CyLj>9rAwDC&(6L%Klj$HTX$Ag-??+=!N!gU4<0-`x&7h8hfgjX
zc=F`Q)BSUvp5OQE(30op_dUOI?A6WFukW1y@ZrP98@oO|yZ8O+g<rpZ{r~@8fPuk*
zf#Ju63;J(fi~Rr3v48&u28Oo`4F4Gz_A@XjGB9v3Fw9|KaA#oPVPIhR!@|(Sz`z31
zlk#KBJN=9QMFjS9IP7@%P+whLl#PwU!GU4Q4+aZ;1`!bk4vu>a4DDd$o;`n<%$poU
zSXek55}29aF)*aCGrVhH_|L+y-+^Jrh6H^x3sDgf4h{|m_IV5qO$;n73=R(BZ<w3R
z7}!B3G3>a*q5p<K^gjc~eg;Ms28Le@47V8=<QW*AFfi_9V9;V<sAgbDU|<jcIn+_a
zpZRSW!~ax<{Y4Dl${C&)G00~!IFvB>q%yo!`2Rn3|Ne^ZnoNU)Vnu-x29C@n)p?Bx
z=?nr23_NL!44DiJISdS`3=9fkHR>!0`V0aE3>?Y2KDi8UQyBhdGVIr9U@2#Km&x!y
zhhcvX!;?&gorw%uxeN})3^n=;3FQm|MGPF-4L<rTZ<87Rr!eeK1f_4hSO+8v$_oq}
z{}>oKWIQ%3aBQv>(u%pk-oV1ZqwEx7;dtOkn^22Q&yEjC^Sgv)S1nw0QQ5g)!En{h
zN6GHI%xa>Gw%l+(<fW<`GDjh?A^C8tf@%(D;De@%OguIRrf^(Qlw2g9<FU74%Hd0W
zvbjQ<S<PMH(jk@^J7!&2%wpu?<g)b8GF{OPJbD2V4O`dD+QPbP)4{{n&qgm1)`)3&
zF-3z#yjt>6Vlwj~2DV~OYgMBM2BJ1HA4>`!S~N8?GO-8z6nx~sp_)_k&2jM(6DIcg
zteZ9nENJRAn(>+Cp`z2lc`XG8ZmbYsV9YpK>!46L*}y~4I>txk!DaOwf&#pp`Z9?v
zJEuxly_nMy`RSlnsezl@72gwce|B3JpG!y-N<R4W%j@4;-ZL-un`0Q|FtNGz+Di4y
zWp}@RY?8_D5PZ<^T{1$f>CD0pZc_0ng0B25i_{<bbG>bMl1{5wsMs#}Y<oO=kWZnj
zsQ-%#igoO5GZNSxR35enyPq+5+%C6v2NSQ=3k7FR`)A>fToxvd2bd*uHZZdB3S2lM
TV6h~?v5vh|^MVs2BZD;nEqcia

diff --git a/images/greater.gif b/images/greater.gif
deleted file mode 100644
index d8bb1375c3999d3ab2935937e2268e6bba57b29e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 194
zcmZ?wbhEHbRA5kGc+3C-jEs!T%*-q-EUc`oY;0^C92}gSoLpR7JUl$Syu3m}LJ|@Z
z4Gazc|Nm!TV9){S0O@65DZg;ibM;<}*JpSCPtfQ~$(*->je%!tn6|>vo4?O}5@Bu+
zuxOm4T3#%|*gcamQ70+SZy~ee91|&Ljfa{`V-lSl8fO1|b?ENqV>uza({3Au`C6ZT
sCAQ60E10J&s4CZ(Gt$LRyp(}iGaysdkWF*)l&RCE&zL!DmLP*Q0Cn6u&j0`b

diff --git a/images/grower.gif b/images/grower.gif
deleted file mode 100644
index d33b2ea196f8381e34ea75397d77c4c615402ea1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1250
zcmZ?wbhEHbRA5kGc+S8eE-o%1At5O#DJCW+BO`M?>F9aSBT`aQqN1X@y1E~BKL7vV
z(_ftf)1<f9={o(m@%i7iPd}CK{FHjQO8SJdl(M>%?#~ln{_OkkN$Tr9se39?s$5)L
z#?sDT*M0il{Q9Ew`$baM)TQ-#d3kN5!oSS__B#6g2I=QL(ie23toix*wWRFtroTPz
z@uE-qzQ6PgMQQCkscW%PM;RCxY^0a@OP@87YGPz$WMX1sVPX0I|G$rqkET?+snkJb
zX|KQk|L)zj{lkY3#SIfuD?6eK>w+>${1UP~!jj`$-86OdrKK|Dq_;~;uac3n*HqVV
zb94%g4>LA4t}iOdEN_j=uL?;k$nf>|icE@ebu-n`m6CUm)>|c|)h{iltE;6WCogYk
zXt;dU;+gZOPnh1@-rw5LSzpsuRa##X79A?3Y%Aq7U)nTZTG`Mm*efYNNm^Q3P0Bbr
zIyx>c&fVQzI%tBlT}nYg!Ta~`d3bm>8$XSRh&br-oRgFD^UCk%yk4ZIr`OllZ`!m;
zRaNy-+lP-eUsk(5yjS#ot<*hrDb4TO-rGcOb@x0ntLDzerbkEnUOnIQ^?v^Qv(isB
zrS-q<d-o&h{voOBii(P#4!rplb#Alt@#hQf{xv=LSNg;X>0LrXLUM9)hjfnokvg3z
zUH3uyRj72bu(0r6>HGdt2`*CQwo+XNQsrt=8M4w@QtBnrCRtK0MTe!IdrBp!N^3ew
zm3vDq_me7Clh(G7j>?nTq#<o+DjgLqwNgjQoRyVTQ`%N3YKF9Hg{qV;2M33|y!_n7
zcchK;6qOaZxw$npHPh14PV9drt)8!>taSG5*`14@OH0?qX2ojhYHe(Iq$%BRZE0y_
zY^bfRsjRFdD<>x@DIp>v;;**$P~&qm=?N1J?>^e}$xUijq}0KC<?mmw`1*G9H$UlV
ze$vwuq_;auSFe<Q8Y?x|RNCXD^s8*?WqQ(<Z>2vqNUixU{jf@EzNWNxu~h#ushu5C
z^Z(-oia%KxxfuR4=rAxaFo5y|1IIsxVh$OP4GRu7a|m;ZC^#&1Zeiq-aQLuckpnxw
zlE(~(gNvLQ#q<&+W-1<F>t}bLU~q8LQ%(`h03neLO|IRuEuwb_2wYy&Gv9&#f`r!>
zh6~abDK;Tq0qp(D14;$H91MBbrV+FvWM`9Wcli3~T^5qoW-Fao7!R~aIv+bT)1=_x
zs>I97^6oOK3-=wEy!=7q{s!Jxk{j6<GT7Dfz4*cGp}4@_ijTvH@xcQ{7qzGh4;HGP
zWo%&=(oDMYVj`!<L@u@oCYqn0otw`u=drkzy;n@lAYjoBgUKvB>ny9;d~ciO@d#O%
zo_YB4^7{uHI<N1W8|}2>sii;w)4IrtoaW8T4?NaO?FzXnGf`ot#Z)iR)nWJliY@2U
zzUF^bEk`r$jl`!$vF!{6haIJRCV0!#F@Brwxa-ZK)0Hfp1`JKij7B~&nF5z392q4Z
z3-Fx~_~LF9pSkdiJZmn)LPw(;q2eYN9ga4eT-b5rSS{B{2Vc|c3Cf2VZwt6Go4YZx
zPI1-bIN)UQ_=!uO<#V0`-9Ai94V=6qmMuOfryaG0onb;xOQZFB1_RZptg=p>EJ8<=
b&-2Cxbu!p~ozb4=#PhJ?`8+0876xkoO(g!r

diff --git a/images/hand1.gif b/images/hand1.gif
deleted file mode 100644
index 382d9a103891750101be762c2ffbd6f582c15953..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1176
zcmZ?wbh9u|RA5kG_|5<VjEsyNtjx;dJjxP$%F@cp%F3ED{F+*tS~C1vG6Gt%0$Q?y
zT5>{K%2HaYGFn<%+6r3Q3fkI=+P0R)c2-7qR>t;LCT>OsZbpXQrgGjMc0M*5K6Z}2
zR=$4Lelf8zv9YloogJN>oqfGMllmsCF0tJ>w{qj$s!f$H2N(_<IPm}Q;lpRUJkNG}
zo}CnOuG{lmkLS7d4d=FXpWEJZesak94UOlwb)Vnfb7gwi)tQl3clTZ0H|gr-<JWe~
z`*6JH!@21nZ?65eBJ$hXq;Km}zHQC@z9IGdp5pIkCw{*)^ZT6@-yf|0{%Y-y^~pcB
z<^9-R@Z)s<kFyhhT$=gg@~j_M=KQ!i_s7kpKW;7kac9Mk`zwFkU-jd`>K{+m{rI@!
z$EThD|Np<h_Q>=dvk1F1hl4`|d!t#y91#|Vm=Ja*^9BYH76uN74Lw`5-(6(;FW|7>
zA%TU#j)6ghfq{d8fx&U@vAQc-ERqfm4h#%W7#MakFlaF_IBeN);NrWt0{{Oz?BD-G
z{E7b0og(a7A1*MwH)Z%Q!myu%K~aLi;XMP#e+G{I40D(m+!+{n7#JA-FfcS7V_?x@
zaBxWZ!SF$!!66}|-0q#I$bSxw{R{!j4DT5j{xdM_XSm0-rQPZx3!8xF1qLS5V+%yI
zSUDULBrbe-Z~Fhg$o~BtDNGMOFueWG@P9wUeuoEa<(BV6+1MF0nZ<u(H0i%%7y0k7
zg{k}^gQx%lhXVs669dC928P=V4Dt*NAb)IO+<B2fOMs!8fg#}?gTQ|Vp8bv@{><;o
z82+a+>@Q;YR?hIeh(SJ+!J&k~Czav7!vFuN`}bEIsLA}DP|Pn-!oZQaq&lxLA)P@$
zfq^HDks*_TA%}q>m4QJatVW$BL7zdOfPo`f*C&_ZeG0?>OosjX3@qggA2J#K=P>Ng
zVR(|surrZCE0@8cn4w0WA)%Z>pooDZd$Nx{%lj0D{bis8O$yclDOO-mU|`_*$H2%T
z<FR4E!DiNQjhGV~79MWrW^|atae$$vTS8ySK_T#w3%|S+Q^LokOHNLfRnL2&c$o3<
zMD^r4&zBpT`Q;qrOcFR6m-tLJk+xg-N!i__O;JE7=3!xC3rEPBCl?+Rw49%BJX0^_
zK|;n<W&T55yr;J^ajuc&wpp9ld}^wWPr-?~-H+LB3yWMZVl|l3Extc?+7St#9R^+8
z>Y)sGUw?alU)M{>V_Ho^5fitn&#Hi!P09>93!L*08ZF%-BEc!rwPRJ~#se1??#?iD
zy4}&u%H_C0@1*5whwTT}`xqKoHnz0drhfZov&C|%ic5k=zM<lyclxKld$nIu=@OQe
zIaJ3d@ZnQc83Ut;hJ?}*4j~2Wj57v~3u?}sozv_!p+T|ri-?3ws%+TY%&P)yuTnn<
z_^_~<PW0H#8<G&re~Vp&!8q|nLMxZyjhSsyQYRiZ7;!$i-63`?<x!hV)sKbQ8k0Ce
k($$Zh5Xok}DzUg*!7t-+FUzZrMM2(yKOQ$TGBQ{L0FvUufdBvi

diff --git a/images/hand2.gif b/images/hand2.gif
deleted file mode 100644
index 7b3748df8e54c10db1f15681ff0d1d250f392bde..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1179
zcmZ?wbh9u|RA5kG_|5<VjEsyNtjx;dJjxP$%F@cp%F3ED{F+*tS~C1vG6Gt%0$Q?y
zT5>{K%2HaYGFn<%+6r3Q3fkI=+P0R)c2-7qR>t;LCT>OsZbpXQrgGjMc0M*5K6Z}2
zR=$4Lelf8zv9YloogJN>oqfGMllmsCF0tJ>w{qj$s!f$H2N(_<IPm}Q;lpRUJkNG}
zo}CnOuG{lmkLS7d4d=FXpWEJZesak94UOlwb)Vnfb7gwi)tQl3clTZ0H|gr-<JWe~
z`*6JH!@21nZ?65eBJ$hXq;Km}zHQC@z9IGdp5pIkCw{*)^ZT6@-yf|0{%Y-y^~pcB
z<^9-R@Z)s<kFyhhT$=gg@~j_M=KQ!i_s7kpKW;7kac9Mk`zwFkU-jd`>K{+m{rI@!
z$EThD|Np<RWs2#=w;}@nIUM#!uwOT8_#wi=&f(w?6LNvc+>}8?gn@%&L(dlNcNf|I
z3png|NMK>GV_*<rVBlb2U~s%}tnRHA%YO%l{R|A785lGe7}yvX9Ja8qTx4JnU|?`y
zVED1+g8s#~A6OXPGcf#TVA#*Vp!kEqL7#yGWH7^=3k>e>7<m3OaO`Jb_`}Z7)WE>P
z!r<VL@+0DdzQunLk^LMT4hauu+Nq0*uyJrWFr-Xju&}r{kD<K@qL9IJ9t%?w!vYot
zRtJWJEzBP-GW-`{*zdrQ!o={Qm*GDPgToe?nHSAP1w=R;I2bhNF)%bSFtCXKU~bZ9
zU>9L<*upXMB7>*^1BU|xBMSq=F9wF&3=HyMr$1p}+{wV8#lTR_z>om;4-bQ*h(GiD
zGKT-D4Eu{1zLhgPFJh3-WN;{9@JVHOukinW>i+!|`)V?OClvDwlrV5)E~(CIOh{)C
zP+;ImV`Ru=V8~%$NM&G92&++NNzi8yC}7}7*7eC{c%Q=XKa*j<J_AcR!-q_U|2Yi%
za~PgvGVDxb(8^_SC}yb9XGkb#5GZ2c$e!Y(&+<NnVSgDYaTCHiAO#8x3JeS!{}>oK
zWIQ%3IM~b@t`T!$!@|Su+>8!$I1VthbW7+fIVc1^I?~P%Q6uTODdl*-g6p)HN}<%l
z6SO1OeRyG{<kV!GZPX$;ImLUfap<={pMurTFLce8`})#Y{lWqrMw6wPAsUw_ddBJ<
zwfefaonL=#(a~359=6FD$-EKq-m>~IpIrq@<;4a?mTf^NgJOTQoa&cJkZcpM4#+>u
zA-E#q<idjwIku^tHY&KV{nSME8OF);Vj5X4&14n0zQOUSmzbJG(CTA_$zM3RR6<W&
z<6fXIuD^Y^PUpeh+w(=l-OkOsE9j7UXUBF8&jWLQGCt?jnIf?65%<TL3>z};?_)hZ
z<$X{>qe_4V)2GtL+uO@8CN0@3D9$a?WDvi%;^pt~WfGb591b1Yt$o%lI-VtHB8#Ab
z%8f%Tf}NprOI;GDD~R~IJZ#~UNib_*$eyZlyIqh;pn-{tN6|&lgJB~xukj2AhxUz;
o-yir3c{Dh3aV~3cOyK29jc}HjFoV&<oHt~epWU=AP7Vy#0PuOY-~a#s

diff --git a/images/info.gif b/images/info.gif
deleted file mode 100644
index af52cdd9a8945497fdd34b02866f9f241a3817ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1580
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
LhaKD^0u0swx4;PO

diff --git a/images/info_20.gif b/images/info_20.gif
deleted file mode 100644
index 83bac5312fd6d536f4c0dca1e8908cee059695fe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1258
zcmZ?wbhEHb6k!ly_<oH61eo}F+1a?cxfs}GI0PhRq@@{nl^J*q7({jW#FZGttVNYg
zG}JXTH8nN#EG+aCjSUT~Elq80Z5d=-8PvU44Z>NB<HRk38H|&eEK^ynGxf|IjBVT)
zoC_FSYB`+?czkMD0_u4K>jm7irNirV!|IIu6V2mleC)K`?2Mi4tv&6G+#M`jU0l4}
zoV>lf1N{60`~rdl0|UZi;$q`sGxCy?lC#s3Gcr;#Gc$|x^2$m|YO1OjJewFp+Swv{
z_`=(HqI(&lCi2Bi6pCt>2yT>(=@p2dDwr}=D0_}{>J*vW84Ah$`o;4M5}Qquy6v+1
z><Xu9moLz(Uuj&vz`Ay+S5co=>9pXY?%?t%(RH)y8tRRjRysGW^yyg_-m@}d%C^Lo
z*@=B?ayk~|O<a{ScUQ*jT~$+-*G^ekHEUz~qP^LR_LeT$J)tV9p|WIhUDE94n1+VB
zDGh1UT5@N!7tQD@pV?c}($UsGp>JAG<CIBVbEox8o-%pL?0Iu%Po6n@X49<oz4KSk
znX{mI$*u{@cFb75eZkEBb<1Y1Uom&Xin;4nFIu^J_0rWFx2##TWy|K>+c)prwX<pE
zfzD0GySAL1vir=Uz2{c!Ikn*6<u#|SZ98;o<MGS;PF>x1>GrOR4~`$+apusb^Cx#-
zIJW)C=_Sw4uY7cV!}Ck)-(Ok#^x~EmSGT;pw)@r1eV?x^`FMT9$J^UK-`{uOz=2bz
zPF_8C=;DR5H!dEzfBn?u+xPBVzjXKJ#oM=Tp1kqk+LO2UUVM0T?ZmU&M_=DL^7j6j
zXZNnXdvyBMqs#AK-v99E%#X)Me>^|;;pwH1FK#`0{OIk=M{nP}e*W&$`w#Emeg69S
z&7&_LUVi=d<@?X?-+uo1@$Kv1e}6%VaDcGlPZqGvIv^61Cm1;XF-X7IQRvLx!)cIk
zpn>slD>pM=#g!d}kK49pUR&c@m6AJaYv#2jhRVju(@e9k<wZ<ZJ1e!=@!Fcm&1q+6
zncB`zu-WwNP21MY^LnW#7o~EmXJ1(s$$Z2|vd06YxJ|8BH+D9Mt!9evEK`U6B}XR(
zK5jELoHZ}>(3ZAS(}fz>L^fYt?A|BIT(&}ROLwni_U=gxnU4-mFwMSN<oHN<VY5W+
z<Xt?5kDsy&D%l4-nH82Rxz1mRW6H@duAUOwVbcU0gIt`IGcGM)UA<N5;0({;DRUmC
zp5+u!QP%shQ<V3XLA*9oOy*&h&VIjZa~K?j4mrt3U6{oC`>N9cP6O|j6E!bV-gfjW
zNgFUsnwlfAAyl{Gg2F|WjwNZ=bUYaY54I^cES$jjdudlIUn-B8#6cleE-_(li$8@|
zR^M13zcS*^2D5I)Rvt;C0EZ6^{7QlQ>sAJ}Y8~axzLs`YW5R=mCb4Rf#$R7whiio_
z0VzH^%hXc;-h;>`98=bZt_qkcW!iO=H~aFk$mA*PQo4}``ecp2oeEtYye8<*2D98*
jrfwELUhFJB?k8(i^6WsNF#92hVn{TCViAH_SQxAU^>!XG

diff --git a/images/info_menu.gif b/images/info_menu.gif
deleted file mode 100644
index 267fe64fe8e21e2ca31eb157d58209c688a6a2c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2152
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
F0{|^8LeBsI

diff --git a/images/inpin_red.gif b/images/inpin_red.gif
deleted file mode 100644
index e85576af15695dacabd7bbd50e0a8b8ff6d9c69d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1050
zcmZ?wbhEHblw^=(c>awc$;ocFtl~Zyl^t?=I~5fUORFA`Q$8xIep*iIvXtrxS(5`Q
zs>hVHk1OgOQPJA3u5naV=b)O&F%89&s=7B76wj)up4X7NsH%BJUFWi@${9_KiyCU{
ztW1yUo1N4*xT>vwQ&aP%meyWVhg;g3n{BOkSlOL5usv&Naa%|Cq>06OLyHr}jwemc
z=DPczF*QA8X??-aai@dLWiy>~=4Q)1eP;T{oU*k&Y2$s<+<JC!$O${|oo>DdTs)sx
zn4fWSd1_%XGbV0pK-i3!^!bT-OA<5Zq-L*)Pq^h7dCfO`T~gNKjQoc_$#;T6wkH<O
z&&yk#mG#s=<9=AggOIfKd1cq);~H9;Yg^kJTAN>lr=7?sIF*y%-QC?gdE&yp-t$#;
zr>i=r&X_i3){LpMW?X1)oi%^XrLL~c^JZ<FzvyP)#LWv9EnBv1-@N7f7A-ioeDSVz
zt8Oe_vT^&?O*^)oUbkw?&TX4^?cTa;=eAwjckS7JYWtRBhYlS)dgT6*Q+H1sJ9GKU
zm8(}@T{!vr%Jp0KZa;o>>-(*%KW|-pb^qayTQ|PkdHUntttZc)Jb(WD`=k4xo;-g2
z{Q0X_uf9Ef`sVH1?=PQ!e*5nIhY!!cfB*dH)2Gj$zkmGn<?Gjv-@pC+{Nd-fkKez2
z|Ni~k*IysL{`&gk$B$n>zWn(4`_J$9zkdDt{O{MV-#<V7|NZyZuWx_<egFIK|IdHF
z|NQ*_^Z)mMfByaY|MmaBKY#xG`1kk!?_WRv{r>&;_qYH5e*F9Q|M%~Ie}4Y__viQD
zKY#xI`u_j#_y7O?{`vR+_rG8N{`~*_|Noy~zyAIG^Y`z+zd!!}`TgtPzkh%J{r>mo
z@83T^{{R2~=g*(N|Ns5@|MUOfzkmP!{`c?i-+%xA`~$(ie}4b_|M&0z|9}4f`v3RO
zzrX+f{{8*`_y51YfBpaW@9)3g|Ns2`_vioLKfnI}|MTzvpZ~vq|Nr;*-@iZq|NQ&+
z=lB2rfB*ge|M&l&|9}7e`}_aj?|&fh|L_05|Ns5_|L;G3p!iSJxhOTUBsE2$JhLQ2
zAtWPJ!QIn0fI;ym3nLf9e+C@}1_lODW^v%S$MBz1MkC;&tXbN*HHFRT{0G|w*!ctt
zk~*7>1dZ*sFsn^C*3T@vlJV!npoxsy6ErfMCM{4<kTYueaWR>NLn1!PuII3;`Vlub
zIfV%dhnZM~>T9@4oEln1IO3*o`2;_1ViOkKBoZW*DY(dt;R%mYO2@=2^@T^~)UH^5
z>Q;Sal*@|+%-%eFCO<S-MV=gBk>SkSWBGfD1D6)>mNlVC4y+<<$=A3zA3Qq2WD>Od
z$&JP&<~DwtWipq3c6fA(+s$y<Xz1)RX>-Y%FO}K_d^26P{6EM!`FH$W?Y)0<6eR^1
FtN~U?nPC6`

diff --git a/images/inverse.gif b/images/inverse.gif
deleted file mode 100644
index 16bed0d8cf7badb4e2e47d19827b782390b3db82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 957
zcmZ?wbh9u|RA5kG_|5<VjEs!T%*-q-EUc`oY;0^C92}gSoLpR7yu7?ZLP8A;4gdfD
zx6C}oQ^3Gc!eCP@@j?IC|4fGcc?>mW6BANx1d2pCiaEBVuDqycBaklYkjb$ut>CTt
zTXy^Z4h;L5Z^SWJuri29GjKRWxUieOYY_R*!m-~WhNXgu!Hj`Hgn@yhh26)p;Vlo#
ze-4NJOjp<$%o-R(Shlb`Tx>8GU=eX};K)&kcyIppzsUdn9Q&`wu>5$(!2X}XVL!tK
z7DrQtIuQmI4hDw^M+UPx1`!qp4hM!92?nNP3>zaD63iF`L>M?Y7^)ebByj8$V9?@W
zaQMN_65hbT!ouL-z%VCd#e0jS|03-BIXLdt9MFFEmhJz4hyD96EZJxJE=lA+JI8*G
z2=+#^1{)C;Q4R-=n2?D~<~9r>q6{1y8+x{Azq`oxU%+9%Ljntf9mF#X3=EDJj@7-@
zV)^gju%CfpGXsML0|OfagTodUmWvDw0t^fe3=BWET+qMxRz%?c2Ns6+3=IDn81^$T
zDE?q@&}ZNfVVHA)!TlWr&wmDv{R|9$SQwfZ7+65sQhsdtpnvhdh`@dh2Zw}*<#y_#
zB5WKS4h#!^Fj(j_h=|;q$I#xy;5qLPQ&ZCe78X_qhlDN6A1*Td7hu@$z>vbk@S&IC
zKMRAy7LM|Z=Ar^344U&8z^04;U~bZ9U>9L1zsMjez`)4D!0?NK;Wh(<JOjfM2F9HX
z3|b5f)eH;?U=Q#xIEwf)zb|9>pUSYmh~Zl~!}B5r`Ai0f5(b}ChW85p|EKQXUopQX
z^LIiqzd#8CN9L01yvBrd1_1>Io-{^=Oa_J=28L7y28FO1b(REu27v+wj$~b*T!!~4
z44|~7&%jd7@FA1oe-6X`9EK;E3_BAUv~n37iWzG384}7F1d13qvgiBgGrvz^*k1-p
z#N=WfkVa5mVBlE9z{nxvv0=f%W>!g!m=hZo9&YDmbg0oNNOJBJQw}?`LLk|#NyfVE
z&5MtZJ=mlzr~TPcl;k~KUvr*MW|4|-x1nrPh~y=O^OKFm^(4Huthl(?Rhi56)RvV&
z3(OX}h3+g=@LR>i&!KTZ!QtE-S<w=c28O4;Z3%%!E)9Y?QCsp|Z}qG$dlxcYmXoDb
e^Wv(Ts|_SoBqj(L#81k9=@iN{<>Sc)25SIsyAp-~

diff --git a/images/less.gif b/images/less.gif
deleted file mode 100644
index 7cdd74fca35422f87d5d919fcc8b65013587ef38..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 203
zcmZ?wbhEHbRA5kGc+3C-jEs!T%*-q-EUc`oY;0^C92}gSoLpR7JUl$Syu3m}LJ|@Z
z4Gazc|Nm!TV9){S0O@65X}ECGbM;<}*JpSCPtfQ~$(*->je%!tn6|>vo4?O}5@Bu+
zuxOm4T3#%|*gcamQO8OuKs+#Gi9(0)im-BK0fTdEwjI36df>`)2{oSSnztWDoBs~G
z_C{^0+iv%E>mWWZW^1S96k{vShTzPs&RPa$mBQG5RYNw-IdkXDU$Ah|;>Cgt)&ON?
BKFa_A

diff --git a/images/list_20.gif b/images/list_20.gif
deleted file mode 100644
index b26ab878afa72193d8a6031962d64e61348cbde6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 743
zcmZ?wbhEHblwgox_-e!e0<xOw8XBf%W(?M$QUSU44h|lko)M9e85tS1wYB__jneUb
z(uw`j8B?VSdt{2{%2X|pZCn-Ey)1V2u7p|J=k}GYoL;kfPV3rb)3+_{+Pr$s_Kk~o
zUwLqT+r+E8rybb2>i&^AH;*p6d1l+)OM4z3oA>C<%4b)1p1*PT_O%m-Za#f}`^e*a
z7hXR+`{wzL4{slQ{P66{ukRpN5r-9jvM@3-7%}L8luIy3Ffg$FbC~I)Hu+?V5s6d-
zl7?U(5w2F(g#j8O5=UJY21GD0%=B5-aWrXTgpOD@j1pmJ@LATu$lcR+_+f#A!UPW$
zrHM94Tnr9s!3QJ|f<hBr5<r69dlC#Jc-Wc`f+^-h3F}!H6eg?2tq*U1RCO?J{q@&h
ztM<l$1r=lTre-;L?2G~Vih&_Q52R8tYTc<N3_Jxv5J3wCF(!ryCk57C>k>GT6Qq3(
z<Y%)bV*fy*d~2_EZMoSKwpz5)#cE>E>Z^<#3@1|BuV!vlnj5zIYF25~+OXA^UokM8
zNNKzLa>=3|zvY)-l~~R7TYdQ@NU-_x%H~-DF3W`lz?L<<FkxUw*>vz^$V?q331P4p
zLysFs(5UgGiV};C_(YH5oiTdiXO62dFr*kQSP-IBsVDBg^2^T}yZPsrhX^q+7)d%P
q2yn14HNq(dkRZe`2<ZT!7-ssgL0Je2DR$5!7dhtGK$4LH4AuZ(u?;!^

diff --git a/images/lock.gif b/images/lock.gif
deleted file mode 100644
index b63a8667011bc7faebb2d9150447743e1eef3f9f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1124
zcmZ?wbhEHblw^=(cz%mP!?j-8r$gVP$j~!S&aYq3qtnE*RL`f@#J5yGutGSt$1tGD
zG@!!9zt}x6#w=i>MablYP)ob0M*G-4ySQG{xK(-4%I#qc_6d_Z!x_xeCRt{eRK&`5
zMlrZ1PjFA}aZR4$l03a9hM_->!6j?v!~_Qa%pR5M&CV62R^^lDq%j!OEuWXc;9I<C
zUN*!0T!w{t49jvEDryXu<TI?vWmuWd;L%&SyokZFYsZ>W2KVlD>nj-6RWZ0sTpruJ
zCv!rw`{Yf|Q;#@L-{&)9b?S`5&Fu_sb9W}ssYsqv?>qa5$Na;~CWxlatIL_Nb6*$3
z{vHOuIZuNY9xa-@H+a#p^d;>X({68{&QLvTTK?P(Da%$?&pMF5t~+zlo%-3wir4gK
zE<aU0|48-H1I>$%b?<b_-gM~VVutc{hf3BT&0q1qX!F6!4Tm~coY=jEp=|Tf^36wT
zw(hOmeynZN@wo@=TXxUu++V+YA4B_|Ih_Y<diK|M9%!F(pty0@scGxaPTq8;Vc*H~
z`xxeJI@`MIL;s$8a}O+@zvEK-zHgmJ&uzG1xb~{jlHKR$9K1Mn&;Nz{uT41gf9{b>
zGml@Hf8@%VeV6ARyR`7wg>Od~)*rmF{P>kw$A7Lpc5U<FYco#$U3cu}hGRF^oxZu?
z?Egh){;$7$=lvaq{b%m1zwm$mg?k4s-rj%l{(-Ca_g{Uq;r8ooH@=^|a_{i9C#SAF
z+;#o`;Tuo(-u!U*){~>Ro_u@DaOlSW_a7OK-ui#+{^N6Zo*%vc=hVaJC+~kdfB(h#
z2Tx8ues<;l%QKH(pL+QJ^rK&AAN{)c<i({YuP;7(dg|%_OHbea`^|9q@voat-#mQt
z;lbPgPd<En@#X*fFW)|X{r3Lr|1V#@fBg3K^S7^GfBpRV^Ut53KmY#y_n+=S@t>%3
zQEFmIYKlU6W=V!ZNJgrHyQgmegW^vXMlOc`3_1)93=ConVhju%{}}#r%6M#8aIl%_
z`GuX$$N8LED!F)tm*q_9YiIphG3lDl4Bd#vpadC<7c(ascJQSJwklmY5j8#NriWXw
z-#XrUw{yQzJQzhxw(NMrbs#N8);GWE$F8NhLPktR211sGsVC$Tt}i?JYRSSw?d|Rb
z6D*y5qD?Z+bgf;;@KABGXx#&kORSoH5(c_LHWe>iJ*5LqZ?XKHx{AMzkyS3QbJDYm
zn%Qd%1TQ%;9c*e3nY3eLijK5?;M5}(1_v61oK&2ySah|ny}HaL$cZB(fbC(wLYm0J
zRo}XV7pN)lSyVJ#;F_S{Q<Zu+R4aHoCxgz1iXAN73PD%GTpvAlc485?meaJ-ELwWe
rFuZ%!j0Xppj-8Ov_bS;j!SM)(sHq#@nL=f@UJ2tD>IsgFj11NQIBSgQ

diff --git a/images/log.gif b/images/log.gif
deleted file mode 100644
index d570f0b3b343001eb91c3b40427b27749bca3e6f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1640
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
JaUlT)YXJC<<h=j@

diff --git a/images/log_20.gif b/images/log_20.gif
deleted file mode 100644
index 8191b4af41ee5479589b794b504fd42df2a72cb1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1258
zcmZ?wbhEHb6k!ly_<oy#L6TccL{wHrno&!V!9bot--N+bfz4Ed!B&aEMvvE2nafU_
z(au=HTESFTPD5QoM@!4j$kf`>)YjIP!9|DJ)ttfGl+oLQ*VBR_!dA>dS=v`q(7{g1
z$DSe7fg#+VDaM&K%7-(;g&{nQCq957(Tyd+n<?9$KhK{bEs7;8h^;(|xjKrYAe^&2
zhPyIOF5g+CB3Q60jxjq`E!W*7E!r|I%GJ)?!_LStRxB`r)7`;5KG4!RK`J6w(z{YS
zCB!DbjxVK1ys(JF)y2ib-O0zx+dniYz%L*uFeox0C@wB8CMiBS)G0a2J3TfeJw75g
zH6}SZIXxpOGc_$ICnv9<pfD$|sHmu@w!W&Ow5qb2r8SkWD~F-0Ot?8sq%~K(Ge>f2
zxk6{5*|a*<#dVd9TnSTkGnZQXEspYC9bVT^D>SK5Xi=x+@^-UzldN~lah%y4JGCRP
zySZ*sPsNtSwdc0A)Rwl^SM~KV^iO7<J%yobrA+g7`DrV8W-VY_wT5f=28NCM1Uef_
zS1t9PcTjol0omP$xexAOIC+HW<VDVB=NKM8U}$b_>F#Xl>h0;7(%v>_ddJj>6MEaG
zb@xu0)-h>D-^9riC(oWZd(zZ-(`L?{HEGVAIZaFEO;|L0@9v(3ix#b1wQBFWb(^<r
z-m`tv&ON(#ojtMb>Y2Tl&u+PUdGEE0CwI&{w|~XS!#nSu-t^?i)W=6>KR&he@!8cc
zF0FfZdDD|CdtO}H`0Cou*EjbbIdb^;sS~G8ojh>!^4%LpZ(P4}`{uQKw{IMNa{I>5
z509=Ld4BWo<J+fR-#YZ_?wNNFj=y_w`q_i4PafQP^XST(C%50fy!GM9xz8`JetCWG
z$>Ybbo<Du_?#;Uo?>@hM^5Oma&tE=&`}zIP_b-3{{$-#eQ2faPwoL~_g7O3d$3F)7
zkcmpECs~x;dL#^;T28Pq3T)7ssN{NTTh8qbji<KhMsLf#xymzoa?15>xwn_(+}_3;
zt(JRx8w7bT>*=}G*4woq<e=YK$D`g;wL(_-<X$fEm6{ZIdsWG<03~J)ZV>?q1p|f#
zJ-@}9-YNxgaW7@j^P3@{$Q01b#m#4P>x#$eDJqQXE?91KI@-x^FY(gj0K;KHzuPqv
zZ?QCXt+UWc+2Wv>(LayLQY7W%*4$g`!-Q6KY<l?gbdOWLnZ~I?4Sx09>uWS$mmWT)
zES%x9!gEO?%X|mNKQ)uY&PHxdv|i=%YIBB%lDuNj9LFsW4lPT&IKxnRn=_YzlL5~O
z&Y6mjU3rYTjbf76bZ;6aTdc`=bU=-l*C27<j(|ia7PW@sGgOt!vfD*HjqYqIR9?m{
zZlLGa(BQ%|b7Rz&f|!qA*!pCplkZ)5snFar$7^fP-9@V0$3@+Hy#hNQte7&1W1)lS
z%`05fbt5;;@;EpxJ6un#?}NoG6OYpi99O5DoW#oAF(vo*w#3_;d?Gg{9?sfXq?#SJ
zCSrYq$IWTEx3{=mTV&`w?aU3`=*>w7tG;q|Ov$~uEl^vC^^~xN-yDlfrX`-jat<;q
HEDY8F3d{;e

diff --git a/images/log_menu.gif b/images/log_menu.gif
deleted file mode 100644
index 47b6856430d9059fca381849a3e8a106a27fb832..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2277
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
a*Ceoe-#8@oZ9|9enk4bl5&KwJ7_0#vQBht1

diff --git a/images/mask.gif b/images/mask.gif
deleted file mode 100644
index 69ca60ba6bef2cf16f0f46087d43dce919b8b5ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1302
zcmZ?wbhEHbRA5kGc+SAU#Ka^gC+FtoR+dz@O=wqBQ&SsX+p=ZLPVG7s#1(Yz)VW1+
z%fy((u3fu!N$i@JlGme0kF40NlGKuJiQRkk>Q$dxUmagvAK#=$V$a^adsoI+c4*Nt
zFE6iIa`QfY`t(Zgos^W+ETLJiq+Y2psg?Paef#z;&n&O5tnQTDsVuInI;A=%Hm7+)
zi?qbFqJp9hi5*)uZy6sS-#e*KYHDhWtQMWxbSjA}$xqAg*RNkjY)0$Wt>a_jTPC#X
zlhn6KM$^iSs;0$FOY=+9Q_?$Rbj;4ot|+a@kIS#Ct1C$=DNHX+jZZ5pEN_$0raq-f
z)7qv*iA8;r`qh-xWF%y?Z{NPSusALzE<ZcJD6Xh7rK*4b{#j{RNij*~<>k3qxz$<K
zX-R1v6FYV4*r`pMHr={)tEsBVOwVkY)T&FDE_tzesd1^vG0DZn#np*5adC026Ixdm
zSGG^;P?%fTq)C&C@`^S|ZDV6&%TmfZC3bES-?U#+zjkfgRi#yz6_<7F*s)zgyR_J}
z{(bv*N$T1;v2$f+Ws~|Qg>i-1vDvw?xs?@_O%s~N#>8gEX0}Rb)w*Tt?up$q5;K}*
zHY+JA$w|%W(Y;4OPC-g+N{^(TRS8x3@%il&+gDdtC&VNa#}#+(+&Mo#KQ%TrAt9k{
z+qT`icW<58rfXu?o=H8c;;U-nYf9rvTO_nhiAgEXDz8edN=r!V(4j+7QBnVX{p;fE
z`t<Honp##KSJ5x2e|l_2?_Rwt%PX74H?66z>73Z5RYL1lEnBrrZq==8w~j43)>PJ%
z$CVdk7vyE-b?(@?Jf*y<qAEYGAU8Izdt#5GxZ>>CoZ9%hoY>rE3C#=RirOc3sEV)7
zi_Pzv*sW($ubTMU(zvo-NxeHIcW#r=HYp~#bwZo8*z~3e&H7J!p!k!8k&EF!gAM}&
z0|O{eFmU{1*vuj0v0=f%W)5Mkm=hZo9&Q)l?dm!q&@SO5r=fO4@wf{ss}#Rq<RYc3
zs_KfIP8U*}+U4WUPHI_lVdZscoq{Q>UB{FKmk9|d&WR9C;g=P$P4T($bop~5+sFi;
zEQu_SwX4HFe+gha*0echc}ed=5mvFon#(t&y>)zht1ok>o&wjjXKuY+{7kWTj~<HB
zO1(Dgqu0}3F2iU+6^7)Bo?};Ic#0x4o^tR^=Dydl<<v%|oBRn4BD)Sfb<mw6C-Lrq
z<K=}uvs~TQ6*z6;YSd|w<Z_sl7<FW>cKfW1iHCA#<)jG89d%rC*qKv?#aJgYfSbAB
zdUu7Wlp>F}cC=>MmqZ1F+>6_^7?M~XT$qy}Atdq1Bzj9m%Pgm!w7q6WyJyW#X@Aln
z$G{>tQP7dS;-jN(z@3jwrcFPTI<*8HlAC!ixFj&>TMKX;;F&A&<e-d00xK)ql^+U6
zINCjud9^q_+8kL}*c{lLw##f}=L&F8WR{&*QpjO`MZ?uw)jFk#jX|M+vC(Pap2T)T
zf1YADL1h&OZ{sT(i@TIo<y>lG5DqOl-I&soaKgk*#lb<Zi{ZjC?c|Irr^V*D8XV%X
z31Q@7PhaBVDYYu6@g7&#nu`uzks`@Q#Y2xova|ae&0=L`-E-)mc9KK-O9wfbA1_xd
LnPwH>z+epknMp}M

diff --git a/images/mlog.gif b/images/mlog.gif
deleted file mode 100644
index e0ed411d2815ad7a00c78936baf6973588cde06f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1002
zcmZ?wbh9u|RA5kG_|5<V4Gazc|Nr05z`?}8<HTSt&miK!z~RF%?>$4)e+HKQ3=ZEJ
zge@5uco-Ns7#M8W89y{I{AXd<@4!$akdt8XRzT!G2gm*`7F#a9yD0Eqz+u0`GIrj#
z4Gioo3=R$q%r`g~EEpI>K$;_5D$L%!75V?4WB>jb7FH&PzYGkl3=9q}>`ayoy*w-|
z91adlS1K6HHZq6^FmP~eVduEmz#zcFkfR{--kjmT2*Z93hU+o>Ki)C0|7UR6&v1c-
z*A#4agd>kx9fJr91BU}cj06+Yv0erSmUR(M31(RWBJ3O-9Mudz5;*h)7({p&IDW9p
zgf}p-urSOC;eT(zaJPn6`yB(@e})T7cue0hi2P^Z*v}BbzQU~Gtq9A14u}0QAtg-a
zSqviV8+v|dztd;?FXFJDBY~ya4rKKM4hB{R$An{bc3LbV4h|d)4E$SI1THc#2rw`>
zFfjbs!mED~<eLvHLhl(E{xdM_XJAnLk?Ww(z#+oG!ND-+!WQ>;Z+ZUzXZT~r&{W94
z!p`8pk@7?4gMR#f5#jwD91aPL<#r6BA`A=*8W=1#-kW!%z3D9r%YO%l{hsq|nVM1`
zu&}c_a3pNG@Zn<2e*xkB4jd^=0v~!m|7ZEX-(kPQmLugCKZpwaXV6S$V5nhW;1K_j
z+oaFHF2dljg`xZ+gQx%lBZ~k7!)K`LehDz#{>&f`4&Nsxj5|LtX#HoXW?)DFdx?i3
zM}*<Sdxro28TRjI$oR(a;W@*9d4?1p289}d4+)?D3;f^Du|Keyy(yuAU4Vsy$H9SN
zO*w;wD1!(G1BXHl2SdU;1_4kIEBLT5z(a(^k>NufBvlDKk@&px*ncesh8hWmgkuao
z5)AK;fs!e0unx#rP+nl*IM2YyA>*-O!NF!$R*jew8x|gJ=Vo-6<1umJkuG6ojVm`k
zD7m#WTC~0SA*gb^SDm#&M>8SCdAe5QA|K1(ho|}t;*0h~8mgRawF~`pX2#^ifJU9}
zS0YhH8W$Nn3bjn7jI`XA8|I$dl4bnrz%&EfxGyI~H60g59L<Z>49mIIk*(`iA{~|#
zvMJ|nooGksi@U2h_y1zOAg&j&f>Tk5?{=y7(Qc2|QL>gL@9xhx)ppk5nX<`e!|d|9
gXKzA`11Gn+FF%txYtiXNYh&|EBz|u`)WBd30K?xe8~^|S

diff --git a/images/mlog10.gif b/images/mlog10.gif
deleted file mode 100644
index 4c64ac7dd8b8fa4f883011dea48ac36055995a3c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1011
zcmZ?wbh9u|RA5kG_|5<V4Gazc|Nr0bz`(@d=)_Pb&%olq;NZg`@t)z>e+GvA3=H2H
zBrF+@@h~uOFfiD#OMGZJ_Me5JMu0KFf<ZupfrEo#i-pO>cc}vZ1swKsEMqr$+mOo6
zBH-Y_!F=NhgT+n;5iJG|hX@yTvv&<5|5-TpJH)V5Ffo`hFo-ZPaI~=dST?-nVfoMD
zu%GD)JA+vRg9ytOc87}%<^n7tISLW)&ENhP`M;lI|MeJ_AMY60|1&u3XSl%PXv$D0
z!ob48;1J=+U{=Q<!otAezz`$Bz;ujZ!xn~wiwpt+4Al&e5{@woXi4)pIQ+N}8E(qN
zBEsOn!7!(X;r%;?|Nj~G?`OEn#-RO<fsLKP!GYld^B+@&cOne`IT-dwurrx8FvNry
zFqx+^hzKxnaBS$=qW$h78_1gu2`mhDU=J`ju02+FMT<q!!NGxn;Ryr7P6h@o1_p;M
zEC((!ycJ;h@4&GC$CfAh7k7#XXmL0=d|+XC&%mJggTX<cfkT90&IJbdcMLrL894Sc
zF#KU)XgbEgqQ&6gkn)4!gFeH55r+L73=Rny<#z8xMgDVe>}OcO%wPewn1kWoye;ib
z7g<;YJm)bmH644vqQ&aqkg(;#hl{5F1w{5caHKFj_|W_IKg<994*MOpu$5nYCn~_s
zpvf%$Bcn<G9lOYXhb>Iy7a2qa7#LX?7=AG@+-6{qXJ7#NV+-TXiws(z5M)Sr#~|>Z
zfoFe?i1>&1KmY${-@o4><J*M~&rSc!i=_Cle|X>U|38aDO~Ho*i~SrNfz|9y2@UK5
zEF3%z4h(C`87xE@L^v2Y6lypaIQA>}fc+0iSS*eVAL<zXvoP#;5O^Z-dFQeJS_}*|
z5)28)7z7v?d?Xm&9|I*&T4EiL;h?<0z;T0tkweB~!-9j&tgIR_CpIiR+|JGDFvnx!
z!XsV6%o<m2d{A<0XS8U0^FvVOc&|EZg^p%Iit}`>$VEPu!4FUM8^jmwi8NF>+iDm3
z>CBADi2;o|-LFKVj5IDXcob@xN*QUnEjP?Pw<XK?)q!aSwsBuhifTG8j5wMXs~MJa
zt0P<2twcI3DP&X5+d9#X&=+@Caqj=cdO=(-Vg;w75Z~=m?W5fuucKrwOWxg|Z>sIA
y!!zZR%ZYmP_aSShYo;%s^;RnER7Bym>z2jK(oS7Xy?Cm6XWkv(ptO?>4Aub4p*iCK

diff --git a/images/multiply.gif b/images/multiply.gif
deleted file mode 100644
index 7d5e63f5cff4ea0eea76d9200f15ba03424ae8e9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 995
zcmZ?wbh9u|RA5kG_|5<VjEs!T%*-q-EUc`oY;0^C92}gSoLpR7JUl$Syu3m}LJ|@Z
z4Gazc|NrMGVbCd-_@IC6e=fuRQihrwmV^=pflLOD0){O)D=t<h3Fxsqq;o9GEO?vt
zmR<e7gZ+MHhJ6ecNem+F3>+L0ChTVK8btoHaO`)8VX0tZFk@g4VPN2BVYjhtc+11`
zpTl84(-n3Gvjzqc76uN7E$j{#8_We*L>wGAViY{yo4@@p@_#?a{_8$0Ki)C0|7UR6
z&v1do(UhT1gn@;F!6Cwt!K@CVl_5rgf$12-rY#H!7a0Tu7^)c_BpiDup!J`}VgHW{
z4B@5>EFugJ91J}*0q@_X{{Jtqe?P}vHV5r@sch^57nq-zGVBy#(28JZF>7Fm30c8p
zp0uH6i}t&VZ2tuu_B$l7FxWwy&cMLnc;HywTP>FV4i5Vn7&bF7XfQCaF)%o6VPUz*
zz#zcD;K0D}W6J^ki*H2){y$)0c+bG_pMhaN1B2oZ1_ylx4iN?p4u&}g7~J16@cd`s
z*w4W5hlQbufq@02GvvpX5BeAXiwNxJaBxU?SZ=2-D#FIW;lQxq2ZMz^gNVqzc?|7M
z3@j`R4h{^S^Zqb3H9cTqVRdi_*uwnbBEx?HhW!o<AxsP(dKvz+FgR@CD8FbfDj>q)
zz`>w7j{$6r_z&hLeFk<BhVqLHq5=$zEDQ|47#MCdFvv47JYitm$-tn+z);P=kO1}!
z4}&9%KlA%ChX1Jy`->R9l`}jqVvx^da42E0No9Di@c)16{{0opYchW)6!Qy|FmPlp
zsm^OmNM{gGVBkq(WXNP-$YEeeWnfSUt5Ii3&}R@RVBkpBwaI08pTh7zlVQI;!<TY~
z_n8d;a~SsLFg(d**qO+nmCN8z%uu7xkWkJbP{hEIecwi(`F#q*{xVSVr3~wUw1e^j
z1IGylMh+Q|4GRu7v&w43oY=7Na631n!yJ!^3y*Y3$j6;I5%};}pQL@$8jYeSM<%J6
zF8jjK(CFGJ&A!Ry<fX;~9R}%4777a*ni&|ROfodKr1{R^wvlp32wreuA=iAVy_uU|
zIkAZAdriG%qRrUPyHco@Yis5ahJ<*hCs|k4gwEkVIjvXnvR1=-zU^YB+QI49XXWfv
zoAc7)V8g*`ajxE(2Oix&uD+5<;(^7|l!+$JTqX|;KA+k$U$N?+O;u{<>4pBw#P&v|
LzHVb=WUvMRBOxRv

diff --git a/images/not.gif b/images/not.gif
deleted file mode 100644
index 0a3c3a0559a9295c67916e62cdb6b840bdc948ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1418
zcmZ?wbhEHbRANwKc+SAU#Ka_K*QOP<E2!$!vSrJ*ZQHhtY1+Ph`>L3-4tZ@lckUdU
zTH3vP_t=zz!otE%rR{t4=+U!h&$5`}%9yfVy?Rx|l*XkLl*SabXwjl~@7^)VMKQ?*
zDTQtO^y!mR-l1h|)4qNCmc$gsrB^3pH|^K2UrIrnR&mW@5_1ysT9?&zZk^aXIj26S
ztbKZVdVNfFOk!56R;^+)>iYNZAD2-Xm)$(0q<!bgj-@r7<Fi|K>C&YprXshzLtIv~
z)=ABi3);q}SH@-5<yCZu&utT%Qq;P2>vrwhb?DHcyuNdMW=&jH)0CXLq}(>KsU@*#
z6>U;lB<HtHFK$;<)2U6HHU*U(vr5|+R(Hy;?3iBAJRzg9u&^jLt*k?So2D_f@mWpc
za#|<nHmi-Pic2j|%4u5Jq)Tyir><SQcI?<OHnT}wMs-PT=cJt4%#!v=d2Q2++qY@c
zE-s@cwXkhMW_3z#ZDM9sdQrRhoK^|BZHuZqmDYBSORGpLXc?c?G$FG#DZ3^%xgaj1
zE-t;YqP|N;aof6>s<_N1sfF$0GV5bgier-t6SC^#vYN-|w9c#O7@ylVE~7TBsC`vT
zc}`h}*tGHv`EAQ$N-AQ?>SJnRGwS2BTg9eVC1uyv#Z>oy6c8N(ia%KxxfuR4=rAxa
zFo5y|1IIsxR1O)B2`=nxZd@8V2`!H7LMj|yb2J29T8vydw%pip(NU5^K{0^AapEFZ
zHujE$2PXs@nwf$`q%@5;E#VOoJH153;e;TclyZU2rp+0GTxO=%Ts(^x_^?b8)t8&#
zl)yOI*l?FXP>ROM>FYh*IHH18PtDcfUC71KIN_DFiH+XLi<<=-Vi|n+axD}&PY9XG
zaQUu0#GrMX*<elC&B-kjm^4e@rxi}vev-+q!O~?@QG1gES6YXTMHdq*hmZi5%QkCE
z<`&lWPaOuY9&;*d3m9u~OkQ4cWcJE%<`a`xlUOtj+cdJC9ClaX7jz8x(DZV<!<ALh
zcVyowB()oHoBaC|8PdTlbH}VP{l4FwYCa|BSqWO_6}_sy9#U_%h+sL~<{W49$wMV2
z!d<ZJXX-(Dw)Q;_++~>#Y-E=EuDD`u3ZKRVL1C$g4NS6f5fhsl+1bh!vm;j=VG)i{
zQEFgdUQ%%1SM~|R&CWZy7aBN>YZ%=HDr6iVl?r&WJ4&)<v^-AfJfg_P9>QXHOhR~~
zgQJJL+LB9LKP^ABGK5qVG*1Y9Rpubb70B8lR#>nzMJ&Lfu(`)9a6yA&+mnke%1U1@
zw#zk@>~!Nb_PQ>r;LEa+S%itj&~>`=GWLs01Z1Bu6wdH7d%R4=<-vjF)2%jWE|+yV
zz`!h6V(@BNj_Q$s#LU&pj)%D^#xR^@*>Ef>mBmfK!Be%lVBukwc`vmBm%IMSYG71b
zk>J2|Om6lq7CngthnW3rq;nlbBsOx2``IWo^V+HiWUk3+WOU=Vz44$$cyf;RMaKy>
Z35RxnJQY2`mGcYt+I{TvvV$EMtN}~G)_ec}

diff --git a/images/off.gif b/images/off.gif
deleted file mode 100644
index 3e53637a0a44d3707de2beb90a72c5862cf3c6b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1457
zcmZ?wbhEHbRA5kG_~yZ2U}~*r=V@f;rR5lH>f~eQ7N+N4svlBk;F)3(oNpRY?cyEk
z8ypoJ9_0~|6c&?`m7SGekY89-Xcp6Ep3rNNJjo}u**R;5SHaAXk{M3<i@eH~hgL01
ztX&Y^ur8{3bA3}sQv2qdiF=Eu?8%;TxN6Rk_RgN({;88DPiva9Z}yx8ixw{3xph~=
z{9|p4kN2#(IBoUGiEA#+-h64vuIp<K-QRTR)~S=H4xhSp{^I#d=PzBjc>dbeYsW7?
zyMOn={Rj8&K6vxs_Weh9A3b<*|K;-+uit+8@b3Mmcb|U#`1$|;e}<s|6o0ZXGBS8D
z=ztsxiW3I*e+>eHLim7ykUL%=M6A3UvM~^jo4b31JIDYxH;90{yQ{OStE-#4o4Y$m
z2!w@%++E$>-9UV2Yi(Wz78VwMEjt&m07x7v@8<6AsKzHIDJLf*BO%78<^VMTWWKAr
ztGk=K1;3c0ii)bfp}xGdG#9@a$d-Q%?rtCzZtl+R?q)oa$|k19M#cu3lHw9_T&!jw
zx460s3b{KwJG)u)N-CS$*q9m_YJx10krU>%c5`-hb_2<~x;d+HshWVK^_1l#Wk5ih
zQ_b1U)fuec)y<ku(FiIHlb2v^uy%2USm5TYA*N(vV``wMEF%NaFC!ztrRD7G>;kgD
z*_mHb)x<<kRY?&hD<dN#$`5mZvo))nzNvw#D#&Iy7G-gAvUd{zdBBlH(Z~o*`d@>L
zD2uf-*b9!%)=V;bda5$gaNQt=D3i6bvx|U`yQ8x;gS4tLs`)Z9!mPH=j;>%Eta-)d
z^+0-%u`oYW-rCVgLqrBudxMOOD2KYWqczw9YiBc7X+<Q>l5#S_!mMVF*4D0qLhjbi
z4t7FZGIA*H6J`>!wsy3377%i`wzjr5;}MoZGC)R{jnCZK5i0NO;NYOcDl8=}0afy^
zL4=EwPsiHY!5VIYqqPnXv#5lqjEs!5h=?#VkB$S#V6eP}wY4S45+PPjQBh$LVPRHA
zK{K$dwUs@{1y&G_rKuV(3kxF)pSq5PC0L8KwH-*_+S<wzgsiPC%*@Qp8qBP%L0T*=
zL6m@yyQQUtm9@2{l{FZG2uo{AFxT4JT2RQ{%-X^d0jxkwYY<^+ZDD3DAmnZVu^&O&
g!kL!Nf`UQ<f&yS5C@3H(ASl!T=70#Ocq4-~07B|Op8x;=

diff --git a/images/on.gif b/images/on.gif
deleted file mode 100644
index fb75f06ae5a5c1d3e0641e880bbf14075438dc68..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1966
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

diff --git a/images/open.gif b/images/open.gif
deleted file mode 100644
index 2aa70cdf0feb246156c1026936f026616c18d35a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1216
zcmZ?wbh9u|RA5kG_|5<V94rh10vrMY0s<le5&|3&0s;~u0umAu3KAR&Dhiqs0-7=c
znkt%_8k(9qnuan0hB}&tI);WOhL$P<mKp+<8WNT!mX;QVjtUZv8WLU_5?(qIUIr3D
zIub!95<vl8K><Ng1`<&Q3Q;BsQ2{|&iAh<hSy`D`#hF>fxmne<)y<)r&5h07josb7
z-BTt`nKE_CoQYHBOq?@k>YO<<=ggTqXGyN*l9@}E%$>7j?vf=7=PX&cWXaMcYjQ2u
z%w4i(;hHr|*Q{B!WX-BIYu2sVQfRql-Igtzwrtt9W$&iFd$(=byKV2@U0e3<+IzIp
z@#wC-M|T}Py6@=GLr0GuJ9_re(X)rno;`N<?5U$?Po2Gb>gv^VSFc_=d-c-QtJkjH
zyL9#5rF-|T-Me?|>b+a{?%lih?ApC&x9&Z=_3YWbXU`rzdj~@A-aUKw?$x_*OS8VM
z%lh`}-M3fYzP<bQ?bEk!-@g4{8ufo^(*Jcy|2HN5-<0)#SJwYs#s7Cz|KC^qe_!+e
zL)HHeHUB@>{r^<=|5H=`pX>gAY03X<bN*jj^8ePF|KI-q|Mma>|Nk5u40A4Qaewog
z=l_3>{regIm@zaJGO(~SIB=x=ka?#c|6fFSKL^K-1jb-H22l|PhJ;22i;WB-0t_4+
z_vRgGZ+gwb^54N>zvnz#rlwQ}7Iqc~j)W~2-d&9OFCe_%fg^=U;9c*>|1AIaJM7=F
z<w)?wccKFSIUM#gXeKi-)G#oxGB9w6|KMoSXJ8j$*s+Bn_#%U-00V~u10#z71H(rK
zhW`u<`x$--Fx>vgApf7iVL!tY6ULqI7_|N~R5LInFfa%(Fz_(sh%mf+%kcj{!~XpY
z8Q&P*J!kkY&#>QtA;pLN-P?x$|5^6$cTlJ?c$Z-DUqB?Vn!PEZfn9)wgU4Y9LryS*
zg(!mv2Lp#f4F^NQ8wP>@3>^Cvd{`LXLM>-tab$Q`$MBzpVZVdG6N!&IkNwwTV5pH`
zNI1s8!NA}n!SMDND4}D+Iv_z%USQz($H2%T<FR4E!Dd!b&6pD#79MWrVs)D1QMm9(
zmxOHGni&(68T#2pYio8)eB#l@qBt$5BIvPKx2|!Q%nGArN*p{AIul-QTF7eN_~*mI
z1H!4Nd2=~LjYL-Xvof=CaWrU6P4eVw;u8He`S>~6^$Gj$DMn3R*yhmw?@FTMqUH`h
zIg^Y96ByH*rWi;DNvLG>_X`w@oOL|Hc5a4o^cIhaO(~ocx!ol57*smWb?6jcJ7B2H
z)-9^x-Nv#|aq&@3mWkp?M}t{hluU}a`d{X>o}46SAGc=4flW)<Y)kDLUVdWpduEz)
zz-MLA5syAet)#fK#fy*3Fv@taAW)d?jHtF(-m=FT4;MT?#9QJb@R2F)>`arB8&euT
zxtR0_v!Bsk@_?n~)5D~Kk4MXWZ5&+$Om{RidZralU=a%QS?DSj<?~Te#Kpp$nak|#
zkpKqGgo#H415F%Vg#%?awg@=hFgVO5G-ay*lL12@vw#iDM&>4~BMyhTjn*VEF&b%^
z9AM#d`Ov`Pt@rW(GoQr*2WDoUFF}E>NtvPTQQxjDb&t=JTsD<sYG#@vBO`+~0Q9^B
ARR910

diff --git a/images/opendap.gif b/images/opendap.gif
deleted file mode 100644
index 346345da29b30c14547776c5ee268a34086737a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1292
zcmZ?wbhEHblwy!(_|Cw<kic-`#tnuO3<3rLH-6ms@Z&?ljt@V6{P^(U!-EG8Ui^6R
z;>C*xKOQi2Fm$}=$jHbzapD961A~BtLBNUthZ_zDZd{nL<HUv?I~X=FI20_Hu;apl
z9Saf`BnWH};F!Q6;IW{gp+TeKM!|*+3@aFBoR|?YA);WyijEyOCcKysaU-Ikqd{Yb
zMn*vaM*~N|fdGw)3oBNv*sx(kMMXtNM@PbggoYU#CQO)6ao~qU#14i6hKPcShzAh`
z1qB%oGG@$}ArKJ35g;KEFvB2YfknlJiiQe>garjJ3Mv{J95NOtB<zp~C<rJBSg>M&
zg2x1h86OO87&tT>2uKJ}NSF~YVME1>3WbaV0tN*J0R{&S9N2MU$BF|h95y&`bV$rN
zFk`}p2?7lQ3K<p_0T~e+A`}8T3{Ds{ylAjEV3Dz6$AS$zJT7=7tjJifU_rxy1q~}^
za9rRxapS~+4<~lKI56YFfdw~CtoX2E#)laV2To|5(D1n7QE}kIi3=xI9N3Vt;lzR!
z2O3VSuxPko&~PGP!3U3y3mO?34F_&)IIv;Ch658$T-b17!-@?D1P(|DOb{?=cwlhA
zK%hdvV1a?c1_g}-4T%d90S^K!CcJQ{aIlzQap1y@2^W4;9C&cy!i5tbK1{gqAYs9c
z2^VhccyVIGivt^WoY=8rN5_H<865=%I}9QU8YDJI9C-2Kz>6CK7X&suxNzXbiHH>+
z6fP)SxN&2~g%=tZG%kF2vEsoCjuRXk9-QFVz@ZUPVUds_;ZSkn!-as30}>q)0TT`!
zc=6%Fj~gp?oLF#T!Ga4P1P%xUBvc&uaN)p*4+macxbWe@iVF`sGBOsdSaIROg$q9}
zT=;O|#)BISgA6GCWMO1rxWJ$Tau+C1FmU{5Q09>F*s#E{nO#V0Pr=EM8B%Q`UUMoG
znvR4oHsLs2viR!!*o901Q!)${Cv(lNk#siI_E*pp@>=n5Lt=`jZ6udSz<~vko0E4$
zX>_?N`mXd6(aqYVpq<E=zQ1cC(}7gMnVz;QX52Kss5C2ui|<9sfd}EUHS4<?JQG=3
zn>l0oXE-c%Q1@qJd6ZHl<kZQn9QWcwS2fejro$DSHJ`3z`mAG&uCiG1dBy9VxRoa+
zsRnRg>s7S0TC-roVUL+66Z~pB0}I)vgr4QtaOrDju)CLi&d#c)baq}TYpG063CGC_
zb_*T|Sg9O$&{o%PVvyW6n@P^5+(To_jK+zw7R7%yytGt)BDPUkOXlJvk=LEt-m|vJ
zGla2D=+HY=BGAaV(4Iv}j^ja_7VitkASaIp6Ii$zO(YuBW_?jVC8W$@;3N_uQ{kZG
zTcg0t#A(5iSZ~17<ft+$fw8fM^J^k2KS#q2g%&}l2Zu!sR3<QpeGFB(XvD7~klbN>
zjl+?_ifzN9exb7qIwu&}MI<+KI&40`bR_VI@)Q>(PF@o$wE|TRAHOZBJ=_hFX;V23
zKJ&~}&HR}%#UpGdgHjR;^K%c*+?Nab!kj+4DH^1le9mb2XQeVrwnIX5Tf17-k}fZ`
U(iJWODg~Kyrk7PYI51cP04g39ApigX

diff --git a/images/outpin_red.gif b/images/outpin_red.gif
deleted file mode 100644
index c1946afbb23d497ef1323bf22bbf317488708d7b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1016
zcmZ?wbhEHblw^=(c>awc$;ocFtl~Zyl^t?=I~5fUORFA`Q$8xIep*iIvXtrxS(5`Q
zs>hVHk1OgOQPJA3u5naV=b)O&F%89&s=7B76wj)up4X7NsH%BJUFWi@${9_KiyCU{
ztW1yUo1N4*xT>vwQ&aP%meyWVhg;g3n{BOkSlOL5usv&Naa%|Cq>06OLyHr}jwemc
z=DPczF*QA8X??-aai@dLWiy>~=4Q)1eP;T{oU*k&Y2$s<+<JC!$O${|oo>DdTs)sx
zn4fWSd1_%XGbV0pK-i3!^!bT-OA<5Zq-L*)Pq^h7dCfO`T~gNKjQoc_$#;T6wkH<O
z&&yk#mG#s=<9=AggOIfKd1cq);~H9;Yg^kJTAN>lr=7?sIF*y%-QC?gdE&yp-t$#;
zr>i=r&X_i3){LpMW?X1)oi%^XrLL~c^JZ<FzvyP)#LWv9EnBv1-@N7f7A-ioeDSVz
zt8Oe_vT^&?O*^)oUbkw?&TX4^?cTa;=eAwjckS7JYWtRBhYlS)dgT6*Q+H1sJ9GKU
zm8(}@T{!vr%Jp0KZa;o>>-(*%KW|-pb^qayTQ|PkdHUntttZc)Jb(WD`=k4xo;-g2
z{Q0X_uf9Ef`sVH1?=PQ!e*5nIhY!!cfB*dH)2Gj$zkmGn<?Gjv-@pC+{Nd-fkKez2
z|Ni~k*IysL{`&gk$B$n>zWn(4`_J$9zkdDt{O{MV-#<V7|NZyZuWx_<egFIK|IdHF
z|NQ*_^Z)mMfByaY|MmaBKY#xG`1kk!?_WRv{r>&;_qYH5e*F9Q|M%~Ie}4Y__viQD
zKY#xI`u_j#_y7O?{`vR+_rG8N{`~*_|Noy~zyAIG^Y`z+zd!!}`TgtPzkh%J{r>mo
z@83T^{{R2~=g*(N|Ns5@|MUOfzkmP!{`c?i-+%xA`~$(ie}4b_|M&0z|9}4f`v3RO
zzrX+f{{8*`_y51YfBpaW@9)3g|Ns2`_vioLKfnI}|MTzvpZ~vq|Nr;*-@iZq|NQ&+
z=lB2rfB*ge|M&l&|9}7e`}_aj?|&fh|L_05|Ns5_|L;G3p!k!8k&EF!gAM}&0|O{e
zIB;BL_|GZhv0;H@Q+39KisTI!L?o1WWMx)p_%H5^Z4l@**|_+4zk=<&i;9Vdx<qtB
z<`gVUJj}1gu%<y#S&e79cIdVhoF_LgKR-V&DZ*pH0!9`#KCzG=28WI*^yetqa0ET+
z6jpU^xpHITL)Jy}6ApLDdYkFYw-@HG^*nS!S&mO6&*b8xR3Ax`$cly;jwc>V=@=C#
zEL37WHAz{`;7f<na{mP`>}N|H3KAR`nb=rZb~Grp^qZBuIn&9k?k8(oCv!J5kwsu>
XQ)W?x#>S2{3*1wSUq6!+V6X-NGJB3t

diff --git a/images/pan_down.gif b/images/pan_down.gif
deleted file mode 100644
index 4ff930a62c592377d8f6295c82e6599df436d983..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 587
zcmZ?wbhEHb6k!lyIF`V`z`(%C#ly)Xz$Yj!EGjN4AuB4WC?+W{Bd;p0s3)(isi1DA
zp=YCI?4oPxVq)cH;t*l(9AoVqWaXY<<CWs#73LXM5D=E^7g-n-o$DLl<d@JAkysL#
z)Et`D7M|V_n%N(gIUzE;FDAPuF1IJPa7I$mq?F<bNu_hL%6if&7i3n>D6F2CRl7K=
zZgEci(t`SVxed$m8kgrcttf0-Uevm}xNUVw+sfj$HDzr}ird$gbgV1wSX0`uuDokQ
zMc2C8o>kR78>)IYSNCnM>EBY{zrMMDW$lEmbrZJLPukuzX=C%G4Xsl)G)>vnJat#g
zv_0+9wzN#&(>h~s`;1*}Gxv4PIoLOMZ}+@IJ@XIu&Ob77;lW8uPfl5OYU=XSv)5jj
zyZ+LD8Uw|DqRvIBi6yBi3gww4844j8sS56%z5xu1KUo;L80r~xKv4vWEC%-ehWe)F
zme#iRj?S)5hTgvZzBU#e6<IlDHEjb+2X7ylcJU}ZEhAfxpvc(x0IqgMH%DDVYxls2
zm^jH!(J*^sD;NLpXfM`I4$WX23unL32%&C%S9?<@-w<{7?s^FmV>?fCzPt52@*4VP
qVr<Xqg%wnlc;DA^N-2skf2$Xe=Kl3pP{4740t1_{)*CSn25SJqm>IPI

diff --git a/images/pan_left.gif b/images/pan_left.gif
deleted file mode 100644
index 2e84b439214f6495cbb600048c90e7f17426ccf3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 592
zcmZ?wbhEHb6k!lyIF`-8z`(%F!phFU#mU9Z$;BfmA}Jy!B`GB*DXT26q^_!EqNQuB
zt!JWZY;S4rZSUe|=NjbV8RG5};pHFY9T*!BQxqPX8JN@(lUxv)QWc$68Ijo)k=dP^
zTa%dA5uZOHqqsA*Y<hCp+|07R)Qb7()eCcL=VsL{$*x<PQ@^adVM>0}io)iV#Vtz;
zTUHmgt}bd@Q{29`v}0{W$BMen1yx<ED!MjQcCV}G-dNSMzOrXiRqy8Jo(0u?TN?Y8
z*Yt0#o3OQU!iM@uI~pc!Z<xHJamvo-DLcBRtZ16Lt9j~<=4rcIrtfK;zPoMuu8!&3
zx@K(dn7O-s*8a}f2YP1j?3#11d+wp`d50$~I52U+fxd-@`xhRYwCKo;#XBc1IWcMJ
z$*D_^O<s0t=IZma*Irz_{=}k<=ay|gyL{{AmD{hb-FbP<uIroj-~LY-Q2ZzAT$Gwv
zlA5AWo>`Ki5R#Fq;O^-gz@Ye(g^`P)o<Ro`MWD!HV4u=Z-_+dF+ScCD+11_2(9_B+
zsL<cUDP(6Z-OnRp5@D$%-pws$lj5tbsv^_LF5#Y<7NDc9p()?aA{>*E8SiGKr*B}W
z*e;u#l^*S2W?^M*Yp>SM%&+Ai;Oyk$>fz<B+sP&%Y3vgi6cQR{+Rec$>KPRqm*CjX
i$|V<>nB+I*A4`D2qf=8Fnpi9@G;COS*u9Z~!5RQ}QyC-x

diff --git a/images/pan_right.gif b/images/pan_right.gif
deleted file mode 100644
index a6a3a27e3e553b9a3ea4e2f65664da76aa11a2b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 596
zcmZ?wbhEHb6k!lyIF`l0z`(#KAR;U#B_<&&CLt#-qb4D%E+wlXC8r@JuP!C8A+4Y(
ztEerftfQc+tDvf<q^7T=W}vKLsG?<}qGh3>WuT&MrLJqKscWKRXsu^xp>JfZXX@<a
z9p~(q;^?30>YwZuoZ}sq<rkS35S14aR}`AsoS0o7mD8VCI4QY!Vn+GYl!|$274y=o
z7G_j0%B)$KS+h8+c5znilB~KV*>y{D>X+s=EX{3PR?#>$ziDMr)8hQ*mHEx93Y(V~
zG_NXbSy|Y!y0CS15eTg*Zd+a6zO<}kb!o@?x{g_8o$Jav*H?C~DC^o#-nF5kdt+tK
zrmEh}wSAjv`nS~dZ>^oMrFO#Bx(VCrCT?q(w7GuLj;6`mnx^b(p0>MX`kuDwJ3D3{
z=$vz)YtF&$IR|>??3=Q1|I{T%X0JNAYWt<NyKnrb7%2V|buLOxEJ;mKD9<d(PzcFL
zRdDz84Pa3G$->CRP|u(PiXu>CF|f~QsBda+X>Duo=<MoZ=x!JFl<MtkmdMPolxCh%
z&zF*xo~kZ6h0EMMC_3IvS%$HTO-Ikv!ok%}Q&DVk8;8E3v5DDXBV7%7)^=_y8+%7*
z7iVWDTLU$bHXaXeUqAnVfIu%TInH+8;E=HJh^SC)1@TV)nAq63IBQwqZo!1aq)i<P
b4xWc3)KpjseibiZX=xQu_OcP-V6X-N(G>(s

diff --git a/images/pan_up.gif b/images/pan_up.gif
deleted file mode 100644
index ed12afba32c8bd20a43b7a0a982c97d32baedbdc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 583
zcmZ?wbhEHb6k!lyI2Omiz`(%9&LJWuAuF#UtEj1@s-vo9tgdaMp=Y6?XQ^jorDNh`
zY;JGm8sia|>>Cv48JzADQ{xv`9~5669$yfVP#BWZ8kJHRpH`ZfQ5Kcem6+2KUoa`L
za6(#PM|{!D^s;GrWo;?t^HVG4XVxsrubG}*w=}PAZg&0Bocg6jjSC8zmKV0HDs5R@
z*t)8ybxm>Gnv(Xlr5$U^yEasJt*GeUSk=9@qGwZ8@8;^h%}o>6)lb@9KWRtfq^<3f
zRyIxE+%S1()0AD!Q@1xy+ub^CNBgwRZ8P??&)D5Qb6?-g4IQ)h_srhWIp@H{Ih(rX
z9_pTVsBhkZ35$<UT5@vglEagio}9ky==7DRXRba!d+mjV>(4FUdU@rxOB?oF+j{8U
zf4Tt0f1=Jssfi`2DGKG8B^e4K8L0~Hp1uJLia%KxxftphbU;xAiYx~9?uPoN=9bpB
z_Kwc3?q-IbHYUZs{$|M-{wYm7zOkOnGbN&<f<>lq*+mApsj~NrhPqo?+w%3WdOH~!
z+jwYkc8j|h>6tos`3rQhnQ3e4m^=Ce+H-U;3acoq>03Da1%*p@aLdRmX&6{K`-en?
jv9$9F3W-U{DyZw4Sh>ozGcYi7@yuAc;9yfD1A{dHOavsz

diff --git a/images/player_end2.gif b/images/player_end2.gif
deleted file mode 100644
index ca90804acc832ae6f2e6bcc66044ad4798b52d04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1145
zcmZ?wbhEHblw(j}_<oLofq_9dN?$lmOE}C@ILb^o#zrVjS~yc&s8B?-L{PLuN~m5+
zxJF*8PCzJCK`2{MC|g@7S5qk6L@3)tD8ovqR7t2%Tew0|DBeLR(N#FXO(@$(C^tx`
zT}Z4!RH#u(s8Lq9O<Js7Qm9ixv`<2&MNpzwSiVz0dXk9jWMP>p!csGYrDlk$P7zR>
zDxfq=SY^JH#(YV&g~FOkgf*6k=qwP>St_8lLR5RLnBEFm{S~tMYvoMW2^z1KGgu>U
zyh+4#ld#b?Im@j=mODl5cT4CkHnd!2XtGhkZnv7_ZZW6bYR>!B-1e%uY&7!OYT~iM
zDsYEs<R0_bedZn;ogEK|IUN*pJS6FMRKn+|jPGd~-!qcIr{n`KNC#YyjkqcsaYH`l
zro87NjleV7QD@Xb&RK?C(2lsM7k5oR`nFQk1;f}&M#+cm6E0|`+*3@tZjyT4BIA;A
z_GP2Yd!{+}t@7^K7F{tfyK0m8P$}uDQu-t1tXHbpZ&eDPYZSlID0ppB_{y~Iy=m!Z
zjp`rjm7mNbPdmq-j!L@hkbK28@4i#^)!>3tPQ_=PD=#}$+;A$t8<KlCx9V1U?VXg$
zmrix>+#7!BH+(c{{%6?!$Fk#(b=&=rmY05=uj6{ZyLEl`=>G22``2mWKgWrGJg0t%
znfW7j{-5ZkhdEtOvsxb(On;j`{YBoaw?%Vam(2T?Hs@pByl<KFzvR#VT(;nA&ca`*
zi@%jF{ZO;)bKTPK6-$2<FaKG#;#cA7pEYZK*R1_hyXfA+CAU|u_|m%WQ}@Qt)3$w?
zzVpS#Jzo|beZS-2mo>+}Y(M{X-|-K}E_^w8<NeF0pT2$g`t$$)|De=1$gtv17Dfh!
za|}8lcY*Q*1IIsxxtuZ{8x|aF<`CA3Ik6$}plQF1Rmhd>E|<3MNxIoZfr`oz8)i5<
z?$C-bNaKBbXV=ozkyDyi)?IZvxuH)da!1rYof$7fby9gB*KoONO+VMv>$1`6+Js(J
zp9L{*AGP{$Ia<thlg!@XDzMahUewu5p=VAWFl?|8%#KL)U*OoRmK(G*YldKB#E%f6
zYXKZ`wsn90OiWo7q8aZxM>X>@dxW!e#=8>}joBwI_E_$x`0Sx7|JpXaT{V`EpY<+u
z?o<%1da$NV%wUDov<;J%_RKU%Iw4SX=vE}RR*Z?MOG7iqWL2*TEE6x@zR9T&{=%eW
z!=qz;%63H^8SmB{>`}~;3g`N<pox`7NRUm$=fflS8EuRbB@%*6O~0DhgDzaSIN?Am
ztHO=)35;qBE;u{0Mg%mnNGUvNV3Ip>L4Zxf=YXR-XX=K7trAK{7~5srG#+)ROv`xG
KsmR8{U=0APy0n}C

diff --git a/images/player_pause.gif b/images/player_pause.gif
deleted file mode 100644
index 9b88ec5ebd4bb5d5e476614f051c1391c546b891..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 639
zcmZ?wbhEHblxL7<_?E%Iz`!7sCMlFIA(SR9lqMsTEi9BRB2pwMS}Z79A|+8RAW<tI
zl&T=sBr4u2BHkt<+a@5}E+E+>EZHk8JwaGzlCaEVVcDr7N)rWCCJ89a5LTQatT;<p
zbFP5)d;#@^!kSBjHI|ELFP1W1C1|il*mRAM`FeTd4Z_BoL~OT;+UyXq*(GYfL)31!
zi06K3ryVL@N5#Dl%6J@=@Hi$Bc3vv@f^^75nYf$sVaHS=PpU<n){noXn0nSQ{k&1q
zO@-_mwpovqvmdMHJ=83FrCssbxax&P$rXpvtB$pgeVRX-x803sd+Xi(Ah!QieCr42
zzVDv>pF=0SkDK`;cJ`~HIj>9Ry)BvkC1u{XwD}(^7JSWJ_@#8&=ekuNT2_2%-TZ0N
zme2EceV%vV^U8ytw;uhx<@D!6XFs31`uXzHPv8Fk{|^c~im~EP7Dfh!3<e#LNuW4k
zV87Fl(bU}1+ScCD+11_C+t)u~;-twf!SP9{>8&BtXHM{nh>f1r;<Iq^1oyzG$h20s
z)oUl%dWVIlwAyUlKEcv8ASk)jV*kMjhE9I|iLH7kPfyUXbMZ`Q)x3Olf~tw5b6l(P
z-TM>d46GeuT4kTVoFJ)dW**uqq4nuYzo5FYsc)-*$CuyVGZ;HWjV6c$ePCR8$eqJt
zLd3_#7Z`bkwe7SL9x`*uw(^90;P^DLfm7OPkA{eY)2XTbY&HuD4!S5Z@nzhqIild$
d#HPgc^^fF~Nf#G;OxB7$wPj_nYa;`LH2}lj?neLs

diff --git a/images/player_play.gif b/images/player_play.gif
deleted file mode 100644
index e610d842485044c82a7a04a2732d79f71a97612a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1052
zcmZ?wbhEHbRA5kG_}<UJz`!6Jr7s+(B^+ic9AzdPV<S{3B2+IWTq7@(svwlDD3q-&
zl&dL}ZX%RzB9vhzRH`IYs4ZNfC=~A?l;|p);3kyqBa|B?)Gj2{C?(V=E8He6)-Ea3
zDIwY?A=4r#H9=5jim=oSVW}D7YEuPN=1b`;70_BCs=ZcBZ-uP>S~<OK{03{}Ew>8U
z@0QS8Y-qX4&}5^6*>(-P-D*y|)tvXMx$RYR*=Xdm)g*9-Y2+UB*nQ?68=ajFia8#V
z^gS&Td`dpxf^5VM`M@*UVdt&FE@($w)Qh{OAAMUX>VjeNVf%y&nn~A9Qm<QNUpC6T
zXPR^0s_2S&*;Sjwhe}CLm9k!`X1`S_cx_Vn%Cz*eM)eQ%%1`F8r(NPtM<rc$NWJ2o
zci$=Ha!|o3r{c5Dm6x3gZ-kcL4aq&6TXieF{%%_3OQ*Vb?hU{6oBtWM|FP`&W8L{W
zuKT-J?_Z~h{~Ra&@tprBy6Is~*VC-lhXu3V7R~vXH}6~K{Lf_zf2A(|R=V_i#nK<e
z%YT-w_*J<2XU&@5HEaLWF1ojH$?cUpUu-=3e#iN*`;LD&cH{lar=Pxk`1<qz|No!}
z8^zQM0mYvzj0_C@3_2hqL3x6K<0peWr;Nvj1qYisgtcN$Y*^^5nl9s2qjF53zmxa4
zPErZ;V<)4UA10?B8ZH!ZXkfFv6!<A&id`+!%9NXv76@CGyyBP@S^Qv<S^l#(iXk2s
z`{wmGWF$UT>yxvu7kc>O=3%dCy3yAToSe)q*fUFaMaa$~*6vx>Wp8AvE?#1pr0GA;
zfiYQ)SI#EedlHAz6OPGhar>q?US@SU&2LvHVmK*<W1>L}&vuiBL#@41CTS-k6nCaF
z395%2NtoEw%(R5bs6`_15OXu5hdir8!@|RDtQ(SrCloj^zq`T2?b2{z0aHPvu$;w?
bf*1u>?lZIPcL~Jq`uh6D=IrTm0u0swX{j$G

diff --git a/images/player_rev.gif b/images/player_rev.gif
deleted file mode 100644
index 4fdabd3115997603c836f4b7a227e3f2a9fe4f03..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1051
zcmZ?wbhEHbRAf+K_}<IFz`!6Jr7s+(B^+ic9AzdPV<S{3B2+IWTq7@(svwlDEtIP%
zlx`xFZ6cImB~+>;RH!Xnp(qsZAe87ToZu#u?IV;MB-Ab>)F>s?C@b71E!Hk6)F~m_
zCn3`!C^JP^YKE}X3~{xo0xI*RH0DdHEfm&SDxkGORC}$M-U?a$wQ>e)<c+q;S#A}w
z-z}lH*wAv7p~*%CyWMI|yVacctGVq}bJ=L*v(?07gH_-T)5tyMvHQ$DHaa^U6mvWz
z>3dox_>_FW1=)xj@_}cxL(W--UC@rWs26ulKl-*()CI%j!}bXmG?T8Iq+YkkzHF3v
z&ot-0RnZmmva2?U50#RhDrLP=&3>y=@Y<yCm1*f`jp`rjm7mNbPdg`Fc1XVBns?tR
z`)Y8(DW~GI&Xt#)%I}8c9?q@0m0o)%rShdy-8=V&U;54e4BP)$cKosKd>z;Q-K+Pn
z)5L#{6aRS5{}bKxFsJKjR_nupS#OKxe9W8oEpz_ovW34=7k?{V`n_W5kK*M&%U1j<
zT>Z0V&F`AEe`*)qTe#%*%AGGZ9(}*#{MUWQKODR9{^iq8-#&c(`TzfaP*ja#YKMU0
zPZmZ7hF%68kinol!NBo@L7G#>W5a@j%^bp7F()=GJlvi-#ir&&bHI#F-dqhY6}HER
zWV*k+kbG>okk760&yR^gpB|iasQ>n+^U|gV-VVi24ip9zKj3p|W_j9qIqmGEdA)fu
zuMV@Hmp04V!tj#w@P)b7d6#l-PCDw<KTDtM;=*8d-f7z5s{%4F8m*DFPCrr8`02?>
z5f!zpNeYQ<J=67kXUGT&xw!aqTI>*zoOHxvqP(4r!qkAK)*eZdtQ`)C44KND(m`uF
z7CvI>V3{Y)8*w4grGsCBWl7jt2j+He4yH59=00>_VcIPnnDBwYsqsOtj!A(6W926<
V;W_Ht7547>`ufIZc^(c1YXIr1F<}4z

diff --git a/images/player_start.gif b/images/player_start.gif
deleted file mode 100644
index add7c1cd99d223f47fe37d508ee106f50379708e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1142
zcmZ?wbhEHbRAf+K_<n|gfq_9dN?$lmOE}C@ILb^o#zrVjS~yc&s8B?-L{PLuN~m5+
zxJF*8PCzJCK`2{WC|6S`-9#wcL@2{bs8mU)P+Pb{Q7GO)DA83o!A&UJM<_Q)s9i{`
zK~$(wN~lp*xJ_EDT~er1LbOjprbSSqS6IGNKzfph>||k?DZ)}Sgr#PPt4<M6n<}6*
zOIT&Tl*W8XwS~f(ON2F+i0CX3&{-;=wL(;Tt(e{lS^X8V`fKG(*9jW0mNQr*Z@fvw
zbd#{rHaW|!LY6y4?RQJ)EjF}VWoWWd!EU#j<8Cph-D=MJ)!g=~xokA@*=pjk!76Zv
zY2+UB*nQ?68=V~wh&de;b37#Jc2vUWsEqGv8Q(LK!KdT{FGvSmkd3%18*xKE=BB*o
zA&tN@+EHiJLe5!+UC@rWs26ulKl-*()CI%XOGe3u?Gr9&rrc9Zx^9ws-6G?XarR}S
z%zLIe_pS2o*%n<fFS}}!_)sb7sZ#nQ<*Zk#*>6<}pKBDq(kOUsQuxZW?!9U0XN~F~
z>Xo0&BTqXgU3N&m;+l8gDf?=0!6~QWv(A;5ohoiPmER4?J)B#0E4}tkO65zZx_9mk
zzw{eEnl%42Z2x1~@yELDen`tpzs}cjz2DusK6`Y3_v-!YH1VI~#6O->zr@V^5j+1+
zbkoC}uBTb84-2NhO`rZEZ`RwQIj>9ReM_73F>l_t%=usP=YK9+@HJ=QuhhlgN|%19
zS@yYZ>Gz7IKZ=+CEL-ubaP`lcHNR`t{;6GbZ{d>LD_4AJUH7Sb<L7DHzD(cwV&k4K
zi;lkEaq!EUV_&wP|GMw^hhrDMoV@Y=<<n2!K79T8|NnnbIvbQ&@h1x-1H%~x9gyol
zd4hrCAHz&e8IKJM4mNWLYsH+{u<&qu?-iRGja2bPoxC$utfyrx+7!P(NU>(onW@^Y
za_L{KN(D|C#ca*GI<w<V=xT4a*hiaKxy9yo9t~-X3JG|w8#v$U;7kvlE6dDT7E4^7
z+C5d>d&)H*k!3IYXEge@UF_Q06|CynxW$LXEc3i*qifSbr>UBg6dW7A1k8NV%`dHT
zrsIQ@X_ttKeeJI&JB3pg>Da`Uap;A<5>$3BdURxC@v>ts!SS0eB(O2JEp~3@*qNDp
zjC;D6uwm}ZLrxD^)tisCI0m=zOw&?PJGb%E;UfpQ4I5-U7p0t>AkCq+Oi*bt<3Vo4
zf-eS(4!3c!3m**mQ801A0|pM|xHTRR9S<ClF%FP1uz0}8At)okGULQ!7fxpOtKSbY
zi3u18^2lm1+;fz4ad2d1O*nFaO~|L9u|+tmfw4_E@4&-$g*J^x9V*jKBswry0|5KS
Btgrw8

diff --git a/images/player_stop.gif b/images/player_stop.gif
deleted file mode 100644
index cbceec23c1bcb3c9a2b7568532b9fe77a9e8c0cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 650
zcmZ?wbhEHblxL7<_?F7Rz`!7sE+LdAEtD-RS}Z79A|+8PAe5>g)+8$4CL-G|AlWM{
zJwaGzqOi<lVU<Y&iZg^2X9+9K6xN<EpuSL8eTj(1B4N!X!rF_a4Aux6t`jz0BV@cm
z*kqH4%`Q>f-J<q8MD2Eq*zXZ_*`@AvRNU*Bxc5OBk7E*^$0fqfONCvK4!I~3dPz3&
zq*}yD<M>;O>F13SZz?9<R!X|5ko{Oa_mO(uL(SYLniVe%D_$E{y*8_QVUcsqq4cU_
z-2?yTceZVJBii12w|;PL`{365$*2Ew=!Exi6F!Ge`x@EzJYn{$qPee&r+-PA@g;5c
z*Od8Rv*v%SSoo!M$=C7~?^>6AZeISmZT08wO&=$1{5*Bb=Xtw6&ENld?Sap04u0Nx
z`16hvpLU)9bo|`sGgm)dz4PhG(@)?2|NjpPGU{Q)pDc_F45<t{AR|F>!odE#A+@Qw
zrM0cSqqD2Kr?;<v!o*3Fo4g`pXUv>6D=smm#~~nO@sg#BL&GAX=Xcw>1#Z~5X>(9=
zkAb7luHAd~`1&XH=vuoTJ$C%KyI(?&nwisui<d4rd&KuB7+c=HbN8;5OH7ZnrpdGC
zFJ742NA(D+=zsk5`LmHlcn`m#_MgB1{^?}-Bra(<+}X?_tmYz^%&E*QZsRe>W8x!r
zQBMiMjtL7FAMckpo$}#eMgudKM)0bTOh*=eH%2js8J?Tdd^u%f41^{$G@hUD&}g>8
ipy^^GlgDJO*eC`@Hm`uiUUR*+uDZH9LYS3_!5RPz`Tsir

diff --git a/images/power.gif b/images/power.gif
deleted file mode 100644
index a998b721bf651c72ac0eba53ac09cb08d5d3d65b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 996
zcmZ?wbh9u|RA5kG_|5<VjEsydEG(?7tQ;I1JUl!S5)usz4gdfDf3JV+e=x)TWQOlW
z5|)|AcnTOeN*HX4B|hjM`(MDYKcAtdyf7ivMxaQPLyu!idgH}R8-X-Y2X&5R_62Vl
z-m<g&cW~Ixd?Sv*f|Wr;nt{V1!iC-JU4zJf7LNT6F)S5K3}y@rA`A>1E$lv)4R3i^
z{&P6&XS%}9VAjAO!m@?k;bMci0E>u&14oWR#C!9%|3&`q=h%NehULdQ2KN694*MA{
zusE7B)QK>#a4<MTI5L>kF^I4*a5yl;NH8!RV^|--kYL6jAi}`G!BEZcB!Oe60D~3}
zgToJYmhc7!78V8v2ZlKzE8bfq{TE^1&%trGrcwLd95#^24i}c}GkupN@}He!KSu<6
zqFIBD2#Y9(14m3qA(OccgNP^t2gin<E!yucvi%oGU}3O>_=JIh!STYey0=;^{}~uI
zGcaf{Ft9N&IBa2IxyZmEz`)?Z!0=<s1^tU}MFjqTU}1RA!0?}eVLt<d;*S^y{dXK9
z|2a7J&$+<h{*Hm?KLf{p28KT@3{4CSEFhgJKel|(zxZE7U_Xb$kA#P1cIu)cY#ba8
z3=4iRSm-l|h}@gU(B8!0IqwfsQ_}+$7FGv`ge}Y;E;9TVVA$`#kix|9p_k!53&W2s
z9Ay{HMFm6{H0LpZO&9;c+@#OIF2YcDkwH{|fsuuQ;THqLZ3YH;28JgLj5`?^v=|tw
z85k14e&Atn6!B+%U&io1m0^Do!?$vV=S2+inG6mk3_ht0?-l<4Pu;)2Vs1_5?}TE0
zff5Fe%q7)%jS1-t0tyT~X^ae+3=BC845<tZ3Sl+sED8Dy0tE~l$+|wd4DVAI{%11m
z*JofUXZVoG@IQxPe-6WwOop9_3|hGi4#f;L`V0x>3<5<A9N8y)^qJqMFzhb_rC<uM
z4oEL3FEDVNWMJfw@z}87U^A<rM$8ET#zXB4B5pZ13Y3m^^Qk7qWL#8aVCG>hy0XJ?
z@sSQC|2~tQ7atv&A{Sn^$HI7-?<7<0FdxnY2aid*<wZOnCaWHsX^=SUOk~MZ-#Mzi
z$7EInYaN}%*=<yMO30ycwL^c=6HSISS67)$J=JroP=Rq{`fRt>C?Tao8;U<O*&Ya2
zyw6;9_MdFeg8T;)+y0B0)mSJ$Xzi3Pj@7xT^W^wcb>nkyZs<QdG?P&y%xCAOj04S{
Rv*Z3me9by1&CJAL4FJsSE?58n

diff --git a/images/pydebug b/images/pydebug
deleted file mode 100755
index 30262bfe2..000000000
--- a/images/pydebug
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/csh -f
-unsetenv PYTHONPATH
-unsetenv PYTHONHOME
-set bindir = `dirname $0`
-set pyver=`${bindir}/python -c "import sys;print 'python'+sys.version[0:3],"`
-set libdirdir = `dirname ${bindir}`
-set libdir = ${libdirdir}/lib
-# setenv PYTHONPATH "${libdir}/${pyver}/site-packages/apps:${libdir}/${pyver}/site-packages/vtk"
-# setenv LD_LIBRARY_PATH "${libdir}:${libdir}/${pyver}/site-packages/vtk:/usr/local/lib:/usr/local/X11R6/lib:/usr/lib"
-if "$1" == "" then
-   echo "Usage: pydebug python_file"
-else
-   exec $bindir/python ${libdir}/${pyver}/site-packages/pydebug/pydebug.py $*
-endif
diff --git a/images/pythonenv b/images/pythonenv
deleted file mode 100755
index f19471f01..000000000
--- a/images/pythonenv
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh -f
-echo $0
-echo "This script shows you the environment variables relevant to running python."
-echo PYTHONPATH=${PYTHONPATH:-'not set'}
-echo PYTHONSTARTUP=${PYTHONSTARTUP:-'not set'}
-echo PYTHONHOME=${PYTHONHOME:-'not set'}
-echo LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-'not set'}
-echo "You should not have PYTHONHOME set."
-echo "It is ok to have PYTHONPATH set to a directory of your own scripts."
-echo "It is ok to have PYTHONSTARTUP set to a script you want run"; \
-echo "when starting up Python interactively."
-    
-   
-
diff --git a/images/recycle.gif b/images/recycle.gif
deleted file mode 100644
index 704e054eb0b026feb9d8c4ce27107097db317b82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1624
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
E0K<I{VE_OC

diff --git a/images/recycle_20.gif b/images/recycle_20.gif
deleted file mode 100644
index df7fa308a177a5ab0ef2ce62496e2dae5fd9a1d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1258
zcmZ?wbhEHb6k!ly_`Z*Uk(+^!kB>=!fnSbIN<xxdm6=hOk<pkzNRL-TUBlSW(AvhD
zC740nMU+2-K`Ng^riRfl+{h-_+&;|CHo`(HOU5b8(l5e3+Fjkn*~QP>-P_AMFw7++
zBp@OzA}%h@Dbc|z#m&FKKcLh<AwD59H8!;<zCJ%ZIVm|KEh9H4r!cRuygawMIHj^U
zqr9xVvZ|!Ex<<Z*LA9MxtDDuJhtH&4&R`<D(Nu1WX?!-b#Vz_(9H+`UPto+AZs4{^
zAz+Dd<Z9#CmXOeC?%@;sqG$QUP701);9fo{Gjp9+;ZFb3<q1tivAt!%U1d>yl~I#x
zVrSMzHx?(&Y6xv;s-4o1Hn}->a$CW)p4zrmH4}~%PdQ%Q+S1b9)z#ZSv1dwm|AdJ%
z`&%YXXq`T%d*1Zk`7`<^Po6S;(#+|zCe55RefFGL^B2yWxo6`1MGF_tp1NTEf<+7G
zEnPQ%?ULD>SI$|yc;UiT3s<jMzJBexjcXTg*s^Zx-gUb+F5bCm<^COOw{70GbMuBB
z+js2QyL;LB30qHZIJ9fi!F~Hr9N2Q=@ZS5!7F<2K?dI8ScQ5Tf`e@suGpnAQ-}wH*
z()SlvJioN%`PCgSE^c~peebKA`#xS<|MAxL&v*C!ySMT1;ln479yxR7^ogs7&R;x#
z;ryA47ti0jarWw!%hzvQyL<cg)fZ=;-8%H<&f!=0PCvMJ=kdLVkKW#W_2~Nh=l9>g
zxcl|dp<mBVetdTM`>TteU*Gxp>guy+PhUKH_U7&D*S{WreEsC(yEmUdzWeg!^Y@?M
z|Ni^SF!X`qPZqEzbU-91PcU%&V-Q~9(AadOiC5Yz=f;G@#wG@hfCUbXOs(tV_ElW`
z_;mGj{rJ6kPj7xWHeEk{U%-z?PrJj#<M!43{Pgs6_yW_0Ghbd^<!)Ucw}<O!M)R}&
z<#Bs!GMS!aALRxsc71+sU1-#oIUApz7GJKnyJTg>L+;k~Ci7|xgPNE<)Qz{++<YbE
z%*w@-71q<)ob4?jYmxRQL%4ame*8AGhZhsl7$*fa)jik|$m}%H-{8%cN2S`KD})jl
zQWB@Au=C0bbai}M(#EA3yEEcx5o6kcNxD`kB9bmoF01?I?a0ZR+I@A6SUf|>i;c~^
znt^l7Sh=pWvMPpc47fOn=@>HyyK~5i&PPi$0~8%(j(l+xJuRZEnGklx@WTNPb-&pr
zPbU^Q_9-?j4+yL}%EH4LAJ1nXAe7P4!6x$LOyrkUla_@0>{{^Q>1*#sW<eeahX-kX
zi-MP{m>zoK!pjxEr{?A+fu<%-qavZXt5h<Bl)VEUEckHs^!0TTvpGIKT-+hF)MK)g
zV%3!tUat7PHFsYvIvu(uVoSo_LnSALmiPp}04rY0mvX4(V9`;psagT^OlCGIf)#&V
Z#LV6&ZB_8#Kp}JbSt+Y5H&zw~YXHtr6P5q~

diff --git a/images/recycle_file.gif b/images/recycle_file.gif
deleted file mode 100644
index f1ab50cd08887ed354bad17c69af9f5ea4ba0647..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1301
zcmZ?wbh9u|lwy!(_|5<Vf}IS4YZ!#uS%r2n2<>4Ip2#3PjY0SzgUAvFkt+<MaonQq
ztfJQ$MDH?)<#CCXa*9=RiJfB*yUie;#Vx*xL3}fV_)`XnhYXSj8KllLNIhkczQ`aG
zFC=q?LFOTY>_Z0m!z{`<63Pbz)OK^L9pzSUl2Y%IR6oM2KUdyhfr|A$6`MUOPKDM^
z#nw(Omd>R%&gIrFMYcXQt^q9`fek)^%bf$)+Xr8?3+eC;*>4}Z*D3U%W7r|b@UFn{
z{VqvKNm+AJvU^f<a&mI|G7Ij-78Vv36%`dvEGQ`{DV?8RF}b8_N_o|uyqcPt+Jl94
zb#--ni|P&*H8eCd>?>_JQrvK(ps}&Bsi~=HQhiHHOKWRuTU%S(%;xs?_KuE@j>WAV
zM`}7dJG;8Nx>mJx9cbw8?(Uw}+0)b0+uPf_va|O{Q(s?S-|dFJUv(2EOqe)v;^d=U
zQ>ILrI(6#QFKyGOPoKVg%FLNFXKtQ4^JM?5S+i!(p1okff(1L~E?Tr`@#4ixmMmGe
zY}xYV%a^ZMzGB6Sl`B`STD5A;nl)?JuHCqC<EBlUwr<_Jef#zuJ9g~cxpUX9UAuSh
z-g9Q>-o1PG?b~<Yz<~p2_8mNU@X(<{M~)mhcI?=R6DLldJbCKWsne%VpE+~p%%#(3
z&z?Pd{>-^^=gwU?cmDkO3l}b2ym;~Al?#_HUAlbv@|7!Bu3o)*?b@~L*RS8adGpq-
zTeolDzI*rX-G_JX-Me@H{{06J9z1;b@X@13j~_pN`t<3uXV0ELfBxddi&w8+y?*`r
z&6_uG-@bkK?%n(M?>~I_@bTlvPoF-0{`~pNmoHzxe*O0C+m9bVe*OCO`}glZfByXa
z`}g0!fB*mg2c@||gLObIkz$ZyVBq-Az{nxvv0;H@^MwV9pNdy3JnYoU!J0H#W8u+m
z1|hwY9|num+%p7XkE{^9c_RJ%0@KeTtA(e#DhsEDWPDOO)v`24SGaX);F*~nSy6j9
zb)Orj%-Loj#Tk;}v}hiS;3s4ClLGE4nNHQu)?{x^JJ)yVPzXn#utL)&w%TPq5*y+R
z8fBxmy%E>;uIpK{^~RK&>%-=mak9C3-!M$v9_Bb}Q+S$Z>XtVLIvy@+?UAggVSUWn
zaAn4^3k`DK&$>DrxFt+N5*D<G>BVjjn#st!MZz%Do1^8yMd#zZ2DNTyR~^mTb}N3n
ziK1r1BGENL-J9lQFuj_(%4Cb_qgPuxIGTiJSor?3Qa<D~QDaGf<nz_B9_$=KZYw+-
z+nksLO4hV+wyNzu6u;$(00Vp8mWl2H`ZEj|Ij#Q$oJ`NUS;oc7{y>0TV}`^dXJ+k=
zMO_;4Kg6dP?W;+0mYk$vbVAltV*``ss)j?Y9miCh&**RJxpb6?-^HMTS$5W;lRc55
zPCbT)|19#>&XSnW$S$9AfJtLf%BI%(1|DM`gS~Hzyj4O%6psq~uVM63pONuUUj7iv
zV{ZMOH<%i<*Dguw(nw!a*;-%qWf8aD7KRU}v{p>HbW&|rLJ_BGzrnPr5*>dI9+xXU
m@zG5xqvIi~cvONRtBCuL=^ctqQ?g#IT){Qzq$?vMgEav8M@N1D

diff --git a/images/recycle_menu.gif b/images/recycle_menu.gif
deleted file mode 100644
index 74489e27d5e1ac59f58e4067b33767eb6d57ed0b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2026
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

diff --git a/images/regrid.gif b/images/regrid.gif
deleted file mode 100644
index 9777ff3cbba3a9761b0ea02bed4a9ab332ba79b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1098
zcmZ?wbh9u|RA5kG_|5<VhK7dj?(V_C!MTiOQ_W{gW0<jsVaXDPWm_5cY@eC8i}Tb$
zuER%N&Yn-Xda3R5<+cmg3UA#nyY_JAt4GJ@J-xX3S<&macR##)c>cqO4<8pj|NQy$
zmm6Qd-1+)_>W^O^pa1&u`}e2ce}DY_`|I!j|NqV2HHiFY;n?pG!_vdVV8*~8!oa}M
z!d_$9@Ro<=KZnD9rYr0WW(^D?EDRhDTi8P`Hkb>rh&VWK%u(ogZ~peb$p8Hu`>*$~
z{CLN}{-42NKf?tUM^lD65e60x28Reo2D3VdR)!b}W~O5d8yF%I7|aA1L^v2Ysu>s(
z7&rtN7<d>Mer(AIznID*AaG_&&ijk0{{;m0J8;}(*rLsFk&QvXfx+Rzn<J+0-irMH
z&#`}h1p9Tfh94p<>>LgbF(DV2%uN|YL>M?YHtgA={q7>$e*uU64hbv_b`Z}nFfceW
z9IJb$#q!_5VLt=IW(Ecg1_m|;28S&yEEgFV92gjWY+=y9_)bLNzXA)x2L^`!3=I1j
z7!-dnIOsEQfDC4s!?4!<{S}`7k_>;IFf{FCV9{c5aG3Ig<AeUYgoGzHb~{Byv^Y2%
z7$y`jSXkei$I#xyz{0}d;K1NHkA<m;;Q$K*ivz=iEeszn9{Vq#wco*E3KPSJUWWfH
z4Er4z61Hrxx%f_0;6H;Vv-poKP5KwvMFbMIFxXr?CMuxC$Z~;!!Ia^b2E*-l4D#S0
ze!|AM^Bsd0J3}=yLjnT>I0PMC{F&dEG5k+u*k8o(t(@U`5rcdtgF^{JO)A5Ch5!Fk
z_wTRRT$A}bp_pHwgn=V-Np)UhLOO$h0s~JPBSR(wLk<H&Dg%Q;SdBVMf<A*l0Ru;}
zZcQ%3`xJ)%nGE~&8BEF<K4dcd&tce~!|)`NVP_(PRxX1>F++_$Lqa)&KoJ8+wpEQj
z%lj0D{bis;OfJ>|X$0j329AFWj2to^8x|aF=HQ;B&{(kWa67-SUJl1bCFe##MxQG$
z1Qxq?FdOHI{4`WPK2h9r+MNocrQTDt_2p7l8Z7f^HsQRLvSV|qf0r=#j~-3K7aR)}
zyxZQK5OiqdmT^&NjVyfWv0U85<^coK%F7FVqWNl89du;kkagmy<(jtCgMmdL!hk#R
zQ0sD`Tldy*hU?wslv7fWb(pcCfuXw8Po*G1ubFKEd-{wy51ZZg%5q9<n6RLj=_I#(
z!j3zW9hlG0H|0Cw;8enT$>pQojJ*jT*shBtXdjJUusy$*sX+Teu3_Q{1`EUYe^&fS
zOg!8%pWot4@z1PN(>!D5&)K{4@YRLx2HEL%qxO7neGt1kZSB5a=NPvehMZVy`>*Da
eVe{$b26I~e{ro%EovDaRaK+??)4C!84AuZbpNq8s

diff --git a/images/remove.gif b/images/remove.gif
deleted file mode 100644
index 12e81f86fd2dcc29472549b0e56c7fd07c2cebda..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1457
zcmZ?wbhEHbRA5kG_!hvxz`!8F$Y{;V?8C<FEzIXFBoM*Gkj=rGC&*pF!dNB9Ss^Ck
z6%`c}77>w>mXw~+#?06(B{GefVHYdoK2e@s;-Y)iB$iqm?l#nFcCqa9bKc_Xx;Y{0
zAQ#I4LAFDB@(1;m4%_OVaI-w_=X^5A<7{-`<#6ANG2vHJqt9ig94XH`Syyp0EA?hk
z&YiNthdJpF3v(Wom)vNmdfi;}wWV(Q%-K`sFPOD_<)Y;)7OmZ|Zqw!s8@JqQYq~#g
z=8ct09?hNcwXNypg4r*ZFMF|N-K%X|KknIn`{wPphYx=`bMoJf>ksZc`2XPE>sPNo
zym|lQ-KRgl{`~*{ALQpjgB5?WFfuX(FzA3>1d0;|_J0i^HeT%G>kC3YSb(pOF9QQu
z($B}o$Il-E{QUiWeSCa;ef@lWd>9zOOdlT~e{&u_DBv;o_wn@sp$1<D245dA^fzbW
z<^ThBb`BPZ3Ljsv1t69FmQ2Rpex49uC&_5#4|WzvKgc$aw7;vPqm#X(t*w!aI2(hN
zzn8C%k3ZOfUjF7x4*pICdb+y0x|*7rni4|n3|9U={~COKeHa*geW40;H4F_5bTl+n
zl@)}AAxa=#faurNcQQ0I(9_XTRn-#~5f)-*wDboDfxjt>vA?U1zN5c~zJsBzj+(o_
zuCTB$CljNEzZV08mp`ANr>mj9lfS>ehpwTXx`)5NzlN}gPy;(7KU4vSkG-C*0Z76_
zPX|P~$bp=IkoR=bH89i%$+)`u`}?~qh(P6i7#Q6A`8dGx#$W~h{{F5?N^-)oLhOuu
z{%#BmJ|KBVU430WV||cje-{-MMLFSr4Z=bo7r;%>)X>p2)P<-}Rs!3=$;b~f!OfqK
z-P2Z6Lq|v59TLs%3ZlYL7eKto;c2U>s;U8Up^J;ZpTCnZNFJmgA`jB9r0(wT=kKnf
z45FMGKng$(fGFU0(NYyL0{KlzMM=Tg-_KuNSXh7q;s7rnQ&uTyF%e;Pe-{NsMKL*H
zCy=xdCkvygpBDpzo132*Be#&Su&|DZh_IZ9u&|ttu&@v(8-uy88(7}W&ys-+q(Bzr
zFkxYk_l1QxnHep7-Mm09@bYo<F=t>G5*C&PAz5KrkTipZpPQGP8v}!vo12@PuO$OJ
zr+^Ry2ncYpfpmi;7#Q5VKq`DJ7?{~P*+Gb%ot>G%!q?5s%?s)RkU~FmMn*<P21Z84
z1`xv(Bo7h?S>Oe-$<5c4m!FT1kDrg9pV!n6BnJ`)$%CXpmiYVm`T6+yfpQo~8fpQ^
Yevm9g2u6ZM!5%=%=0X^GzmdTj03cgDFaQ7m

diff --git a/images/save.gif b/images/save.gif
deleted file mode 100644
index bfbcf8058684519e1c10c716bff4ec5d9d50f9aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1259
zcmZ?wbh9u|RA5kG_|5<V{QUfaf`XEglJfHMW^HW_4h~LEPA+|YUXv#IO_>rnZCY?}
zaPai$p`oGSvt~uiniUxt85I>39UUDvZ(c$|LSkZK;(`T9NlD4c$;k^BrY>5PmX?;D
zo}Q7Bk(rs9xpZk(R#tX)c3xgy-ij3k1qFqLg+)b0#l^+Nt5=tll$4g1R#sM4u3J}C
zRaISGU9(|B{iaP#O-;?s%`Gi0EnBy?wY7D2c6N1j_4fAm_4W1b-re8dKViazi4!MI
znlx$B-o2A2Po6Sm%G9Y-r%jtSW5$e`GiT14HEZ_l*>mR1nLBsx{Q2`2ELgB`;lf3W
z7A;=9c*&9_D^{#nxpL*IRjW2^*syWq#%<fSZQs6q$BrHQ_U+rhfB(UQ2M--ObolV$
zbLY<8ym|B4vuEGGfB*UO=dWMCe*gac=g*(NfB*jb_wWDz|4imt3?l3d92^^Ze!PCK
z&-!1)VLyijOS2sVg9w8I2Ll^}qeYvYofeCTg98TxgW47rfr$(Z0t^fe3=BWEsOV2*
z5D{SDaA5erBJ_cQ;Xebzeg+1`A4U%P3>+d192^XDE^Kjs|BmPXe~$h88UC0tI2AIm
zuroMtr2LTis2~4dM0h_3M}P&Ry&Z$72m?b-BZI|81`&aK^NzSXy<=hd@8GcCbDk}e
zQ>p_CJDUSX!j=mkC&v625Z>>=k-{YK(f7-LmjC-5_6KY^Vn6YtsK9>?hy4ti$qWoN
z3=FIc3>@M=jGFWr*hLruwlLUFWDpf#U}O<sVE6)c=`R6>*<Tps|1&u3XLw@5Sox7b
z>pw#^149DXhdd09BL2)D${7BqGVCv6_*Txayof<Qlfj{c!6%jBgTnv+sr&a=wAW<*
zPAKLQC}H5pTvDCan2^pOpuoVB#>kM#z>vehkjlWI5LTnklAzBZkix)`sOwY0@F9`m
zzdpl$M+TN)hL0``|Kl0<moq%cXQ(V<(8^|T&}XPgW=Ke35J+U;D0$$c&-x*N;eR5-
z{$x->$A)!4f}p&>!10fPkweB~!-9j&tQR$6P829I=rKrnrAQPix$4O&L`{h(eC(_j
z!=v+Jhaj(KpMvu|OXE#T4owz!lyYEx(lc|KYT`bhOa~uH6YH=?TULBtd`d#Q@s`Y~
ziHoP{M5bxAIJWW3l5#4YmBYbsdaAaur;d-|GoD#uk?NCJ0$RJGS1O22+R&NCJZrXr
zHPZ|u*RJ~-L2tEK6p#7Dn&|k4u`oRCoP6AOmchiT#D#53_}>}zayWQSQt{}Mut+-M
zA-GaNEJz~Rw9$#Vicvt)$fbkPAc5!4hlh)gpE2eY)7$Xt*RkHCHYFPSdDT4fWRB%~
zgl-Txm@R3v>&b&Xs_dVcH4a^TZ1&+0E4Nq>_nx?gPP?0r^6|8A7AG9z;rskt+M)1J
z3+KuV34=o%?~a-YOSs%Pz?jGLOwEZyu_obw5L?Lw$3~HvCahBN1s{&KE7T=6FiIvQ
zEMgT6X-I67TJ-Q}w?S3nfg)ia1xFUaH7Am~qrcpE+;i$>0t2(ls~ySRVJevnygo*j
zD$H(jHy4Sp?MPTU)!$8XX&c*=2TP|%KKl^omnC`O==8)s&u1=-76oauqH=d$VE8Di
jnKq|L&!u5zl+e>j416qI>fw4bRRR`PDn$i3FjxZs9>(ho

diff --git a/images/save_20.gif b/images/save_20.gif
deleted file mode 100644
index b900e48013de1c544c8228d51b88c3a8ee6d6d66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 585
zcmZ?wbhEHb6k!ly_-f0*$;l}rBcrOSs;Q}IY-D6>Yikw}VHFeO;^N}v<rNYV5)%^>
zlboECl$4Q{mYbVfTvSwDU0vVM(9+V<(bCe@)iq_xlo`{e&6z!W`jRE{mM>p8ckaT4
z3m2|mzhe3F)vH%;T)%$v=FQu8?AW<|`<^{}mY+Jc>fE_?7cOi#cW&$D%e${#J9Om8
z$&)7!-@bk7?%gYwF5S9y>+IvlR~|pU_2kLDckiA)efs$A+c$6CJpKIn_2<tofByXP
z_3QVaKmY#y%K!$7KUu)E4u}N#iGl5(L*wF$875-=E)5KkCQ`j_i!Ww;sn{F0e*5eM
zsTFbSufP6Uwb!lx`s1&8-4|Vp8NQb7mFvHr{iR_~-1=(@v2GS~7_U73TD3QB@$uJp
zr55$FO)q}RvrumR_1C6Vd!m`Qoct2ADV95(0jwlEo54_}L-%O#$pX!}idSBLmD+ps
z>EnX|Im_pHZF9cJw@6N(ab=9oB=6KD<BvglQQ4*nUzw(QwTLn~sR^Dsb4B}RT(5sp
z>x>o)KF{1M9Ts+mk}OPKE>#T9`9hU%E9SGfG&UNzb-J&Ae#0Y6`35)J76Xx97v?Dy
zU#j-H`8)0G4HM*eHZh|?s6TG~_3STIlReYlKAhnq!WD4nBG{k#*Eg#uO>k#g!JsO)
z7vy=<sy%V}i#CXeEjY3m929YjufP6SHT_`9lnQV#f&95QuK)UO1-1!t8z4&7Uj&B;
PfALF@uR%fB#9$2ofn6+F

diff --git a/images/save_file.gif b/images/save_file.gif
deleted file mode 100644
index dde653798fa9c4a739a960b7b29a80b2a92cdb90..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1335
zcmZ?wbh9u|lwy!(_|Cw<!o(udbfst75*DW#7dID{q$MeBbJm=DqB84=iC<37rZX%>
zdsu>cLe{-8nRJImE#%IvJ2vy)Y}vMj#Vkc6X^u+Y6_K!>kXdI~vewjWd(yLPkIAAt
zDq%G&QB&T$dlQnDQ_?o2=g=D#y_hYh?ugi>=yaVq^X!YwvNtStB`jVoCSff(Sve;2
z?kw4~$EWXz&a@{rhraN{EvcC_N5sfSrs>R_S#!>uJEK#ygs19E&b~h;)9yTZ_JqZ(
zM5pf#OWq!qs3m`X{o(OzF^TJ8N!wzQHD}JgD=cAiVmAHpnRR8$z9S-8TUxf=F<JDc
zq;Cm}QO=P=M{L4cYN~2XX1$rRXpM+l4oljakV!{Of@(~Xrp(!PhNtWZOW2f{Rc~zi
z&OCYaL}k()nYf;oMO#?%wy?y_`SR^cN?A)y+Z-076rW{pSp0fq+Rj|Lc7?^NWX-xY
zGFeN`oH`@Yc4f-6DLzRhEJ<s&TzjK4>yC|Aj858=lx26;>^pMh-Jg=8k|m3lOj)-_
zC9b9C)R#TG_I&yD<;tZiZ(hAwvue$reS1RI{bA9H5s8{ov+Iq?vL_}{Jv?b^YNjpG
zne?QlYssB^cWf5DVR35_DcfVS>J3lb8J4&ufByXu$=hPG?2Sy_o|?KElX-7!CY@m^
zI>Hh(g~cpKrSA?)))tniIU#8!EP5$AT~}D_YFNB_Oy)f?nf8Pw?}$xUk4)PY7ONVD
zkq2}@UY25zVqoC-&%nqb<FR3ZWAk(&t(X%V9y&4b-4~hVF>w(~yMVM8!<Qw=?wl<g
zM^|1nSbWH=<p+lnb4%(1$GCZWBu@$)m?UT6>)WW{c)>}*fz`8NLwmDyD|_6Eps$aP
zPLcJm(Nb}Kc4?MHAjglHPm~mS+<j$Bj3%h|Fj<wj#e5QYAvD3UHSEs9Mis^7iqmug
zcN8!7=9KMpirMib^@8fO3Ew7oFfTj0)T3C1cSC`@V_Sev(I3a+lWo(drP$=m`k3r6
z+1uwC&kTn{esfg3Kgbw9;owk^Zf0TRG_g9i(yiZ6k?WA7pJb5yr-+A1u5CSbMqgeS
zGB$B3U+z~nsR(Qj{w_Y}(DMIYs;#b-V)|MuE*8DI_*kDYta8%+Q^#xM?N*)9obdhl
z3f=ij4z^XRw+J1mnWwVj6w{B+Me%WqU4C#fPufs;i}Qoxjss23JxMKsE0!dBwnXO~
zbdX|haC#uVR^vq{Klc%aW+my2N2kOVmoOwqY4Q}XaZI1nz#zkU=)?n!$r2k`wQQCI
zK5EJIXmZj_i*fSQaFKf1EU}p90GqVUoJq%8)V+cdH67BJ+*Ripa40K>9{F%mU2$2V
zQa|$ohEs~6N)63oKMa-F*g{1Nj@1V&o6wZ9e8a;diVk86kH{297_|v9E^F+X$vo%M
zi|Gq20=qc)LpU4QToM{v1-dsVv1oTY$OvkSXkFksD!L<XVgtkU8BZ>(mtfS+@jNUx
JJHUa#8UVzj>TLi3

diff --git a/images/save_menu.gif b/images/save_menu.gif
deleted file mode 100644
index 17fb7640b899e88a1d60d86264d970566c4b2ce5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1299
zcmZ?wbhEHb)L|51IL5&6|NsA_q@=%p|9=1Z^UK$-EiEl`X3ySm?%bO<Z(?F%c5dH3
zW7@QN%a>cl#B5x@{^`@Fd-m*k`uVe2M8x(TI~LBJ`}*_eQ+Mxf-n{wo<HxI3t(v}M
z$(6^C58u9RX=zzpRP^}m+pU)`@4j~J<<FlC3=FGRuU@fyc}Gjjx(gTXy?YlL8Y(L*
zd;IwEqM{-%FR!kyt|?Qd)HgJ&I(P2Skt3R#ntgqJGBPsN)zv3Yp1k$s$?{XDu3Wn0
z;^MM!;lhlxw6l*Nb8>QqgoMN-C+Fto-nw<m*4Fm_Py;#)3=9mQxL{!a*TBHY#LU#j
z#KOwP$ll(^#4vHv<SA39O`kDy*6cZR=gnWRaM9u=OP5V<Zf)h@<l^Sx<?Co;Ze6~8
z$Ie~5_w3!bYh@chqX0LTprFvE*7p79&R@8A>GFXVCJshn5gtKNF;OA$Yi(DaK70P+
z<@S{~_(Y_b#H3kdPHsB;>gTWDe=av4W>cv6!I0$8!7J#{!O_mo(8eQa;Bk5Z_hGIe
z5#6;DEHsn%_bcf0dTnTM;bc~`n<G##;Q*ruubM#Dl!eSLvoE@pL^&o0w}~t%iSl}A
zIO)O!kBQqpJV-joEx{cl@<Sk*frDGa;=~L_Mxh2l8AF*;GqcP7^Bu|smxh?FjIRA>
z8na_V;p3)uCNrN09f}Ia*<~3$woFL8l6-8wW=IT+G^ctupKL_Hp$m$vehmG}(n}+E
zHoNd>3VFX<uqfU4^nC4hzw9ZClTXWX^`B4>*_gzzTG4yW-I<SX-@j5Ovg5#F_8xXF
zrW-FD4;^RYmy_AD;o;O{9Vf(<S9Z8CXLQYz*tU5>&+M8d?-?qR)aE;FIwyLYF-73M
zaKod`A2RdY`4@ar`SS3jyPTi$64j8JyAQ=~SH&+Czh85}RpTtb5J$swJ{BH@8SD-c
z4;%%!wkWVzPD(k@#KmpZGNZ<!_qsf{z{UeoX=Xdw7I!+lbZPb#cv*7AE&VNrU@q?^
zlgE*IZvQqNsu7Vbz2dy^;k1bnyj(XIw?tT7W@bIEY0$#wyhngVfN_gJLy7XF<clh%
zt1isznY~hBBA0pEgt;nrMKj{(c3-qenLI_|q_T_arW4a@h0cDLZJhK%<lgLil}{GW
zcTUUH)NekJz{JFLBB7a`jU!QQR-eU*XOlALhTdz+J{f+$^5)AcS!}j1muO{tOLb>n
z)n>(VC3nWz9j_`S*FH^IpT2c@O3t=rt*@6}SeNX<$ZDhD!e7D2*ivF^QzX}a>X5s3
zS7%><e5%O>h8z{6M=t`{U*1y-sW$aIwq)0*(gMM~v+ll5Tkvd?w+OfLj_WI$A6HFl
z+WG2RWZd41ZZW46SgJWb94e9P*tNE!zhbJK%RXJtKo=8MFC$f@@{&#N-uHe^NW8gK
z=j7?>BCLWFK22SrvQT@yPUjgRc3Ce2F{Y19f}9g>ZM@)PF8fen3&(~7JghAiO2$jA
t)_%SA*Fp9xll7Sgj>mZmbHClZB2e4G$UPy}>{h{X-S2lw%w;(ktO0;Mv0VTF

diff --git a/images/sin.gif b/images/sin.gif
deleted file mode 100644
index 27f1b4ff1c2ba5d9553c5ddb4b5e8750ffce6692..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 960
zcmZ?wbh9u|RA5kG_|5<V4Gazc{~!4O|36cjqf=&`d<Ba`s>7UOiTC=){s%McPiFXD
zBw?9(jHiHsqlBTSSmJ~JvH!&k`!gA8^7In)3Ix*gI5N|>q%mAnXArPwaA06q#?JD#
zfq|Wc!NGxndCmg{i+2nn{~0*;M@(Tid)FZHpM_(;Lkvp~6N4E8g9rlyM+^HL%Z9f+
zEdMzi_A^~!XE1AE5Mg29aM;2ga<Rc&fJMZ?fn$%tiudMk|BL+J&$0jd8kQgL7})<a
zIP7P*z~X4iP$$B`!olDW;mBZC2hqw9Bf-pcjA1QvL;{1E0D}kz14nfPLxLHHfCvK*
z2g8p)Q^MI(Sr`Ny7&zW6JMjK(>VI~D{SF*=nYU;&Tx0`@J6zcE#Ps4@5rO{^?AOg2
zeu%KJb2vD}gj`@UH)RkJVc_7{aA%A5yNhi91swJ}B(N~pK|I62z~HEGtnQr_%YO%l
z{R|A785lGe7}yvX9Ja8qTx4JnU|{&MMM3}KI|mkq4-5?d85s66Fev_DaL{Mq0GY}#
zM}fipJp&IYz!(_*uro9@FtC7va?1~m5Blc+MMU;<aGXeZsA;DzD#FIW;lPlR!eC*3
zZyrN?6G)-wJQk)V1_c%d76*n6TbMswWcV+@u-}1U3lqbKUWWfH3@5h8XkIiI6%gTY
z;9$_4$H36Uz`!E@gSkncfn9{*#1;<CiwvRy42&!c48Ir{ZZj~*Gk_xX2?OI!1_mt#
zhH3_e1h6-F7#vglnctT&{7+@rU&QdOoZ)#9gM21~LkYv2REGBo|Np1%-(PX6Ci8bf
zF~2|w14rhP>b%B;bOr$h2A(uVhD-*A90rC|1_p(&8g-TgeFlL7299LiIk^n)QyBhd
zGVIr92q|aykjd~rhhcvX!;?&gorw%uxeN})3^n=;3FQm|MGPF-2j=KAzfWP<Uj|Cb
zq+=bB7EoSb;8@DQ$RXpgVZp&>R#uIe6B`yDZs%rnnBy^V;gK#0`M5JD0v{ghleBMI
zqfzwa$Rx&~WhO5-F7%qJ!&(!w)1bj=mQ4Dsk`7~)!}APN|J~`FxZ>DC{>FVKw>GH-
zFnYyXiEv(CdUbYirBQ3u)NJP|Uc2*jEfwCJpB1_BUdk!4x8d6ZZqEzN7F-v(JM(c^
iEcfPDmnS*CW^3c9*bs2IQqVo*&$N$8$GMo97_0&JswJ%e

diff --git a/images/sinh.gif b/images/sinh.gif
deleted file mode 100644
index 207e16b23986c5b4ba34567441c03684832e50e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 977
zcmZ?wbh9u|RA5kG_|5<V4Gazc{~!4O|36cjqf=&`d<Ba`szXe%#C!c?|AQI!Co_C6
zlCaD?##6w+QNrL;Eb&4A*#BaN{h16kc?%LUQU&w`IMO+`WNx^amMWkw;9$?Oj6vaT
z0|Pq?gM$MD^PEQv7R(GH(hM995h3hm?;1q@vvBNph+*krVlZQ15Mf~8Xkm}BY<SDV
z@}I+DKhqU<2D1hR5tc3NAr~9W1z1EJ95`weGTxiN{V(!=Kga&-IV?ZkF|hw<aM;gq
zfyL33p-zN>g@eH%!jZwOjzNTlfy03zMuM5?7{fZ|hy(^R0R|Bc29D|oh6FPX0TBis
z4u&6p7KXFOurP=^FmS9{7Wn>c?0<IA{SF*=nYU;&Tx4SqaA0t_uw{wq#kV2?|0CG1
zn>G9pVPWTRaEJ-Hz+`U9AR@xR!Leb^7VUQz+5QVS>~~0DVX%Yvgn@y<@xigWw^}U!
z9US&EFl=UE&|qL-V_<OD!oqTqfkA+Q!GVF{$Cd~B7vD0lFnnNO_|L$wpMgQ~2ZMt?
z0|&@phB*%y+}|<q{Ab|U&%p49ouR3Lfdv$lB|joQ=v(|35!uhd(U9=a+D=_mgpGs4
zfgxoIgN4Ptc?|7MAcdauSeTj^7O*fdIWQD#Vg7KD;lBXGeg}pUCWa5a4F6de8n(z-
zUo;mL5aDp(V9=b$z|h3Nz#{&Gxk;aaU4)@w3y1YZ22lY9MivH!UknVl85rcjj()<x
zxRZfFi-Dn<fgu6x6CMUf6@TXUWeopQ8TJ=3d@E;oUc?}u$>31J5R=OAUg7`$)cyM_
z&evrAPAKLVC}H5pTvDCan2^pOpuoVB#>kM#z>vehkjlWI5LTnklAzBZP{6>EtQ(Wd
z@IHm%e<s6zeFl+oh7Xwx|8p4j=P*3UWZ0R=pq0zuP|Q%H&yY~gAW+1>k?jzp&-gxt
zVSgDYDU*(MKw3a~fq`Qi10#ow$A$$5n^{>kVoq#Wc(|RL(P56q#Dzz?B;@1HoCth)
ztWVOuX^lqFlOz3%L2L#$3l@7#l?~q(GGo%hGqXfeqn4};K5%v(e<Rn9j>&00?Jlis
zr5Yxg7v|~LACfs0oDn!*fAyo1%BwG&=9=%X+LC#7S;YMGz_QjVu{SqbnXk?I`f8e1
z#Dbic%Un-yPK?`Es(SCMwfKj7D^e04t=Soo<~hwnaq<+OkA_dTPghRAwx=>Zy^WEP
G!5RR0Y%M1M

diff --git a/images/spk2scr.py b/images/spk2scr.py
deleted file mode 100755
index 03fa37519..000000000
--- a/images/spk2scr.py
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/usr/bin/env python
-import vcs,os
-
-version = '1.0'
-general_description = """
-    Reads in and converts Ferret (spk) colormap file to vcs colormap
-    If method is set to 'blend':
-      colors will be set using the ferret % value, and blending will be used in between
-      0% in ferret corresponds to index_start
-      100% in ferret corresponds to index_end
-    If method is set to 'contiguous':
-      colors will be set starting at index_start and assigned in order as found in the ferret (spk) file, no blending between colors
-    """
-
-def spk2vcs(file,cname=None,x=None,index_start=16,index_end=239,method='blend',verbose=False):
-    """ %s
-    Usage:
-    cmap, ncolors = spk2vcs(file,cname=None,x=None)
-    Input:
-    file                     : Ferret (spk) colormap file
-    cname                    : VCS output colormap name, if None, uses ferret file name
-    x                        : vcs canvas, if None then a vcs canvas instance will be created
-    index_start              : 0%% of ferret %% index, default is 16
-    index_end                : 100%% of ferret %% index, defalut is 239
-    method                   : 'blend' or 'adjacent', defalut is 'blend'
-    Output:
-    cmap                     : vcs colormap object, with conitguous color set from index_Start if method='contiguous'
-                               or spread from index_start to index_end if method is 'blend'
-    """ 
-
-    f=open(file)
-    ln=f.readlines()
-    # Treat colormap name
-    if cname is None:
-        cname = '.'.join(os.path.split(op.file)[-1].split('.')[:-1])
-        if verbose: print 'Colormap name:',cname
-
-    if x is None:
-        x=vcs.init()
-    cmap=x.createcolormap(cname)
-    x.setcolormap(cmap.name)
-    ncolors = 0
-    last_index = index_start
-    if verbose: print 'Method:',method
-    for l in ln:
-        sp=l.split()
-        if len(sp)!=4: # Is it a line with 4 values (p,r,g,b)?
-            continue
-        p,r,g,b=sp
-        try: # Are the 4 values float?
-            p=float(p)
-            r=float(r)
-            g=float(g)
-            b=float(b)
-        except:
-            continue
-        if method == 'contiguous':
-            x.setcolorcell(index_start + ncolors, int(r), int(g), int(b))
-            if verbose: print 'Setting cell %s to: %s, %s, %s' % (index_start + ncolors, int(r), int(g), int(b))
-            cmap=x.getcolormap(cmap.name)
-            ncolors+=1
-        else:
-            index = index_start + int(p*(index_end-index_start)/100.)
-            x.setcolorcell( index, int(r), int(g), int(b))
-            cmap=x.getcolormap(cmap.name)
-            if verbose: print 'Setting cell %s to: %s, %s, %s' % (index, int(r), int(g), int(b))
-            dr = cmap.index[index][0] - cmap.index[last_index][0]
-            dg = cmap.index[index][1] - cmap.index[last_index][1]
-            db = cmap.index[index][2] - cmap.index[last_index][2]
-            for indx in range(last_index+1,index):
-                p = float(indx-last_index)/float(index-last_index)
-                r = cmap.index[last_index][0]+int(p*dr)
-                g = cmap.index[last_index][1]+int(p*dg)
-                b = cmap.index[last_index][2]+int(p*db)
-                x.setcolorcell(indx , r, g, b)
-                if verbose: print '\t Sub-setting cell %s to: %s, %s, %s' % (indx , r, g, b)
-                cmap=x.getcolormap(cmap.name)
-            last_index = index
-    return cmap
-setattr(spk2vcs,'__doc__',spk2vcs.__doc__ %  general_description)
-
-if __name__=='__main__':
-    import optparse
-    op=optparse.OptionParser(usage="%%prog [options]\n%s" % general_description,version="%%prog %s" % version)
-    op.add_option("--file",dest='file',help="Ferret (spk) colormap file to convert, [default: %default]",default="pal1.spk")
-    op.add_option("--name",dest="name",help="Name of the returned vcs colormap, [default: uses ferret (spk) file name]",default='default')
-    op.add_option("--out",dest="out",help="Name of the returned vcs script file, [default: file.scr]",default='default')
-    op.add_option("--index_start",dest="index_start",type='int',help='start index for mapping of ferret colors into vcs colormap, [default: %default]',default=16)
-    op.add_option("--index_end",dest="index_end",type='int',help='end index for mapping of ferret colors into vcs colormap, [default: %default]',default=239)
-    op.add_option("--method",dest="method",help='method for mapping of ferret colors into vcs colormap (blend or contiguous), [default: %default]',default='blend')
-    op.add_option("--blend",dest="blend",action='store_true',help='end index for mapping of ferret colors into vcs colormap, overrides --method option',default=True)
-    op.add_option("--contiguous",dest="blend",action='store_false',help='end index for mapping of ferret colors into vcs colormap, overrides --method option',default=True)
-    op.add_option("--verbose",dest="verbose",action='store_true',help='Enable verbose screen output while converting colorcells, [default: %default]',default=False)
-    
-    op,args = op.parse_args()
-
-    if op.method in [ 'contiguous','blend']:
-        method = op.method
-    else:
-        op.error("options method can ONLY be either blend or contiguous")
-
-    if op.blend is True:
-        method = 'blend'
-    else:
-        method = 'contiguous'
-
-    if op.name == 'default':
-        cname = None
-        
-    cmap  = spk2vcs(op.file,index_start=op.index_start,index_end=op.index_end,method=method,cname=cname,verbose=op.verbose)
-
-    if op.out == 'default':
-        oname = '.'.join(os.path.split(op.file)[-1].split('.')[:-1])+'.scr'
-    cmap.script(oname)
-    print 'Done, colormap converted to VCS using "%s" method from index %s to index %s\nStored in file: %s' % (method,op.index_start,op.index_end,oname)
-    
-      
diff --git a/images/splash.gif b/images/splash.gif
deleted file mode 100755
index 3fb4ad9ae6145b376ee7e4bd0340eb2ff2a02675..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25144
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
Y_wGa6<`vz$Pjv5n(fwRhfPujp0OI;H&;S4c

diff --git a/images/sqrt.gif b/images/sqrt.gif
deleted file mode 100644
index 5bad811d7db4aae7ab61a37385409ba5a4b55ec1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1014
zcmZ?wbh9u|RA5kG_|5<VjEszIY;5f8?3|pOe0+RTQc?{J4gdfDf6s92KLf*l28Qnp
z5|#|dco-Ns7#M8WB|bD9`_IC#-+`e<z#+kcQ9y)&gM(p<h0n!z?*#t;ci6vw8T+BP
z4e!`l{yRAAXTA}|V8Os30@57e!fy7iLF7LR$9{(xmI@{YGl)bByN_kVTOOAG91i=L
zuCOzhH86;<FmO0*VRyLLU@pKS;^4rMqY&}l{Ox~{|NA-iUyot=@s5H0KZC=5h6^l?
zrVMo=3@jWB4iSzFW_1v)3^5W6Ovf13MKC0oF;p|SCU7tbFfjaJj}C8OVqsx$aA24d
z!tmaL;lBvOeh!AaHH_Nt7})+ZTv+nN^xaO8|5_33EM^T1F(E6M%##>I*cmuDHuP-K
zes_`WzktJjhXfV|JFwFk94{QJd#lCrpMhaB1A_(w0~-T_!xk2niwq173=BWET+qMx
zRz%?c2Ns6+3=E1t7##E&I7ArcTwrj2$H4QSfnz@d!ygugCI$u;kcN~WTR!Mt{4XM~
zpTof+;bFO*x~K>n2Zsa0f*%YP`V1l>_vSIQH!*n5`@_`K^nith)xjZQ3-gDI4F3ff
zQkWP%^fEYX;V8doE-E0x;lRP5IgbHswD=F^CVd8W5r*=M459)Ij4TWczZe*9Gcd?A
zFg#&k+{wV8#lTR_z>vVeAi%)D!;mAw@Zmkf|Njj8_cLUCWBBl#;lDgXiVypT_YMF5
zv+UpRpioorA;IFmfXIFhj=*a6ri2D|0TvD(2M2~V<qQ_03?dv1911lY3<>WT1VElt
z@B#ZDl9*T=89vl8fD@3w6N%3|kNwwTV5pH`NI1seBf;?g7$`;35$k~L0_6n;j@t~3
z95Nmo794D571W41v0>ric5X(8IUW-i9_ixX%eZr5<Ktu9BIZdk6%0>YdX+tAwR9LQ
zJv5a+dRNQMfF<56CX%P-L>8(uF*7T(9liOv!IjB^RY{{DFw?KqtdL7!m53w5@_^oJ
zSAJbey1GP2)lK!})D=e=#o~)fUR-`1($3J+Cwu!tcI+mr(}&J-7Ny^AWqPyh?5Wb_
zCmFRJXXQwiYTP)Ow%JQe>cP^-2LwN#(v22%Xgtp1v(Dw^WQ9=Xa?}65mb2cSJ(2Qt
aU)#%HYQ8r&C+}<9UH#<pJ#J<u25SJt#4L;e

diff --git a/images/std.gif b/images/std.gif
deleted file mode 100644
index 61e29c4ad7cfc08d5387d5087da8491b854af16a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 151
zcmZ?wbhEHbRA5kGc+3C-jEs!T%*-q-EUc`oY;0^C92}gSoLpR7yu7?ZLP7@^4*W*~
zIv^b&y$mcq6Ha=r-fQvt?C$>w8ht65^D?q@b6)RypuJz-cB5*{!{q9pN)Nikqf<&u
rA5VOd$T!vVg|W&Uv85s@U!LcLN#4@_a(nX119vx9oy}XU#9$2op`kg&

diff --git a/images/subtract.gif b/images/subtract.gif
deleted file mode 100644
index ece53af6fa0268426160ec0b381484f94e5d1f26..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 978
zcmZ?wbh9u|RA5kG_|5<VjEs!T%*-q-EUc`oY;0^C92}gSoLpR7JUl$Syu3m}LJ|@Z
z4Gazc|NrM;V9;Tg_|S0dKMTWt2ZkB}fdq?G0TF>M8X_0pr3(BPaM;hWjD6GFhIi~N
z{~a9mGv9c`V8P5FBF(_z5Mjb@_O3zXKMTixhZvR$CI&MG1`!4Zjuv(s%Z9f+EdMzi
z_A^~!XE1AE5MkNE?r^ceT!2Ny!GR-2!Q;L8+y5f}_jByO?!)rq9RvG+28aC&7g!uk
z8R|qBSU4CQA{-ga>KH^=7&sglVk8)tjxlVCU`Q}y5D;PD;9#g`*q6YOB*4JV!@%)_
z{a|>54GW8CPsqdf7B>GyME7%W+|5~_{q8N>|NjpA_g|P2XZns+<iB(TJC9jIstAh!
zhXY4UhzOH;Duajs0|&>3nl0MzF0z3<>yW_0U<dXFgX7v`byu`lBpn<a7#N-~FzjSt
z&|+Y4*ut{mBEwq&hW`!>`+sbCqJMFxh=3M{gTn(BhW88%{}~weGcYLrU~tf9;1FS$
zbAZA99RtsQ29Es<41X9HnvOBBXfZfAg#2LmpwIAMgke7igF`|@x!pTak^dYV`xzE6
zGgyGF=U})uZ%cdAMHUtT&v^_?O~)RvXt6pt1Z=tR;iBn(0g?R<93e~>KJ>o*&+>o2
z!+wV?Y~>f<i3+eYXflich-lJ($1d{UVGC3FMFvp;21XVJhF=T}w;34Z85lsm*}}N<
zB7>FyL-hxSgtrU={~37p$FPWhc>nYNfA;<R9U{J6`0(8Hzr09@4f}`p4gdeM2-FmO
zNU#X3W^YPpU>9KF;BjzZSX0hmA<7`a!N8$V^Miq7zk&@?5PWfDcwff=NmWlIKJPsC
zUyFgEMuH*X7=r)<gN+2k`(vP#N&~C|G82>+7&x{wFmlLvY*=uxnN?OJ=ER1DhugUs
z9p-pUTzI5QLO$-yiNJ@)`Xud})@T$xIWkGjblDe<hDO&;Y4%MnCoeS~=rBlUvQSvi
z(9B?>e{T(EaicpkM-HE@X2=TPHjX(#Q!*zv9B=a$HM?=DG~2hIaoxV08(Uw8FHI^e
z>yiAN89KpyrB<)CiT05eV_6M}hVLmySj3(`n;TW`@L)=*>m?q|3k`>lYF~B>v;3Kt
VdV0Ei`n5ej3(`-{WoBZq1^{r$D>wiE

diff --git a/images/tan.gif b/images/tan.gif
deleted file mode 100644
index bba5910b4c51ec47b7b3bd8f96ec6c0f9c71d662..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 959
zcmZ?wbh9u|RA5kG_|5<V4Gazc{~y?&&cKxB=#*I}U%}##>M*BR;=TT{|G^CVlNr7j
zNmync<0)X^C}HR+miVB5?0*Tv{zQhFJiP?H0)g~Aj?DBeX$%+D83gPZ92gjuv9r8w
zU|?rqaByH?p7Vgg;vIv?e+G{I5mVUB-ZhB)XW`iI5W~{L#9+q2Ai}`F(ZW8*vf(Wc
z%YP1s{Y+Qb8O$0OL|7O&9Ja8BTx>8GU=eX};Mk+E;=TFX|04hQbL_vqhULdQ2KN69
z4*MA{usE7B)QK>#a4<MTI5L>kL9{Z&NH8-UV_3@^k-%Ukz#ziGz)>B+kYL6kAi}`I
z!SLhHlyLS`76t(a297t&4!nPx`k!53zXQiz<}KO`7ui7K4i~mOF}?U!MBsk}`*pL1
zA0jO591adKAs3j;O&LT)7&tgK+}Wc2?jqZN0f+q#2`mhD5YI3$FgPk4t9z%#^54N>
zKLf*N1_liV1~vu;hb=5D7a14?7#MzRQP98m&VhyD0|Uc<28R6%42nM(9P}ADK&CRx
zQDAU?&%gr;Fb0M{><mo}3@o6a-10-?gTDEH5t02I948VUYTBubim-8TI54E7Fj$!1
zo5#@J1XAcZkA<m;L4k#V#ereN7UmBZ8U70}>~~<;!o={Qm*GDP!-*|2nitJQ1w=R;
zI2bhNF)%bSFtCXKU~bZ9U>9LHv4unPB7>*^10xFq!!HJg+YAiy44_DT!oawbfkBIb
zp_+jq0qhMP2FDbC=J#a`|5F+E7cqP*XLw%3AfL(LP{J@LmEpa@|Np7`_g9>$$^4yA
z%r8*Fz>&G6I<GMyok2i>fhUcTA(Me2hk+rLfk7dxMx7-=pFyC2fg@RWPA<dy6o&tq
z4EyyNLdqFFWHS8EVc4I;@FbIAXCi}EE`vicLybN|LOFv#5d%l|o;mu=?^77|mw}Qp
z=~xG(1(X*UIF>Lla>#gWSa7hJl~p6=#D;~3+qoGX=6Fn8c%(~0KJLtkz=y~BB<-8l
zXcRp;($5&QiYMWc^5Lmk(OeEICoJ`u&YgQ}Ph`*mzYcp-E1#LgsTXJPdH=hzQ+U~h
zHpgtUvp>H)^<HASQcZT%)#X>$M6WN4y>(UT%BGZqW+IlMufo?S9v7>XE`1ib$l#;U
h*U0V9&vw-Nv$ef2FL=1Wy^?R;E{THVHbzDUYXD<tB~SnW

diff --git a/images/tanh.gif b/images/tanh.gif
deleted file mode 100644
index 60753ac6abb4f1a6eb81dc3356a6d7aad547e6ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 972
zcmZ?wbh9u|RA5kG_|5<V4Gazc{~y?&&cKxB=#*I}U%}##>JU>b@m~Mf|6qpw$qe6%
zBrG$J@f0v{lrZ=dOMK8j_P>N-e<DLo-hzaTQ~^B!j&zPKnHw&qr3$DEIM{P6V_5sP
z;R-v8q=SP4^PEQv7R(GH(hM995h3hm?;1q@vvBNph+*krVlZQ15Mf~8Xkm}BY<SDV
z@}I+DKhqU<2D1hR5tc3NAr~9W1z1EJ95`weGTxiN{V(!=Kga&-IV?ZkF|hw<aM;gq
zfyL33p-zN>g@eH%!jZwOjzNTlfy03zMuM5?7{fZ|hy(^R0R|Bc29D|oh6FPX0TBis
z4u&6pZichhvM`7`FmS9{*7^Qz-G6q`{SF*=nYU;&Tx4SqaA0t_uw{wq#kV2?|0CG1
zn>G9pVPWTRaEJ-Hz+`U9AR@xR!Leb^7VUQz+5QVS>~~0DVX%Yvgn@y<@xigWw^}U!
z9US&EFl=UE&|qL-V_<OD!oqTqfkA+Q!GVF{$Cd~B7vD0lFnnNO_|L$wpMgQ~2ZMt?
z0|&@phB*%y+}|<q{Ab|U&%p49ouR3LfrW*^!J*`b#s_`#{~{v$IXF5J9=hA9i;A#u
za5yleq%c^R-<!wK-ULy|;5m<lsfl3$3j>n_L%|m24;LB!3oz_=U?^c?_|VJnpM{}g
zi;Vk4b5Q{i4hIef&3OzAO$-by;y;+1^cmPi7&^9axL;%t6<}awVPN>hz;K&^K_2Yx
zCk%``85pz}7^)c<62P9}VQ^IOXMSJC@IRGde-XpCa)#$c4Dy)_4kZjRsSNKG{{K(i
zzrW%_P3G@}Vt#=V29C@n)p?Bx=?nr23_NL!44DiJISdS`3=9fkHR>!0`V0aE3>?Y2
zF}V!yQyBhdGVIr95GiN)kjd~rhhcvX!;?&gorw%uxeN})3^n=;3FQm|MGPF-4l(+S
z?^77|mw{3<iC71u9+VdtI5sjca>#gWSa7hJl~p6=#D;~3+qoGX=6Fn8c%(~0KJLtk
zz=y~BB<-8lXcRp;(#sgMis!(@ROcz$!P`nYf)<|cGgsCtnQ5Ht&!}2&^yg>r5}(=H
z6IX>)U3n3(#HUh?^;W=(i?eOYtJYYRtn^*Wv>~td*Vdef4M{8C`BY!axwc9E=C--N
zx8=rcNW6KiwDS7exb4Zw&qQmcras)L=BaipqUfXdaS>@}H=Cb@sk5dVrl&~=FjxZs
DHgYOX

diff --git a/images/templator b/images/templator
deleted file mode 100755
index a8c9f2e9b..000000000
--- a/images/templator
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh -f
-unset PYTHONHOME
-opt=$1
-bindir=`dirname $0`
-if (test "--help" = "$1") then
-   echo 'Usage: templator [template_name]'; exit 0
-fi
-set path="${bindir}:$path" #in case of respawns, get our python
-exec ${bindir}/python -O -c "import vcs, gui_support;vcs.templateeditorgui.create(template_name='${opt}');gui_support.root().mainloop()"
-
diff --git a/images/tg2_20.gif b/images/tg2_20.gif
deleted file mode 100644
index c2390d374da6e88429f164dd27b3dadeef2aa47c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 825
zcmZ?wbhEHb6k!ly_~ygFz`!6WC8esWYGq}`>l7vLpCKJwpzG{m?BO3B9UYsIk`^17
zo)TA-5t)~lmsnI>oRe5zl2lPvU|%uEzILH~+e(Ly)eij|9VTy1=v|mHX?gyvja9Q(
zmCo5zwQhIS+Jl`n8J$g~lUwp8c2=&KTG`#vIHk97+N6%jlP4{hJ89XnIXf1&u3Wit
z$>tp!*RS5XY30^!+xj;hn6%^M+EX{Tp1E;ob=S%5Gq3EOb!_j-(+AcZKeqGgp(WSO
z?!I?v&!aOdAD-Xz^y<zNCr+HXaQ4LID_1U`ymRNyt;Y|a-aPpF;n_FOZ@z!`=)=3m
z|Ns97`EyWW#h)yUj0`>uIw049;)H?yUjvAZfqgImgO8)Gj*gzbj*gyz0f?o+XTjiT
zVB!P=&dyFw8jPF_1_p-0!lEK#qN1YW5)u+}222bL2KutX!os3ZAR(_064UYabZc<-
zh65dtpq8hbv6O+Qrw|CJdTKE;Fz9M}7|F8oyYPUWspz7?$iSed>0!&lp>AcNuBNQ2
ztnaSQ#K54V?%{5uZ{hCl?%?2V>*B7?2oiH}aItcLh&ebosDZ>39b8N#wd@@Pd8aq<
z^71O$D1$}q4Q1K5thvFq2%0H?#1!l-S=g1$w3U<;6cn`0L1G%brlu-NDyF6?+8|)c
l%fP^(!N7<DKt>oagGgk|$>3w4feIQl92qc!+NY7h8US4D$anw%

diff --git a/images/tg_20.gif b/images/tg_20.gif
deleted file mode 100644
index b26ab878afa72193d8a6031962d64e61348cbde6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 743
zcmZ?wbhEHblwgox_-e!e0<xOw8XBf%W(?M$QUSU44h|lko)M9e85tS1wYB__jneUb
z(uw`j8B?VSdt{2{%2X|pZCn-Ey)1V2u7p|J=k}GYoL;kfPV3rb)3+_{+Pr$s_Kk~o
zUwLqT+r+E8rybb2>i&^AH;*p6d1l+)OM4z3oA>C<%4b)1p1*PT_O%m-Za#f}`^e*a
z7hXR+`{wzL4{slQ{P66{ukRpN5r-9jvM@3-7%}L8luIy3Ffg$FbC~I)Hu+?V5s6d-
zl7?U(5w2F(g#j8O5=UJY21GD0%=B5-aWrXTgpOD@j1pmJ@LATu$lcR+_+f#A!UPW$
zrHM94Tnr9s!3QJ|f<hBr5<r69dlC#Jc-Wc`f+^-h3F}!H6eg?2tq*U1RCO?J{q@&h
ztM<l$1r=lTre-;L?2G~Vih&_Q52R8tYTc<N3_Jxv5J3wCF(!ryCk57C>k>GT6Qq3(
z<Y%)bV*fy*d~2_EZMoSKwpz5)#cE>E>Z^<#3@1|BuV!vlnj5zIYF25~+OXA^UokM8
zNNKzLa>=3|zvY)-l~~R7TYdQ@NU-_x%H~-DF3W`lz?L<<FkxUw*>vz^$V?q331P4p
zLysFs(5UgGiV};C_(YH5oiTdiXO62dFr*kQSP-IBsVDBg^2^T}yZPsrhX^q+7)d%P
q2yn14HNq(dkRZe`2<ZT!7-ssgL0Je2DR$5!7dhtGK$4LH4AuZ(u?;!^

diff --git a/images/tg_menu.gif b/images/tg_menu.gif
deleted file mode 100644
index 7e08f4ad83538d6e03d87e4929a60061395b8ca8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1774
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
FH2|K9fBpaf

diff --git a/images/tiltedpin_red.gif b/images/tiltedpin_red.gif
deleted file mode 100644
index db91095014e706c3169ad1c981ab32a3b039b239..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1067
zcmZ?wbhEHblw^=(cs`XO$;ocFtl~Zyl^t?=I~5fUORFA`Q$8xIep*iIvXtrxS(5`Q
zs>hVHk1OgOQPJA3u5naV=b)O&F%89&s=7B76wj)up4X7NsH%BJUFWi@${9_KiyCU{
ztW1yUo1N4*xT>vwQ&aP%meyWVhg;g3n{BOkSlOL5usv&Naa%|Cq>06OLyHr}jwemc
z=DPczF*QA8X??-aai@dLWiy>~=4Q)1eP;T{oU*k&Y2$s<+<JC!$O${|oo>DdTs)sx
zn4fWSd1_%XGbV0pK-i3!^!bT-OA<5Zq-L*)Pq^h7dCfO`T~gNKjQoc_$#;T6wkH<O
z&&yk#mG#s=<9=AggOIfKd1cq);~H9;Yg^kJTAN>lr=7?sIF*y%-QC?gdE&yp-t$#;
zr>i=r&X_i3){LpMW?X1)oi%^XrLL~c^JZ<FzvyP)#LWv9EnBv1-@N7f7A-ioeDSVz
zt8Oe_vT^&?O*^)oUbkw?&TX4^?cTa;=eAwjckS7JYWtRBhYlS)dgT6*Q+H1sJ9GKU
zm8(}@T{!vr%Jp0KZa;o>>-(*%KW|-pb^qayTQ|PkdHUntttZc)Jb(WD`=k4xo;-g2
z{Q0X_uf9Ef`sVH1?=PQ!e*5nIhY!!cfB!!UC<_6_f1=Jssfi`2DGKG8B^e4K8L0~H
zp1uJLia%KxxfuR4=rAxaFn}@(1IK%Y|C};A(ia?T=HP#Hb91}@p?3D`I}SQGACvD8
zIKL)RxS6@rTtax3VKE!G7`M5T(w@V|eAs1;3N$hn6)jM5EmtaWFks}I#1@yu6*6V{
z(Pn1muz-n7i9HwUE2S8<j219(YX-<n`5FFVLV%Y)hd{u_l#@+5!OLnYUma;^5O(*e
zdBEuGGHJOp3(JKD#={+wN<6lI)t@kR@!BrBp<wbOewM6;lR>A_@{jxVERBAAU|it8
z;8<+Kl!}XOd@~$6*|?RQQZCwCmz{{H6Ulrq$0A8bzK6NJJFmI$QOr-<4Sn-;kFfsw
RxLEC{z5BVv>O33_)&NScrltS@

diff --git a/images/toggle_menu.gif b/images/toggle_menu.gif
deleted file mode 100644
index 3a2e664df08f4a931d7a7e049acb822391220b18..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1096
zcmZ?wbhEHb)L|51c+9}?|Nnmj0|N#IhR2T|A3uJ4)v8th@2n^)Dzdb+3=IwK>+6%1
zmHm$d6#t1j7o{eaq^2m8XO?6rgk+>DxO@5rFz7HaFff1&WnlRyaKdx-UW?afcmGe&
z=u63*m$7PH&g*>zI_FDr?^mp2-(&D|*Mb5MokdJS3JxnJdE8o>N}{xK*jSVmvZe~m
zo2$?5Em@-8^5&^dV(<}}mA{<W4u*R)Pnv1j;2guj9;8|$#>y$fRjkk1%*El)nI}0}
zr$dC5iA$K7sZ-oxL7UJtUk)x-_66;0q`MiGX)|r9_T1XGPI;5cl9{{2_vo^62y-2f
zKBPWFn3eme(1a7-o+qb>a?TOrxPC_Fl;OVoTS7LBkHj{yaB$ucV&`b;WPZ~$$KlA^
zdWN5z+_4{6ax0f*-nNnda;x;DcxU|Xir;e@6_Za2HnFnbI~px|+RLf@U#ifL%VOu}
zyO$}&Dn>D|g(?M4tI_!3(tAK_vMggwiL%hy$#eNkx$Yc#C*PRPqO&%5$J!UBJUcQ%
zqk~R2$#Z$EsGM*#XnB9>`x==G+Y~NdXU)A}Cj8-vMgy~Ca_W{Ah0{!1W{9OoF1W61
zzbDJl&*6h7<BTpzTS4C0!R!5w3k$trRZ=*;F+wHO>X8e-u#fhX)tOn{*Cr+J>*<?j
zTO6gYwqvPLS!wh|ukfSZI{v>K)`hg%OsRD_x^2Q$m0;GXU#6V&<r2=n!{YfcBlFEE
z#+x?257{!i_|s0EQMobY@)Z6j&$%<EEA6;>X61}26~!E3j;p4}Ci(q6*L8cz*CPS{
zoETK97;nTVU0PWbWBk-JQ6?kz%`?Y>(1niYbc1q3V^TVFRAN%n_Fk1yJZsZ&Q6y61
zX@{1Opuz!>R|lDs11x`D@vJg^bi%(%@6Zl^>&Y!*Q)*^09tet^_mq8M*q=fR&;DQ+
zmxG1@UW)T3HlHwzZ@%}!eKGs98;cGy_Do3NiWh#d)FI~m)l>n~GYQi>qui3V3#dPH
zb>cDcnjo33^k5_7Y?h2`VP|Jud~icuIqA`4jue@xKdv!WJluYE(n8D0%jQPyJ<5^7
zps*`rQm&5E@}>VTzMQdGA?0dDYx7ctZjX+JO%7Vzb3zaJD4ufliOH?`wAycl#)BEk
zlUArY#4tV&lDfU2aav(g1Fv7{YGVsC@8vAlg{HBtKKCZ-ntrs7w8+v`e-5j(obx&4
z=XWdYfsfV%8$o@wFE`5H6c+ysyjZx{<%SkR)t?QHGga<vbY<+RaMw6&J6DkP5V!f7
zdxz~;7JfXO<KweJifg;$BeC4Z!nVT&GaNflMWkGGmDP$4IDWLW;!c}**b^Pe!*M<)
zMUq7fe?Q5DEjqZ_@72LXV|)4LhVFx|0-w)$r`RrS<qX=d`tT}KajbK`Spb*dMsdd1
vTe*_VOU&4!*X25eIPKE?ey8Mm?)SSD&)0sxSM&Yt_xla(dOHLJ85pbqqPpNJ

diff --git a/images/trashcan_empty.gif b/images/trashcan_empty.gif
deleted file mode 100644
index cbd89f784853939528324baf11f1fd12c9080723..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1500
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

diff --git a/images/trashcan_empty_20.gif b/images/trashcan_empty_20.gif
deleted file mode 100644
index ecb0c3ed762ed2fea827a0bdadcc58c8d63511aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 444
zcmZ?wbhEHb6k!ly_#(i-z`!6aEv=!UVQy~j<>eI-5s{IRQBhIR-rhca`t)VXmTlj@
z{rK_Y*RNlH{`~phzkmP#{}0kbG*<k{!pO)Vz@P)t0kV^U_1}U5iMB==H%5k|g)(i4
z5=|d%`VXtPB{q088l3rTb3WOoKS+eLSm0=Z0Lwy~^UPBI&Kf?SRoIL~JSPd9{Vd^M
zY;*Rq33rD8`yvgO&o;*{i+De_;N7g_-6YcV*=E5<n~p{e?@0<L0(lre+4O(3>A0l9
zS=7)LDAL*hGMs;s3h!Y9k0c4#29V+Bn^ioURk|h$un8)h|11IGF4p0!P-%7KIPux$
z*k^^#ODf()Q0{_{HXe&iPEL~XOcY=O8_v1N<kX}FjwA`F;Y}L8n>0LvBwApGb51tk
zY?5G8gc^QsvXu;5heB&23)plE_f015O)Bh)68&JO_g_|EE0S=VXmb9uP5%d*^Pg?b
Oe{KMiHs^(z7_0&3TAzmi

diff --git a/images/trashcan_full.gif b/images/trashcan_full.gif
deleted file mode 100644
index 39acb09dc13cb93f6d1907820d2cbc999eb5a29a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 993
zcmZ?wbh9u|RA5kG_{PA%!o;F7k7Z4p&y#Z|E>1E>jvZODY>A2*%bRCczI^-g<k*rk
zt3tMPg*<uoL`O~J%d<NoLOecRJ~>%AbE<s4ynAxx+LbNaw&<9dOqn$0$)hJVQ6^8$
zt=Tfk=gXrrGEy=nWhH+;J>lVEX=!S?b85|>cU%7a`;(HCGH2eLEt6u_tXrd^r1Iz6
zmov*sbo6xI+}aZo6!PWMmp%LT*jU-z+12yr(vqI8o;{OdT%26aoICU8-J373?udwq
zloXZ3M8%ZcO1X3I&YW3uROCcz>S}oSc>cUQa%WQw3meOtwvaQY&g^-&B`3&a&8jtD
zo?UrzYE4g`%bQnkbhLCtghY<aOY!mZ$;r$4^6pK^xtKe*?(EsM=gPi0Q>IOMa%f6T
zoQaH_OifkIl}lHaELyT<)0QKLj$Bz)^5)W(C3QY6Z7nHjDIsAYHg+~WeLXI2E-`U2
ze?Gn8;o|x7>WPY)%Aa3<7>EWsAeErFU||2(z|hp((%RPEs@m1v#n96~VPf9|24%Va
zriqiLD5zQ~ySXuldwMoG=gsP!p{%MctJtN@7-q*1sGU1=a?c)B1`*Xz4m}2cUQvtV
z4AH)N`>j;9W^_-r()N+%VvrP#_b^Oi;4wCqcH<XOh~0aYflF3a&zK?HP*ao5o571o
zhsDIoM&skM*u{=qX&#IL37xYw0u^`^oR|*H(2X>Ev7jJRR7Ep6fFYvEF>nrxj2KUW
zL7S_X(MKM;U4d=hBFt%zY<>nR9-qwPrglSP)6)k1`0jN}0+|?^JLEl%BzSH-vT(9;
z@&lHIY%jSOB=uE1cBC`#2<S%jWMnX=p5<HjuYaA1N5G@bRul6N>vn#8#52`cFlx`#
zlP|m)^;L@$v<<$th#5Pn%xPp=n!ME`{7i&~qDu#>3fs9W3`x)2`cF=MC>FMPryH*h
zt4e_2qNT@pO;)hSzw2W3=DaReaKg;F%9mfbAV}D66`S`Qsk0MLhy~s*$-C-lxFt<@
z4tuWPvGWH6dtxt6y}o~|vgKz-m%=+!bgO%^k8PLKov*q@y*7H!r@LQr)7r`o)fU8O
z9#>VruRr5zI8*8Txer-Omp)vUP^tPyp(WpGg}P#Erpk}|HLaB!Bij$o+#uhSzJj4O
zPetu3Ymz*}Mi!x*3da~;qX*mExL4{dKfy0~Ab^QKiov7NnLqAAS{u*ug@TQO5=G9_
z3z9@GGz*x{Dm+%G@8Zy@rKM1KM!aWf0aIpNfFWy;;W?HAQlbipjuHtOij4}{8BEKy
K8k~eU7_0#e&zn2|

diff --git a/images/trashcan_full_20.gif b/images/trashcan_full_20.gif
deleted file mode 100644
index 97ed55ba861960dda5ff3962222823ca8c076fac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 825
zcmZ?wbhEHb6k!ly_?F8csUxl;BciIJs;RD_t)s1_Yp8FeZ>p<mVq{`tZDW^a>||r?
zWoO{;Zs_T5ALVD48mgZhX;&JiTbpR>?Cj$1?&;y?;p^+?AK)Jn=ocIi6dM~G7ncy1
z5SJDonh>9mkQkqn8IzoxoRgKBlarHQSXhu>P*hk{Rb5qA*;wCL-%wY(px(c|v0_?N
z+O*D$Wz7+r=lO1*nZ0p(Y5U#s15;w3U#f0yZtm^vnKWtg^vN@3Oq(%h&YYQZS1y@9
zbK%@2+m`h$U9x2Ps^u$|uUNBo&DO13x9{A(W9PPAyLR2(-gbTa#M?&}-@LH?>4E;o
z2PPaoa`?ot6K78xI(_EMxeMpc-92&c!o|DSPG7!q`TC9PH?QBkedqSo*H`X6xPSlQ
z;|Eudzqo$%^|SlGUS9e6^5*~V_Z~fd^z_k-=P#eXdGq?~r+5E<KmYRe%lDt(|Nr~;
z_upRzvVh`G7O*}Y5DAJC2KIjq%qmLK>fEAg>S`(~YAVvwN+6J%otvU<mmZ#~9+Z}l
z3kFKLxe;<1VTzhuCJY=J79K&lS=matQQB!a4jQ>3(PCc7l7SWxx!KaWsyy+D#wtNp
z_S^<W`bi1yx!Ll$E~3hQIx@~mDu!kPp5B@63AswS*|}MI4MO4`xfyXjyr#Z_j=9-N
zx!GB{R*X^>9*&N-?81^9*|}haxk2ISE-EU@vdYq|oVj3i*}47!;ZEW97M4m%Oq{t;
zb#89{TK*~;mg3R~F%ORbivSfZ3n`GgY>0UvF@H7l=?xYVV3i=7b8}ri0xbO1%`G8f
zAeGs<u5SJyF$;)^5Oq$j{uchK=1?(^y4>8zC|3&)6?02bSq>JcYtn6U!!12jv@DgB
tMa**{HfN>STe}1}S(}S<nCIp;K%JeNW$l)c5*1|al$)EKo88D@4FD_4F)9E6

diff --git a/images/trashcan_menu.gif b/images/trashcan_menu.gif
deleted file mode 100644
index 1b8b1af82d7a3475df0699284426825fad13f4d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1757
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
X5n$rjz{s<v(@TH)$unteObpflhiXWO

diff --git a/images/unlock.gif b/images/unlock.gif
deleted file mode 100644
index da0b2f547f6573fe644ea0fbe233fd7e37bc89c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1048
zcmZ?wbhEHb6k`x!c>aY!L`q#s$v{fkM9)6T&^gJ(IoiZI(bPG?#3j+hHPOU1$<#g7
z+&#tIJ=@GH!`e63#=posu+%!Bz%sB%KCap}pwuZa%__LcBBaJXsKg<t+%BZXKBUSq
zyv`}S#ycw8HM+$qsV6Y0NI!34P-=T<TC;2Rl#tA7*OHkLxzltTmML~Fh|ZfL-?vD$
zduc?`Lb=|J(Zx$WTUI1iF7a+&tvYR8Z0)Lqy5%Xg%arDBiEUb?Hh-J(tgX89clb?M
zufJetQr8BP`Fr&j?KW7nE4^cb!J<9-i}&a+-fOUAkKWR~221wlbZpaDd&FqvA&b?=
z4A!5Hp1Zqn(r)7o$IB=0&Y8K-eACIS*?S6R>@nYR&S>|Ql6iX_w_Wkva=CfdQJZ~N
zb5|X9+IP);&vp0Rck34)?V5Mk`q1sPbyt1%T<utVB5LQ2*qs-0H=XTSeA4IO^{%C-
zd=A}C+Ihk7?7M{Bm%3IQFWYcA?7;QXjaRa_-Avwfw`JXl+Kp$rS0A6W;^f2?XC|#Y
z)3)JE?!HT*C+@Xvx=_6P`lR(|>UUf!-+Oh!mh<&{F86G^IBCoIv=et`Z@D~e$Atx3
zE><7A*}d;h%aMD_w_a#De#`gX-x&w4)t|Z7ckI^mLpPS}zub8K!IJ$q%C0=GzxX`%
z{?ESC4{NVHSa$H{@`E>*9lF(j_Fm8V`)dwfZN2<(@rfHNkKCJd@j=g(M=Out>bd%G
z`N><;FWz5q>dvIgFBhGAF!S=miPxTQKYnY?nWrl+Jlt{W-sZFS7F>J0^vdHoH=ixO
z_GIIQ2TQI$*>&OG@|#bW-+Zz8>XUUhpY6KxWXp|btM9&8dH?0w`>(d$eSYNH^Bs3z
z?!WzV)1x;B?!4Om@YU}7uMgjSdE)l-Bllh%di47I-4}<Rygv5m-MI&^k34&K>EWBp
zkKUbq`tjV;_eWp7zxedS$(J9`KL2?B`MXQcKU{e6<>H%<cV2$H{^s+wcb{*({c`W!
zmuK%kJ^t|Z!RIf}K74ug>D#NX-`{=z@#e>`|3m=ApDc`A4F4H)7#J8BKzV|J<152|
zP8pAa1yZK1UtVks+MsyQeRBzKGpl#EbNj&=yt|y;CnyBg=?R4hpB3O~EPK<!r5Ut9
zCNVo?!IsS{{k^9fr2g}cyqwrAHYY<hxb4L8j@kdio}6Ip3b!bUPr2Z5anmtAHJ`BB
z+3NhEa$0Ip-#nPu&KQ=z+Vj(DiL#ToqVK&uh11sET5IoMAd#_>#e0Uqtw$5Jmvx+A
zW!0S+vND+cmQ~ieV>fOTELbY2nSL&&db;lQInts6TXY_&_(~-|pVm9;(;?>Oi%b2N
z$KCz4)kEBIM?vMWb5XiR#uhv~PCEC@NPD~E;VYrVjSNee{X2dHFzou;#K_2C4FC`o
BYPSFY

diff --git a/images/vcs2py.py b/images/vcs2py.py
deleted file mode 100755
index bb06fc09f..000000000
--- a/images/vcs2py.py
+++ /dev/null
@@ -1,367 +0,0 @@
-#!/usr/bin/env python
-
-""" This script converts old vcs scripts to python scripts
-This is version 0. graphic method and template won't be converted
-Therefore old script still needed around in order to load all graphic methods needed
-
-Not implemented yet, to do:
-xname, xunits, etc....
-Transform, Logical mask
-"""
-version='0.2'
-import sys
-import vcs
-import cdms
-
-## initialize some stats
-warnings=0
-vcscmd=0
-arrays=0
-arrays_from_file=0
-plots=0
-active_plots=0
-unimplemented=0
-vcs_objects=0
-## Continents overlaying (default none)
-overlay_continents=''
-
-## Determine input script
-src=sys.argv[1]
-
-## Generate output name
-outnm=src[:-4]+'.py'
-
-## Generate output name for graphic methods, templates, etc...
-outnm_vcs=src[:-4]+'_vcs.scr'
-f2=open(outnm_vcs,'w')
-
-# open input script file
-fi=open(src,'r')
-
-## Opens output script file
-f=open(outnm,'w')
-f.write('#/usr/bin/env python\nimport vcs\nimport cdms\nimport MV\nx=vcs.init()\n\n')
-f.write('"""Python script autogenerated using vcs2py version '+version+'\n')
-f.write('Input VCS script: '+src+'\n"""\n')
-f.write('## First load all the necessary template and graphic methods from the old script\nx.scriptrun(\''+outnm_vcs+'\')\n')
-f.write("## Individual python code for individual vcs object can be generated by loading the object and saving it to a file\n## e.g: t=x.getboxfill('default')\n## x.scriptobject(t,'myfile.py')\n\n")
-
-## Opens file for graphic methods rewriting
-
-## Ok now let's loop through all lines and figure out commands
-ln=fi.readlines()
-n=len(ln)
-
-def extract(instring,beg,end=','):
-    """ Extract part of a string between 2 characters def, returns None if not existing
-    Usage: val = extract(instring,beg,end=',')
-    """
-    try:
-        sp=instring.split(beg)[1]
-        sp=sp.split(end)[0]
-        if sp[-1]==instring[-1]:
-            sp=sp[:-1]
-    except:
-        sp=None
-    return sp
-for i in range(n):
-    l=ln[i]
-    #print l
-    iprint=0
-    if l[:4]=='Page':
-        vcscmd+=1
-        val=l[5:].split(')')[0]
-        f.write('x.'+val+'()\n\n')
-    elif l.split('_')[0] in ['L','Tt','To','Tl','Tf','Tm','Th','C','P',
-                                    'Gi','Gfb','Gfi','Gfo','Go','GSp','Gv','GXY','GXy','GYx']:
-        # First reconstruct the full name
-        nbracket=l.count('(')
-        vcs_objects+=1
-        j=1
-        f2.write(ln[i])
-        nbracket-=l.count(')')
-        while nbracket>0:
-            f2.write(ln[i+j])
-            nbracket+=ln[i+j].count('(')
-            nbracket-=ln[i+j].count(')')
-            j+=1
-            
-    elif l[:5]=='Sleep':
-        vcscmd+=1
-        val=l[6:].split(')')[0]
-        f.write('import time\ntime.sleep('+val+')\n\n')
-    elif l[:4]=='Over':
-        vcscmd+=1
-        overlay_continents=',continents='
-        n=l[19:].split(')')[0]
-        overlay_continents+=n
-    elif l[:3].lower()=='cgm':
-        vcscmd+=1
-        args=l[4:].split(')')[0] # get the arguments
-        sp=args.split(',')
-        cgmfnm=sp[0]
-        if len(sp)>1:
-            app=sp[1][0]
-        else:
-            app="'a'"
-        f.write("x.cgm('"+cgmfnm+"',"+app+")\n\n")
-    elif l[:3].lower()=='run':
-        vcscmd+=1
-        args=l[4:].split(')')[0] # get the arguments
-        sp=args.split(',')
-        scrfnm=sp[0]
-        f.write("## Warning the following will only load the templates/graphic methods\n")
-        f.write("## To excute commands convert script to file and uncoment the following line\n")
-        warnings+=1
-        print 'Warning: Run script, will not execute any command, you need to convert it first and uncoment the line in the python script'
-        pyfnm=scrfnm.replace('.scr','.py')
-        f.write("## execfile('"+pyfnm+"')\n")
-        f.write("x.scriptrun('"+scrfnm+"')\n\n")
-    elif l[:6].lower()=='raster':
-        vcscmd+=1
-        args=l[7:].split(')')[0] # get the arguments
-        sp=args.split(',')
-        cgmfnm=sp[0]
-        if len(sp)>1:
-            app=sp[1][0]
-        else:
-            app="'a'"
-        f.write("x.raster('"+cgmfnm+"',"+app+")\n\n")
-    elif l[:3].lower() in['drs','hdf']:
-        vcscmd+=1
-        warnings+=1
-        args=l[4:].split(')')[0] # get the arguments
-        sp=args.split(',')
-        ncfnm=sp[0]
-        ncfnm=ncfnm.replace('.dic','.nc')
-        ncfnm=ncfnm.replace('.hdf','.nc')
-        if len(sp)>2:
-            app=sp[2][0]
-            if app=='r':app="'w'"
-            if app=='a':app="'r+'"
-        else:
-            app="'w'"
-        array=sp[1]
-        print 'WARNING: Output file converted from '+l[:3]+' to NetCDF'
-        f.write("f=cdms.open('"+ncfnm+"',"+app+")\n")
-        f.write("f.write("+array+","+app+")\n")
-        f.write('f.close()\n\n')
-    elif l[:6].lower()=='netcdf':
-        vcscmd+=1
-        args=l[7:].split(')')[0] # get the arguments
-        sp=args.split(',')
-        ncfnm=sp[0]
-        if len(sp)>2:
-            app=sp[2][0]
-            if app=='r':app="'w'"
-            if app=='a':app="'r+'"
-        else:
-            app="'w'"
-        array=sp[1]
-        f.write("f=cdms.open('"+ncfnm+"',"+app+")\n")
-        f.write("f.write("+array+","+app+")\n")
-        f.write('f.close()\n\n')
-    elif l[:5].lower()=='clear':
-        vcscmd+=1
-        f.write('x.clear()\n\n')
-    elif l[:5].lower()=='color':
-        vcscmd+=1
-        cmap=l[6:].split(')')[0]
-        f.write("x.setcolormap('"+cmap+"')\n\n")
-    elif l[:6].lower()=='canvas':
-        vcscmd+=1
-        if l[7:-1]=='open':
-            f.write('x.open()\n\n')
-        elif l[7:-1]=='close':
-            f.write('x.close()\n\n')
-    elif l[:2]=='A_':
-        arrays+=1
-        # Acquiring Array data
-        # First reconstruct the full name
-        j=1
-        while l[-2]!=')' and l[-1]!=')':
-            l=l[:-1]+ln[i+j]
-            j+=1
-        l=l.replace('\n','')
-        nm=extract(l,'A_','(')
-        pnm=nm.replace('.','_') # . are not acceptable in python names
-        if pnm!=nm:
-            # Now replace in every over possible lines !
-            for j in range(i,n):
-                ln[j]=ln[j].replace(nm,pnm)
-        fnm=extract(l,'File=')
-        src=extract(l,'Source=')
-        vr=extract(l,'Name=')
-        tit=extract(l,'Title=')
-        units=extract(l,'Units=')
-        xnm=extract(l,'XName=')
-        xfirst=extract(l,'xfirst=')
-        xlast=extract(l,'xlast=')
-        ynm=extract(l,'YName=')
-        yfirst=extract(l,'yfirst=')
-        ylast=extract(l,'ylast=')
-        znm=extract(l,'ZName=')
-        zfirst=extract(l,'zfirst=')
-        zlast=extract(l,'zlast=')
-        tnm=extract(l,'TName=')
-        tfirst=extract(l,'tfirst=')
-        tlast=extract(l,'tlast=')
-        func=extract(l,'Function="','"')
-        cmd=''
-        
-        if not fnm is None:
-            arrays_from_file+=1
-            cmd+='f = cdms.open('+fnm+')\n'
-            cmd+=pnm+' = f('+vr
-            if fnm[-5:-1]=='.dic':
-                if not tnm is None: tnm=tnm[:-1]+'_'+vr[1:]
-                if not znm is None: znm=znm[:-1]+'_'+vr[1:]
-                if not ynm is None: ynm=ynm[:-1]+'_'+vr[1:]
-                if not xnm is None: xnm=xnm[:-1]+'_'+vr[1:]
-
-        elif not func is None:
-            # First of all treats the special commands (mean and sqrt)
-            # Mean ?
-##             if func[:-1]!=')':
-##                 func=func+')'
-            imean=func.find('mean(')
-            while imean!=-1 :
-                tmp=func[imean:]
-                tmp=tmp.replace('mean(','cdutil.averager(',1)
-                tmp=tmp.split(',')
-                tmp2=tmp[1]
-                fpar=tmp2.find('\'')
-                lpar=tmp2[fpar+1].find('\'')
-                tmp3=tmp2[fpar+1:lpar].lower()
-                if tmp3=='time':
-                    tmp3="axis='t')"
-                elif tmp3=='longitude':
-                    tmp3="axis='x')"
-                elif tmp3=='latitude':
-                    tmp3="axis='y')"
-                elif tmp3=='level':
-                    tmp3="axis='z')"
-                else:
-                    tmp3="axis='("+tmp2[fpar+1:lpar-1]+")'"+tmp2[lpar:]
-                tmp[1]=tmp3
-                tmp=','.join(tmp)
-                func=func[:imean]+tmp
-                imean=func.find('mean(')
-            isqrt=func.find('sqrt(')
-            while isqrt!=-1:
-                warnings+=1
-                print 'WARNING FOR ARRAY:'+pnm+'\nsqrt FUNCTION FOUND YOU NEED TO REPLACE AXIS NAME WITH CORRECT VALUE !'
-                tmp=func[isqrt:]
-                tmp=tmp.replace('sqrt(','MV.xxxx(',1)
-                tmp=tmp.split(',')
-                if len(tmp)>1:
-                    tmp2=tmp[1]
-                    fpar=tmp2.find('\'')
-                    lpar=tmp2[fpar+1].find('\'')
-                    tmp3="axis='("+tmp2[fpar+1:lpar-1].lower()+")'"
-                    tmp[1]=tmp3
-                else:
-                    tmp[0]+=')'
-                tmp=','.join(tmp)
-                func=func[:isqrt]+tmp
-                isqrt=func.find('sqrt(')
-            func=func.replace('MV.xxxx','MV.sqrt')
-            cmd+=pnm+' = '+func+'\n'+pnm+' = '+pnm+'('
-        else:
-            raise 'Error array'+nm+' is coming neither from file nor function !'
-        # Now does the dimensions needed
-        order=''
-        if not tnm is None:
-            order+='('+tnm[1:-1]+')'
-            if not tfirst is None:
-                tcmd=tnm[1:-1]+'=('+tfirst+','+tlast+')'
-                if cmd[-1]!='(':
-                    cmd+=','+tcmd
-                else:
-                    cmd+=tcmd
-        if not znm is None:
-            order+='('+znm[1:-1]+')'
-            if not zfirst is None:
-                zcmd=znm[1:-1]+'=('+zfirst+','+zlast+')'
-                if cmd[-1]!='(':
-                    cmd+=','+zcmd
-                else:
-                    cmd+=zcmd
-        if not ynm is None:
-            order+='('+ynm[1:-1]+')'
-            if not yfirst is None:
-                ycmd=ynm[1:-1]+'=('+yfirst+','+ylast+')'
-                if cmd[-1]!='(':
-                    cmd+=','+ycmd
-                else:
-                    cmd+=ycmd
-        if not xnm is None:
-            order+='('+xnm[1:-1]+')'
-            if not xfirst is None:
-                xcmd=xnm[1:-1]+'=('+xfirst+','+xlast+')'
-                if cmd[-1]!='(':
-                    cmd+=','+xcmd
-                else:
-                    cmd+=xcmd
-        if order!='':
-            cmd+=",order='..."+order+"'"
-        cmd+=')\n'
-        if not fnm is None:
-            cmd+='f.close()\n'
-        if not src is None:
-            cmd+=pnm+'.source = '+src+'\n'
-        if not tit is None:
-            cmd+=pnm+'.title = '+tit+'\n'
-        if not units is None:
-            cmd+=pnm+'.units = '+units+'\n'
-        
-        # Now does the attributes that are overwrittable
-        for att in ['source','name','units','crdate','crtime',
-                    'comment#1','comment#2','comment#3','comment#4']:
-            val=extract(l,att+'="','"')
-            Att=att.replace('#','')
-            if not val is None:
-                cmd+=pnm+'.'+Att+' = "'+val+'"\n'
-        cmd+='\n'
-        cmd=cmd.replace('"',"'")
-        cmd=cmd.replace('(,',"(")
-        f.write(cmd)
-    elif l[:2]=='D_':
-        plots+=1
-        # Plotting data
-        # First reconstruct the full string
-        j=1
-        while l[-2]!=')' and l[-1]!=')':
-            l=l[:-1]+ln[i+j]
-            j+=1
-        l=l.replace('\n','')
-        off=extract(l,'off=',',')
-        if int(off)==0: # Ok it's not off, let's draw it
-            cmd=''
-            active_plots+=1
-        else:
-            cmd='## Next line commented, display was "off"\n## '
-        type=extract(l,'type='    ,',')
-        if type is None: type = 'boxfill'
-        tmpl=extract(l,'template=',',')
-        if tmpl is None: tmpl='default'
-        mthd=extract(l,'graph='   ,',')
-        if mthd is None: mthd='default'
-        a   =extract(l,'a='       ,',')
-        b   =extract(l,'b='       ,',')
-        cmd+='x.plot('+a+', '
-        if not b is None:
-            cmd+=b+' ,'
-        cmd+="'"+tmpl+"', '"+type+"', '"+mthd+"'"+overlay_continents+")\n\n"
-        f.write(cmd)
-f.close()
-print 'Successfully converted:',src
-print 'Processed:'
-print 'VCS Commands:',vcscmd
-
-print 'Arrays:',arrays,':',arrays_from_file,'from file and',arrays-arrays_from_file,'computed'
-print 'Plots:',plots
-print 'Active plots:',active_plots
-print 'Warnings:',warnings
-print 'VCS OBJECTS (templates, graphic methods, etc..):',vcs_objects
-
diff --git a/images/vcs_icon.xbm b/images/vcs_icon.xbm
deleted file mode 100644
index 912510e77..000000000
--- a/images/vcs_icon.xbm
+++ /dev/null
@@ -1,566 +0,0 @@
-#define splash_width 492
-#define splash_height 136
-static char splash_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf4,0xff,0x3f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xfe,0xff,0x0f,0xfc,0xff,0xbf,
- 0xee,0x17,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x14,0xfd,0xfb,0xff,0x52,0xff,
- 0x7f,0xeb,0x7b,0x2d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0x57,0xb8,0xaf,0x00,
- 0xef,0xff,0xd7,0x7f,0xdf,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xe0,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x6f,
- 0x08,0xfd,0x7f,0x6b,0xfd,0xda,0x7b,0x2d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x28,0x16,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x48,
- 0xf9,0x12,0x80,0xaf,0xdb,0xff,0xb7,0xff,0xee,0x17,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0xe9,0xab,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x2a,0xfc,0x3f,
- 0x00,0xf0,0x4f,0x02,0x00,0x00,0xfc,0xd6,0xfe,0xad,0xbf,0x1d,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xfe,0x5f,0xbd,0x07,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x3a,
- 0x74,0x15,0x00,0xa0,0x1f,0x01,0x00,0x00,0xf8,0xff,0x6b,0xff,0xea,0x0b,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x7f,0xeb,
- 0xd6,0x12,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xf0,0xd7,0xa9,0x80,0x8f,0xbe,0x2a,0x04,0x00,0x00,0x78,0x6d,0xff,0xd5,0x7f,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0xf4,
- 0xd7,0xb6,0xb5,0x5a,0x2f,0xad,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xf8,0xfe,0x01,0x7a,0xf8,0xff,0x5f,0x00,0x00,0xdc,0xfb,0xad,
- 0x7f,0xdb,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,
- 0xf2,0xdf,0x6a,0x5b,0xdb,0xed,0xd5,0xb7,0x8b,0xfb,0xff,0x2d,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0xd0,0xff,
- 0xbf,0x00,0x00,0x14,0x00,0xec,0x7f,0x01,0x3e,0xa0,0xd5,0xbf,0x01,0x00,0x68,
- 0x5f,0xff,0xed,0x57,0x00,0x00,0x00,0x00,0x00,0x80,0xfe,0x07,0x00,0x00,0x00,
- 0x20,0x40,0x01,0xa8,0xbd,0xed,0xad,0xb6,0xda,0xda,0xfa,0x6e,0xad,0xf6,0xff,
- 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x60,
- 0xff,0xff,0xff,0xff,0xfe,0xff,0xff,0x57,0x5b,0xf8,0x7b,0x70,0x00,0xf5,0x01,
- 0x00,0xac,0xf7,0x6b,0x77,0x01,0x00,0x00,0x00,0x00,0x00,0x70,0xab,0xf4,0x13,
- 0x20,0x20,0x91,0xbe,0x00,0xfc,0xd6,0xb6,0xf6,0x5b,0x6f,0xb7,0xae,0xb5,0x6a,
- 0x55,0x95,0xfe,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,
- 0x00,0xf0,0xff,0xbf,0xfb,0xff,0xff,0xff,0xff,0x23,0x3f,0xf0,0xde,0x1d,0x00,
- 0xdc,0x00,0x00,0xd8,0xdd,0xfe,0xd3,0x00,0x00,0x00,0x00,0x00,0x00,0xdf,0x95,
- 0x52,0xed,0x60,0xf0,0x7f,0x55,0x02,0x54,0xbb,0xad,0x2d,0xed,0xb5,0xad,0x75,
- 0x5b,0x57,0x5b,0xd5,0xea,0x5f,0x8a,0x3d,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
- 0x00,0x00,0x00,0xe0,0xbf,0xff,0xef,0xff,0xff,0xf7,0xbe,0xff,0xf7,0xbf,0x7f,
- 0x5d,0x00,0xf5,0x0f,0x00,0x7e,0xff,0x5b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x56,0xa8,0xaa,0x92,0x22,0x5c,0xaa,0x90,0x02,0xea,0xd6,0xf6,0xf6,0xaa,0x5a,
- 0xf5,0xaa,0xd6,0xb9,0x6d,0x5b,0x35,0x69,0x6b,0xa5,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xf0,0x00,0x00,0xe0,0x7f,0xfb,0xf6,0xff,0xb6,0xef,0xdf,0xf7,0xfe,0xde,
- 0xff,0xf6,0x02,0xe4,0x5f,0x08,0x00,0xee,0x2d,0x05,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x80,0x5f,0x83,0x95,0x02,0x94,0x52,0x55,0x2a,0x01,0x5c,0x7b,0x5b,0x5b,
- 0xbf,0xed,0x56,0xb7,0x6b,0xae,0xaa,0xaa,0xd6,0x56,0xad,0xaa,0x05,0x00,0x00,
- 0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0xfe,0xff,0xff,0xfe,0xff,0xfd,0xfe,0xff,
- 0xdb,0x7f,0xff,0x8a,0x07,0xd0,0xff,0x00,0x00,0xbc,0x3f,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xe0,0xa5,0xc0,0x52,0x49,0xa9,0x2a,0x11,0x85,0x04,0xe8,0xad,
- 0xad,0xed,0xd2,0x56,0xbb,0x5a,0xb5,0xab,0xd5,0xd6,0xaa,0xaa,0xaa,0xaa,0x2a,
- 0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0xfc,0xff,0xff,0xdf,0xbb,0xff,0xff,
- 0xff,0xee,0x7f,0xf7,0x0b,0xa0,0x00,0x80,0x0f,0x00,0x00,0xf6,0x05,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xbc,0x2a,0x68,0xab,0xaa,0x94,0x8a,0xaa,0x28,0x09,
- 0xb4,0xd6,0xf6,0x56,0x6f,0xfb,0xd5,0xad,0xad,0xd4,0x6e,0x5b,0x55,0xdb,0xaa,
- 0x56,0x95,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0xfd,0xbb,0xb7,0xff,0xff,
- 0xbb,0xb7,0xdb,0x7f,0xff,0xfd,0x4d,0x00,0x00,0x05,0x44,0x00,0x00,0xbc,0x0b,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x6d,0x95,0x54,0x49,0x2a,0x55,0x52,0x44,
- 0xa5,0x02,0x58,0x7b,0x5b,0xbb,0xb5,0xaa,0xae,0xf6,0xd6,0x6e,0xb5,0x6a,0x6b,
- 0x55,0x7a,0x59,0x15,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0xc0,0xff,0xff,0xfb,
- 0xfb,0xef,0xff,0xfe,0xff,0xfb,0xed,0x5f,0x00,0x00,0xf0,0x3f,0x00,0x00,0x00,
- 0xf8,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x97,0x2a,0xa0,0xaa,0x52,0x49,
- 0xa9,0x2a,0x12,0x04,0xe8,0xad,0xad,0x6d,0xdd,0x57,0xb5,0x95,0x6a,0x55,0x55,
- 0x55,0xad,0x2a,0x20,0xa6,0x0a,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0xd0,0xff,
- 0x57,0x41,0x7d,0xff,0xfe,0xdf,0x77,0xdf,0xbf,0x3b,0x00,0x00,0xe0,0x2f,0x10,
- 0x00,0x00,0x80,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xaa,0x2a,0x80,0x40,
- 0x4a,0x25,0x45,0x52,0xa9,0x10,0xb5,0xd6,0xf6,0xb6,0x6b,0xed,0xdb,0x76,0xb7,
- 0xb6,0xad,0xad,0xaa,0x2a,0x00,0x0d,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,
- 0x00,0x5a,0x00,0x00,0xe0,0xfd,0xef,0xff,0xfe,0xff,0xfb,0x3f,0x00,0x00,0xfc,
- 0x7d,0x39,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x87,0x25,
- 0x00,0xaa,0x2a,0x95,0x2a,0x25,0x05,0x44,0xdd,0x7b,0x5b,0xdb,0xb6,0x36,0xad,
- 0xda,0x5a,0xdb,0xb6,0xd6,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xf0,0x00,0x80,0x95,0x00,0x00,0xc0,0xb7,0xfd,0xf6,0xdf,0x76,0xef,0xb6,0x00,
- 0x00,0x78,0xb7,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0e,0x00,
- 0x80,0x1a,0xe0,0x4a,0xa9,0x54,0x92,0x94,0x08,0x58,0x6b,0xad,0x6d,0x6d,0x5b,
- 0xdb,0x76,0x57,0xab,0x55,0x55,0x55,0x00,0x00,0x80,0x55,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xf0,0x00,0x40,0x2b,0x00,0x00,0xe0,0xff,0xff,0xff,0xfe,0xff,0xff,
- 0x7f,0x01,0x00,0xd8,0xff,0x5e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x1e,0x00,0x20,0x2b,0xa0,0x2a,0xa5,0x52,0x55,0x4a,0x05,0xd4,0xb6,0xed,0xd6,
- 0xb6,0xed,0x6d,0xdb,0x6a,0xb5,0xaa,0xda,0xda,0x00,0x00,0x80,0xae,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xf0,0x00,0x08,0x00,0x00,0x00,0x40,0xff,0xb7,0xdf,0xf7,
- 0xdf,0x7d,0xb7,0x0b,0x00,0x7e,0xdb,0x37,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x02,0x00,0x30,0x00,0xe0,0x54,0x95,0x4a,0x22,0x21,0x12,0xb4,0xdd,
- 0x56,0x7b,0xdb,0xb6,0xaa,0x55,0x5d,0x5b,0xbb,0x6b,0xab,0x00,0x00,0x00,0xbb,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x90,0xdd,0xfe,
- 0xfb,0x7f,0xfb,0xef,0xfd,0x77,0xd1,0xff,0xff,0x7d,0x01,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xa0,0x09,0x00,0x30,0xc2,0x6b,0xa5,0x54,0x29,0x55,0x55,0x09,
- 0x6c,0x6b,0xfb,0xaa,0x6d,0xd5,0xde,0xb6,0xab,0xad,0x55,0x55,0xad,0x02,0x18,
- 0x00,0x60,0x01,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0xc8,
- 0xff,0xff,0xfe,0xee,0x6f,0xff,0xbf,0xff,0xf0,0xd7,0x6b,0xef,0x05,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xf8,0x20,0x00,0x7f,0x55,0x95,0x2a,0x25,0x95,0x24,
- 0x8a,0x00,0xda,0xdd,0x96,0xdd,0xb6,0x5e,0x6b,0x6d,0x75,0xd5,0xda,0x5a,0xb5,
- 0xfa,0x03,0x00,0xc0,0x03,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,
- 0x00,0x80,0xf7,0xdb,0xdf,0xff,0xfe,0x75,0xef,0xbd,0xf0,0xfd,0xfe,0x7d,0x03,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x50,0xa8,0xc1,0xab,0x52,0x55,0x52,0x95,
- 0xaa,0x52,0x15,0x4a,0x6c,0x6b,0x7b,0x6b,0xdb,0xb5,0xd5,0xb6,0xad,0x6d,0x6d,
- 0xab,0x55,0xad,0x86,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,
- 0x00,0x00,0x00,0x80,0xbf,0xff,0x7b,0xf7,0xfb,0xff,0xfb,0xf7,0x7e,0xdf,0xb7,
- 0xdf,0x09,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x5c,0x5c,0x64,0x95,0x2a,0xa5,
- 0x4a,0xa9,0x44,0x8a,0x08,0x28,0xb7,0xbd,0xd5,0xb6,0x6d,0xdb,0x6e,0xab,0x56,
- 0xb5,0x56,0xb5,0xd6,0xaa,0x8a,0x03,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0xf0,
- 0x00,0x00,0x00,0x00,0x00,0xe0,0xfd,0xfe,0xff,0xbf,0x6f,0xbf,0xdf,0xde,0xff,
- 0x7b,0x4f,0x3d,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x50,0xf1,0xaa,
- 0xaa,0xaa,0x2a,0x55,0x32,0x55,0x25,0xa4,0xda,0xd6,0x6e,0xdb,0xb6,0x6d,0xb5,
- 0xdd,0xda,0x56,0x6b,0x5b,0x55,0x6b,0x0b,0x06,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x80,0xea,0xd7,0xde,0xfb,0xff,0xed,0xfd,
- 0xff,0x6e,0xef,0x05,0x80,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,
- 0x2c,0xaa,0xaa,0x54,0xaa,0x24,0x95,0x48,0x12,0xd8,0x6f,0xbb,0xb5,0xad,0xda,
- 0xb6,0xdb,0xaa,0x6d,0xb5,0xad,0xd5,0x6a,0xad,0x0a,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0x7b,0xdf,0xfd,
- 0xbf,0x6f,0xf7,0xfb,0x7f,0x0f,0xe0,0x1b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xf0,0xa5,0x55,0xaa,0xaa,0x92,0xaa,0x4a,0x25,0x09,0x62,0xf5,0xd6,0xde,
- 0xf6,0x6b,0xd5,0x56,0xdd,0x56,0x5b,0xb5,0xaa,0x56,0x55,0x15,0x10,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x80,0x77,0xff,0xff,
- 0x7d,0xb7,0xfb,0xfe,0xbd,0xbf,0xed,0x05,0x01,0x0a,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xc0,0xb7,0x54,0x49,0x95,0xaa,0x4a,0xa9,0x94,0x2a,0xa8,0xae,
- 0x7b,0x6b,0x9b,0xb6,0xbb,0x7a,0x6b,0xb5,0xd5,0xd6,0xb6,0xaa,0x6a,0x2b,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,
- 0x5b,0xef,0xff,0xff,0xff,0xf7,0xf7,0xee,0xbf,0x4f,0x03,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x40,0x93,0xaa,0xa6,0x52,0x55,0x51,0x94,0x52,0x12,
- 0xc0,0x75,0xad,0xb5,0x6d,0xdb,0xd6,0xad,0x55,0x5b,0xad,0xaa,0xaa,0x6d,0x5b,
- 0x15,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,
- 0xe0,0xde,0xff,0xff,0xef,0xdf,0xde,0x5f,0xdf,0x7b,0xdb,0x15,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xab,0xaa,0x42,0x4a,0x29,0x2d,0x4b,
- 0x29,0x25,0x60,0xbf,0xed,0xde,0xb6,0x6d,0xbb,0xd6,0xbe,0xd5,0xb6,0x6d,0x5b,
- 0xb5,0xaa,0x16,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,
- 0x00,0x00,0xf0,0x7f,0xff,0xbb,0xbe,0xfb,0xf7,0xfd,0xff,0xef,0x05,0x06,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0x55,0xc5,0x8d,0x2b,0xa5,
- 0xc2,0x28,0x95,0x04,0xa8,0xff,0x5a,0x6b,0xdb,0xb6,0x6d,0x6b,0xd3,0x6e,0xd5,
- 0x56,0xad,0xaa,0xd5,0x0a,0x80,0x0b,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,
- 0x00,0x00,0x00,0x00,0xf8,0xfb,0xb7,0xff,0xfb,0x7f,0xbf,0xff,0xed,0xfe,0x01,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0x0b,0x00,0x0b,
- 0x7c,0x55,0x35,0xa5,0xa4,0x02,0xd4,0xbf,0xa2,0xbb,0x6d,0xdb,0xb6,0xbd,0x6d,
- 0xb5,0xb6,0xda,0x6a,0xad,0xb6,0x00,0xe0,0x04,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xf0,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xfe,0xef,0xed,0xfb,0x6e,0xbf,
- 0x17,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x68,0xac,0x08,
- 0x00,0xf0,0xa0,0xa2,0x95,0x2a,0x70,0x09,0xd5,0x57,0xe8,0x6d,0xb7,0x6d,0xdb,
- 0xd6,0xb6,0x56,0x5b,0x6b,0xab,0xb5,0xaa,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x7d,0xb7,0xfd,0xb7,0xbf,0xff,0xff,
- 0xff,0xfb,0x85,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xb8,
- 0x55,0x05,0x00,0xe8,0xc0,0xd2,0x55,0x95,0xd0,0x05,0xaa,0xaf,0xa0,0xab,0xdd,
- 0xb6,0x6d,0x6b,0xdb,0xeb,0xaa,0x55,0xb5,0xaa,0xd5,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xef,0xff,0xfe,
- 0x7f,0xb7,0xdb,0xef,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xac,0xaa,0x00,0x40,0x00,0x91,0x02,0xc2,0x25,0xf4,0x96,0xb6,0x5b,0xfd,
- 0xaf,0xb6,0xdb,0xb6,0xba,0x55,0x5d,0xdb,0xba,0x56,0x81,0x5a,0x00,0x00,0x06,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0xdf,0xff,0x7f,
- 0xff,0xfb,0xed,0xff,0x7e,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x78,0x55,0x00,0x20,0x80,0x00,0x03,0xe9,0x0b,0xe8,0x6f,0x5b,
- 0x35,0xfe,0xc3,0xfd,0x6f,0xdb,0xd7,0xee,0xaa,0xad,0x56,0xab,0x01,0x70,0x01,
- 0x00,0x0e,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x7f,
- 0xdb,0xfd,0xed,0xbf,0xff,0xfd,0xfb,0x3d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xf8,0x0b,0x00,0x00,0x60,0x00,0x45,0xff,0x85,0x52,
- 0xb5,0xed,0xde,0x5e,0xd5,0xff,0xbf,0x56,0x6d,0x5b,0xdb,0x76,0xab,0xb5,0x2a,
- 0x80,0x06,0x00,0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,
- 0x80,0xff,0xff,0xf7,0xbf,0xff,0xbe,0xdf,0xef,0x37,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x05,0xfa,0xff,0x00,0x00,0x00,0x10,
- 0xc6,0x7f,0x6f,0xb7,0xb5,0x76,0xd5,0xff,0xae,0xbb,0xb6,0xb5,0xad,0xaa,0x6d,
- 0xd5,0x5a,0x00,0x06,0x00,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,
- 0x00,0x00,0x00,0xf7,0xff,0xdf,0xff,0xf7,0xf7,0x06,0x04,0x80,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x06,0x80,0x0b,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
- 0x00,0x00,0x00,0x00,0x00,0xde,0x6d,0xff,0xfe,0xde,0xff,0x07,0xbf,0xcf,0x03,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x80,0x07,0x00,
- 0x00,0xf0,0x00,0x00,0x70,0x00,0x00,0xfc,0x0f,0x00,0x00,0x1c,0x00,0x00,0xf0,
- 0xf8,0xfc,0x01,0x1e,0xff,0x1f,0x00,0x04,0x70,0x15,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xf7,0xff,0xff,0x87,0x7f,
- 0xef,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x03,0x00,0x00,0x00,0x00,0x80,
- 0x07,0x00,0x00,0x70,0x00,0x00,0x78,0x00,0x00,0xfc,0x07,0x00,0x00,0x1e,0x00,
- 0x00,0x78,0xfc,0xfd,0x07,0x9f,0xff,0x1f,0x00,0x00,0xac,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xfb,0xff,0x7f,0xdb,
- 0xc6,0xff,0x8f,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x07,0x00,0x00,0x00,
- 0x00,0xc0,0x07,0x00,0x00,0xf0,0x00,0x00,0x30,0x00,0x00,0xfc,0x0f,0x00,0x00,
- 0x1e,0x00,0x00,0x78,0xfe,0xfd,0x0f,0x3f,0xdf,0x3f,0x00,0x80,0x07,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x40,0xbc,0x6f,0xdf,
- 0xfb,0xff,0xc7,0x63,0x0f,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0xbc,0x07,0x00,
- 0x08,0x00,0x00,0x80,0x07,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x00,0xe0,0x01,
- 0x00,0x00,0x1e,0x00,0x00,0x3c,0xdf,0xdd,0x0f,0x3f,0x7c,0x7c,0x00,0x00,0x0a,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x60,0xf6,
- 0xff,0x7f,0xff,0x5f,0xe2,0x83,0x0f,0x00,0x00,0x00,0x80,0x03,0x00,0x00,0x3c,
- 0x0f,0x00,0x1c,0x00,0x00,0xc0,0x07,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,
- 0xe0,0x01,0x00,0x00,0x1e,0x00,0x00,0x1c,0x9f,0x7d,0x9f,0x3f,0x7c,0x78,0x08,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,
- 0x40,0xfd,0xfe,0xfd,0x5f,0x3d,0xe1,0x03,0xcf,0xf1,0xf3,0xc0,0x81,0x0f,0x07,
- 0x00,0x3c,0x0f,0x06,0x1e,0x1c,0x00,0xc0,0x0f,0x32,0x60,0xf0,0x04,0xc1,0x20,
- 0x10,0x00,0xe0,0x01,0x02,0x08,0x1e,0x04,0x00,0x3e,0x0f,0x7c,0x9f,0x3f,0xfc,
- 0x78,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,
- 0x00,0x00,0x80,0xfc,0xff,0xff,0x05,0x00,0xe0,0x83,0xef,0xfb,0xff,0xf1,0xc7,
- 0xcf,0x0f,0x00,0x34,0x8e,0x1f,0x7e,0x3e,0x00,0xc0,0x8f,0x7f,0xf8,0x71,0xce,
- 0xf3,0x79,0x7e,0x00,0xe0,0xc1,0x0f,0x3f,0xbe,0x1f,0x00,0x9e,0x0f,0x3c,0x9b,
- 0x7f,0x7c,0xf8,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,
- 0x00,0x00,0x00,0x00,0xe0,0xe0,0xef,0xff,0x01,0x80,0xe0,0x01,0xcf,0xf3,0xff,
- 0xfb,0xe7,0xcf,0x1f,0x00,0x3c,0xcf,0x3f,0x7f,0x7f,0x00,0xe0,0x8f,0x7f,0xfc,
- 0xf1,0xde,0xfb,0x79,0x7e,0x00,0xe0,0xe1,0x1f,0x7f,0xde,0x1f,0x00,0x9e,0x0f,
- 0x7c,0x9f,0x7f,0xfc,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0xc3,0x7e,0xf7,0x22,0x09,0xe2,0x83,0xcf,
- 0xfb,0xde,0x73,0xcf,0xef,0x1d,0x00,0x3c,0xce,0x3d,0x1f,0x77,0x00,0xe0,0x8e,
- 0xf7,0xdc,0xf3,0xde,0xfb,0x79,0x6f,0x00,0xe0,0xe1,0x9f,0x7f,0xde,0x1f,0x00,
- 0x9e,0x0f,0x7c,0x9f,0x7d,0x7c,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0xa1,0xff,0xbf,0x08,0x20,0xe0,
- 0x01,0xef,0xfb,0xde,0x1b,0xcf,0xe3,0x1f,0x00,0x3c,0xcf,0x38,0x1e,0xf1,0x00,
- 0xe0,0x8e,0xf7,0xc4,0x71,0xfc,0x79,0x78,0x1e,0x00,0xe0,0xf1,0x9e,0xff,0xde,
- 0x17,0x00,0x9f,0x0f,0x7c,0xdf,0x7f,0xfc,0xf8,0x80,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x83,0xfb,0x7f,0x81,
- 0x04,0xe1,0x83,0xcf,0x73,0xde,0xdb,0x87,0xe3,0x1f,0x00,0x3c,0x4f,0x3e,0x0e,
- 0x78,0x00,0xe0,0x9e,0xf3,0xc4,0xf3,0xfc,0xf9,0x78,0x3e,0x00,0xe0,0xf1,0xde,
- 0xf7,0xbe,0x0f,0x00,0x9e,0x0f,0x5c,0xdf,0xff,0x7c,0xf8,0x80,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x0c,0xff,
- 0xbf,0x50,0x50,0xe4,0x8b,0xef,0x7b,0xdf,0xe3,0xcf,0xe3,0x1f,0x00,0x3c,0x1f,
- 0x3f,0x1e,0xfe,0x00,0xe0,0x1f,0xd7,0xf0,0xf3,0xfc,0xf1,0x78,0x3c,0x00,0xe0,
- 0xf1,0xbe,0xf7,0x9e,0x0f,0x00,0x9f,0x9f,0x7c,0xdf,0xdf,0x7c,0xf9,0x81,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xbe,0x3b,0x05,0x05,0xe1,0x03,0xcf,0xfb,0xde,0xf3,0xcf,0xe3,0x15,0x00,
- 0x3c,0xcf,0x3f,0x0e,0x7f,0x00,0xf0,0x9f,0xf7,0xfc,0x73,0xf8,0xe0,0x79,0x7c,
- 0x00,0xe0,0xf1,0xde,0xf7,0x3e,0x1f,0x00,0x1e,0x1f,0x7c,0xdf,0xff,0xfc,0xf8,
- 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfc,0xdf,0xa8,0xfc,0xc2,0xe3,0xef,0x7b,0xde,0x7b,0x8f,0xe3,
- 0x11,0x00,0x3c,0xcf,0x3b,0x0e,0xf7,0x00,0xf0,0x9f,0xf7,0xdc,0xf1,0xf8,0xc8,
- 0x79,0x79,0x00,0xe0,0xf1,0xbe,0xbf,0xde,0x3e,0x00,0x1f,0x1f,0x7f,0xff,0xff,
- 0x7c,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xff,0xbf,0x12,0x7f,0xc0,0x7f,0xcf,0xf3,0xdf,0xfb,
- 0xdf,0xcb,0x1b,0x00,0xfc,0xc7,0x7d,0xbe,0xf7,0x01,0x70,0x9c,0x77,0xde,0xf7,
- 0xf0,0xdc,0x7b,0xf7,0x00,0xe0,0xe1,0x9f,0xff,0xfe,0x3f,0x00,0x1e,0xff,0xfd,
- 0xef,0xfb,0xfc,0xf8,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xa5,0xbe,0xc6,0xff,0xef,0x7b,
- 0xde,0xfb,0x9f,0xdf,0x1f,0x00,0xfc,0xc7,0x7f,0x7e,0xff,0x01,0x70,0xbc,0xf6,
- 0xfc,0xd7,0xf0,0xf8,0x7b,0x7e,0x00,0xe0,0xe1,0x9f,0x7f,0xde,0x1f,0x00,0x3e,
- 0xfe,0xff,0xef,0xfb,0x7c,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xbf,0xfb,0x57,0x81,0x7f,
- 0xcf,0xfb,0xff,0x73,0xdf,0x9f,0x1f,0x00,0xfc,0xc3,0x7f,0x7e,0xbf,0x01,0x70,
- 0xbc,0xf3,0xfc,0x77,0x7a,0xfc,0x79,0x7f,0x00,0xe0,0xe1,0x0f,0x7d,0xde,0x1f,
- 0x00,0x1e,0xfe,0xff,0xe7,0xf3,0xfd,0xf8,0x00,0x02,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,
- 0x05,0xbe,0xef,0x73,0xde,0xe3,0x0e,0x0f,0x1f,0x00,0x6c,0x00,0x33,0x38,0xee,
- 0x00,0x78,0xb8,0xd7,0xb8,0xf3,0x78,0xf1,0x78,0x3e,0x00,0xe0,0x83,0x17,0x3f,
- 0xbe,0x1f,0x00,0x3e,0xf8,0x7c,0xe1,0xfb,0xfd,0xf8,0x00,0x06,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x44,0xf4,
- 0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x08,0x00,0x40,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xbe,0x00,0x00,0x00,0x00,0x00,0xf8,0x00,0x06,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x09,0xf8,0xff,0x07,0x00,0x00,0x88,0x00,0x80,0x24,0x00,0x00,0x00,0x00,
- 0x08,0x48,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0x08,0x00,0x00,0x00,
- 0x00,0x00,0x90,0xa0,0x00,0x00,0x00,0x3c,0x00,0x00,0x09,0x00,0x00,0x7c,0x00,
- 0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x20,0xa4,0xf5,0xff,0x07,0x00,0x00,0x00,0x48,0x22,0x00,0x01,0x24,
- 0x00,0x00,0x41,0x00,0x02,0x90,0x00,0x00,0x10,0x40,0x00,0x24,0xbc,0x00,0x00,
- 0x40,0x00,0x00,0x08,0x04,0x04,0x92,0x24,0x00,0x3c,0x02,0x00,0x20,0xa9,0x00,
- 0x7c,0x02,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x89,0x52,0xaa,0xfe,0x07,0x00,0x48,0x21,0x02,0x00,0x12,
- 0x20,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x02,0x09,0x00,0x01,0x3c,
- 0x80,0x44,0x08,0x00,0x00,0x00,0x40,0x20,0x00,0x00,0x00,0x78,0x20,0x40,0x02,
- 0x00,0x20,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x50,0x55,0xe5,0x07,0x00,0x00,0x00,0x80,
- 0x00,0x00,0x00,0x08,0x00,0x00,0x02,0x01,0x00,0x40,0x00,0x00,0x00,0x00,0x11,
- 0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0x20,0x08,0x80,0x00,0x00,0x00,0x78,0x80,
- 0x00,0x00,0x04,0x02,0x3e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xaa,0xaa,0xda,0x07,0x10,0x00,
- 0x00,0x00,0x08,0x08,0x00,0x00,0x00,0x00,0x00,0x04,0x20,0x00,0x00,0x00,0x08,
- 0x00,0x00,0x20,0x1e,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x88,0x08,0x00,
- 0xf0,0x00,0x88,0x48,0x20,0x00,0x1f,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x24,0x84,0x54,0xd5,0x06,
- 0x80,0x00,0x00,0x08,0x40,0x40,0x04,0x00,0x00,0x00,0x00,0x80,0x80,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x01,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x80,0xb2,0xaa,
- 0xaa,0xff,0xff,0xff,0xff,0xff,0x57,0xab,0xf5,0x77,0xab,0xfd,0xde,0xba,0x5e,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xdf,0xfb,
- 0xef,0xb6,0xed,0xfe,0xaa,0x5b,0x25,0x81,0x01,0x16,0x00,0x00,0x60,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,
- 0x88,0xaa,0xaa,0xea,0xff,0xff,0xff,0xbf,0xaa,0x56,0x95,0x54,0x55,0xa5,0x52,
- 0xd5,0x4a,0xfd,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x53,0x95,0x98,0xaa,0xaa,0x6a,0xb7,0xa4,0x12,0xa4,0x05,0x00,0x00,0x00,0x00,
- 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x08,0xa5,0x54,0x55,0xad,0xfa,0xff,0xff,0xff,0x5f,0x55,0x55,0x55,0x55,
- 0x95,0xaa,0xaa,0xb2,0xf6,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x2a,0x55,0x67,0x55,0x55,0x55,0xaf,0xaa,0x94,0x00,0x0a,0x00,0x00,
- 0x00,0x40,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x40,0x92,0xaa,0xaa,0x52,0xf6,0xff,0xff,0xff,0xf7,0xaf,0xaa,
- 0xaa,0xaa,0x6a,0x55,0x55,0x55,0xd5,0xff,0xff,0xef,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x55,0x55,0xa9,0xaa,0xaa,0xaa,0x5e,0x55,0x42,0x08,0x38,
- 0x00,0x00,0x78,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x02,0x28,0x91,0xaa,0xaa,0xfa,0xff,0xff,0xdb,0xfe,
- 0xbb,0xaa,0xaa,0xaa,0x2a,0x55,0x95,0xaa,0x54,0xfe,0xb5,0x92,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x7f,0x55,0x55,0x95,0xaa,0xaa,0xaa,0xaa,0x92,0x14,
- 0xfc,0x38,0x00,0x00,0x4e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x28,0x85,0x54,0x49,0xaa,0x6a,0xf7,0xbf,
- 0xff,0xdf,0x6f,0x55,0x4a,0x55,0xa9,0x92,0x52,0x4a,0xa5,0x2a,0x55,0x55,0xda,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x55,0x49,0xaa,0x54,0x95,0x54,0x49,
- 0x4a,0x42,0x71,0x28,0x00,0x00,0x5b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x80,0x01,0x00,0x50,0xa5,0x54,0x49,0xfd,
- 0x7f,0xfb,0xff,0xff,0x7e,0x49,0xa9,0x24,0xa5,0xaa,0x54,0xa9,0x2a,0x95,0x94,
- 0x54,0xa5,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x5f,0x29,0x55,0xa9,0x4a,0x52,
- 0x25,0xa5,0x24,0x11,0xc0,0x67,0x00,0x80,0x57,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0x00,0x09,0x12,0x92,
- 0x2a,0xff,0xff,0xff,0xbd,0xfb,0x5b,0x25,0x25,0x92,0x14,0x49,0x12,0x15,0x91,
- 0x44,0x4a,0x8a,0x52,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x42,0x45,0x2a,0x25,
- 0x22,0x89,0x92,0x54,0x92,0x08,0x80,0x4b,0x00,0xf8,0x5a,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x70,0xf8,0xff,0xa2,
- 0x48,0x49,0xa0,0xff,0xee,0xdf,0xf7,0xdf,0xff,0x92,0x48,0x49,0xa2,0x24,0xa5,
- 0x40,0x4a,0x29,0x21,0x51,0xc8,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x29,0x28,
- 0x41,0x92,0x94,0x54,0x48,0x09,0x25,0x42,0x02,0x5e,0x00,0x56,0x15,0x10,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,
- 0xfe,0xff,0x22,0x92,0xca,0xef,0x7f,0x7b,0xdf,0x7d,0x5f,0x5f,0x92,0xa4,0x14,
- 0x92,0x48,0xaa,0x24,0x92,0x94,0x24,0xa5,0xff,0xff,0xff,0xff,0xff,0xff,0x2e,
- 0x45,0x45,0x2a,0x49,0x49,0x22,0x25,0x52,0x88,0x10,0x00,0x78,0x00,0xde,0x0a,
- 0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,
- 0xf0,0x00,0xc5,0xff,0x9f,0x44,0xe4,0xbf,0xfb,0xff,0xff,0xf7,0x77,0xeb,0x45,
- 0x12,0xa2,0x48,0x12,0x11,0x90,0x44,0x22,0x89,0xc8,0x7f,0xdf,0xfd,0xff,0xff,
- 0xf7,0xaf,0x90,0x10,0x81,0x10,0x22,0x89,0x88,0x04,0x21,0x42,0x00,0xa8,0x00,
- 0x54,0x0d,0x2c,0x00,0x20,0xc0,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,
- 0x00,0x00,0xf0,0xee,0x0f,0xf0,0x5f,0x10,0xa1,0xfb,0xdf,0xef,0x7b,0xdf,0xfd,
- 0x7f,0x29,0x80,0x08,0x02,0x40,0x44,0x05,0x20,0x08,0x20,0x82,0xff,0xff,0x77,
- 0xef,0xdf,0xff,0x17,0x0a,0x44,0x28,0x84,0x08,0x20,0x22,0x50,0x04,0x00,0x08,
- 0x70,0x00,0xa8,0x05,0x06,0x00,0xc0,0xe0,0x01,0x00,0x00,0x00,0x00,0xf0,0x00,
- 0x00,0x00,0x00,0x00,0xf0,0xb6,0x0c,0x00,0x3e,0x42,0xc8,0xfe,0x7e,0xbd,0xde,
- 0x7d,0xdf,0xda,0xd6,0x2b,0xa0,0x50,0x15,0x11,0xa0,0x8a,0x42,0x85,0x50,0xfe,
- 0xff,0xff,0xbf,0x7d,0xdf,0x89,0xa0,0x12,0x82,0x22,0xa2,0x8a,0x88,0x04,0x21,
- 0x09,0x00,0xa0,0x01,0x78,0x0f,0x16,0x80,0xc7,0x7e,0xfe,0x00,0x00,0x00,0x00,
- 0xf0,0x00,0x00,0x00,0x00,0x00,0xf0,0xda,0x0e,0x8c,0x98,0x08,0xe2,0xaf,0xeb,
- 0xf7,0xfb,0xf7,0xf7,0xf7,0xff,0x45,0x05,0x04,0x40,0x00,0x09,0x00,0x10,0x10,
- 0x04,0xf0,0xfb,0xff,0xff,0xff,0xff,0x00,0x04,0x80,0x10,0x08,0x00,0x00,0x00,
- 0x10,0x04,0x20,0x00,0xc0,0x02,0x00,0x00,0x08,0x00,0x00,0xb4,0x7f,0x01,0x00,
- 0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0xe0,0xb8,0x42,0x1b,0x18,0x20,0xc0,
- 0xfb,0xbf,0xdf,0xdf,0xbe,0xba,0x5e,0x55,0xb7,0x10,0x00,0x00,0x44,0x00,0x20,
- 0x02,0x40,0x10,0xe1,0xef,0xff,0xfd,0xff,0x7f,0x48,0x10,0x10,0x42,0x20,0x11,
- 0x44,0x24,0x41,0x10,0x80,0x00,0x00,0x02,0x00,0x00,0x20,0x00,0x00,0x00,0xff,
- 0x04,0x14,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0xe0,0xac,0xa0,0x7c,0x18,
- 0x00,0xe4,0x7e,0xfb,0x7a,0xed,0xeb,0xef,0xf7,0xff,0x56,0x41,0x49,0x12,0x00,
- 0x44,0x09,0x88,0x04,0x40,0xb4,0xff,0xbd,0xff,0x7d,0x7b,0x02,0x40,0x02,0x00,
- 0x01,0x80,0x00,0x01,0x00,0x80,0x00,0x00,0x00,0x28,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xbf,0x52,0x0e,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0xf0,0xf4,0x20,
- 0xee,0x1b,0x82,0x80,0xdb,0xde,0xdf,0x7f,0xdf,0xba,0xba,0xaa,0xbb,0x00,0x00,
- 0x00,0x11,0x00,0x00,0x00,0x00,0x01,0xe0,0xff,0xf7,0xdf,0xef,0xef,0x00,0x01,
- 0x40,0x00,0x00,0x04,0x08,0x00,0x04,0x00,0x00,0x00,0x00,0xd0,0x0e,0x00,0x00,
- 0x00,0x00,0x80,0xaf,0x04,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0xf0,
- 0x5c,0x00,0xbb,0x39,0x00,0x00,0xfe,0xeb,0xb6,0xd5,0xf6,0xef,0xdf,0xff,0xee,
- 0x02,0x00,0x00,0x40,0x00,0x40,0x00,0x00,0x00,0xc0,0xbd,0xff,0xfb,0xff,0x7f,
- 0x10,0x00,0x00,0x08,0x20,0x00,0x00,0x20,0x00,0x01,0x00,0x00,0x00,0x00,0x50,
- 0xa0,0x00,0x00,0x00,0x00,0x7a,0x78,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,
- 0x00,0x60,0x34,0x70,0xed,0x19,0x00,0x00,0xde,0xbe,0x7d,0xbf,0xbb,0xba,0xea,
- 0xaa,0x5b,0x00,0x00,0x00,0x00,0x01,0x00,0x20,0x00,0x00,0xc0,0xf7,0x7f,0xff,
- 0xfd,0x7d,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x40,0x03,0x00,0x00,0x00,0xe0,0x01,0x00,0x00,0xf0,0x00,0x00,
- 0x00,0x00,0x00,0x60,0x38,0x50,0x5f,0x18,0x00,0x00,0xf4,0xef,0xd7,0xeb,0xde,
- 0xdf,0x7f,0xf7,0x56,0x00,0x80,0x00,0x00,0x08,0x00,0x80,0x10,0x00,0xc0,0xff,
- 0xf6,0xb7,0xb7,0xf7,0x04,0x08,0x02,0x00,0x02,0x20,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
- 0x00,0x00,0x00,0x00,0x00,0x60,0x0c,0xb8,0xf5,0x18,0x00,0x00,0xe0,0x7a,0x7d,
- 0xbd,0xab,0xea,0xaa,0xad,0x0d,0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x04,
- 0x00,0xff,0xdf,0xff,0xff,0xff,0x02,0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,
- 0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x60,0x08,0xa8,0xee,0x18,0x00,0x00,0xc0,
- 0xaf,0xd7,0x6f,0xfd,0x5d,0xf7,0xde,0x06,0x00,0x02,0x00,0x00,0x40,0x00,0x00,
- 0x00,0x00,0xc0,0xb7,0xff,0xdd,0xdd,0xdd,0x05,0x40,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x50,0x01,0x70,0x00,
- 0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x60,0x08,0xf8,0x7b,0x19,0x00,
- 0x00,0x40,0xf5,0xbd,0xda,0x57,0xb7,0xad,0x75,0x01,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xe0,0xff,0x7b,0xff,0xff,0xf7,0x00,0x40,0x01,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x5e,0x04,
- 0x18,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x60,0x10,0xb8,0x5e,
- 0x19,0x00,0x00,0x80,0x5f,0xeb,0xbd,0xfa,0xed,0xf6,0xae,0x03,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xfd,0xee,0xdb,0x6d,0xff,0x05,0x60,0x01,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x88,
- 0x57,0x01,0x58,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0xe0,0x10,
- 0xec,0x6b,0x1c,0x00,0x00,0x00,0xfa,0x5e,0xeb,0x57,0xbb,0xad,0xf5,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xd7,0xff,0x7f,0xff,0xbd,0x00,
- 0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x80,0xaf,0x95,0x00,0x68,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,
- 0xe0,0x00,0xb8,0x69,0x1c,0x00,0x00,0x00,0xd0,0xeb,0x5e,0xdd,0xd6,0x76,0x5b,
- 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xb8,0xff,0x7f,0xff,0xdd,
- 0x6f,0x80,0x5f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x70,0xa5,0x54,0x15,0x16,0x01,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,
- 0x00,0x00,0xe0,0x40,0xf8,0x28,0x1c,0x00,0x00,0x00,0x40,0xbf,0xeb,0xb6,0x6d,
- 0xab,0xad,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x7d,0xdb,
- 0xeb,0x7f,0x0b,0x80,0xbf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xf0,0xb5,0xaa,0x24,0x5e,0x01,0x00,0x00,0x00,0xf0,0x00,
- 0x00,0x00,0x00,0x00,0xc0,0x00,0xe0,0x21,0x1c,0x00,0x00,0x00,0x00,0x6a,0xbd,
- 0x6d,0xbb,0xdd,0x76,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,
- 0xdf,0x7f,0x7f,0xf7,0x07,0x80,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x58,0x4a,0xa5,0x52,0xa1,0x00,0x00,0x00,0x00,
- 0xf0,0x00,0x00,0x00,0x00,0x00,0x40,0x20,0xe1,0x00,0x1c,0x00,0x00,0x00,0x00,
- 0xbe,0xd7,0xb6,0x6d,0x6b,0xab,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x60,0xfb,0xf6,0xf7,0x5f,0x00,0x00,0x1b,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xae,0xaa,0x54,0x2a,0x55,0x01,0x00,
- 0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x40,0x00,0xe1,0x80,0x1c,0x00,0x00,
- 0x00,0x00,0xd6,0x7a,0xdb,0xb6,0xbd,0xdd,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xc0,0xef,0xff,0xbe,0x7b,0x00,0xc0,0x2f,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfa,0x57,0x55,0x55,0x55,0x95,
- 0x04,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x40,0x40,0xc0,0x60,0x1c,
- 0x00,0x00,0x00,0x00,0x7c,0xad,0x6d,0xdb,0xd6,0x6a,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x80,0x7f,0xdb,0xfb,0x3e,0x00,0xe0,0x16,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x57,0x55,0x55,0xa5,
- 0x24,0x49,0x05,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x40,0x80,0xe0,
- 0x00,0x1d,0x00,0x00,0x00,0x00,0xac,0xd7,0xb6,0x6d,0x6b,0x37,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0xff,0xef,0x6f,0x00,0xc0,0x0b,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x55,0x55,
- 0x2a,0x95,0xaa,0x54,0x12,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x80,0xe0,0x00,0x1c,0x00,0x00,0x00,0x00,0xf6,0xba,0xdd,0xb6,0xb5,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xbd,0xdb,0xbe,0xbb,0x00,
- 0xe0,0x0b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,
- 0x55,0x55,0x55,0x55,0x55,0x25,0x49,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x40,0x60,0x80,0x1d,0x00,0x00,0x00,0x00,0x5c,0xef,0x76,0xdb,0x1e,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xfe,0x7b,
- 0x6f,0x00,0xc0,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x5c,0x55,0x55,0x55,0x55,0x49,0x55,0x25,0x00,0x00,0x00,0xf0,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x40,0x60,0x40,0x1f,0x00,0x00,0x00,0x00,0xee,0x5a,0xab,
- 0x6d,0x0b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xef,
- 0xb7,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xb8,0xaa,0xaa,0xaa,0x54,0xaa,0xa4,0x94,0x00,0x00,0x00,0xf0,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0xc0,0x1f,0x00,0x00,0x00,0x00,0xb4,
- 0xed,0x7d,0xab,0x0d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xbe,0xff,0xdb,0x0d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x54,0x55,0x55,0xa5,0xaa,0x4a,0x95,0x52,0x00,0x00,
- 0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xa0,0x1e,0x00,0x00,0x00,
- 0x00,0xdc,0x56,0xab,0xdd,0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfb,0xdd,0xfe,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xa8,0xaa,0xaa,0xaa,0x4a,0x29,0x55,0xaa,
- 0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x00,0xc0,0x1e,0x00,
- 0x00,0x00,0x00,0x76,0xfb,0x76,0x6b,0x13,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x7e,0xff,0x6f,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x58,0x55,0x25,0x55,0xa9,0xaa,
- 0x52,0x85,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x1c,0x00,0x00,
- 0x1e,0x00,0x00,0x00,0x00,0xdc,0xad,0xad,0xbd,0x09,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x75,0xfb,0x01,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x58,0x55,0x55,0x55,
- 0x55,0x55,0x4a,0x29,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
- 0x00,0x00,0x1e,0x00,0x00,0x00,0x00,0xb4,0xd6,0x76,0x6b,0x01,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0x1f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xa8,0xaa,
- 0xaa,0xae,0x2a,0x49,0x29,0x05,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xc0,0x07,0x00,0x1f,0x00,0x00,0x00,0x00,0xd8,0xbb,0xad,0x5d,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xdf,0x0e,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x54,0x55,0x3d,0xe0,0xaa,0xaa,0xa6,0x04,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x3f,0x00,0x1f,0x00,0x00,0x00,0x00,0xb8,0x6e,0xf7,0xb6,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xf6,
- 0x17,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xa8,0xaa,0x02,0x80,0xa9,0x2a,0x99,0x02,0x00,0x00,0x08,0xf0,0x00,
- 0x00,0x00,0x00,0x00,0x1e,0x00,0xf8,0x01,0x1f,0x00,0x00,0x00,0x00,0x78,0xdb,
- 0x5a,0x2b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xe0,0x7f,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xbe,0x25,0x00,0x80,0x55,0xa9,0x54,0x00,0x00,0x00,0x5a,
- 0xf0,0x00,0x00,0x00,0x00,0x00,0x7c,0x00,0xe0,0x07,0x1f,0x00,0x00,0x00,0x00,
- 0xec,0x75,0x6f,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,0x24,0x55,0x25,0x00,0x00,
- 0x00,0x18,0xf0,0x00,0x00,0x00,0x00,0x00,0xf8,0x01,0x80,0x3f,0x1f,0x00,0x00,
- 0x00,0x00,0xb8,0xde,0xda,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xaa,0x4a,0x05,
- 0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0xc0,0x07,0x00,0x7e,0x1f,
- 0x00,0x00,0x00,0x00,0xdc,0xab,0x6d,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xb0,
- 0xaa,0x02,0x00,0x00,0x00,0x07,0xf0,0x00,0x00,0x00,0x00,0x00,0x80,0x1f,0x00,
- 0x70,0x1e,0x00,0x00,0x00,0x00,0x6e,0x7d,0xdb,0x02,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x70,0x55,0x03,0x00,0x00,0x80,0x01,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfc,0x00,0xc0,0x0e,0x00,0x00,0x00,0x00,0xb8,0xd7,0x4d,0x01,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x40,0x19,0x00,0x00,0x00,0xc0,0x00,0xf0,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xf0,0x03,0x00,0x07,0x00,0x00,0x00,0x00,0xf8,0x7a,0x07,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0xf0,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xc0,0x0f,0x00,0x08,0x00,0x00,0x00,0x00,0x68,0xaf,0x01,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x00,0x00,0x00,0x00,0x00,0xf0,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x94,
- 0xda,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0x01,0x00,0x00,0x00,0x00,
- 0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x01,0x00,0x00,0x00,0x00,
- 0x00,0xa0,0x77,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x07,0x00,0x00,
- 0x00,0x00,0x00,0xf0,0xdd,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x0f,
- 0x00,0x00,0x00,0x00,0x00,0xd0,0x36,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x1b,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xf8,0x01,0x00,0x00,0x00,0x00,0x80,0xb6,0x04,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xe0,0x07,0x00,0x00,0x00,0x00,0x00,0x2f,0x01,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x1f,0x00,0x00,0x00,0x00,0x80,0xfb,
- 0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3f,0x00,0x00,0x00,0x00,
- 0x80,0x56,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0x00,0x00,
- 0x00,0x00,0x00,0xfd,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,
- 0x00,0x00,0x00,0x00,0x00,0xa8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xb8,0x02,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x15,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xf0};
diff --git a/images/viewmag+.gif b/images/viewmag+.gif
deleted file mode 100644
index 6daba5233321e77718e8708feb51c4fc5fb51af0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1069
zcmZ?wbhEHb6k!lyc>bS(fsuiUm63~?k%gU!os(6Jm4S<gLz<OAfsKVvfJabRK#P|_
zL{!+4n^{~^+>x6}MpoKhfZ3Iw!Hbt!PF_}CK`xMo(Nmb!UyxBzSs{vtA(Wq0Nln8~
zoH<UAHA;k8T~jScibG9HM_WhBSw+IY$RI*Z#@N)TQ-aOL*4n|*eu^@KqmzS+tMh7k
z<}I=uD^!^#>I*E<WbpL%@bK|lsL$!+=e<jX*+0N9I3#G5x!_83xl`H##|>E`qQXxY
z37j?OI&aBv+Lr6GHFHu*Vrp8-j2Q8&c0#k_1a3HRZ1L63$V{(GjGmn$a?_JHJHKdR
zhT(#A{=9<R`|eUpvRG$js!z?<z2_^_QQ-Z^OC_(gwz#xtRX)S)eC?vL%KQE*D~lP5
zE2`EOGWC>(RaBKf3|A<xsasN}QdLv=I8te4rRdsn(J7Vwwe>X%s;t)5@N`y}t*w>n
zuTN=cs^3<}bTBt?VO_wkMuz6rrpk`Kt<CI}Ju~LF`%majUDz5`*|Vgfd&b^Qh8bOn
zZQXqp{qyH{#?0+Z`j}=jw=X_t+MdcOtG;Jh_D|?t(wBH>62q??>+IRb7fi~WIC;X1
zsilRp53Zl=(KK__)w;wfvufwgC^|WV;pi;(!Ubn1&RkeOf7hAW4AW-MJvE=9cfsnp
z3+pE=*ff3q@^gzAYnPp!JAcmX#jA@qTxnQ!ao*x(%N8!^Saa^m8iu9Imn>MZp=IO6
z<tvx9Z@6)5Bg4WC+b3^6e|FL28JkZn+IZydPKN2*FR$ISW%ZUlOST`LxckwxU3cf~
zIsJGaL+jDU(+-_ny!*_qty>oFKe=V+?k7hWx=-DDdX%B>#Df`!UhUkyW66=@oAw`=
zdHluR{d?vgf4t+siMMAMwjVyS=iuS_XC5p(cXjQ_%Lfnde{+#x`lVO9jvs%2g<;v{
zTgOix-E-#hx=Xhw-~H8p|NnuD*H522HSNLQMR&h#y8h<(J%*LHzn;8!>-@!YKOV7c
zx%vL=rK_v&e&2iZ$;HbT7C-*K>gnGbx2_#}^!fJPTQ~1Ly!7nT)n{)Wy!`n8|9{1w
zER0+X{~2@`7#J8pd4hrCAH#o68IKJM9Gf_00#;0LJm}cW<MrgjqoY1tT>R`z6-FE(
zt0MNTGPL?A;J~UoC*vfiNGtE!;GG3BDGtmNv}4Pru&z?#y`ibEz%$RMWyK|_>{&;C
zY;@(mz|*WGa`D!dY>7R2r;hAse0I9$px~m8xq-zY!qe3zp7^Qs*;LHXr)gCQcZ*8U
zj>>&q4yMIx=Irz=S){Pbynp^oK{m}B9^1}F8`{l0arX1}ezt~Y1&Ncz<$AZws;2DR
zDlkFNcXj%s9kPcHzlfMCtHCGJG9j7!sIE@X0n0B>kF(w6XJt_M+ka${YkXXU!-R<n
p46>PGv4u)YEDs7;owAS=I`YebQ9O&ALs02(^+A3?7B&_JYXEDa>x=*Z

diff --git a/images/viewmag-.gif b/images/viewmag-.gif
deleted file mode 100644
index e2dc98fa2744235c6eaf67e880b70cc4d4deaf06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1064
zcmZ?wbhEHb6k!lyc>a%pfsuiUm63~?k%gU!os(6Jm4S<gLz<OAfsKVvfJabRK#P|_
zL{!+4n^{~^+>x6}MpoKhfZ3IwK~`SIi<enWURGW~E|7=OQ<&9XkWo=tA&Q3~l%G{e
zO~X%|IZlu@N`zTmQ!Pk}LrqIZTSv=TMZ&<yAVN*X*wm;~g3ZR(+QHF&iZX+vlY@(^
z^J;nKEwUUdRGB8~3oOxO@bvcZ@bO!y&$&y5+1KC4KhQ5YBxsen;7W73Q`!Q@4Ot?h
z!cQ0poHge<Z^>}lmg}-Lb5crTYFf%wJE0p699w*~Gcwcb5~FW=^3F(?%gxWp&M#V)
z#ym4a{=U1^tW1Uc!n`%v4EKCx9(k$cmDU!Q7Txz(DK4*?USwQRRsJwsp}eN9s;2UB
zq*85t&7|7E#npP9)nyB-ts9!^=hZtO%nfXAZJN>=R@t+pp?gMKci;9dfsbi6>C+Fl
zPMq{D)1tS(r*g`wAK6y@6Z?MUSZB{ZK5_Dd!r2F#X0AFsgDHRBsjGE~*$XcfE<8JN
z=E4JWB<knynl^jxsrd}MW;@MT&{?|lV()_0i|5xLT_87M!KV2Oy3Q?PtX+0??)*8Y
z7bs3zK5P1-4VRWO%v-c{_TtqIt1d2E+O=%qf|89_7c5;dYuV<dD`sq1*1mN4lC}-k
z+c(}=v1-}EwYzq%nlyRy`PLox&MulfWAmxrZTA*!JaTk(*THq&_jWN%-+p=RrY)z|
zwXfN-XUX=%({|nMJ$z!)o+mR79GtV~%;S9wtw$ek+P-Vnp~JhjZkcxAMbGj3PmVCm
zJ$P;FuDv^V?^tr=_^iXPC!M)I^Z1Ls`}fQ}_I}5K6T1%_T6Fy7vQwAmpLwwN(2=z#
zFRwm*?%?75voAhgbpGS96GxAqJT~d>&sn#AthxGl;f?QmF5H=V|Id~yPYztXe)`<0
zX%GKyx$<$*-ESLizSw-@-N}o$=05tl>dv?G7tigu@p9&q|7R~<xp?`)`775KKmNb^
z;g=PU|LnQ*X2YYuH*Q@!^yu@AyAN*Py>;vUqmxhnUVQrL>a#bOpMSaX=HG*tAOC}a
z;!hSvE{6XMIt&a944^#0!10gaKc|exh6RpIoH9Ne7C0VsZ07NKabwfd?k+BVcBYC)
z%LJB&ZZ3Q2_)(yNRj1BLG<lj%q=v`J5}A~M#l5Qve*U<4*zK&?5?w`}c|C_$imVQs
zFH>2xY!xqWv+|FYNl&<DT#X66AfQ~zwn`~BpC?o*nzL(W#^!AjDupk_r)w5G);pzk
z`b3oBhINIvtIx{V6#m>c!N6jnn|{W*9Xo@c_ubi7ZNebK^Ke<r&fF&_mcA~3AIZ%q
zc`&0Y%r{Ekw7hER!-<a$_{fHAv$=W6$yL%Ks-d9ZZ$JaX$^TwAW-ewu#>yhe$#g^T
m*f{|;=SjjxHXP;_QgK?sZ}Q;au?dRCTiC=|1RWC`7_0$Pk_p}b

diff --git a/images/viewmag-.png b/images/viewmag-.png
deleted file mode 100644
index 8108ecd7b08e2e49f9c421ac3dcdbe18c28e94ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1056
zcmeAS@N?(olHy`uVBq!ia0y~yU=RUe4mJh`hTcwDUIqpRwj^(N7l!{JxM1({$qWn(
zoCO|{#S9GG!XV7ZFl&wk0|NtliKnkC`*kKZF=K<USca<%49sgiT^vI!PS3r(J3l&A
z=Ge#gJ8!6;Td9A1`W4?tDyF{9lg$)6W4Kb7E^-`f5ctE{(a6dvaU()fV#0)o2@+i`
z5)6u>OIJy7iHdWET%6`sc*$&GY3^~qnn#acf84o;M`UGI%+yah@2&Uz;@SWGyT==U
z4i5&a1q@6X%%%$tIxF2R=4UwGaQS7)FVWcR=_!$Y8eK`;il3%>r5-goo8NHS;d|l(
zh7B_P$M2s@+q_&%OpLkR?KmgTixwv-i`-Ay+4rul4iDFl-SuT+?(KNS>c0-G6B>h0
zrhIB%x^(HC&H8)R$W^?_ymLb^C7CH)-mS%b=FGWM)76ginXUbmvod7Y%U$o-9(-r!
z^}T%W<kO<lpU>}IWzriN^my_T_qI-{!b2A&qOLsXQ+>#qe8%2RZmmc@zc^QGal=*q
zGbu(h`HRo*UuL}L#K)Yb<;O(*RH~L7w#}*&SG>7o5wl5+Y$&(4S9$rFJ8S=C%u4%L
z7r+`~E7R%j-X|mw>bA{p+1|R==mvF#SB-iLuFX{|{S+%z)O9#`Gs}Ma?JPC7`CY<H
zoldI!`c}#JBHhyF_8s##-0^n~d7l-WS<RfBBH?@4>93tDE60hZhzQqDZW=Lso4#NF
z*KTXwA?BSdp;(qzRw&cX-ndST=ZaFC@x6JKou>}!?Cv!(Qt)2j@t-HEdkJUXT$QDs
zYo_NVM_yxgTz&cFpH1bD&x;#(s(kHCf5FN=QH0f%DYS`!>1?^>i>-pUumAkHygP66
z%|CnPHJH;@hFI<1xbdQgRjJzA**vCRM{>G1TvmIu#dC+Q+8;K}?Z>ui*KgRhE9>g(
zuWNUk-ra5%xBBX>k2d)g85u8LJnGCe)x0V5;u@#5F3)kLcTp?K=7t?Ubm#8D-J6##
zE9*`!y)B!?&Gmho+s^8!r$v=(qt<Hutf{+Y(37CCLg|f|?CF%x$4bM(!Zujv7B%bn
zi|A_$S5M73^?m-GH=Qn*pP$;lq9lHOa$BN|zuM${E=4if<CaRELB5lggx=n!@1vr0
z`n~Rw;^n-KACJkdd)_@~z2#ivWxp$L3cqJ|{VEs0uq<<yxbNjXH`4FjI&kmXxBR-q
zy23)Avp%T~99zy7X-G_o`(Jcja!+pec9DP8HkSqW&Qo8uIIjH3g#~L~RB=2sx12WN
z=8ezGR^|Rbv$%obs?+iK^(B8#uDCASYodGe_`w{jKN}v;jE?>Ia&Z%rhM3jAt!I~+
zo9pgeY<vFU>rK!9+!B~C8oO`ukNSy?iz9u1xlEm?>%V4(UV6^_NB6mf7f&?|V4KRo
Pz`)??>gTe~DWM4fX;b6C

diff --git a/installation/DAP.py b/installation/DAP.py
deleted file mode 100644
index ca1edb378..000000000
--- a/installation/DAP.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Edit this configuration file before building.
-# Always build with --force after changing a configuration.
-# You do not need to rebuild Python itself.
-#print 'DAP'
-
-import os
-current_dir = os.path.dirname(__file__)
-src_dir = os.path.join(current_dir, '..')
-installation_script_dir = os.path.join(src_dir, 'installation')
-
-sys.path.append(src_dir)
-sys.path.append(installation_script_dir)
-
-CDMS_INCLUDE_DAP='yes'
-CDMS_DAP_DIR=""
-try:
-    import cdat_info
-    externals = cdat_info.externals
-except:
-    externals = os.path.join(sys.prefix,"Externals")
-externals = os.environ.get("EXTERNALS",externals)
-
-for o in sys.argv[1:]:
-    pth = o.lower().split('with-opendap=')
-    if len(pth)>1:
-        CDMS_DAP_DIR=pth[1]
-        
-if CDMS_DAP_DIR is "":
-    CDMS_DAP_DIR=os.path.join(externals,'OpenDAP')
diff --git a/installation/HDF.py b/installation/HDF.py
deleted file mode 100644
index 23830d08e..000000000
--- a/installation/HDF.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# To build on Linux with HDF:
-# express_install /usr/local/cdat/somewhere --force --configuration installation/hdf.py
-import os
-current_dir = os.path.dirname(__file__)
-src_dir = os.path.join(current_dir, '..')
-installation_script_dir = os.path.join(src_dir, 'installation')
-
-sys.path.append(src_dir)
-sys.path.append(installation_script_dir)
-
-CDMS_INCLUDE_HDF='yes'
-CDMS_HDF_DIR=""
-try:
-    import cdat_info
-    externals = cdat_info.externals
-except:
-    externals = os.path.join(sys.prefix,"Externals")
-externals = os.environ.get("EXTERNALS",externals)
-
-for o in sys.argv[1:]:
-    pth = o.lower().split('with-hdf4=')
-    if len(pth)>1:
-        CDMS_HDF_DIR=pth[1]
-
-if CDMS_HDF_DIR is "":
-    CDMS_HDF_DIR=os.path.join(externals,'HDF')
diff --git a/installation/cdmsonly.py b/installation/cdmsonly.py
deleted file mode 100644
index 90ea11824..000000000
--- a/installation/cdmsonly.py
+++ /dev/null
@@ -1,16 +0,0 @@
-packages = [ 
-	    "Packages/AutoAPI",
-            "Packages/cdtime",
-            "Packages/regrid2",
-#            "Packages/regrid",
-            "Packages/Properties",
-	    "Packages/kinds",
-            "Packages/cdms2", 
-            "Packages/genutil", 
-            "Packages/cdutil", 
-            "Packages/unidata", 
-#            "Packages/cdms", 
-            "Packages/ncml", 
-            "Packages/esg",
-            "Packages/distarray",
-           ]
diff --git a/installation/contrib.py b/installation/contrib.py
deleted file mode 100644
index 606aaf5fd..000000000
--- a/installation/contrib.py
+++ /dev/null
@@ -1,73 +0,0 @@
-import os
-dostandard = force
-## try:
-##     import Numeric, cdms
-## except ImportError:
-##     dostandard = 1
-dostandard = 1
-import sys
-if not 'clist' in locals().keys():
-    clist=[]
-## Format is [path,description,licence_file]
-Clist = [
-#    ['contrib/Sphinx','sphinx documentation builder','GNU'],
-##     ['contrib/zope-interface','zope interface','GNU'],
-#    ['contrib/Twisted','network computing tools','GNU'],
-#    ['contrib/Foolscap','RPC protocol for Python+Twisted','GNU'],
-#    ['contrib/ipython','an Enhanced Python Shell','GNU'],
-#    ['contrib/scipy','Scientific tools for Python (core only)','GNU'],
-    ['contrib/SP','A collection of Python modules that are useful for scientific computing.','LICENSE'],
-    ['contrib/cssgrid','An interpolation package for random data on the surface of a sphere based on the work of Robert Renka. cssgrid uses cubic splines to calculate its interpolation function.',''],
-    ['contrib/lmoments','56 routines for statistical analysis using L-moments','UC'],
-    ['contrib/ort','Reads in Oort data files','UC'],
-#    ['contrib/spherepack','A collection of programs for computing certain common differential operators and performing related manipulations on a sphere.',''],
-    ['contrib/asciidata','Reads in ASCII files with the ability to specify tab or comma or space delimited fields','Lib/ASV.py'],
-    ['contrib/eof','Calculates Empirical Orthogonal Functions of either one variable or two variables jointly','UC'],
-    ['contrib/trends','Computes variance estimate taking auto-correlation into account.',''],
-    ['contrib/binaryio','Handles binary or unformatted data',''],
-    ['contrib/regridpack','A collection of programs for linear or cubic interpolation in one, two, three or four dimensions.',''],
-    ['contrib/shgrid','An interpolation package for random data in 3-space based on the work of Robert Renka. shgrid uses a modified Shepard\'s algorithm to calculate its interpolation function',''],
-    ['contrib/dsgrid','A three-dimensional random data interpolator based on a simple inverse distance weighting algorithm.',''],
-    ['contrib/pyclimate','Provides functions to perform some simple IO operations, operations with COARDS-compliant netCDF files, EOF analysis, SVD and CCA analysis of coupled data sets, some linear digital filters, kernel based probability density function estimation and access to DCDFLIB.C library from Python.','GNU'],
-    ['contrib/ComparisonStatistics','Calculates statistics (e.g., correlations and RMS differences) that quantify differences between two datasets. Allows for ellaborated masking and regridding operations','UC'],
-    ['contrib/IaGraph','Package for Quick Interactive Graphing','GNU'],
-    ['contrib/MSU','Package to compute Equivalent MSU Temperatures','UC'],
-    ['contrib/EzTemplate','Package to generate VCS templates easily','GNU'],
-    ['contrib/ZonalMeans','Package to compute zonal means on any grid (requires f90 compiler)','GNU'],
-    ['contrib/HDF5Tools','Package to read HDF5 files into CDAT (requires h5dump binary utility)','GNU'],
-# following is now built via externals
-#    ['contrib/eof2','',''],
-#    ['contrib/eofs','',''],
-#    ['contrib/windspharm','','GNU'],
-]
-
-# natgrid has illegal C comments but gcc lets them through...
-# we need to fix it.
-NCARG_ROOT = os.environ.get('NCARG_ROOT')
-NCARG_COLORMAP_PATH = os.environ.get('NCARG_COLORMAP_PATH')
-if NCARG_COLORMAP_PATH or NCARG_ROOT :
-    Clist.append(['contrib/pyncl','Generate NCL plots of cdms transient variables',''])
-
-
-if sys.platform == "linux2" or sys.platform == 'darwin':
-    Clist.append(['contrib/natgrid','A two-dimensional random data interpolation package based on Dave Watson\'s nngridr',''])
-
-if '--enable-R' in sys.argv or '--enable-r' in sys.argv:
-    Clist.append(['contrib/Rpy','Python Interface to the R library','GNU'])
-
-if '--enable-ioapi' in sys.argv :
-    Clist.append(['contrib/pyIoapi','Python Interface to the IoAPI library','GNU'])
-    Clist.append(['contrib/egenix',"Collection of  tools which enhance Python's usability in many important areas such as ODBC database connectivity, fast text processing, date/time processing and web site programming.",'LICENSE'])
-    Clist.append(['contrib/ioapiTools','ioapiTools developped by Alexis Zubrow form University of Chicago','GNU'])
-
-if '--enable-spanlib' in sys.argv :
-    Clist.append(['contrib/spanlib','Package to do Spectral analysis','GNU'],)
-    
-if not dostandard:
-    packages = []
-
-for c in Clist:
-    clist.append(c)
-    packages.append(c[0])
-
-    
diff --git a/installation/control.py b/installation/control.py
deleted file mode 100644
index 49ed5d9af..000000000
--- a/installation/control.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# This file is used to control the behavior of install.py.
-
-# The search path is used if the X11 directories aren't configured.
-x11search = ['/usr/X11R6', '/usr/X11R6.5.1',
-             '/usr/X11R6.4','/usr','/usr/openwin','/opt']
-# Here is where they are on OSF1 and perhaps similar systems
-x11OSF1lib = ['/usr/lib/X11', '/usr/lib']
-x11OSF1include = ['/usr/include/X11']
-
-# Controlling the install itself
-force=0    # Force a complete recompilation?
-norun=0   # Cause _install just to echo command?
-echo=0     # Echo installation commands before executing?
-log=1      # Make logs?
-silent = 0 # Report progress?
-
-import os,sys
-current_dir = os.path.dirname(__file__)
-build_dir = os.getcwd()
-sys.path.append(build_dir)
-src_dir = os.path.join(current_dir, '..')
-installation_script_dir = os.path.join(src_dir, 'installation')
-
-sys.path.append(src_dir)
-sys.path.append(installation_script_dir)
-
-# Configuration
-do_configure = 1
-if os.path.isfile(os.path.join(build_dir,'cdat_info.py')):
-    try:
-      import cdat_info
-      do_configure = 0
-    except:
-      pass
-
-finish="""
-******************************************************
-Success! CDAT has been installed in %s .
-Make sure all Packages built successfully
-******************************************************
-
-""" %(sys.prefix,)
-
-# Options used for building setup.py, install_script, make
-if os.environ.has_key('MAKE'):
-    make_code = os.environ['MAKE']
-else:
-    make_code = 'make'
-
-# List of packages to be built
-packages = [
-    "Packages/pydebug",
-    "Packages/cdtime",
-    "Packages/demo",
-    "Packages/help",
-    "Packages/regrid2",
-    "Packages/cdms2",
-    "Packages/esg",
-    "Packages/ncml",
-    "Packages/DV3D",
-    "Packages/vcs",
-    "Packages/vcsaddons",
-    "Packages/cdutil",
-    "Packages/unidata",
-    "Packages/xmgrace",
-    "Packages/genutil",
-    "Packages/Thermo",
-    "Packages/WK",
-    "Packages/gui_support",
-    "Packages/distarray",
-    "Packages/testing",
-    ]
diff --git a/installation/debug.py b/installation/debug.py
deleted file mode 100644
index 87fcd2bc9..000000000
--- a/installation/debug.py
+++ /dev/null
@@ -1,12 +0,0 @@
-## action['setup.py'] = sys.executable + ' setup.py build --debug install'
-## action['install_script'] = './install_script --debug ' + sys.exec_prefix
-## for k in ['makefile','Makefile','MAKEFILE']:
-##     action[k] = make_code + " PREFIX='%s' DEBUG=1 install " % sys.exec_prefix
-
-# matplotlib depends on pkg-config under install/bin
-action['setup.py'] = 'PATH=%s/bin:$PATH && %s setup.py build --debug install --prefix=%s ; ' \
-    % (sys.exec_prefix, sys.executable, target_prefix)
-action['install_script'] = './install_script  %s %s --debug ; ' % (target_prefix, sys.exec_prefix)
-for k in ['makefile','Makefile','MAKEFILE']:
-    action[k] = make_code + " PYPREFIX='%s' PREFIX='%s' DEBUG=1 install ; " % (sys.exec_prefix,target_prefix)
-action['autogen.sh'] = "autogen.sh ; ./configure --prefix=%s  --with-python=%s ; make ; make install ;" % (os.path.join(os.path.split(target_prefix)[0],'Externals'), os.path.join(sys.exec_prefix,'bin','python'))
diff --git a/installation/irix.py b/installation/irix.py
deleted file mode 100644
index 04e8318aa..000000000
--- a/installation/irix.py
+++ /dev/null
@@ -1,2 +0,0 @@
-x11include='/usr/include/X11'
-x11libdir='/usr/lib/X11'
diff --git a/installation/pcmdi.py b/installation/pcmdi.py
deleted file mode 100644
index 141884ef2..000000000
--- a/installation/pcmdi.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Edit this configuration file before building.
-# Always build with --force after changing a configuration.
-# You do not need to rebuild Python itself.
-CDMS_INCLUDE_DRS='yes'
-# if sys.platform=="linux2":
-#   COMPILER_EXTRA_LIBS=['pgftnrtl','pgc']
-# else:
-#   COMPILER_EXTRA_LIBS=[]
-COMPILER_EXTRA_LIBS=["gfortran",]
-#if sys.platform[0:3] == "aix":  # and probably other platforms...
-#    CMDS_INCLUDE_QL = 'no'
-#else:
-#    CDMS_INCLUDE_QL ='yes'
-
-# These don't actually get respected by the libcdms build yet.
-# drs_file = '/usr/local/lib/libdrs.a'
-
-# Add on additional packages
-#packages.append('Packages/psql')
-#packages.append('Packages/cu')
-#packages.append('Packages/pcmdi')
-
diff --git a/installation/pp.py b/installation/pp.py
deleted file mode 100644
index 6c5abf9c0..000000000
--- a/installation/pp.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# To build CDMS with support for the Met Office PP format:
-# express_install /usr/local/cdat/somewhere --force --configuration=installation/pp.py
-CDMS_INCLUDE_PP='yes'
diff --git a/installation/psql.py b/installation/psql.py
deleted file mode 100644
index d3b52b6eb..000000000
--- a/installation/psql.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Add on additional packages
-CDMS_INCLUDE_QL ='yes'
-packages.append('Packages/psql')
diff --git a/installation/standard.py b/installation/standard.py
deleted file mode 100644
index b86f594dc..000000000
--- a/installation/standard.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# DO NOT EDIT THIS FILE
-# Instead, make your own configuration file to override these values 
-# and use the -c option to read it.
-
-# This is the standard configuration file. It is read first by install.py.
-# In your own configuration file you can use any Python statements to modify
-# these values. 
-
-# File pcmdi.txt is an example that shows the changes we use at PCMDI.
-
-# Append to packages to build additional packages, such as
-# packages.append('cu')
-
-#This file is executed as Python input so you can compute values depending on
-#platform, etc. Modules os, sys will be imported already.
-
-current_dir = os.path.dirname(__file__)
-src_dir = os.path.join(current_dir, '..')
-libcdms_dir = os.path.join(src_dir, 'libcdms')
-
-## This part figures out the target thing
-target_prefix = sys.prefix
-for i in range(len(sys.argv)):
-    a = sys.argv[i]
-    if a=='--prefix':
-        target_prefix=sys.argv[i+1]
-    sp = a.split("--prefix=")
-    if len(sp)==2:
-        target_prefix=sp[1]
-
-
-# This is where we build netcdf, if you let us
-#netcdf_directory = os.popen('%s --prefix' % os.environ.get("LOCNCCONFIG","nc-config")).readlines()[0]
-#netcdf_include_directory = os.popen('%s --includedir' % os.environ.get("LOCNCCONFIG","nc-config")).readlines()[0]
-#netcdf_include_directory= os.path.join(os.environ.get("EXTERNALS",os.path.join(sys.prefix,'Externals')),'include')
-
-#  Control of the CDMS build
-drs_file = '/usr/local/libdrs.a'  # only needed if next line is 'yes'
-CDMS_INCLUDE_DRS='no'    # Change to 'yes' to include DRS. If yes:
-                         # Assumes /usr/local/lib/libdrs.a exists.
-                         # Assumes you have a Fortran compiler.
-CDMS_INCLUDE_QL='no'     # Include QL in build?
-                         # Caution: if set to yes, CDMS library compile
-                         # may fail on certain platforms, including AIX.
-CDMS_INCLUDE_HDF='no'    # Don't set to yes, doesn't work.
-CDMS_INCLUDE_PP='no'     # Met Office PP format is built in to cdunif.
-#  Location of X11 library
-#     If you set x11libdir (that is two ones and an el) AND x11include to point
-#     to the lib and include directories, they will be used.
-#     Otherwise a search is made for common locations.
-if sys.platform in ['mac']:
-   x11libdir='/usr/X11R6/lib'
-   x11include='/usr/X11R6/include'
-else:
-   x11libdir=''
-   x11include=''
-
-#  List of math libraries
-#    We attempt to get the C math libraries right but if we don't fix it.
-mathlibs= ['m']  #i.e., libm.a
-if sys.platform in ['win32', 'mac', 'beos5']:
-    mathlibs = []
-
-# Build actions
-action = {}
-## Commenting out pyfort not used anylonger (it's been years)
-#if os.path.exists(os.path.join(target_prefix, 'bin', 'pyfort')):
-#    action['*.pfp'] = os.path.join(target_prefix, 'bin', 'pyfort') + " -i %(file)s ; "
-#elif os.path.exists(os.path.join(sys.exec_prefix, 'bin', 'pyfort')):
-#    action['*.pfp'] = os.path.join(sys.exec_prefix, 'bin', 'pyfort') + " -i %(file)s ; "
-#else:
-#    action['*.pfp'] = "pyfort  -i %(file)s ; "
-    
-# matplotlib depends on pkg-config
-action['setup.py'] = 'PATH=%s/bin:$PATH  %s setup.py install --prefix=%s ; ' \
-    % (sys.exec_prefix, sys.executable, target_prefix)
-install_script_path = os.path.join(libcdms_dir, 'install_script')
-action['install_script'] = install_script_path + ' %s %s ; ' % (target_prefix, sys.executable)
-for k in ['makefile','Makefile','MAKEFILE']:
-    action[k] = make_code + " PYPREFIX='%s' PREFIX='%s' install ; " % (sys.exec_prefix,target_prefix)
-action['autogen.sh'] = "autogen.sh ; ./configure --prefix=%s  --with-python=%s ; make -j1 ; make -j1 install ;" % (os.environ.get("EXTERNALS",os.path.join(sys.prefix,'Externals')), os.path.join(sys.exec_prefix,'bin','python'))
diff --git a/pysrc/README.txt b/pysrc/README.txt
deleted file mode 100644
index 040a48ab7..000000000
--- a/pysrc/README.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-This directory contains all the sources for building a Python suitable for
-use with CDAT. 
-
-Changes from standard distributions:
-   a. readline
-      In file readline.c, change definition of RL_LIBRARY_VERSION to avoid
-      the error if this macro is already defined, by undefining it.
-   b. We use a private version of Python's setup.py to have it find
-      our own tcl/tk.
-
-To install:
-./install_script /whereyouwanttoputit 
-
-A subdirectory build will be created that contains the output.
-Some of these products can be tested by changing to their directory under 
-build and typing "make test".
-
-If you put in a new source file you need to remove the old one and run
-./clean_script before building again.
-
-
-OPTIONS:
-you can add: --enable-aqua to the build line to prevent the build of Tcl/Tk
-and use Aqua Native
-you can add: --disable-tkbuild to the build line to prevent the build of Tcl/Tk
-
-Log files are created in the build subdirectory.
-
-Each of the pieces may be built individually using the corresponding .sh 
-files in this directory. Some warning errors are usual from 
-many of the packages and vary from architecture to architecture.
-
-N.B.: The order in which the packages are built matters. 
-
-You can add an 'exit 0' at any appropriate point in install_script if you
-want to go up to that point and then stop.
diff --git a/pysrc/clean_script b/pysrc/clean_script
deleted file mode 100755
index 185cc2b0e..000000000
--- a/pysrc/clean_script
+++ /dev/null
@@ -1,2 +0,0 @@
-/bin/rm -fr build >/dev/null 2>&1
-find . -name 'config.cache' -print -exec rm {} \; 
diff --git a/pysrc/install_script.obsolete b/pysrc/install_script.obsolete
deleted file mode 100755
index a96a6fab4..000000000
--- a/pysrc/install_script.obsolete
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/sh
-d=`pwd`
-if [ -n "$PYTHONPATH" ]; then
-    echo "PYTHONPATH environment variable should not be set!"
-    exit 1
-fi
-
-if [ -n "$PYTHONHOME" ]; then
-   echo "PYTHONHOME environment variable should not be set!"
-   exit 1
-fi
-
-echo "Building Zlib, Readline, Tcl, Tk, and Python."
-echo "Logs are in $d/build"
- 
-
-OS=`uname`
-AQUA=no
-TK=yes
-all=$*
-READLINE=yes
-ZLIB=yes
-OSver=`uname -r`
-OSMajor=`uname -r | cut -d. -f1`
-
-s=$1; shift;
-while [ "$#" -ne 0 ]
-do
-  # Translate $1 to lowercase
-  MYOPT=`echo $1 | tr 'A-Z' 'a-z'`
-  if [ "$MYOPT" = "--enable-aqua" ]; then
-      if ( test "${OS}" == "Darwin" ) then
-	  AQUA=yes
-      else
-	  echo "--enable-aqua is for Darwin systems only! Use --disable-tkbuild"
-	  exit 1
-      fi
-      if ( test "${OSMajor}" == "9" ) then
-	  echo "Detected Leopard 10.5, doing the posix thing";
-	  CPPFLAGS="-DSETPGRP_HAVE_ARG "${CFLAGS}
-      fi
-  fi
-  if [ "$MYOPT" = "--disable-tkbuild" ]; then
-      TK=no
-  fi
-  if [ "$MYOPT" = "--disable-externals-build" ]; then
-      TK=no
-      READLINE=no
-      ZLIB=no
-  fi
-  shift
-done
-./prolog.sh ${all}
-if [ $? -ne 0 ]; then
-    echo "Unpacking of tar files failed."
-    exit 1
-fi
-
-
-if [ "${ZLIB}" = "no" ]; then
-    echo "skipping build of zlib"
-else
-    echo "Building zlib"
-    ./zlib.sh $s  >build/zlib.LOG 2>&1
-    if [ $? -ne 0 ]; then
-	echo "Build of zlib failed"
-	exit 1
-    fi
-fi
-
-if [ "${READLINE}" = "no" ]; then
-    echo "skipping build of readline"
-else
-    echo "Building readline"
-    ./readline.sh $s >build/readline.LOG 2>&1
-    if [ $? -ne 0 ]; then
-	echo "Build of readline failed"
-	exit 1
-    fi
-fi
-if [ "${OS}" = "CYGWIN_NT-5.1" ]; then
-   echo "Tcl - Using the pre-built tcl library that is part of the standard Cygwin distribution"
-   echo "Tk - Using the pre-built tk library that is part of the standard Cygwin distribution"
-elif [ "${OS}" = "CYGWIN_NT-6.0" ]; then
-   echo "Tcl - Using the pre-built tcl library that is part of the standard Cygwin distribution"
-   echo "Tk - Using the pre-built tk library that is part of the standard Cygwin distribution"
-elif [ "${AQUA}" = "yes" ]; then
-    echo "Tcl - Using the pre-built tcl library that is part of the standard Darwin distribution (with Aqua support)"
-    echo "Tk - Using the pre-built tk library that is part of the standard Darwin distributioni (with Aqua support)"
-elif [ "${TK}" = "no" ]; then
-    echo "Tcl - Using the pre-built tcl library that is part of your system"
-    echo "Tk - Using the pre-built tk library that is part of your system"
-else
-   echo "Building tcl"
-   ./tcl.sh $s >build/tcl.LOG 2>&1
-   if [ $? -ne 0 ]; then
-       echo "Build of tcl failed."
-       exit 1
-   fi
-   
-   echo "Building tk"
-   ./tk.sh $s >build/tk.LOG 2>&1
-   if [ $? -ne 0 ]; then
-       echo "Build of tk failed."
-       exit 1
-   fi
-fi
-
-echo "Building python"
-./python.sh $s >build/python.LOG 2>&1
-if [ $? -ne 0 ]; then
-    echo "Build of Python failed."
-    exit 1
-fi
-
-echo "Python built successfully."
-
diff --git a/pysrc/prolog.sh b/pysrc/prolog.sh
deleted file mode 100755
index f98909593..000000000
--- a/pysrc/prolog.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-if (test "$1" = "--debug") then
-    D="--debug";
-    OPT=-g; 
-    shift
-else
-    D="";
-    OPT=${OPT:=-O}
-fi
-export OPT
-
-OS=`uname`
-
-if (test -z "$1") then
-    echo "Usage: $0 prefix";
-    exit 1
-fi
-version=`more ../version`
-
-if (test ! -d $1) then
-    echo -n "$1/${version} is not a directory; create it? (y/[n])";
-    y='n'
-    read y;
-    if (test ${y} = 'y') then
-        mkdir -p $1/${version}/bin; mkdir $1/${version}/lib; mkdir $1/${version}/include ; mkdir -p $1/Externals/bin ; mkdir $1/Externals/lib ; mkdir $1/Externals/share ; mkdir $1/Externals/include
-        if (test ! -d $1) then
-            echo "Could not create $1, installation aborted.";
-            exit 1
-        fi
-    else
-        echo 'Installation aborted.';
-        exit 1
-    fi
-fi
-echo "Created  $1/${version} and $1/Externals directories"
-echo "Python/CDAT built in $1/${version} and external dependencies binaries and libs are built to $1/Externals"
-
-prefix=`(cd $1;pwd)`
-
-if (test ! -d build) then
-    # Unpack everything into build
-    mkdir build
-    /bin/cp src/*gz build
-    cd build
-    OS=`uname`
-    if (test "${OS}" = "Linux" ) then
-         TAR=`which tar`
-    elif (test "${OS}" = "Darwin" ) then
-    	 TAR=`which tar`
-    elif (test "${OS}" = "CYGWIN_NT-5.1" ) then
-         TAR=`which tar`
-    elif (test "${OS}" = "CYGWIN_NT-6.0" ) then
-         TAR=`which tar`
-    elif (test "${OS}" = "AIX" ) then
-         TAR=`which tar`
-    else
-         echo "Building tar for non GNU OS to unpack Python, some error messages may be generated but can be ignored"
-	 chmod +w tar*gz
-         for x in tar*gz;
-         do 
-           gunzip -f $x;
-           tar xf `basename $x .gz`;
-	   (cd tar-* ; ./configure --prefix=$1/Externals ; make ; make install; cd .. )> LOG.prolog;
-           TAR=$1/Externals/bin/tar
-         done
-    fi
-    #rm tar*gz
-    chmod +w *.gz 
-    for x in *.gz; 
-    do 
-        echo "$x"; 
-	gunzip -f $x;
-        ${TAR} xf `basename $x .gz`;
-        /bin/rm -f `basename $x .gz`;
-    done
-#    for x in *.tgz; 
-#    do 
-#        echo "$x"; 
-#        ${TAR} xzf $x;
-#        /bin/rm -f $x
-#    done
-    cd ..
-fi
-cd build
-echo "Installation to ${prefix}"
diff --git a/pysrc/python.sh b/pysrc/python.sh
deleted file mode 100755
index 3e0d844b7..000000000
--- a/pysrc/python.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-. ./prolog.sh
-# Python, idle
-# This needs to be set or Python's installer will conclude _tkinter cannot
-# be imported.
-CCTEMP=${CC-gcc}
-# Get command name WITHOUT the parameters
-CCTEMP=`echo $CCTEMP | awk '{print $1}'` 
-if (test "${CCTEMP}" = "gcc") then
-config_opt="--with-gcc --without-cxx"
-else
-   config_opt="--without-gcc --without-cxx"
-fi
-OS=`uname`
-if (test "${OS}" = "Darwin") then  # MacIntosh OSX
-   CPPFLAGS="-I${prefix}/Externals/include"; export CPPFLAGS
-   LDFLAGS="-L${prefix}/Externals/lib"; export LDFLAGS
-   config_opt=""
-   OPT=""; export OPT
-fi
-getaddrbug=""
-if (test "${OS}" = "OSF1") then
-    getaddrbug="--disable-ipv6"
-fi
-if (test "${OS}" = "AIX") then
-    getaddrbug="--disable-ipv6"
-fi
-cd Python*
-/bin/rm -f setup.py
-/bin/cp ../../src/setup.py setup.py
-CDAT_PREFIX=${prefix}/Externals; export CDAT_PREFIX
-if (test "${OS}" = "Linux") then  # Linux -- needed for readline
-   export LDFLAGS="-L${prefix}/Externals/lib -Wl,-R${prefix}/Externals/lib"
-   if (test "${CCTEMP}" = "icc") then  # zeus x86_64 with Intel compiler
-      if (test "${IC}" = "") then
-	  echo "Run 'use <compiler>' to set environment variable IC to the location of libimf.a, libirc.a"
-	  exit 1
-      fi
-      export LDFLAGS="${LDFLAGS} -L${IC}/lib -limf -lirc"
-   fi
-fi
-./configure ${config_opt} --prefix=${prefix}/${version} ${getaddrbug}
-if (test $? -ne 0) then
-    echo "Python configure failed."; exit 1;
-fi
-
-make 
-if (test $? -ne 0) then
-    echo "Python make failed."; exit 1;
-fi
-
-make install 
-if (test $? -ne 0) then
-    echo "Python install failed."; exit 1;
-fi
-
-#cd Tools/idle
-#${prefix}/bin/python setup.py install
-#if (test $? -ne 0) then
-#    echo "Python idle install failed."; exit 1;
-#fi
-mkdir -p ${prefix}/Externals/share
-if (test "${OS}" = "CYGWIN_NT-5.1" ) then
-    ln -s /usr/share/tcl* ${prefix}/Externals/share ;
-    ln -s /usr/share/tk* ${prefix}/Externals/share ;
-fi
-if (test "${OS}" = "CYGWIN_NT-6.0" ) then
-    ln -s /usr/share/tcl* ${prefix}/Externals/share ;
-    ln -s /usr/share/tk* ${prefix}/Externals/share ;
-fi
-
-${prefix}/${version}/bin/python -c "import Tkinter"
-if (test $? -ne 0) then
-    echo "Python Tkinter import failed."; exit 1;
-fi
-echo "Python built with Tkinter correctly." 
diff --git a/pysrc/readline.sh b/pysrc/readline.sh
deleted file mode 100755
index 40f2d97d2..000000000
--- a/pysrc/readline.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-. ./prolog.sh
-cd readline-*
-./configure --prefix=${prefix}/Externals
-if (test $? -ne 0) then
-    echo "readline configuration failed.";
-    echo "Some platforms don't support readline, this doesn't matter.";
-    echo "Ignoring this error.";
-    exit 0;
-fi
-make
-if (test $? -ne 0) then
-    echo "readline make failed.";
-    echo "Some platforms don't support readline, this doesn't matter.";
-    echo "Ignoring this error.";
-    exit 0;
-fi
-make install
-if (test $? -ne 0) then
-    echo "readline install failed.";
-    echo "This is unexpected since it built ok.";
-    exit 1;
-fi
diff --git a/pysrc/src/setup-2.7.1.py b/pysrc/src/setup-2.7.1.py
deleted file mode 100644
index c7d059069..000000000
--- a/pysrc/src/setup-2.7.1.py
+++ /dev/null
@@ -1,2067 +0,0 @@
-# Autodetecting setup.py script for building the Python extensions
-#
-
-__version__ = "$Revision: 86041 $"
-
-import sys, os, imp, re, optparse
-from glob import glob
-from platform import machine as platform_machine
-import sysconfig
-
-from distutils import log
-from distutils import text_file
-from distutils.errors import *
-from distutils.core import Extension, setup
-from distutils.command.build_ext import build_ext
-from distutils.command.install import install
-from distutils.command.install_lib import install_lib
-from distutils.spawn import find_executable
-
-# Were we compiled --with-pydebug or with #define Py_DEBUG?
-COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
-
-# This global variable is used to hold the list of modules to be disabled.
-disabled_module_list = []
-
-def add_dir_to_list(dirlist, dir):
-    """Add the directory 'dir' to the list 'dirlist' (at the front) if
-    1) 'dir' is not already in 'dirlist'
-    2) 'dir' actually exists, and is a directory."""
-    if dir is not None and os.path.isdir(dir) and dir not in dirlist:
-        dirlist.insert(0, dir)
-
-def macosx_sdk_root():
-    """
-    Return the directory of the current OSX SDK,
-    or '/' if no SDK was specified.
-    """
-    cflags = sysconfig.get_config_var('CFLAGS')
-    m = re.search(r'-isysroot\s+(\S+)', cflags)
-    if m is None:
-        sysroot = '/'
-    else:
-        sysroot = m.group(1)
-    return sysroot
-
-def is_macosx_sdk_path(path):
-    """
-    Returns True if 'path' can be located in an OSX SDK
-    """
-    return (path.startswith('/usr/') and not path.startswith('/usr/local')) or path.startswith('/System/')
-
-def find_file(filename, std_dirs, paths):
-    """Searches for the directory where a given file is located,
-    and returns a possibly-empty list of additional directories, or None
-    if the file couldn't be found at all.
-
-    'filename' is the name of a file, such as readline.h or libcrypto.a.
-    'std_dirs' is the list of standard system directories; if the
-        file is found in one of them, no additional directives are needed.
-    'paths' is a list of additional locations to check; if the file is
-        found in one of them, the resulting list will contain the directory.
-    """
-    if sys.platform == 'darwin':
-        # Honor the MacOSX SDK setting when one was specified.
-        # An SDK is a directory with the same structure as a real
-        # system, but with only header files and libraries.
-        sysroot = macosx_sdk_root()
-
-    # Check the standard locations
-    for dir in std_dirs:
-        f = os.path.join(dir, filename)
-
-        if sys.platform == 'darwin' and is_macosx_sdk_path(dir):
-            f = os.path.join(sysroot, dir[1:], filename)
-
-        if os.path.exists(f): return []
-
-    # Check the additional directories
-    for dir in paths:
-        f = os.path.join(dir, filename)
-
-        if sys.platform == 'darwin' and is_macosx_sdk_path(dir):
-            f = os.path.join(sysroot, dir[1:], filename)
-
-        if os.path.exists(f):
-            return [dir]
-
-    # Not found anywhere
-    return None
-
-def find_library_file(compiler, libname, std_dirs, paths):
-    result = compiler.find_library_file(std_dirs + paths, libname)
-    if result is None:
-        return None
-
-    if sys.platform == 'darwin':
-        sysroot = macosx_sdk_root()
-
-    # Check whether the found file is in one of the standard directories
-    dirname = os.path.dirname(result)
-    for p in std_dirs:
-        # Ensure path doesn't end with path separator
-        p = p.rstrip(os.sep)
-
-        if sys.platform == 'darwin' and is_macosx_sdk_path(p):
-            if os.path.join(sysroot, p[1:]) == dirname:
-                return [ ]
-
-        if p == dirname:
-            return [ ]
-
-    # Otherwise, it must have been in one of the additional directories,
-    # so we have to figure out which one.
-    for p in paths:
-        # Ensure path doesn't end with path separator
-        p = p.rstrip(os.sep)
-
-        if sys.platform == 'darwin' and is_macosx_sdk_path(p):
-            if os.path.join(sysroot, p[1:]) == dirname:
-                return [ p ]
-
-        if p == dirname:
-            return [p]
-    else:
-        assert False, "Internal error: Path not found in std_dirs or paths"
-
-def module_enabled(extlist, modname):
-    """Returns whether the module 'modname' is present in the list
-    of extensions 'extlist'."""
-    extlist = [ext for ext in extlist if ext.name == modname]
-    return len(extlist)
-
-def find_module_file(module, dirlist):
-    """Find a module in a set of possible folders. If it is not found
-    return the unadorned filename"""
-    list = find_file(module, [], dirlist)
-    if not list:
-        return module
-    if len(list) > 1:
-        log.info("WARNING: multiple copies of %s found"%module)
-    return os.path.join(list[0], module)
-
-class PyBuildExt(build_ext):
-
-    def __init__(self, dist):
-        build_ext.__init__(self, dist)
-        self.failed = []
-
-    def build_extensions(self):
-
-        # Detect which modules should be compiled
-        missing = self.detect_modules()
-
-        # Remove modules that are present on the disabled list
-        extensions = [ext for ext in self.extensions
-                      if ext.name not in disabled_module_list]
-        # move ctypes to the end, it depends on other modules
-        ext_map = dict((ext.name, i) for i, ext in enumerate(extensions))
-        if "_ctypes" in ext_map:
-            ctypes = extensions.pop(ext_map["_ctypes"])
-            extensions.append(ctypes)
-        self.extensions = extensions
-
-        # Fix up the autodetected modules, prefixing all the source files
-        # with Modules/ and adding Python's include directory to the path.
-        (srcdir,) = sysconfig.get_config_vars('srcdir')
-        if not srcdir:
-            # Maybe running on Windows but not using CYGWIN?
-            raise ValueError("No source directory; cannot proceed.")
-        srcdir = os.path.abspath(srcdir)
-        moddirlist = [os.path.join(srcdir, 'Modules')]
-
-        # Platform-dependent module source and include directories
-        incdirlist = []
-        platform = self.get_platform()
-        if platform == 'darwin' and ("--disable-toolbox-glue" not in
-            sysconfig.get_config_var("CONFIG_ARGS")):
-            # Mac OS X also includes some mac-specific modules
-            macmoddir = os.path.join(srcdir, 'Mac/Modules')
-            moddirlist.append(macmoddir)
-            incdirlist.append(os.path.join(srcdir, 'Mac/Include'))
-
-        # Fix up the paths for scripts, too
-        self.distribution.scripts = [os.path.join(srcdir, filename)
-                                     for filename in self.distribution.scripts]
-
-        # Python header files
-        headers = [sysconfig.get_config_h_filename()]
-        headers += glob(os.path.join(sysconfig.get_path('platinclude'), "*.h"))
-        for ext in self.extensions[:]:
-            ext.sources = [ find_module_file(filename, moddirlist)
-                            for filename in ext.sources ]
-            if ext.depends is not None:
-                ext.depends = [find_module_file(filename, moddirlist)
-                               for filename in ext.depends]
-            else:
-                ext.depends = []
-            # re-compile extensions if a header file has been changed
-            ext.depends.extend(headers)
-
-            # platform specific include directories
-            ext.include_dirs.extend(incdirlist)
-
-            # If a module has already been built statically,
-            # don't build it here
-            if ext.name in sys.builtin_module_names:
-                self.extensions.remove(ext)
-
-        # Parse Modules/Setup and Modules/Setup.local to figure out which
-        # modules are turned on in the file.
-        remove_modules = []
-        for filename in ('Modules/Setup', 'Modules/Setup.local'):
-            input = text_file.TextFile(filename, join_lines=1)
-            while 1:
-                line = input.readline()
-                if not line: break
-                line = line.split()
-                remove_modules.append(line[0])
-            input.close()
-
-        for ext in self.extensions[:]:
-            if ext.name in remove_modules:
-                self.extensions.remove(ext)
-
-        # When you run "make CC=altcc" or something similar, you really want
-        # those environment variables passed into the setup.py phase.  Here's
-        # a small set of useful ones.
-        compiler = os.environ.get('CC')
-        args = {}
-        # unfortunately, distutils doesn't let us provide separate C and C++
-        # compilers
-        if compiler is not None:
-            (ccshared,cflags) = sysconfig.get_config_vars('CCSHARED','CFLAGS')
-            args['compiler_so'] = compiler + ' ' + ccshared + ' ' + cflags
-        self.compiler.set_executables(**args)
-
-        build_ext.build_extensions(self)
-
-        longest = max([len(e.name) for e in self.extensions])
-        if self.failed:
-            longest = max(longest, max([len(name) for name in self.failed]))
-
-        def print_three_column(lst):
-            lst.sort(key=str.lower)
-            # guarantee zip() doesn't drop anything
-            while len(lst) % 3:
-                lst.append("")
-            for e, f, g in zip(lst[::3], lst[1::3], lst[2::3]):
-                print "%-*s   %-*s   %-*s" % (longest, e, longest, f,
-                                              longest, g)
-
-        if missing:
-            print
-            print ("Python build finished, but the necessary bits to build "
-                   "these modules were not found:")
-            print_three_column(missing)
-            print ("To find the necessary bits, look in setup.py in"
-                   " detect_modules() for the module's name.")
-            print
-
-        if self.failed:
-            failed = self.failed[:]
-            print
-            print "Failed to build these modules:"
-            print_three_column(failed)
-            print
-
-    def build_extension(self, ext):
-
-        if ext.name == '_ctypes':
-            if not self.configure_ctypes(ext):
-                return
-
-        try:
-            build_ext.build_extension(self, ext)
-        except (CCompilerError, DistutilsError), why:
-            self.announce('WARNING: building of extension "%s" failed: %s' %
-                          (ext.name, sys.exc_info()[1]))
-            self.failed.append(ext.name)
-            return
-        # Workaround for Mac OS X: The Carbon-based modules cannot be
-        # reliably imported into a command-line Python
-        if 'Carbon' in ext.extra_link_args:
-            self.announce(
-                'WARNING: skipping import check for Carbon-based "%s"' %
-                ext.name)
-            return
-
-        if self.get_platform() == 'darwin' and (
-                sys.maxint > 2**32 and '-arch' in ext.extra_link_args):
-            # Don't bother doing an import check when an extension was
-            # build with an explicit '-arch' flag on OSX. That's currently
-            # only used to build 32-bit only extensions in a 4-way
-            # universal build and loading 32-bit code into a 64-bit
-            # process will fail.
-            self.announce(
-                'WARNING: skipping import check for "%s"' %
-                ext.name)
-            return
-
-        # Workaround for Cygwin: Cygwin currently has fork issues when many
-        # modules have been imported
-        if self.get_platform() == 'cygwin':
-            self.announce('WARNING: skipping import check for Cygwin-based "%s"'
-                % ext.name)
-            return
-        ext_filename = os.path.join(
-            self.build_lib,
-            self.get_ext_filename(self.get_ext_fullname(ext.name)))
-        try:
-            imp.load_dynamic(ext.name, ext_filename)
-        except ImportError, why:
-            self.failed.append(ext.name)
-            self.announce('*** WARNING: renaming "%s" since importing it'
-                          ' failed: %s' % (ext.name, why), level=3)
-            assert not self.inplace
-            basename, tail = os.path.splitext(ext_filename)
-            newname = basename + "_failed" + tail
-            if os.path.exists(newname):
-                os.remove(newname)
-            os.rename(ext_filename, newname)
-
-            # XXX -- This relies on a Vile HACK in
-            # distutils.command.build_ext.build_extension().  The
-            # _built_objects attribute is stored there strictly for
-            # use here.
-            # If there is a failure, _built_objects may not be there,
-            # so catch the AttributeError and move on.
-            try:
-                for filename in self._built_objects:
-                    os.remove(filename)
-            except AttributeError:
-                self.announce('unable to remove files (ignored)')
-        except:
-            exc_type, why, tb = sys.exc_info()
-            self.announce('*** WARNING: importing extension "%s" '
-                          'failed with %s: %s' % (ext.name, exc_type, why),
-                          level=3)
-            self.failed.append(ext.name)
-
-    def get_platform(self):
-        # Get value of sys.platform
-        for platform in ['cygwin', 'beos', 'darwin', 'atheos', 'osf1']:
-            if sys.platform.startswith(platform):
-                return platform
-        return sys.platform
-
-    def detect_modules(self):
-	# PCMDI Change
-        # Ensure that place we put tcl/tk/netcdf etc. is always used
-        libbase = os.environ.get('EXTERNALS', os.path.join(sys.prefix,'..','Externals'))
-        mylibdir = os.path.join(libbase,'lib')
-        myincdir = os.path.join(libbase,'include')
-        add_dir_to_list(self.compiler.library_dirs, mylibdir)
-        add_dir_to_list(self.compiler.include_dirs, myincdir)
-        # end PCMDI change
-
-        # Ensure that /usr/local is always used
-        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-
-        # Add paths specified in the environment variables LDFLAGS and
-        # CPPFLAGS for header and library files.
-        # We must get the values from the Makefile and not the environment
-        # directly since an inconsistently reproducible issue comes up where
-        # the environment variable is not set even though the value were passed
-        # into configure and stored in the Makefile (issue found on OS X 10.3).
-        for env_var, arg_name, dir_list in (
-                ('LDFLAGS', '-R', self.compiler.runtime_library_dirs),
-                ('LDFLAGS', '-L', self.compiler.library_dirs),
-                ('CPPFLAGS', '-I', self.compiler.include_dirs)):
-            env_val = sysconfig.get_config_var(env_var)
-            if env_val:
-                # To prevent optparse from raising an exception about any
-                # options in env_val that it doesn't know about we strip out
-                # all double dashes and any dashes followed by a character
-                # that is not for the option we are dealing with.
-                #
-                # Please note that order of the regex is important!  We must
-                # strip out double-dashes first so that we don't end up with
-                # substituting "--Long" to "-Long" and thus lead to "ong" being
-                # used for a library directory.
-                env_val = re.sub(r'(^|\s+)-(-|(?!%s))' % arg_name[1],
-                                 ' ', env_val)
-                parser = optparse.OptionParser()
-                # Make sure that allowing args interspersed with options is
-                # allowed
-                parser.allow_interspersed_args = True
-                parser.error = lambda msg: None
-                parser.add_option(arg_name, dest="dirs", action="append")
-                options = parser.parse_args(env_val.split())[0]
-                if options.dirs:
-                    for directory in reversed(options.dirs):
-                        add_dir_to_list(dir_list, directory)
-
-        if os.path.normpath(sys.prefix) != '/usr' \
-                and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
-            # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
-            # (PYTHONFRAMEWORK is set) to avoid # linking problems when
-            # building a framework with different architectures than
-            # the one that is currently installed (issue #7473)
-            add_dir_to_list(self.compiler.library_dirs,
-                            sysconfig.get_config_var("LIBDIR"))
-            add_dir_to_list(self.compiler.include_dirs,
-                            sysconfig.get_config_var("INCLUDEDIR"))
-
-        try:
-            have_unicode = unicode
-        except NameError:
-            have_unicode = 0
-
-        # lib_dirs and inc_dirs are used to search for files;
-        # if a file is found in one of those directories, it can
-        # be assumed that no additional -I,-L directives are needed.
-        lib_dirs = self.compiler.library_dirs + [
-            '/lib64', '/usr/lib64',
-            '/lib', '/usr/lib', '/usr/lib/x86_64-linux-gnu',
-            ]
-        inc_dirs = self.compiler.include_dirs + ['/usr/include']
-        exts = []
-        missing = []
-
-        config_h = sysconfig.get_config_h_filename()
-        config_h_vars = sysconfig.parse_config_h(open(config_h))
-
-        platform = self.get_platform()
-        srcdir = sysconfig.get_config_var('srcdir')
-
-        # Check for AtheOS which has libraries in non-standard locations
-        if platform == 'atheos':
-            lib_dirs += ['/system/libs', '/atheos/autolnk/lib']
-            lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
-            inc_dirs += ['/system/include', '/atheos/autolnk/include']
-            inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
-
-        # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
-        if platform in ['osf1', 'unixware7', 'openunix8']:
-            lib_dirs += ['/usr/ccs/lib']
-
-        if platform == 'darwin':
-            # This should work on any unixy platform ;-)
-            # If the user has bothered specifying additional -I and -L flags
-            # in OPT and LDFLAGS we might as well use them here.
-            #   NOTE: using shlex.split would technically be more correct, but
-            # also gives a bootstrap problem. Let's hope nobody uses directories
-            # with whitespace in the name to store libraries.
-            cflags, ldflags = sysconfig.get_config_vars(
-                    'CFLAGS', 'LDFLAGS')
-            for item in cflags.split():
-                if item.startswith('-I'):
-                    inc_dirs.append(item[2:])
-
-            for item in ldflags.split():
-                if item.startswith('-L'):
-                    lib_dirs.append(item[2:])
-
-        # Check for MacOS X, which doesn't need libm.a at all
-        math_libs = ['m']
-        if platform in ['darwin', 'beos']:
-            math_libs = []
-
-        # XXX Omitted modules: gl, pure, dl, SGI-specific modules
-
-        #
-        # The following modules are all pretty straightforward, and compile
-        # on pretty much any POSIXish platform.
-        #
-
-        # Some modules that are normally always on:
-        #exts.append( Extension('_weakref', ['_weakref.c']) )
-
-        # array objects
-        exts.append( Extension('array', ['arraymodule.c']) )
-        # complex math library functions
-        exts.append( Extension('cmath', ['cmathmodule.c', '_math.c'],
-                               depends=['_math.h'],
-                               libraries=math_libs) )
-        # math library functions, e.g. sin()
-        exts.append( Extension('math',  ['mathmodule.c', '_math.c'],
-                               depends=['_math.h'],
-                               libraries=math_libs) )
-        # fast string operations implemented in C
-        exts.append( Extension('strop', ['stropmodule.c']) )
-        # time operations and variables
-        exts.append( Extension('time', ['timemodule.c'],
-                               libraries=math_libs) )
-        exts.append( Extension('datetime', ['datetimemodule.c', 'timemodule.c'],
-                               libraries=math_libs) )
-        # fast iterator tools implemented in C
-        exts.append( Extension("itertools", ["itertoolsmodule.c"]) )
-        # code that will be builtins in the future, but conflict with the
-        #  current builtins
-        exts.append( Extension('future_builtins', ['future_builtins.c']) )
-        # random number generator implemented in C
-        exts.append( Extension("_random", ["_randommodule.c"]) )
-        # high-performance collections
-        exts.append( Extension("_collections", ["_collectionsmodule.c"]) )
-        # bisect
-        exts.append( Extension("_bisect", ["_bisectmodule.c"]) )
-        # heapq
-        exts.append( Extension("_heapq", ["_heapqmodule.c"]) )
-        # operator.add() and similar goodies
-        exts.append( Extension('operator', ['operator.c']) )
-        # Python 3.1 _io library
-        exts.append( Extension("_io",
-            ["_io/bufferedio.c", "_io/bytesio.c", "_io/fileio.c",
-             "_io/iobase.c", "_io/_iomodule.c", "_io/stringio.c", "_io/textio.c"],
-             depends=["_io/_iomodule.h"], include_dirs=["Modules/_io"]))
-        # _functools
-        exts.append( Extension("_functools", ["_functoolsmodule.c"]) )
-        # _json speedups
-        exts.append( Extension("_json", ["_json.c"]) )
-        # Python C API test module
-        exts.append( Extension('_testcapi', ['_testcapimodule.c'],
-                               depends=['testcapi_long.h']) )
-        # profilers (_lsprof is for cProfile.py)
-        exts.append( Extension('_hotshot', ['_hotshot.c']) )
-        exts.append( Extension('_lsprof', ['_lsprof.c', 'rotatingtree.c']) )
-        # static Unicode character database
-        if have_unicode:
-            exts.append( Extension('unicodedata', ['unicodedata.c']) )
-        else:
-            missing.append('unicodedata')
-        # access to ISO C locale support
-        data = open('pyconfig.h').read()
-        m = re.search(r"#s*define\s+WITH_LIBINTL\s+1\s*", data)
-        if m is not None:
-            locale_libs = ['intl']
-        else:
-            locale_libs = []
-        if platform == 'darwin':
-            locale_extra_link_args = ['-framework', 'CoreFoundation']
-        else:
-            locale_extra_link_args = []
-
-
-        exts.append( Extension('_locale', ['_localemodule.c'],
-                               libraries=locale_libs,
-                               extra_link_args=locale_extra_link_args) )
-
-        # Modules with some UNIX dependencies -- on by default:
-        # (If you have a really backward UNIX, select and socket may not be
-        # supported...)
-
-        # fcntl(2) and ioctl(2)
-        libs = []
-        if (config_h_vars.get('FLOCK_NEEDS_LIBBSD', False)):
-            # May be necessary on AIX for flock function
-            libs = ['bsd']
-        exts.append( Extension('fcntl', ['fcntlmodule.c'], libraries=libs) )
-        # pwd(3)
-        exts.append( Extension('pwd', ['pwdmodule.c']) )
-        # grp(3)
-        exts.append( Extension('grp', ['grpmodule.c']) )
-        # spwd, shadow passwords
-        if (config_h_vars.get('HAVE_GETSPNAM', False) or
-                config_h_vars.get('HAVE_GETSPENT', False)):
-            exts.append( Extension('spwd', ['spwdmodule.c']) )
-        else:
-            missing.append('spwd')
-
-        # select(2); not on ancient System V
-        exts.append( Extension('select', ['selectmodule.c']) )
-
-        # Fred Drake's interface to the Python parser
-        exts.append( Extension('parser', ['parsermodule.c']) )
-
-        # cStringIO and cPickle
-        exts.append( Extension('cStringIO', ['cStringIO.c']) )
-        exts.append( Extension('cPickle', ['cPickle.c']) )
-
-        # Memory-mapped files (also works on Win32).
-        if platform not in ['atheos']:
-            exts.append( Extension('mmap', ['mmapmodule.c']) )
-        else:
-            missing.append('mmap')
-
-        # Lance Ellinghaus's syslog module
-        # syslog daemon interface
-        exts.append( Extension('syslog', ['syslogmodule.c']) )
-
-        # George Neville-Neil's timing module:
-        # Deprecated in PEP 4 http://www.python.org/peps/pep-0004.html
-        # http://mail.python.org/pipermail/python-dev/2006-January/060023.html
-        #exts.append( Extension('timing', ['timingmodule.c']) )
-
-        #
-        # Here ends the simple stuff.  From here on, modules need certain
-        # libraries, are platform-specific, or present other surprises.
-        #
-
-        # Multimedia modules
-        # These don't work for 64-bit platforms!!!
-        # These represent audio samples or images as strings:
-
-        # Operations on audio samples
-        # According to #993173, this one should actually work fine on
-        # 64-bit platforms.
-        exts.append( Extension('audioop', ['audioop.c']) )
-
-        # Disabled on 64-bit platforms
-        if sys.maxint != 9223372036854775807L:
-            # Operations on images
-            exts.append( Extension('imageop', ['imageop.c']) )
-        else:
-            missing.extend(['imageop'])
-
-        # readline
-        do_readline = self.compiler.find_library_file(lib_dirs, 'readline')
-        readline_termcap_library = ""
-        curses_library = ""
-        # Determine if readline is already linked against curses or tinfo.
-        if do_readline and find_executable('ldd'):
-            fp = os.popen("ldd %s" % do_readline)
-            ldd_output = fp.readlines()
-            ret = fp.close()
-            if ret is None or ret >> 8 == 0:
-                for ln in ldd_output:
-                    if 'curses' in ln:
-                        readline_termcap_library = re.sub(
-                            r'.*lib(n?cursesw?)\.so.*', r'\1', ln
-                        ).rstrip()
-                        break
-                    if 'tinfo' in ln: # termcap interface split out from ncurses
-                        readline_termcap_library = 'tinfo'
-                        break
-        # Issue 7384: If readline is already linked against curses,
-        # use the same library for the readline and curses modules.
-        if 'curses' in readline_termcap_library:
-            curses_library = readline_termcap_library
-        elif self.compiler.find_library_file(lib_dirs, 'ncursesw'):
-            curses_library = 'ncursesw'
-        elif self.compiler.find_library_file(lib_dirs, 'ncurses'):
-            curses_library = 'ncurses'
-        elif self.compiler.find_library_file(lib_dirs, 'curses'):
-            curses_library = 'curses'
-
-        if platform == 'darwin':
-            os_release = int(os.uname()[2].split('.')[0])
-            dep_target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
-            if dep_target and dep_target.split('.') < ['10', '5']:
-                os_release = 8
-            if os_release < 9:
-                # MacOSX 10.4 has a broken readline. Don't try to build
-                # the readline module unless the user has installed a fixed
-                # readline package
-                if find_file('readline/rlconf.h', inc_dirs, []) is None:
-                    do_readline = False
-        if do_readline:
-            if platform == 'darwin' and os_release < 9:
-                # In every directory on the search path search for a dynamic
-                # library and then a static library, instead of first looking
-                # for dynamic libraries on the entiry path.
-                # This way a staticly linked custom readline gets picked up
-                # before the (possibly broken) dynamic library in /usr/lib.
-                readline_extra_link_args = ('-Wl,-search_paths_first',)
-            else:
-                readline_extra_link_args = ()
-
-            readline_libs = ['readline']
-            if readline_termcap_library:
-                pass # Issue 7384: Already linked against curses or tinfo.
-            elif curses_library:
-                readline_libs.append(curses_library)
-            elif self.compiler.find_library_file(lib_dirs +
-                                                     ['/usr/lib/termcap'],
-                                                     'termcap'):
-                readline_libs.append('termcap')
-            exts.append( Extension('readline', ['readline.c'],
-                                   library_dirs=['/usr/lib/termcap'],
-                                   extra_link_args=readline_extra_link_args,
-                                   libraries=readline_libs) )
-        else:
-            missing.append('readline')
-
-        # crypt module.
-
-        if self.compiler.find_library_file(lib_dirs, 'crypt'):
-            libs = ['crypt']
-        else:
-            libs = []
-        exts.append( Extension('crypt', ['cryptmodule.c'], libraries=libs) )
-
-        # CSV files
-        exts.append( Extension('_csv', ['_csv.c']) )
-
-        # socket(2)
-        exts.append( Extension('_socket', ['socketmodule.c'],
-                               depends = ['socketmodule.h']) )
-        # Detect SSL support for the socket module (via _ssl)
-        search_for_ssl_incs_in = [
-                              '/usr/local/ssl/include',
-                              '/usr/contrib/ssl/include/'
-                             ]
-        ssl_incs = find_file('openssl/ssl.h', inc_dirs,
-                             search_for_ssl_incs_in
-                             )
-        if ssl_incs is not None:
-            krb5_h = find_file('krb5.h', inc_dirs,
-                               ['/usr/kerberos/include'])
-            if krb5_h:
-                ssl_incs += krb5_h
-        ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
-                                     ['/usr/local/ssl/lib',
-                                      '/usr/contrib/ssl/lib/'
-                                     ] )
-
-        if (ssl_incs is not None and
-            ssl_libs is not None):
-            exts.append( Extension('_ssl', ['_ssl.c'],
-                                   include_dirs = ssl_incs,
-                                   library_dirs = ssl_libs,
-                                   libraries = ['ssl', 'crypto'],
-                                   depends = ['socketmodule.h']), )
-        else:
-            missing.append('_ssl')
-
-        # find out which version of OpenSSL we have
-        openssl_ver = 0
-        openssl_ver_re = re.compile(
-            '^\s*#\s*define\s+OPENSSL_VERSION_NUMBER\s+(0x[0-9a-fA-F]+)' )
-
-        # look for the openssl version header on the compiler search path.
-        opensslv_h = find_file('openssl/opensslv.h', [],
-                inc_dirs + search_for_ssl_incs_in)
-        if opensslv_h:
-            name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
-            if sys.platform == 'darwin' and is_macosx_sdk_path(name):
-                name = os.path.join(macosx_sdk_root(), name[1:])
-            try:
-                incfile = open(name, 'r')
-                for line in incfile:
-                    m = openssl_ver_re.match(line)
-                    if m:
-                        openssl_ver = eval(m.group(1))
-            except IOError, msg:
-                print "IOError while reading opensshv.h:", msg
-                pass
-
-        min_openssl_ver = 0x00907000
-        have_any_openssl = ssl_incs is not None and ssl_libs is not None
-        have_usable_openssl = (have_any_openssl and
-                               openssl_ver >= min_openssl_ver)
-
-        if have_any_openssl:
-            if have_usable_openssl:
-                # The _hashlib module wraps optimized implementations
-                # of hash functions from the OpenSSL library.
-                exts.append( Extension('_hashlib', ['_hashopenssl.c'],
-                                       include_dirs = ssl_incs,
-                                       library_dirs = ssl_libs,
-                                       libraries = ['ssl', 'crypto']) )
-            else:
-                print ("warning: openssl 0x%08x is too old for _hashlib" %
-                       openssl_ver)
-                missing.append('_hashlib')
-        if COMPILED_WITH_PYDEBUG or not have_usable_openssl:
-            # The _sha module implements the SHA1 hash algorithm.
-            exts.append( Extension('_sha', ['shamodule.c']) )
-            # The _md5 module implements the RSA Data Security, Inc. MD5
-            # Message-Digest Algorithm, described in RFC 1321.  The
-            # necessary files md5.c and md5.h are included here.
-            exts.append( Extension('_md5',
-                            sources = ['md5module.c', 'md5.c'],
-                            depends = ['md5.h']) )
-
-        min_sha2_openssl_ver = 0x00908000
-        if COMPILED_WITH_PYDEBUG or openssl_ver < min_sha2_openssl_ver:
-            # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash
-            exts.append( Extension('_sha256', ['sha256module.c']) )
-            exts.append( Extension('_sha512', ['sha512module.c']) )
-
-        # Modules that provide persistent dictionary-like semantics.  You will
-        # probably want to arrange for at least one of them to be available on
-        # your machine, though none are defined by default because of library
-        # dependencies.  The Python module anydbm.py provides an
-        # implementation independent wrapper for these; dumbdbm.py provides
-        # similar functionality (but slower of course) implemented in Python.
-
-        # Sleepycat^WOracle Berkeley DB interface.
-        #  http://www.oracle.com/database/berkeley-db/db/index.html
-        #
-        # This requires the Sleepycat^WOracle DB code. The supported versions
-        # are set below.  Visit the URL above to download
-        # a release.  Most open source OSes come with one or more
-        # versions of BerkeleyDB already installed.
-
-        max_db_ver = (4, 8)
-        min_db_ver = (4, 1)
-        db_setup_debug = False   # verbose debug prints from this script?
-
-        def allow_db_ver(db_ver):
-            """Returns a boolean if the given BerkeleyDB version is acceptable.
-
-            Args:
-              db_ver: A tuple of the version to verify.
-            """
-            if not (min_db_ver <= db_ver <= max_db_ver):
-                return False
-            # Use this function to filter out known bad configurations.
-            if (4, 6) == db_ver[:2]:
-                # BerkeleyDB 4.6.x is not stable on many architectures.
-                arch = platform_machine()
-                if arch not in ('i386', 'i486', 'i586', 'i686',
-                                'x86_64', 'ia64'):
-                    return False
-            return True
-
-        def gen_db_minor_ver_nums(major):
-            if major == 4:
-                for x in range(max_db_ver[1]+1):
-                    if allow_db_ver((4, x)):
-                        yield x
-            elif major == 3:
-                for x in (3,):
-                    if allow_db_ver((3, x)):
-                        yield x
-            else:
-                raise ValueError("unknown major BerkeleyDB version", major)
-
-        # construct a list of paths to look for the header file in on
-        # top of the normal inc_dirs.
-        db_inc_paths = [
-            '/usr/include/db4',
-            '/usr/local/include/db4',
-            '/opt/sfw/include/db4',
-            '/usr/include/db3',
-            '/usr/local/include/db3',
-            '/opt/sfw/include/db3',
-            # Fink defaults (http://fink.sourceforge.net/)
-            '/sw/include/db4',
-            '/sw/include/db3',
-        ]
-        # 4.x minor number specific paths
-        for x in gen_db_minor_ver_nums(4):
-            db_inc_paths.append('/usr/include/db4%d' % x)
-            db_inc_paths.append('/usr/include/db4.%d' % x)
-            db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
-            db_inc_paths.append('/usr/local/include/db4%d' % x)
-            db_inc_paths.append('/pkg/db-4.%d/include' % x)
-            db_inc_paths.append('/opt/db-4.%d/include' % x)
-            # MacPorts default (http://www.macports.org/)
-            db_inc_paths.append('/opt/local/include/db4%d' % x)
-        # 3.x minor number specific paths
-        for x in gen_db_minor_ver_nums(3):
-            db_inc_paths.append('/usr/include/db3%d' % x)
-            db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x)
-            db_inc_paths.append('/usr/local/include/db3%d' % x)
-            db_inc_paths.append('/pkg/db-3.%d/include' % x)
-            db_inc_paths.append('/opt/db-3.%d/include' % x)
-
-        # Add some common subdirectories for Sleepycat DB to the list,
-        # based on the standard include directories. This way DB3/4 gets
-        # picked up when it is installed in a non-standard prefix and
-        # the user has added that prefix into inc_dirs.
-        std_variants = []
-        for dn in inc_dirs:
-            std_variants.append(os.path.join(dn, 'db3'))
-            std_variants.append(os.path.join(dn, 'db4'))
-            for x in gen_db_minor_ver_nums(4):
-                std_variants.append(os.path.join(dn, "db4%d"%x))
-                std_variants.append(os.path.join(dn, "db4.%d"%x))
-            for x in gen_db_minor_ver_nums(3):
-                std_variants.append(os.path.join(dn, "db3%d"%x))
-                std_variants.append(os.path.join(dn, "db3.%d"%x))
-
-        db_inc_paths = std_variants + db_inc_paths
-        db_inc_paths = [p for p in db_inc_paths if os.path.exists(p)]
-
-        db_ver_inc_map = {}
-
-        if sys.platform == 'darwin':
-            sysroot = macosx_sdk_root()
-
-        class db_found(Exception): pass
-        try:
-            # See whether there is a Sleepycat header in the standard
-            # search path.
-            for d in inc_dirs + db_inc_paths:
-                f = os.path.join(d, "db.h")
-
-                if sys.platform == 'darwin' and is_macosx_sdk_path(d):
-                    f = os.path.join(sysroot, d[1:], "db.h")
-
-                if db_setup_debug: print "db: looking for db.h in", f
-                if os.path.exists(f):
-                    f = open(f).read()
-                    m = re.search(r"#define\WDB_VERSION_MAJOR\W(\d+)", f)
-                    if m:
-                        db_major = int(m.group(1))
-                        m = re.search(r"#define\WDB_VERSION_MINOR\W(\d+)", f)
-                        db_minor = int(m.group(1))
-                        db_ver = (db_major, db_minor)
-
-                        # Avoid 4.6 prior to 4.6.21 due to a BerkeleyDB bug
-                        if db_ver == (4, 6):
-                            m = re.search(r"#define\WDB_VERSION_PATCH\W(\d+)", f)
-                            db_patch = int(m.group(1))
-                            if db_patch < 21:
-                                print "db.h:", db_ver, "patch", db_patch,
-                                print "being ignored (4.6.x must be >= 4.6.21)"
-                                continue
-
-                        if ( (db_ver not in db_ver_inc_map) and
-                            allow_db_ver(db_ver) ):
-                            # save the include directory with the db.h version
-                            # (first occurrence only)
-                            db_ver_inc_map[db_ver] = d
-                            if db_setup_debug:
-                                print "db.h: found", db_ver, "in", d
-                        else:
-                            # we already found a header for this library version
-                            if db_setup_debug: print "db.h: ignoring", d
-                    else:
-                        # ignore this header, it didn't contain a version number
-                        if db_setup_debug:
-                            print "db.h: no version number version in", d
-
-            db_found_vers = db_ver_inc_map.keys()
-            db_found_vers.sort()
-
-            while db_found_vers:
-                db_ver = db_found_vers.pop()
-                db_incdir = db_ver_inc_map[db_ver]
-
-                # check lib directories parallel to the location of the header
-                db_dirs_to_check = [
-                    db_incdir.replace("include", 'lib64'),
-                    db_incdir.replace("include", 'lib'),
-                    db_incdir.replace("include", 'lib/x86_64-linux-gnu')
-                ]
-
-                if sys.platform != 'darwin':
-                    db_dirs_to_check = filter(os.path.isdir, db_dirs_to_check)
-
-                else:
-                    # Same as other branch, but takes OSX SDK into account
-                    tmp = []
-                    for dn in db_dirs_to_check:
-                        if is_macosx_sdk_path(dn):
-                            if os.path.isdir(os.path.join(sysroot, dn[1:])):
-                                tmp.append(dn)
-                        else:
-                            if os.path.isdir(dn):
-                                tmp.append(dn)
-                    db_dirs_to_check = tmp
-
-                # Look for a version specific db-X.Y before an ambiguoius dbX
-                # XXX should we -ever- look for a dbX name?  Do any
-                # systems really not name their library by version and
-                # symlink to more general names?
-                for dblib in (('db-%d.%d' % db_ver),
-                              ('db%d%d' % db_ver),
-                              ('db%d' % db_ver[0])):
-                    dblib_file = self.compiler.find_library_file(
-                                    db_dirs_to_check + lib_dirs, dblib )
-                    if dblib_file:
-                        dblib_dir = [ os.path.abspath(os.path.dirname(dblib_file)) ]
-                        raise db_found
-                    else:
-                        if db_setup_debug: print "db lib: ", dblib, "not found"
-
-        except db_found:
-            if db_setup_debug:
-                print "bsddb using BerkeleyDB lib:", db_ver, dblib
-                print "bsddb lib dir:", dblib_dir, " inc dir:", db_incdir
-            db_incs = [db_incdir]
-            dblibs = [dblib]
-            # We add the runtime_library_dirs argument because the
-            # BerkeleyDB lib we're linking against often isn't in the
-            # system dynamic library search path.  This is usually
-            # correct and most trouble free, but may cause problems in
-            # some unusual system configurations (e.g. the directory
-            # is on an NFS server that goes away).
-            exts.append(Extension('_bsddb', ['_bsddb.c'],
-                                  depends = ['bsddb.h'],
-                                  library_dirs=dblib_dir,
-                                  runtime_library_dirs=dblib_dir,
-                                  include_dirs=db_incs,
-                                  libraries=dblibs))
-        else:
-            if db_setup_debug: print "db: no appropriate library found"
-            db_incs = None
-            dblibs = []
-            dblib_dir = None
-            missing.append('_bsddb')
-
-        # The sqlite interface
-        sqlite_setup_debug = False   # verbose debug prints from this script?
-
-        # We hunt for #define SQLITE_VERSION "n.n.n"
-        # We need to find >= sqlite version 3.0.8
-        sqlite_incdir = sqlite_libdir = None
-        sqlite_inc_paths = [ '/usr/include',
-                             '/usr/include/sqlite',
-                             '/usr/include/sqlite3',
-                             '/usr/local/include',
-                             '/usr/local/include/sqlite',
-                             '/usr/local/include/sqlite3',
-                           ]
-        MIN_SQLITE_VERSION_NUMBER = (3, 0, 8)
-        MIN_SQLITE_VERSION = ".".join([str(x)
-                                    for x in MIN_SQLITE_VERSION_NUMBER])
-
-        # Scan the default include directories before the SQLite specific
-        # ones. This allows one to override the copy of sqlite on OSX,
-        # where /usr/include contains an old version of sqlite.
-        if sys.platform == 'darwin':
-            sysroot = macosx_sdk_root()
-
-        for d in inc_dirs + sqlite_inc_paths:
-            f = os.path.join(d, "sqlite3.h")
-
-            if sys.platform == 'darwin' and is_macosx_sdk_path(d):
-                f = os.path.join(sysroot, d[1:], "sqlite3.h")
-
-            if os.path.exists(f):
-                if sqlite_setup_debug: print "sqlite: found %s"%f
-                incf = open(f).read()
-                m = re.search(
-                    r'\s*.*#\s*.*define\s.*SQLITE_VERSION\W*"(.*)"', incf)
-                if m:
-                    sqlite_version = m.group(1)
-                    sqlite_version_tuple = tuple([int(x)
-                                        for x in sqlite_version.split(".")])
-                    if sqlite_version_tuple >= MIN_SQLITE_VERSION_NUMBER:
-                        # we win!
-                        if sqlite_setup_debug:
-                            print "%s/sqlite3.h: version %s"%(d, sqlite_version)
-                        sqlite_incdir = d
-                        break
-                    else:
-                        if sqlite_setup_debug:
-                            print "%s: version %d is too old, need >= %s"%(d,
-                                        sqlite_version, MIN_SQLITE_VERSION)
-                elif sqlite_setup_debug:
-                    print "sqlite: %s had no SQLITE_VERSION"%(f,)
-
-        if sqlite_incdir:
-            sqlite_dirs_to_check = [
-                os.path.join(sqlite_incdir, '..', 'lib64'),
-                os.path.join(sqlite_incdir, '..', 'lib'),
-                os.path.join(sqlite_incdir, '..', 'lib/x86_64-linux-gnu'),
-                os.path.join(sqlite_incdir, '..', '..', 'lib64'),
-                os.path.join(sqlite_incdir, '..', '..', 'lib'),
-            ]
-            sqlite_libfile = self.compiler.find_library_file(
-                                sqlite_dirs_to_check + lib_dirs, 'sqlite3')
-            if sqlite_libfile:
-                sqlite_libdir = [os.path.abspath(os.path.dirname(sqlite_libfile))]
-
-        if sqlite_incdir and sqlite_libdir:
-            sqlite_srcs = ['_sqlite/cache.c',
-                '_sqlite/connection.c',
-                '_sqlite/cursor.c',
-                '_sqlite/microprotocols.c',
-                '_sqlite/module.c',
-                '_sqlite/prepare_protocol.c',
-                '_sqlite/row.c',
-                '_sqlite/statement.c',
-                '_sqlite/util.c', ]
-
-            sqlite_defines = []
-            if sys.platform != "win32":
-                sqlite_defines.append(('MODULE_NAME', '"sqlite3"'))
-            else:
-                sqlite_defines.append(('MODULE_NAME', '\\"sqlite3\\"'))
-
-            # Comment this out if you want the sqlite3 module to be able to load extensions.
-            sqlite_defines.append(("SQLITE_OMIT_LOAD_EXTENSION", "1"))
-
-            if sys.platform == 'darwin':
-                # In every directory on the search path search for a dynamic
-                # library and then a static library, instead of first looking
-                # for dynamic libraries on the entiry path.
-                # This way a staticly linked custom sqlite gets picked up
-                # before the dynamic library in /usr/lib.
-                sqlite_extra_link_args = ('-Wl,-search_paths_first',)
-            else:
-                sqlite_extra_link_args = ()
-
-            exts.append(Extension('_sqlite3', sqlite_srcs,
-                                  define_macros=sqlite_defines,
-                                  include_dirs=["Modules/_sqlite",
-                                                sqlite_incdir],
-                                  library_dirs=sqlite_libdir,
-                                  runtime_library_dirs=sqlite_libdir,
-                                  extra_link_args=sqlite_extra_link_args,
-                                  libraries=["sqlite3",]))
-        else:
-            missing.append('_sqlite3')
-
-        # Look for Berkeley db 1.85.   Note that it is built as a different
-        # module name so it can be included even when later versions are
-        # available.  A very restrictive search is performed to avoid
-        # accidentally building this module with a later version of the
-        # underlying db library.  May BSD-ish Unixes incorporate db 1.85
-        # symbols into libc and place the include file in /usr/include.
-        #
-        # If the better bsddb library can be built (db_incs is defined)
-        # we do not build this one.  Otherwise this build will pick up
-        # the more recent berkeleydb's db.h file first in the include path
-        # when attempting to compile and it will fail.
-        f = "/usr/include/db.h"
-
-        if sys.platform == 'darwin':
-            if is_macosx_sdk_path(f):
-                sysroot = macosx_sdk_root()
-                f = os.path.join(sysroot, f[1:])
-
-        if os.path.exists(f) and not db_incs:
-            data = open(f).read()
-            m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
-            if m is not None:
-                # bingo - old version used hash file format version 2
-                ### XXX this should be fixed to not be platform-dependent
-                ### but I don't have direct access to an osf1 platform and
-                ### seemed to be muffing the search somehow
-                libraries = platform == "osf1" and ['db'] or None
-                if libraries is not None:
-                    exts.append(Extension('bsddb185', ['bsddbmodule.c'],
-                                          libraries=libraries))
-                else:
-                    exts.append(Extension('bsddb185', ['bsddbmodule.c']))
-            else:
-                missing.append('bsddb185')
-        else:
-            missing.append('bsddb185')
-
-        dbm_order = ['gdbm']
-        # The standard Unix dbm module:
-        if platform not in ['cygwin']:
-            config_args = [arg.strip("'")
-                           for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
-            dbm_args = [arg for arg in config_args
-                        if arg.startswith('--with-dbmliborder=')]
-            if dbm_args:
-                dbm_order = [arg.split('=')[-1] for arg in dbm_args][-1].split(":")
-            else:
-                dbm_order = "ndbm:gdbm:bdb".split(":")
-            dbmext = None
-            for cand in dbm_order:
-                if cand == "ndbm":
-                    if find_file("ndbm.h", inc_dirs, []) is not None:
-                        # Some systems have -lndbm, others don't
-                        if self.compiler.find_library_file(lib_dirs,
-                                                               'ndbm'):
-                            ndbm_libs = ['ndbm']
-                        else:
-                            ndbm_libs = []
-                        print "building dbm using ndbm"
-                        dbmext = Extension('dbm', ['dbmmodule.c'],
-                                           define_macros=[
-                                               ('HAVE_NDBM_H',None),
-                                               ],
-                                           libraries=ndbm_libs)
-                        break
-
-                elif cand == "gdbm":
-                    if self.compiler.find_library_file(lib_dirs, 'gdbm'):
-                        gdbm_libs = ['gdbm']
-                        if self.compiler.find_library_file(lib_dirs,
-                                                               'gdbm_compat'):
-                            gdbm_libs.append('gdbm_compat')
-                        if find_file("gdbm/ndbm.h", inc_dirs, []) is not None:
-                            print "building dbm using gdbm"
-                            dbmext = Extension(
-                                'dbm', ['dbmmodule.c'],
-                                define_macros=[
-                                    ('HAVE_GDBM_NDBM_H', None),
-                                    ],
-                                libraries = gdbm_libs)
-                            break
-                        if find_file("gdbm-ndbm.h", inc_dirs, []) is not None:
-                            print "building dbm using gdbm"
-                            dbmext = Extension(
-                                'dbm', ['dbmmodule.c'],
-                                define_macros=[
-                                    ('HAVE_GDBM_DASH_NDBM_H', None),
-                                    ],
-                                libraries = gdbm_libs)
-                            break
-                elif cand == "bdb":
-                    if db_incs is not None:
-                        print "building dbm using bdb"
-                        dbmext = Extension('dbm', ['dbmmodule.c'],
-                                           library_dirs=dblib_dir,
-                                           runtime_library_dirs=dblib_dir,
-                                           include_dirs=db_incs,
-                                           define_macros=[
-                                               ('HAVE_BERKDB_H', None),
-                                               ('DB_DBM_HSEARCH', None),
-                                               ],
-                                           libraries=dblibs)
-                        break
-            if dbmext is not None:
-                exts.append(dbmext)
-            else:
-                missing.append('dbm')
-
-        # Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
-        if ('gdbm' in dbm_order and
-            self.compiler.find_library_file(lib_dirs, 'gdbm')):
-            exts.append( Extension('gdbm', ['gdbmmodule.c'],
-                                   libraries = ['gdbm'] ) )
-        else:
-            missing.append('gdbm')
-
-        # Unix-only modules
-        if platform not in ['win32']:
-            # Steen Lumholt's termios module
-            exts.append( Extension('termios', ['termios.c']) )
-            # Jeremy Hylton's rlimit interface
-            if platform not in ['atheos']:
-                exts.append( Extension('resource', ['resource.c']) )
-            else:
-                missing.append('resource')
-
-            # Sun yellow pages. Some systems have the functions in libc.
-            if (platform not in ['cygwin', 'atheos', 'qnx6'] and
-                find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None):
-                if (self.compiler.find_library_file(lib_dirs, 'nsl')):
-                    libs = ['nsl']
-                else:
-                    libs = []
-                exts.append( Extension('nis', ['nismodule.c'],
-                                       libraries = libs) )
-            else:
-                missing.append('nis')
-        else:
-            missing.extend(['nis', 'resource', 'termios'])
-
-        # Curses support, requiring the System V version of curses, often
-        # provided by the ncurses library.
-        panel_library = 'panel'
-        if curses_library.startswith('ncurses'):
-            if curses_library == 'ncursesw':
-                # Bug 1464056: If _curses.so links with ncursesw,
-                # _curses_panel.so must link with panelw.
-                panel_library = 'panelw'
-            curses_libs = [curses_library]
-            exts.append( Extension('_curses', ['_cursesmodule.c'],
-                                   libraries = curses_libs) )
-        elif curses_library == 'curses' and platform != 'darwin':
-                # OSX has an old Berkeley curses, not good enough for
-                # the _curses module.
-            if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
-                curses_libs = ['curses', 'terminfo']
-            elif (self.compiler.find_library_file(lib_dirs, 'termcap')):
-                curses_libs = ['curses', 'termcap']
-            else:
-                curses_libs = ['curses']
-
-            exts.append( Extension('_curses', ['_cursesmodule.c'],
-                                   libraries = curses_libs) )
-        else:
-            missing.append('_curses')
-
-        # If the curses module is enabled, check for the panel module
-        if (module_enabled(exts, '_curses') and
-            self.compiler.find_library_file(lib_dirs, panel_library)):
-            exts.append( Extension('_curses_panel', ['_curses_panel.c'],
-                                   libraries = [panel_library] + curses_libs) )
-        else:
-            missing.append('_curses_panel')
-
-        # Andrew Kuchling's zlib module.  Note that some versions of zlib
-        # 1.1.3 have security problems.  See CERT Advisory CA-2002-07:
-        # http://www.cert.org/advisories/CA-2002-07.html
-        #
-        # zlib 1.1.4 is fixed, but at least one vendor (RedHat) has decided to
-        # patch its zlib 1.1.3 package instead of upgrading to 1.1.4.  For
-        # now, we still accept 1.1.3, because we think it's difficult to
-        # exploit this in Python, and we'd rather make it RedHat's problem
-        # than our problem <wink>.
-        #
-        # You can upgrade zlib to version 1.1.4 yourself by going to
-        # http://www.gzip.org/zlib/
-        zlib_inc = find_file('zlib.h', [], inc_dirs)
-        have_zlib = False
-        if zlib_inc is not None:
-            zlib_h = zlib_inc[0] + '/zlib.h'
-            version = '"0.0.0"'
-            version_req = '"1.1.3"'
-            fp = open(zlib_h)
-            while 1:
-                line = fp.readline()
-                if not line:
-                    break
-                if line.startswith('#define ZLIB_VERSION'):
-                    version = line.split()[2]
-                    break
-            if version >= version_req:
-                if (self.compiler.find_library_file(lib_dirs, 'z')):
-                    if sys.platform == "darwin":
-                        zlib_extra_link_args = ('-Wl,-search_paths_first',)
-                    else:
-                        zlib_extra_link_args = ()
-                    exts.append( Extension('zlib', ['zlibmodule.c'],
-                                           libraries = ['z'],
-                                           extra_link_args = zlib_extra_link_args))
-                    have_zlib = True
-                else:
-                    missing.append('zlib')
-            else:
-                missing.append('zlib')
-        else:
-            missing.append('zlib')
-
-        # Helper module for various ascii-encoders.  Uses zlib for an optimized
-        # crc32 if we have it.  Otherwise binascii uses its own.
-        if have_zlib:
-            extra_compile_args = ['-DUSE_ZLIB_CRC32']
-            libraries = ['z']
-            extra_link_args = zlib_extra_link_args
-        else:
-            extra_compile_args = []
-            libraries = []
-            extra_link_args = []
-        exts.append( Extension('binascii', ['binascii.c'],
-                               extra_compile_args = extra_compile_args,
-                               libraries = libraries,
-                               extra_link_args = extra_link_args) )
-
-        # Gustavo Niemeyer's bz2 module.
-        if (self.compiler.find_library_file(lib_dirs, 'bz2')):
-            if sys.platform == "darwin":
-                bz2_extra_link_args = ('-Wl,-search_paths_first',)
-            else:
-                bz2_extra_link_args = ()
-            exts.append( Extension('bz2', ['bz2module.c'],
-                                   libraries = ['bz2'],
-                                   extra_link_args = bz2_extra_link_args) )
-        else:
-            missing.append('bz2')
-
-        # Interface to the Expat XML parser
-        #
-        # Expat was written by James Clark and is now maintained by a group of
-        # developers on SourceForge; see www.libexpat.org for more information.
-        # The pyexpat module was written by Paul Prescod after a prototype by
-        # Jack Jansen.  The Expat source is included in Modules/expat/.  Usage
-        # of a system shared libexpat.so is possible with --with-system-expat
-        # configure option.
-        #
-        # More information on Expat can be found at www.libexpat.org.
-        #
-        if '--with-system-expat' in sysconfig.get_config_var("CONFIG_ARGS"):
-            expat_inc = []
-            define_macros = []
-            expat_lib = ['expat']
-            expat_sources = []
-        else:
-            expat_inc = [os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')]
-            define_macros = [
-                ('HAVE_EXPAT_CONFIG_H', '1'),
-            ]
-            expat_lib = []
-            expat_sources = ['expat/xmlparse.c',
-                             'expat/xmlrole.c',
-                             'expat/xmltok.c']
-
-        exts.append(Extension('pyexpat',
-                              define_macros = define_macros,
-                              include_dirs = expat_inc,
-                              libraries = expat_lib,
-                              sources = ['pyexpat.c'] + expat_sources
-                              ))
-
-        # Fredrik Lundh's cElementTree module.  Note that this also
-        # uses expat (via the CAPI hook in pyexpat).
-
-        if os.path.isfile(os.path.join(srcdir, 'Modules', '_elementtree.c')):
-            define_macros.append(('USE_PYEXPAT_CAPI', None))
-            exts.append(Extension('_elementtree',
-                                  define_macros = define_macros,
-                                  include_dirs = expat_inc,
-                                  libraries = expat_lib,
-                                  sources = ['_elementtree.c'],
-                                  ))
-        else:
-            missing.append('_elementtree')
-
-        # Hye-Shik Chang's CJKCodecs modules.
-        if have_unicode:
-            exts.append(Extension('_multibytecodec',
-                                  ['cjkcodecs/multibytecodec.c']))
-            for loc in ('kr', 'jp', 'cn', 'tw', 'hk', 'iso2022'):
-                exts.append(Extension('_codecs_%s' % loc,
-                                      ['cjkcodecs/_codecs_%s.c' % loc]))
-        else:
-            missing.append('_multibytecodec')
-            for loc in ('kr', 'jp', 'cn', 'tw', 'hk', 'iso2022'):
-                missing.append('_codecs_%s' % loc)
-
-        # Dynamic loading module
-        if sys.maxint == 0x7fffffff:
-            # This requires sizeof(int) == sizeof(long) == sizeof(char*)
-            dl_inc = find_file('dlfcn.h', [], inc_dirs)
-            if (dl_inc is not None) and (platform not in ['atheos']):
-                exts.append( Extension('dl', ['dlmodule.c']) )
-            else:
-                missing.append('dl')
-        else:
-            missing.append('dl')
-
-        # Thomas Heller's _ctypes module
-        self.detect_ctypes(inc_dirs, lib_dirs)
-
-        # Richard Oudkerk's multiprocessing module
-        if platform == 'win32':             # Windows
-            macros = dict()
-            libraries = ['ws2_32']
-
-        elif platform == 'darwin':          # Mac OSX
-            macros = dict()
-            libraries = []
-
-        elif platform == 'cygwin':          # Cygwin
-            macros = dict()
-            libraries = []
-
-        elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
-            # FreeBSD's P1003.1b semaphore support is very experimental
-            # and has many known problems. (as of June 2008)
-            macros = dict()
-            libraries = []
-
-        elif platform.startswith('openbsd'):
-            macros = dict()
-            libraries = []
-
-        elif platform.startswith('netbsd'):
-            macros = dict()
-            libraries = []
-
-        else:                                   # Linux and other unices
-            macros = dict()
-            libraries = ['rt']
-
-        if platform == 'win32':
-            multiprocessing_srcs = [ '_multiprocessing/multiprocessing.c',
-                                     '_multiprocessing/semaphore.c',
-                                     '_multiprocessing/pipe_connection.c',
-                                     '_multiprocessing/socket_connection.c',
-                                     '_multiprocessing/win32_functions.c'
-                                   ]
-
-        else:
-            multiprocessing_srcs = [ '_multiprocessing/multiprocessing.c',
-                                     '_multiprocessing/socket_connection.c'
-                                   ]
-            if (sysconfig.get_config_var('HAVE_SEM_OPEN') and not
-                sysconfig.get_config_var('POSIX_SEMAPHORES_NOT_ENABLED')):
-                multiprocessing_srcs.append('_multiprocessing/semaphore.c')
-
-        if sysconfig.get_config_var('WITH_THREAD'):
-            exts.append ( Extension('_multiprocessing', multiprocessing_srcs,
-                                    define_macros=macros.items(),
-                                    include_dirs=["Modules/_multiprocessing"]))
-        else:
-            missing.append('_multiprocessing')
-
-        # End multiprocessing
-
-
-        # Platform-specific libraries
-        if platform == 'linux2':
-            # Linux-specific modules
-            exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) )
-        else:
-            missing.append('linuxaudiodev')
-
-        if (platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
-                        'freebsd7', 'freebsd8')
-            or platform.startswith("gnukfreebsd")):
-            exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
-        else:
-            missing.append('ossaudiodev')
-
-        if platform == 'sunos5':
-            # SunOS specific modules
-            exts.append( Extension('sunaudiodev', ['sunaudiodev.c']) )
-        else:
-            missing.append('sunaudiodev')
-
-        if platform == 'darwin':
-            # _scproxy
-            exts.append(Extension("_scproxy", [os.path.join(srcdir, "Mac/Modules/_scproxy.c")],
-                extra_link_args= [
-                    '-framework', 'SystemConfiguration',
-                    '-framework', 'CoreFoundation'
-                ]))
-
-
-        if platform == 'darwin' and ("--disable-toolbox-glue" not in
-                sysconfig.get_config_var("CONFIG_ARGS")):
-
-            if int(os.uname()[2].split('.')[0]) >= 8:
-                # We're on Mac OS X 10.4 or later, the compiler should
-                # support '-Wno-deprecated-declarations'. This will
-                # surpress deprecation warnings for the Carbon extensions,
-                # these extensions wrap the Carbon APIs and even those
-                # parts that are deprecated.
-                carbon_extra_compile_args = ['-Wno-deprecated-declarations']
-            else:
-                carbon_extra_compile_args = []
-
-            # Mac OS X specific modules.
-            def macSrcExists(name1, name2=''):
-                if not name1:
-                    return None
-                names = (name1,)
-                if name2:
-                    names = (name1, name2)
-                path = os.path.join(srcdir, 'Mac', 'Modules', *names)
-                return os.path.exists(path)
-
-            def addMacExtension(name, kwds, extra_srcs=[]):
-                dirname = ''
-                if name[0] == '_':
-                    dirname = name[1:].lower()
-                cname = name + '.c'
-                cmodulename = name + 'module.c'
-                # Check for NNN.c, NNNmodule.c, _nnn/NNN.c, _nnn/NNNmodule.c
-                if macSrcExists(cname):
-                    srcs = [cname]
-                elif macSrcExists(cmodulename):
-                    srcs = [cmodulename]
-                elif macSrcExists(dirname, cname):
-                    # XXX(nnorwitz): If all the names ended with module, we
-                    # wouldn't need this condition.  ibcarbon is the only one.
-                    srcs = [os.path.join(dirname, cname)]
-                elif macSrcExists(dirname, cmodulename):
-                    srcs = [os.path.join(dirname, cmodulename)]
-                else:
-                    raise RuntimeError("%s not found" % name)
-
-                # Here's the whole point:  add the extension with sources
-                exts.append(Extension(name, srcs + extra_srcs, **kwds))
-
-            # Core Foundation
-            core_kwds = {'extra_compile_args': carbon_extra_compile_args,
-                         'extra_link_args': ['-framework', 'CoreFoundation'],
-                        }
-            addMacExtension('_CF', core_kwds, ['cf/pycfbridge.c'])
-            addMacExtension('autoGIL', core_kwds)
-
-
-
-            # Carbon
-            carbon_kwds = {'extra_compile_args': carbon_extra_compile_args,
-                           'extra_link_args': ['-framework', 'Carbon'],
-                          }
-            CARBON_EXTS = ['ColorPicker', 'gestalt', 'MacOS', 'Nav',
-                           'OSATerminology', 'icglue',
-                           # All these are in subdirs
-                           '_AE', '_AH', '_App', '_CarbonEvt', '_Cm', '_Ctl',
-                           '_Dlg', '_Drag', '_Evt', '_File', '_Folder', '_Fm',
-                           '_Help', '_Icn', '_IBCarbon', '_List',
-                           '_Menu', '_Mlte', '_OSA', '_Res', '_Qd', '_Qdoffs',
-                           '_Scrap', '_Snd', '_TE',
-                          ]
-            for name in CARBON_EXTS:
-                addMacExtension(name, carbon_kwds)
-
-            # Workaround for a bug in the version of gcc shipped with Xcode 3.
-            # The _Win extension should build just like the other Carbon extensions, but
-            # this actually results in a hard crash of the linker.
-            #
-            if '-arch ppc64' in cflags and '-arch ppc' in cflags:
-                win_kwds = {'extra_compile_args': carbon_extra_compile_args + ['-arch', 'i386', '-arch', 'ppc'],
-                               'extra_link_args': ['-framework', 'Carbon', '-arch', 'i386', '-arch', 'ppc'],
-                           }
-                addMacExtension('_Win', win_kwds)
-            else:
-                addMacExtension('_Win', carbon_kwds)
-
-
-            # Application Services & QuickTime
-            app_kwds = {'extra_compile_args': carbon_extra_compile_args,
-                        'extra_link_args': ['-framework','ApplicationServices'],
-                       }
-            addMacExtension('_Launch', app_kwds)
-            addMacExtension('_CG', app_kwds)
-
-            exts.append( Extension('_Qt', ['qt/_Qtmodule.c'],
-                        extra_compile_args=carbon_extra_compile_args,
-                        extra_link_args=['-framework', 'QuickTime',
-                                     '-framework', 'Carbon']) )
-
-
-        self.extensions.extend(exts)
-
-        # Call the method for detecting whether _tkinter can be compiled
-        self.detect_tkinter(inc_dirs, lib_dirs)
-
-        if '_tkinter' not in [e.name for e in self.extensions]:
-            missing.append('_tkinter')
-
-        return missing
-
-    def detect_tkinter_darwin(self, inc_dirs, lib_dirs):
-        # The _tkinter module, using frameworks. Since frameworks are quite
-        # different the UNIX search logic is not sharable.
-        from os.path import join, exists
-        framework_dirs = [
-            '/Library/Frameworks',
-            '/System/Library/Frameworks/',
-            join(os.getenv('HOME'), '/Library/Frameworks')
-        ]
-
-        sysroot = macosx_sdk_root()
-
-        # Find the directory that contains the Tcl.framework and Tk.framework
-        # bundles.
-        # XXX distutils should support -F!
-        for F in framework_dirs:
-            # both Tcl.framework and Tk.framework should be present
-
-
-            for fw in 'Tcl', 'Tk':
-                if is_macosx_sdk_path(F):
-                    if not exists(join(sysroot, F[1:], fw + '.framework')):
-                        break
-                else:
-                    if not exists(join(F, fw + '.framework')):
-                        break
-            else:
-                # ok, F is now directory with both frameworks. Continure
-                # building
-                break
-        else:
-            # Tk and Tcl frameworks not found. Normal "unix" tkinter search
-            # will now resume.
-            return 0
-
-        # For 8.4a2, we must add -I options that point inside the Tcl and Tk
-        # frameworks. In later release we should hopefully be able to pass
-        # the -F option to gcc, which specifies a framework lookup path.
-        #
-        include_dirs = [
-            join(F, fw + '.framework', H)
-            for fw in 'Tcl', 'Tk'
-            for H in 'Headers', 'Versions/Current/PrivateHeaders'
-        ]
-
-        # For 8.4a2, the X11 headers are not included. Rather than include a
-        # complicated search, this is a hard-coded path. It could bail out
-        # if X11 libs are not found...
-        include_dirs.append('/usr/X11R6/include')
-        frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
-
-        # All existing framework builds of Tcl/Tk don't support 64-bit
-        # architectures.
-        cflags = sysconfig.get_config_vars('CFLAGS')[0]
-        archs = re.findall('-arch\s+(\w+)', cflags)
-
-        if is_macosx_sdk_path(F):
-            fp = os.popen("file %s/Tk.framework/Tk | grep 'for architecture'"%(os.path.join(sysroot, F[1:]),))
-        else:
-            fp = os.popen("file %s/Tk.framework/Tk | grep 'for architecture'"%(F,))
-
-        detected_archs = []
-        for ln in fp:
-            a = ln.split()[-1]
-            if a in archs:
-                detected_archs.append(ln.split()[-1])
-        fp.close()
-
-        for a in detected_archs:
-            frameworks.append('-arch')
-            frameworks.append(a)
-
-        ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
-                        define_macros=[('WITH_APPINIT', 1)],
-                        include_dirs = include_dirs,
-                        libraries = [],
-                        extra_compile_args = frameworks[2:],
-                        extra_link_args = frameworks,
-                        )
-        self.extensions.append(ext)
-        return 1
-
-
-    def detect_tkinter(self, inc_dirs, lib_dirs):
-        # The _tkinter module.
-
-        # Rather than complicate the code below, detecting and building
-        # AquaTk is a separate method. Only one Tkinter will be built on
-        # Darwin - either AquaTk, if it is found, or X11 based Tk.
-        platform = self.get_platform()
-        ## PCMDI changes look for AQUA_CDAT env variable to decide
-        if os.environ.get("AQUA_CDAT","no")=="yes" :
-            if (platform == 'darwin' and
-                self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
-                return
-        ## End of pcmdi changes (we just added the if test
-
-        # Assume we haven't found any of the libraries or include files
-        # The versions with dots are used on Unix, and the versions without
-        # dots on Windows, for detection by cygwin.
-        tcllib = tklib = tcl_includes = tk_includes = None
-        for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83',
-                        '8.2', '82', '8.1', '81', '8.0', '80']:
-            tklib = self.compiler.find_library_file(lib_dirs,
-                                                        'tk' + version)
-            tcllib = self.compiler.find_library_file(lib_dirs,
-                                                         'tcl' + version)
-            if tklib and tcllib:
-                # Exit the loop when we've found the Tcl/Tk libraries
-                break
-
-        # Now check for the header files
-        if tklib and tcllib:
-            # Check for the include files on Debian and {Free,Open}BSD, where
-            # they're put in /usr/include/{tcl,tk}X.Y
-            dotversion = version
-            if '.' not in dotversion and "bsd" in sys.platform.lower():
-                # OpenBSD and FreeBSD use Tcl/Tk library names like libtcl83.a,
-                # but the include subdirs are named like .../include/tcl8.3.
-                dotversion = dotversion[:-1] + '.' + dotversion[-1]
-            tcl_include_sub = []
-            tk_include_sub = []
-            for dir in inc_dirs:
-                tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
-                tk_include_sub += [dir + os.sep + "tk" + dotversion]
-            tk_include_sub += tcl_include_sub
-            tcl_includes = find_file('tcl.h', inc_dirs, tcl_include_sub)
-            tk_includes = find_file('tk.h', inc_dirs, tk_include_sub)
-
-        if (tcllib is None or tklib is None or
-            tcl_includes is None or tk_includes is None):
-            self.announce("INFO: Can't locate Tcl/Tk libs and/or headers", 2)
-            return
-
-        # OK... everything seems to be present for Tcl/Tk.
-
-        include_dirs = [] ; libs = [] ; defs = [] ; added_lib_dirs = []
-        for dir in tcl_includes + tk_includes:
-            if dir not in include_dirs:
-                include_dirs.append(dir)
-
-        # Check for various platform-specific directories
-        if platform == 'sunos5':
-            include_dirs.append('/usr/openwin/include')
-            added_lib_dirs.append('/usr/openwin/lib')
-        elif os.path.exists('/usr/X11R6/include'):
-            include_dirs.append('/usr/X11R6/include')
-            added_lib_dirs.append('/usr/X11R6/lib64')
-            added_lib_dirs.append('/usr/X11R6/lib')
-        elif os.path.exists('/usr/X11R5/include'):
-            include_dirs.append('/usr/X11R5/include')
-            added_lib_dirs.append('/usr/X11R5/lib')
-        else:
-            # Assume default location for X11
-            include_dirs.append('/usr/X11/include')
-            added_lib_dirs.append('/usr/X11/lib')
-
-        # If Cygwin, then verify that X is installed before proceeding
-        if platform == 'cygwin':
-            x11_inc = find_file('X11/Xlib.h', [], include_dirs)
-            if x11_inc is None:
-                return
-
-        # Check for BLT extension
-        if self.compiler.find_library_file(lib_dirs + added_lib_dirs,
-                                               'BLT8.0'):
-            defs.append( ('WITH_BLT', 1) )
-            libs.append('BLT8.0')
-        elif self.compiler.find_library_file(lib_dirs + added_lib_dirs,
-                                                'BLT'):
-            defs.append( ('WITH_BLT', 1) )
-            libs.append('BLT')
-
-        # Add the Tcl/Tk libraries
-        libs.append('tk'+ version)
-        libs.append('tcl'+ version)
-
-        if platform in ['aix3', 'aix4']:
-            libs.append('ld')
-
-        # Finally, link with the X11 libraries (not appropriate on cygwin)
-        if platform != "cygwin":
-            libs.append('X11')
-
-        ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
-                        define_macros=[('WITH_APPINIT', 1)] + defs,
-                        include_dirs = include_dirs,
-                        libraries = libs,
-                        library_dirs = added_lib_dirs,
-                        )
-        self.extensions.append(ext)
-
-##         # Uncomment these lines if you want to play with xxmodule.c
-##         ext = Extension('xx', ['xxmodule.c'])
-##         self.extensions.append(ext)
-
-        # XXX handle these, but how to detect?
-        # *** Uncomment and edit for PIL (TkImaging) extension only:
-        #       -DWITH_PIL -I../Extensions/Imaging/libImaging  tkImaging.c \
-        # *** Uncomment and edit for TOGL extension only:
-        #       -DWITH_TOGL togl.c \
-        # *** Uncomment these for TOGL extension only:
-        #       -lGL -lGLU -lXext -lXmu \
-
-    def configure_ctypes_darwin(self, ext):
-        # Darwin (OS X) uses preconfigured files, in
-        # the Modules/_ctypes/libffi_osx directory.
-        srcdir = sysconfig.get_config_var('srcdir')
-        ffi_srcdir = os.path.abspath(os.path.join(srcdir, 'Modules',
-                                                  '_ctypes', 'libffi_osx'))
-        sources = [os.path.join(ffi_srcdir, p)
-                   for p in ['ffi.c',
-                             'x86/darwin64.S',
-                             'x86/x86-darwin.S',
-                             'x86/x86-ffi_darwin.c',
-                             'x86/x86-ffi64.c',
-                             'powerpc/ppc-darwin.S',
-                             'powerpc/ppc-darwin_closure.S',
-                             'powerpc/ppc-ffi_darwin.c',
-                             'powerpc/ppc64-darwin_closure.S',
-                             ]]
-
-        # Add .S (preprocessed assembly) to C compiler source extensions.
-        self.compiler.src_extensions.append('.S')
-
-        include_dirs = [os.path.join(ffi_srcdir, 'include'),
-                        os.path.join(ffi_srcdir, 'powerpc')]
-        ext.include_dirs.extend(include_dirs)
-        ext.sources.extend(sources)
-        return True
-
-    def configure_ctypes(self, ext):
-        if not self.use_system_libffi:
-            if sys.platform == 'darwin':
-                return self.configure_ctypes_darwin(ext)
-
-            srcdir = sysconfig.get_config_var('srcdir')
-            ffi_builddir = os.path.join(self.build_temp, 'libffi')
-            ffi_srcdir = os.path.abspath(os.path.join(srcdir, 'Modules',
-                                         '_ctypes', 'libffi'))
-            ffi_configfile = os.path.join(ffi_builddir, 'fficonfig.py')
-
-            from distutils.dep_util import newer_group
-
-            config_sources = [os.path.join(ffi_srcdir, fname)
-                              for fname in os.listdir(ffi_srcdir)
-                              if os.path.isfile(os.path.join(ffi_srcdir, fname))]
-            if self.force or newer_group(config_sources,
-                                         ffi_configfile):
-                from distutils.dir_util import mkpath
-                mkpath(ffi_builddir)
-                config_args = []
-
-                # Pass empty CFLAGS because we'll just append the resulting
-                # CFLAGS to Python's; -g or -O2 is to be avoided.
-                cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \
-                      % (ffi_builddir, ffi_srcdir, " ".join(config_args))
-
-                res = os.system(cmd)
-                if res or not os.path.exists(ffi_configfile):
-                    print "Failed to configure _ctypes module"
-                    return False
-
-            fficonfig = {}
-            with open(ffi_configfile) as f:
-                exec f in fficonfig
-
-            # Add .S (preprocessed assembly) to C compiler source extensions.
-            self.compiler.src_extensions.append('.S')
-
-            include_dirs = [os.path.join(ffi_builddir, 'include'),
-                            ffi_builddir,
-                            os.path.join(ffi_srcdir, 'src')]
-            extra_compile_args = fficonfig['ffi_cflags'].split()
-
-            ext.sources.extend(os.path.join(ffi_srcdir, f) for f in
-                               fficonfig['ffi_sources'])
-            ext.include_dirs.extend(include_dirs)
-            ext.extra_compile_args.extend(extra_compile_args)
-        return True
-
-    def detect_ctypes(self, inc_dirs, lib_dirs):
-        self.use_system_libffi = False
-        include_dirs = []
-        extra_compile_args = []
-        extra_link_args = []
-        sources = ['_ctypes/_ctypes.c',
-                   '_ctypes/callbacks.c',
-                   '_ctypes/callproc.c',
-                   '_ctypes/stgdict.c',
-                   '_ctypes/cfield.c']
-        depends = ['_ctypes/ctypes.h']
-
-        if sys.platform == 'darwin':
-            sources.append('_ctypes/malloc_closure.c')
-            sources.append('_ctypes/darwin/dlfcn_simple.c')
-            extra_compile_args.append('-DMACOSX')
-            include_dirs.append('_ctypes/darwin')
-# XXX Is this still needed?
-##            extra_link_args.extend(['-read_only_relocs', 'warning'])
-
-        elif sys.platform == 'sunos5':
-            # XXX This shouldn't be necessary; it appears that some
-            # of the assembler code is non-PIC (i.e. it has relocations
-            # when it shouldn't. The proper fix would be to rewrite
-            # the assembler code to be PIC.
-            # This only works with GCC; the Sun compiler likely refuses
-            # this option. If you want to compile ctypes with the Sun
-            # compiler, please research a proper solution, instead of
-            # finding some -z option for the Sun compiler.
-            extra_link_args.append('-mimpure-text')
-
-        elif sys.platform.startswith('hp-ux'):
-            extra_link_args.append('-fPIC')
-
-        ext = Extension('_ctypes',
-                        include_dirs=include_dirs,
-                        extra_compile_args=extra_compile_args,
-                        extra_link_args=extra_link_args,
-                        libraries=[],
-                        sources=sources,
-                        depends=depends)
-        ext_test = Extension('_ctypes_test',
-                             sources=['_ctypes/_ctypes_test.c'])
-        self.extensions.extend([ext, ext_test])
-
-        if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"):
-            return
-
-        if sys.platform == 'darwin':
-            # OS X 10.5 comes with libffi.dylib; the include files are
-            # in /usr/include/ffi
-            inc_dirs.append('/usr/include/ffi')
-
-        ffi_inc = [sysconfig.get_config_var("LIBFFI_INCLUDEDIR")]
-        if not ffi_inc or ffi_inc[0] == '':
-            ffi_inc = find_file('ffi.h', [], inc_dirs)
-        if ffi_inc is not None:
-            ffi_h = ffi_inc[0] + '/ffi.h'
-            fp = open(ffi_h)
-            while 1:
-                line = fp.readline()
-                if not line:
-                    ffi_inc = None
-                    break
-                if line.startswith('#define LIBFFI_H'):
-                    break
-        ffi_lib = None
-        if ffi_inc is not None:
-            for lib_name in ('ffi_convenience', 'ffi_pic', 'ffi'):
-                if (self.compiler.find_library_file(lib_dirs, lib_name)):
-                    ffi_lib = lib_name
-                    break
-
-        if ffi_inc and ffi_lib:
-            ext.include_dirs.extend(ffi_inc)
-            ext.libraries.append(ffi_lib)
-            self.use_system_libffi = True
-
-
-class PyBuildInstall(install):
-    # Suppress the warning about installation into the lib_dynload
-    # directory, which is not in sys.path when running Python during
-    # installation:
-    def initialize_options (self):
-        install.initialize_options(self)
-        self.warn_dir=0
-
-class PyBuildInstallLib(install_lib):
-    # Do exactly what install_lib does but make sure correct access modes get
-    # set on installed directories and files. All installed files with get
-    # mode 644 unless they are a shared library in which case they will get
-    # mode 755. All installed directories will get mode 755.
-
-    so_ext = sysconfig.get_config_var("SO")
-
-    def install(self):
-        outfiles = install_lib.install(self)
-        self.set_file_modes(outfiles, 0644, 0755)
-        self.set_dir_modes(self.install_dir, 0755)
-        return outfiles
-
-    def set_file_modes(self, files, defaultMode, sharedLibMode):
-        if not self.is_chmod_supported(): return
-        if not files: return
-
-        for filename in files:
-            if os.path.islink(filename): continue
-            mode = defaultMode
-            if filename.endswith(self.so_ext): mode = sharedLibMode
-            log.info("changing mode of %s to %o", filename, mode)
-            if not self.dry_run: os.chmod(filename, mode)
-
-    def set_dir_modes(self, dirname, mode):
-        if not self.is_chmod_supported(): return
-        os.path.walk(dirname, self.set_dir_modes_visitor, mode)
-
-    def set_dir_modes_visitor(self, mode, dirname, names):
-        if os.path.islink(dirname): return
-        log.info("changing mode of %s to %o", dirname, mode)
-        if not self.dry_run: os.chmod(dirname, mode)
-
-    def is_chmod_supported(self):
-        return hasattr(os, 'chmod')
-
-SUMMARY = """
-Python is an interpreted, interactive, object-oriented programming
-language. It is often compared to Tcl, Perl, Scheme or Java.
-
-Python combines remarkable power with very clear syntax. It has
-modules, classes, exceptions, very high level dynamic data types, and
-dynamic typing. There are interfaces to many system calls and
-libraries, as well as to various windowing systems (X11, Motif, Tk,
-Mac, MFC). New built-in modules are easily written in C or C++. Python
-is also usable as an extension language for applications that need a
-programmable interface.
-
-The Python implementation is portable: it runs on many brands of UNIX,
-on Windows, DOS, OS/2, Mac, Amiga... If your favorite system isn't
-listed here, it may still be supported, if there's a C compiler for
-it. Ask around on comp.lang.python -- or just try compiling Python
-yourself.
-"""
-
-CLASSIFIERS = """
-Development Status :: 6 - Mature
-License :: OSI Approved :: Python Software Foundation License
-Natural Language :: English
-Programming Language :: C
-Programming Language :: Python
-Topic :: Software Development
-"""
-
-def main():
-    # turn off warnings when deprecated modules are imported
-    import warnings
-    warnings.filterwarnings("ignore",category=DeprecationWarning)
-    setup(# PyPI Metadata (PEP 301)
-          name = "Python",
-          version = sys.version.split()[0],
-          url = "http://www.python.org/%s" % sys.version[:3],
-          maintainer = "Guido van Rossum and the Python community",
-          maintainer_email = "python-dev@python.org",
-          description = "A high-level object-oriented programming language",
-          long_description = SUMMARY.strip(),
-          license = "PSF license",
-          classifiers = filter(None, CLASSIFIERS.split("\n")),
-          platforms = ["Many"],
-
-          # Build info
-          cmdclass = {'build_ext':PyBuildExt, 'install':PyBuildInstall,
-                      'install_lib':PyBuildInstallLib},
-          # The struct module is defined here, because build_ext won't be
-          # called unless there's at least one extension module defined.
-          ext_modules=[Extension('_struct', ['_struct.c'])],
-
-          # Scripts to install
-          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
-                     'Tools/scripts/2to3',
-                     'Lib/smtpd.py']
-        )
-
-# --install-platlib
-if __name__ == '__main__':
-    main()
diff --git a/pysrc/src/setup-2.7.2.py b/pysrc/src/setup-2.7.2.py
deleted file mode 100644
index 1f9c9b83d..000000000
--- a/pysrc/src/setup-2.7.2.py
+++ /dev/null
@@ -1,2090 +0,0 @@
-# Autodetecting setup.py script for building the Python extensions
-#
-
-__version__ = "$Revision$"
-
-import sys, os, imp, re, optparse
-from glob import glob
-from platform import machine as platform_machine
-import sysconfig
-
-from distutils import log
-from distutils import text_file
-from distutils.errors import *
-from distutils.core import Extension, setup
-from distutils.command.build_ext import build_ext
-from distutils.command.install import install
-from distutils.command.install_lib import install_lib
-from distutils.spawn import find_executable
-
-# Were we compiled --with-pydebug or with #define Py_DEBUG?
-COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
-
-# This global variable is used to hold the list of modules to be disabled.
-disabled_module_list = []
-
-def add_dir_to_list(dirlist, dir):
-    """Add the directory 'dir' to the list 'dirlist' (at the front) if
-    1) 'dir' is not already in 'dirlist'
-    2) 'dir' actually exists, and is a directory."""
-    if dir is not None and os.path.isdir(dir) and dir not in dirlist:
-        dirlist.insert(0, dir)
-
-def macosx_sdk_root():
-    """
-    Return the directory of the current OSX SDK,
-    or '/' if no SDK was specified.
-    """
-    cflags = sysconfig.get_config_var('CFLAGS')
-    m = re.search(r'-isysroot\s+(\S+)', cflags)
-    if m is None:
-        sysroot = '/'
-    else:
-        sysroot = m.group(1)
-    return sysroot
-
-def is_macosx_sdk_path(path):
-    """
-    Returns True if 'path' can be located in an OSX SDK
-    """
-    return (path.startswith('/usr/') and not path.startswith('/usr/local')) or path.startswith('/System/')
-
-def find_file(filename, std_dirs, paths):
-    """Searches for the directory where a given file is located,
-    and returns a possibly-empty list of additional directories, or None
-    if the file couldn't be found at all.
-
-    'filename' is the name of a file, such as readline.h or libcrypto.a.
-    'std_dirs' is the list of standard system directories; if the
-        file is found in one of them, no additional directives are needed.
-    'paths' is a list of additional locations to check; if the file is
-        found in one of them, the resulting list will contain the directory.
-    """
-    if sys.platform == 'darwin':
-        # Honor the MacOSX SDK setting when one was specified.
-        # An SDK is a directory with the same structure as a real
-        # system, but with only header files and libraries.
-        sysroot = macosx_sdk_root()
-
-    # Check the standard locations
-    for dir in std_dirs:
-        f = os.path.join(dir, filename)
-
-        if sys.platform == 'darwin' and is_macosx_sdk_path(dir):
-            f = os.path.join(sysroot, dir[1:], filename)
-
-        if os.path.exists(f): return []
-
-    # Check the additional directories
-    for dir in paths:
-        f = os.path.join(dir, filename)
-
-        if sys.platform == 'darwin' and is_macosx_sdk_path(dir):
-            f = os.path.join(sysroot, dir[1:], filename)
-
-        if os.path.exists(f):
-            return [dir]
-
-    # Not found anywhere
-    return None
-
-def find_library_file(compiler, libname, std_dirs, paths):
-    result = compiler.find_library_file(std_dirs + paths, libname)
-    if result is None:
-        return None
-
-    if sys.platform == 'darwin':
-        sysroot = macosx_sdk_root()
-
-    # Check whether the found file is in one of the standard directories
-    dirname = os.path.dirname(result)
-    for p in std_dirs:
-        # Ensure path doesn't end with path separator
-        p = p.rstrip(os.sep)
-
-        if sys.platform == 'darwin' and is_macosx_sdk_path(p):
-            if os.path.join(sysroot, p[1:]) == dirname:
-                return [ ]
-
-        if p == dirname:
-            return [ ]
-
-    # Otherwise, it must have been in one of the additional directories,
-    # so we have to figure out which one.
-    for p in paths:
-        # Ensure path doesn't end with path separator
-        p = p.rstrip(os.sep)
-
-        if sys.platform == 'darwin' and is_macosx_sdk_path(p):
-            if os.path.join(sysroot, p[1:]) == dirname:
-                return [ p ]
-
-        if p == dirname:
-            return [p]
-    else:
-        assert False, "Internal error: Path not found in std_dirs or paths"
-
-def module_enabled(extlist, modname):
-    """Returns whether the module 'modname' is present in the list
-    of extensions 'extlist'."""
-    extlist = [ext for ext in extlist if ext.name == modname]
-    return len(extlist)
-
-def find_module_file(module, dirlist):
-    """Find a module in a set of possible folders. If it is not found
-    return the unadorned filename"""
-    list = find_file(module, [], dirlist)
-    if not list:
-        return module
-    if len(list) > 1:
-        log.info("WARNING: multiple copies of %s found"%module)
-    return os.path.join(list[0], module)
-
-class PyBuildExt(build_ext):
-
-    def __init__(self, dist):
-        build_ext.__init__(self, dist)
-        self.failed = []
-
-    def build_extensions(self):
-
-        # Detect which modules should be compiled
-        missing = self.detect_modules()
-
-        # Remove modules that are present on the disabled list
-        extensions = [ext for ext in self.extensions
-                      if ext.name not in disabled_module_list]
-        # move ctypes to the end, it depends on other modules
-        ext_map = dict((ext.name, i) for i, ext in enumerate(extensions))
-        if "_ctypes" in ext_map:
-            ctypes = extensions.pop(ext_map["_ctypes"])
-            extensions.append(ctypes)
-        self.extensions = extensions
-
-        # Fix up the autodetected modules, prefixing all the source files
-        # with Modules/ and adding Python's include directory to the path.
-        (srcdir,) = sysconfig.get_config_vars('srcdir')
-        if not srcdir:
-            # Maybe running on Windows but not using CYGWIN?
-            raise ValueError("No source directory; cannot proceed.")
-        srcdir = os.path.abspath(srcdir)
-        moddirlist = [os.path.join(srcdir, 'Modules')]
-
-        # Platform-dependent module source and include directories
-        incdirlist = []
-        platform = self.get_platform()
-        if platform == 'darwin' and ("--disable-toolbox-glue" not in
-            sysconfig.get_config_var("CONFIG_ARGS")):
-            # Mac OS X also includes some mac-specific modules
-            macmoddir = os.path.join(srcdir, 'Mac/Modules')
-            moddirlist.append(macmoddir)
-            incdirlist.append(os.path.join(srcdir, 'Mac/Include'))
-
-        # Fix up the paths for scripts, too
-        self.distribution.scripts = [os.path.join(srcdir, filename)
-                                     for filename in self.distribution.scripts]
-
-        # Python header files
-        headers = [sysconfig.get_config_h_filename()]
-        headers += glob(os.path.join(sysconfig.get_path('platinclude'), "*.h"))
-        for ext in self.extensions[:]:
-            ext.sources = [ find_module_file(filename, moddirlist)
-                            for filename in ext.sources ]
-            if ext.depends is not None:
-                ext.depends = [find_module_file(filename, moddirlist)
-                               for filename in ext.depends]
-            else:
-                ext.depends = []
-            # re-compile extensions if a header file has been changed
-            ext.depends.extend(headers)
-
-            # platform specific include directories
-            ext.include_dirs.extend(incdirlist)
-
-            # If a module has already been built statically,
-            # don't build it here
-            if ext.name in sys.builtin_module_names:
-                self.extensions.remove(ext)
-
-        # Parse Modules/Setup and Modules/Setup.local to figure out which
-        # modules are turned on in the file.
-        remove_modules = []
-        for filename in ('Modules/Setup', 'Modules/Setup.local'):
-            input = text_file.TextFile(filename, join_lines=1)
-            while 1:
-                line = input.readline()
-                if not line: break
-                line = line.split()
-                remove_modules.append(line[0])
-            input.close()
-
-        for ext in self.extensions[:]:
-            if ext.name in remove_modules:
-                self.extensions.remove(ext)
-
-        # When you run "make CC=altcc" or something similar, you really want
-        # those environment variables passed into the setup.py phase.  Here's
-        # a small set of useful ones.
-        compiler = os.environ.get('CC')
-        args = {}
-        # unfortunately, distutils doesn't let us provide separate C and C++
-        # compilers
-        if compiler is not None:
-            (ccshared,cflags) = sysconfig.get_config_vars('CCSHARED','CFLAGS')
-            args['compiler_so'] = compiler + ' ' + ccshared + ' ' + cflags
-        self.compiler.set_executables(**args)
-
-        build_ext.build_extensions(self)
-
-        longest = max([len(e.name) for e in self.extensions])
-        if self.failed:
-            longest = max(longest, max([len(name) for name in self.failed]))
-
-        def print_three_column(lst):
-            lst.sort(key=str.lower)
-            # guarantee zip() doesn't drop anything
-            while len(lst) % 3:
-                lst.append("")
-            for e, f, g in zip(lst[::3], lst[1::3], lst[2::3]):
-                print "%-*s   %-*s   %-*s" % (longest, e, longest, f,
-                                              longest, g)
-
-        if missing:
-            print
-            print ("Python build finished, but the necessary bits to build "
-                   "these modules were not found:")
-            print_three_column(missing)
-            print ("To find the necessary bits, look in setup.py in"
-                   " detect_modules() for the module's name.")
-            print
-
-        if self.failed:
-            failed = self.failed[:]
-            print
-            print "Failed to build these modules:"
-            print_three_column(failed)
-            print
-
-    def build_extension(self, ext):
-
-        if ext.name == '_ctypes':
-            if not self.configure_ctypes(ext):
-                return
-
-        try:
-            build_ext.build_extension(self, ext)
-        except (CCompilerError, DistutilsError), why:
-            self.announce('WARNING: building of extension "%s" failed: %s' %
-                          (ext.name, sys.exc_info()[1]))
-            self.failed.append(ext.name)
-            return
-        # Workaround for Mac OS X: The Carbon-based modules cannot be
-        # reliably imported into a command-line Python
-        if 'Carbon' in ext.extra_link_args:
-            self.announce(
-                'WARNING: skipping import check for Carbon-based "%s"' %
-                ext.name)
-            return
-
-        if self.get_platform() == 'darwin' and (
-                sys.maxint > 2**32 and '-arch' in ext.extra_link_args):
-            # Don't bother doing an import check when an extension was
-            # build with an explicit '-arch' flag on OSX. That's currently
-            # only used to build 32-bit only extensions in a 4-way
-            # universal build and loading 32-bit code into a 64-bit
-            # process will fail.
-            self.announce(
-                'WARNING: skipping import check for "%s"' %
-                ext.name)
-            return
-
-        # Workaround for Cygwin: Cygwin currently has fork issues when many
-        # modules have been imported
-        if self.get_platform() == 'cygwin':
-            self.announce('WARNING: skipping import check for Cygwin-based "%s"'
-                % ext.name)
-            return
-        ext_filename = os.path.join(
-            self.build_lib,
-            self.get_ext_filename(self.get_ext_fullname(ext.name)))
-        try:
-            imp.load_dynamic(ext.name, ext_filename)
-        except ImportError, why:
-            self.failed.append(ext.name)
-            self.announce('*** WARNING: renaming "%s" since importing it'
-                          ' failed: %s' % (ext.name, why), level=3)
-            assert not self.inplace
-            basename, tail = os.path.splitext(ext_filename)
-            newname = basename + "_failed" + tail
-            if os.path.exists(newname):
-                os.remove(newname)
-            os.rename(ext_filename, newname)
-
-            # XXX -- This relies on a Vile HACK in
-            # distutils.command.build_ext.build_extension().  The
-            # _built_objects attribute is stored there strictly for
-            # use here.
-            # If there is a failure, _built_objects may not be there,
-            # so catch the AttributeError and move on.
-            try:
-                for filename in self._built_objects:
-                    os.remove(filename)
-            except AttributeError:
-                self.announce('unable to remove files (ignored)')
-        except:
-            exc_type, why, tb = sys.exc_info()
-            self.announce('*** WARNING: importing extension "%s" '
-                          'failed with %s: %s' % (ext.name, exc_type, why),
-                          level=3)
-            self.failed.append(ext.name)
-
-    def get_platform(self):
-        # Get value of sys.platform
-        for platform in ['cygwin', 'beos', 'darwin', 'atheos', 'osf1']:
-            if sys.platform.startswith(platform):
-                return platform
-        return sys.platform
-
-    def add_multiarch_paths(self):
-        # Debian/Ubuntu multiarch support.
-        # https://wiki.ubuntu.com/MultiarchSpec
-        if not find_executable('dpkg-architecture'):
-            return
-        tmpfile = os.path.join(self.build_temp, 'multiarch')
-        if not os.path.exists(self.build_temp):
-            os.makedirs(self.build_temp)
-        ret = os.system(
-            'dpkg-architecture -qDEB_HOST_MULTIARCH > %s 2> /dev/null' %
-            tmpfile)
-        try:
-            if ret >> 8 == 0:
-                with open(tmpfile) as fp:
-                    multiarch_path_component = fp.readline().strip()
-                add_dir_to_list(self.compiler.library_dirs,
-                                '/usr/lib/' + multiarch_path_component)
-                add_dir_to_list(self.compiler.include_dirs,
-                                '/usr/include/' + multiarch_path_component)
-        finally:
-            os.unlink(tmpfile)
-
-    def detect_modules(self):
-	# PCMDI Change
-        # Ensure that place we put tcl/tk/netcdf etc. is always used
-        libbase = os.environ.get('EXTERNALS', os.path.join(sys.prefix,'..','Externals'))
-        mylibdir = os.path.join(libbase,'lib')
-        myincdir = os.path.join(libbase,'include')
-        add_dir_to_list(self.compiler.library_dirs, mylibdir)
-        add_dir_to_list(self.compiler.include_dirs, myincdir)
-        # end PCMDI change
-
-        # Ensure that /usr/local is always used
-        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-        self.add_multiarch_paths()
-
-        # Add paths specified in the environment variables LDFLAGS and
-        # CPPFLAGS for header and library files.
-        # We must get the values from the Makefile and not the environment
-        # directly since an inconsistently reproducible issue comes up where
-        # the environment variable is not set even though the value were passed
-        # into configure and stored in the Makefile (issue found on OS X 10.3).
-        for env_var, arg_name, dir_list in (
-                ('LDFLAGS', '-R', self.compiler.runtime_library_dirs),
-                ('LDFLAGS', '-L', self.compiler.library_dirs),
-                ('CPPFLAGS', '-I', self.compiler.include_dirs)):
-            env_val = sysconfig.get_config_var(env_var)
-            if env_val:
-                # To prevent optparse from raising an exception about any
-                # options in env_val that it doesn't know about we strip out
-                # all double dashes and any dashes followed by a character
-                # that is not for the option we are dealing with.
-                #
-                # Please note that order of the regex is important!  We must
-                # strip out double-dashes first so that we don't end up with
-                # substituting "--Long" to "-Long" and thus lead to "ong" being
-                # used for a library directory.
-                env_val = re.sub(r'(^|\s+)-(-|(?!%s))' % arg_name[1],
-                                 ' ', env_val)
-                parser = optparse.OptionParser()
-                # Make sure that allowing args interspersed with options is
-                # allowed
-                parser.allow_interspersed_args = True
-                parser.error = lambda msg: None
-                parser.add_option(arg_name, dest="dirs", action="append")
-                options = parser.parse_args(env_val.split())[0]
-                if options.dirs:
-                    for directory in reversed(options.dirs):
-                        add_dir_to_list(dir_list, directory)
-
-        if os.path.normpath(sys.prefix) != '/usr' \
-                and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
-            # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
-            # (PYTHONFRAMEWORK is set) to avoid # linking problems when
-            # building a framework with different architectures than
-            # the one that is currently installed (issue #7473)
-            add_dir_to_list(self.compiler.library_dirs,
-                            sysconfig.get_config_var("LIBDIR"))
-            add_dir_to_list(self.compiler.include_dirs,
-                            sysconfig.get_config_var("INCLUDEDIR"))
-
-        try:
-            have_unicode = unicode
-        except NameError:
-            have_unicode = 0
-
-        # lib_dirs and inc_dirs are used to search for files;
-        # if a file is found in one of those directories, it can
-        # be assumed that no additional -I,-L directives are needed.
-        lib_dirs = self.compiler.library_dirs + [
-            '/lib64', '/usr/lib64',
-            '/lib', '/usr/lib', '/usr/lib/x86_64-linux-gnu',
-            ]
-        inc_dirs = self.compiler.include_dirs + ['/usr/include']
-        exts = []
-        missing = []
-
-        config_h = sysconfig.get_config_h_filename()
-        config_h_vars = sysconfig.parse_config_h(open(config_h))
-
-        platform = self.get_platform()
-        srcdir = sysconfig.get_config_var('srcdir')
-
-        # Check for AtheOS which has libraries in non-standard locations
-        if platform == 'atheos':
-            lib_dirs += ['/system/libs', '/atheos/autolnk/lib']
-            lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
-            inc_dirs += ['/system/include', '/atheos/autolnk/include']
-            inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
-
-        # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
-        if platform in ['osf1', 'unixware7', 'openunix8']:
-            lib_dirs += ['/usr/ccs/lib']
-
-        if platform == 'darwin':
-            # This should work on any unixy platform ;-)
-            # If the user has bothered specifying additional -I and -L flags
-            # in OPT and LDFLAGS we might as well use them here.
-            #   NOTE: using shlex.split would technically be more correct, but
-            # also gives a bootstrap problem. Let's hope nobody uses directories
-            # with whitespace in the name to store libraries.
-            cflags, ldflags = sysconfig.get_config_vars(
-                    'CFLAGS', 'LDFLAGS')
-            for item in cflags.split():
-                if item.startswith('-I'):
-                    inc_dirs.append(item[2:])
-
-            for item in ldflags.split():
-                if item.startswith('-L'):
-                    lib_dirs.append(item[2:])
-
-        # Check for MacOS X, which doesn't need libm.a at all
-        math_libs = ['m']
-        if platform in ['darwin', 'beos']:
-            math_libs = []
-
-        # XXX Omitted modules: gl, pure, dl, SGI-specific modules
-
-        #
-        # The following modules are all pretty straightforward, and compile
-        # on pretty much any POSIXish platform.
-        #
-
-        # Some modules that are normally always on:
-        #exts.append( Extension('_weakref', ['_weakref.c']) )
-
-        # array objects
-        exts.append( Extension('array', ['arraymodule.c']) )
-        # complex math library functions
-        exts.append( Extension('cmath', ['cmathmodule.c', '_math.c'],
-                               depends=['_math.h'],
-                               libraries=math_libs) )
-        # math library functions, e.g. sin()
-        exts.append( Extension('math',  ['mathmodule.c', '_math.c'],
-                               depends=['_math.h'],
-                               libraries=math_libs) )
-        # fast string operations implemented in C
-        exts.append( Extension('strop', ['stropmodule.c']) )
-        # time operations and variables
-        exts.append( Extension('time', ['timemodule.c'],
-                               libraries=math_libs) )
-        exts.append( Extension('datetime', ['datetimemodule.c', 'timemodule.c'],
-                               libraries=math_libs) )
-        # fast iterator tools implemented in C
-        exts.append( Extension("itertools", ["itertoolsmodule.c"]) )
-        # code that will be builtins in the future, but conflict with the
-        #  current builtins
-        exts.append( Extension('future_builtins', ['future_builtins.c']) )
-        # random number generator implemented in C
-        exts.append( Extension("_random", ["_randommodule.c"]) )
-        # high-performance collections
-        exts.append( Extension("_collections", ["_collectionsmodule.c"]) )
-        # bisect
-        exts.append( Extension("_bisect", ["_bisectmodule.c"]) )
-        # heapq
-        exts.append( Extension("_heapq", ["_heapqmodule.c"]) )
-        # operator.add() and similar goodies
-        exts.append( Extension('operator', ['operator.c']) )
-        # Python 3.1 _io library
-        exts.append( Extension("_io",
-            ["_io/bufferedio.c", "_io/bytesio.c", "_io/fileio.c",
-             "_io/iobase.c", "_io/_iomodule.c", "_io/stringio.c", "_io/textio.c"],
-             depends=["_io/_iomodule.h"], include_dirs=["Modules/_io"]))
-        # _functools
-        exts.append( Extension("_functools", ["_functoolsmodule.c"]) )
-        # _json speedups
-        exts.append( Extension("_json", ["_json.c"]) )
-        # Python C API test module
-        exts.append( Extension('_testcapi', ['_testcapimodule.c'],
-                               depends=['testcapi_long.h']) )
-        # profilers (_lsprof is for cProfile.py)
-        exts.append( Extension('_hotshot', ['_hotshot.c']) )
-        exts.append( Extension('_lsprof', ['_lsprof.c', 'rotatingtree.c']) )
-        # static Unicode character database
-        if have_unicode:
-            exts.append( Extension('unicodedata', ['unicodedata.c']) )
-        else:
-            missing.append('unicodedata')
-        # access to ISO C locale support
-        data = open('pyconfig.h').read()
-        m = re.search(r"#s*define\s+WITH_LIBINTL\s+1\s*", data)
-        if m is not None:
-            locale_libs = ['intl']
-        else:
-            locale_libs = []
-        if platform == 'darwin':
-            locale_extra_link_args = ['-framework', 'CoreFoundation']
-        else:
-            locale_extra_link_args = []
-
-
-        exts.append( Extension('_locale', ['_localemodule.c'],
-                               libraries=locale_libs,
-                               extra_link_args=locale_extra_link_args) )
-
-        # Modules with some UNIX dependencies -- on by default:
-        # (If you have a really backward UNIX, select and socket may not be
-        # supported...)
-
-        # fcntl(2) and ioctl(2)
-        libs = []
-        if (config_h_vars.get('FLOCK_NEEDS_LIBBSD', False)):
-            # May be necessary on AIX for flock function
-            libs = ['bsd']
-        exts.append( Extension('fcntl', ['fcntlmodule.c'], libraries=libs) )
-        # pwd(3)
-        exts.append( Extension('pwd', ['pwdmodule.c']) )
-        # grp(3)
-        exts.append( Extension('grp', ['grpmodule.c']) )
-        # spwd, shadow passwords
-        if (config_h_vars.get('HAVE_GETSPNAM', False) or
-                config_h_vars.get('HAVE_GETSPENT', False)):
-            exts.append( Extension('spwd', ['spwdmodule.c']) )
-        else:
-            missing.append('spwd')
-
-        # select(2); not on ancient System V
-        exts.append( Extension('select', ['selectmodule.c']) )
-
-        # Fred Drake's interface to the Python parser
-        exts.append( Extension('parser', ['parsermodule.c']) )
-
-        # cStringIO and cPickle
-        exts.append( Extension('cStringIO', ['cStringIO.c']) )
-        exts.append( Extension('cPickle', ['cPickle.c']) )
-
-        # Memory-mapped files (also works on Win32).
-        if platform not in ['atheos']:
-            exts.append( Extension('mmap', ['mmapmodule.c']) )
-        else:
-            missing.append('mmap')
-
-        # Lance Ellinghaus's syslog module
-        # syslog daemon interface
-        exts.append( Extension('syslog', ['syslogmodule.c']) )
-
-        # George Neville-Neil's timing module:
-        # Deprecated in PEP 4 http://www.python.org/peps/pep-0004.html
-        # http://mail.python.org/pipermail/python-dev/2006-January/060023.html
-        #exts.append( Extension('timing', ['timingmodule.c']) )
-
-        #
-        # Here ends the simple stuff.  From here on, modules need certain
-        # libraries, are platform-specific, or present other surprises.
-        #
-
-        # Multimedia modules
-        # These don't work for 64-bit platforms!!!
-        # These represent audio samples or images as strings:
-
-        # Operations on audio samples
-        # According to #993173, this one should actually work fine on
-        # 64-bit platforms.
-        exts.append( Extension('audioop', ['audioop.c']) )
-
-        # Disabled on 64-bit platforms
-        if sys.maxint != 9223372036854775807L:
-            # Operations on images
-            exts.append( Extension('imageop', ['imageop.c']) )
-        else:
-            missing.extend(['imageop'])
-
-        # readline
-        do_readline = self.compiler.find_library_file(lib_dirs, 'readline')
-        readline_termcap_library = ""
-        curses_library = ""
-        # Determine if readline is already linked against curses or tinfo.
-        if do_readline and find_executable('ldd'):
-            fp = os.popen("ldd %s" % do_readline)
-            ldd_output = fp.readlines()
-            ret = fp.close()
-            if ret is None or ret >> 8 == 0:
-                for ln in ldd_output:
-                    if 'curses' in ln:
-                        readline_termcap_library = re.sub(
-                            r'.*lib(n?cursesw?)\.so.*', r'\1', ln
-                        ).rstrip()
-                        break
-                    if 'tinfo' in ln: # termcap interface split out from ncurses
-                        readline_termcap_library = 'tinfo'
-                        break
-        # Issue 7384: If readline is already linked against curses,
-        # use the same library for the readline and curses modules.
-        if 'curses' in readline_termcap_library:
-            curses_library = readline_termcap_library
-        elif self.compiler.find_library_file(lib_dirs, 'ncursesw'):
-            curses_library = 'ncursesw'
-        elif self.compiler.find_library_file(lib_dirs, 'ncurses'):
-            curses_library = 'ncurses'
-        elif self.compiler.find_library_file(lib_dirs, 'curses'):
-            curses_library = 'curses'
-
-        if platform == 'darwin':
-            os_release = int(os.uname()[2].split('.')[0])
-            dep_target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
-            if dep_target and dep_target.split('.') < ['10', '5']:
-                os_release = 8
-            if os_release < 9:
-                # MacOSX 10.4 has a broken readline. Don't try to build
-                # the readline module unless the user has installed a fixed
-                # readline package
-                if find_file('readline/rlconf.h', inc_dirs, []) is None:
-                    do_readline = False
-        if do_readline:
-            if platform == 'darwin' and os_release < 9:
-                # In every directory on the search path search for a dynamic
-                # library and then a static library, instead of first looking
-                # for dynamic libraries on the entiry path.
-                # This way a staticly linked custom readline gets picked up
-                # before the (possibly broken) dynamic library in /usr/lib.
-                readline_extra_link_args = ('-Wl,-search_paths_first',)
-            else:
-                readline_extra_link_args = ()
-
-            readline_libs = ['readline']
-            if readline_termcap_library:
-                pass # Issue 7384: Already linked against curses or tinfo.
-            elif curses_library:
-                readline_libs.append(curses_library)
-            elif self.compiler.find_library_file(lib_dirs +
-                                                     ['/usr/lib/termcap'],
-                                                     'termcap'):
-                readline_libs.append('termcap')
-            exts.append( Extension('readline', ['readline.c'],
-                                   library_dirs=['/usr/lib/termcap'],
-                                   extra_link_args=readline_extra_link_args,
-                                   libraries=readline_libs) )
-        else:
-            missing.append('readline')
-
-        # crypt module.
-
-        if self.compiler.find_library_file(lib_dirs, 'crypt'):
-            libs = ['crypt']
-        else:
-            libs = []
-        exts.append( Extension('crypt', ['cryptmodule.c'], libraries=libs) )
-
-        # CSV files
-        exts.append( Extension('_csv', ['_csv.c']) )
-
-        # socket(2)
-        exts.append( Extension('_socket', ['socketmodule.c'],
-                               depends = ['socketmodule.h']) )
-        # Detect SSL support for the socket module (via _ssl)
-        search_for_ssl_incs_in = [
-                              '/usr/local/ssl/include',
-                              '/usr/contrib/ssl/include/'
-                             ]
-        ssl_incs = find_file('openssl/ssl.h', inc_dirs,
-                             search_for_ssl_incs_in
-                             )
-        if ssl_incs is not None:
-            krb5_h = find_file('krb5.h', inc_dirs,
-                               ['/usr/kerberos/include'])
-            if krb5_h:
-                ssl_incs += krb5_h
-        ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
-                                     ['/usr/local/ssl/lib',
-                                      '/usr/contrib/ssl/lib/'
-                                     ] )
-
-        if (ssl_incs is not None and
-            ssl_libs is not None):
-            exts.append( Extension('_ssl', ['_ssl.c'],
-                                   include_dirs = ssl_incs,
-                                   library_dirs = ssl_libs,
-                                   libraries = ['ssl', 'crypto'],
-                                   depends = ['socketmodule.h']), )
-        else:
-            missing.append('_ssl')
-
-        # find out which version of OpenSSL we have
-        openssl_ver = 0
-        openssl_ver_re = re.compile(
-            '^\s*#\s*define\s+OPENSSL_VERSION_NUMBER\s+(0x[0-9a-fA-F]+)' )
-
-        # look for the openssl version header on the compiler search path.
-        opensslv_h = find_file('openssl/opensslv.h', [],
-                inc_dirs + search_for_ssl_incs_in)
-        if opensslv_h:
-            name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
-            if sys.platform == 'darwin' and is_macosx_sdk_path(name):
-                name = os.path.join(macosx_sdk_root(), name[1:])
-            try:
-                incfile = open(name, 'r')
-                for line in incfile:
-                    m = openssl_ver_re.match(line)
-                    if m:
-                        openssl_ver = eval(m.group(1))
-            except IOError, msg:
-                print "IOError while reading opensshv.h:", msg
-                pass
-
-        min_openssl_ver = 0x00907000
-        have_any_openssl = ssl_incs is not None and ssl_libs is not None
-        have_usable_openssl = (have_any_openssl and
-                               openssl_ver >= min_openssl_ver)
-
-        if have_any_openssl:
-            if have_usable_openssl:
-                # The _hashlib module wraps optimized implementations
-                # of hash functions from the OpenSSL library.
-                exts.append( Extension('_hashlib', ['_hashopenssl.c'],
-                                       include_dirs = ssl_incs,
-                                       library_dirs = ssl_libs,
-                                       libraries = ['ssl', 'crypto']) )
-            else:
-                print ("warning: openssl 0x%08x is too old for _hashlib" %
-                       openssl_ver)
-                missing.append('_hashlib')
-        if COMPILED_WITH_PYDEBUG or not have_usable_openssl:
-            # The _sha module implements the SHA1 hash algorithm.
-            exts.append( Extension('_sha', ['shamodule.c']) )
-            # The _md5 module implements the RSA Data Security, Inc. MD5
-            # Message-Digest Algorithm, described in RFC 1321.  The
-            # necessary files md5.c and md5.h are included here.
-            exts.append( Extension('_md5',
-                            sources = ['md5module.c', 'md5.c'],
-                            depends = ['md5.h']) )
-
-        min_sha2_openssl_ver = 0x00908000
-        if COMPILED_WITH_PYDEBUG or openssl_ver < min_sha2_openssl_ver:
-            # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash
-            exts.append( Extension('_sha256', ['sha256module.c']) )
-            exts.append( Extension('_sha512', ['sha512module.c']) )
-
-        # Modules that provide persistent dictionary-like semantics.  You will
-        # probably want to arrange for at least one of them to be available on
-        # your machine, though none are defined by default because of library
-        # dependencies.  The Python module anydbm.py provides an
-        # implementation independent wrapper for these; dumbdbm.py provides
-        # similar functionality (but slower of course) implemented in Python.
-
-        # Sleepycat^WOracle Berkeley DB interface.
-        #  http://www.oracle.com/database/berkeley-db/db/index.html
-        #
-        # This requires the Sleepycat^WOracle DB code. The supported versions
-        # are set below.  Visit the URL above to download
-        # a release.  Most open source OSes come with one or more
-        # versions of BerkeleyDB already installed.
-
-        max_db_ver = (4, 8)
-        min_db_ver = (4, 1)
-        db_setup_debug = False   # verbose debug prints from this script?
-
-        def allow_db_ver(db_ver):
-            """Returns a boolean if the given BerkeleyDB version is acceptable.
-
-            Args:
-              db_ver: A tuple of the version to verify.
-            """
-            if not (min_db_ver <= db_ver <= max_db_ver):
-                return False
-            # Use this function to filter out known bad configurations.
-            if (4, 6) == db_ver[:2]:
-                # BerkeleyDB 4.6.x is not stable on many architectures.
-                arch = platform_machine()
-                if arch not in ('i386', 'i486', 'i586', 'i686',
-                                'x86_64', 'ia64'):
-                    return False
-            return True
-
-        def gen_db_minor_ver_nums(major):
-            if major == 4:
-                for x in range(max_db_ver[1]+1):
-                    if allow_db_ver((4, x)):
-                        yield x
-            elif major == 3:
-                for x in (3,):
-                    if allow_db_ver((3, x)):
-                        yield x
-            else:
-                raise ValueError("unknown major BerkeleyDB version", major)
-
-        # construct a list of paths to look for the header file in on
-        # top of the normal inc_dirs.
-        db_inc_paths = [
-            '/usr/include/db4',
-            '/usr/local/include/db4',
-            '/opt/sfw/include/db4',
-            '/usr/include/db3',
-            '/usr/local/include/db3',
-            '/opt/sfw/include/db3',
-            # Fink defaults (http://fink.sourceforge.net/)
-            '/sw/include/db4',
-            '/sw/include/db3',
-        ]
-        # 4.x minor number specific paths
-        for x in gen_db_minor_ver_nums(4):
-            db_inc_paths.append('/usr/include/db4%d' % x)
-            db_inc_paths.append('/usr/include/db4.%d' % x)
-            db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
-            db_inc_paths.append('/usr/local/include/db4%d' % x)
-            db_inc_paths.append('/pkg/db-4.%d/include' % x)
-            db_inc_paths.append('/opt/db-4.%d/include' % x)
-            # MacPorts default (http://www.macports.org/)
-            db_inc_paths.append('/opt/local/include/db4%d' % x)
-        # 3.x minor number specific paths
-        for x in gen_db_minor_ver_nums(3):
-            db_inc_paths.append('/usr/include/db3%d' % x)
-            db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x)
-            db_inc_paths.append('/usr/local/include/db3%d' % x)
-            db_inc_paths.append('/pkg/db-3.%d/include' % x)
-            db_inc_paths.append('/opt/db-3.%d/include' % x)
-
-        # Add some common subdirectories for Sleepycat DB to the list,
-        # based on the standard include directories. This way DB3/4 gets
-        # picked up when it is installed in a non-standard prefix and
-        # the user has added that prefix into inc_dirs.
-        std_variants = []
-        for dn in inc_dirs:
-            std_variants.append(os.path.join(dn, 'db3'))
-            std_variants.append(os.path.join(dn, 'db4'))
-            for x in gen_db_minor_ver_nums(4):
-                std_variants.append(os.path.join(dn, "db4%d"%x))
-                std_variants.append(os.path.join(dn, "db4.%d"%x))
-            for x in gen_db_minor_ver_nums(3):
-                std_variants.append(os.path.join(dn, "db3%d"%x))
-                std_variants.append(os.path.join(dn, "db3.%d"%x))
-
-        db_inc_paths = std_variants + db_inc_paths
-        db_inc_paths = [p for p in db_inc_paths if os.path.exists(p)]
-
-        db_ver_inc_map = {}
-
-        if sys.platform == 'darwin':
-            sysroot = macosx_sdk_root()
-
-        class db_found(Exception): pass
-        try:
-            # See whether there is a Sleepycat header in the standard
-            # search path.
-            for d in inc_dirs + db_inc_paths:
-                f = os.path.join(d, "db.h")
-
-                if sys.platform == 'darwin' and is_macosx_sdk_path(d):
-                    f = os.path.join(sysroot, d[1:], "db.h")
-
-                if db_setup_debug: print "db: looking for db.h in", f
-                if os.path.exists(f):
-                    f = open(f).read()
-                    m = re.search(r"#define\WDB_VERSION_MAJOR\W(\d+)", f)
-                    if m:
-                        db_major = int(m.group(1))
-                        m = re.search(r"#define\WDB_VERSION_MINOR\W(\d+)", f)
-                        db_minor = int(m.group(1))
-                        db_ver = (db_major, db_minor)
-
-                        # Avoid 4.6 prior to 4.6.21 due to a BerkeleyDB bug
-                        if db_ver == (4, 6):
-                            m = re.search(r"#define\WDB_VERSION_PATCH\W(\d+)", f)
-                            db_patch = int(m.group(1))
-                            if db_patch < 21:
-                                print "db.h:", db_ver, "patch", db_patch,
-                                print "being ignored (4.6.x must be >= 4.6.21)"
-                                continue
-
-                        if ( (db_ver not in db_ver_inc_map) and
-                            allow_db_ver(db_ver) ):
-                            # save the include directory with the db.h version
-                            # (first occurrence only)
-                            db_ver_inc_map[db_ver] = d
-                            if db_setup_debug:
-                                print "db.h: found", db_ver, "in", d
-                        else:
-                            # we already found a header for this library version
-                            if db_setup_debug: print "db.h: ignoring", d
-                    else:
-                        # ignore this header, it didn't contain a version number
-                        if db_setup_debug:
-                            print "db.h: no version number version in", d
-
-            db_found_vers = db_ver_inc_map.keys()
-            db_found_vers.sort()
-
-            while db_found_vers:
-                db_ver = db_found_vers.pop()
-                db_incdir = db_ver_inc_map[db_ver]
-
-                # check lib directories parallel to the location of the header
-                db_dirs_to_check = [
-                    db_incdir.replace("include", 'lib64'),
-                    db_incdir.replace("include", 'lib'),
-                    db_incdir.replace("include", 'lib/x86_64-linux-gnu')
-                ]
-
-                if sys.platform != 'darwin':
-                    db_dirs_to_check = filter(os.path.isdir, db_dirs_to_check)
-
-                else:
-                    # Same as other branch, but takes OSX SDK into account
-                    tmp = []
-                    for dn in db_dirs_to_check:
-                        if is_macosx_sdk_path(dn):
-                            if os.path.isdir(os.path.join(sysroot, dn[1:])):
-                                tmp.append(dn)
-                        else:
-                            if os.path.isdir(dn):
-                                tmp.append(dn)
-                    db_dirs_to_check = tmp
-
-                # Look for a version specific db-X.Y before an ambiguous dbX
-                # XXX should we -ever- look for a dbX name?  Do any
-                # systems really not name their library by version and
-                # symlink to more general names?
-                for dblib in (('db-%d.%d' % db_ver),
-                              ('db%d%d' % db_ver),
-                              ('db%d' % db_ver[0])):
-                    dblib_file = self.compiler.find_library_file(
-                                    db_dirs_to_check + lib_dirs, dblib )
-                    if dblib_file:
-                        dblib_dir = [ os.path.abspath(os.path.dirname(dblib_file)) ]
-                        raise db_found
-                    else:
-                        if db_setup_debug: print "db lib: ", dblib, "not found"
-
-        except db_found:
-            if db_setup_debug:
-                print "bsddb using BerkeleyDB lib:", db_ver, dblib
-                print "bsddb lib dir:", dblib_dir, " inc dir:", db_incdir
-            db_incs = [db_incdir]
-            dblibs = [dblib]
-            # We add the runtime_library_dirs argument because the
-            # BerkeleyDB lib we're linking against often isn't in the
-            # system dynamic library search path.  This is usually
-            # correct and most trouble free, but may cause problems in
-            # some unusual system configurations (e.g. the directory
-            # is on an NFS server that goes away).
-            exts.append(Extension('_bsddb', ['_bsddb.c'],
-                                  depends = ['bsddb.h'],
-                                  library_dirs=dblib_dir,
-                                  runtime_library_dirs=dblib_dir,
-                                  include_dirs=db_incs,
-                                  libraries=dblibs))
-        else:
-            if db_setup_debug: print "db: no appropriate library found"
-            db_incs = None
-            dblibs = []
-            dblib_dir = None
-            missing.append('_bsddb')
-
-        # The sqlite interface
-        sqlite_setup_debug = False   # verbose debug prints from this script?
-
-        # We hunt for #define SQLITE_VERSION "n.n.n"
-        # We need to find >= sqlite version 3.0.8
-        sqlite_incdir = sqlite_libdir = None
-        sqlite_inc_paths = [ '/usr/include',
-                             '/usr/include/sqlite',
-                             '/usr/include/sqlite3',
-                             '/usr/local/include',
-                             '/usr/local/include/sqlite',
-                             '/usr/local/include/sqlite3',
-                           ]
-        MIN_SQLITE_VERSION_NUMBER = (3, 0, 8)
-        MIN_SQLITE_VERSION = ".".join([str(x)
-                                    for x in MIN_SQLITE_VERSION_NUMBER])
-
-        # Scan the default include directories before the SQLite specific
-        # ones. This allows one to override the copy of sqlite on OSX,
-        # where /usr/include contains an old version of sqlite.
-        if sys.platform == 'darwin':
-            sysroot = macosx_sdk_root()
-
-        for d in inc_dirs + sqlite_inc_paths:
-            f = os.path.join(d, "sqlite3.h")
-
-            if sys.platform == 'darwin' and is_macosx_sdk_path(d):
-                f = os.path.join(sysroot, d[1:], "sqlite3.h")
-
-            if os.path.exists(f):
-                if sqlite_setup_debug: print "sqlite: found %s"%f
-                incf = open(f).read()
-                m = re.search(
-                    r'\s*.*#\s*.*define\s.*SQLITE_VERSION\W*"(.*)"', incf)
-                if m:
-                    sqlite_version = m.group(1)
-                    sqlite_version_tuple = tuple([int(x)
-                                        for x in sqlite_version.split(".")])
-                    if sqlite_version_tuple >= MIN_SQLITE_VERSION_NUMBER:
-                        # we win!
-                        if sqlite_setup_debug:
-                            print "%s/sqlite3.h: version %s"%(d, sqlite_version)
-                        sqlite_incdir = d
-                        break
-                    else:
-                        if sqlite_setup_debug:
-                            print "%s: version %d is too old, need >= %s"%(d,
-                                        sqlite_version, MIN_SQLITE_VERSION)
-                elif sqlite_setup_debug:
-                    print "sqlite: %s had no SQLITE_VERSION"%(f,)
-
-        if sqlite_incdir:
-            sqlite_dirs_to_check = [
-                os.path.join(sqlite_incdir, '..', 'lib64'),
-                os.path.join(sqlite_incdir, '..', 'lib'),
-                os.path.join(sqlite_incdir, '..', 'lib/x86_64-linux-gnu'),
-                os.path.join(sqlite_incdir, '..', '..', 'lib64'),
-                os.path.join(sqlite_incdir, '..', '..', 'lib'),
-            ]
-            sqlite_libfile = self.compiler.find_library_file(
-                                sqlite_dirs_to_check + lib_dirs, 'sqlite3')
-            if sqlite_libfile:
-                sqlite_libdir = [os.path.abspath(os.path.dirname(sqlite_libfile))]
-
-        if sqlite_incdir and sqlite_libdir:
-            sqlite_srcs = ['_sqlite/cache.c',
-                '_sqlite/connection.c',
-                '_sqlite/cursor.c',
-                '_sqlite/microprotocols.c',
-                '_sqlite/module.c',
-                '_sqlite/prepare_protocol.c',
-                '_sqlite/row.c',
-                '_sqlite/statement.c',
-                '_sqlite/util.c', ]
-
-            sqlite_defines = []
-            if sys.platform != "win32":
-                sqlite_defines.append(('MODULE_NAME', '"sqlite3"'))
-            else:
-                sqlite_defines.append(('MODULE_NAME', '\\"sqlite3\\"'))
-
-            # Comment this out if you want the sqlite3 module to be able to load extensions.
-            sqlite_defines.append(("SQLITE_OMIT_LOAD_EXTENSION", "1"))
-
-            if sys.platform == 'darwin':
-                # In every directory on the search path search for a dynamic
-                # library and then a static library, instead of first looking
-                # for dynamic libraries on the entire path.
-                # This way a statically linked custom sqlite gets picked up
-                # before the dynamic library in /usr/lib.
-                sqlite_extra_link_args = ('-Wl,-search_paths_first',)
-            else:
-                sqlite_extra_link_args = ()
-
-            exts.append(Extension('_sqlite3', sqlite_srcs,
-                                  define_macros=sqlite_defines,
-                                  include_dirs=["Modules/_sqlite",
-                                                sqlite_incdir],
-                                  library_dirs=sqlite_libdir,
-                                  runtime_library_dirs=sqlite_libdir,
-                                  extra_link_args=sqlite_extra_link_args,
-                                  libraries=["sqlite3",]))
-        else:
-            missing.append('_sqlite3')
-
-        # Look for Berkeley db 1.85.   Note that it is built as a different
-        # module name so it can be included even when later versions are
-        # available.  A very restrictive search is performed to avoid
-        # accidentally building this module with a later version of the
-        # underlying db library.  May BSD-ish Unixes incorporate db 1.85
-        # symbols into libc and place the include file in /usr/include.
-        #
-        # If the better bsddb library can be built (db_incs is defined)
-        # we do not build this one.  Otherwise this build will pick up
-        # the more recent berkeleydb's db.h file first in the include path
-        # when attempting to compile and it will fail.
-        f = "/usr/include/db.h"
-
-        if sys.platform == 'darwin':
-            if is_macosx_sdk_path(f):
-                sysroot = macosx_sdk_root()
-                f = os.path.join(sysroot, f[1:])
-
-        if os.path.exists(f) and not db_incs:
-            data = open(f).read()
-            m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
-            if m is not None:
-                # bingo - old version used hash file format version 2
-                ### XXX this should be fixed to not be platform-dependent
-                ### but I don't have direct access to an osf1 platform and
-                ### seemed to be muffing the search somehow
-                libraries = platform == "osf1" and ['db'] or None
-                if libraries is not None:
-                    exts.append(Extension('bsddb185', ['bsddbmodule.c'],
-                                          libraries=libraries))
-                else:
-                    exts.append(Extension('bsddb185', ['bsddbmodule.c']))
-            else:
-                missing.append('bsddb185')
-        else:
-            missing.append('bsddb185')
-
-        dbm_order = ['gdbm']
-        # The standard Unix dbm module:
-        if platform not in ['cygwin']:
-            config_args = [arg.strip("'")
-                           for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
-            dbm_args = [arg for arg in config_args
-                        if arg.startswith('--with-dbmliborder=')]
-            if dbm_args:
-                dbm_order = [arg.split('=')[-1] for arg in dbm_args][-1].split(":")
-            else:
-                dbm_order = "ndbm:gdbm:bdb".split(":")
-            dbmext = None
-            for cand in dbm_order:
-                if cand == "ndbm":
-                    if find_file("ndbm.h", inc_dirs, []) is not None:
-                        # Some systems have -lndbm, others don't
-                        if self.compiler.find_library_file(lib_dirs,
-                                                               'ndbm'):
-                            ndbm_libs = ['ndbm']
-                        else:
-                            ndbm_libs = []
-                        print "building dbm using ndbm"
-                        dbmext = Extension('dbm', ['dbmmodule.c'],
-                                           define_macros=[
-                                               ('HAVE_NDBM_H',None),
-                                               ],
-                                           libraries=ndbm_libs)
-                        break
-
-                elif cand == "gdbm":
-                    if self.compiler.find_library_file(lib_dirs, 'gdbm'):
-                        gdbm_libs = ['gdbm']
-                        if self.compiler.find_library_file(lib_dirs,
-                                                               'gdbm_compat'):
-                            gdbm_libs.append('gdbm_compat')
-                        if find_file("gdbm/ndbm.h", inc_dirs, []) is not None:
-                            print "building dbm using gdbm"
-                            dbmext = Extension(
-                                'dbm', ['dbmmodule.c'],
-                                define_macros=[
-                                    ('HAVE_GDBM_NDBM_H', None),
-                                    ],
-                                libraries = gdbm_libs)
-                            break
-                        if find_file("gdbm-ndbm.h", inc_dirs, []) is not None:
-                            print "building dbm using gdbm"
-                            dbmext = Extension(
-                                'dbm', ['dbmmodule.c'],
-                                define_macros=[
-                                    ('HAVE_GDBM_DASH_NDBM_H', None),
-                                    ],
-                                libraries = gdbm_libs)
-                            break
-                elif cand == "bdb":
-                    if db_incs is not None:
-                        print "building dbm using bdb"
-                        dbmext = Extension('dbm', ['dbmmodule.c'],
-                                           library_dirs=dblib_dir,
-                                           runtime_library_dirs=dblib_dir,
-                                           include_dirs=db_incs,
-                                           define_macros=[
-                                               ('HAVE_BERKDB_H', None),
-                                               ('DB_DBM_HSEARCH', None),
-                                               ],
-                                           libraries=dblibs)
-                        break
-            if dbmext is not None:
-                exts.append(dbmext)
-            else:
-                missing.append('dbm')
-
-        # Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
-        if ('gdbm' in dbm_order and
-            self.compiler.find_library_file(lib_dirs, 'gdbm')):
-            exts.append( Extension('gdbm', ['gdbmmodule.c'],
-                                   libraries = ['gdbm'] ) )
-        else:
-            missing.append('gdbm')
-
-        # Unix-only modules
-        if platform not in ['win32']:
-            # Steen Lumholt's termios module
-            exts.append( Extension('termios', ['termios.c']) )
-            # Jeremy Hylton's rlimit interface
-            if platform not in ['atheos']:
-                exts.append( Extension('resource', ['resource.c']) )
-            else:
-                missing.append('resource')
-
-            # Sun yellow pages. Some systems have the functions in libc.
-            if (platform not in ['cygwin', 'atheos', 'qnx6'] and
-                find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None):
-                if (self.compiler.find_library_file(lib_dirs, 'nsl')):
-                    libs = ['nsl']
-                else:
-                    libs = []
-                exts.append( Extension('nis', ['nismodule.c'],
-                                       libraries = libs) )
-            else:
-                missing.append('nis')
-        else:
-            missing.extend(['nis', 'resource', 'termios'])
-
-        # Curses support, requiring the System V version of curses, often
-        # provided by the ncurses library.
-        panel_library = 'panel'
-        if curses_library.startswith('ncurses'):
-            if curses_library == 'ncursesw':
-                # Bug 1464056: If _curses.so links with ncursesw,
-                # _curses_panel.so must link with panelw.
-                panel_library = 'panelw'
-            curses_libs = [curses_library]
-            exts.append( Extension('_curses', ['_cursesmodule.c'],
-                                   libraries = curses_libs) )
-        elif curses_library == 'curses' and platform != 'darwin':
-                # OSX has an old Berkeley curses, not good enough for
-                # the _curses module.
-            if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
-                curses_libs = ['curses', 'terminfo']
-            elif (self.compiler.find_library_file(lib_dirs, 'termcap')):
-                curses_libs = ['curses', 'termcap']
-            else:
-                curses_libs = ['curses']
-
-            exts.append( Extension('_curses', ['_cursesmodule.c'],
-                                   libraries = curses_libs) )
-        else:
-            missing.append('_curses')
-
-        # If the curses module is enabled, check for the panel module
-        if (module_enabled(exts, '_curses') and
-            self.compiler.find_library_file(lib_dirs, panel_library)):
-            exts.append( Extension('_curses_panel', ['_curses_panel.c'],
-                                   libraries = [panel_library] + curses_libs) )
-        else:
-            missing.append('_curses_panel')
-
-        # Andrew Kuchling's zlib module.  Note that some versions of zlib
-        # 1.1.3 have security problems.  See CERT Advisory CA-2002-07:
-        # http://www.cert.org/advisories/CA-2002-07.html
-        #
-        # zlib 1.1.4 is fixed, but at least one vendor (RedHat) has decided to
-        # patch its zlib 1.1.3 package instead of upgrading to 1.1.4.  For
-        # now, we still accept 1.1.3, because we think it's difficult to
-        # exploit this in Python, and we'd rather make it RedHat's problem
-        # than our problem <wink>.
-        #
-        # You can upgrade zlib to version 1.1.4 yourself by going to
-        # http://www.gzip.org/zlib/
-        zlib_inc = find_file('zlib.h', [], inc_dirs)
-        have_zlib = False
-        if zlib_inc is not None:
-            zlib_h = zlib_inc[0] + '/zlib.h'
-            version = '"0.0.0"'
-            version_req = '"1.1.3"'
-            fp = open(zlib_h)
-            while 1:
-                line = fp.readline()
-                if not line:
-                    break
-                if line.startswith('#define ZLIB_VERSION'):
-                    version = line.split()[2]
-                    break
-            if version >= version_req:
-                if (self.compiler.find_library_file(lib_dirs, 'z')):
-                    if sys.platform == "darwin":
-                        zlib_extra_link_args = ('-Wl,-search_paths_first',)
-                    else:
-                        zlib_extra_link_args = ()
-                    exts.append( Extension('zlib', ['zlibmodule.c'],
-                                           libraries = ['z'],
-                                           extra_link_args = zlib_extra_link_args))
-                    have_zlib = True
-                else:
-                    missing.append('zlib')
-            else:
-                missing.append('zlib')
-        else:
-            missing.append('zlib')
-
-        # Helper module for various ascii-encoders.  Uses zlib for an optimized
-        # crc32 if we have it.  Otherwise binascii uses its own.
-        if have_zlib:
-            extra_compile_args = ['-DUSE_ZLIB_CRC32']
-            libraries = ['z']
-            extra_link_args = zlib_extra_link_args
-        else:
-            extra_compile_args = []
-            libraries = []
-            extra_link_args = []
-        exts.append( Extension('binascii', ['binascii.c'],
-                               extra_compile_args = extra_compile_args,
-                               libraries = libraries,
-                               extra_link_args = extra_link_args) )
-
-        # Gustavo Niemeyer's bz2 module.
-        if (self.compiler.find_library_file(lib_dirs, 'bz2')):
-            if sys.platform == "darwin":
-                bz2_extra_link_args = ('-Wl,-search_paths_first',)
-            else:
-                bz2_extra_link_args = ()
-            exts.append( Extension('bz2', ['bz2module.c'],
-                                   libraries = ['bz2'],
-                                   extra_link_args = bz2_extra_link_args) )
-        else:
-            missing.append('bz2')
-
-        # Interface to the Expat XML parser
-        #
-        # Expat was written by James Clark and is now maintained by a group of
-        # developers on SourceForge; see www.libexpat.org for more information.
-        # The pyexpat module was written by Paul Prescod after a prototype by
-        # Jack Jansen.  The Expat source is included in Modules/expat/.  Usage
-        # of a system shared libexpat.so is possible with --with-system-expat
-        # configure option.
-        #
-        # More information on Expat can be found at www.libexpat.org.
-        #
-        if '--with-system-expat' in sysconfig.get_config_var("CONFIG_ARGS"):
-            expat_inc = []
-            define_macros = []
-            expat_lib = ['expat']
-            expat_sources = []
-        else:
-            expat_inc = [os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')]
-            define_macros = [
-                ('HAVE_EXPAT_CONFIG_H', '1'),
-            ]
-            expat_lib = []
-            expat_sources = ['expat/xmlparse.c',
-                             'expat/xmlrole.c',
-                             'expat/xmltok.c']
-
-        exts.append(Extension('pyexpat',
-                              define_macros = define_macros,
-                              include_dirs = expat_inc,
-                              libraries = expat_lib,
-                              sources = ['pyexpat.c'] + expat_sources
-                              ))
-
-        # Fredrik Lundh's cElementTree module.  Note that this also
-        # uses expat (via the CAPI hook in pyexpat).
-
-        if os.path.isfile(os.path.join(srcdir, 'Modules', '_elementtree.c')):
-            define_macros.append(('USE_PYEXPAT_CAPI', None))
-            exts.append(Extension('_elementtree',
-                                  define_macros = define_macros,
-                                  include_dirs = expat_inc,
-                                  libraries = expat_lib,
-                                  sources = ['_elementtree.c'],
-                                  ))
-        else:
-            missing.append('_elementtree')
-
-        # Hye-Shik Chang's CJKCodecs modules.
-        if have_unicode:
-            exts.append(Extension('_multibytecodec',
-                                  ['cjkcodecs/multibytecodec.c']))
-            for loc in ('kr', 'jp', 'cn', 'tw', 'hk', 'iso2022'):
-                exts.append(Extension('_codecs_%s' % loc,
-                                      ['cjkcodecs/_codecs_%s.c' % loc]))
-        else:
-            missing.append('_multibytecodec')
-            for loc in ('kr', 'jp', 'cn', 'tw', 'hk', 'iso2022'):
-                missing.append('_codecs_%s' % loc)
-
-        # Dynamic loading module
-        if sys.maxint == 0x7fffffff:
-            # This requires sizeof(int) == sizeof(long) == sizeof(char*)
-            dl_inc = find_file('dlfcn.h', [], inc_dirs)
-            if (dl_inc is not None) and (platform not in ['atheos']):
-                exts.append( Extension('dl', ['dlmodule.c']) )
-            else:
-                missing.append('dl')
-        else:
-            missing.append('dl')
-
-        # Thomas Heller's _ctypes module
-        self.detect_ctypes(inc_dirs, lib_dirs)
-
-        # Richard Oudkerk's multiprocessing module
-        if platform == 'win32':             # Windows
-            macros = dict()
-            libraries = ['ws2_32']
-
-        elif platform == 'darwin':          # Mac OSX
-            macros = dict()
-            libraries = []
-
-        elif platform == 'cygwin':          # Cygwin
-            macros = dict()
-            libraries = []
-
-        elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
-            # FreeBSD's P1003.1b semaphore support is very experimental
-            # and has many known problems. (as of June 2008)
-            macros = dict()
-            libraries = []
-
-        elif platform.startswith('openbsd'):
-            macros = dict()
-            libraries = []
-
-        elif platform.startswith('netbsd'):
-            macros = dict()
-            libraries = []
-
-        else:                                   # Linux and other unices
-            macros = dict()
-            libraries = ['rt']
-
-        if platform == 'win32':
-            multiprocessing_srcs = [ '_multiprocessing/multiprocessing.c',
-                                     '_multiprocessing/semaphore.c',
-                                     '_multiprocessing/pipe_connection.c',
-                                     '_multiprocessing/socket_connection.c',
-                                     '_multiprocessing/win32_functions.c'
-                                   ]
-
-        else:
-            multiprocessing_srcs = [ '_multiprocessing/multiprocessing.c',
-                                     '_multiprocessing/socket_connection.c'
-                                   ]
-            if (sysconfig.get_config_var('HAVE_SEM_OPEN') and not
-                sysconfig.get_config_var('POSIX_SEMAPHORES_NOT_ENABLED')):
-                multiprocessing_srcs.append('_multiprocessing/semaphore.c')
-
-        if sysconfig.get_config_var('WITH_THREAD'):
-            exts.append ( Extension('_multiprocessing', multiprocessing_srcs,
-                                    define_macros=macros.items(),
-                                    include_dirs=["Modules/_multiprocessing"]))
-        else:
-            missing.append('_multiprocessing')
-
-        # End multiprocessing
-
-
-        # Platform-specific libraries
-        if platform == 'linux2':
-            # Linux-specific modules
-            exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) )
-        else:
-            missing.append('linuxaudiodev')
-
-        if (platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
-                        'freebsd7', 'freebsd8')
-            or platform.startswith("gnukfreebsd")):
-            exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
-        else:
-            missing.append('ossaudiodev')
-
-        if platform == 'sunos5':
-            # SunOS specific modules
-            exts.append( Extension('sunaudiodev', ['sunaudiodev.c']) )
-        else:
-            missing.append('sunaudiodev')
-
-        if platform == 'darwin':
-            # _scproxy
-            exts.append(Extension("_scproxy", [os.path.join(srcdir, "Mac/Modules/_scproxy.c")],
-                extra_link_args= [
-                    '-framework', 'SystemConfiguration',
-                    '-framework', 'CoreFoundation'
-                ]))
-
-
-        if platform == 'darwin' and ("--disable-toolbox-glue" not in
-                sysconfig.get_config_var("CONFIG_ARGS")):
-
-            if int(os.uname()[2].split('.')[0]) >= 8:
-                # We're on Mac OS X 10.4 or later, the compiler should
-                # support '-Wno-deprecated-declarations'. This will
-                # surpress deprecation warnings for the Carbon extensions,
-                # these extensions wrap the Carbon APIs and even those
-                # parts that are deprecated.
-                carbon_extra_compile_args = ['-Wno-deprecated-declarations']
-            else:
-                carbon_extra_compile_args = []
-
-            # Mac OS X specific modules.
-            def macSrcExists(name1, name2=''):
-                if not name1:
-                    return None
-                names = (name1,)
-                if name2:
-                    names = (name1, name2)
-                path = os.path.join(srcdir, 'Mac', 'Modules', *names)
-                return os.path.exists(path)
-
-            def addMacExtension(name, kwds, extra_srcs=[]):
-                dirname = ''
-                if name[0] == '_':
-                    dirname = name[1:].lower()
-                cname = name + '.c'
-                cmodulename = name + 'module.c'
-                # Check for NNN.c, NNNmodule.c, _nnn/NNN.c, _nnn/NNNmodule.c
-                if macSrcExists(cname):
-                    srcs = [cname]
-                elif macSrcExists(cmodulename):
-                    srcs = [cmodulename]
-                elif macSrcExists(dirname, cname):
-                    # XXX(nnorwitz): If all the names ended with module, we
-                    # wouldn't need this condition.  ibcarbon is the only one.
-                    srcs = [os.path.join(dirname, cname)]
-                elif macSrcExists(dirname, cmodulename):
-                    srcs = [os.path.join(dirname, cmodulename)]
-                else:
-                    raise RuntimeError("%s not found" % name)
-
-                # Here's the whole point:  add the extension with sources
-                exts.append(Extension(name, srcs + extra_srcs, **kwds))
-
-            # Core Foundation
-            core_kwds = {'extra_compile_args': carbon_extra_compile_args,
-                         'extra_link_args': ['-framework', 'CoreFoundation'],
-                        }
-            addMacExtension('_CF', core_kwds, ['cf/pycfbridge.c'])
-            addMacExtension('autoGIL', core_kwds)
-
-
-
-            # Carbon
-            carbon_kwds = {'extra_compile_args': carbon_extra_compile_args,
-                           'extra_link_args': ['-framework', 'Carbon'],
-                          }
-            CARBON_EXTS = ['ColorPicker', 'gestalt', 'MacOS', 'Nav',
-                           'OSATerminology', 'icglue',
-                           # All these are in subdirs
-                           '_AE', '_AH', '_App', '_CarbonEvt', '_Cm', '_Ctl',
-                           '_Dlg', '_Drag', '_Evt', '_File', '_Folder', '_Fm',
-                           '_Help', '_Icn', '_IBCarbon', '_List',
-                           '_Menu', '_Mlte', '_OSA', '_Res', '_Qd', '_Qdoffs',
-                           '_Scrap', '_Snd', '_TE',
-                          ]
-            for name in CARBON_EXTS:
-                addMacExtension(name, carbon_kwds)
-
-            # Workaround for a bug in the version of gcc shipped with Xcode 3.
-            # The _Win extension should build just like the other Carbon extensions, but
-            # this actually results in a hard crash of the linker.
-            #
-            if '-arch ppc64' in cflags and '-arch ppc' in cflags:
-                win_kwds = {'extra_compile_args': carbon_extra_compile_args + ['-arch', 'i386', '-arch', 'ppc'],
-                               'extra_link_args': ['-framework', 'Carbon', '-arch', 'i386', '-arch', 'ppc'],
-                           }
-                addMacExtension('_Win', win_kwds)
-            else:
-                addMacExtension('_Win', carbon_kwds)
-
-
-            # Application Services & QuickTime
-            app_kwds = {'extra_compile_args': carbon_extra_compile_args,
-                        'extra_link_args': ['-framework','ApplicationServices'],
-                       }
-            addMacExtension('_Launch', app_kwds)
-            addMacExtension('_CG', app_kwds)
-
-            exts.append( Extension('_Qt', ['qt/_Qtmodule.c'],
-                        extra_compile_args=carbon_extra_compile_args,
-                        extra_link_args=['-framework', 'QuickTime',
-                                     '-framework', 'Carbon']) )
-
-
-        self.extensions.extend(exts)
-
-        # Call the method for detecting whether _tkinter can be compiled
-        self.detect_tkinter(inc_dirs, lib_dirs)
-
-        if '_tkinter' not in [e.name for e in self.extensions]:
-            missing.append('_tkinter')
-
-        return missing
-
-    def detect_tkinter_darwin(self, inc_dirs, lib_dirs):
-        # The _tkinter module, using frameworks. Since frameworks are quite
-        # different the UNIX search logic is not sharable.
-        from os.path import join, exists
-        framework_dirs = [
-            '/Library/Frameworks',
-            '/System/Library/Frameworks/',
-            join(os.getenv('HOME'), '/Library/Frameworks')
-        ]
-
-        sysroot = macosx_sdk_root()
-
-        # Find the directory that contains the Tcl.framework and Tk.framework
-        # bundles.
-        # XXX distutils should support -F!
-        for F in framework_dirs:
-            # both Tcl.framework and Tk.framework should be present
-
-
-            for fw in 'Tcl', 'Tk':
-                if is_macosx_sdk_path(F):
-                    if not exists(join(sysroot, F[1:], fw + '.framework')):
-                        break
-                else:
-                    if not exists(join(F, fw + '.framework')):
-                        break
-            else:
-                # ok, F is now directory with both frameworks. Continure
-                # building
-                break
-        else:
-            # Tk and Tcl frameworks not found. Normal "unix" tkinter search
-            # will now resume.
-            return 0
-
-        # For 8.4a2, we must add -I options that point inside the Tcl and Tk
-        # frameworks. In later release we should hopefully be able to pass
-        # the -F option to gcc, which specifies a framework lookup path.
-        #
-        include_dirs = [
-            join(F, fw + '.framework', H)
-            for fw in 'Tcl', 'Tk'
-            for H in 'Headers', 'Versions/Current/PrivateHeaders'
-        ]
-
-        # For 8.4a2, the X11 headers are not included. Rather than include a
-        # complicated search, this is a hard-coded path. It could bail out
-        # if X11 libs are not found...
-        include_dirs.append('/usr/X11R6/include')
-        frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
-
-        # All existing framework builds of Tcl/Tk don't support 64-bit
-        # architectures.
-        cflags = sysconfig.get_config_vars('CFLAGS')[0]
-        archs = re.findall('-arch\s+(\w+)', cflags)
-
-        if is_macosx_sdk_path(F):
-            fp = os.popen("file %s/Tk.framework/Tk | grep 'for architecture'"%(os.path.join(sysroot, F[1:]),))
-        else:
-            fp = os.popen("file %s/Tk.framework/Tk | grep 'for architecture'"%(F,))
-
-        detected_archs = []
-        for ln in fp:
-            a = ln.split()[-1]
-            if a in archs:
-                detected_archs.append(ln.split()[-1])
-        fp.close()
-
-        for a in detected_archs:
-            frameworks.append('-arch')
-            frameworks.append(a)
-
-        ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
-                        define_macros=[('WITH_APPINIT', 1)],
-                        include_dirs = include_dirs,
-                        libraries = [],
-                        extra_compile_args = frameworks[2:],
-                        extra_link_args = frameworks,
-                        )
-        self.extensions.append(ext)
-        return 1
-
-
-    def detect_tkinter(self, inc_dirs, lib_dirs):
-        # The _tkinter module.
-
-        # Rather than complicate the code below, detecting and building
-        # AquaTk is a separate method. Only one Tkinter will be built on
-        # Darwin - either AquaTk, if it is found, or X11 based Tk.
-        platform = self.get_platform()
-        ## PCMDI changes look for AQUA_CDAT env variable to decide
-        if os.environ.get("AQUA_CDAT","no")=="yes" :
-            if (platform == 'darwin' and
-                self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
-                return
-        ## End of pcmdi changes (we just added the if test
-
-        # Assume we haven't found any of the libraries or include files
-        # The versions with dots are used on Unix, and the versions without
-        # dots on Windows, for detection by cygwin.
-        tcllib = tklib = tcl_includes = tk_includes = None
-        for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83',
-                        '8.2', '82', '8.1', '81', '8.0', '80']:
-            tklib = self.compiler.find_library_file(lib_dirs,
-                                                        'tk' + version)
-            tcllib = self.compiler.find_library_file(lib_dirs,
-                                                         'tcl' + version)
-            if tklib and tcllib:
-                # Exit the loop when we've found the Tcl/Tk libraries
-                break
-
-        # Now check for the header files
-        if tklib and tcllib:
-            # Check for the include files on Debian and {Free,Open}BSD, where
-            # they're put in /usr/include/{tcl,tk}X.Y
-            dotversion = version
-            if '.' not in dotversion and "bsd" in sys.platform.lower():
-                # OpenBSD and FreeBSD use Tcl/Tk library names like libtcl83.a,
-                # but the include subdirs are named like .../include/tcl8.3.
-                dotversion = dotversion[:-1] + '.' + dotversion[-1]
-            tcl_include_sub = []
-            tk_include_sub = []
-            for dir in inc_dirs:
-                tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
-                tk_include_sub += [dir + os.sep + "tk" + dotversion]
-            tk_include_sub += tcl_include_sub
-            tcl_includes = find_file('tcl.h', inc_dirs, tcl_include_sub)
-            tk_includes = find_file('tk.h', inc_dirs, tk_include_sub)
-
-        if (tcllib is None or tklib is None or
-            tcl_includes is None or tk_includes is None):
-            self.announce("INFO: Can't locate Tcl/Tk libs and/or headers", 2)
-            return
-
-        # OK... everything seems to be present for Tcl/Tk.
-
-        include_dirs = [] ; libs = [] ; defs = [] ; added_lib_dirs = []
-        for dir in tcl_includes + tk_includes:
-            if dir not in include_dirs:
-                include_dirs.append(dir)
-
-        # Check for various platform-specific directories
-        if platform == 'sunos5':
-            include_dirs.append('/usr/openwin/include')
-            added_lib_dirs.append('/usr/openwin/lib')
-        elif os.path.exists('/usr/X11R6/include'):
-            include_dirs.append('/usr/X11R6/include')
-            added_lib_dirs.append('/usr/X11R6/lib64')
-            added_lib_dirs.append('/usr/X11R6/lib')
-        elif os.path.exists('/usr/X11R5/include'):
-            include_dirs.append('/usr/X11R5/include')
-            added_lib_dirs.append('/usr/X11R5/lib')
-        else:
-            # Assume default location for X11
-            include_dirs.append('/usr/X11/include')
-            added_lib_dirs.append('/usr/X11/lib')
-
-        # If Cygwin, then verify that X is installed before proceeding
-        if platform == 'cygwin':
-            x11_inc = find_file('X11/Xlib.h', [], include_dirs)
-            if x11_inc is None:
-                return
-
-        # Check for BLT extension
-        if self.compiler.find_library_file(lib_dirs + added_lib_dirs,
-                                               'BLT8.0'):
-            defs.append( ('WITH_BLT', 1) )
-            libs.append('BLT8.0')
-        elif self.compiler.find_library_file(lib_dirs + added_lib_dirs,
-                                                'BLT'):
-            defs.append( ('WITH_BLT', 1) )
-            libs.append('BLT')
-
-        # Add the Tcl/Tk libraries
-        libs.append('tk'+ version)
-        libs.append('tcl'+ version)
-
-        if platform in ['aix3', 'aix4']:
-            libs.append('ld')
-
-        # Finally, link with the X11 libraries (not appropriate on cygwin)
-        if platform != "cygwin":
-            libs.append('X11')
-
-        ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
-                        define_macros=[('WITH_APPINIT', 1)] + defs,
-                        include_dirs = include_dirs,
-                        libraries = libs,
-                        library_dirs = added_lib_dirs,
-                        )
-        self.extensions.append(ext)
-
-##         # Uncomment these lines if you want to play with xxmodule.c
-##         ext = Extension('xx', ['xxmodule.c'])
-##         self.extensions.append(ext)
-
-        # XXX handle these, but how to detect?
-        # *** Uncomment and edit for PIL (TkImaging) extension only:
-        #       -DWITH_PIL -I../Extensions/Imaging/libImaging  tkImaging.c \
-        # *** Uncomment and edit for TOGL extension only:
-        #       -DWITH_TOGL togl.c \
-        # *** Uncomment these for TOGL extension only:
-        #       -lGL -lGLU -lXext -lXmu \
-
-    def configure_ctypes_darwin(self, ext):
-        # Darwin (OS X) uses preconfigured files, in
-        # the Modules/_ctypes/libffi_osx directory.
-        srcdir = sysconfig.get_config_var('srcdir')
-        ffi_srcdir = os.path.abspath(os.path.join(srcdir, 'Modules',
-                                                  '_ctypes', 'libffi_osx'))
-        sources = [os.path.join(ffi_srcdir, p)
-                   for p in ['ffi.c',
-                             'x86/darwin64.S',
-                             'x86/x86-darwin.S',
-                             'x86/x86-ffi_darwin.c',
-                             'x86/x86-ffi64.c',
-                             'powerpc/ppc-darwin.S',
-                             'powerpc/ppc-darwin_closure.S',
-                             'powerpc/ppc-ffi_darwin.c',
-                             'powerpc/ppc64-darwin_closure.S',
-                             ]]
-
-        # Add .S (preprocessed assembly) to C compiler source extensions.
-        self.compiler.src_extensions.append('.S')
-
-        include_dirs = [os.path.join(ffi_srcdir, 'include'),
-                        os.path.join(ffi_srcdir, 'powerpc')]
-        ext.include_dirs.extend(include_dirs)
-        ext.sources.extend(sources)
-        return True
-
-    def configure_ctypes(self, ext):
-        if not self.use_system_libffi:
-            if sys.platform == 'darwin':
-                return self.configure_ctypes_darwin(ext)
-
-            srcdir = sysconfig.get_config_var('srcdir')
-            ffi_builddir = os.path.join(self.build_temp, 'libffi')
-            ffi_srcdir = os.path.abspath(os.path.join(srcdir, 'Modules',
-                                         '_ctypes', 'libffi'))
-            ffi_configfile = os.path.join(ffi_builddir, 'fficonfig.py')
-
-            from distutils.dep_util import newer_group
-
-            config_sources = [os.path.join(ffi_srcdir, fname)
-                              for fname in os.listdir(ffi_srcdir)
-                              if os.path.isfile(os.path.join(ffi_srcdir, fname))]
-            if self.force or newer_group(config_sources,
-                                         ffi_configfile):
-                from distutils.dir_util import mkpath
-                mkpath(ffi_builddir)
-                config_args = []
-
-                # Pass empty CFLAGS because we'll just append the resulting
-                # CFLAGS to Python's; -g or -O2 is to be avoided.
-                cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \
-                      % (ffi_builddir, ffi_srcdir, " ".join(config_args))
-
-                res = os.system(cmd)
-                if res or not os.path.exists(ffi_configfile):
-                    print "Failed to configure _ctypes module"
-                    return False
-
-            fficonfig = {}
-            with open(ffi_configfile) as f:
-                exec f in fficonfig
-
-            # Add .S (preprocessed assembly) to C compiler source extensions.
-            self.compiler.src_extensions.append('.S')
-
-            include_dirs = [os.path.join(ffi_builddir, 'include'),
-                            ffi_builddir,
-                            os.path.join(ffi_srcdir, 'src')]
-            extra_compile_args = fficonfig['ffi_cflags'].split()
-
-            ext.sources.extend(os.path.join(ffi_srcdir, f) for f in
-                               fficonfig['ffi_sources'])
-            ext.include_dirs.extend(include_dirs)
-            ext.extra_compile_args.extend(extra_compile_args)
-        return True
-
-    def detect_ctypes(self, inc_dirs, lib_dirs):
-        self.use_system_libffi = False
-        include_dirs = []
-        extra_compile_args = []
-        extra_link_args = []
-        sources = ['_ctypes/_ctypes.c',
-                   '_ctypes/callbacks.c',
-                   '_ctypes/callproc.c',
-                   '_ctypes/stgdict.c',
-                   '_ctypes/cfield.c']
-        depends = ['_ctypes/ctypes.h']
-
-        if sys.platform == 'darwin':
-            sources.append('_ctypes/malloc_closure.c')
-            sources.append('_ctypes/darwin/dlfcn_simple.c')
-            extra_compile_args.append('-DMACOSX')
-            include_dirs.append('_ctypes/darwin')
-# XXX Is this still needed?
-##            extra_link_args.extend(['-read_only_relocs', 'warning'])
-
-        elif sys.platform == 'sunos5':
-            # XXX This shouldn't be necessary; it appears that some
-            # of the assembler code is non-PIC (i.e. it has relocations
-            # when it shouldn't. The proper fix would be to rewrite
-            # the assembler code to be PIC.
-            # This only works with GCC; the Sun compiler likely refuses
-            # this option. If you want to compile ctypes with the Sun
-            # compiler, please research a proper solution, instead of
-            # finding some -z option for the Sun compiler.
-            extra_link_args.append('-mimpure-text')
-
-        elif sys.platform.startswith('hp-ux'):
-            extra_link_args.append('-fPIC')
-
-        ext = Extension('_ctypes',
-                        include_dirs=include_dirs,
-                        extra_compile_args=extra_compile_args,
-                        extra_link_args=extra_link_args,
-                        libraries=[],
-                        sources=sources,
-                        depends=depends)
-        ext_test = Extension('_ctypes_test',
-                             sources=['_ctypes/_ctypes_test.c'])
-        self.extensions.extend([ext, ext_test])
-
-        if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"):
-            return
-
-        if sys.platform == 'darwin':
-            # OS X 10.5 comes with libffi.dylib; the include files are
-            # in /usr/include/ffi
-            inc_dirs.append('/usr/include/ffi')
-
-        ffi_inc = [sysconfig.get_config_var("LIBFFI_INCLUDEDIR")]
-        if not ffi_inc or ffi_inc[0] == '':
-            ffi_inc = find_file('ffi.h', [], inc_dirs)
-        if ffi_inc is not None:
-            ffi_h = ffi_inc[0] + '/ffi.h'
-            fp = open(ffi_h)
-            while 1:
-                line = fp.readline()
-                if not line:
-                    ffi_inc = None
-                    break
-                if line.startswith('#define LIBFFI_H'):
-                    break
-        ffi_lib = None
-        if ffi_inc is not None:
-            for lib_name in ('ffi_convenience', 'ffi_pic', 'ffi'):
-                if (self.compiler.find_library_file(lib_dirs, lib_name)):
-                    ffi_lib = lib_name
-                    break
-
-        if ffi_inc and ffi_lib:
-            ext.include_dirs.extend(ffi_inc)
-            ext.libraries.append(ffi_lib)
-            self.use_system_libffi = True
-
-
-class PyBuildInstall(install):
-    # Suppress the warning about installation into the lib_dynload
-    # directory, which is not in sys.path when running Python during
-    # installation:
-    def initialize_options (self):
-        install.initialize_options(self)
-        self.warn_dir=0
-
-class PyBuildInstallLib(install_lib):
-    # Do exactly what install_lib does but make sure correct access modes get
-    # set on installed directories and files. All installed files with get
-    # mode 644 unless they are a shared library in which case they will get
-    # mode 755. All installed directories will get mode 755.
-
-    so_ext = sysconfig.get_config_var("SO")
-
-    def install(self):
-        outfiles = install_lib.install(self)
-        self.set_file_modes(outfiles, 0644, 0755)
-        self.set_dir_modes(self.install_dir, 0755)
-        return outfiles
-
-    def set_file_modes(self, files, defaultMode, sharedLibMode):
-        if not self.is_chmod_supported(): return
-        if not files: return
-
-        for filename in files:
-            if os.path.islink(filename): continue
-            mode = defaultMode
-            if filename.endswith(self.so_ext): mode = sharedLibMode
-            log.info("changing mode of %s to %o", filename, mode)
-            if not self.dry_run: os.chmod(filename, mode)
-
-    def set_dir_modes(self, dirname, mode):
-        if not self.is_chmod_supported(): return
-        os.path.walk(dirname, self.set_dir_modes_visitor, mode)
-
-    def set_dir_modes_visitor(self, mode, dirname, names):
-        if os.path.islink(dirname): return
-        log.info("changing mode of %s to %o", dirname, mode)
-        if not self.dry_run: os.chmod(dirname, mode)
-
-    def is_chmod_supported(self):
-        return hasattr(os, 'chmod')
-
-SUMMARY = """
-Python is an interpreted, interactive, object-oriented programming
-language. It is often compared to Tcl, Perl, Scheme or Java.
-
-Python combines remarkable power with very clear syntax. It has
-modules, classes, exceptions, very high level dynamic data types, and
-dynamic typing. There are interfaces to many system calls and
-libraries, as well as to various windowing systems (X11, Motif, Tk,
-Mac, MFC). New built-in modules are easily written in C or C++. Python
-is also usable as an extension language for applications that need a
-programmable interface.
-
-The Python implementation is portable: it runs on many brands of UNIX,
-on Windows, DOS, OS/2, Mac, Amiga... If your favorite system isn't
-listed here, it may still be supported, if there's a C compiler for
-it. Ask around on comp.lang.python -- or just try compiling Python
-yourself.
-"""
-
-CLASSIFIERS = """
-Development Status :: 6 - Mature
-License :: OSI Approved :: Python Software Foundation License
-Natural Language :: English
-Programming Language :: C
-Programming Language :: Python
-Topic :: Software Development
-"""
-
-def main():
-    # turn off warnings when deprecated modules are imported
-    import warnings
-    warnings.filterwarnings("ignore",category=DeprecationWarning)
-    setup(# PyPI Metadata (PEP 301)
-          name = "Python",
-          version = sys.version.split()[0],
-          url = "http://www.python.org/%s" % sys.version[:3],
-          maintainer = "Guido van Rossum and the Python community",
-          maintainer_email = "python-dev@python.org",
-          description = "A high-level object-oriented programming language",
-          long_description = SUMMARY.strip(),
-          license = "PSF license",
-          classifiers = filter(None, CLASSIFIERS.split("\n")),
-          platforms = ["Many"],
-
-          # Build info
-          cmdclass = {'build_ext':PyBuildExt, 'install':PyBuildInstall,
-                      'install_lib':PyBuildInstallLib},
-          # The struct module is defined here, because build_ext won't be
-          # called unless there's at least one extension module defined.
-          ext_modules=[Extension('_struct', ['_struct.c'])],
-
-          # Scripts to install
-          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
-                     'Tools/scripts/2to3',
-                     'Lib/smtpd.py']
-        )
-
-# --install-platlib
-if __name__ == '__main__':
-    main()
diff --git a/pysrc/src/setup-2.7.3.py b/pysrc/src/setup-2.7.3.py
deleted file mode 100644
index 4026128eb..000000000
--- a/pysrc/src/setup-2.7.3.py
+++ /dev/null
@@ -1,2094 +0,0 @@
-# Autodetecting setup.py script for building the Python extensions
-#
-
-__version__ = "$Revision$"
-
-import sys, os, imp, re, optparse
-from glob import glob
-from platform import machine as platform_machine
-import sysconfig
-
-from distutils import log
-from distutils import text_file
-from distutils.errors import *
-from distutils.core import Extension, setup
-from distutils.command.build_ext import build_ext
-from distutils.command.install import install
-from distutils.command.install_lib import install_lib
-from distutils.spawn import find_executable
-
-# Were we compiled --with-pydebug or with #define Py_DEBUG?
-COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
-
-# This global variable is used to hold the list of modules to be disabled.
-disabled_module_list = []
-
-def add_dir_to_list(dirlist, dir):
-    """Add the directory 'dir' to the list 'dirlist' (at the front) if
-    1) 'dir' is not already in 'dirlist'
-    2) 'dir' actually exists, and is a directory."""
-    if dir is not None and os.path.isdir(dir) and dir not in dirlist:
-        dirlist.insert(0, dir)
-
-def macosx_sdk_root():
-    """
-    Return the directory of the current OSX SDK,
-    or '/' if no SDK was specified.
-    """
-    cflags = sysconfig.get_config_var('CFLAGS')
-    m = re.search(r'-isysroot\s+(\S+)', cflags)
-    if m is None:
-        sysroot = '/'
-    else:
-        sysroot = m.group(1)
-    return sysroot
-
-def is_macosx_sdk_path(path):
-    """
-    Returns True if 'path' can be located in an OSX SDK
-    """
-    return (path.startswith('/usr/') and not path.startswith('/usr/local')) or path.startswith('/System/')
-
-def find_file(filename, std_dirs, paths):
-    """Searches for the directory where a given file is located,
-    and returns a possibly-empty list of additional directories, or None
-    if the file couldn't be found at all.
-
-    'filename' is the name of a file, such as readline.h or libcrypto.a.
-    'std_dirs' is the list of standard system directories; if the
-        file is found in one of them, no additional directives are needed.
-    'paths' is a list of additional locations to check; if the file is
-        found in one of them, the resulting list will contain the directory.
-    """
-    if sys.platform == 'darwin':
-        # Honor the MacOSX SDK setting when one was specified.
-        # An SDK is a directory with the same structure as a real
-        # system, but with only header files and libraries.
-        sysroot = macosx_sdk_root()
-
-    # Check the standard locations
-    for dir in std_dirs:
-        f = os.path.join(dir, filename)
-
-        if sys.platform == 'darwin' and is_macosx_sdk_path(dir):
-            f = os.path.join(sysroot, dir[1:], filename)
-
-        if os.path.exists(f): return []
-
-    # Check the additional directories
-    for dir in paths:
-        f = os.path.join(dir, filename)
-
-        if sys.platform == 'darwin' and is_macosx_sdk_path(dir):
-            f = os.path.join(sysroot, dir[1:], filename)
-
-        if os.path.exists(f):
-            return [dir]
-
-    # Not found anywhere
-    return None
-
-def find_library_file(compiler, libname, std_dirs, paths):
-    result = compiler.find_library_file(std_dirs + paths, libname)
-    if result is None:
-        return None
-
-    if sys.platform == 'darwin':
-        sysroot = macosx_sdk_root()
-
-    # Check whether the found file is in one of the standard directories
-    dirname = os.path.dirname(result)
-    for p in std_dirs:
-        # Ensure path doesn't end with path separator
-        p = p.rstrip(os.sep)
-
-        if sys.platform == 'darwin' and is_macosx_sdk_path(p):
-            if os.path.join(sysroot, p[1:]) == dirname:
-                return [ ]
-
-        if p == dirname:
-            return [ ]
-
-    # Otherwise, it must have been in one of the additional directories,
-    # so we have to figure out which one.
-    for p in paths:
-        # Ensure path doesn't end with path separator
-        p = p.rstrip(os.sep)
-
-        if sys.platform == 'darwin' and is_macosx_sdk_path(p):
-            if os.path.join(sysroot, p[1:]) == dirname:
-                return [ p ]
-
-        if p == dirname:
-            return [p]
-    else:
-        assert False, "Internal error: Path not found in std_dirs or paths"
-
-def module_enabled(extlist, modname):
-    """Returns whether the module 'modname' is present in the list
-    of extensions 'extlist'."""
-    extlist = [ext for ext in extlist if ext.name == modname]
-    return len(extlist)
-
-def find_module_file(module, dirlist):
-    """Find a module in a set of possible folders. If it is not found
-    return the unadorned filename"""
-    list = find_file(module, [], dirlist)
-    if not list:
-        return module
-    if len(list) > 1:
-        log.info("WARNING: multiple copies of %s found"%module)
-    return os.path.join(list[0], module)
-
-class PyBuildExt(build_ext):
-
-    def __init__(self, dist):
-        build_ext.__init__(self, dist)
-        self.failed = []
-
-    def build_extensions(self):
-
-        # Detect which modules should be compiled
-        missing = self.detect_modules()
-
-        # Remove modules that are present on the disabled list
-        extensions = [ext for ext in self.extensions
-                      if ext.name not in disabled_module_list]
-        # move ctypes to the end, it depends on other modules
-        ext_map = dict((ext.name, i) for i, ext in enumerate(extensions))
-        if "_ctypes" in ext_map:
-            ctypes = extensions.pop(ext_map["_ctypes"])
-            extensions.append(ctypes)
-        self.extensions = extensions
-
-        # Fix up the autodetected modules, prefixing all the source files
-        # with Modules/ and adding Python's include directory to the path.
-        (srcdir,) = sysconfig.get_config_vars('srcdir')
-        if not srcdir:
-            # Maybe running on Windows but not using CYGWIN?
-            raise ValueError("No source directory; cannot proceed.")
-        srcdir = os.path.abspath(srcdir)
-        moddirlist = [os.path.join(srcdir, 'Modules')]
-
-        # Platform-dependent module source and include directories
-        incdirlist = []
-        platform = self.get_platform()
-        if platform == 'darwin' and ("--disable-toolbox-glue" not in
-            sysconfig.get_config_var("CONFIG_ARGS")):
-            # Mac OS X also includes some mac-specific modules
-            macmoddir = os.path.join(srcdir, 'Mac/Modules')
-            moddirlist.append(macmoddir)
-            incdirlist.append(os.path.join(srcdir, 'Mac/Include'))
-
-        # Fix up the paths for scripts, too
-        self.distribution.scripts = [os.path.join(srcdir, filename)
-                                     for filename in self.distribution.scripts]
-
-        # Python header files
-        headers = [sysconfig.get_config_h_filename()]
-        headers += glob(os.path.join(sysconfig.get_path('platinclude'), "*.h"))
-        for ext in self.extensions[:]:
-            ext.sources = [ find_module_file(filename, moddirlist)
-                            for filename in ext.sources ]
-            if ext.depends is not None:
-                ext.depends = [find_module_file(filename, moddirlist)
-                               for filename in ext.depends]
-            else:
-                ext.depends = []
-            # re-compile extensions if a header file has been changed
-            ext.depends.extend(headers)
-
-            # platform specific include directories
-            ext.include_dirs.extend(incdirlist)
-
-            # If a module has already been built statically,
-            # don't build it here
-            if ext.name in sys.builtin_module_names:
-                self.extensions.remove(ext)
-
-        # Parse Modules/Setup and Modules/Setup.local to figure out which
-        # modules are turned on in the file.
-        remove_modules = []
-        for filename in ('Modules/Setup', 'Modules/Setup.local'):
-            input = text_file.TextFile(filename, join_lines=1)
-            while 1:
-                line = input.readline()
-                if not line: break
-                line = line.split()
-                remove_modules.append(line[0])
-            input.close()
-
-        for ext in self.extensions[:]:
-            if ext.name in remove_modules:
-                self.extensions.remove(ext)
-
-        # When you run "make CC=altcc" or something similar, you really want
-        # those environment variables passed into the setup.py phase.  Here's
-        # a small set of useful ones.
-        compiler = os.environ.get('CC')
-        args = {}
-        # unfortunately, distutils doesn't let us provide separate C and C++
-        # compilers
-        if compiler is not None:
-            (ccshared,cflags) = sysconfig.get_config_vars('CCSHARED','CFLAGS')
-            args['compiler_so'] = compiler + ' ' + ccshared + ' ' + cflags
-        self.compiler.set_executables(**args)
-
-        build_ext.build_extensions(self)
-
-        longest = max([len(e.name) for e in self.extensions])
-        if self.failed:
-            longest = max(longest, max([len(name) for name in self.failed]))
-
-        def print_three_column(lst):
-            lst.sort(key=str.lower)
-            # guarantee zip() doesn't drop anything
-            while len(lst) % 3:
-                lst.append("")
-            for e, f, g in zip(lst[::3], lst[1::3], lst[2::3]):
-                print "%-*s   %-*s   %-*s" % (longest, e, longest, f,
-                                              longest, g)
-
-        if missing:
-            print
-            print ("Python build finished, but the necessary bits to build "
-                   "these modules were not found:")
-            print_three_column(missing)
-            print ("To find the necessary bits, look in setup.py in"
-                   " detect_modules() for the module's name.")
-            print
-
-        if self.failed:
-            failed = self.failed[:]
-            print
-            print "Failed to build these modules:"
-            print_three_column(failed)
-            print
-
-    def build_extension(self, ext):
-
-        if ext.name == '_ctypes':
-            if not self.configure_ctypes(ext):
-                return
-
-        try:
-            build_ext.build_extension(self, ext)
-        except (CCompilerError, DistutilsError), why:
-            self.announce('WARNING: building of extension "%s" failed: %s' %
-                          (ext.name, sys.exc_info()[1]))
-            self.failed.append(ext.name)
-            return
-        # Workaround for Mac OS X: The Carbon-based modules cannot be
-        # reliably imported into a command-line Python
-        if 'Carbon' in ext.extra_link_args:
-            self.announce(
-                'WARNING: skipping import check for Carbon-based "%s"' %
-                ext.name)
-            return
-
-        if self.get_platform() == 'darwin' and (
-                sys.maxint > 2**32 and '-arch' in ext.extra_link_args):
-            # Don't bother doing an import check when an extension was
-            # build with an explicit '-arch' flag on OSX. That's currently
-            # only used to build 32-bit only extensions in a 4-way
-            # universal build and loading 32-bit code into a 64-bit
-            # process will fail.
-            self.announce(
-                'WARNING: skipping import check for "%s"' %
-                ext.name)
-            return
-
-        # Workaround for Cygwin: Cygwin currently has fork issues when many
-        # modules have been imported
-        if self.get_platform() == 'cygwin':
-            self.announce('WARNING: skipping import check for Cygwin-based "%s"'
-                % ext.name)
-            return
-        ext_filename = os.path.join(
-            self.build_lib,
-            self.get_ext_filename(self.get_ext_fullname(ext.name)))
-        try:
-            imp.load_dynamic(ext.name, ext_filename)
-        except ImportError, why:
-            self.failed.append(ext.name)
-            self.announce('*** WARNING: renaming "%s" since importing it'
-                          ' failed: %s' % (ext.name, why), level=3)
-            assert not self.inplace
-            basename, tail = os.path.splitext(ext_filename)
-            newname = basename + "_failed" + tail
-            if os.path.exists(newname):
-                os.remove(newname)
-            os.rename(ext_filename, newname)
-
-            # XXX -- This relies on a Vile HACK in
-            # distutils.command.build_ext.build_extension().  The
-            # _built_objects attribute is stored there strictly for
-            # use here.
-            # If there is a failure, _built_objects may not be there,
-            # so catch the AttributeError and move on.
-            try:
-                for filename in self._built_objects:
-                    os.remove(filename)
-            except AttributeError:
-                self.announce('unable to remove files (ignored)')
-        except:
-            exc_type, why, tb = sys.exc_info()
-            self.announce('*** WARNING: importing extension "%s" '
-                          'failed with %s: %s' % (ext.name, exc_type, why),
-                          level=3)
-            self.failed.append(ext.name)
-
-    def get_platform(self):
-        # Get value of sys.platform
-        for platform in ['cygwin', 'beos', 'darwin', 'atheos', 'osf1']:
-            if sys.platform.startswith(platform):
-                return platform
-        return sys.platform
-
-    def add_multiarch_paths(self):
-        # Debian/Ubuntu multiarch support.
-        # https://wiki.ubuntu.com/MultiarchSpec
-        if not find_executable('dpkg-architecture'):
-            return
-        tmpfile = os.path.join(self.build_temp, 'multiarch')
-        if not os.path.exists(self.build_temp):
-            os.makedirs(self.build_temp)
-        ret = os.system(
-            'dpkg-architecture -qDEB_HOST_MULTIARCH > %s 2> /dev/null' %
-            tmpfile)
-        try:
-            if ret >> 8 == 0:
-                with open(tmpfile) as fp:
-                    multiarch_path_component = fp.readline().strip()
-                add_dir_to_list(self.compiler.library_dirs,
-                                '/usr/lib/' + multiarch_path_component)
-                add_dir_to_list(self.compiler.include_dirs,
-                                '/usr/include/' + multiarch_path_component)
-        finally:
-            os.unlink(tmpfile)
-
-    def detect_modules(self):
-	# PCMDI Change
-        # Ensure that place we put tcl/tk/netcdf etc. is always used
-        libbase = os.environ.get('EXTERNALS', os.path.join(sys.prefix,'..','Externals'))
-        mylibdir = os.path.join(libbase,'lib')
-        myincdir = os.path.join(libbase,'include')
-        add_dir_to_list(self.compiler.library_dirs, mylibdir)
-        add_dir_to_list(self.compiler.include_dirs, myincdir)
-        # end PCMDI change
-	# PCMDI Change
-        # Ensure that place we put tcl/tk/netcdf etc. is always used
-        libbase = os.environ.get('EXTERNALS', os.path.join(sys.prefix,'..','Externals'))
-        mylibdir = os.path.join(libbase,'lib')
-        myincdir = os.path.join(libbase,'include')
-        add_dir_to_list(self.compiler.library_dirs, mylibdir)
-        add_dir_to_list(self.compiler.include_dirs, myincdir)
-        # end PCMDI change
-        # Ensure that /usr/local is always used
-        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-        self.add_multiarch_paths()
-
-        # Add paths specified in the environment variables LDFLAGS and
-        # CPPFLAGS for header and library files.
-        # We must get the values from the Makefile and not the environment
-        # directly since an inconsistently reproducible issue comes up where
-        # the environment variable is not set even though the value were passed
-        # into configure and stored in the Makefile (issue found on OS X 10.3).
-        for env_var, arg_name, dir_list in (
-                ('LDFLAGS', '-R', self.compiler.runtime_library_dirs),
-                ('LDFLAGS', '-L', self.compiler.library_dirs),
-                ('CPPFLAGS', '-I', self.compiler.include_dirs)):
-            env_val = sysconfig.get_config_var(env_var)
-            if env_val:
-                # To prevent optparse from raising an exception about any
-                # options in env_val that it doesn't know about we strip out
-                # all double dashes and any dashes followed by a character
-                # that is not for the option we are dealing with.
-                #
-                # Please note that order of the regex is important!  We must
-                # strip out double-dashes first so that we don't end up with
-                # substituting "--Long" to "-Long" and thus lead to "ong" being
-                # used for a library directory.
-                env_val = re.sub(r'(^|\s+)-(-|(?!%s))' % arg_name[1],
-                                 ' ', env_val)
-                parser = optparse.OptionParser()
-                # Make sure that allowing args interspersed with options is
-                # allowed
-                parser.allow_interspersed_args = True
-                parser.error = lambda msg: None
-                parser.add_option(arg_name, dest="dirs", action="append")
-                options = parser.parse_args(env_val.split())[0]
-                if options.dirs:
-                    for directory in reversed(options.dirs):
-                        add_dir_to_list(dir_list, directory)
-
-        if os.path.normpath(sys.prefix) != '/usr' \
-                and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
-            # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
-            # (PYTHONFRAMEWORK is set) to avoid # linking problems when
-            # building a framework with different architectures than
-            # the one that is currently installed (issue #7473)
-            add_dir_to_list(self.compiler.library_dirs,
-                            sysconfig.get_config_var("LIBDIR"))
-            add_dir_to_list(self.compiler.include_dirs,
-                            sysconfig.get_config_var("INCLUDEDIR"))
-
-        try:
-            have_unicode = unicode
-        except NameError:
-            have_unicode = 0
-
-        # lib_dirs and inc_dirs are used to search for files;
-        # if a file is found in one of those directories, it can
-        # be assumed that no additional -I,-L directives are needed.
-        lib_dirs = self.compiler.library_dirs + [
-            '/lib64', '/usr/lib64',
-            '/lib', '/usr/lib', '/usr/lib/x86_64-linux-gnu',
-            ]
-        inc_dirs = self.compiler.include_dirs + ['/usr/include']
-        exts = []
-        missing = []
-
-        config_h = sysconfig.get_config_h_filename()
-        config_h_vars = sysconfig.parse_config_h(open(config_h))
-
-        platform = self.get_platform()
-        srcdir = sysconfig.get_config_var('srcdir')
-
-        # Check for AtheOS which has libraries in non-standard locations
-        if platform == 'atheos':
-            lib_dirs += ['/system/libs', '/atheos/autolnk/lib']
-            lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
-            inc_dirs += ['/system/include', '/atheos/autolnk/include']
-            inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
-
-        # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
-        if platform in ['osf1', 'unixware7', 'openunix8']:
-            lib_dirs += ['/usr/ccs/lib']
-
-        if platform == 'darwin':
-            # This should work on any unixy platform ;-)
-            # If the user has bothered specifying additional -I and -L flags
-            # in OPT and LDFLAGS we might as well use them here.
-            #   NOTE: using shlex.split would technically be more correct, but
-            # also gives a bootstrap problem. Let's hope nobody uses directories
-            # with whitespace in the name to store libraries.
-            cflags, ldflags = sysconfig.get_config_vars(
-                    'CFLAGS', 'LDFLAGS')
-            for item in cflags.split():
-                if item.startswith('-I'):
-                    inc_dirs.append(item[2:])
-
-            for item in ldflags.split():
-                if item.startswith('-L'):
-                    lib_dirs.append(item[2:])
-
-        # Check for MacOS X, which doesn't need libm.a at all
-        math_libs = ['m']
-        if platform in ['darwin', 'beos']:
-            math_libs = []
-
-        # XXX Omitted modules: gl, pure, dl, SGI-specific modules
-
-        #
-        # The following modules are all pretty straightforward, and compile
-        # on pretty much any POSIXish platform.
-        #
-
-        # Some modules that are normally always on:
-        #exts.append( Extension('_weakref', ['_weakref.c']) )
-
-        # array objects
-        exts.append( Extension('array', ['arraymodule.c']) )
-        # complex math library functions
-        exts.append( Extension('cmath', ['cmathmodule.c', '_math.c'],
-                               depends=['_math.h'],
-                               libraries=math_libs) )
-        # math library functions, e.g. sin()
-        exts.append( Extension('math',  ['mathmodule.c', '_math.c'],
-                               depends=['_math.h'],
-                               libraries=math_libs) )
-        # fast string operations implemented in C
-        exts.append( Extension('strop', ['stropmodule.c']) )
-        # time operations and variables
-        exts.append( Extension('time', ['timemodule.c'],
-                               libraries=math_libs) )
-        exts.append( Extension('datetime', ['datetimemodule.c', 'timemodule.c'],
-                               libraries=math_libs) )
-        # fast iterator tools implemented in C
-        exts.append( Extension("itertools", ["itertoolsmodule.c"]) )
-        # code that will be builtins in the future, but conflict with the
-        #  current builtins
-        exts.append( Extension('future_builtins', ['future_builtins.c']) )
-        # random number generator implemented in C
-        exts.append( Extension("_random", ["_randommodule.c"]) )
-        # high-performance collections
-        exts.append( Extension("_collections", ["_collectionsmodule.c"]) )
-        # bisect
-        exts.append( Extension("_bisect", ["_bisectmodule.c"]) )
-        # heapq
-        exts.append( Extension("_heapq", ["_heapqmodule.c"]) )
-        # operator.add() and similar goodies
-        exts.append( Extension('operator', ['operator.c']) )
-        # Python 3.1 _io library
-        exts.append( Extension("_io",
-            ["_io/bufferedio.c", "_io/bytesio.c", "_io/fileio.c",
-             "_io/iobase.c", "_io/_iomodule.c", "_io/stringio.c", "_io/textio.c"],
-             depends=["_io/_iomodule.h"], include_dirs=["Modules/_io"]))
-        # _functools
-        exts.append( Extension("_functools", ["_functoolsmodule.c"]) )
-        # _json speedups
-        exts.append( Extension("_json", ["_json.c"]) )
-        # Python C API test module
-        exts.append( Extension('_testcapi', ['_testcapimodule.c'],
-                               depends=['testcapi_long.h']) )
-        # profilers (_lsprof is for cProfile.py)
-        exts.append( Extension('_hotshot', ['_hotshot.c']) )
-        exts.append( Extension('_lsprof', ['_lsprof.c', 'rotatingtree.c']) )
-        # static Unicode character database
-        if have_unicode:
-            exts.append( Extension('unicodedata', ['unicodedata.c']) )
-        else:
-            missing.append('unicodedata')
-        # access to ISO C locale support
-        data = open('pyconfig.h').read()
-        m = re.search(r"#s*define\s+WITH_LIBINTL\s+1\s*", data)
-        if m is not None:
-            locale_libs = ['intl']
-        else:
-            locale_libs = []
-        if platform == 'darwin':
-            locale_extra_link_args = ['-framework', 'CoreFoundation']
-        else:
-            locale_extra_link_args = []
-
-
-        exts.append( Extension('_locale', ['_localemodule.c'],
-                               libraries=locale_libs,
-                               extra_link_args=locale_extra_link_args) )
-
-        # Modules with some UNIX dependencies -- on by default:
-        # (If you have a really backward UNIX, select and socket may not be
-        # supported...)
-
-        # fcntl(2) and ioctl(2)
-        libs = []
-        if (config_h_vars.get('FLOCK_NEEDS_LIBBSD', False)):
-            # May be necessary on AIX for flock function
-            libs = ['bsd']
-        exts.append( Extension('fcntl', ['fcntlmodule.c'], libraries=libs) )
-        # pwd(3)
-        exts.append( Extension('pwd', ['pwdmodule.c']) )
-        # grp(3)
-        exts.append( Extension('grp', ['grpmodule.c']) )
-        # spwd, shadow passwords
-        if (config_h_vars.get('HAVE_GETSPNAM', False) or
-                config_h_vars.get('HAVE_GETSPENT', False)):
-            exts.append( Extension('spwd', ['spwdmodule.c']) )
-        else:
-            missing.append('spwd')
-
-        # select(2); not on ancient System V
-        exts.append( Extension('select', ['selectmodule.c']) )
-
-        # Fred Drake's interface to the Python parser
-        exts.append( Extension('parser', ['parsermodule.c']) )
-
-        # cStringIO and cPickle
-        exts.append( Extension('cStringIO', ['cStringIO.c']) )
-        exts.append( Extension('cPickle', ['cPickle.c']) )
-
-        # Memory-mapped files (also works on Win32).
-        if platform not in ['atheos']:
-            exts.append( Extension('mmap', ['mmapmodule.c']) )
-        else:
-            missing.append('mmap')
-
-        # Lance Ellinghaus's syslog module
-        # syslog daemon interface
-        exts.append( Extension('syslog', ['syslogmodule.c']) )
-
-        # George Neville-Neil's timing module:
-        # Deprecated in PEP 4 http://www.python.org/peps/pep-0004.html
-        # http://mail.python.org/pipermail/python-dev/2006-January/060023.html
-        #exts.append( Extension('timing', ['timingmodule.c']) )
-
-        #
-        # Here ends the simple stuff.  From here on, modules need certain
-        # libraries, are platform-specific, or present other surprises.
-        #
-
-        # Multimedia modules
-        # These don't work for 64-bit platforms!!!
-        # These represent audio samples or images as strings:
-
-        # Operations on audio samples
-        # According to #993173, this one should actually work fine on
-        # 64-bit platforms.
-        exts.append( Extension('audioop', ['audioop.c']) )
-
-        # Disabled on 64-bit platforms
-        if sys.maxint != 9223372036854775807L:
-            # Operations on images
-            exts.append( Extension('imageop', ['imageop.c']) )
-        else:
-            missing.extend(['imageop'])
-
-        # readline
-        do_readline = self.compiler.find_library_file(lib_dirs, 'readline')
-        readline_termcap_library = ""
-        curses_library = ""
-        # Determine if readline is already linked against curses or tinfo.
-        if do_readline and find_executable('ldd'):
-            fp = os.popen("ldd %s" % do_readline)
-            ldd_output = fp.readlines()
-            ret = fp.close()
-            if ret is None or ret >> 8 == 0:
-                for ln in ldd_output:
-                    if 'curses' in ln:
-                        readline_termcap_library = re.sub(
-                            r'.*lib(n?cursesw?)\.so.*', r'\1', ln
-                        ).rstrip()
-                        break
-                    if 'tinfo' in ln: # termcap interface split out from ncurses
-                        readline_termcap_library = 'tinfo'
-                        break
-        # Issue 7384: If readline is already linked against curses,
-        # use the same library for the readline and curses modules.
-        if 'curses' in readline_termcap_library:
-            curses_library = readline_termcap_library
-        elif self.compiler.find_library_file(lib_dirs, 'ncursesw'):
-            curses_library = 'ncursesw'
-        elif self.compiler.find_library_file(lib_dirs, 'ncurses'):
-            curses_library = 'ncurses'
-        elif self.compiler.find_library_file(lib_dirs, 'curses'):
-            curses_library = 'curses'
-
-        if platform == 'darwin':
-            os_release = int(os.uname()[2].split('.')[0])
-            dep_target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
-            if dep_target and dep_target.split('.') < ['10', '5']:
-                os_release = 8
-            if os_release < 9:
-                # MacOSX 10.4 has a broken readline. Don't try to build
-                # the readline module unless the user has installed a fixed
-                # readline package
-                if find_file('readline/rlconf.h', inc_dirs, []) is None:
-                    do_readline = False
-        if do_readline:
-            if platform == 'darwin' and os_release < 9:
-                # In every directory on the search path search for a dynamic
-                # library and then a static library, instead of first looking
-                # for dynamic libraries on the entiry path.
-                # This way a staticly linked custom readline gets picked up
-                # before the (possibly broken) dynamic library in /usr/lib.
-                readline_extra_link_args = ('-Wl,-search_paths_first',)
-            else:
-                readline_extra_link_args = ()
-
-            readline_libs = ['readline']
-            if readline_termcap_library:
-                pass # Issue 7384: Already linked against curses or tinfo.
-            elif curses_library:
-                readline_libs.append(curses_library)
-            elif self.compiler.find_library_file(lib_dirs +
-                                                     ['/usr/lib/termcap'],
-                                                     'termcap'):
-                readline_libs.append('termcap')
-            exts.append( Extension('readline', ['readline.c'],
-                                   library_dirs=['/usr/lib/termcap'],
-                                   extra_link_args=readline_extra_link_args,
-                                   libraries=readline_libs) )
-        else:
-            missing.append('readline')
-
-        # crypt module.
-
-        if self.compiler.find_library_file(lib_dirs, 'crypt'):
-            libs = ['crypt']
-        else:
-            libs = []
-        exts.append( Extension('crypt', ['cryptmodule.c'], libraries=libs) )
-
-        # CSV files
-        exts.append( Extension('_csv', ['_csv.c']) )
-
-        # socket(2)
-        exts.append( Extension('_socket', ['socketmodule.c'],
-                               depends = ['socketmodule.h']) )
-        # Detect SSL support for the socket module (via _ssl)
-        search_for_ssl_incs_in = [
-                              '/usr/local/ssl/include',
-                              '/usr/contrib/ssl/include/'
-                             ]
-        ssl_incs = find_file('openssl/ssl.h', inc_dirs,
-                             search_for_ssl_incs_in
-                             )
-        if ssl_incs is not None:
-            krb5_h = find_file('krb5.h', inc_dirs,
-                               ['/usr/kerberos/include'])
-            if krb5_h:
-                ssl_incs += krb5_h
-        ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
-                                     ['/usr/local/ssl/lib',
-                                      '/usr/contrib/ssl/lib/'
-                                     ] )
-
-        if (ssl_incs is not None and
-            ssl_libs is not None):
-            exts.append( Extension('_ssl', ['_ssl.c'],
-                                   include_dirs = ssl_incs,
-                                   library_dirs = ssl_libs,
-                                   libraries = ['ssl', 'crypto'],
-                                   depends = ['socketmodule.h']), )
-        else:
-            missing.append('_ssl')
-
-        # find out which version of OpenSSL we have
-        openssl_ver = 0
-        openssl_ver_re = re.compile(
-            '^\s*#\s*define\s+OPENSSL_VERSION_NUMBER\s+(0x[0-9a-fA-F]+)' )
-
-        # look for the openssl version header on the compiler search path.
-        opensslv_h = find_file('openssl/opensslv.h', [],
-                inc_dirs + search_for_ssl_incs_in)
-        if opensslv_h:
-            name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
-            if sys.platform == 'darwin' and is_macosx_sdk_path(name):
-                name = os.path.join(macosx_sdk_root(), name[1:])
-            try:
-                incfile = open(name, 'r')
-                for line in incfile:
-                    m = openssl_ver_re.match(line)
-                    if m:
-                        openssl_ver = eval(m.group(1))
-            except IOError, msg:
-                print "IOError while reading opensshv.h:", msg
-                pass
-
-        min_openssl_ver = 0x00907000
-        have_any_openssl = ssl_incs is not None and ssl_libs is not None
-        have_usable_openssl = (have_any_openssl and
-                               openssl_ver >= min_openssl_ver)
-
-        if have_any_openssl:
-            if have_usable_openssl:
-                # The _hashlib module wraps optimized implementations
-                # of hash functions from the OpenSSL library.
-                exts.append( Extension('_hashlib', ['_hashopenssl.c'],
-                                       include_dirs = ssl_incs,
-                                       library_dirs = ssl_libs,
-                                       libraries = ['ssl', 'crypto']) )
-            else:
-                print ("warning: openssl 0x%08x is too old for _hashlib" %
-                       openssl_ver)
-                missing.append('_hashlib')
-        if COMPILED_WITH_PYDEBUG or not have_usable_openssl:
-            # The _sha module implements the SHA1 hash algorithm.
-            exts.append( Extension('_sha', ['shamodule.c']) )
-            # The _md5 module implements the RSA Data Security, Inc. MD5
-            # Message-Digest Algorithm, described in RFC 1321.  The
-            # necessary files md5.c and md5.h are included here.
-            exts.append( Extension('_md5',
-                            sources = ['md5module.c', 'md5.c'],
-                            depends = ['md5.h']) )
-
-        min_sha2_openssl_ver = 0x00908000
-        if COMPILED_WITH_PYDEBUG or openssl_ver < min_sha2_openssl_ver:
-            # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash
-            exts.append( Extension('_sha256', ['sha256module.c']) )
-            exts.append( Extension('_sha512', ['sha512module.c']) )
-
-        # Modules that provide persistent dictionary-like semantics.  You will
-        # probably want to arrange for at least one of them to be available on
-        # your machine, though none are defined by default because of library
-        # dependencies.  The Python module anydbm.py provides an
-        # implementation independent wrapper for these; dumbdbm.py provides
-        # similar functionality (but slower of course) implemented in Python.
-
-        # Sleepycat^WOracle Berkeley DB interface.
-        #  http://www.oracle.com/database/berkeley-db/db/index.html
-        #
-        # This requires the Sleepycat^WOracle DB code. The supported versions
-        # are set below.  Visit the URL above to download
-        # a release.  Most open source OSes come with one or more
-        # versions of BerkeleyDB already installed.
-
-        max_db_ver = (4, 8)
-        min_db_ver = (4, 1)
-        db_setup_debug = False   # verbose debug prints from this script?
-
-        def allow_db_ver(db_ver):
-            """Returns a boolean if the given BerkeleyDB version is acceptable.
-
-            Args:
-              db_ver: A tuple of the version to verify.
-            """
-            if not (min_db_ver <= db_ver <= max_db_ver):
-                return False
-            # Use this function to filter out known bad configurations.
-            if (4, 6) == db_ver[:2]:
-                # BerkeleyDB 4.6.x is not stable on many architectures.
-                arch = platform_machine()
-                if arch not in ('i386', 'i486', 'i586', 'i686',
-                                'x86_64', 'ia64'):
-                    return False
-            return True
-
-        def gen_db_minor_ver_nums(major):
-            if major == 4:
-                for x in range(max_db_ver[1]+1):
-                    if allow_db_ver((4, x)):
-                        yield x
-            elif major == 3:
-                for x in (3,):
-                    if allow_db_ver((3, x)):
-                        yield x
-            else:
-                raise ValueError("unknown major BerkeleyDB version", major)
-
-        # construct a list of paths to look for the header file in on
-        # top of the normal inc_dirs.
-        db_inc_paths = [
-            '/usr/include/db4',
-            '/usr/local/include/db4',
-            '/opt/sfw/include/db4',
-            '/usr/include/db3',
-            '/usr/local/include/db3',
-            '/opt/sfw/include/db3',
-            # Fink defaults (http://fink.sourceforge.net/)
-            '/sw/include/db4',
-            '/sw/include/db3',
-        ]
-        # 4.x minor number specific paths
-        for x in gen_db_minor_ver_nums(4):
-            db_inc_paths.append('/usr/include/db4%d' % x)
-            db_inc_paths.append('/usr/include/db4.%d' % x)
-            db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
-            db_inc_paths.append('/usr/local/include/db4%d' % x)
-            db_inc_paths.append('/pkg/db-4.%d/include' % x)
-            db_inc_paths.append('/opt/db-4.%d/include' % x)
-            # MacPorts default (http://www.macports.org/)
-            db_inc_paths.append('/opt/local/include/db4%d' % x)
-        # 3.x minor number specific paths
-        for x in gen_db_minor_ver_nums(3):
-            db_inc_paths.append('/usr/include/db3%d' % x)
-            db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x)
-            db_inc_paths.append('/usr/local/include/db3%d' % x)
-            db_inc_paths.append('/pkg/db-3.%d/include' % x)
-            db_inc_paths.append('/opt/db-3.%d/include' % x)
-
-        # Add some common subdirectories for Sleepycat DB to the list,
-        # based on the standard include directories. This way DB3/4 gets
-        # picked up when it is installed in a non-standard prefix and
-        # the user has added that prefix into inc_dirs.
-        std_variants = []
-        for dn in inc_dirs:
-            std_variants.append(os.path.join(dn, 'db3'))
-            std_variants.append(os.path.join(dn, 'db4'))
-            for x in gen_db_minor_ver_nums(4):
-                std_variants.append(os.path.join(dn, "db4%d"%x))
-                std_variants.append(os.path.join(dn, "db4.%d"%x))
-            for x in gen_db_minor_ver_nums(3):
-                std_variants.append(os.path.join(dn, "db3%d"%x))
-                std_variants.append(os.path.join(dn, "db3.%d"%x))
-
-        db_inc_paths = std_variants + db_inc_paths
-        db_inc_paths = [p for p in db_inc_paths if os.path.exists(p)]
-
-        db_ver_inc_map = {}
-
-        if sys.platform == 'darwin':
-            sysroot = macosx_sdk_root()
-
-        class db_found(Exception): pass
-        try:
-            # See whether there is a Sleepycat header in the standard
-            # search path.
-            for d in inc_dirs + db_inc_paths:
-                f = os.path.join(d, "db.h")
-
-                if sys.platform == 'darwin' and is_macosx_sdk_path(d):
-                    f = os.path.join(sysroot, d[1:], "db.h")
-
-                if db_setup_debug: print "db: looking for db.h in", f
-                if os.path.exists(f):
-                    f = open(f).read()
-                    m = re.search(r"#define\WDB_VERSION_MAJOR\W(\d+)", f)
-                    if m:
-                        db_major = int(m.group(1))
-                        m = re.search(r"#define\WDB_VERSION_MINOR\W(\d+)", f)
-                        db_minor = int(m.group(1))
-                        db_ver = (db_major, db_minor)
-
-                        # Avoid 4.6 prior to 4.6.21 due to a BerkeleyDB bug
-                        if db_ver == (4, 6):
-                            m = re.search(r"#define\WDB_VERSION_PATCH\W(\d+)", f)
-                            db_patch = int(m.group(1))
-                            if db_patch < 21:
-                                print "db.h:", db_ver, "patch", db_patch,
-                                print "being ignored (4.6.x must be >= 4.6.21)"
-                                continue
-
-                        if ( (db_ver not in db_ver_inc_map) and
-                            allow_db_ver(db_ver) ):
-                            # save the include directory with the db.h version
-                            # (first occurrence only)
-                            db_ver_inc_map[db_ver] = d
-                            if db_setup_debug:
-                                print "db.h: found", db_ver, "in", d
-                        else:
-                            # we already found a header for this library version
-                            if db_setup_debug: print "db.h: ignoring", d
-                    else:
-                        # ignore this header, it didn't contain a version number
-                        if db_setup_debug:
-                            print "db.h: no version number version in", d
-
-            db_found_vers = db_ver_inc_map.keys()
-            db_found_vers.sort()
-
-            while db_found_vers:
-                db_ver = db_found_vers.pop()
-                db_incdir = db_ver_inc_map[db_ver]
-
-                # check lib directories parallel to the location of the header
-                db_dirs_to_check = [
-                    db_incdir.replace("include", 'lib64'),
-                    db_incdir.replace("include", 'lib'),
-                    db_incdir.replace("include", 'lib/x86_64-linux-gnu')
-                ]
-
-                if sys.platform != 'darwin':
-                    db_dirs_to_check = filter(os.path.isdir, db_dirs_to_check)
-
-                else:
-                    # Same as other branch, but takes OSX SDK into account
-                    tmp = []
-                    for dn in db_dirs_to_check:
-                        if is_macosx_sdk_path(dn):
-                            if os.path.isdir(os.path.join(sysroot, dn[1:])):
-                                tmp.append(dn)
-                        else:
-                            if os.path.isdir(dn):
-                                tmp.append(dn)
-                    db_dirs_to_check = tmp
-
-                # Look for a version specific db-X.Y before an ambiguous dbX
-                # XXX should we -ever- look for a dbX name?  Do any
-                # systems really not name their library by version and
-                # symlink to more general names?
-                for dblib in (('db-%d.%d' % db_ver),
-                              ('db%d%d' % db_ver),
-                              ('db%d' % db_ver[0])):
-                    dblib_file = self.compiler.find_library_file(
-                                    db_dirs_to_check + lib_dirs, dblib )
-                    if dblib_file:
-                        dblib_dir = [ os.path.abspath(os.path.dirname(dblib_file)) ]
-                        raise db_found
-                    else:
-                        if db_setup_debug: print "db lib: ", dblib, "not found"
-
-        except db_found:
-            if db_setup_debug:
-                print "bsddb using BerkeleyDB lib:", db_ver, dblib
-                print "bsddb lib dir:", dblib_dir, " inc dir:", db_incdir
-            db_incs = [db_incdir]
-            dblibs = [dblib]
-            # We add the runtime_library_dirs argument because the
-            # BerkeleyDB lib we're linking against often isn't in the
-            # system dynamic library search path.  This is usually
-            # correct and most trouble free, but may cause problems in
-            # some unusual system configurations (e.g. the directory
-            # is on an NFS server that goes away).
-            exts.append(Extension('_bsddb', ['_bsddb.c'],
-                                  depends = ['bsddb.h'],
-                                  library_dirs=dblib_dir,
-                                  runtime_library_dirs=dblib_dir,
-                                  include_dirs=db_incs,
-                                  libraries=dblibs))
-        else:
-            if db_setup_debug: print "db: no appropriate library found"
-            db_incs = None
-            dblibs = []
-            dblib_dir = None
-            missing.append('_bsddb')
-
-        # The sqlite interface
-        sqlite_setup_debug = False   # verbose debug prints from this script?
-
-        # We hunt for #define SQLITE_VERSION "n.n.n"
-        # We need to find >= sqlite version 3.0.8
-        sqlite_incdir = sqlite_libdir = None
-        sqlite_inc_paths = [ '/usr/include',
-                             '/usr/include/sqlite',
-                             '/usr/include/sqlite3',
-                             '/usr/local/include',
-                             '/usr/local/include/sqlite',
-                             '/usr/local/include/sqlite3',
-                           ]
-        MIN_SQLITE_VERSION_NUMBER = (3, 0, 8)
-        MIN_SQLITE_VERSION = ".".join([str(x)
-                                    for x in MIN_SQLITE_VERSION_NUMBER])
-
-        # Scan the default include directories before the SQLite specific
-        # ones. This allows one to override the copy of sqlite on OSX,
-        # where /usr/include contains an old version of sqlite.
-        if sys.platform == 'darwin':
-            sysroot = macosx_sdk_root()
-
-        for d in inc_dirs + sqlite_inc_paths:
-            f = os.path.join(d, "sqlite3.h")
-
-            if sys.platform == 'darwin' and is_macosx_sdk_path(d):
-                f = os.path.join(sysroot, d[1:], "sqlite3.h")
-
-            if os.path.exists(f):
-                if sqlite_setup_debug: print "sqlite: found %s"%f
-                incf = open(f).read()
-                m = re.search(
-                    r'\s*.*#\s*.*define\s.*SQLITE_VERSION\W*"(.*)"', incf)
-                if m:
-                    sqlite_version = m.group(1)
-                    sqlite_version_tuple = tuple([int(x)
-                                        for x in sqlite_version.split(".")])
-                    if sqlite_version_tuple >= MIN_SQLITE_VERSION_NUMBER:
-                        # we win!
-                        if sqlite_setup_debug:
-                            print "%s/sqlite3.h: version %s"%(d, sqlite_version)
-                        sqlite_incdir = d
-                        break
-                    else:
-                        if sqlite_setup_debug:
-                            print "%s: version %d is too old, need >= %s"%(d,
-                                        sqlite_version, MIN_SQLITE_VERSION)
-                elif sqlite_setup_debug:
-                    print "sqlite: %s had no SQLITE_VERSION"%(f,)
-
-        if sqlite_incdir:
-            sqlite_dirs_to_check = [
-                os.path.join(sqlite_incdir, '..', 'lib64'),
-                os.path.join(sqlite_incdir, '..', 'lib'),
-                os.path.join(sqlite_incdir, '..', 'lib/x86_64-linux-gnu'),
-                os.path.join(sqlite_incdir, '..', '..', 'lib64'),
-                os.path.join(sqlite_incdir, '..', '..', 'lib'),
-            ]
-            sqlite_libfile = self.compiler.find_library_file(
-                                sqlite_dirs_to_check + lib_dirs, 'sqlite3')
-            if sqlite_libfile:
-                sqlite_libdir = [os.path.abspath(os.path.dirname(sqlite_libfile))]
-
-        if sqlite_incdir and sqlite_libdir:
-            sqlite_srcs = ['_sqlite/cache.c',
-                '_sqlite/connection.c',
-                '_sqlite/cursor.c',
-                '_sqlite/microprotocols.c',
-                '_sqlite/module.c',
-                '_sqlite/prepare_protocol.c',
-                '_sqlite/row.c',
-                '_sqlite/statement.c',
-                '_sqlite/util.c', ]
-
-            sqlite_defines = []
-            if sys.platform != "win32":
-                sqlite_defines.append(('MODULE_NAME', '"sqlite3"'))
-            else:
-                sqlite_defines.append(('MODULE_NAME', '\\"sqlite3\\"'))
-
-            # Comment this out if you want the sqlite3 module to be able to load extensions.
-            sqlite_defines.append(("SQLITE_OMIT_LOAD_EXTENSION", "1"))
-
-            if sys.platform == 'darwin':
-                # In every directory on the search path search for a dynamic
-                # library and then a static library, instead of first looking
-                # for dynamic libraries on the entire path.
-                # This way a statically linked custom sqlite gets picked up
-                # before the dynamic library in /usr/lib.
-                sqlite_extra_link_args = ('-Wl,-search_paths_first',)
-            else:
-                sqlite_extra_link_args = ()
-
-            exts.append(Extension('_sqlite3', sqlite_srcs,
-                                  define_macros=sqlite_defines,
-                                  include_dirs=["Modules/_sqlite",
-                                                sqlite_incdir],
-                                  library_dirs=sqlite_libdir,
-                                  runtime_library_dirs=sqlite_libdir,
-                                  extra_link_args=sqlite_extra_link_args,
-                                  libraries=["sqlite3",]))
-        else:
-            missing.append('_sqlite3')
-
-        # Look for Berkeley db 1.85.   Note that it is built as a different
-        # module name so it can be included even when later versions are
-        # available.  A very restrictive search is performed to avoid
-        # accidentally building this module with a later version of the
-        # underlying db library.  May BSD-ish Unixes incorporate db 1.85
-        # symbols into libc and place the include file in /usr/include.
-        #
-        # If the better bsddb library can be built (db_incs is defined)
-        # we do not build this one.  Otherwise this build will pick up
-        # the more recent berkeleydb's db.h file first in the include path
-        # when attempting to compile and it will fail.
-        f = "/usr/include/db.h"
-
-        if sys.platform == 'darwin':
-            if is_macosx_sdk_path(f):
-                sysroot = macosx_sdk_root()
-                f = os.path.join(sysroot, f[1:])
-
-        if os.path.exists(f) and not db_incs:
-            data = open(f).read()
-            m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
-            if m is not None:
-                # bingo - old version used hash file format version 2
-                ### XXX this should be fixed to not be platform-dependent
-                ### but I don't have direct access to an osf1 platform and
-                ### seemed to be muffing the search somehow
-                libraries = platform == "osf1" and ['db'] or None
-                if libraries is not None:
-                    exts.append(Extension('bsddb185', ['bsddbmodule.c'],
-                                          libraries=libraries))
-                else:
-                    exts.append(Extension('bsddb185', ['bsddbmodule.c']))
-            else:
-                missing.append('bsddb185')
-        else:
-            missing.append('bsddb185')
-
-        dbm_order = ['gdbm']
-        # The standard Unix dbm module:
-        if platform not in ['cygwin']:
-            config_args = [arg.strip("'")
-                           for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
-            dbm_args = [arg for arg in config_args
-                        if arg.startswith('--with-dbmliborder=')]
-            if dbm_args:
-                dbm_order = [arg.split('=')[-1] for arg in dbm_args][-1].split(":")
-            else:
-                dbm_order = "ndbm:gdbm:bdb".split(":")
-            dbmext = None
-            for cand in dbm_order:
-                if cand == "ndbm":
-                    if find_file("ndbm.h", inc_dirs, []) is not None:
-                        # Some systems have -lndbm, others don't
-                        if self.compiler.find_library_file(lib_dirs,
-                                                               'ndbm'):
-                            ndbm_libs = ['ndbm']
-                        else:
-                            ndbm_libs = []
-                        print "building dbm using ndbm"
-                        dbmext = Extension('dbm', ['dbmmodule.c'],
-                                           define_macros=[
-                                               ('HAVE_NDBM_H',None),
-                                               ],
-                                           libraries=ndbm_libs)
-                        break
-
-                elif cand == "gdbm":
-                    if self.compiler.find_library_file(lib_dirs, 'gdbm'):
-                        gdbm_libs = ['gdbm']
-                        if self.compiler.find_library_file(lib_dirs,
-                                                               'gdbm_compat'):
-                            gdbm_libs.append('gdbm_compat')
-                        if find_file("gdbm/ndbm.h", inc_dirs, []) is not None:
-                            print "building dbm using gdbm"
-                            dbmext = Extension(
-                                'dbm', ['dbmmodule.c'],
-                                define_macros=[
-                                    ('HAVE_GDBM_NDBM_H', None),
-                                    ],
-                                libraries = gdbm_libs)
-                            break
-                        if find_file("gdbm-ndbm.h", inc_dirs, []) is not None:
-                            print "building dbm using gdbm"
-                            dbmext = Extension(
-                                'dbm', ['dbmmodule.c'],
-                                define_macros=[
-                                    ('HAVE_GDBM_DASH_NDBM_H', None),
-                                    ],
-                                libraries = gdbm_libs)
-                            break
-                elif cand == "bdb":
-                    if db_incs is not None:
-                        print "building dbm using bdb"
-                        dbmext = Extension('dbm', ['dbmmodule.c'],
-                                           library_dirs=dblib_dir,
-                                           runtime_library_dirs=dblib_dir,
-                                           include_dirs=db_incs,
-                                           define_macros=[
-                                               ('HAVE_BERKDB_H', None),
-                                               ('DB_DBM_HSEARCH', None),
-                                               ],
-                                           libraries=dblibs)
-                        break
-            if dbmext is not None:
-                exts.append(dbmext)
-            else:
-                missing.append('dbm')
-
-        # Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
-        if ('gdbm' in dbm_order and
-            self.compiler.find_library_file(lib_dirs, 'gdbm')):
-            exts.append( Extension('gdbm', ['gdbmmodule.c'],
-                                   libraries = ['gdbm'] ) )
-        else:
-            missing.append('gdbm')
-
-        # Unix-only modules
-        if platform not in ['win32']:
-            # Steen Lumholt's termios module
-            exts.append( Extension('termios', ['termios.c']) )
-            # Jeremy Hylton's rlimit interface
-            if platform not in ['atheos']:
-                exts.append( Extension('resource', ['resource.c']) )
-            else:
-                missing.append('resource')
-
-            # Sun yellow pages. Some systems have the functions in libc.
-            if (platform not in ['cygwin', 'atheos', 'qnx6'] and
-                find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None):
-                if (self.compiler.find_library_file(lib_dirs, 'nsl')):
-                    libs = ['nsl']
-                else:
-                    libs = []
-                exts.append( Extension('nis', ['nismodule.c'],
-                                       libraries = libs) )
-            else:
-                missing.append('nis')
-        else:
-            missing.extend(['nis', 'resource', 'termios'])
-
-        # Curses support, requiring the System V version of curses, often
-        # provided by the ncurses library.
-        panel_library = 'panel'
-        if curses_library.startswith('ncurses'):
-            if curses_library == 'ncursesw':
-                # Bug 1464056: If _curses.so links with ncursesw,
-                # _curses_panel.so must link with panelw.
-                panel_library = 'panelw'
-            curses_libs = [curses_library]
-            exts.append( Extension('_curses', ['_cursesmodule.c'],
-                                   libraries = curses_libs) )
-        elif curses_library == 'curses' and platform != 'darwin':
-                # OSX has an old Berkeley curses, not good enough for
-                # the _curses module.
-            if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
-                curses_libs = ['curses', 'terminfo']
-            elif (self.compiler.find_library_file(lib_dirs, 'termcap')):
-                curses_libs = ['curses', 'termcap']
-            else:
-                curses_libs = ['curses']
-
-            exts.append( Extension('_curses', ['_cursesmodule.c'],
-                                   libraries = curses_libs) )
-        else:
-            missing.append('_curses')
-
-        # If the curses module is enabled, check for the panel module
-        if (module_enabled(exts, '_curses') and
-            self.compiler.find_library_file(lib_dirs, panel_library)):
-            exts.append( Extension('_curses_panel', ['_curses_panel.c'],
-                                   libraries = [panel_library] + curses_libs) )
-        else:
-            missing.append('_curses_panel')
-
-        # Andrew Kuchling's zlib module.  Note that some versions of zlib
-        # 1.1.3 have security problems.  See CERT Advisory CA-2002-07:
-        # http://www.cert.org/advisories/CA-2002-07.html
-        #
-        # zlib 1.1.4 is fixed, but at least one vendor (RedHat) has decided to
-        # patch its zlib 1.1.3 package instead of upgrading to 1.1.4.  For
-        # now, we still accept 1.1.3, because we think it's difficult to
-        # exploit this in Python, and we'd rather make it RedHat's problem
-        # than our problem <wink>.
-        #
-        # You can upgrade zlib to version 1.1.4 yourself by going to
-        # http://www.gzip.org/zlib/
-        zlib_inc = find_file('zlib.h', [], inc_dirs)
-        have_zlib = False
-        if zlib_inc is not None:
-            zlib_h = zlib_inc[0] + '/zlib.h'
-            version = '"0.0.0"'
-            version_req = '"1.1.3"'
-            fp = open(zlib_h)
-            while 1:
-                line = fp.readline()
-                if not line:
-                    break
-                if line.startswith('#define ZLIB_VERSION'):
-                    version = line.split()[2]
-                    break
-            if version >= version_req:
-                if (self.compiler.find_library_file(lib_dirs, 'z')):
-                    if sys.platform == "darwin":
-                        zlib_extra_link_args = ('-Wl,-search_paths_first',)
-                    else:
-                        zlib_extra_link_args = ()
-                    exts.append( Extension('zlib', ['zlibmodule.c'],
-                                           libraries = ['z'],
-                                           extra_link_args = zlib_extra_link_args))
-                    have_zlib = True
-                else:
-                    missing.append('zlib')
-            else:
-                missing.append('zlib')
-        else:
-            missing.append('zlib')
-
-        # Helper module for various ascii-encoders.  Uses zlib for an optimized
-        # crc32 if we have it.  Otherwise binascii uses its own.
-        if have_zlib:
-            extra_compile_args = ['-DUSE_ZLIB_CRC32']
-            libraries = ['z']
-            extra_link_args = zlib_extra_link_args
-        else:
-            extra_compile_args = []
-            libraries = []
-            extra_link_args = []
-        exts.append( Extension('binascii', ['binascii.c'],
-                               extra_compile_args = extra_compile_args,
-                               libraries = libraries,
-                               extra_link_args = extra_link_args) )
-
-        # Gustavo Niemeyer's bz2 module.
-        if (self.compiler.find_library_file(lib_dirs, 'bz2')):
-            if sys.platform == "darwin":
-                bz2_extra_link_args = ('-Wl,-search_paths_first',)
-            else:
-                bz2_extra_link_args = ()
-            exts.append( Extension('bz2', ['bz2module.c'],
-                                   libraries = ['bz2'],
-                                   extra_link_args = bz2_extra_link_args) )
-        else:
-            missing.append('bz2')
-
-        # Interface to the Expat XML parser
-        #
-        # Expat was written by James Clark and is now maintained by a group of
-        # developers on SourceForge; see www.libexpat.org for more information.
-        # The pyexpat module was written by Paul Prescod after a prototype by
-        # Jack Jansen.  The Expat source is included in Modules/expat/.  Usage
-        # of a system shared libexpat.so is possible with --with-system-expat
-        # configure option.
-        #
-        # More information on Expat can be found at www.libexpat.org.
-        #
-        if '--with-system-expat' in sysconfig.get_config_var("CONFIG_ARGS"):
-            expat_inc = []
-            define_macros = []
-            expat_lib = ['expat']
-            expat_sources = []
-        else:
-            expat_inc = [os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')]
-            define_macros = [
-                ('HAVE_EXPAT_CONFIG_H', '1'),
-            ]
-            expat_lib = []
-            expat_sources = ['expat/xmlparse.c',
-                             'expat/xmlrole.c',
-                             'expat/xmltok.c']
-
-        exts.append(Extension('pyexpat',
-                              define_macros = define_macros,
-                              include_dirs = expat_inc,
-                              libraries = expat_lib,
-                              sources = ['pyexpat.c'] + expat_sources
-                              ))
-
-        # Fredrik Lundh's cElementTree module.  Note that this also
-        # uses expat (via the CAPI hook in pyexpat).
-
-        if os.path.isfile(os.path.join(srcdir, 'Modules', '_elementtree.c')):
-            define_macros.append(('USE_PYEXPAT_CAPI', None))
-            exts.append(Extension('_elementtree',
-                                  define_macros = define_macros,
-                                  include_dirs = expat_inc,
-                                  libraries = expat_lib,
-                                  sources = ['_elementtree.c'],
-                                  ))
-        else:
-            missing.append('_elementtree')
-
-        # Hye-Shik Chang's CJKCodecs modules.
-        if have_unicode:
-            exts.append(Extension('_multibytecodec',
-                                  ['cjkcodecs/multibytecodec.c']))
-            for loc in ('kr', 'jp', 'cn', 'tw', 'hk', 'iso2022'):
-                exts.append(Extension('_codecs_%s' % loc,
-                                      ['cjkcodecs/_codecs_%s.c' % loc]))
-        else:
-            missing.append('_multibytecodec')
-            for loc in ('kr', 'jp', 'cn', 'tw', 'hk', 'iso2022'):
-                missing.append('_codecs_%s' % loc)
-
-        # Dynamic loading module
-        if sys.maxint == 0x7fffffff:
-            # This requires sizeof(int) == sizeof(long) == sizeof(char*)
-            dl_inc = find_file('dlfcn.h', [], inc_dirs)
-            if (dl_inc is not None) and (platform not in ['atheos']):
-                exts.append( Extension('dl', ['dlmodule.c']) )
-            else:
-                missing.append('dl')
-        else:
-            missing.append('dl')
-
-        # Thomas Heller's _ctypes module
-        self.detect_ctypes(inc_dirs, lib_dirs)
-
-        # Richard Oudkerk's multiprocessing module
-        if platform == 'win32':             # Windows
-            macros = dict()
-            libraries = ['ws2_32']
-
-        elif platform == 'darwin':          # Mac OSX
-            macros = dict()
-            libraries = []
-
-        elif platform == 'cygwin':          # Cygwin
-            macros = dict()
-            libraries = []
-
-        elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
-            # FreeBSD's P1003.1b semaphore support is very experimental
-            # and has many known problems. (as of June 2008)
-            macros = dict()
-            libraries = []
-
-        elif platform.startswith('openbsd'):
-            macros = dict()
-            libraries = []
-
-        elif platform.startswith('netbsd'):
-            macros = dict()
-            libraries = []
-
-        else:                                   # Linux and other unices
-            macros = dict()
-            libraries = ['rt']
-
-        if platform == 'win32':
-            multiprocessing_srcs = [ '_multiprocessing/multiprocessing.c',
-                                     '_multiprocessing/semaphore.c',
-                                     '_multiprocessing/pipe_connection.c',
-                                     '_multiprocessing/socket_connection.c',
-                                     '_multiprocessing/win32_functions.c'
-                                   ]
-
-        else:
-            multiprocessing_srcs = [ '_multiprocessing/multiprocessing.c',
-                                     '_multiprocessing/socket_connection.c'
-                                   ]
-            if (sysconfig.get_config_var('HAVE_SEM_OPEN') and not
-                sysconfig.get_config_var('POSIX_SEMAPHORES_NOT_ENABLED')):
-                multiprocessing_srcs.append('_multiprocessing/semaphore.c')
-
-        if sysconfig.get_config_var('WITH_THREAD'):
-            exts.append ( Extension('_multiprocessing', multiprocessing_srcs,
-                                    define_macros=macros.items(),
-                                    include_dirs=["Modules/_multiprocessing"]))
-        else:
-            missing.append('_multiprocessing')
-
-        # End multiprocessing
-
-
-        # Platform-specific libraries
-        if platform == 'linux2':
-            # Linux-specific modules
-            exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) )
-        else:
-            missing.append('linuxaudiodev')
-
-        if (platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
-                        'freebsd7', 'freebsd8')
-            or platform.startswith("gnukfreebsd")):
-            exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
-        else:
-            missing.append('ossaudiodev')
-
-        if platform == 'sunos5':
-            # SunOS specific modules
-            exts.append( Extension('sunaudiodev', ['sunaudiodev.c']) )
-        else:
-            missing.append('sunaudiodev')
-
-        if platform == 'darwin':
-            # _scproxy
-            exts.append(Extension("_scproxy", [os.path.join(srcdir, "Mac/Modules/_scproxy.c")],
-                extra_link_args= [
-                    '-framework', 'SystemConfiguration',
-                    '-framework', 'CoreFoundation'
-                ]))
-
-
-        if platform == 'darwin' and ("--disable-toolbox-glue" not in
-                sysconfig.get_config_var("CONFIG_ARGS")):
-
-            if int(os.uname()[2].split('.')[0]) >= 8:
-                # We're on Mac OS X 10.4 or later, the compiler should
-                # support '-Wno-deprecated-declarations'. This will
-                # surpress deprecation warnings for the Carbon extensions,
-                # these extensions wrap the Carbon APIs and even those
-                # parts that are deprecated.
-                carbon_extra_compile_args = ['-Wno-deprecated-declarations']
-            else:
-                carbon_extra_compile_args = []
-
-            # Mac OS X specific modules.
-            def macSrcExists(name1, name2=''):
-                if not name1:
-                    return None
-                names = (name1,)
-                if name2:
-                    names = (name1, name2)
-                path = os.path.join(srcdir, 'Mac', 'Modules', *names)
-                return os.path.exists(path)
-
-            def addMacExtension(name, kwds, extra_srcs=[]):
-                dirname = ''
-                if name[0] == '_':
-                    dirname = name[1:].lower()
-                cname = name + '.c'
-                cmodulename = name + 'module.c'
-                # Check for NNN.c, NNNmodule.c, _nnn/NNN.c, _nnn/NNNmodule.c
-                if macSrcExists(cname):
-                    srcs = [cname]
-                elif macSrcExists(cmodulename):
-                    srcs = [cmodulename]
-                elif macSrcExists(dirname, cname):
-                    # XXX(nnorwitz): If all the names ended with module, we
-                    # wouldn't need this condition.  ibcarbon is the only one.
-                    srcs = [os.path.join(dirname, cname)]
-                elif macSrcExists(dirname, cmodulename):
-                    srcs = [os.path.join(dirname, cmodulename)]
-                else:
-                    raise RuntimeError("%s not found" % name)
-
-                # Here's the whole point:  add the extension with sources
-                exts.append(Extension(name, srcs + extra_srcs, **kwds))
-
-            # Core Foundation
-            core_kwds = {'extra_compile_args': carbon_extra_compile_args,
-                         'extra_link_args': ['-framework', 'CoreFoundation'],
-                        }
-            addMacExtension('_CF', core_kwds, ['cf/pycfbridge.c'])
-            addMacExtension('autoGIL', core_kwds)
-
-
-
-            # Carbon
-            carbon_kwds = {'extra_compile_args': carbon_extra_compile_args,
-                           'extra_link_args': ['-framework', 'Carbon'],
-                          }
-            CARBON_EXTS = ['ColorPicker', 'gestalt', 'MacOS', 'Nav',
-                           'OSATerminology', 'icglue',
-                           # All these are in subdirs
-                           '_AE', '_AH', '_App', '_CarbonEvt', '_Cm', '_Ctl',
-                           '_Dlg', '_Drag', '_Evt', '_File', '_Folder', '_Fm',
-                           '_Help', '_Icn', '_IBCarbon', '_List',
-                           '_Menu', '_Mlte', '_OSA', '_Res', '_Qd', '_Qdoffs',
-                           '_Scrap', '_Snd', '_TE',
-                          ]
-            for name in CARBON_EXTS:
-                addMacExtension(name, carbon_kwds)
-
-            # Workaround for a bug in the version of gcc shipped with Xcode 3.
-            # The _Win extension should build just like the other Carbon extensions, but
-            # this actually results in a hard crash of the linker.
-            #
-            if '-arch ppc64' in cflags and '-arch ppc' in cflags:
-                win_kwds = {'extra_compile_args': carbon_extra_compile_args + ['-arch', 'i386', '-arch', 'ppc'],
-                               'extra_link_args': ['-framework', 'Carbon', '-arch', 'i386', '-arch', 'ppc'],
-                           }
-                addMacExtension('_Win', win_kwds)
-            else:
-                addMacExtension('_Win', carbon_kwds)
-
-
-            # Application Services & QuickTime
-            app_kwds = {'extra_compile_args': carbon_extra_compile_args,
-                        'extra_link_args': ['-framework','ApplicationServices'],
-                       }
-            addMacExtension('_Launch', app_kwds)
-            addMacExtension('_CG', app_kwds)
-
-            exts.append( Extension('_Qt', ['qt/_Qtmodule.c'],
-                        extra_compile_args=carbon_extra_compile_args,
-                        extra_link_args=['-framework', 'QuickTime',
-                                     '-framework', 'Carbon']) )
-
-
-        self.extensions.extend(exts)
-
-        # Call the method for detecting whether _tkinter can be compiled
-        self.detect_tkinter(inc_dirs, lib_dirs)
-
-        if '_tkinter' not in [e.name for e in self.extensions]:
-            missing.append('_tkinter')
-
-        return missing
-
-    def detect_tkinter_darwin(self, inc_dirs, lib_dirs):
-        # The _tkinter module, using frameworks. Since frameworks are quite
-        # different the UNIX search logic is not sharable.
-        from os.path import join, exists
-        framework_dirs = [
-            '/Library/Frameworks',
-            '/System/Library/Frameworks/',
-            join(os.getenv('HOME'), '/Library/Frameworks')
-        ]
-
-        sysroot = macosx_sdk_root()
-
-        # Find the directory that contains the Tcl.framework and Tk.framework
-        # bundles.
-        # XXX distutils should support -F!
-        for F in framework_dirs:
-            # both Tcl.framework and Tk.framework should be present
-
-
-            for fw in 'Tcl', 'Tk':
-                if is_macosx_sdk_path(F):
-                    if not exists(join(sysroot, F[1:], fw + '.framework')):
-                        break
-                else:
-                    if not exists(join(F, fw + '.framework')):
-                        break
-            else:
-                # ok, F is now directory with both frameworks. Continure
-                # building
-                break
-        else:
-            # Tk and Tcl frameworks not found. Normal "unix" tkinter search
-            # will now resume.
-            return 0
-
-        # For 8.4a2, we must add -I options that point inside the Tcl and Tk
-        # frameworks. In later release we should hopefully be able to pass
-        # the -F option to gcc, which specifies a framework lookup path.
-        #
-        include_dirs = [
-            join(F, fw + '.framework', H)
-            for fw in 'Tcl', 'Tk'
-            for H in 'Headers', 'Versions/Current/PrivateHeaders'
-        ]
-
-        # For 8.4a2, the X11 headers are not included. Rather than include a
-        # complicated search, this is a hard-coded path. It could bail out
-        # if X11 libs are not found...
-        include_dirs.append('/usr/X11R6/include')
-        frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
-
-        # All existing framework builds of Tcl/Tk don't support 64-bit
-        # architectures.
-        cflags = sysconfig.get_config_vars('CFLAGS')[0]
-        archs = re.findall('-arch\s+(\w+)', cflags)
-
-        if is_macosx_sdk_path(F):
-            fp = os.popen("file %s/Tk.framework/Tk | grep 'for architecture'"%(os.path.join(sysroot, F[1:]),))
-        else:
-            fp = os.popen("file %s/Tk.framework/Tk | grep 'for architecture'"%(F,))
-
-        detected_archs = []
-        for ln in fp:
-            a = ln.split()[-1]
-            if a in archs:
-                detected_archs.append(ln.split()[-1])
-        fp.close()
-
-        for a in detected_archs:
-            frameworks.append('-arch')
-            frameworks.append(a)
-
-        ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
-                        define_macros=[('WITH_APPINIT', 1)],
-                        include_dirs = include_dirs,
-                        libraries = [],
-                        extra_compile_args = frameworks[2:],
-                        extra_link_args = frameworks,
-                        )
-        self.extensions.append(ext)
-        return 1
-
-
-    def detect_tkinter(self, inc_dirs, lib_dirs):
-        # The _tkinter module.
-
-        # Rather than complicate the code below, detecting and building
-        # AquaTk is a separate method. Only one Tkinter will be built on
-        # Darwin - either AquaTk, if it is found, or X11 based Tk.
-        platform = self.get_platform()
-        if (platform == 'darwin' and
-            self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
-            return
-
-        # Assume we haven't found any of the libraries or include files
-        # The versions with dots are used on Unix, and the versions without
-        # dots on Windows, for detection by cygwin.
-        tcllib = tklib = tcl_includes = tk_includes = None
-        for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83',
-                        '8.2', '82', '8.1', '81', '8.0', '80']:
-            tklib = self.compiler.find_library_file(lib_dirs,
-                                                        'tk' + version)
-            tcllib = self.compiler.find_library_file(lib_dirs,
-                                                         'tcl' + version)
-            if tklib and tcllib:
-                # Exit the loop when we've found the Tcl/Tk libraries
-                break
-
-        # Now check for the header files
-        if tklib and tcllib:
-            # Check for the include files on Debian and {Free,Open}BSD, where
-            # they're put in /usr/include/{tcl,tk}X.Y
-            dotversion = version
-            if '.' not in dotversion and "bsd" in sys.platform.lower():
-                # OpenBSD and FreeBSD use Tcl/Tk library names like libtcl83.a,
-                # but the include subdirs are named like .../include/tcl8.3.
-                dotversion = dotversion[:-1] + '.' + dotversion[-1]
-            tcl_include_sub = []
-            tk_include_sub = []
-            for dir in inc_dirs:
-                tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
-                tk_include_sub += [dir + os.sep + "tk" + dotversion]
-            tk_include_sub += tcl_include_sub
-            tcl_includes = find_file('tcl.h', inc_dirs, tcl_include_sub)
-            tk_includes = find_file('tk.h', inc_dirs, tk_include_sub)
-
-        if (tcllib is None or tklib is None or
-            tcl_includes is None or tk_includes is None):
-            self.announce("INFO: Can't locate Tcl/Tk libs and/or headers", 2)
-            return
-
-        # OK... everything seems to be present for Tcl/Tk.
-
-        include_dirs = [] ; libs = [] ; defs = [] ; added_lib_dirs = []
-        for dir in tcl_includes + tk_includes:
-            if dir not in include_dirs:
-                include_dirs.append(dir)
-
-        # Check for various platform-specific directories
-        if platform == 'sunos5':
-            include_dirs.append('/usr/openwin/include')
-            added_lib_dirs.append('/usr/openwin/lib')
-        elif os.path.exists('/usr/X11R6/include'):
-            include_dirs.append('/usr/X11R6/include')
-            added_lib_dirs.append('/usr/X11R6/lib64')
-            added_lib_dirs.append('/usr/X11R6/lib')
-        elif os.path.exists('/usr/X11R5/include'):
-            include_dirs.append('/usr/X11R5/include')
-            added_lib_dirs.append('/usr/X11R5/lib')
-        else:
-            # Assume default location for X11
-            include_dirs.append('/usr/X11/include')
-            added_lib_dirs.append('/usr/X11/lib')
-
-        # If Cygwin, then verify that X is installed before proceeding
-        if platform == 'cygwin':
-            x11_inc = find_file('X11/Xlib.h', [], include_dirs)
-            if x11_inc is None:
-                return
-
-        # Check for BLT extension
-        if self.compiler.find_library_file(lib_dirs + added_lib_dirs,
-                                               'BLT8.0'):
-            defs.append( ('WITH_BLT', 1) )
-            libs.append('BLT8.0')
-        elif self.compiler.find_library_file(lib_dirs + added_lib_dirs,
-                                                'BLT'):
-            defs.append( ('WITH_BLT', 1) )
-            libs.append('BLT')
-
-        # Add the Tcl/Tk libraries
-        libs.append('tk'+ version)
-        libs.append('tcl'+ version)
-
-        if platform in ['aix3', 'aix4']:
-            libs.append('ld')
-
-        # Finally, link with the X11 libraries (not appropriate on cygwin)
-        if platform != "cygwin":
-            libs.append('X11')
-
-        ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
-                        define_macros=[('WITH_APPINIT', 1)] + defs,
-                        include_dirs = include_dirs,
-                        libraries = libs,
-                        library_dirs = added_lib_dirs,
-                        )
-        self.extensions.append(ext)
-
-##         # Uncomment these lines if you want to play with xxmodule.c
-##         ext = Extension('xx', ['xxmodule.c'])
-##         self.extensions.append(ext)
-
-        # XXX handle these, but how to detect?
-        # *** Uncomment and edit for PIL (TkImaging) extension only:
-        #       -DWITH_PIL -I../Extensions/Imaging/libImaging  tkImaging.c \
-        # *** Uncomment and edit for TOGL extension only:
-        #       -DWITH_TOGL togl.c \
-        # *** Uncomment these for TOGL extension only:
-        #       -lGL -lGLU -lXext -lXmu \
-
-    def configure_ctypes_darwin(self, ext):
-        # Darwin (OS X) uses preconfigured files, in
-        # the Modules/_ctypes/libffi_osx directory.
-        srcdir = sysconfig.get_config_var('srcdir')
-        ffi_srcdir = os.path.abspath(os.path.join(srcdir, 'Modules',
-                                                  '_ctypes', 'libffi_osx'))
-        sources = [os.path.join(ffi_srcdir, p)
-                   for p in ['ffi.c',
-                             'x86/darwin64.S',
-                             'x86/x86-darwin.S',
-                             'x86/x86-ffi_darwin.c',
-                             'x86/x86-ffi64.c',
-                             'powerpc/ppc-darwin.S',
-                             'powerpc/ppc-darwin_closure.S',
-                             'powerpc/ppc-ffi_darwin.c',
-                             'powerpc/ppc64-darwin_closure.S',
-                             ]]
-
-        # Add .S (preprocessed assembly) to C compiler source extensions.
-        self.compiler.src_extensions.append('.S')
-
-        include_dirs = [os.path.join(ffi_srcdir, 'include'),
-                        os.path.join(ffi_srcdir, 'powerpc')]
-        ext.include_dirs.extend(include_dirs)
-        ext.sources.extend(sources)
-        return True
-
-    def configure_ctypes(self, ext):
-        if not self.use_system_libffi:
-            if sys.platform == 'darwin':
-                return self.configure_ctypes_darwin(ext)
-
-            srcdir = sysconfig.get_config_var('srcdir')
-            ffi_builddir = os.path.join(self.build_temp, 'libffi')
-            ffi_srcdir = os.path.abspath(os.path.join(srcdir, 'Modules',
-                                         '_ctypes', 'libffi'))
-            ffi_configfile = os.path.join(ffi_builddir, 'fficonfig.py')
-
-            from distutils.dep_util import newer_group
-
-            config_sources = [os.path.join(ffi_srcdir, fname)
-                              for fname in os.listdir(ffi_srcdir)
-                              if os.path.isfile(os.path.join(ffi_srcdir, fname))]
-            if self.force or newer_group(config_sources,
-                                         ffi_configfile):
-                from distutils.dir_util import mkpath
-                mkpath(ffi_builddir)
-                config_args = []
-
-                # Pass empty CFLAGS because we'll just append the resulting
-                # CFLAGS to Python's; -g or -O2 is to be avoided.
-                cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \
-                      % (ffi_builddir, ffi_srcdir, " ".join(config_args))
-
-                res = os.system(cmd)
-                if res or not os.path.exists(ffi_configfile):
-                    print "Failed to configure _ctypes module"
-                    return False
-
-            fficonfig = {}
-            with open(ffi_configfile) as f:
-                exec f in fficonfig
-
-            # Add .S (preprocessed assembly) to C compiler source extensions.
-            self.compiler.src_extensions.append('.S')
-
-            include_dirs = [os.path.join(ffi_builddir, 'include'),
-                            ffi_builddir,
-                            os.path.join(ffi_srcdir, 'src')]
-            extra_compile_args = fficonfig['ffi_cflags'].split()
-
-            ext.sources.extend(os.path.join(ffi_srcdir, f) for f in
-                               fficonfig['ffi_sources'])
-            ext.include_dirs.extend(include_dirs)
-            ext.extra_compile_args.extend(extra_compile_args)
-        return True
-
-    def detect_ctypes(self, inc_dirs, lib_dirs):
-        self.use_system_libffi = False
-        include_dirs = []
-        extra_compile_args = []
-        extra_link_args = []
-        sources = ['_ctypes/_ctypes.c',
-                   '_ctypes/callbacks.c',
-                   '_ctypes/callproc.c',
-                   '_ctypes/stgdict.c',
-                   '_ctypes/cfield.c']
-        depends = ['_ctypes/ctypes.h']
-
-        if sys.platform == 'darwin':
-            sources.append('_ctypes/malloc_closure.c')
-            sources.append('_ctypes/darwin/dlfcn_simple.c')
-            extra_compile_args.append('-DMACOSX')
-            include_dirs.append('_ctypes/darwin')
-# XXX Is this still needed?
-##            extra_link_args.extend(['-read_only_relocs', 'warning'])
-
-        elif sys.platform == 'sunos5':
-            # XXX This shouldn't be necessary; it appears that some
-            # of the assembler code is non-PIC (i.e. it has relocations
-            # when it shouldn't. The proper fix would be to rewrite
-            # the assembler code to be PIC.
-            # This only works with GCC; the Sun compiler likely refuses
-            # this option. If you want to compile ctypes with the Sun
-            # compiler, please research a proper solution, instead of
-            # finding some -z option for the Sun compiler.
-            extra_link_args.append('-mimpure-text')
-
-        elif sys.platform.startswith('hp-ux'):
-            extra_link_args.append('-fPIC')
-
-        ext = Extension('_ctypes',
-                        include_dirs=include_dirs,
-                        extra_compile_args=extra_compile_args,
-                        extra_link_args=extra_link_args,
-                        libraries=[],
-                        sources=sources,
-                        depends=depends)
-        ext_test = Extension('_ctypes_test',
-                             sources=['_ctypes/_ctypes_test.c'])
-        self.extensions.extend([ext, ext_test])
-
-        if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"):
-            return
-
-        if sys.platform == 'darwin':
-            # OS X 10.5 comes with libffi.dylib; the include files are
-            # in /usr/include/ffi
-            inc_dirs.append('/usr/include/ffi')
-
-        ffi_inc = [sysconfig.get_config_var("LIBFFI_INCLUDEDIR")]
-        if not ffi_inc or ffi_inc[0] == '':
-            ffi_inc = find_file('ffi.h', [], inc_dirs)
-        if ffi_inc is not None:
-            ffi_h = ffi_inc[0] + '/ffi.h'
-            fp = open(ffi_h)
-            while 1:
-                line = fp.readline()
-                if not line:
-                    ffi_inc = None
-                    break
-                if line.startswith('#define LIBFFI_H'):
-                    break
-        ffi_lib = None
-        if ffi_inc is not None:
-            for lib_name in ('ffi_convenience', 'ffi_pic', 'ffi'):
-                if (self.compiler.find_library_file(lib_dirs, lib_name)):
-                    ffi_lib = lib_name
-                    break
-
-        if ffi_inc and ffi_lib:
-            ext.include_dirs.extend(ffi_inc)
-            ext.libraries.append(ffi_lib)
-            self.use_system_libffi = True
-
-
-class PyBuildInstall(install):
-    # Suppress the warning about installation into the lib_dynload
-    # directory, which is not in sys.path when running Python during
-    # installation:
-    def initialize_options (self):
-        install.initialize_options(self)
-        self.warn_dir=0
-
-class PyBuildInstallLib(install_lib):
-    # Do exactly what install_lib does but make sure correct access modes get
-    # set on installed directories and files. All installed files with get
-    # mode 644 unless they are a shared library in which case they will get
-    # mode 755. All installed directories will get mode 755.
-
-    so_ext = sysconfig.get_config_var("SO")
-
-    def install(self):
-        outfiles = install_lib.install(self)
-        self.set_file_modes(outfiles, 0644, 0755)
-        self.set_dir_modes(self.install_dir, 0755)
-        return outfiles
-
-    def set_file_modes(self, files, defaultMode, sharedLibMode):
-        if not self.is_chmod_supported(): return
-        if not files: return
-
-        for filename in files:
-            if os.path.islink(filename): continue
-            mode = defaultMode
-            if filename.endswith(self.so_ext): mode = sharedLibMode
-            log.info("changing mode of %s to %o", filename, mode)
-            if not self.dry_run: os.chmod(filename, mode)
-
-    def set_dir_modes(self, dirname, mode):
-        if not self.is_chmod_supported(): return
-        os.path.walk(dirname, self.set_dir_modes_visitor, mode)
-
-    def set_dir_modes_visitor(self, mode, dirname, names):
-        if os.path.islink(dirname): return
-        log.info("changing mode of %s to %o", dirname, mode)
-        if not self.dry_run: os.chmod(dirname, mode)
-
-    def is_chmod_supported(self):
-        return hasattr(os, 'chmod')
-
-SUMMARY = """
-Python is an interpreted, interactive, object-oriented programming
-language. It is often compared to Tcl, Perl, Scheme or Java.
-
-Python combines remarkable power with very clear syntax. It has
-modules, classes, exceptions, very high level dynamic data types, and
-dynamic typing. There are interfaces to many system calls and
-libraries, as well as to various windowing systems (X11, Motif, Tk,
-Mac, MFC). New built-in modules are easily written in C or C++. Python
-is also usable as an extension language for applications that need a
-programmable interface.
-
-The Python implementation is portable: it runs on many brands of UNIX,
-on Windows, DOS, OS/2, Mac, Amiga... If your favorite system isn't
-listed here, it may still be supported, if there's a C compiler for
-it. Ask around on comp.lang.python -- or just try compiling Python
-yourself.
-"""
-
-CLASSIFIERS = """
-Development Status :: 6 - Mature
-License :: OSI Approved :: Python Software Foundation License
-Natural Language :: English
-Programming Language :: C
-Programming Language :: Python
-Topic :: Software Development
-"""
-
-def main():
-    # turn off warnings when deprecated modules are imported
-    import warnings
-    warnings.filterwarnings("ignore",category=DeprecationWarning)
-    setup(# PyPI Metadata (PEP 301)
-          name = "Python",
-          version = sys.version.split()[0],
-          url = "http://www.python.org/%s" % sys.version[:3],
-          maintainer = "Guido van Rossum and the Python community",
-          maintainer_email = "python-dev@python.org",
-          description = "A high-level object-oriented programming language",
-          long_description = SUMMARY.strip(),
-          license = "PSF license",
-          classifiers = filter(None, CLASSIFIERS.split("\n")),
-          platforms = ["Many"],
-
-          # Build info
-          cmdclass = {'build_ext':PyBuildExt, 'install':PyBuildInstall,
-                      'install_lib':PyBuildInstallLib},
-          # The struct module is defined here, because build_ext won't be
-          # called unless there's at least one extension module defined.
-          ext_modules=[Extension('_struct', ['_struct.c'])],
-
-          # Scripts to install
-          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
-                     'Tools/scripts/2to3',
-                     'Lib/smtpd.py']
-        )
-
-# --install-platlib
-if __name__ == '__main__':
-    main()
diff --git a/pysrc/src/setup-2.7.4.py b/pysrc/src/setup-2.7.4.py
deleted file mode 100644
index ea8a5f51e..000000000
--- a/pysrc/src/setup-2.7.4.py
+++ /dev/null
@@ -1,2186 +0,0 @@
-# Autodetecting setup.py script for building the Python extensions
-#
-
-__version__ = "$Revision$"
-
-import sys, os, imp, re, optparse
-from glob import glob
-from platform import machine as platform_machine
-import sysconfig
-
-from distutils import log
-from distutils import text_file
-from distutils.errors import *
-from distutils.core import Extension, setup
-from distutils.command.build_ext import build_ext
-from distutils.command.install import install
-from distutils.command.install_lib import install_lib
-from distutils.spawn import find_executable
-
-cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ
-
-def get_platform():
-    # cross build
-    if "_PYTHON_HOST_PLATFORM" in os.environ:
-        return os.environ["_PYTHON_HOST_PLATFORM"]
-    # Get value of sys.platform
-    if sys.platform.startswith('osf1'):
-        return 'osf1'
-    return sys.platform
-host_platform = get_platform()
-
-# Were we compiled --with-pydebug or with #define Py_DEBUG?
-COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
-
-# This global variable is used to hold the list of modules to be disabled.
-disabled_module_list = []
-
-def add_dir_to_list(dirlist, dir):
-    """Add the directory 'dir' to the list 'dirlist' (at the front) if
-    1) 'dir' is not already in 'dirlist'
-    2) 'dir' actually exists, and is a directory."""
-    if dir is not None and os.path.isdir(dir) and dir not in dirlist:
-        dirlist.insert(0, dir)
-
-def macosx_sdk_root():
-    """
-    Return the directory of the current OSX SDK,
-    or '/' if no SDK was specified.
-    """
-    cflags = sysconfig.get_config_var('CFLAGS')
-    m = re.search(r'-isysroot\s+(\S+)', cflags)
-    if m is None:
-        sysroot = '/'
-    else:
-        sysroot = m.group(1)
-    return sysroot
-
-def is_macosx_sdk_path(path):
-    """
-    Returns True if 'path' can be located in an OSX SDK
-    """
-    return ( (path.startswith('/usr/') and not path.startswith('/usr/local'))
-                or path.startswith('/System/')
-                or path.startswith('/Library/') )
-
-def find_file(filename, std_dirs, paths):
-    """Searches for the directory where a given file is located,
-    and returns a possibly-empty list of additional directories, or None
-    if the file couldn't be found at all.
-
-    'filename' is the name of a file, such as readline.h or libcrypto.a.
-    'std_dirs' is the list of standard system directories; if the
-        file is found in one of them, no additional directives are needed.
-    'paths' is a list of additional locations to check; if the file is
-        found in one of them, the resulting list will contain the directory.
-    """
-    if host_platform == 'darwin':
-        # Honor the MacOSX SDK setting when one was specified.
-        # An SDK is a directory with the same structure as a real
-        # system, but with only header files and libraries.
-        sysroot = macosx_sdk_root()
-
-    # Check the standard locations
-    for dir in std_dirs:
-        f = os.path.join(dir, filename)
-
-        if host_platform == 'darwin' and is_macosx_sdk_path(dir):
-            f = os.path.join(sysroot, dir[1:], filename)
-
-        if os.path.exists(f): return []
-
-    # Check the additional directories
-    for dir in paths:
-        f = os.path.join(dir, filename)
-
-        if host_platform == 'darwin' and is_macosx_sdk_path(dir):
-            f = os.path.join(sysroot, dir[1:], filename)
-
-        if os.path.exists(f):
-            return [dir]
-
-    # Not found anywhere
-    return None
-
-def find_library_file(compiler, libname, std_dirs, paths):
-    result = compiler.find_library_file(std_dirs + paths, libname)
-    if result is None:
-        return None
-
-    if host_platform == 'darwin':
-        sysroot = macosx_sdk_root()
-
-    # Check whether the found file is in one of the standard directories
-    dirname = os.path.dirname(result)
-    for p in std_dirs:
-        # Ensure path doesn't end with path separator
-        p = p.rstrip(os.sep)
-
-        if host_platform == 'darwin' and is_macosx_sdk_path(p):
-            if os.path.join(sysroot, p[1:]) == dirname:
-                return [ ]
-
-        if p == dirname:
-            return [ ]
-
-    # Otherwise, it must have been in one of the additional directories,
-    # so we have to figure out which one.
-    for p in paths:
-        # Ensure path doesn't end with path separator
-        p = p.rstrip(os.sep)
-
-        if host_platform == 'darwin' and is_macosx_sdk_path(p):
-            if os.path.join(sysroot, p[1:]) == dirname:
-                return [ p ]
-
-        if p == dirname:
-            return [p]
-    else:
-        assert False, "Internal error: Path not found in std_dirs or paths"
-
-def module_enabled(extlist, modname):
-    """Returns whether the module 'modname' is present in the list
-    of extensions 'extlist'."""
-    extlist = [ext for ext in extlist if ext.name == modname]
-    return len(extlist)
-
-def find_module_file(module, dirlist):
-    """Find a module in a set of possible folders. If it is not found
-    return the unadorned filename"""
-    list = find_file(module, [], dirlist)
-    if not list:
-        return module
-    if len(list) > 1:
-        log.info("WARNING: multiple copies of %s found"%module)
-    return os.path.join(list[0], module)
-
-class PyBuildExt(build_ext):
-
-    def __init__(self, dist):
-        build_ext.__init__(self, dist)
-        self.failed = []
-
-    def build_extensions(self):
-
-        # Detect which modules should be compiled
-        missing = self.detect_modules()
-
-        # Remove modules that are present on the disabled list
-        extensions = [ext for ext in self.extensions
-                      if ext.name not in disabled_module_list]
-        # move ctypes to the end, it depends on other modules
-        ext_map = dict((ext.name, i) for i, ext in enumerate(extensions))
-        if "_ctypes" in ext_map:
-            ctypes = extensions.pop(ext_map["_ctypes"])
-            extensions.append(ctypes)
-        self.extensions = extensions
-
-        # Fix up the autodetected modules, prefixing all the source files
-        # with Modules/ and adding Python's include directory to the path.
-        (srcdir,) = sysconfig.get_config_vars('srcdir')
-        if not srcdir:
-            # Maybe running on Windows but not using CYGWIN?
-            raise ValueError("No source directory; cannot proceed.")
-        srcdir = os.path.abspath(srcdir)
-        moddirlist = [os.path.join(srcdir, 'Modules')]
-
-        # Platform-dependent module source and include directories
-        incdirlist = []
-
-        if host_platform == 'darwin' and ("--disable-toolbox-glue" not in
-            sysconfig.get_config_var("CONFIG_ARGS")):
-            # Mac OS X also includes some mac-specific modules
-            macmoddir = os.path.join(srcdir, 'Mac/Modules')
-            moddirlist.append(macmoddir)
-            incdirlist.append(os.path.join(srcdir, 'Mac/Include'))
-
-        # Fix up the paths for scripts, too
-        self.distribution.scripts = [os.path.join(srcdir, filename)
-                                     for filename in self.distribution.scripts]
-
-        # Python header files
-        headers = [sysconfig.get_config_h_filename()]
-        headers += glob(os.path.join(sysconfig.get_path('include'), "*.h"))
-        for ext in self.extensions[:]:
-            ext.sources = [ find_module_file(filename, moddirlist)
-                            for filename in ext.sources ]
-            if ext.depends is not None:
-                ext.depends = [find_module_file(filename, moddirlist)
-                               for filename in ext.depends]
-            else:
-                ext.depends = []
-            # re-compile extensions if a header file has been changed
-            ext.depends.extend(headers)
-
-            # platform specific include directories
-            ext.include_dirs.extend(incdirlist)
-
-            # If a module has already been built statically,
-            # don't build it here
-            if ext.name in sys.builtin_module_names:
-                self.extensions.remove(ext)
-
-        # Parse Modules/Setup and Modules/Setup.local to figure out which
-        # modules are turned on in the file.
-        remove_modules = []
-        for filename in ('Modules/Setup', 'Modules/Setup.local'):
-            input = text_file.TextFile(filename, join_lines=1)
-            while 1:
-                line = input.readline()
-                if not line: break
-                line = line.split()
-                remove_modules.append(line[0])
-            input.close()
-
-        for ext in self.extensions[:]:
-            if ext.name in remove_modules:
-                self.extensions.remove(ext)
-
-        # When you run "make CC=altcc" or something similar, you really want
-        # those environment variables passed into the setup.py phase.  Here's
-        # a small set of useful ones.
-        compiler = os.environ.get('CC')
-        args = {}
-        # unfortunately, distutils doesn't let us provide separate C and C++
-        # compilers
-        if compiler is not None:
-            (ccshared,cflags) = sysconfig.get_config_vars('CCSHARED','CFLAGS')
-            args['compiler_so'] = compiler + ' ' + ccshared + ' ' + cflags
-        self.compiler.set_executables(**args)
-
-        build_ext.build_extensions(self)
-
-        longest = max([len(e.name) for e in self.extensions])
-        if self.failed:
-            longest = max(longest, max([len(name) for name in self.failed]))
-
-        def print_three_column(lst):
-            lst.sort(key=str.lower)
-            # guarantee zip() doesn't drop anything
-            while len(lst) % 3:
-                lst.append("")
-            for e, f, g in zip(lst[::3], lst[1::3], lst[2::3]):
-                print "%-*s   %-*s   %-*s" % (longest, e, longest, f,
-                                              longest, g)
-
-        if missing:
-            print
-            print ("Python build finished, but the necessary bits to build "
-                   "these modules were not found:")
-            print_three_column(missing)
-            print ("To find the necessary bits, look in setup.py in"
-                   " detect_modules() for the module's name.")
-            print
-
-        if self.failed:
-            failed = self.failed[:]
-            print
-            print "Failed to build these modules:"
-            print_three_column(failed)
-            print
-
-    def build_extension(self, ext):
-
-        if ext.name == '_ctypes':
-            if not self.configure_ctypes(ext):
-                return
-
-        try:
-            build_ext.build_extension(self, ext)
-        except (CCompilerError, DistutilsError), why:
-            self.announce('WARNING: building of extension "%s" failed: %s' %
-                          (ext.name, sys.exc_info()[1]))
-            self.failed.append(ext.name)
-            return
-        # Workaround for Mac OS X: The Carbon-based modules cannot be
-        # reliably imported into a command-line Python
-        if 'Carbon' in ext.extra_link_args:
-            self.announce(
-                'WARNING: skipping import check for Carbon-based "%s"' %
-                ext.name)
-            return
-
-        if host_platform == 'darwin' and (
-                sys.maxint > 2**32 and '-arch' in ext.extra_link_args):
-            # Don't bother doing an import check when an extension was
-            # build with an explicit '-arch' flag on OSX. That's currently
-            # only used to build 32-bit only extensions in a 4-way
-            # universal build and loading 32-bit code into a 64-bit
-            # process will fail.
-            self.announce(
-                'WARNING: skipping import check for "%s"' %
-                ext.name)
-            return
-
-        # Workaround for Cygwin: Cygwin currently has fork issues when many
-        # modules have been imported
-        if host_platform == 'cygwin':
-            self.announce('WARNING: skipping import check for Cygwin-based "%s"'
-                % ext.name)
-            return
-        ext_filename = os.path.join(
-            self.build_lib,
-            self.get_ext_filename(self.get_ext_fullname(ext.name)))
-
-        # Don't try to load extensions for cross builds
-        if cross_compiling:
-            return
-
-        try:
-            imp.load_dynamic(ext.name, ext_filename)
-        except ImportError, why:
-            self.failed.append(ext.name)
-            self.announce('*** WARNING: renaming "%s" since importing it'
-                          ' failed: %s' % (ext.name, why), level=3)
-            assert not self.inplace
-            basename, tail = os.path.splitext(ext_filename)
-            newname = basename + "_failed" + tail
-            if os.path.exists(newname):
-                os.remove(newname)
-            os.rename(ext_filename, newname)
-
-            # XXX -- This relies on a Vile HACK in
-            # distutils.command.build_ext.build_extension().  The
-            # _built_objects attribute is stored there strictly for
-            # use here.
-            # If there is a failure, _built_objects may not be there,
-            # so catch the AttributeError and move on.
-            try:
-                for filename in self._built_objects:
-                    os.remove(filename)
-            except AttributeError:
-                self.announce('unable to remove files (ignored)')
-        except:
-            exc_type, why, tb = sys.exc_info()
-            self.announce('*** WARNING: importing extension "%s" '
-                          'failed with %s: %s' % (ext.name, exc_type, why),
-                          level=3)
-            self.failed.append(ext.name)
-
-    def add_multiarch_paths(self):
-        # Debian/Ubuntu multiarch support.
-        # https://wiki.ubuntu.com/MultiarchSpec
-        cc = sysconfig.get_config_var('CC')
-        tmpfile = os.path.join(self.build_temp, 'multiarch')
-        if not os.path.exists(self.build_temp):
-            os.makedirs(self.build_temp)
-        ret = os.system(
-            '%s -print-multiarch > %s 2> /dev/null' % (cc, tmpfile))
-        multiarch_path_component = ''
-        try:
-            if ret >> 8 == 0:
-                with open(tmpfile) as fp:
-                    multiarch_path_component = fp.readline().strip()
-        finally:
-            os.unlink(tmpfile)
-
-        if multiarch_path_component != '':
-            add_dir_to_list(self.compiler.library_dirs,
-                            '/usr/lib/' + multiarch_path_component)
-            add_dir_to_list(self.compiler.include_dirs,
-                            '/usr/include/' + multiarch_path_component)
-            return
-
-        if not find_executable('dpkg-architecture'):
-            return
-        opt = ''
-        if cross_compiling:
-            opt = '-t' + sysconfig.get_config_var('HOST_GNU_TYPE')
-        tmpfile = os.path.join(self.build_temp, 'multiarch')
-        if not os.path.exists(self.build_temp):
-            os.makedirs(self.build_temp)
-        ret = os.system(
-            'dpkg-architecture %s -qDEB_HOST_MULTIARCH > %s 2> /dev/null' %
-            (opt, tmpfile))
-        try:
-            if ret >> 8 == 0:
-                with open(tmpfile) as fp:
-                    multiarch_path_component = fp.readline().strip()
-                add_dir_to_list(self.compiler.library_dirs,
-                                '/usr/lib/' + multiarch_path_component)
-                add_dir_to_list(self.compiler.include_dirs,
-                                '/usr/include/' + multiarch_path_component)
-        finally:
-            os.unlink(tmpfile)
-
-    def add_gcc_paths(self):
-        gcc = sysconfig.get_config_var('CC')
-        tmpfile = os.path.join(self.build_temp, 'gccpaths')
-        if not os.path.exists(self.build_temp):
-            os.makedirs(self.build_temp)
-        ret = os.system('%s -E -v - </dev/null 2>%s 1>/dev/null' % (gcc, tmpfile))
-        is_gcc = False
-        in_incdirs = False
-        inc_dirs = []
-        lib_dirs = []
-        try:
-            if ret >> 8 == 0:
-                with open(tmpfile) as fp:
-                    for line in fp.readlines():
-                        if line.startswith("gcc version"):
-                            is_gcc = True
-                        elif line.startswith("#include <...>"):
-                            in_incdirs = True
-                        elif line.startswith("End of search list"):
-                            in_incdirs = False
-                        elif is_gcc and line.startswith("LIBRARY_PATH"):
-                            for d in line.strip().split("=")[1].split(":"):
-                                d = os.path.normpath(d)
-                                if '/gcc/' not in d:
-                                    add_dir_to_list(self.compiler.library_dirs,
-                                                    d)
-                        elif is_gcc and in_incdirs and '/gcc/' not in line:
-                            add_dir_to_list(self.compiler.include_dirs,
-                                            line.strip())
-        finally:
-            os.unlink(tmpfile)
-
-    def detect_modules(self):
-        # Ensure that /usr/local is always used
-        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-        self.add_multiarch_paths()
-
-        # Add paths specified in the environment variables LDFLAGS and
-        # CPPFLAGS for header and library files.
-        # We must get the values from the Makefile and not the environment
-        # directly since an inconsistently reproducible issue comes up where
-        # the environment variable is not set even though the value were passed
-        # into configure and stored in the Makefile (issue found on OS X 10.3).
-        for env_var, arg_name, dir_list in (
-                ('LDFLAGS', '-R', self.compiler.runtime_library_dirs),
-                ('LDFLAGS', '-L', self.compiler.library_dirs),
-                ('CPPFLAGS', '-I', self.compiler.include_dirs)):
-            env_val = sysconfig.get_config_var(env_var)
-            if env_val:
-                # To prevent optparse from raising an exception about any
-                # options in env_val that it doesn't know about we strip out
-                # all double dashes and any dashes followed by a character
-                # that is not for the option we are dealing with.
-                #
-                # Please note that order of the regex is important!  We must
-                # strip out double-dashes first so that we don't end up with
-                # substituting "--Long" to "-Long" and thus lead to "ong" being
-                # used for a library directory.
-                env_val = re.sub(r'(^|\s+)-(-|(?!%s))' % arg_name[1],
-                                 ' ', env_val)
-                parser = optparse.OptionParser()
-                # Make sure that allowing args interspersed with options is
-                # allowed
-                parser.allow_interspersed_args = True
-                parser.error = lambda msg: None
-                parser.add_option(arg_name, dest="dirs", action="append")
-                options = parser.parse_args(env_val.split())[0]
-                if options.dirs:
-                    for directory in reversed(options.dirs):
-                        add_dir_to_list(dir_list, directory)
-
-        if os.path.normpath(sys.prefix) != '/usr' \
-                and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
-            # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
-            # (PYTHONFRAMEWORK is set) to avoid # linking problems when
-            # building a framework with different architectures than
-            # the one that is currently installed (issue #7473)
-            add_dir_to_list(self.compiler.library_dirs,
-                            sysconfig.get_config_var("LIBDIR"))
-            add_dir_to_list(self.compiler.include_dirs,
-                            sysconfig.get_config_var("INCLUDEDIR"))
-
-        try:
-            have_unicode = unicode
-        except NameError:
-            have_unicode = 0
-
-        # lib_dirs and inc_dirs are used to search for files;
-        # if a file is found in one of those directories, it can
-        # be assumed that no additional -I,-L directives are needed.
-        inc_dirs = self.compiler.include_dirs[:]
-        lib_dirs = self.compiler.library_dirs[:]
-        if not cross_compiling:
-            for d in (
-                '/usr/include',
-                ):
-                add_dir_to_list(inc_dirs, d)
-            for d in (
-                '/lib64', '/usr/lib64',
-                '/lib', '/usr/lib',
-                ):
-                add_dir_to_list(lib_dirs, d)
-        exts = []
-        missing = []
-
-        config_h = sysconfig.get_config_h_filename()
-        config_h_vars = sysconfig.parse_config_h(open(config_h))
-
-        srcdir = sysconfig.get_config_var('srcdir')
-
-        # Check for AtheOS which has libraries in non-standard locations
-        if host_platform == 'atheos':
-            lib_dirs += ['/system/libs', '/atheos/autolnk/lib']
-            lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
-            inc_dirs += ['/system/include', '/atheos/autolnk/include']
-            inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
-
-        # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
-        if host_platform in ['osf1', 'unixware7', 'openunix8']:
-            lib_dirs += ['/usr/ccs/lib']
-
-        # HP-UX11iv3 keeps files in lib/hpux folders.
-        if host_platform == 'hp-ux11':
-            lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32']
-
-        if host_platform == 'darwin':
-            # This should work on any unixy platform ;-)
-            # If the user has bothered specifying additional -I and -L flags
-            # in OPT and LDFLAGS we might as well use them here.
-            #   NOTE: using shlex.split would technically be more correct, but
-            # also gives a bootstrap problem. Let's hope nobody uses directories
-            # with whitespace in the name to store libraries.
-            cflags, ldflags = sysconfig.get_config_vars(
-                    'CFLAGS', 'LDFLAGS')
-            for item in cflags.split():
-                if item.startswith('-I'):
-                    inc_dirs.append(item[2:])
-
-            for item in ldflags.split():
-                if item.startswith('-L'):
-                    lib_dirs.append(item[2:])
-
-        # Check for MacOS X, which doesn't need libm.a at all
-        math_libs = ['m']
-        if host_platform in ['darwin', 'beos']:
-            math_libs = []
-
-        # XXX Omitted modules: gl, pure, dl, SGI-specific modules
-
-        #
-        # The following modules are all pretty straightforward, and compile
-        # on pretty much any POSIXish platform.
-        #
-
-        # Some modules that are normally always on:
-        #exts.append( Extension('_weakref', ['_weakref.c']) )
-
-        # array objects
-        exts.append( Extension('array', ['arraymodule.c']) )
-        # complex math library functions
-        exts.append( Extension('cmath', ['cmathmodule.c', '_math.c'],
-                               depends=['_math.h'],
-                               libraries=math_libs) )
-        # math library functions, e.g. sin()
-        exts.append( Extension('math',  ['mathmodule.c', '_math.c'],
-                               depends=['_math.h'],
-                               libraries=math_libs) )
-        # fast string operations implemented in C
-        exts.append( Extension('strop', ['stropmodule.c']) )
-        # time operations and variables
-        exts.append( Extension('time', ['timemodule.c'],
-                               libraries=math_libs) )
-        exts.append( Extension('datetime', ['datetimemodule.c', 'timemodule.c'],
-                               libraries=math_libs) )
-        # fast iterator tools implemented in C
-        exts.append( Extension("itertools", ["itertoolsmodule.c"]) )
-        # code that will be builtins in the future, but conflict with the
-        #  current builtins
-        exts.append( Extension('future_builtins', ['future_builtins.c']) )
-        # random number generator implemented in C
-        exts.append( Extension("_random", ["_randommodule.c"]) )
-        # high-performance collections
-        exts.append( Extension("_collections", ["_collectionsmodule.c"]) )
-        # bisect
-        exts.append( Extension("_bisect", ["_bisectmodule.c"]) )
-        # heapq
-        exts.append( Extension("_heapq", ["_heapqmodule.c"]) )
-        # operator.add() and similar goodies
-        exts.append( Extension('operator', ['operator.c']) )
-        # Python 3.1 _io library
-        exts.append( Extension("_io",
-            ["_io/bufferedio.c", "_io/bytesio.c", "_io/fileio.c",
-             "_io/iobase.c", "_io/_iomodule.c", "_io/stringio.c", "_io/textio.c"],
-             depends=["_io/_iomodule.h"], include_dirs=["Modules/_io"]))
-        # _functools
-        exts.append( Extension("_functools", ["_functoolsmodule.c"]) )
-        # _json speedups
-        exts.append( Extension("_json", ["_json.c"]) )
-        # Python C API test module
-        exts.append( Extension('_testcapi', ['_testcapimodule.c'],
-                               depends=['testcapi_long.h']) )
-        # profilers (_lsprof is for cProfile.py)
-        exts.append( Extension('_hotshot', ['_hotshot.c']) )
-        exts.append( Extension('_lsprof', ['_lsprof.c', 'rotatingtree.c']) )
-        # static Unicode character database
-        if have_unicode:
-            exts.append( Extension('unicodedata', ['unicodedata.c']) )
-        else:
-            missing.append('unicodedata')
-        # access to ISO C locale support
-        data = open('pyconfig.h').read()
-        m = re.search(r"#s*define\s+WITH_LIBINTL\s+1\s*", data)
-        if m is not None:
-            locale_libs = ['intl']
-        else:
-            locale_libs = []
-        if host_platform == 'darwin':
-            locale_extra_link_args = ['-framework', 'CoreFoundation']
-        else:
-            locale_extra_link_args = []
-
-
-        exts.append( Extension('_locale', ['_localemodule.c'],
-                               libraries=locale_libs,
-                               extra_link_args=locale_extra_link_args) )
-
-        # Modules with some UNIX dependencies -- on by default:
-        # (If you have a really backward UNIX, select and socket may not be
-        # supported...)
-
-        # fcntl(2) and ioctl(2)
-        libs = []
-        if (config_h_vars.get('FLOCK_NEEDS_LIBBSD', False)):
-            # May be necessary on AIX for flock function
-            libs = ['bsd']
-        exts.append( Extension('fcntl', ['fcntlmodule.c'], libraries=libs) )
-        # pwd(3)
-        exts.append( Extension('pwd', ['pwdmodule.c']) )
-        # grp(3)
-        exts.append( Extension('grp', ['grpmodule.c']) )
-        # spwd, shadow passwords
-        if (config_h_vars.get('HAVE_GETSPNAM', False) or
-                config_h_vars.get('HAVE_GETSPENT', False)):
-            exts.append( Extension('spwd', ['spwdmodule.c']) )
-        else:
-            missing.append('spwd')
-
-        # select(2); not on ancient System V
-        exts.append( Extension('select', ['selectmodule.c']) )
-
-        # Fred Drake's interface to the Python parser
-        exts.append( Extension('parser', ['parsermodule.c']) )
-
-        # cStringIO and cPickle
-        exts.append( Extension('cStringIO', ['cStringIO.c']) )
-        exts.append( Extension('cPickle', ['cPickle.c']) )
-
-        # Memory-mapped files (also works on Win32).
-        if host_platform not in ['atheos']:
-            exts.append( Extension('mmap', ['mmapmodule.c']) )
-        else:
-            missing.append('mmap')
-
-        # Lance Ellinghaus's syslog module
-        # syslog daemon interface
-        exts.append( Extension('syslog', ['syslogmodule.c']) )
-
-        # George Neville-Neil's timing module:
-        # Deprecated in PEP 4 http://www.python.org/peps/pep-0004.html
-        # http://mail.python.org/pipermail/python-dev/2006-January/060023.html
-        #exts.append( Extension('timing', ['timingmodule.c']) )
-
-        #
-        # Here ends the simple stuff.  From here on, modules need certain
-        # libraries, are platform-specific, or present other surprises.
-        #
-
-        # Multimedia modules
-        # These don't work for 64-bit platforms!!!
-        # These represent audio samples or images as strings:
-
-        # Operations on audio samples
-        # According to #993173, this one should actually work fine on
-        # 64-bit platforms.
-        exts.append( Extension('audioop', ['audioop.c']) )
-
-        # Disabled on 64-bit platforms
-        if sys.maxint != 9223372036854775807L:
-            # Operations on images
-            exts.append( Extension('imageop', ['imageop.c']) )
-        else:
-            missing.extend(['imageop'])
-
-        # readline
-        do_readline = self.compiler.find_library_file(lib_dirs, 'readline')
-        readline_termcap_library = ""
-        curses_library = ""
-        # Determine if readline is already linked against curses or tinfo.
-        if do_readline and find_executable('ldd'):
-            fp = os.popen("ldd %s" % do_readline)
-            ldd_output = fp.readlines()
-            ret = fp.close()
-            if ret is None or ret >> 8 == 0:
-                for ln in ldd_output:
-                    if 'curses' in ln:
-                        readline_termcap_library = re.sub(
-                            r'.*lib(n?cursesw?)\.so.*', r'\1', ln
-                        ).rstrip()
-                        break
-                    if 'tinfo' in ln: # termcap interface split out from ncurses
-                        readline_termcap_library = 'tinfo'
-                        break
-        # Issue 7384: If readline is already linked against curses,
-        # use the same library for the readline and curses modules.
-        if 'curses' in readline_termcap_library:
-            curses_library = readline_termcap_library
-        elif self.compiler.find_library_file(lib_dirs, 'ncursesw'):
-            curses_library = 'ncursesw'
-        elif self.compiler.find_library_file(lib_dirs, 'ncurses'):
-            curses_library = 'ncurses'
-        elif self.compiler.find_library_file(lib_dirs, 'curses'):
-            curses_library = 'curses'
-
-        if host_platform == 'darwin':
-            os_release = int(os.uname()[2].split('.')[0])
-            dep_target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
-            if dep_target and dep_target.split('.') < ['10', '5']:
-                os_release = 8
-            if os_release < 9:
-                # MacOSX 10.4 has a broken readline. Don't try to build
-                # the readline module unless the user has installed a fixed
-                # readline package
-                if find_file('readline/rlconf.h', inc_dirs, []) is None:
-                    do_readline = False
-        if do_readline:
-            if host_platform == 'darwin' and os_release < 9:
-                # In every directory on the search path search for a dynamic
-                # library and then a static library, instead of first looking
-                # for dynamic libraries on the entiry path.
-                # This way a staticly linked custom readline gets picked up
-                # before the (possibly broken) dynamic library in /usr/lib.
-                readline_extra_link_args = ('-Wl,-search_paths_first',)
-            else:
-                readline_extra_link_args = ()
-
-            readline_libs = ['readline']
-            if readline_termcap_library:
-                pass # Issue 7384: Already linked against curses or tinfo.
-            elif curses_library:
-                readline_libs.append(curses_library)
-            elif self.compiler.find_library_file(lib_dirs +
-                                                     ['/usr/lib/termcap'],
-                                                     'termcap'):
-                readline_libs.append('termcap')
-            exts.append( Extension('readline', ['readline.c'],
-                                   library_dirs=['/usr/lib/termcap'],
-                                   extra_link_args=readline_extra_link_args,
-                                   libraries=readline_libs) )
-        else:
-            missing.append('readline')
-
-        # crypt module.
-
-        if self.compiler.find_library_file(lib_dirs, 'crypt'):
-            libs = ['crypt']
-        else:
-            libs = []
-        exts.append( Extension('crypt', ['cryptmodule.c'], libraries=libs) )
-
-        # CSV files
-        exts.append( Extension('_csv', ['_csv.c']) )
-
-        # socket(2)
-        exts.append( Extension('_socket', ['socketmodule.c', 'timemodule.c'],
-                               depends=['socketmodule.h'],
-                               libraries=math_libs) )
-        # Detect SSL support for the socket module (via _ssl)
-        search_for_ssl_incs_in = [
-                              '/usr/local/ssl/include',
-                              '/usr/contrib/ssl/include/'
-                             ]
-        ssl_incs = find_file('openssl/ssl.h', inc_dirs,
-                             search_for_ssl_incs_in
-                             )
-        if ssl_incs is not None:
-            krb5_h = find_file('krb5.h', inc_dirs,
-                               ['/usr/kerberos/include'])
-            if krb5_h:
-                ssl_incs += krb5_h
-        ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
-                                     ['/usr/local/ssl/lib',
-                                      '/usr/contrib/ssl/lib/'
-                                     ] )
-
-        if (ssl_incs is not None and
-            ssl_libs is not None):
-            exts.append( Extension('_ssl', ['_ssl.c'],
-                                   include_dirs = ssl_incs,
-                                   library_dirs = ssl_libs,
-                                   libraries = ['ssl', 'crypto'],
-                                   depends = ['socketmodule.h']), )
-        else:
-            missing.append('_ssl')
-
-        # find out which version of OpenSSL we have
-        openssl_ver = 0
-        openssl_ver_re = re.compile(
-            '^\s*#\s*define\s+OPENSSL_VERSION_NUMBER\s+(0x[0-9a-fA-F]+)' )
-
-        # look for the openssl version header on the compiler search path.
-        opensslv_h = find_file('openssl/opensslv.h', [],
-                inc_dirs + search_for_ssl_incs_in)
-        if opensslv_h:
-            name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
-            if host_platform == 'darwin' and is_macosx_sdk_path(name):
-                name = os.path.join(macosx_sdk_root(), name[1:])
-            try:
-                incfile = open(name, 'r')
-                for line in incfile:
-                    m = openssl_ver_re.match(line)
-                    if m:
-                        openssl_ver = eval(m.group(1))
-            except IOError, msg:
-                print "IOError while reading opensshv.h:", msg
-                pass
-
-        min_openssl_ver = 0x00907000
-        have_any_openssl = ssl_incs is not None and ssl_libs is not None
-        have_usable_openssl = (have_any_openssl and
-                               openssl_ver >= min_openssl_ver)
-
-        if have_any_openssl:
-            if have_usable_openssl:
-                # The _hashlib module wraps optimized implementations
-                # of hash functions from the OpenSSL library.
-                exts.append( Extension('_hashlib', ['_hashopenssl.c'],
-                                       include_dirs = ssl_incs,
-                                       library_dirs = ssl_libs,
-                                       libraries = ['ssl', 'crypto']) )
-            else:
-                print ("warning: openssl 0x%08x is too old for _hashlib" %
-                       openssl_ver)
-                missing.append('_hashlib')
-        if COMPILED_WITH_PYDEBUG or not have_usable_openssl:
-            # The _sha module implements the SHA1 hash algorithm.
-            exts.append( Extension('_sha', ['shamodule.c']) )
-            # The _md5 module implements the RSA Data Security, Inc. MD5
-            # Message-Digest Algorithm, described in RFC 1321.  The
-            # necessary files md5.c and md5.h are included here.
-            exts.append( Extension('_md5',
-                            sources = ['md5module.c', 'md5.c'],
-                            depends = ['md5.h']) )
-
-        min_sha2_openssl_ver = 0x00908000
-        if COMPILED_WITH_PYDEBUG or openssl_ver < min_sha2_openssl_ver:
-            # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash
-            exts.append( Extension('_sha256', ['sha256module.c']) )
-            exts.append( Extension('_sha512', ['sha512module.c']) )
-
-        # Modules that provide persistent dictionary-like semantics.  You will
-        # probably want to arrange for at least one of them to be available on
-        # your machine, though none are defined by default because of library
-        # dependencies.  The Python module anydbm.py provides an
-        # implementation independent wrapper for these; dumbdbm.py provides
-        # similar functionality (but slower of course) implemented in Python.
-
-        # Sleepycat^WOracle Berkeley DB interface.
-        #  http://www.oracle.com/database/berkeley-db/db/index.html
-        #
-        # This requires the Sleepycat^WOracle DB code. The supported versions
-        # are set below.  Visit the URL above to download
-        # a release.  Most open source OSes come with one or more
-        # versions of BerkeleyDB already installed.
-
-        max_db_ver = (5, 3)
-        min_db_ver = (4, 3)
-        db_setup_debug = False   # verbose debug prints from this script?
-
-        def allow_db_ver(db_ver):
-            """Returns a boolean if the given BerkeleyDB version is acceptable.
-
-            Args:
-              db_ver: A tuple of the version to verify.
-            """
-            if not (min_db_ver <= db_ver <= max_db_ver):
-                return False
-            # Use this function to filter out known bad configurations.
-            if (4, 6) == db_ver[:2]:
-                # BerkeleyDB 4.6.x is not stable on many architectures.
-                arch = platform_machine()
-                if arch not in ('i386', 'i486', 'i586', 'i686',
-                                'x86_64', 'ia64'):
-                    return False
-            return True
-
-        def gen_db_minor_ver_nums(major):
-            if major == 5:
-                for x in range(max_db_ver[1]+1):
-                    if allow_db_ver((5, x)):
-                        yield x
-            elif major == 4:
-                for x in range(max_db_ver[1]+1):
-                    if allow_db_ver((4, x)):
-                        yield x
-            elif major == 3:
-                for x in (3,):
-                    if allow_db_ver((3, x)):
-                        yield x
-            else:
-                raise ValueError("unknown major BerkeleyDB version", major)
-
-        # construct a list of paths to look for the header file in on
-        # top of the normal inc_dirs.
-        db_inc_paths = [
-            '/usr/include/db4',
-            '/usr/local/include/db4',
-            '/opt/sfw/include/db4',
-            '/usr/include/db3',
-            '/usr/local/include/db3',
-            '/opt/sfw/include/db3',
-            # Fink defaults (http://fink.sourceforge.net/)
-            '/sw/include/db4',
-            '/sw/include/db3',
-        ]
-        # 4.x minor number specific paths
-        for x in gen_db_minor_ver_nums(4):
-            db_inc_paths.append('/usr/include/db4%d' % x)
-            db_inc_paths.append('/usr/include/db4.%d' % x)
-            db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
-            db_inc_paths.append('/usr/local/include/db4%d' % x)
-            db_inc_paths.append('/pkg/db-4.%d/include' % x)
-            db_inc_paths.append('/opt/db-4.%d/include' % x)
-            # MacPorts default (http://www.macports.org/)
-            db_inc_paths.append('/opt/local/include/db4%d' % x)
-        # 3.x minor number specific paths
-        for x in gen_db_minor_ver_nums(3):
-            db_inc_paths.append('/usr/include/db3%d' % x)
-            db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x)
-            db_inc_paths.append('/usr/local/include/db3%d' % x)
-            db_inc_paths.append('/pkg/db-3.%d/include' % x)
-            db_inc_paths.append('/opt/db-3.%d/include' % x)
-
-        if cross_compiling:
-            db_inc_paths = []
-
-        # Add some common subdirectories for Sleepycat DB to the list,
-        # based on the standard include directories. This way DB3/4 gets
-        # picked up when it is installed in a non-standard prefix and
-        # the user has added that prefix into inc_dirs.
-        std_variants = []
-        for dn in inc_dirs:
-            std_variants.append(os.path.join(dn, 'db3'))
-            std_variants.append(os.path.join(dn, 'db4'))
-            for x in gen_db_minor_ver_nums(4):
-                std_variants.append(os.path.join(dn, "db4%d"%x))
-                std_variants.append(os.path.join(dn, "db4.%d"%x))
-            for x in gen_db_minor_ver_nums(3):
-                std_variants.append(os.path.join(dn, "db3%d"%x))
-                std_variants.append(os.path.join(dn, "db3.%d"%x))
-
-        db_inc_paths = std_variants + db_inc_paths
-        db_inc_paths = [p for p in db_inc_paths if os.path.exists(p)]
-
-        db_ver_inc_map = {}
-
-        if host_platform == 'darwin':
-            sysroot = macosx_sdk_root()
-
-        class db_found(Exception): pass
-        try:
-            # See whether there is a Sleepycat header in the standard
-            # search path.
-            for d in inc_dirs + db_inc_paths:
-                f = os.path.join(d, "db.h")
-
-                if host_platform == 'darwin' and is_macosx_sdk_path(d):
-                    f = os.path.join(sysroot, d[1:], "db.h")
-
-                if db_setup_debug: print "db: looking for db.h in", f
-                if os.path.exists(f):
-                    f = open(f).read()
-                    m = re.search(r"#define\WDB_VERSION_MAJOR\W(\d+)", f)
-                    if m:
-                        db_major = int(m.group(1))
-                        m = re.search(r"#define\WDB_VERSION_MINOR\W(\d+)", f)
-                        db_minor = int(m.group(1))
-                        db_ver = (db_major, db_minor)
-
-                        # Avoid 4.6 prior to 4.6.21 due to a BerkeleyDB bug
-                        if db_ver == (4, 6):
-                            m = re.search(r"#define\WDB_VERSION_PATCH\W(\d+)", f)
-                            db_patch = int(m.group(1))
-                            if db_patch < 21:
-                                print "db.h:", db_ver, "patch", db_patch,
-                                print "being ignored (4.6.x must be >= 4.6.21)"
-                                continue
-
-                        if ( (db_ver not in db_ver_inc_map) and
-                            allow_db_ver(db_ver) ):
-                            # save the include directory with the db.h version
-                            # (first occurrence only)
-                            db_ver_inc_map[db_ver] = d
-                            if db_setup_debug:
-                                print "db.h: found", db_ver, "in", d
-                        else:
-                            # we already found a header for this library version
-                            if db_setup_debug: print "db.h: ignoring", d
-                    else:
-                        # ignore this header, it didn't contain a version number
-                        if db_setup_debug:
-                            print "db.h: no version number version in", d
-
-            db_found_vers = db_ver_inc_map.keys()
-            db_found_vers.sort()
-
-            while db_found_vers:
-                db_ver = db_found_vers.pop()
-                db_incdir = db_ver_inc_map[db_ver]
-
-                # check lib directories parallel to the location of the header
-                db_dirs_to_check = [
-                    db_incdir.replace("include", 'lib64'),
-                    db_incdir.replace("include", 'lib'),
-                ]
-
-                if host_platform != 'darwin':
-                    db_dirs_to_check = filter(os.path.isdir, db_dirs_to_check)
-
-                else:
-                    # Same as other branch, but takes OSX SDK into account
-                    tmp = []
-                    for dn in db_dirs_to_check:
-                        if is_macosx_sdk_path(dn):
-                            if os.path.isdir(os.path.join(sysroot, dn[1:])):
-                                tmp.append(dn)
-                        else:
-                            if os.path.isdir(dn):
-                                tmp.append(dn)
-                    db_dirs_to_check = tmp
-
-                # Look for a version specific db-X.Y before an ambiguous dbX
-                # XXX should we -ever- look for a dbX name?  Do any
-                # systems really not name their library by version and
-                # symlink to more general names?
-                for dblib in (('db-%d.%d' % db_ver),
-                              ('db%d%d' % db_ver),
-                              ('db%d' % db_ver[0])):
-                    dblib_file = self.compiler.find_library_file(
-                                    db_dirs_to_check + lib_dirs, dblib )
-                    if dblib_file:
-                        dblib_dir = [ os.path.abspath(os.path.dirname(dblib_file)) ]
-                        raise db_found
-                    else:
-                        if db_setup_debug: print "db lib: ", dblib, "not found"
-
-        except db_found:
-            if db_setup_debug:
-                print "bsddb using BerkeleyDB lib:", db_ver, dblib
-                print "bsddb lib dir:", dblib_dir, " inc dir:", db_incdir
-            db_incs = [db_incdir]
-            dblibs = [dblib]
-            # We add the runtime_library_dirs argument because the
-            # BerkeleyDB lib we're linking against often isn't in the
-            # system dynamic library search path.  This is usually
-            # correct and most trouble free, but may cause problems in
-            # some unusual system configurations (e.g. the directory
-            # is on an NFS server that goes away).
-            exts.append(Extension('_bsddb', ['_bsddb.c'],
-                                  depends = ['bsddb.h'],
-                                  library_dirs=dblib_dir,
-                                  runtime_library_dirs=dblib_dir,
-                                  include_dirs=db_incs,
-                                  libraries=dblibs))
-        else:
-            if db_setup_debug: print "db: no appropriate library found"
-            db_incs = None
-            dblibs = []
-            dblib_dir = None
-            missing.append('_bsddb')
-
-        # The sqlite interface
-        sqlite_setup_debug = False   # verbose debug prints from this script?
-
-        # We hunt for #define SQLITE_VERSION "n.n.n"
-        # We need to find >= sqlite version 3.0.8
-        sqlite_incdir = sqlite_libdir = None
-        sqlite_inc_paths = [ '/usr/include',
-                             '/usr/include/sqlite',
-                             '/usr/include/sqlite3',
-                             '/usr/local/include',
-                             '/usr/local/include/sqlite',
-                             '/usr/local/include/sqlite3',
-                           ]
-        if cross_compiling:
-            sqlite_inc_paths = []
-        MIN_SQLITE_VERSION_NUMBER = (3, 0, 8)
-        MIN_SQLITE_VERSION = ".".join([str(x)
-                                    for x in MIN_SQLITE_VERSION_NUMBER])
-
-        # Scan the default include directories before the SQLite specific
-        # ones. This allows one to override the copy of sqlite on OSX,
-        # where /usr/include contains an old version of sqlite.
-        if host_platform == 'darwin':
-            sysroot = macosx_sdk_root()
-
-        for d_ in inc_dirs + sqlite_inc_paths:
-            d = d_
-            if host_platform == 'darwin' and is_macosx_sdk_path(d):
-                d = os.path.join(sysroot, d[1:])
-
-            f = os.path.join(d, "sqlite3.h")
-            if os.path.exists(f):
-                if sqlite_setup_debug: print "sqlite: found %s"%f
-                incf = open(f).read()
-                m = re.search(
-                    r'\s*.*#\s*.*define\s.*SQLITE_VERSION\W*"([\d\.]*)"', incf)
-                if m:
-                    sqlite_version = m.group(1)
-                    sqlite_version_tuple = tuple([int(x)
-                                        for x in sqlite_version.split(".")])
-                    if sqlite_version_tuple >= MIN_SQLITE_VERSION_NUMBER:
-                        # we win!
-                        if sqlite_setup_debug:
-                            print "%s/sqlite3.h: version %s"%(d, sqlite_version)
-                        sqlite_incdir = d
-                        break
-                    else:
-                        if sqlite_setup_debug:
-                            print "%s: version %d is too old, need >= %s"%(d,
-                                        sqlite_version, MIN_SQLITE_VERSION)
-                elif sqlite_setup_debug:
-                    print "sqlite: %s had no SQLITE_VERSION"%(f,)
-
-        if sqlite_incdir:
-            sqlite_dirs_to_check = [
-                os.path.join(sqlite_incdir, '..', 'lib64'),
-                os.path.join(sqlite_incdir, '..', 'lib'),
-                os.path.join(sqlite_incdir, '..', '..', 'lib64'),
-                os.path.join(sqlite_incdir, '..', '..', 'lib'),
-            ]
-            sqlite_libfile = self.compiler.find_library_file(
-                                sqlite_dirs_to_check + lib_dirs, 'sqlite3')
-            if sqlite_libfile:
-                sqlite_libdir = [os.path.abspath(os.path.dirname(sqlite_libfile))]
-
-        if sqlite_incdir and sqlite_libdir:
-            sqlite_srcs = ['_sqlite/cache.c',
-                '_sqlite/connection.c',
-                '_sqlite/cursor.c',
-                '_sqlite/microprotocols.c',
-                '_sqlite/module.c',
-                '_sqlite/prepare_protocol.c',
-                '_sqlite/row.c',
-                '_sqlite/statement.c',
-                '_sqlite/util.c', ]
-
-            sqlite_defines = []
-            if host_platform != "win32":
-                sqlite_defines.append(('MODULE_NAME', '"sqlite3"'))
-            else:
-                sqlite_defines.append(('MODULE_NAME', '\\"sqlite3\\"'))
-
-            # Comment this out if you want the sqlite3 module to be able to load extensions.
-            sqlite_defines.append(("SQLITE_OMIT_LOAD_EXTENSION", "1"))
-
-            if host_platform == 'darwin':
-                # In every directory on the search path search for a dynamic
-                # library and then a static library, instead of first looking
-                # for dynamic libraries on the entire path.
-                # This way a statically linked custom sqlite gets picked up
-                # before the dynamic library in /usr/lib.
-                sqlite_extra_link_args = ('-Wl,-search_paths_first',)
-            else:
-                sqlite_extra_link_args = ()
-
-            exts.append(Extension('_sqlite3', sqlite_srcs,
-                                  define_macros=sqlite_defines,
-                                  include_dirs=["Modules/_sqlite",
-                                                sqlite_incdir],
-                                  library_dirs=sqlite_libdir,
-                                  runtime_library_dirs=sqlite_libdir,
-                                  extra_link_args=sqlite_extra_link_args,
-                                  libraries=["sqlite3",]))
-        else:
-            missing.append('_sqlite3')
-
-        # Look for Berkeley db 1.85.   Note that it is built as a different
-        # module name so it can be included even when later versions are
-        # available.  A very restrictive search is performed to avoid
-        # accidentally building this module with a later version of the
-        # underlying db library.  May BSD-ish Unixes incorporate db 1.85
-        # symbols into libc and place the include file in /usr/include.
-        #
-        # If the better bsddb library can be built (db_incs is defined)
-        # we do not build this one.  Otherwise this build will pick up
-        # the more recent berkeleydb's db.h file first in the include path
-        # when attempting to compile and it will fail.
-        f = "/usr/include/db.h"
-
-        if host_platform == 'darwin':
-            if is_macosx_sdk_path(f):
-                sysroot = macosx_sdk_root()
-                f = os.path.join(sysroot, f[1:])
-
-        if os.path.exists(f) and not db_incs:
-            data = open(f).read()
-            m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
-            if m is not None:
-                # bingo - old version used hash file format version 2
-                ### XXX this should be fixed to not be platform-dependent
-                ### but I don't have direct access to an osf1 platform and
-                ### seemed to be muffing the search somehow
-                libraries = host_platform == "osf1" and ['db'] or None
-                if libraries is not None:
-                    exts.append(Extension('bsddb185', ['bsddbmodule.c'],
-                                          libraries=libraries))
-                else:
-                    exts.append(Extension('bsddb185', ['bsddbmodule.c']))
-            else:
-                missing.append('bsddb185')
-        else:
-            missing.append('bsddb185')
-
-        dbm_order = ['gdbm']
-        # The standard Unix dbm module:
-        if host_platform not in ['cygwin']:
-            config_args = [arg.strip("'")
-                           for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
-            dbm_args = [arg for arg in config_args
-                        if arg.startswith('--with-dbmliborder=')]
-            if dbm_args:
-                dbm_order = [arg.split('=')[-1] for arg in dbm_args][-1].split(":")
-            else:
-                dbm_order = "ndbm:gdbm:bdb".split(":")
-            dbmext = None
-            for cand in dbm_order:
-                if cand == "ndbm":
-                    if find_file("ndbm.h", inc_dirs, []) is not None:
-                        # Some systems have -lndbm, others have -lgdbm_compat,
-                        # others don't have either
-                        if self.compiler.find_library_file(lib_dirs,
-                                                               'ndbm'):
-                            ndbm_libs = ['ndbm']
-                        elif self.compiler.find_library_file(lib_dirs,
-                                                             'gdbm_compat'):
-                            ndbm_libs = ['gdbm_compat']
-                        else:
-                            ndbm_libs = []
-                        print "building dbm using ndbm"
-                        dbmext = Extension('dbm', ['dbmmodule.c'],
-                                           define_macros=[
-                                               ('HAVE_NDBM_H',None),
-                                               ],
-                                           libraries=ndbm_libs)
-                        break
-
-                elif cand == "gdbm":
-                    if self.compiler.find_library_file(lib_dirs, 'gdbm'):
-                        gdbm_libs = ['gdbm']
-                        if self.compiler.find_library_file(lib_dirs,
-                                                               'gdbm_compat'):
-                            gdbm_libs.append('gdbm_compat')
-                        if find_file("gdbm/ndbm.h", inc_dirs, []) is not None:
-                            print "building dbm using gdbm"
-                            dbmext = Extension(
-                                'dbm', ['dbmmodule.c'],
-                                define_macros=[
-                                    ('HAVE_GDBM_NDBM_H', None),
-                                    ],
-                                libraries = gdbm_libs)
-                            break
-                        if find_file("gdbm-ndbm.h", inc_dirs, []) is not None:
-                            print "building dbm using gdbm"
-                            dbmext = Extension(
-                                'dbm', ['dbmmodule.c'],
-                                define_macros=[
-                                    ('HAVE_GDBM_DASH_NDBM_H', None),
-                                    ],
-                                libraries = gdbm_libs)
-                            break
-                elif cand == "bdb":
-                    if db_incs is not None:
-                        print "building dbm using bdb"
-                        dbmext = Extension('dbm', ['dbmmodule.c'],
-                                           library_dirs=dblib_dir,
-                                           runtime_library_dirs=dblib_dir,
-                                           include_dirs=db_incs,
-                                           define_macros=[
-                                               ('HAVE_BERKDB_H', None),
-                                               ('DB_DBM_HSEARCH', None),
-                                               ],
-                                           libraries=dblibs)
-                        break
-            if dbmext is not None:
-                exts.append(dbmext)
-            else:
-                missing.append('dbm')
-
-        # Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
-        if ('gdbm' in dbm_order and
-            self.compiler.find_library_file(lib_dirs, 'gdbm')):
-            exts.append( Extension('gdbm', ['gdbmmodule.c'],
-                                   libraries = ['gdbm'] ) )
-        else:
-            missing.append('gdbm')
-
-        # Unix-only modules
-        if host_platform not in ['win32']:
-            # Steen Lumholt's termios module
-            exts.append( Extension('termios', ['termios.c']) )
-            # Jeremy Hylton's rlimit interface
-            if host_platform not in ['atheos']:
-                exts.append( Extension('resource', ['resource.c']) )
-            else:
-                missing.append('resource')
-
-            # Sun yellow pages. Some systems have the functions in libc.
-            if (host_platform not in ['cygwin', 'atheos', 'qnx6'] and
-                find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None):
-                if (self.compiler.find_library_file(lib_dirs, 'nsl')):
-                    libs = ['nsl']
-                else:
-                    libs = []
-                exts.append( Extension('nis', ['nismodule.c'],
-                                       libraries = libs) )
-            else:
-                missing.append('nis')
-        else:
-            missing.extend(['nis', 'resource', 'termios'])
-
-        # Curses support, requiring the System V version of curses, often
-        # provided by the ncurses library.
-        panel_library = 'panel'
-        if curses_library.startswith('ncurses'):
-            if curses_library == 'ncursesw':
-                # Bug 1464056: If _curses.so links with ncursesw,
-                # _curses_panel.so must link with panelw.
-                panel_library = 'panelw'
-            curses_libs = [curses_library]
-            exts.append( Extension('_curses', ['_cursesmodule.c'],
-                                   libraries = curses_libs) )
-        elif curses_library == 'curses' and host_platform != 'darwin':
-                # OSX has an old Berkeley curses, not good enough for
-                # the _curses module.
-            if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
-                curses_libs = ['curses', 'terminfo']
-            elif (self.compiler.find_library_file(lib_dirs, 'termcap')):
-                curses_libs = ['curses', 'termcap']
-            else:
-                curses_libs = ['curses']
-
-            exts.append( Extension('_curses', ['_cursesmodule.c'],
-                                   libraries = curses_libs) )
-        else:
-            missing.append('_curses')
-
-        # If the curses module is enabled, check for the panel module
-        if (module_enabled(exts, '_curses') and
-            self.compiler.find_library_file(lib_dirs, panel_library)):
-            exts.append( Extension('_curses_panel', ['_curses_panel.c'],
-                                   libraries = [panel_library] + curses_libs) )
-        else:
-            missing.append('_curses_panel')
-
-        # Andrew Kuchling's zlib module.  Note that some versions of zlib
-        # 1.1.3 have security problems.  See CERT Advisory CA-2002-07:
-        # http://www.cert.org/advisories/CA-2002-07.html
-        #
-        # zlib 1.1.4 is fixed, but at least one vendor (RedHat) has decided to
-        # patch its zlib 1.1.3 package instead of upgrading to 1.1.4.  For
-        # now, we still accept 1.1.3, because we think it's difficult to
-        # exploit this in Python, and we'd rather make it RedHat's problem
-        # than our problem <wink>.
-        #
-        # You can upgrade zlib to version 1.1.4 yourself by going to
-        # http://www.gzip.org/zlib/
-        zlib_inc = find_file('zlib.h', [], inc_dirs)
-        have_zlib = False
-        if zlib_inc is not None:
-            zlib_h = zlib_inc[0] + '/zlib.h'
-            version = '"0.0.0"'
-            version_req = '"1.1.3"'
-            fp = open(zlib_h)
-            while 1:
-                line = fp.readline()
-                if not line:
-                    break
-                if line.startswith('#define ZLIB_VERSION'):
-                    version = line.split()[2]
-                    break
-            if version >= version_req:
-                if (self.compiler.find_library_file(lib_dirs, 'z')):
-                    if host_platform == "darwin":
-                        zlib_extra_link_args = ('-Wl,-search_paths_first',)
-                    else:
-                        zlib_extra_link_args = ()
-                    exts.append( Extension('zlib', ['zlibmodule.c'],
-                                           libraries = ['z'],
-                                           extra_link_args = zlib_extra_link_args))
-                    have_zlib = True
-                else:
-                    missing.append('zlib')
-            else:
-                missing.append('zlib')
-        else:
-            missing.append('zlib')
-
-        # Helper module for various ascii-encoders.  Uses zlib for an optimized
-        # crc32 if we have it.  Otherwise binascii uses its own.
-        if have_zlib:
-            extra_compile_args = ['-DUSE_ZLIB_CRC32']
-            libraries = ['z']
-            extra_link_args = zlib_extra_link_args
-        else:
-            extra_compile_args = []
-            libraries = []
-            extra_link_args = []
-        exts.append( Extension('binascii', ['binascii.c'],
-                               extra_compile_args = extra_compile_args,
-                               libraries = libraries,
-                               extra_link_args = extra_link_args) )
-
-        # Gustavo Niemeyer's bz2 module.
-        if (self.compiler.find_library_file(lib_dirs, 'bz2')):
-            if host_platform == "darwin":
-                bz2_extra_link_args = ('-Wl,-search_paths_first',)
-            else:
-                bz2_extra_link_args = ()
-            exts.append( Extension('bz2', ['bz2module.c'],
-                                   libraries = ['bz2'],
-                                   extra_link_args = bz2_extra_link_args) )
-        else:
-            missing.append('bz2')
-
-        # Interface to the Expat XML parser
-        #
-        # Expat was written by James Clark and is now maintained by a group of
-        # developers on SourceForge; see www.libexpat.org for more information.
-        # The pyexpat module was written by Paul Prescod after a prototype by
-        # Jack Jansen.  The Expat source is included in Modules/expat/.  Usage
-        # of a system shared libexpat.so is possible with --with-system-expat
-        # configure option.
-        #
-        # More information on Expat can be found at www.libexpat.org.
-        #
-        if '--with-system-expat' in sysconfig.get_config_var("CONFIG_ARGS"):
-            expat_inc = []
-            define_macros = []
-            expat_lib = ['expat']
-            expat_sources = []
-            expat_depends = []
-        else:
-            expat_inc = [os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')]
-            define_macros = [
-                ('HAVE_EXPAT_CONFIG_H', '1'),
-            ]
-            expat_lib = []
-            expat_sources = ['expat/xmlparse.c',
-                             'expat/xmlrole.c',
-                             'expat/xmltok.c']
-            expat_depends = ['expat/ascii.h',
-                             'expat/asciitab.h',
-                             'expat/expat.h',
-                             'expat/expat_config.h',
-                             'expat/expat_external.h',
-                             'expat/internal.h',
-                             'expat/latin1tab.h',
-                             'expat/utf8tab.h',
-                             'expat/xmlrole.h',
-                             'expat/xmltok.h',
-                             'expat/xmltok_impl.h'
-                             ]
-
-        exts.append(Extension('pyexpat',
-                              define_macros = define_macros,
-                              include_dirs = expat_inc,
-                              libraries = expat_lib,
-                              sources = ['pyexpat.c'] + expat_sources,
-                              depends = expat_depends,
-                              ))
-
-        # Fredrik Lundh's cElementTree module.  Note that this also
-        # uses expat (via the CAPI hook in pyexpat).
-
-        if os.path.isfile(os.path.join(srcdir, 'Modules', '_elementtree.c')):
-            define_macros.append(('USE_PYEXPAT_CAPI', None))
-            exts.append(Extension('_elementtree',
-                                  define_macros = define_macros,
-                                  include_dirs = expat_inc,
-                                  libraries = expat_lib,
-                                  sources = ['_elementtree.c'],
-                                  depends = ['pyexpat.c'] + expat_sources +
-                                      expat_depends,
-                                  ))
-        else:
-            missing.append('_elementtree')
-
-        # Hye-Shik Chang's CJKCodecs modules.
-        if have_unicode:
-            exts.append(Extension('_multibytecodec',
-                                  ['cjkcodecs/multibytecodec.c']))
-            for loc in ('kr', 'jp', 'cn', 'tw', 'hk', 'iso2022'):
-                exts.append(Extension('_codecs_%s' % loc,
-                                      ['cjkcodecs/_codecs_%s.c' % loc]))
-        else:
-            missing.append('_multibytecodec')
-            for loc in ('kr', 'jp', 'cn', 'tw', 'hk', 'iso2022'):
-                missing.append('_codecs_%s' % loc)
-
-        # Dynamic loading module
-        if sys.maxint == 0x7fffffff:
-            # This requires sizeof(int) == sizeof(long) == sizeof(char*)
-            dl_inc = find_file('dlfcn.h', [], inc_dirs)
-            if (dl_inc is not None) and (host_platform not in ['atheos']):
-                exts.append( Extension('dl', ['dlmodule.c']) )
-            else:
-                missing.append('dl')
-        else:
-            missing.append('dl')
-
-        # Thomas Heller's _ctypes module
-        self.detect_ctypes(inc_dirs, lib_dirs)
-
-        # Richard Oudkerk's multiprocessing module
-        if host_platform == 'win32':             # Windows
-            macros = dict()
-            libraries = ['ws2_32']
-
-        elif host_platform == 'darwin':          # Mac OSX
-            macros = dict()
-            libraries = []
-
-        elif host_platform == 'cygwin':          # Cygwin
-            macros = dict()
-            libraries = []
-
-        elif host_platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
-            # FreeBSD's P1003.1b semaphore support is very experimental
-            # and has many known problems. (as of June 2008)
-            macros = dict()
-            libraries = []
-
-        elif host_platform.startswith('openbsd'):
-            macros = dict()
-            libraries = []
-
-        elif host_platform.startswith('netbsd'):
-            macros = dict()
-            libraries = []
-
-        else:                                   # Linux and other unices
-            macros = dict()
-            libraries = ['rt']
-
-        if host_platform == 'win32':
-            multiprocessing_srcs = [ '_multiprocessing/multiprocessing.c',
-                                     '_multiprocessing/semaphore.c',
-                                     '_multiprocessing/pipe_connection.c',
-                                     '_multiprocessing/socket_connection.c',
-                                     '_multiprocessing/win32_functions.c'
-                                   ]
-
-        else:
-            multiprocessing_srcs = [ '_multiprocessing/multiprocessing.c',
-                                     '_multiprocessing/socket_connection.c'
-                                   ]
-            if (sysconfig.get_config_var('HAVE_SEM_OPEN') and not
-                sysconfig.get_config_var('POSIX_SEMAPHORES_NOT_ENABLED')):
-                multiprocessing_srcs.append('_multiprocessing/semaphore.c')
-
-        if sysconfig.get_config_var('WITH_THREAD'):
-            exts.append ( Extension('_multiprocessing', multiprocessing_srcs,
-                                    define_macros=macros.items(),
-                                    include_dirs=["Modules/_multiprocessing"]))
-        else:
-            missing.append('_multiprocessing')
-
-        # End multiprocessing
-
-
-        # Platform-specific libraries
-        if host_platform == 'linux2':
-            # Linux-specific modules
-            exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) )
-        else:
-            missing.append('linuxaudiodev')
-
-        if (host_platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
-                        'freebsd7', 'freebsd8')
-            or host_platform.startswith("gnukfreebsd")):
-            exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
-        else:
-            missing.append('ossaudiodev')
-
-        if host_platform == 'sunos5':
-            # SunOS specific modules
-            exts.append( Extension('sunaudiodev', ['sunaudiodev.c']) )
-        else:
-            missing.append('sunaudiodev')
-
-        if host_platform == 'darwin':
-            # _scproxy
-            exts.append(Extension("_scproxy", [os.path.join(srcdir, "Mac/Modules/_scproxy.c")],
-                extra_link_args= [
-                    '-framework', 'SystemConfiguration',
-                    '-framework', 'CoreFoundation'
-                ]))
-
-
-        if host_platform == 'darwin' and ("--disable-toolbox-glue" not in
-                sysconfig.get_config_var("CONFIG_ARGS")):
-
-            if int(os.uname()[2].split('.')[0]) >= 8:
-                # We're on Mac OS X 10.4 or later, the compiler should
-                # support '-Wno-deprecated-declarations'. This will
-                # surpress deprecation warnings for the Carbon extensions,
-                # these extensions wrap the Carbon APIs and even those
-                # parts that are deprecated.
-                carbon_extra_compile_args = ['-Wno-deprecated-declarations']
-            else:
-                carbon_extra_compile_args = []
-
-            # Mac OS X specific modules.
-            def macSrcExists(name1, name2=''):
-                if not name1:
-                    return None
-                names = (name1,)
-                if name2:
-                    names = (name1, name2)
-                path = os.path.join(srcdir, 'Mac', 'Modules', *names)
-                return os.path.exists(path)
-
-            def addMacExtension(name, kwds, extra_srcs=[]):
-                dirname = ''
-                if name[0] == '_':
-                    dirname = name[1:].lower()
-                cname = name + '.c'
-                cmodulename = name + 'module.c'
-                # Check for NNN.c, NNNmodule.c, _nnn/NNN.c, _nnn/NNNmodule.c
-                if macSrcExists(cname):
-                    srcs = [cname]
-                elif macSrcExists(cmodulename):
-                    srcs = [cmodulename]
-                elif macSrcExists(dirname, cname):
-                    # XXX(nnorwitz): If all the names ended with module, we
-                    # wouldn't need this condition.  ibcarbon is the only one.
-                    srcs = [os.path.join(dirname, cname)]
-                elif macSrcExists(dirname, cmodulename):
-                    srcs = [os.path.join(dirname, cmodulename)]
-                else:
-                    raise RuntimeError("%s not found" % name)
-
-                # Here's the whole point:  add the extension with sources
-                exts.append(Extension(name, srcs + extra_srcs, **kwds))
-
-            # Core Foundation
-            core_kwds = {'extra_compile_args': carbon_extra_compile_args,
-                         'extra_link_args': ['-framework', 'CoreFoundation'],
-                        }
-            addMacExtension('_CF', core_kwds, ['cf/pycfbridge.c'])
-            addMacExtension('autoGIL', core_kwds)
-
-
-
-            # Carbon
-            carbon_kwds = {'extra_compile_args': carbon_extra_compile_args,
-                           'extra_link_args': ['-framework', 'Carbon'],
-                          }
-            CARBON_EXTS = ['ColorPicker', 'gestalt', 'MacOS', 'Nav',
-                           'OSATerminology', 'icglue',
-                           # All these are in subdirs
-                           '_AE', '_AH', '_App', '_CarbonEvt', '_Cm', '_Ctl',
-                           '_Dlg', '_Drag', '_Evt', '_File', '_Folder', '_Fm',
-                           '_Help', '_Icn', '_IBCarbon', '_List',
-                           '_Menu', '_Mlte', '_OSA', '_Res', '_Qd', '_Qdoffs',
-                           '_Scrap', '_Snd', '_TE',
-                          ]
-            for name in CARBON_EXTS:
-                addMacExtension(name, carbon_kwds)
-
-            # Workaround for a bug in the version of gcc shipped with Xcode 3.
-            # The _Win extension should build just like the other Carbon extensions, but
-            # this actually results in a hard crash of the linker.
-            #
-            if '-arch ppc64' in cflags and '-arch ppc' in cflags:
-                win_kwds = {'extra_compile_args': carbon_extra_compile_args + ['-arch', 'i386', '-arch', 'ppc'],
-                               'extra_link_args': ['-framework', 'Carbon', '-arch', 'i386', '-arch', 'ppc'],
-                           }
-                addMacExtension('_Win', win_kwds)
-            else:
-                addMacExtension('_Win', carbon_kwds)
-
-
-            # Application Services & QuickTime
-            app_kwds = {'extra_compile_args': carbon_extra_compile_args,
-                        'extra_link_args': ['-framework','ApplicationServices'],
-                       }
-            addMacExtension('_Launch', app_kwds)
-            addMacExtension('_CG', app_kwds)
-
-            exts.append( Extension('_Qt', ['qt/_Qtmodule.c'],
-                        extra_compile_args=carbon_extra_compile_args,
-                        extra_link_args=['-framework', 'QuickTime',
-                                     '-framework', 'Carbon']) )
-
-
-        self.extensions.extend(exts)
-
-        # Call the method for detecting whether _tkinter can be compiled
-        self.detect_tkinter(inc_dirs, lib_dirs)
-
-        if '_tkinter' not in [e.name for e in self.extensions]:
-            missing.append('_tkinter')
-
-        return missing
-
-    def detect_tkinter_darwin(self, inc_dirs, lib_dirs):
-        # The _tkinter module, using frameworks. Since frameworks are quite
-        # different the UNIX search logic is not sharable.
-        from os.path import join, exists
-        framework_dirs = [
-            '/Library/Frameworks',
-            '/System/Library/Frameworks/',
-            join(os.getenv('HOME'), '/Library/Frameworks')
-        ]
-
-        sysroot = macosx_sdk_root()
-
-        # Find the directory that contains the Tcl.framework and Tk.framework
-        # bundles.
-        # XXX distutils should support -F!
-        for F in framework_dirs:
-            # both Tcl.framework and Tk.framework should be present
-
-
-            for fw in 'Tcl', 'Tk':
-                if is_macosx_sdk_path(F):
-                    if not exists(join(sysroot, F[1:], fw + '.framework')):
-                        break
-                else:
-                    if not exists(join(F, fw + '.framework')):
-                        break
-            else:
-                # ok, F is now directory with both frameworks. Continure
-                # building
-                break
-        else:
-            # Tk and Tcl frameworks not found. Normal "unix" tkinter search
-            # will now resume.
-            return 0
-
-        # For 8.4a2, we must add -I options that point inside the Tcl and Tk
-        # frameworks. In later release we should hopefully be able to pass
-        # the -F option to gcc, which specifies a framework lookup path.
-        #
-        include_dirs = [
-            join(F, fw + '.framework', H)
-            for fw in 'Tcl', 'Tk'
-            for H in 'Headers', 'Versions/Current/PrivateHeaders'
-        ]
-
-        # For 8.4a2, the X11 headers are not included. Rather than include a
-        # complicated search, this is a hard-coded path. It could bail out
-        # if X11 libs are not found...
-        include_dirs.append('/usr/X11R6/include')
-        frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
-
-        # All existing framework builds of Tcl/Tk don't support 64-bit
-        # architectures.
-        cflags = sysconfig.get_config_vars('CFLAGS')[0]
-        archs = re.findall('-arch\s+(\w+)', cflags)
-
-        if is_macosx_sdk_path(F):
-            fp = os.popen("file %s/Tk.framework/Tk | grep 'for architecture'"%(os.path.join(sysroot, F[1:]),))
-        else:
-            fp = os.popen("file %s/Tk.framework/Tk | grep 'for architecture'"%(F,))
-
-        detected_archs = []
-        for ln in fp:
-            a = ln.split()[-1]
-            if a in archs:
-                detected_archs.append(ln.split()[-1])
-        fp.close()
-
-        for a in detected_archs:
-            frameworks.append('-arch')
-            frameworks.append(a)
-
-        ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
-                        define_macros=[('WITH_APPINIT', 1)],
-                        include_dirs = include_dirs,
-                        libraries = [],
-                        extra_compile_args = frameworks[2:],
-                        extra_link_args = frameworks,
-                        )
-        self.extensions.append(ext)
-        return 1
-
-
-    def detect_tkinter(self, inc_dirs, lib_dirs):
-        # The _tkinter module.
-
-        # Rather than complicate the code below, detecting and building
-        # AquaTk is a separate method. Only one Tkinter will be built on
-        # Darwin - either AquaTk, if it is found, or X11 based Tk.
-        if (host_platform == 'darwin' and
-            self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
-            return
-
-        # Assume we haven't found any of the libraries or include files
-        # The versions with dots are used on Unix, and the versions without
-        # dots on Windows, for detection by cygwin.
-        tcllib = tklib = tcl_includes = tk_includes = None
-        for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83',
-                        '8.2', '82', '8.1', '81', '8.0', '80']:
-            tklib = self.compiler.find_library_file(lib_dirs,
-                                                        'tk' + version)
-            tcllib = self.compiler.find_library_file(lib_dirs,
-                                                         'tcl' + version)
-            if tklib and tcllib:
-                # Exit the loop when we've found the Tcl/Tk libraries
-                break
-
-        # Now check for the header files
-        if tklib and tcllib:
-            # Check for the include files on Debian and {Free,Open}BSD, where
-            # they're put in /usr/include/{tcl,tk}X.Y
-            dotversion = version
-            if '.' not in dotversion and "bsd" in host_platform.lower():
-                # OpenBSD and FreeBSD use Tcl/Tk library names like libtcl83.a,
-                # but the include subdirs are named like .../include/tcl8.3.
-                dotversion = dotversion[:-1] + '.' + dotversion[-1]
-            tcl_include_sub = []
-            tk_include_sub = []
-            for dir in inc_dirs:
-                tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
-                tk_include_sub += [dir + os.sep + "tk" + dotversion]
-            tk_include_sub += tcl_include_sub
-            tcl_includes = find_file('tcl.h', inc_dirs, tcl_include_sub)
-            tk_includes = find_file('tk.h', inc_dirs, tk_include_sub)
-
-        if (tcllib is None or tklib is None or
-            tcl_includes is None or tk_includes is None):
-            self.announce("INFO: Can't locate Tcl/Tk libs and/or headers", 2)
-            return
-
-        # OK... everything seems to be present for Tcl/Tk.
-
-        include_dirs = [] ; libs = [] ; defs = [] ; added_lib_dirs = []
-        for dir in tcl_includes + tk_includes:
-            if dir not in include_dirs:
-                include_dirs.append(dir)
-
-        # Check for various platform-specific directories
-        if host_platform == 'sunos5':
-            include_dirs.append('/usr/openwin/include')
-            added_lib_dirs.append('/usr/openwin/lib')
-        elif os.path.exists('/usr/X11R6/include'):
-            include_dirs.append('/usr/X11R6/include')
-            added_lib_dirs.append('/usr/X11R6/lib64')
-            added_lib_dirs.append('/usr/X11R6/lib')
-        elif os.path.exists('/usr/X11R5/include'):
-            include_dirs.append('/usr/X11R5/include')
-            added_lib_dirs.append('/usr/X11R5/lib')
-        else:
-            # Assume default location for X11
-            include_dirs.append('/usr/X11/include')
-            added_lib_dirs.append('/usr/X11/lib')
-
-        # If Cygwin, then verify that X is installed before proceeding
-        if host_platform == 'cygwin':
-            x11_inc = find_file('X11/Xlib.h', [], include_dirs)
-            if x11_inc is None:
-                return
-
-        # Check for BLT extension
-        if self.compiler.find_library_file(lib_dirs + added_lib_dirs,
-                                               'BLT8.0'):
-            defs.append( ('WITH_BLT', 1) )
-            libs.append('BLT8.0')
-        elif self.compiler.find_library_file(lib_dirs + added_lib_dirs,
-                                                'BLT'):
-            defs.append( ('WITH_BLT', 1) )
-            libs.append('BLT')
-
-        # Add the Tcl/Tk libraries
-        libs.append('tk'+ version)
-        libs.append('tcl'+ version)
-
-        if host_platform in ['aix3', 'aix4']:
-            libs.append('ld')
-
-        # Finally, link with the X11 libraries (not appropriate on cygwin)
-        if host_platform != "cygwin":
-            libs.append('X11')
-
-        ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
-                        define_macros=[('WITH_APPINIT', 1)] + defs,
-                        include_dirs = include_dirs,
-                        libraries = libs,
-                        library_dirs = added_lib_dirs,
-                        )
-        self.extensions.append(ext)
-
-##         # Uncomment these lines if you want to play with xxmodule.c
-##         ext = Extension('xx', ['xxmodule.c'])
-##         self.extensions.append(ext)
-
-        # XXX handle these, but how to detect?
-        # *** Uncomment and edit for PIL (TkImaging) extension only:
-        #       -DWITH_PIL -I../Extensions/Imaging/libImaging  tkImaging.c \
-        # *** Uncomment and edit for TOGL extension only:
-        #       -DWITH_TOGL togl.c \
-        # *** Uncomment these for TOGL extension only:
-        #       -lGL -lGLU -lXext -lXmu \
-
-    def configure_ctypes_darwin(self, ext):
-        # Darwin (OS X) uses preconfigured files, in
-        # the Modules/_ctypes/libffi_osx directory.
-        srcdir = sysconfig.get_config_var('srcdir')
-        ffi_srcdir = os.path.abspath(os.path.join(srcdir, 'Modules',
-                                                  '_ctypes', 'libffi_osx'))
-        sources = [os.path.join(ffi_srcdir, p)
-                   for p in ['ffi.c',
-                             'x86/darwin64.S',
-                             'x86/x86-darwin.S',
-                             'x86/x86-ffi_darwin.c',
-                             'x86/x86-ffi64.c',
-                             'powerpc/ppc-darwin.S',
-                             'powerpc/ppc-darwin_closure.S',
-                             'powerpc/ppc-ffi_darwin.c',
-                             'powerpc/ppc64-darwin_closure.S',
-                             ]]
-
-        # Add .S (preprocessed assembly) to C compiler source extensions.
-        self.compiler.src_extensions.append('.S')
-
-        include_dirs = [os.path.join(ffi_srcdir, 'include'),
-                        os.path.join(ffi_srcdir, 'powerpc')]
-        ext.include_dirs.extend(include_dirs)
-        ext.sources.extend(sources)
-        return True
-
-    def configure_ctypes(self, ext):
-        if not self.use_system_libffi:
-            if host_platform == 'darwin':
-                return self.configure_ctypes_darwin(ext)
-
-            srcdir = sysconfig.get_config_var('srcdir')
-            ffi_builddir = os.path.join(self.build_temp, 'libffi')
-            ffi_srcdir = os.path.abspath(os.path.join(srcdir, 'Modules',
-                                         '_ctypes', 'libffi'))
-            ffi_configfile = os.path.join(ffi_builddir, 'fficonfig.py')
-
-            from distutils.dep_util import newer_group
-
-            config_sources = [os.path.join(ffi_srcdir, fname)
-                              for fname in os.listdir(ffi_srcdir)
-                              if os.path.isfile(os.path.join(ffi_srcdir, fname))]
-            if self.force or newer_group(config_sources,
-                                         ffi_configfile):
-                from distutils.dir_util import mkpath
-                mkpath(ffi_builddir)
-                config_args = [arg for arg in sysconfig.get_config_var("CONFIG_ARGS").split()
-                               if (('--host=' in arg) or ('--build=' in arg))]
-                if not self.verbose:
-                    config_args.append("-q")
-
-                # Pass empty CFLAGS because we'll just append the resulting
-                # CFLAGS to Python's; -g or -O2 is to be avoided.
-                cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \
-                      % (ffi_builddir, ffi_srcdir, " ".join(config_args))
-
-                res = os.system(cmd)
-                if res or not os.path.exists(ffi_configfile):
-                    print "Failed to configure _ctypes module"
-                    return False
-
-            fficonfig = {}
-            with open(ffi_configfile) as f:
-                exec f in fficonfig
-
-            # Add .S (preprocessed assembly) to C compiler source extensions.
-            self.compiler.src_extensions.append('.S')
-
-            include_dirs = [os.path.join(ffi_builddir, 'include'),
-                            ffi_builddir,
-                            os.path.join(ffi_srcdir, 'src')]
-            extra_compile_args = fficonfig['ffi_cflags'].split()
-
-            ext.sources.extend(os.path.join(ffi_srcdir, f) for f in
-                               fficonfig['ffi_sources'])
-            ext.include_dirs.extend(include_dirs)
-            ext.extra_compile_args.extend(extra_compile_args)
-        return True
-
-    def detect_ctypes(self, inc_dirs, lib_dirs):
-        self.use_system_libffi = False
-        include_dirs = []
-        extra_compile_args = []
-        extra_link_args = []
-        sources = ['_ctypes/_ctypes.c',
-                   '_ctypes/callbacks.c',
-                   '_ctypes/callproc.c',
-                   '_ctypes/stgdict.c',
-                   '_ctypes/cfield.c']
-        depends = ['_ctypes/ctypes.h']
-
-        if host_platform == 'darwin':
-            sources.append('_ctypes/malloc_closure.c')
-            sources.append('_ctypes/darwin/dlfcn_simple.c')
-            extra_compile_args.append('-DMACOSX')
-            include_dirs.append('_ctypes/darwin')
-# XXX Is this still needed?
-##            extra_link_args.extend(['-read_only_relocs', 'warning'])
-
-        elif host_platform == 'sunos5':
-            # XXX This shouldn't be necessary; it appears that some
-            # of the assembler code is non-PIC (i.e. it has relocations
-            # when it shouldn't. The proper fix would be to rewrite
-            # the assembler code to be PIC.
-            # This only works with GCC; the Sun compiler likely refuses
-            # this option. If you want to compile ctypes with the Sun
-            # compiler, please research a proper solution, instead of
-            # finding some -z option for the Sun compiler.
-            extra_link_args.append('-mimpure-text')
-
-        elif host_platform.startswith('hp-ux'):
-            extra_link_args.append('-fPIC')
-
-        ext = Extension('_ctypes',
-                        include_dirs=include_dirs,
-                        extra_compile_args=extra_compile_args,
-                        extra_link_args=extra_link_args,
-                        libraries=[],
-                        sources=sources,
-                        depends=depends)
-        ext_test = Extension('_ctypes_test',
-                             sources=['_ctypes/_ctypes_test.c'])
-        self.extensions.extend([ext, ext_test])
-
-        if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"):
-            return
-
-        if host_platform == 'darwin':
-            # OS X 10.5 comes with libffi.dylib; the include files are
-            # in /usr/include/ffi
-            inc_dirs.append('/usr/include/ffi')
-
-        ffi_inc = [sysconfig.get_config_var("LIBFFI_INCLUDEDIR")]
-        if not ffi_inc or ffi_inc[0] == '':
-            ffi_inc = find_file('ffi.h', [], inc_dirs)
-        if ffi_inc is not None:
-            ffi_h = ffi_inc[0] + '/ffi.h'
-            fp = open(ffi_h)
-            while 1:
-                line = fp.readline()
-                if not line:
-                    ffi_inc = None
-                    break
-                if line.startswith('#define LIBFFI_H'):
-                    break
-        ffi_lib = None
-        if ffi_inc is not None:
-            for lib_name in ('ffi_convenience', 'ffi_pic', 'ffi'):
-                if (self.compiler.find_library_file(lib_dirs, lib_name)):
-                    ffi_lib = lib_name
-                    break
-
-        if ffi_inc and ffi_lib:
-            ext.include_dirs.extend(ffi_inc)
-            ext.libraries.append(ffi_lib)
-            self.use_system_libffi = True
-
-
-class PyBuildInstall(install):
-    # Suppress the warning about installation into the lib_dynload
-    # directory, which is not in sys.path when running Python during
-    # installation:
-    def initialize_options (self):
-        install.initialize_options(self)
-        self.warn_dir=0
-
-class PyBuildInstallLib(install_lib):
-    # Do exactly what install_lib does but make sure correct access modes get
-    # set on installed directories and files. All installed files with get
-    # mode 644 unless they are a shared library in which case they will get
-    # mode 755. All installed directories will get mode 755.
-
-    so_ext = sysconfig.get_config_var("SO")
-
-    def install(self):
-        outfiles = install_lib.install(self)
-        self.set_file_modes(outfiles, 0644, 0755)
-        self.set_dir_modes(self.install_dir, 0755)
-        return outfiles
-
-    def set_file_modes(self, files, defaultMode, sharedLibMode):
-        if not self.is_chmod_supported(): return
-        if not files: return
-
-        for filename in files:
-            if os.path.islink(filename): continue
-            mode = defaultMode
-            if filename.endswith(self.so_ext): mode = sharedLibMode
-            log.info("changing mode of %s to %o", filename, mode)
-            if not self.dry_run: os.chmod(filename, mode)
-
-    def set_dir_modes(self, dirname, mode):
-        if not self.is_chmod_supported(): return
-        os.path.walk(dirname, self.set_dir_modes_visitor, mode)
-
-    def set_dir_modes_visitor(self, mode, dirname, names):
-        if os.path.islink(dirname): return
-        log.info("changing mode of %s to %o", dirname, mode)
-        if not self.dry_run: os.chmod(dirname, mode)
-
-    def is_chmod_supported(self):
-        return hasattr(os, 'chmod')
-
-SUMMARY = """
-Python is an interpreted, interactive, object-oriented programming
-language. It is often compared to Tcl, Perl, Scheme or Java.
-
-Python combines remarkable power with very clear syntax. It has
-modules, classes, exceptions, very high level dynamic data types, and
-dynamic typing. There are interfaces to many system calls and
-libraries, as well as to various windowing systems (X11, Motif, Tk,
-Mac, MFC). New built-in modules are easily written in C or C++. Python
-is also usable as an extension language for applications that need a
-programmable interface.
-
-The Python implementation is portable: it runs on many brands of UNIX,
-on Windows, DOS, OS/2, Mac, Amiga... If your favorite system isn't
-listed here, it may still be supported, if there's a C compiler for
-it. Ask around on comp.lang.python -- or just try compiling Python
-yourself.
-"""
-
-CLASSIFIERS = """
-Development Status :: 6 - Mature
-License :: OSI Approved :: Python Software Foundation License
-Natural Language :: English
-Programming Language :: C
-Programming Language :: Python
-Topic :: Software Development
-"""
-
-def main():
-    # turn off warnings when deprecated modules are imported
-    import warnings
-    warnings.filterwarnings("ignore",category=DeprecationWarning)
-    setup(# PyPI Metadata (PEP 301)
-          name = "Python",
-          version = sys.version.split()[0],
-          url = "http://www.python.org/%s" % sys.version[:3],
-          maintainer = "Guido van Rossum and the Python community",
-          maintainer_email = "python-dev@python.org",
-          description = "A high-level object-oriented programming language",
-          long_description = SUMMARY.strip(),
-          license = "PSF license",
-          classifiers = filter(None, CLASSIFIERS.split("\n")),
-          platforms = ["Many"],
-
-          # Build info
-          cmdclass = {'build_ext':PyBuildExt, 'install':PyBuildInstall,
-                      'install_lib':PyBuildInstallLib},
-          # The struct module is defined here, because build_ext won't be
-          # called unless there's at least one extension module defined.
-          ext_modules=[Extension('_struct', ['_struct.c'])],
-
-          # Scripts to install
-          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
-                     'Tools/scripts/2to3',
-                     'Lib/smtpd.py']
-        )
-
-# --install-platlib
-if __name__ == '__main__':
-    main()
diff --git a/pysrc/src/setup-2.7.7.py b/pysrc/src/setup-2.7.7.py
deleted file mode 100644
index 9a92bc3a7..000000000
--- a/pysrc/src/setup-2.7.7.py
+++ /dev/null
@@ -1,2244 +0,0 @@
-# Autodetecting setup.py script for building the Python extensions
-#
-
-__version__ = "$Revision$"
-
-import sys, os, imp, re, optparse
-from glob import glob
-from platform import machine as platform_machine
-import sysconfig
-
-from distutils import log
-from distutils import text_file
-from distutils.errors import *
-from distutils.core import Extension, setup
-from distutils.command.build_ext import build_ext
-from distutils.command.install import install
-from distutils.command.install_lib import install_lib
-from distutils.spawn import find_executable
-
-cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ
-
-def get_platform():
-    # cross build
-    if "_PYTHON_HOST_PLATFORM" in os.environ:
-        return os.environ["_PYTHON_HOST_PLATFORM"]
-    # Get value of sys.platform
-    if sys.platform.startswith('osf1'):
-        return 'osf1'
-    return sys.platform
-host_platform = get_platform()
-
-# Were we compiled --with-pydebug or with #define Py_DEBUG?
-COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
-
-# This global variable is used to hold the list of modules to be disabled.
-disabled_module_list = []
-
-def add_dir_to_list(dirlist, dir):
-    """Add the directory 'dir' to the list 'dirlist' (at the front) if
-    1) 'dir' is not already in 'dirlist'
-    2) 'dir' actually exists, and is a directory."""
-    if dir is not None and os.path.isdir(dir) and dir not in dirlist:
-        dirlist.insert(0, dir)
-
-def macosx_sdk_root():
-    """
-    Return the directory of the current OSX SDK,
-    or '/' if no SDK was specified.
-    """
-    cflags = sysconfig.get_config_var('CFLAGS')
-    m = re.search(r'-isysroot\s+(\S+)', cflags)
-    if m is None:
-        sysroot = '/'
-    else:
-        sysroot = m.group(1)
-    return sysroot
-
-def is_macosx_sdk_path(path):
-    """
-    Returns True if 'path' can be located in an OSX SDK
-    """
-    return ( (path.startswith('/usr/') and not path.startswith('/usr/local'))
-                or path.startswith('/System/')
-                or path.startswith('/Library/') )
-
-def find_file(filename, std_dirs, paths):
-    """Searches for the directory where a given file is located,
-    and returns a possibly-empty list of additional directories, or None
-    if the file couldn't be found at all.
-
-    'filename' is the name of a file, such as readline.h or libcrypto.a.
-    'std_dirs' is the list of standard system directories; if the
-        file is found in one of them, no additional directives are needed.
-    'paths' is a list of additional locations to check; if the file is
-        found in one of them, the resulting list will contain the directory.
-    """
-    if host_platform == 'darwin':
-        # Honor the MacOSX SDK setting when one was specified.
-        # An SDK is a directory with the same structure as a real
-        # system, but with only header files and libraries.
-        sysroot = macosx_sdk_root()
-
-    # Check the standard locations
-    for dir in std_dirs:
-        f = os.path.join(dir, filename)
-
-        if host_platform == 'darwin' and is_macosx_sdk_path(dir):
-            f = os.path.join(sysroot, dir[1:], filename)
-
-        if os.path.exists(f): return []
-
-    # Check the additional directories
-    for dir in paths:
-        f = os.path.join(dir, filename)
-
-        if host_platform == 'darwin' and is_macosx_sdk_path(dir):
-            f = os.path.join(sysroot, dir[1:], filename)
-
-        if os.path.exists(f):
-            return [dir]
-
-    # Not found anywhere
-    return None
-
-def find_library_file(compiler, libname, std_dirs, paths):
-    result = compiler.find_library_file(std_dirs + paths, libname)
-    if result is None:
-        return None
-
-    if host_platform == 'darwin':
-        sysroot = macosx_sdk_root()
-
-    # Check whether the found file is in one of the standard directories
-    dirname = os.path.dirname(result)
-    for p in std_dirs:
-        # Ensure path doesn't end with path separator
-        p = p.rstrip(os.sep)
-
-        if host_platform == 'darwin' and is_macosx_sdk_path(p):
-            if os.path.join(sysroot, p[1:]) == dirname:
-                return [ ]
-
-        if p == dirname:
-            return [ ]
-
-    # Otherwise, it must have been in one of the additional directories,
-    # so we have to figure out which one.
-    for p in paths:
-        # Ensure path doesn't end with path separator
-        p = p.rstrip(os.sep)
-
-        if host_platform == 'darwin' and is_macosx_sdk_path(p):
-            if os.path.join(sysroot, p[1:]) == dirname:
-                return [ p ]
-
-        if p == dirname:
-            return [p]
-    else:
-        assert False, "Internal error: Path not found in std_dirs or paths"
-
-def module_enabled(extlist, modname):
-    """Returns whether the module 'modname' is present in the list
-    of extensions 'extlist'."""
-    extlist = [ext for ext in extlist if ext.name == modname]
-    return len(extlist)
-
-def find_module_file(module, dirlist):
-    """Find a module in a set of possible folders. If it is not found
-    return the unadorned filename"""
-    list = find_file(module, [], dirlist)
-    if not list:
-        return module
-    if len(list) > 1:
-        log.info("WARNING: multiple copies of %s found"%module)
-    return os.path.join(list[0], module)
-
-class PyBuildExt(build_ext):
-
-    def __init__(self, dist):
-        build_ext.__init__(self, dist)
-        self.failed = []
-
-    def build_extensions(self):
-
-        # Detect which modules should be compiled
-        missing = self.detect_modules()
-
-        # Remove modules that are present on the disabled list
-        extensions = [ext for ext in self.extensions
-                      if ext.name not in disabled_module_list]
-        # move ctypes to the end, it depends on other modules
-        ext_map = dict((ext.name, i) for i, ext in enumerate(extensions))
-        if "_ctypes" in ext_map:
-            ctypes = extensions.pop(ext_map["_ctypes"])
-            extensions.append(ctypes)
-        self.extensions = extensions
-
-        # Fix up the autodetected modules, prefixing all the source files
-        # with Modules/ and adding Python's include directory to the path.
-        (srcdir,) = sysconfig.get_config_vars('srcdir')
-        if not srcdir:
-            # Maybe running on Windows but not using CYGWIN?
-            raise ValueError("No source directory; cannot proceed.")
-        srcdir = os.path.abspath(srcdir)
-        moddirlist = [os.path.join(srcdir, 'Modules')]
-
-        # Platform-dependent module source and include directories
-        incdirlist = []
-
-        if host_platform == 'darwin' and ("--disable-toolbox-glue" not in
-            sysconfig.get_config_var("CONFIG_ARGS")):
-            # Mac OS X also includes some mac-specific modules
-            macmoddir = os.path.join(srcdir, 'Mac/Modules')
-            moddirlist.append(macmoddir)
-            incdirlist.append(os.path.join(srcdir, 'Mac/Include'))
-
-        # Fix up the paths for scripts, too
-        self.distribution.scripts = [os.path.join(srcdir, filename)
-                                     for filename in self.distribution.scripts]
-
-        # Python header files
-        headers = [sysconfig.get_config_h_filename()]
-        headers += glob(os.path.join(sysconfig.get_path('include'), "*.h"))
-        for ext in self.extensions[:]:
-            ext.sources = [ find_module_file(filename, moddirlist)
-                            for filename in ext.sources ]
-            if ext.depends is not None:
-                ext.depends = [find_module_file(filename, moddirlist)
-                               for filename in ext.depends]
-            else:
-                ext.depends = []
-            # re-compile extensions if a header file has been changed
-            ext.depends.extend(headers)
-
-            # platform specific include directories
-            ext.include_dirs.extend(incdirlist)
-
-            # If a module has already been built statically,
-            # don't build it here
-            if ext.name in sys.builtin_module_names:
-                self.extensions.remove(ext)
-
-        # Parse Modules/Setup and Modules/Setup.local to figure out which
-        # modules are turned on in the file.
-        remove_modules = []
-        for filename in ('Modules/Setup', 'Modules/Setup.local'):
-            input = text_file.TextFile(filename, join_lines=1)
-            while 1:
-                line = input.readline()
-                if not line: break
-                line = line.split()
-                remove_modules.append(line[0])
-            input.close()
-
-        for ext in self.extensions[:]:
-            if ext.name in remove_modules:
-                self.extensions.remove(ext)
-
-        # When you run "make CC=altcc" or something similar, you really want
-        # those environment variables passed into the setup.py phase.  Here's
-        # a small set of useful ones.
-        compiler = os.environ.get('CC')
-        args = {}
-        # unfortunately, distutils doesn't let us provide separate C and C++
-        # compilers
-        if compiler is not None:
-            (ccshared,cflags) = sysconfig.get_config_vars('CCSHARED','CFLAGS')
-            args['compiler_so'] = compiler + ' ' + ccshared + ' ' + cflags
-        self.compiler.set_executables(**args)
-
-        build_ext.build_extensions(self)
-
-        longest = max([len(e.name) for e in self.extensions])
-        if self.failed:
-            longest = max(longest, max([len(name) for name in self.failed]))
-
-        def print_three_column(lst):
-            lst.sort(key=str.lower)
-            # guarantee zip() doesn't drop anything
-            while len(lst) % 3:
-                lst.append("")
-            for e, f, g in zip(lst[::3], lst[1::3], lst[2::3]):
-                print "%-*s   %-*s   %-*s" % (longest, e, longest, f,
-                                              longest, g)
-
-        if missing:
-            print
-            print ("Python build finished, but the necessary bits to build "
-                   "these modules were not found:")
-            print_three_column(missing)
-            print ("To find the necessary bits, look in setup.py in"
-                   " detect_modules() for the module's name.")
-            print
-
-        if self.failed:
-            failed = self.failed[:]
-            print
-            print "Failed to build these modules:"
-            print_three_column(failed)
-            print
-
-    def build_extension(self, ext):
-
-        if ext.name == '_ctypes':
-            if not self.configure_ctypes(ext):
-                return
-
-        try:
-            build_ext.build_extension(self, ext)
-        except (CCompilerError, DistutilsError), why:
-            self.announce('WARNING: building of extension "%s" failed: %s' %
-                          (ext.name, sys.exc_info()[1]))
-            self.failed.append(ext.name)
-            return
-        # Workaround for Mac OS X: The Carbon-based modules cannot be
-        # reliably imported into a command-line Python
-        if 'Carbon' in ext.extra_link_args:
-            self.announce(
-                'WARNING: skipping import check for Carbon-based "%s"' %
-                ext.name)
-            return
-
-        if host_platform == 'darwin' and (
-                sys.maxint > 2**32 and '-arch' in ext.extra_link_args):
-            # Don't bother doing an import check when an extension was
-            # build with an explicit '-arch' flag on OSX. That's currently
-            # only used to build 32-bit only extensions in a 4-way
-            # universal build and loading 32-bit code into a 64-bit
-            # process will fail.
-            self.announce(
-                'WARNING: skipping import check for "%s"' %
-                ext.name)
-            return
-
-        # Workaround for Cygwin: Cygwin currently has fork issues when many
-        # modules have been imported
-        if host_platform == 'cygwin':
-            self.announce('WARNING: skipping import check for Cygwin-based "%s"'
-                % ext.name)
-            return
-        ext_filename = os.path.join(
-            self.build_lib,
-            self.get_ext_filename(self.get_ext_fullname(ext.name)))
-
-        # Don't try to load extensions for cross builds
-        if cross_compiling:
-            return
-
-        try:
-            imp.load_dynamic(ext.name, ext_filename)
-        except ImportError, why:
-            self.failed.append(ext.name)
-            self.announce('*** WARNING: renaming "%s" since importing it'
-                          ' failed: %s' % (ext.name, why), level=3)
-            assert not self.inplace
-            basename, tail = os.path.splitext(ext_filename)
-            newname = basename + "_failed" + tail
-            if os.path.exists(newname):
-                os.remove(newname)
-            os.rename(ext_filename, newname)
-
-            # XXX -- This relies on a Vile HACK in
-            # distutils.command.build_ext.build_extension().  The
-            # _built_objects attribute is stored there strictly for
-            # use here.
-            # If there is a failure, _built_objects may not be there,
-            # so catch the AttributeError and move on.
-            try:
-                for filename in self._built_objects:
-                    os.remove(filename)
-            except AttributeError:
-                self.announce('unable to remove files (ignored)')
-        except:
-            exc_type, why, tb = sys.exc_info()
-            self.announce('*** WARNING: importing extension "%s" '
-                          'failed with %s: %s' % (ext.name, exc_type, why),
-                          level=3)
-            self.failed.append(ext.name)
-
-    def add_multiarch_paths(self):
-        # Debian/Ubuntu multiarch support.
-        # https://wiki.ubuntu.com/MultiarchSpec
-        cc = sysconfig.get_config_var('CC')
-        tmpfile = os.path.join(self.build_temp, 'multiarch')
-        if not os.path.exists(self.build_temp):
-            os.makedirs(self.build_temp)
-        ret = os.system(
-            '%s -print-multiarch > %s 2> /dev/null' % (cc, tmpfile))
-        multiarch_path_component = ''
-        try:
-            if ret >> 8 == 0:
-                with open(tmpfile) as fp:
-                    multiarch_path_component = fp.readline().strip()
-        finally:
-            os.unlink(tmpfile)
-
-        if multiarch_path_component != '':
-            add_dir_to_list(self.compiler.library_dirs,
-                            '/usr/lib/' + multiarch_path_component)
-            add_dir_to_list(self.compiler.include_dirs,
-                            '/usr/include/' + multiarch_path_component)
-            return
-
-        if not find_executable('dpkg-architecture'):
-            return
-        opt = ''
-        if cross_compiling:
-            opt = '-t' + sysconfig.get_config_var('HOST_GNU_TYPE')
-        tmpfile = os.path.join(self.build_temp, 'multiarch')
-        if not os.path.exists(self.build_temp):
-            os.makedirs(self.build_temp)
-        ret = os.system(
-            'dpkg-architecture %s -qDEB_HOST_MULTIARCH > %s 2> /dev/null' %
-            (opt, tmpfile))
-        try:
-            if ret >> 8 == 0:
-                with open(tmpfile) as fp:
-                    multiarch_path_component = fp.readline().strip()
-                add_dir_to_list(self.compiler.library_dirs,
-                                '/usr/lib/' + multiarch_path_component)
-                add_dir_to_list(self.compiler.include_dirs,
-                                '/usr/include/' + multiarch_path_component)
-        finally:
-            os.unlink(tmpfile)
-
-    def add_gcc_paths(self):
-        gcc = sysconfig.get_config_var('CC')
-        tmpfile = os.path.join(self.build_temp, 'gccpaths')
-        if not os.path.exists(self.build_temp):
-            os.makedirs(self.build_temp)
-        ret = os.system('%s -E -v - </dev/null 2>%s 1>/dev/null' % (gcc, tmpfile))
-        is_gcc = False
-        in_incdirs = False
-        inc_dirs = []
-        lib_dirs = []
-        try:
-            if ret >> 8 == 0:
-                with open(tmpfile) as fp:
-                    for line in fp.readlines():
-                        if line.startswith("gcc version"):
-                            is_gcc = True
-                        elif line.startswith("#include <...>"):
-                            in_incdirs = True
-                        elif line.startswith("End of search list"):
-                            in_incdirs = False
-                        elif is_gcc and line.startswith("LIBRARY_PATH"):
-                            for d in line.strip().split("=")[1].split(":"):
-                                d = os.path.normpath(d)
-                                if '/gcc/' not in d:
-                                    add_dir_to_list(self.compiler.library_dirs,
-                                                    d)
-                        elif is_gcc and in_incdirs and '/gcc/' not in line:
-                            add_dir_to_list(self.compiler.include_dirs,
-                                            line.strip())
-        finally:
-            os.unlink(tmpfile)
-
-    def detect_modules(self):
-        # PCMDI Change
-        # Ensure that place we put tcl/tk/netcdf etc. is always used
-        libbase = os.environ.get('EXTERNALS', os.path.join(sys.prefix,'..','Externals'))
-        mylibdir = os.path.join(libbase,'lib')
-        myincdir = os.path.join(libbase,'include')
-        add_dir_to_list(self.compiler.library_dirs, mylibdir)
-        add_dir_to_list(self.compiler.include_dirs, myincdir)
-        # End PCMDI Changes
-        # Ensure that /usr/local is always used
-        if not cross_compiling:
-            add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-            add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-        if cross_compiling:
-            self.add_gcc_paths()
-        self.add_multiarch_paths()
-
-        # Add paths specified in the environment variables LDFLAGS and
-        # CPPFLAGS for header and library files.
-        # We must get the values from the Makefile and not the environment
-        # directly since an inconsistently reproducible issue comes up where
-        # the environment variable is not set even though the value were passed
-        # into configure and stored in the Makefile (issue found on OS X 10.3).
-        for env_var, arg_name, dir_list in (
-                ('LDFLAGS', '-R', self.compiler.runtime_library_dirs),
-                ('LDFLAGS', '-L', self.compiler.library_dirs),
-                ('CPPFLAGS', '-I', self.compiler.include_dirs)):
-            env_val = sysconfig.get_config_var(env_var)
-            if env_val:
-                # To prevent optparse from raising an exception about any
-                # options in env_val that it doesn't know about we strip out
-                # all double dashes and any dashes followed by a character
-                # that is not for the option we are dealing with.
-                #
-                # Please note that order of the regex is important!  We must
-                # strip out double-dashes first so that we don't end up with
-                # substituting "--Long" to "-Long" and thus lead to "ong" being
-                # used for a library directory.
-                env_val = re.sub(r'(^|\s+)-(-|(?!%s))' % arg_name[1],
-                                 ' ', env_val)
-                parser = optparse.OptionParser()
-                # Make sure that allowing args interspersed with options is
-                # allowed
-                parser.allow_interspersed_args = True
-                parser.error = lambda msg: None
-                parser.add_option(arg_name, dest="dirs", action="append")
-                options = parser.parse_args(env_val.split())[0]
-                if options.dirs:
-                    for directory in reversed(options.dirs):
-                        add_dir_to_list(dir_list, directory)
-
-        if os.path.normpath(sys.prefix) != '/usr' \
-                and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
-            # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
-            # (PYTHONFRAMEWORK is set) to avoid # linking problems when
-            # building a framework with different architectures than
-            # the one that is currently installed (issue #7473)
-            add_dir_to_list(self.compiler.library_dirs,
-                            sysconfig.get_config_var("LIBDIR"))
-            add_dir_to_list(self.compiler.include_dirs,
-                            sysconfig.get_config_var("INCLUDEDIR"))
-
-        try:
-            have_unicode = unicode
-        except NameError:
-            have_unicode = 0
-
-        # lib_dirs and inc_dirs are used to search for files;
-        # if a file is found in one of those directories, it can
-        # be assumed that no additional -I,-L directives are needed.
-        inc_dirs = self.compiler.include_dirs[:]
-        lib_dirs = self.compiler.library_dirs[:]
-        if not cross_compiling:
-            for d in (
-                '/usr/include',
-                ):
-                add_dir_to_list(inc_dirs, d)
-            for d in (
-                '/lib64', '/usr/lib64',
-                '/lib', '/usr/lib',
-                ):
-                add_dir_to_list(lib_dirs, d)
-        exts = []
-        missing = []
-
-        config_h = sysconfig.get_config_h_filename()
-        config_h_vars = sysconfig.parse_config_h(open(config_h))
-
-        srcdir = sysconfig.get_config_var('srcdir')
-
-        # Check for AtheOS which has libraries in non-standard locations
-        if host_platform == 'atheos':
-            lib_dirs += ['/system/libs', '/atheos/autolnk/lib']
-            lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
-            inc_dirs += ['/system/include', '/atheos/autolnk/include']
-            inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
-
-        # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
-        if host_platform in ['osf1', 'unixware7', 'openunix8']:
-            lib_dirs += ['/usr/ccs/lib']
-
-        # HP-UX11iv3 keeps files in lib/hpux folders.
-        if host_platform == 'hp-ux11':
-            lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32']
-
-        if host_platform == 'darwin':
-            # This should work on any unixy platform ;-)
-            # If the user has bothered specifying additional -I and -L flags
-            # in OPT and LDFLAGS we might as well use them here.
-            #   NOTE: using shlex.split would technically be more correct, but
-            # also gives a bootstrap problem. Let's hope nobody uses directories
-            # with whitespace in the name to store libraries.
-            cflags, ldflags = sysconfig.get_config_vars(
-                    'CFLAGS', 'LDFLAGS')
-            for item in cflags.split():
-                if item.startswith('-I'):
-                    inc_dirs.append(item[2:])
-
-            for item in ldflags.split():
-                if item.startswith('-L'):
-                    lib_dirs.append(item[2:])
-
-        # Check for MacOS X, which doesn't need libm.a at all
-        math_libs = ['m']
-        if host_platform in ['darwin', 'beos']:
-            math_libs = []
-
-        # XXX Omitted modules: gl, pure, dl, SGI-specific modules
-
-        #
-        # The following modules are all pretty straightforward, and compile
-        # on pretty much any POSIXish platform.
-        #
-
-        # Some modules that are normally always on:
-        #exts.append( Extension('_weakref', ['_weakref.c']) )
-
-        # array objects
-        exts.append( Extension('array', ['arraymodule.c']) )
-        # complex math library functions
-        exts.append( Extension('cmath', ['cmathmodule.c', '_math.c'],
-                               depends=['_math.h'],
-                               libraries=math_libs) )
-        # math library functions, e.g. sin()
-        exts.append( Extension('math',  ['mathmodule.c', '_math.c'],
-                               depends=['_math.h'],
-                               libraries=math_libs) )
-        # fast string operations implemented in C
-        exts.append( Extension('strop', ['stropmodule.c']) )
-        # time operations and variables
-        exts.append( Extension('time', ['timemodule.c'],
-                               libraries=math_libs) )
-        exts.append( Extension('datetime', ['datetimemodule.c', 'timemodule.c'],
-                               libraries=math_libs) )
-        # fast iterator tools implemented in C
-        exts.append( Extension("itertools", ["itertoolsmodule.c"]) )
-        # code that will be builtins in the future, but conflict with the
-        #  current builtins
-        exts.append( Extension('future_builtins', ['future_builtins.c']) )
-        # random number generator implemented in C
-        exts.append( Extension("_random", ["_randommodule.c"]) )
-        # high-performance collections
-        exts.append( Extension("_collections", ["_collectionsmodule.c"]) )
-        # bisect
-        exts.append( Extension("_bisect", ["_bisectmodule.c"]) )
-        # heapq
-        exts.append( Extension("_heapq", ["_heapqmodule.c"]) )
-        # operator.add() and similar goodies
-        exts.append( Extension('operator', ['operator.c']) )
-        # Python 3.1 _io library
-        exts.append( Extension("_io",
-            ["_io/bufferedio.c", "_io/bytesio.c", "_io/fileio.c",
-             "_io/iobase.c", "_io/_iomodule.c", "_io/stringio.c", "_io/textio.c"],
-             depends=["_io/_iomodule.h"], include_dirs=["Modules/_io"]))
-        # _functools
-        exts.append( Extension("_functools", ["_functoolsmodule.c"]) )
-        # _json speedups
-        exts.append( Extension("_json", ["_json.c"]) )
-        # Python C API test module
-        exts.append( Extension('_testcapi', ['_testcapimodule.c'],
-                               depends=['testcapi_long.h']) )
-        # profilers (_lsprof is for cProfile.py)
-        exts.append( Extension('_hotshot', ['_hotshot.c']) )
-        exts.append( Extension('_lsprof', ['_lsprof.c', 'rotatingtree.c']) )
-        # static Unicode character database
-        if have_unicode:
-            exts.append( Extension('unicodedata', ['unicodedata.c']) )
-        else:
-            missing.append('unicodedata')
-        # access to ISO C locale support
-        data = open('pyconfig.h').read()
-        m = re.search(r"#s*define\s+WITH_LIBINTL\s+1\s*", data)
-        if m is not None:
-            locale_libs = ['intl']
-        else:
-            locale_libs = []
-        if host_platform == 'darwin':
-            locale_extra_link_args = ['-framework', 'CoreFoundation']
-        else:
-            locale_extra_link_args = []
-
-
-        exts.append( Extension('_locale', ['_localemodule.c'],
-                               libraries=locale_libs,
-                               extra_link_args=locale_extra_link_args) )
-
-        # Modules with some UNIX dependencies -- on by default:
-        # (If you have a really backward UNIX, select and socket may not be
-        # supported...)
-
-        # fcntl(2) and ioctl(2)
-        libs = []
-        if (config_h_vars.get('FLOCK_NEEDS_LIBBSD', False)):
-            # May be necessary on AIX for flock function
-            libs = ['bsd']
-        exts.append( Extension('fcntl', ['fcntlmodule.c'], libraries=libs) )
-        # pwd(3)
-        exts.append( Extension('pwd', ['pwdmodule.c']) )
-        # grp(3)
-        exts.append( Extension('grp', ['grpmodule.c']) )
-        # spwd, shadow passwords
-        if (config_h_vars.get('HAVE_GETSPNAM', False) or
-                config_h_vars.get('HAVE_GETSPENT', False)):
-            exts.append( Extension('spwd', ['spwdmodule.c']) )
-        else:
-            missing.append('spwd')
-
-        # select(2); not on ancient System V
-        exts.append( Extension('select', ['selectmodule.c']) )
-
-        # Fred Drake's interface to the Python parser
-        exts.append( Extension('parser', ['parsermodule.c']) )
-
-        # cStringIO and cPickle
-        exts.append( Extension('cStringIO', ['cStringIO.c']) )
-        exts.append( Extension('cPickle', ['cPickle.c']) )
-
-        # Memory-mapped files (also works on Win32).
-        if host_platform not in ['atheos']:
-            exts.append( Extension('mmap', ['mmapmodule.c']) )
-        else:
-            missing.append('mmap')
-
-        # Lance Ellinghaus's syslog module
-        # syslog daemon interface
-        exts.append( Extension('syslog', ['syslogmodule.c']) )
-
-        # George Neville-Neil's timing module:
-        # Deprecated in PEP 4 http://www.python.org/peps/pep-0004.html
-        # http://mail.python.org/pipermail/python-dev/2006-January/060023.html
-        #exts.append( Extension('timing', ['timingmodule.c']) )
-
-        #
-        # Here ends the simple stuff.  From here on, modules need certain
-        # libraries, are platform-specific, or present other surprises.
-        #
-
-        # Multimedia modules
-        # These don't work for 64-bit platforms!!!
-        # These represent audio samples or images as strings:
-
-        # Operations on audio samples
-        # According to #993173, this one should actually work fine on
-        # 64-bit platforms.
-        exts.append( Extension('audioop', ['audioop.c']) )
-
-        # Disabled on 64-bit platforms
-        if sys.maxint != 9223372036854775807L:
-            # Operations on images
-            exts.append( Extension('imageop', ['imageop.c']) )
-        else:
-            missing.extend(['imageop'])
-
-        # readline
-        do_readline = self.compiler.find_library_file(lib_dirs, 'readline')
-        readline_termcap_library = ""
-        curses_library = ""
-        # Determine if readline is already linked against curses or tinfo.
-        if do_readline and find_executable('ldd'):
-            fp = os.popen("ldd %s" % do_readline)
-            ldd_output = fp.readlines()
-            ret = fp.close()
-            if ret is None or ret >> 8 == 0:
-                for ln in ldd_output:
-                    if 'curses' in ln:
-                        readline_termcap_library = re.sub(
-                            r'.*lib(n?cursesw?)\.so.*', r'\1', ln
-                        ).rstrip()
-                        break
-                    if 'tinfo' in ln: # termcap interface split out from ncurses
-                        readline_termcap_library = 'tinfo'
-                        break
-        # Issue 7384: If readline is already linked against curses,
-        # use the same library for the readline and curses modules.
-        if 'curses' in readline_termcap_library:
-            curses_library = readline_termcap_library
-        elif self.compiler.find_library_file(lib_dirs, 'ncursesw'):
-            curses_library = 'ncursesw'
-        elif self.compiler.find_library_file(lib_dirs, 'ncurses'):
-            curses_library = 'ncurses'
-        elif self.compiler.find_library_file(lib_dirs, 'curses'):
-            curses_library = 'curses'
-
-        if host_platform == 'darwin':
-            os_release = int(os.uname()[2].split('.')[0])
-            dep_target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
-            if dep_target and dep_target.split('.') < ['10', '5']:
-                os_release = 8
-            if os_release < 9:
-                # MacOSX 10.4 has a broken readline. Don't try to build
-                # the readline module unless the user has installed a fixed
-                # readline package
-                if find_file('readline/rlconf.h', inc_dirs, []) is None:
-                    do_readline = False
-        if do_readline:
-            if host_platform == 'darwin' and os_release < 9:
-                # In every directory on the search path search for a dynamic
-                # library and then a static library, instead of first looking
-                # for dynamic libraries on the entiry path.
-                # This way a staticly linked custom readline gets picked up
-                # before the (possibly broken) dynamic library in /usr/lib.
-                readline_extra_link_args = ('-Wl,-search_paths_first',)
-            else:
-                readline_extra_link_args = ()
-
-            readline_libs = ['readline']
-            if readline_termcap_library:
-                pass # Issue 7384: Already linked against curses or tinfo.
-            elif curses_library:
-                readline_libs.append(curses_library)
-            elif self.compiler.find_library_file(lib_dirs +
-                                                     ['/usr/lib/termcap'],
-                                                     'termcap'):
-                readline_libs.append('termcap')
-            exts.append( Extension('readline', ['readline.c'],
-                                   library_dirs=['/usr/lib/termcap'],
-                                   extra_link_args=readline_extra_link_args,
-                                   libraries=readline_libs) )
-        else:
-            missing.append('readline')
-
-        # crypt module.
-
-        if self.compiler.find_library_file(lib_dirs, 'crypt'):
-            libs = ['crypt']
-        else:
-            libs = []
-        exts.append( Extension('crypt', ['cryptmodule.c'], libraries=libs) )
-
-        # CSV files
-        exts.append( Extension('_csv', ['_csv.c']) )
-
-        # socket(2)
-        exts.append( Extension('_socket', ['socketmodule.c', 'timemodule.c'],
-                               depends=['socketmodule.h'],
-                               libraries=math_libs) )
-        # Detect SSL support for the socket module (via _ssl)
-        search_for_ssl_incs_in = [
-                              '/usr/local/ssl/include',
-                              '/usr/contrib/ssl/include/'
-                             ]
-        ssl_incs = find_file('openssl/ssl.h', inc_dirs,
-                             search_for_ssl_incs_in
-                             )
-        if ssl_incs is not None:
-            krb5_h = find_file('krb5.h', inc_dirs,
-                               ['/usr/kerberos/include'])
-            if krb5_h:
-                ssl_incs += krb5_h
-        ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
-                                     ['/usr/local/ssl/lib',
-                                      '/usr/contrib/ssl/lib/'
-                                     ] )
-
-        if (ssl_incs is not None and
-            ssl_libs is not None):
-            exts.append( Extension('_ssl', ['_ssl.c'],
-                                   include_dirs = ssl_incs,
-                                   library_dirs = ssl_libs,
-                                   libraries = ['ssl', 'crypto'],
-                                   depends = ['socketmodule.h']), )
-        else:
-            missing.append('_ssl')
-
-        # find out which version of OpenSSL we have
-        openssl_ver = 0
-        openssl_ver_re = re.compile(
-            '^\s*#\s*define\s+OPENSSL_VERSION_NUMBER\s+(0x[0-9a-fA-F]+)' )
-
-        # look for the openssl version header on the compiler search path.
-        opensslv_h = find_file('openssl/opensslv.h', [],
-                inc_dirs + search_for_ssl_incs_in)
-        if opensslv_h:
-            name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
-            if host_platform == 'darwin' and is_macosx_sdk_path(name):
-                name = os.path.join(macosx_sdk_root(), name[1:])
-            try:
-                incfile = open(name, 'r')
-                for line in incfile:
-                    m = openssl_ver_re.match(line)
-                    if m:
-                        openssl_ver = eval(m.group(1))
-            except IOError, msg:
-                print "IOError while reading opensshv.h:", msg
-                pass
-
-        min_openssl_ver = 0x00907000
-        have_any_openssl = ssl_incs is not None and ssl_libs is not None
-        have_usable_openssl = (have_any_openssl and
-                               openssl_ver >= min_openssl_ver)
-
-        if have_any_openssl:
-            if have_usable_openssl:
-                # The _hashlib module wraps optimized implementations
-                # of hash functions from the OpenSSL library.
-                exts.append( Extension('_hashlib', ['_hashopenssl.c'],
-                                       include_dirs = ssl_incs,
-                                       library_dirs = ssl_libs,
-                                       libraries = ['ssl', 'crypto']) )
-            else:
-                print ("warning: openssl 0x%08x is too old for _hashlib" %
-                       openssl_ver)
-                missing.append('_hashlib')
-        if COMPILED_WITH_PYDEBUG or not have_usable_openssl:
-            # The _sha module implements the SHA1 hash algorithm.
-            exts.append( Extension('_sha', ['shamodule.c']) )
-            # The _md5 module implements the RSA Data Security, Inc. MD5
-            # Message-Digest Algorithm, described in RFC 1321.  The
-            # necessary files md5.c and md5.h are included here.
-            exts.append( Extension('_md5',
-                            sources = ['md5module.c', 'md5.c'],
-                            depends = ['md5.h']) )
-
-        min_sha2_openssl_ver = 0x00908000
-        if COMPILED_WITH_PYDEBUG or openssl_ver < min_sha2_openssl_ver:
-            # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash
-            exts.append( Extension('_sha256', ['sha256module.c']) )
-            exts.append( Extension('_sha512', ['sha512module.c']) )
-
-        # Modules that provide persistent dictionary-like semantics.  You will
-        # probably want to arrange for at least one of them to be available on
-        # your machine, though none are defined by default because of library
-        # dependencies.  The Python module anydbm.py provides an
-        # implementation independent wrapper for these; dumbdbm.py provides
-        # similar functionality (but slower of course) implemented in Python.
-
-        # Sleepycat^WOracle Berkeley DB interface.
-        #  http://www.oracle.com/database/berkeley-db/db/index.html
-        #
-        # This requires the Sleepycat^WOracle DB code. The supported versions
-        # are set below.  Visit the URL above to download
-        # a release.  Most open source OSes come with one or more
-        # versions of BerkeleyDB already installed.
-
-        max_db_ver = (5, 3)
-        min_db_ver = (4, 3)
-        db_setup_debug = False   # verbose debug prints from this script?
-
-        def allow_db_ver(db_ver):
-            """Returns a boolean if the given BerkeleyDB version is acceptable.
-
-            Args:
-              db_ver: A tuple of the version to verify.
-            """
-            if not (min_db_ver <= db_ver <= max_db_ver):
-                return False
-            # Use this function to filter out known bad configurations.
-            if (4, 6) == db_ver[:2]:
-                # BerkeleyDB 4.6.x is not stable on many architectures.
-                arch = platform_machine()
-                if arch not in ('i386', 'i486', 'i586', 'i686',
-                                'x86_64', 'ia64'):
-                    return False
-            return True
-
-        def gen_db_minor_ver_nums(major):
-            if major == 5:
-                for x in range(max_db_ver[1]+1):
-                    if allow_db_ver((5, x)):
-                        yield x
-            elif major == 4:
-                for x in range(9):
-                    if allow_db_ver((4, x)):
-                        yield x
-            elif major == 3:
-                for x in (3,):
-                    if allow_db_ver((3, x)):
-                        yield x
-            else:
-                raise ValueError("unknown major BerkeleyDB version", major)
-
-        # construct a list of paths to look for the header file in on
-        # top of the normal inc_dirs.
-        db_inc_paths = [
-            '/usr/include/db4',
-            '/usr/local/include/db4',
-            '/opt/sfw/include/db4',
-            '/usr/include/db3',
-            '/usr/local/include/db3',
-            '/opt/sfw/include/db3',
-            # Fink defaults (http://fink.sourceforge.net/)
-            '/sw/include/db4',
-            '/sw/include/db3',
-        ]
-        # 4.x minor number specific paths
-        for x in gen_db_minor_ver_nums(4):
-            db_inc_paths.append('/usr/include/db4%d' % x)
-            db_inc_paths.append('/usr/include/db4.%d' % x)
-            db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
-            db_inc_paths.append('/usr/local/include/db4%d' % x)
-            db_inc_paths.append('/pkg/db-4.%d/include' % x)
-            db_inc_paths.append('/opt/db-4.%d/include' % x)
-            # MacPorts default (http://www.macports.org/)
-            db_inc_paths.append('/opt/local/include/db4%d' % x)
-        # 3.x minor number specific paths
-        for x in gen_db_minor_ver_nums(3):
-            db_inc_paths.append('/usr/include/db3%d' % x)
-            db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x)
-            db_inc_paths.append('/usr/local/include/db3%d' % x)
-            db_inc_paths.append('/pkg/db-3.%d/include' % x)
-            db_inc_paths.append('/opt/db-3.%d/include' % x)
-
-        if cross_compiling:
-            db_inc_paths = []
-
-        # Add some common subdirectories for Sleepycat DB to the list,
-        # based on the standard include directories. This way DB3/4 gets
-        # picked up when it is installed in a non-standard prefix and
-        # the user has added that prefix into inc_dirs.
-        std_variants = []
-        for dn in inc_dirs:
-            std_variants.append(os.path.join(dn, 'db3'))
-            std_variants.append(os.path.join(dn, 'db4'))
-            for x in gen_db_minor_ver_nums(4):
-                std_variants.append(os.path.join(dn, "db4%d"%x))
-                std_variants.append(os.path.join(dn, "db4.%d"%x))
-            for x in gen_db_minor_ver_nums(3):
-                std_variants.append(os.path.join(dn, "db3%d"%x))
-                std_variants.append(os.path.join(dn, "db3.%d"%x))
-
-        db_inc_paths = std_variants + db_inc_paths
-        db_inc_paths = [p for p in db_inc_paths if os.path.exists(p)]
-
-        db_ver_inc_map = {}
-
-        if host_platform == 'darwin':
-            sysroot = macosx_sdk_root()
-
-        class db_found(Exception): pass
-        try:
-            # See whether there is a Sleepycat header in the standard
-            # search path.
-            for d in inc_dirs + db_inc_paths:
-                f = os.path.join(d, "db.h")
-
-                if host_platform == 'darwin' and is_macosx_sdk_path(d):
-                    f = os.path.join(sysroot, d[1:], "db.h")
-
-                if db_setup_debug: print "db: looking for db.h in", f
-                if os.path.exists(f):
-                    f = open(f).read()
-                    m = re.search(r"#define\WDB_VERSION_MAJOR\W(\d+)", f)
-                    if m:
-                        db_major = int(m.group(1))
-                        m = re.search(r"#define\WDB_VERSION_MINOR\W(\d+)", f)
-                        db_minor = int(m.group(1))
-                        db_ver = (db_major, db_minor)
-
-                        # Avoid 4.6 prior to 4.6.21 due to a BerkeleyDB bug
-                        if db_ver == (4, 6):
-                            m = re.search(r"#define\WDB_VERSION_PATCH\W(\d+)", f)
-                            db_patch = int(m.group(1))
-                            if db_patch < 21:
-                                print "db.h:", db_ver, "patch", db_patch,
-                                print "being ignored (4.6.x must be >= 4.6.21)"
-                                continue
-
-                        if ( (db_ver not in db_ver_inc_map) and
-                            allow_db_ver(db_ver) ):
-                            # save the include directory with the db.h version
-                            # (first occurrence only)
-                            db_ver_inc_map[db_ver] = d
-                            if db_setup_debug:
-                                print "db.h: found", db_ver, "in", d
-                        else:
-                            # we already found a header for this library version
-                            if db_setup_debug: print "db.h: ignoring", d
-                    else:
-                        # ignore this header, it didn't contain a version number
-                        if db_setup_debug:
-                            print "db.h: no version number version in", d
-
-            db_found_vers = db_ver_inc_map.keys()
-            db_found_vers.sort()
-
-            while db_found_vers:
-                db_ver = db_found_vers.pop()
-                db_incdir = db_ver_inc_map[db_ver]
-
-                # check lib directories parallel to the location of the header
-                db_dirs_to_check = [
-                    db_incdir.replace("include", 'lib64'),
-                    db_incdir.replace("include", 'lib'),
-                ]
-
-                if host_platform != 'darwin':
-                    db_dirs_to_check = filter(os.path.isdir, db_dirs_to_check)
-
-                else:
-                    # Same as other branch, but takes OSX SDK into account
-                    tmp = []
-                    for dn in db_dirs_to_check:
-                        if is_macosx_sdk_path(dn):
-                            if os.path.isdir(os.path.join(sysroot, dn[1:])):
-                                tmp.append(dn)
-                        else:
-                            if os.path.isdir(dn):
-                                tmp.append(dn)
-                    db_dirs_to_check = tmp
-
-                # Look for a version specific db-X.Y before an ambiguous dbX
-                # XXX should we -ever- look for a dbX name?  Do any
-                # systems really not name their library by version and
-                # symlink to more general names?
-                for dblib in (('db-%d.%d' % db_ver),
-                              ('db%d%d' % db_ver),
-                              ('db%d' % db_ver[0])):
-                    dblib_file = self.compiler.find_library_file(
-                                    db_dirs_to_check + lib_dirs, dblib )
-                    if dblib_file:
-                        dblib_dir = [ os.path.abspath(os.path.dirname(dblib_file)) ]
-                        raise db_found
-                    else:
-                        if db_setup_debug: print "db lib: ", dblib, "not found"
-
-        except db_found:
-            if db_setup_debug:
-                print "bsddb using BerkeleyDB lib:", db_ver, dblib
-                print "bsddb lib dir:", dblib_dir, " inc dir:", db_incdir
-            db_incs = [db_incdir]
-            dblibs = [dblib]
-            # We add the runtime_library_dirs argument because the
-            # BerkeleyDB lib we're linking against often isn't in the
-            # system dynamic library search path.  This is usually
-            # correct and most trouble free, but may cause problems in
-            # some unusual system configurations (e.g. the directory
-            # is on an NFS server that goes away).
-            exts.append(Extension('_bsddb', ['_bsddb.c'],
-                                  depends = ['bsddb.h'],
-                                  library_dirs=dblib_dir,
-                                  runtime_library_dirs=dblib_dir,
-                                  include_dirs=db_incs,
-                                  libraries=dblibs))
-        else:
-            if db_setup_debug: print "db: no appropriate library found"
-            db_incs = None
-            dblibs = []
-            dblib_dir = None
-            missing.append('_bsddb')
-
-        # The sqlite interface
-        sqlite_setup_debug = False   # verbose debug prints from this script?
-
-        # We hunt for #define SQLITE_VERSION "n.n.n"
-        # We need to find >= sqlite version 3.0.8
-        sqlite_incdir = sqlite_libdir = None
-        sqlite_inc_paths = [ '/usr/include',
-                             '/usr/include/sqlite',
-                             '/usr/include/sqlite3',
-                             '/usr/local/include',
-                             '/usr/local/include/sqlite',
-                             '/usr/local/include/sqlite3',
-                           ]
-        if cross_compiling:
-            sqlite_inc_paths = []
-        MIN_SQLITE_VERSION_NUMBER = (3, 0, 8)
-        MIN_SQLITE_VERSION = ".".join([str(x)
-                                    for x in MIN_SQLITE_VERSION_NUMBER])
-
-        # Scan the default include directories before the SQLite specific
-        # ones. This allows one to override the copy of sqlite on OSX,
-        # where /usr/include contains an old version of sqlite.
-        if host_platform == 'darwin':
-            sysroot = macosx_sdk_root()
-
-        for d_ in inc_dirs + sqlite_inc_paths:
-            d = d_
-            if host_platform == 'darwin' and is_macosx_sdk_path(d):
-                d = os.path.join(sysroot, d[1:])
-
-            f = os.path.join(d, "sqlite3.h")
-            if os.path.exists(f):
-                if sqlite_setup_debug: print "sqlite: found %s"%f
-                incf = open(f).read()
-                m = re.search(
-                    r'\s*.*#\s*.*define\s.*SQLITE_VERSION\W*"([\d\.]*)"', incf)
-                if m:
-                    sqlite_version = m.group(1)
-                    sqlite_version_tuple = tuple([int(x)
-                                        for x in sqlite_version.split(".")])
-                    if sqlite_version_tuple >= MIN_SQLITE_VERSION_NUMBER:
-                        # we win!
-                        if sqlite_setup_debug:
-                            print "%s/sqlite3.h: version %s"%(d, sqlite_version)
-                        sqlite_incdir = d
-                        break
-                    else:
-                        if sqlite_setup_debug:
-                            print "%s: version %d is too old, need >= %s"%(d,
-                                        sqlite_version, MIN_SQLITE_VERSION)
-                elif sqlite_setup_debug:
-                    print "sqlite: %s had no SQLITE_VERSION"%(f,)
-
-        if sqlite_incdir:
-            sqlite_dirs_to_check = [
-                os.path.join(sqlite_incdir, '..', 'lib64'),
-                os.path.join(sqlite_incdir, '..', 'lib'),
-                os.path.join(sqlite_incdir, '..', '..', 'lib64'),
-                os.path.join(sqlite_incdir, '..', '..', 'lib'),
-            ]
-            sqlite_libfile = self.compiler.find_library_file(
-                                sqlite_dirs_to_check + lib_dirs, 'sqlite3')
-            if sqlite_libfile:
-                sqlite_libdir = [os.path.abspath(os.path.dirname(sqlite_libfile))]
-
-        if sqlite_incdir and sqlite_libdir:
-            sqlite_srcs = ['_sqlite/cache.c',
-                '_sqlite/connection.c',
-                '_sqlite/cursor.c',
-                '_sqlite/microprotocols.c',
-                '_sqlite/module.c',
-                '_sqlite/prepare_protocol.c',
-                '_sqlite/row.c',
-                '_sqlite/statement.c',
-                '_sqlite/util.c', ]
-
-            sqlite_defines = []
-            if host_platform != "win32":
-                sqlite_defines.append(('MODULE_NAME', '"sqlite3"'))
-            else:
-                sqlite_defines.append(('MODULE_NAME', '\\"sqlite3\\"'))
-
-            # Comment this out if you want the sqlite3 module to be able to load extensions.
-            sqlite_defines.append(("SQLITE_OMIT_LOAD_EXTENSION", "1"))
-
-            if host_platform == 'darwin':
-                # In every directory on the search path search for a dynamic
-                # library and then a static library, instead of first looking
-                # for dynamic libraries on the entire path.
-                # This way a statically linked custom sqlite gets picked up
-                # before the dynamic library in /usr/lib.
-                sqlite_extra_link_args = ('-Wl,-search_paths_first',)
-            else:
-                sqlite_extra_link_args = ()
-
-            exts.append(Extension('_sqlite3', sqlite_srcs,
-                                  define_macros=sqlite_defines,
-                                  include_dirs=["Modules/_sqlite",
-                                                sqlite_incdir],
-                                  library_dirs=sqlite_libdir,
-                                  extra_link_args=sqlite_extra_link_args,
-                                  libraries=["sqlite3",]))
-        else:
-            missing.append('_sqlite3')
-
-        # Look for Berkeley db 1.85.   Note that it is built as a different
-        # module name so it can be included even when later versions are
-        # available.  A very restrictive search is performed to avoid
-        # accidentally building this module with a later version of the
-        # underlying db library.  May BSD-ish Unixes incorporate db 1.85
-        # symbols into libc and place the include file in /usr/include.
-        #
-        # If the better bsddb library can be built (db_incs is defined)
-        # we do not build this one.  Otherwise this build will pick up
-        # the more recent berkeleydb's db.h file first in the include path
-        # when attempting to compile and it will fail.
-        f = "/usr/include/db.h"
-
-        if host_platform == 'darwin':
-            if is_macosx_sdk_path(f):
-                sysroot = macosx_sdk_root()
-                f = os.path.join(sysroot, f[1:])
-
-        if os.path.exists(f) and not db_incs:
-            data = open(f).read()
-            m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
-            if m is not None:
-                # bingo - old version used hash file format version 2
-                ### XXX this should be fixed to not be platform-dependent
-                ### but I don't have direct access to an osf1 platform and
-                ### seemed to be muffing the search somehow
-                libraries = host_platform == "osf1" and ['db'] or None
-                if libraries is not None:
-                    exts.append(Extension('bsddb185', ['bsddbmodule.c'],
-                                          libraries=libraries))
-                else:
-                    exts.append(Extension('bsddb185', ['bsddbmodule.c']))
-            else:
-                missing.append('bsddb185')
-        else:
-            missing.append('bsddb185')
-
-        dbm_order = ['gdbm']
-        # The standard Unix dbm module:
-        if host_platform not in ['cygwin']:
-            config_args = [arg.strip("'")
-                           for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
-            dbm_args = [arg for arg in config_args
-                        if arg.startswith('--with-dbmliborder=')]
-            if dbm_args:
-                dbm_order = [arg.split('=')[-1] for arg in dbm_args][-1].split(":")
-            else:
-                dbm_order = "ndbm:gdbm:bdb".split(":")
-            dbmext = None
-            for cand in dbm_order:
-                if cand == "ndbm":
-                    if find_file("ndbm.h", inc_dirs, []) is not None:
-                        # Some systems have -lndbm, others have -lgdbm_compat,
-                        # others don't have either
-                        if self.compiler.find_library_file(lib_dirs,
-                                                               'ndbm'):
-                            ndbm_libs = ['ndbm']
-                        elif self.compiler.find_library_file(lib_dirs,
-                                                             'gdbm_compat'):
-                            ndbm_libs = ['gdbm_compat']
-                        else:
-                            ndbm_libs = []
-                        print "building dbm using ndbm"
-                        dbmext = Extension('dbm', ['dbmmodule.c'],
-                                           define_macros=[
-                                               ('HAVE_NDBM_H',None),
-                                               ],
-                                           libraries=ndbm_libs)
-                        break
-
-                elif cand == "gdbm":
-                    if self.compiler.find_library_file(lib_dirs, 'gdbm'):
-                        gdbm_libs = ['gdbm']
-                        if self.compiler.find_library_file(lib_dirs,
-                                                               'gdbm_compat'):
-                            gdbm_libs.append('gdbm_compat')
-                        if find_file("gdbm/ndbm.h", inc_dirs, []) is not None:
-                            print "building dbm using gdbm"
-                            dbmext = Extension(
-                                'dbm', ['dbmmodule.c'],
-                                define_macros=[
-                                    ('HAVE_GDBM_NDBM_H', None),
-                                    ],
-                                libraries = gdbm_libs)
-                            break
-                        if find_file("gdbm-ndbm.h", inc_dirs, []) is not None:
-                            print "building dbm using gdbm"
-                            dbmext = Extension(
-                                'dbm', ['dbmmodule.c'],
-                                define_macros=[
-                                    ('HAVE_GDBM_DASH_NDBM_H', None),
-                                    ],
-                                libraries = gdbm_libs)
-                            break
-                elif cand == "bdb":
-                    if db_incs is not None:
-                        print "building dbm using bdb"
-                        dbmext = Extension('dbm', ['dbmmodule.c'],
-                                           library_dirs=dblib_dir,
-                                           runtime_library_dirs=dblib_dir,
-                                           include_dirs=db_incs,
-                                           define_macros=[
-                                               ('HAVE_BERKDB_H', None),
-                                               ('DB_DBM_HSEARCH', None),
-                                               ],
-                                           libraries=dblibs)
-                        break
-            if dbmext is not None:
-                exts.append(dbmext)
-            else:
-                missing.append('dbm')
-
-        # Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
-        if ('gdbm' in dbm_order and
-            self.compiler.find_library_file(lib_dirs, 'gdbm')):
-            exts.append( Extension('gdbm', ['gdbmmodule.c'],
-                                   libraries = ['gdbm'] ) )
-        else:
-            missing.append('gdbm')
-
-        # Unix-only modules
-        if host_platform not in ['win32']:
-            # Steen Lumholt's termios module
-            exts.append( Extension('termios', ['termios.c']) )
-            # Jeremy Hylton's rlimit interface
-            if host_platform not in ['atheos']:
-                exts.append( Extension('resource', ['resource.c']) )
-            else:
-                missing.append('resource')
-
-            # Sun yellow pages. Some systems have the functions in libc.
-            if (host_platform not in ['cygwin', 'atheos', 'qnx6'] and
-                find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None):
-                if (self.compiler.find_library_file(lib_dirs, 'nsl')):
-                    libs = ['nsl']
-                else:
-                    libs = []
-                exts.append( Extension('nis', ['nismodule.c'],
-                                       libraries = libs) )
-            else:
-                missing.append('nis')
-        else:
-            missing.extend(['nis', 'resource', 'termios'])
-
-        # Curses support, requiring the System V version of curses, often
-        # provided by the ncurses library.
-        panel_library = 'panel'
-        curses_incs = None
-        if curses_library.startswith('ncurses'):
-            if curses_library == 'ncursesw':
-                # Bug 1464056: If _curses.so links with ncursesw,
-                # _curses_panel.so must link with panelw.
-                panel_library = 'panelw'
-            curses_libs = [curses_library]
-            curses_incs = find_file('curses.h', inc_dirs,
-                                    [os.path.join(d, 'ncursesw') for d in inc_dirs])
-            exts.append( Extension('_curses', ['_cursesmodule.c'],
-                                   include_dirs = curses_incs,
-                                   libraries = curses_libs) )
-        elif curses_library == 'curses' and host_platform != 'darwin':
-                # OSX has an old Berkeley curses, not good enough for
-                # the _curses module.
-            if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
-                curses_libs = ['curses', 'terminfo']
-            elif (self.compiler.find_library_file(lib_dirs, 'termcap')):
-                curses_libs = ['curses', 'termcap']
-            else:
-                curses_libs = ['curses']
-
-            exts.append( Extension('_curses', ['_cursesmodule.c'],
-                                   libraries = curses_libs) )
-        else:
-            missing.append('_curses')
-
-        # If the curses module is enabled, check for the panel module
-        if (module_enabled(exts, '_curses') and
-            self.compiler.find_library_file(lib_dirs, panel_library)):
-            exts.append( Extension('_curses_panel', ['_curses_panel.c'],
-                                   include_dirs = curses_incs,
-                                   libraries = [panel_library] + curses_libs) )
-        else:
-            missing.append('_curses_panel')
-
-        # Andrew Kuchling's zlib module.  Note that some versions of zlib
-        # 1.1.3 have security problems.  See CERT Advisory CA-2002-07:
-        # http://www.cert.org/advisories/CA-2002-07.html
-        #
-        # zlib 1.1.4 is fixed, but at least one vendor (RedHat) has decided to
-        # patch its zlib 1.1.3 package instead of upgrading to 1.1.4.  For
-        # now, we still accept 1.1.3, because we think it's difficult to
-        # exploit this in Python, and we'd rather make it RedHat's problem
-        # than our problem <wink>.
-        #
-        # You can upgrade zlib to version 1.1.4 yourself by going to
-        # http://www.gzip.org/zlib/
-        zlib_inc = find_file('zlib.h', [], inc_dirs)
-        have_zlib = False
-        if zlib_inc is not None:
-            zlib_h = zlib_inc[0] + '/zlib.h'
-            version = '"0.0.0"'
-            version_req = '"1.1.3"'
-            if host_platform == 'darwin' and is_macosx_sdk_path(zlib_h):
-                zlib_h = os.path.join(macosx_sdk_root(), zlib_h[1:])
-            fp = open(zlib_h)
-            while 1:
-                line = fp.readline()
-                if not line:
-                    break
-                if line.startswith('#define ZLIB_VERSION'):
-                    version = line.split()[2]
-                    break
-            if version >= version_req:
-                if (self.compiler.find_library_file(lib_dirs, 'z')):
-                    if host_platform == "darwin":
-                        zlib_extra_link_args = ('-Wl,-search_paths_first',)
-                    else:
-                        zlib_extra_link_args = ()
-                    exts.append( Extension('zlib', ['zlibmodule.c'],
-                                           libraries = ['z'],
-                                           extra_link_args = zlib_extra_link_args))
-                    have_zlib = True
-                else:
-                    missing.append('zlib')
-            else:
-                missing.append('zlib')
-        else:
-            missing.append('zlib')
-
-        # Helper module for various ascii-encoders.  Uses zlib for an optimized
-        # crc32 if we have it.  Otherwise binascii uses its own.
-        if have_zlib:
-            extra_compile_args = ['-DUSE_ZLIB_CRC32']
-            libraries = ['z']
-            extra_link_args = zlib_extra_link_args
-        else:
-            extra_compile_args = []
-            libraries = []
-            extra_link_args = []
-        exts.append( Extension('binascii', ['binascii.c'],
-                               extra_compile_args = extra_compile_args,
-                               libraries = libraries,
-                               extra_link_args = extra_link_args) )
-
-        # Gustavo Niemeyer's bz2 module.
-        if (self.compiler.find_library_file(lib_dirs, 'bz2')):
-            if host_platform == "darwin":
-                bz2_extra_link_args = ('-Wl,-search_paths_first',)
-            else:
-                bz2_extra_link_args = ()
-            exts.append( Extension('bz2', ['bz2module.c'],
-                                   libraries = ['bz2'],
-                                   extra_link_args = bz2_extra_link_args) )
-        else:
-            missing.append('bz2')
-
-        # Interface to the Expat XML parser
-        #
-        # Expat was written by James Clark and is now maintained by a group of
-        # developers on SourceForge; see www.libexpat.org for more information.
-        # The pyexpat module was written by Paul Prescod after a prototype by
-        # Jack Jansen.  The Expat source is included in Modules/expat/.  Usage
-        # of a system shared libexpat.so is possible with --with-system-expat
-        # configure option.
-        #
-        # More information on Expat can be found at www.libexpat.org.
-        #
-        if '--with-system-expat' in sysconfig.get_config_var("CONFIG_ARGS"):
-            expat_inc = []
-            define_macros = []
-            expat_lib = ['expat']
-            expat_sources = []
-            expat_depends = []
-        else:
-            expat_inc = [os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')]
-            define_macros = [
-                ('HAVE_EXPAT_CONFIG_H', '1'),
-            ]
-            expat_lib = []
-            expat_sources = ['expat/xmlparse.c',
-                             'expat/xmlrole.c',
-                             'expat/xmltok.c']
-            expat_depends = ['expat/ascii.h',
-                             'expat/asciitab.h',
-                             'expat/expat.h',
-                             'expat/expat_config.h',
-                             'expat/expat_external.h',
-                             'expat/internal.h',
-                             'expat/latin1tab.h',
-                             'expat/utf8tab.h',
-                             'expat/xmlrole.h',
-                             'expat/xmltok.h',
-                             'expat/xmltok_impl.h'
-                             ]
-
-        exts.append(Extension('pyexpat',
-                              define_macros = define_macros,
-                              include_dirs = expat_inc,
-                              libraries = expat_lib,
-                              sources = ['pyexpat.c'] + expat_sources,
-                              depends = expat_depends,
-                              ))
-
-        # Fredrik Lundh's cElementTree module.  Note that this also
-        # uses expat (via the CAPI hook in pyexpat).
-
-        if os.path.isfile(os.path.join(srcdir, 'Modules', '_elementtree.c')):
-            define_macros.append(('USE_PYEXPAT_CAPI', None))
-            exts.append(Extension('_elementtree',
-                                  define_macros = define_macros,
-                                  include_dirs = expat_inc,
-                                  libraries = expat_lib,
-                                  sources = ['_elementtree.c'],
-                                  depends = ['pyexpat.c'] + expat_sources +
-                                      expat_depends,
-                                  ))
-        else:
-            missing.append('_elementtree')
-
-        # Hye-Shik Chang's CJKCodecs modules.
-        if have_unicode:
-            exts.append(Extension('_multibytecodec',
-                                  ['cjkcodecs/multibytecodec.c']))
-            for loc in ('kr', 'jp', 'cn', 'tw', 'hk', 'iso2022'):
-                exts.append(Extension('_codecs_%s' % loc,
-                                      ['cjkcodecs/_codecs_%s.c' % loc]))
-        else:
-            missing.append('_multibytecodec')
-            for loc in ('kr', 'jp', 'cn', 'tw', 'hk', 'iso2022'):
-                missing.append('_codecs_%s' % loc)
-
-        # Dynamic loading module
-        if sys.maxint == 0x7fffffff:
-            # This requires sizeof(int) == sizeof(long) == sizeof(char*)
-            dl_inc = find_file('dlfcn.h', [], inc_dirs)
-            if (dl_inc is not None) and (host_platform not in ['atheos']):
-                exts.append( Extension('dl', ['dlmodule.c']) )
-            else:
-                missing.append('dl')
-        else:
-            missing.append('dl')
-
-        # Thomas Heller's _ctypes module
-        self.detect_ctypes(inc_dirs, lib_dirs)
-
-        # Richard Oudkerk's multiprocessing module
-        if host_platform == 'win32':             # Windows
-            macros = dict()
-            libraries = ['ws2_32']
-
-        elif host_platform == 'darwin':          # Mac OSX
-            macros = dict()
-            libraries = []
-
-        elif host_platform == 'cygwin':          # Cygwin
-            macros = dict()
-            libraries = []
-
-        elif host_platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
-            # FreeBSD's P1003.1b semaphore support is very experimental
-            # and has many known problems. (as of June 2008)
-            macros = dict()
-            libraries = []
-
-        elif host_platform.startswith('openbsd'):
-            macros = dict()
-            libraries = []
-
-        elif host_platform.startswith('netbsd'):
-            macros = dict()
-            libraries = []
-
-        else:                                   # Linux and other unices
-            macros = dict()
-            libraries = ['rt']
-
-        if host_platform == 'win32':
-            multiprocessing_srcs = [ '_multiprocessing/multiprocessing.c',
-                                     '_multiprocessing/semaphore.c',
-                                     '_multiprocessing/pipe_connection.c',
-                                     '_multiprocessing/socket_connection.c',
-                                     '_multiprocessing/win32_functions.c'
-                                   ]
-
-        else:
-            multiprocessing_srcs = [ '_multiprocessing/multiprocessing.c',
-                                     '_multiprocessing/socket_connection.c'
-                                   ]
-            if (sysconfig.get_config_var('HAVE_SEM_OPEN') and not
-                sysconfig.get_config_var('POSIX_SEMAPHORES_NOT_ENABLED')):
-                multiprocessing_srcs.append('_multiprocessing/semaphore.c')
-
-        if sysconfig.get_config_var('WITH_THREAD'):
-            exts.append ( Extension('_multiprocessing', multiprocessing_srcs,
-                                    define_macros=macros.items(),
-                                    include_dirs=["Modules/_multiprocessing"]))
-        else:
-            missing.append('_multiprocessing')
-
-        # End multiprocessing
-
-
-        # Platform-specific libraries
-        if host_platform == 'linux2':
-            # Linux-specific modules
-            exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) )
-        else:
-            missing.append('linuxaudiodev')
-
-        if (host_platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
-                        'freebsd7', 'freebsd8')
-            or host_platform.startswith("gnukfreebsd")):
-            exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
-        else:
-            missing.append('ossaudiodev')
-
-        if host_platform == 'sunos5':
-            # SunOS specific modules
-            exts.append( Extension('sunaudiodev', ['sunaudiodev.c']) )
-        else:
-            missing.append('sunaudiodev')
-
-        if host_platform == 'darwin':
-            # _scproxy
-            exts.append(Extension("_scproxy", [os.path.join(srcdir, "Mac/Modules/_scproxy.c")],
-                extra_link_args= [
-                    '-framework', 'SystemConfiguration',
-                    '-framework', 'CoreFoundation'
-                ]))
-
-
-        if host_platform == 'darwin' and ("--disable-toolbox-glue" not in
-                sysconfig.get_config_var("CONFIG_ARGS")):
-
-            if int(os.uname()[2].split('.')[0]) >= 8:
-                # We're on Mac OS X 10.4 or later, the compiler should
-                # support '-Wno-deprecated-declarations'. This will
-                # surpress deprecation warnings for the Carbon extensions,
-                # these extensions wrap the Carbon APIs and even those
-                # parts that are deprecated.
-                carbon_extra_compile_args = ['-Wno-deprecated-declarations']
-            else:
-                carbon_extra_compile_args = []
-
-            # Mac OS X specific modules.
-            def macSrcExists(name1, name2=''):
-                if not name1:
-                    return None
-                names = (name1,)
-                if name2:
-                    names = (name1, name2)
-                path = os.path.join(srcdir, 'Mac', 'Modules', *names)
-                return os.path.exists(path)
-
-            def addMacExtension(name, kwds, extra_srcs=[]):
-                dirname = ''
-                if name[0] == '_':
-                    dirname = name[1:].lower()
-                cname = name + '.c'
-                cmodulename = name + 'module.c'
-                # Check for NNN.c, NNNmodule.c, _nnn/NNN.c, _nnn/NNNmodule.c
-                if macSrcExists(cname):
-                    srcs = [cname]
-                elif macSrcExists(cmodulename):
-                    srcs = [cmodulename]
-                elif macSrcExists(dirname, cname):
-                    # XXX(nnorwitz): If all the names ended with module, we
-                    # wouldn't need this condition.  ibcarbon is the only one.
-                    srcs = [os.path.join(dirname, cname)]
-                elif macSrcExists(dirname, cmodulename):
-                    srcs = [os.path.join(dirname, cmodulename)]
-                else:
-                    raise RuntimeError("%s not found" % name)
-
-                # Here's the whole point:  add the extension with sources
-                exts.append(Extension(name, srcs + extra_srcs, **kwds))
-
-            # Core Foundation
-            core_kwds = {'extra_compile_args': carbon_extra_compile_args,
-                         'extra_link_args': ['-framework', 'CoreFoundation'],
-                        }
-            addMacExtension('_CF', core_kwds, ['cf/pycfbridge.c'])
-            addMacExtension('autoGIL', core_kwds)
-
-
-
-            # Carbon
-            carbon_kwds = {'extra_compile_args': carbon_extra_compile_args,
-                           'extra_link_args': ['-framework', 'Carbon'],
-                          }
-            CARBON_EXTS = ['ColorPicker', 'gestalt', 'MacOS', 'Nav',
-                           'OSATerminology', 'icglue',
-                           # All these are in subdirs
-                           '_AE', '_AH', '_App', '_CarbonEvt', '_Cm', '_Ctl',
-                           '_Dlg', '_Drag', '_Evt', '_File', '_Folder', '_Fm',
-                           '_Help', '_Icn', '_IBCarbon', '_List',
-                           '_Menu', '_Mlte', '_OSA', '_Res', '_Qd', '_Qdoffs',
-                           '_Scrap', '_Snd', '_TE',
-                          ]
-            for name in CARBON_EXTS:
-                addMacExtension(name, carbon_kwds)
-
-            # Workaround for a bug in the version of gcc shipped with Xcode 3.
-            # The _Win extension should build just like the other Carbon extensions, but
-            # this actually results in a hard crash of the linker.
-            #
-            if '-arch ppc64' in cflags and '-arch ppc' in cflags:
-                win_kwds = {'extra_compile_args': carbon_extra_compile_args + ['-arch', 'i386', '-arch', 'ppc'],
-                               'extra_link_args': ['-framework', 'Carbon', '-arch', 'i386', '-arch', 'ppc'],
-                           }
-                addMacExtension('_Win', win_kwds)
-            else:
-                addMacExtension('_Win', carbon_kwds)
-
-
-            # Application Services & QuickTime
-            app_kwds = {'extra_compile_args': carbon_extra_compile_args,
-                        'extra_link_args': ['-framework','ApplicationServices'],
-                       }
-            addMacExtension('_Launch', app_kwds)
-            addMacExtension('_CG', app_kwds)
-
-            exts.append( Extension('_Qt', ['qt/_Qtmodule.c'],
-                        extra_compile_args=carbon_extra_compile_args,
-                        extra_link_args=['-framework', 'QuickTime',
-                                     '-framework', 'Carbon']) )
-
-
-        self.extensions.extend(exts)
-
-        # Call the method for detecting whether _tkinter can be compiled
-        self.detect_tkinter(inc_dirs, lib_dirs)
-
-        if '_tkinter' not in [e.name for e in self.extensions]:
-            missing.append('_tkinter')
-
-##         # Uncomment these lines if you want to play with xxmodule.c
-##         ext = Extension('xx', ['xxmodule.c'])
-##         self.extensions.append(ext)
-
-        return missing
-
-    def detect_tkinter_explicitly(self):
-        # Build _tkinter using explicit locations for Tcl/Tk.
-        #
-        # This is enabled when both arguments are given to ./configure:
-        #
-        #     --with-tcltk-includes="-I/path/to/tclincludes \
-        #                            -I/path/to/tkincludes"
-        #     --with-tcltk-libs="-L/path/to/tcllibs -ltclm.n \
-        #                        -L/path/to/tklibs -ltkm.n"
-        #
-        # These values can also be specified or overriden via make:
-        #    make TCLTK_INCLUDES="..." TCLTK_LIBS="..."
-        #
-        # This can be useful for building and testing tkinter with multiple
-        # versions of Tcl/Tk.  Note that a build of Tk depends on a particular
-        # build of Tcl so you need to specify both arguments and use care when
-        # overriding.
-
-        # The _TCLTK variables are created in the Makefile sharedmods target.
-        tcltk_includes = os.environ.get('_TCLTK_INCLUDES')
-        tcltk_libs = os.environ.get('_TCLTK_LIBS')
-        if not (tcltk_includes and tcltk_libs):
-            # Resume default configuration search.
-            return 0
-
-        extra_compile_args = tcltk_includes.split()
-        extra_link_args = tcltk_libs.split()
-        ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
-                        define_macros=[('WITH_APPINIT', 1)],
-                        extra_compile_args = extra_compile_args,
-                        extra_link_args = extra_link_args,
-                        )
-        self.extensions.append(ext)
-        return 1
-
-    def detect_tkinter_darwin(self, inc_dirs, lib_dirs):
-        # The _tkinter module, using frameworks. Since frameworks are quite
-        # different the UNIX search logic is not sharable.
-        from os.path import join, exists
-        framework_dirs = [
-            '/Library/Frameworks',
-            '/System/Library/Frameworks/',
-            join(os.getenv('HOME'), '/Library/Frameworks')
-        ]
-
-        sysroot = macosx_sdk_root()
-
-        # Find the directory that contains the Tcl.framework and Tk.framework
-        # bundles.
-        # XXX distutils should support -F!
-        for F in framework_dirs:
-            # both Tcl.framework and Tk.framework should be present
-
-
-            for fw in 'Tcl', 'Tk':
-                if is_macosx_sdk_path(F):
-                    if not exists(join(sysroot, F[1:], fw + '.framework')):
-                        break
-                else:
-                    if not exists(join(F, fw + '.framework')):
-                        break
-            else:
-                # ok, F is now directory with both frameworks. Continure
-                # building
-                break
-        else:
-            # Tk and Tcl frameworks not found. Normal "unix" tkinter search
-            # will now resume.
-            return 0
-
-        # For 8.4a2, we must add -I options that point inside the Tcl and Tk
-        # frameworks. In later release we should hopefully be able to pass
-        # the -F option to gcc, which specifies a framework lookup path.
-        #
-        include_dirs = [
-            join(F, fw + '.framework', H)
-            for fw in 'Tcl', 'Tk'
-            for H in 'Headers', 'Versions/Current/PrivateHeaders'
-        ]
-
-        # For 8.4a2, the X11 headers are not included. Rather than include a
-        # complicated search, this is a hard-coded path. It could bail out
-        # if X11 libs are not found...
-        include_dirs.append('/usr/X11R6/include')
-        frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
-
-        # All existing framework builds of Tcl/Tk don't support 64-bit
-        # architectures.
-        cflags = sysconfig.get_config_vars('CFLAGS')[0]
-        archs = re.findall('-arch\s+(\w+)', cflags)
-
-        if is_macosx_sdk_path(F):
-            fp = os.popen("file %s/Tk.framework/Tk | grep 'for architecture'"%(os.path.join(sysroot, F[1:]),))
-        else:
-            fp = os.popen("file %s/Tk.framework/Tk | grep 'for architecture'"%(F,))
-
-        detected_archs = []
-        for ln in fp:
-            a = ln.split()[-1]
-            if a in archs:
-                detected_archs.append(ln.split()[-1])
-        fp.close()
-
-        for a in detected_archs:
-            frameworks.append('-arch')
-            frameworks.append(a)
-
-        ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
-                        define_macros=[('WITH_APPINIT', 1)],
-                        include_dirs = include_dirs,
-                        libraries = [],
-                        extra_compile_args = frameworks[2:],
-                        extra_link_args = frameworks,
-                        )
-        self.extensions.append(ext)
-        return 1
-
-    def detect_tkinter(self, inc_dirs, lib_dirs):
-        # The _tkinter module.
-
-        # Check whether --with-tcltk-includes and --with-tcltk-libs were
-        # configured or passed into the make target.  If so, use these values
-        # to build tkinter and bypass the searches for Tcl and TK in standard
-        # locations.
-        if self.detect_tkinter_explicitly():
-            return
-
-        # Rather than complicate the code below, detecting and building
-        # AquaTk is a separate method. Only one Tkinter will be built on
-        # Darwin - either AquaTk, if it is found, or X11 based Tk.
-        if (host_platform == 'darwin' and
-            self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
-            return
-
-        # Assume we haven't found any of the libraries or include files
-        # The versions with dots are used on Unix, and the versions without
-        # dots on Windows, for detection by cygwin.
-        tcllib = tklib = tcl_includes = tk_includes = None
-        for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83',
-                        '8.2', '82', '8.1', '81', '8.0', '80']:
-            tklib = self.compiler.find_library_file(lib_dirs,
-                                                        'tk' + version)
-            tcllib = self.compiler.find_library_file(lib_dirs,
-                                                         'tcl' + version)
-            if tklib and tcllib:
-                # Exit the loop when we've found the Tcl/Tk libraries
-                break
-
-        # Now check for the header files
-        if tklib and tcllib:
-            # Check for the include files on Debian and {Free,Open}BSD, where
-            # they're put in /usr/include/{tcl,tk}X.Y
-            dotversion = version
-            if '.' not in dotversion and "bsd" in host_platform.lower():
-                # OpenBSD and FreeBSD use Tcl/Tk library names like libtcl83.a,
-                # but the include subdirs are named like .../include/tcl8.3.
-                dotversion = dotversion[:-1] + '.' + dotversion[-1]
-            tcl_include_sub = []
-            tk_include_sub = []
-            for dir in inc_dirs:
-                tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
-                tk_include_sub += [dir + os.sep + "tk" + dotversion]
-            tk_include_sub += tcl_include_sub
-            tcl_includes = find_file('tcl.h', inc_dirs, tcl_include_sub)
-            tk_includes = find_file('tk.h', inc_dirs, tk_include_sub)
-
-        if (tcllib is None or tklib is None or
-            tcl_includes is None or tk_includes is None):
-            self.announce("INFO: Can't locate Tcl/Tk libs and/or headers", 2)
-            return
-
-        # OK... everything seems to be present for Tcl/Tk.
-
-        include_dirs = [] ; libs = [] ; defs = [] ; added_lib_dirs = []
-        for dir in tcl_includes + tk_includes:
-            if dir not in include_dirs:
-                include_dirs.append(dir)
-
-        # Check for various platform-specific directories
-        if host_platform == 'sunos5':
-            include_dirs.append('/usr/openwin/include')
-            added_lib_dirs.append('/usr/openwin/lib')
-        elif os.path.exists('/usr/X11R6/include'):
-            include_dirs.append('/usr/X11R6/include')
-            added_lib_dirs.append('/usr/X11R6/lib64')
-            added_lib_dirs.append('/usr/X11R6/lib')
-        elif os.path.exists('/usr/X11R5/include'):
-            include_dirs.append('/usr/X11R5/include')
-            added_lib_dirs.append('/usr/X11R5/lib')
-        else:
-            # Assume default location for X11
-            include_dirs.append('/usr/X11/include')
-            added_lib_dirs.append('/usr/X11/lib')
-
-        # If Cygwin, then verify that X is installed before proceeding
-        if host_platform == 'cygwin':
-            x11_inc = find_file('X11/Xlib.h', [], include_dirs)
-            if x11_inc is None:
-                return
-
-        # Check for BLT extension
-        if self.compiler.find_library_file(lib_dirs + added_lib_dirs,
-                                               'BLT8.0'):
-            defs.append( ('WITH_BLT', 1) )
-            libs.append('BLT8.0')
-        elif self.compiler.find_library_file(lib_dirs + added_lib_dirs,
-                                                'BLT'):
-            defs.append( ('WITH_BLT', 1) )
-            libs.append('BLT')
-
-        # Add the Tcl/Tk libraries
-        libs.append('tk'+ version)
-        libs.append('tcl'+ version)
-
-        if host_platform in ['aix3', 'aix4']:
-            libs.append('ld')
-
-        # Finally, link with the X11 libraries (not appropriate on cygwin)
-        if host_platform != "cygwin":
-            libs.append('X11')
-
-        ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
-                        define_macros=[('WITH_APPINIT', 1)] + defs,
-                        include_dirs = include_dirs,
-                        libraries = libs,
-                        library_dirs = added_lib_dirs,
-                        )
-        self.extensions.append(ext)
-
-        # XXX handle these, but how to detect?
-        # *** Uncomment and edit for PIL (TkImaging) extension only:
-        #       -DWITH_PIL -I../Extensions/Imaging/libImaging  tkImaging.c \
-        # *** Uncomment and edit for TOGL extension only:
-        #       -DWITH_TOGL togl.c \
-        # *** Uncomment these for TOGL extension only:
-        #       -lGL -lGLU -lXext -lXmu \
-
-    def configure_ctypes_darwin(self, ext):
-        # Darwin (OS X) uses preconfigured files, in
-        # the Modules/_ctypes/libffi_osx directory.
-        srcdir = sysconfig.get_config_var('srcdir')
-        ffi_srcdir = os.path.abspath(os.path.join(srcdir, 'Modules',
-                                                  '_ctypes', 'libffi_osx'))
-        sources = [os.path.join(ffi_srcdir, p)
-                   for p in ['ffi.c',
-                             'x86/darwin64.S',
-                             'x86/x86-darwin.S',
-                             'x86/x86-ffi_darwin.c',
-                             'x86/x86-ffi64.c',
-                             'powerpc/ppc-darwin.S',
-                             'powerpc/ppc-darwin_closure.S',
-                             'powerpc/ppc-ffi_darwin.c',
-                             'powerpc/ppc64-darwin_closure.S',
-                             ]]
-
-        # Add .S (preprocessed assembly) to C compiler source extensions.
-        self.compiler.src_extensions.append('.S')
-
-        include_dirs = [os.path.join(ffi_srcdir, 'include'),
-                        os.path.join(ffi_srcdir, 'powerpc')]
-        ext.include_dirs.extend(include_dirs)
-        ext.sources.extend(sources)
-        return True
-
-    def configure_ctypes(self, ext):
-        if not self.use_system_libffi:
-            if host_platform == 'darwin':
-                return self.configure_ctypes_darwin(ext)
-
-            srcdir = sysconfig.get_config_var('srcdir')
-            ffi_builddir = os.path.join(self.build_temp, 'libffi')
-            ffi_srcdir = os.path.abspath(os.path.join(srcdir, 'Modules',
-                                         '_ctypes', 'libffi'))
-            ffi_configfile = os.path.join(ffi_builddir, 'fficonfig.py')
-
-            from distutils.dep_util import newer_group
-
-            config_sources = [os.path.join(ffi_srcdir, fname)
-                              for fname in os.listdir(ffi_srcdir)
-                              if os.path.isfile(os.path.join(ffi_srcdir, fname))]
-            if self.force or newer_group(config_sources,
-                                         ffi_configfile):
-                from distutils.dir_util import mkpath
-                mkpath(ffi_builddir)
-                config_args = [arg for arg in sysconfig.get_config_var("CONFIG_ARGS").split()
-                               if (('--host=' in arg) or ('--build=' in arg))]
-                if not self.verbose:
-                    config_args.append("-q")
-
-                # Pass empty CFLAGS because we'll just append the resulting
-                # CFLAGS to Python's; -g or -O2 is to be avoided.
-                cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \
-                      % (ffi_builddir, ffi_srcdir, " ".join(config_args))
-
-                res = os.system(cmd)
-                if res or not os.path.exists(ffi_configfile):
-                    print "Failed to configure _ctypes module"
-                    return False
-
-            fficonfig = {}
-            with open(ffi_configfile) as f:
-                exec f in fficonfig
-
-            # Add .S (preprocessed assembly) to C compiler source extensions.
-            self.compiler.src_extensions.append('.S')
-
-            include_dirs = [os.path.join(ffi_builddir, 'include'),
-                            ffi_builddir,
-                            os.path.join(ffi_srcdir, 'src')]
-            extra_compile_args = fficonfig['ffi_cflags'].split()
-
-            ext.sources.extend(os.path.join(ffi_srcdir, f) for f in
-                               fficonfig['ffi_sources'])
-            ext.include_dirs.extend(include_dirs)
-            ext.extra_compile_args.extend(extra_compile_args)
-        return True
-
-    def detect_ctypes(self, inc_dirs, lib_dirs):
-        self.use_system_libffi = False
-        include_dirs = []
-        extra_compile_args = []
-        extra_link_args = []
-        sources = ['_ctypes/_ctypes.c',
-                   '_ctypes/callbacks.c',
-                   '_ctypes/callproc.c',
-                   '_ctypes/stgdict.c',
-                   '_ctypes/cfield.c']
-        depends = ['_ctypes/ctypes.h']
-
-        if host_platform == 'darwin':
-            sources.append('_ctypes/malloc_closure.c')
-            sources.append('_ctypes/darwin/dlfcn_simple.c')
-            extra_compile_args.append('-DMACOSX')
-            include_dirs.append('_ctypes/darwin')
-# XXX Is this still needed?
-##            extra_link_args.extend(['-read_only_relocs', 'warning'])
-
-        elif host_platform == 'sunos5':
-            # XXX This shouldn't be necessary; it appears that some
-            # of the assembler code is non-PIC (i.e. it has relocations
-            # when it shouldn't. The proper fix would be to rewrite
-            # the assembler code to be PIC.
-            # This only works with GCC; the Sun compiler likely refuses
-            # this option. If you want to compile ctypes with the Sun
-            # compiler, please research a proper solution, instead of
-            # finding some -z option for the Sun compiler.
-            extra_link_args.append('-mimpure-text')
-
-        elif host_platform.startswith('hp-ux'):
-            extra_link_args.append('-fPIC')
-
-        ext = Extension('_ctypes',
-                        include_dirs=include_dirs,
-                        extra_compile_args=extra_compile_args,
-                        extra_link_args=extra_link_args,
-                        libraries=[],
-                        sources=sources,
-                        depends=depends)
-        ext_test = Extension('_ctypes_test',
-                             sources=['_ctypes/_ctypes_test.c'])
-        self.extensions.extend([ext, ext_test])
-
-        if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"):
-            return
-
-        if host_platform == 'darwin':
-            # OS X 10.5 comes with libffi.dylib; the include files are
-            # in /usr/include/ffi
-            inc_dirs.append('/usr/include/ffi')
-
-        ffi_inc = [sysconfig.get_config_var("LIBFFI_INCLUDEDIR")]
-        if not ffi_inc or ffi_inc[0] == '':
-            ffi_inc = find_file('ffi.h', [], inc_dirs)
-        if ffi_inc is not None:
-            ffi_h = ffi_inc[0] + '/ffi.h'
-            fp = open(ffi_h)
-            while 1:
-                line = fp.readline()
-                if not line:
-                    ffi_inc = None
-                    break
-                if line.startswith('#define LIBFFI_H'):
-                    break
-        ffi_lib = None
-        if ffi_inc is not None:
-            for lib_name in ('ffi_convenience', 'ffi_pic', 'ffi'):
-                if (self.compiler.find_library_file(lib_dirs, lib_name)):
-                    ffi_lib = lib_name
-                    break
-
-        if ffi_inc and ffi_lib:
-            ext.include_dirs.extend(ffi_inc)
-            ext.libraries.append(ffi_lib)
-            self.use_system_libffi = True
-
-
-class PyBuildInstall(install):
-    # Suppress the warning about installation into the lib_dynload
-    # directory, which is not in sys.path when running Python during
-    # installation:
-    def initialize_options (self):
-        install.initialize_options(self)
-        self.warn_dir=0
-
-class PyBuildInstallLib(install_lib):
-    # Do exactly what install_lib does but make sure correct access modes get
-    # set on installed directories and files. All installed files with get
-    # mode 644 unless they are a shared library in which case they will get
-    # mode 755. All installed directories will get mode 755.
-
-    so_ext = sysconfig.get_config_var("SO")
-
-    def install(self):
-        outfiles = install_lib.install(self)
-        self.set_file_modes(outfiles, 0644, 0755)
-        self.set_dir_modes(self.install_dir, 0755)
-        return outfiles
-
-    def set_file_modes(self, files, defaultMode, sharedLibMode):
-        if not self.is_chmod_supported(): return
-        if not files: return
-
-        for filename in files:
-            if os.path.islink(filename): continue
-            mode = defaultMode
-            if filename.endswith(self.so_ext): mode = sharedLibMode
-            log.info("changing mode of %s to %o", filename, mode)
-            if not self.dry_run: os.chmod(filename, mode)
-
-    def set_dir_modes(self, dirname, mode):
-        if not self.is_chmod_supported(): return
-        os.path.walk(dirname, self.set_dir_modes_visitor, mode)
-
-    def set_dir_modes_visitor(self, mode, dirname, names):
-        if os.path.islink(dirname): return
-        log.info("changing mode of %s to %o", dirname, mode)
-        if not self.dry_run: os.chmod(dirname, mode)
-
-    def is_chmod_supported(self):
-        return hasattr(os, 'chmod')
-
-SUMMARY = """
-Python is an interpreted, interactive, object-oriented programming
-language. It is often compared to Tcl, Perl, Scheme or Java.
-
-Python combines remarkable power with very clear syntax. It has
-modules, classes, exceptions, very high level dynamic data types, and
-dynamic typing. There are interfaces to many system calls and
-libraries, as well as to various windowing systems (X11, Motif, Tk,
-Mac, MFC). New built-in modules are easily written in C or C++. Python
-is also usable as an extension language for applications that need a
-programmable interface.
-
-The Python implementation is portable: it runs on many brands of UNIX,
-on Windows, DOS, OS/2, Mac, Amiga... If your favorite system isn't
-listed here, it may still be supported, if there's a C compiler for
-it. Ask around on comp.lang.python -- or just try compiling Python
-yourself.
-"""
-
-CLASSIFIERS = """
-Development Status :: 6 - Mature
-License :: OSI Approved :: Python Software Foundation License
-Natural Language :: English
-Programming Language :: C
-Programming Language :: Python
-Topic :: Software Development
-"""
-
-def main():
-    # turn off warnings when deprecated modules are imported
-    import warnings
-    warnings.filterwarnings("ignore",category=DeprecationWarning)
-    setup(# PyPI Metadata (PEP 301)
-          name = "Python",
-          version = sys.version.split()[0],
-          url = "http://www.python.org/%s" % sys.version[:3],
-          maintainer = "Guido van Rossum and the Python community",
-          maintainer_email = "python-dev@python.org",
-          description = "A high-level object-oriented programming language",
-          long_description = SUMMARY.strip(),
-          license = "PSF license",
-          classifiers = filter(None, CLASSIFIERS.split("\n")),
-          platforms = ["Many"],
-
-          # Build info
-          cmdclass = {'build_ext':PyBuildExt, 'install':PyBuildInstall,
-                      'install_lib':PyBuildInstallLib},
-          # The struct module is defined here, because build_ext won't be
-          # called unless there's at least one extension module defined.
-          ext_modules=[Extension('_struct', ['_struct.c'])],
-
-          # Scripts to install
-          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
-                     'Tools/scripts/2to3',
-                     'Lib/smtpd.py']
-        )
-
-# --install-platlib
-if __name__ == '__main__':
-    main()
diff --git a/pysrc/src/setup.py b/pysrc/src/setup.py
deleted file mode 100644
index 9a92bc3a7..000000000
--- a/pysrc/src/setup.py
+++ /dev/null
@@ -1,2244 +0,0 @@
-# Autodetecting setup.py script for building the Python extensions
-#
-
-__version__ = "$Revision$"
-
-import sys, os, imp, re, optparse
-from glob import glob
-from platform import machine as platform_machine
-import sysconfig
-
-from distutils import log
-from distutils import text_file
-from distutils.errors import *
-from distutils.core import Extension, setup
-from distutils.command.build_ext import build_ext
-from distutils.command.install import install
-from distutils.command.install_lib import install_lib
-from distutils.spawn import find_executable
-
-cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ
-
-def get_platform():
-    # cross build
-    if "_PYTHON_HOST_PLATFORM" in os.environ:
-        return os.environ["_PYTHON_HOST_PLATFORM"]
-    # Get value of sys.platform
-    if sys.platform.startswith('osf1'):
-        return 'osf1'
-    return sys.platform
-host_platform = get_platform()
-
-# Were we compiled --with-pydebug or with #define Py_DEBUG?
-COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
-
-# This global variable is used to hold the list of modules to be disabled.
-disabled_module_list = []
-
-def add_dir_to_list(dirlist, dir):
-    """Add the directory 'dir' to the list 'dirlist' (at the front) if
-    1) 'dir' is not already in 'dirlist'
-    2) 'dir' actually exists, and is a directory."""
-    if dir is not None and os.path.isdir(dir) and dir not in dirlist:
-        dirlist.insert(0, dir)
-
-def macosx_sdk_root():
-    """
-    Return the directory of the current OSX SDK,
-    or '/' if no SDK was specified.
-    """
-    cflags = sysconfig.get_config_var('CFLAGS')
-    m = re.search(r'-isysroot\s+(\S+)', cflags)
-    if m is None:
-        sysroot = '/'
-    else:
-        sysroot = m.group(1)
-    return sysroot
-
-def is_macosx_sdk_path(path):
-    """
-    Returns True if 'path' can be located in an OSX SDK
-    """
-    return ( (path.startswith('/usr/') and not path.startswith('/usr/local'))
-                or path.startswith('/System/')
-                or path.startswith('/Library/') )
-
-def find_file(filename, std_dirs, paths):
-    """Searches for the directory where a given file is located,
-    and returns a possibly-empty list of additional directories, or None
-    if the file couldn't be found at all.
-
-    'filename' is the name of a file, such as readline.h or libcrypto.a.
-    'std_dirs' is the list of standard system directories; if the
-        file is found in one of them, no additional directives are needed.
-    'paths' is a list of additional locations to check; if the file is
-        found in one of them, the resulting list will contain the directory.
-    """
-    if host_platform == 'darwin':
-        # Honor the MacOSX SDK setting when one was specified.
-        # An SDK is a directory with the same structure as a real
-        # system, but with only header files and libraries.
-        sysroot = macosx_sdk_root()
-
-    # Check the standard locations
-    for dir in std_dirs:
-        f = os.path.join(dir, filename)
-
-        if host_platform == 'darwin' and is_macosx_sdk_path(dir):
-            f = os.path.join(sysroot, dir[1:], filename)
-
-        if os.path.exists(f): return []
-
-    # Check the additional directories
-    for dir in paths:
-        f = os.path.join(dir, filename)
-
-        if host_platform == 'darwin' and is_macosx_sdk_path(dir):
-            f = os.path.join(sysroot, dir[1:], filename)
-
-        if os.path.exists(f):
-            return [dir]
-
-    # Not found anywhere
-    return None
-
-def find_library_file(compiler, libname, std_dirs, paths):
-    result = compiler.find_library_file(std_dirs + paths, libname)
-    if result is None:
-        return None
-
-    if host_platform == 'darwin':
-        sysroot = macosx_sdk_root()
-
-    # Check whether the found file is in one of the standard directories
-    dirname = os.path.dirname(result)
-    for p in std_dirs:
-        # Ensure path doesn't end with path separator
-        p = p.rstrip(os.sep)
-
-        if host_platform == 'darwin' and is_macosx_sdk_path(p):
-            if os.path.join(sysroot, p[1:]) == dirname:
-                return [ ]
-
-        if p == dirname:
-            return [ ]
-
-    # Otherwise, it must have been in one of the additional directories,
-    # so we have to figure out which one.
-    for p in paths:
-        # Ensure path doesn't end with path separator
-        p = p.rstrip(os.sep)
-
-        if host_platform == 'darwin' and is_macosx_sdk_path(p):
-            if os.path.join(sysroot, p[1:]) == dirname:
-                return [ p ]
-
-        if p == dirname:
-            return [p]
-    else:
-        assert False, "Internal error: Path not found in std_dirs or paths"
-
-def module_enabled(extlist, modname):
-    """Returns whether the module 'modname' is present in the list
-    of extensions 'extlist'."""
-    extlist = [ext for ext in extlist if ext.name == modname]
-    return len(extlist)
-
-def find_module_file(module, dirlist):
-    """Find a module in a set of possible folders. If it is not found
-    return the unadorned filename"""
-    list = find_file(module, [], dirlist)
-    if not list:
-        return module
-    if len(list) > 1:
-        log.info("WARNING: multiple copies of %s found"%module)
-    return os.path.join(list[0], module)
-
-class PyBuildExt(build_ext):
-
-    def __init__(self, dist):
-        build_ext.__init__(self, dist)
-        self.failed = []
-
-    def build_extensions(self):
-
-        # Detect which modules should be compiled
-        missing = self.detect_modules()
-
-        # Remove modules that are present on the disabled list
-        extensions = [ext for ext in self.extensions
-                      if ext.name not in disabled_module_list]
-        # move ctypes to the end, it depends on other modules
-        ext_map = dict((ext.name, i) for i, ext in enumerate(extensions))
-        if "_ctypes" in ext_map:
-            ctypes = extensions.pop(ext_map["_ctypes"])
-            extensions.append(ctypes)
-        self.extensions = extensions
-
-        # Fix up the autodetected modules, prefixing all the source files
-        # with Modules/ and adding Python's include directory to the path.
-        (srcdir,) = sysconfig.get_config_vars('srcdir')
-        if not srcdir:
-            # Maybe running on Windows but not using CYGWIN?
-            raise ValueError("No source directory; cannot proceed.")
-        srcdir = os.path.abspath(srcdir)
-        moddirlist = [os.path.join(srcdir, 'Modules')]
-
-        # Platform-dependent module source and include directories
-        incdirlist = []
-
-        if host_platform == 'darwin' and ("--disable-toolbox-glue" not in
-            sysconfig.get_config_var("CONFIG_ARGS")):
-            # Mac OS X also includes some mac-specific modules
-            macmoddir = os.path.join(srcdir, 'Mac/Modules')
-            moddirlist.append(macmoddir)
-            incdirlist.append(os.path.join(srcdir, 'Mac/Include'))
-
-        # Fix up the paths for scripts, too
-        self.distribution.scripts = [os.path.join(srcdir, filename)
-                                     for filename in self.distribution.scripts]
-
-        # Python header files
-        headers = [sysconfig.get_config_h_filename()]
-        headers += glob(os.path.join(sysconfig.get_path('include'), "*.h"))
-        for ext in self.extensions[:]:
-            ext.sources = [ find_module_file(filename, moddirlist)
-                            for filename in ext.sources ]
-            if ext.depends is not None:
-                ext.depends = [find_module_file(filename, moddirlist)
-                               for filename in ext.depends]
-            else:
-                ext.depends = []
-            # re-compile extensions if a header file has been changed
-            ext.depends.extend(headers)
-
-            # platform specific include directories
-            ext.include_dirs.extend(incdirlist)
-
-            # If a module has already been built statically,
-            # don't build it here
-            if ext.name in sys.builtin_module_names:
-                self.extensions.remove(ext)
-
-        # Parse Modules/Setup and Modules/Setup.local to figure out which
-        # modules are turned on in the file.
-        remove_modules = []
-        for filename in ('Modules/Setup', 'Modules/Setup.local'):
-            input = text_file.TextFile(filename, join_lines=1)
-            while 1:
-                line = input.readline()
-                if not line: break
-                line = line.split()
-                remove_modules.append(line[0])
-            input.close()
-
-        for ext in self.extensions[:]:
-            if ext.name in remove_modules:
-                self.extensions.remove(ext)
-
-        # When you run "make CC=altcc" or something similar, you really want
-        # those environment variables passed into the setup.py phase.  Here's
-        # a small set of useful ones.
-        compiler = os.environ.get('CC')
-        args = {}
-        # unfortunately, distutils doesn't let us provide separate C and C++
-        # compilers
-        if compiler is not None:
-            (ccshared,cflags) = sysconfig.get_config_vars('CCSHARED','CFLAGS')
-            args['compiler_so'] = compiler + ' ' + ccshared + ' ' + cflags
-        self.compiler.set_executables(**args)
-
-        build_ext.build_extensions(self)
-
-        longest = max([len(e.name) for e in self.extensions])
-        if self.failed:
-            longest = max(longest, max([len(name) for name in self.failed]))
-
-        def print_three_column(lst):
-            lst.sort(key=str.lower)
-            # guarantee zip() doesn't drop anything
-            while len(lst) % 3:
-                lst.append("")
-            for e, f, g in zip(lst[::3], lst[1::3], lst[2::3]):
-                print "%-*s   %-*s   %-*s" % (longest, e, longest, f,
-                                              longest, g)
-
-        if missing:
-            print
-            print ("Python build finished, but the necessary bits to build "
-                   "these modules were not found:")
-            print_three_column(missing)
-            print ("To find the necessary bits, look in setup.py in"
-                   " detect_modules() for the module's name.")
-            print
-
-        if self.failed:
-            failed = self.failed[:]
-            print
-            print "Failed to build these modules:"
-            print_three_column(failed)
-            print
-
-    def build_extension(self, ext):
-
-        if ext.name == '_ctypes':
-            if not self.configure_ctypes(ext):
-                return
-
-        try:
-            build_ext.build_extension(self, ext)
-        except (CCompilerError, DistutilsError), why:
-            self.announce('WARNING: building of extension "%s" failed: %s' %
-                          (ext.name, sys.exc_info()[1]))
-            self.failed.append(ext.name)
-            return
-        # Workaround for Mac OS X: The Carbon-based modules cannot be
-        # reliably imported into a command-line Python
-        if 'Carbon' in ext.extra_link_args:
-            self.announce(
-                'WARNING: skipping import check for Carbon-based "%s"' %
-                ext.name)
-            return
-
-        if host_platform == 'darwin' and (
-                sys.maxint > 2**32 and '-arch' in ext.extra_link_args):
-            # Don't bother doing an import check when an extension was
-            # build with an explicit '-arch' flag on OSX. That's currently
-            # only used to build 32-bit only extensions in a 4-way
-            # universal build and loading 32-bit code into a 64-bit
-            # process will fail.
-            self.announce(
-                'WARNING: skipping import check for "%s"' %
-                ext.name)
-            return
-
-        # Workaround for Cygwin: Cygwin currently has fork issues when many
-        # modules have been imported
-        if host_platform == 'cygwin':
-            self.announce('WARNING: skipping import check for Cygwin-based "%s"'
-                % ext.name)
-            return
-        ext_filename = os.path.join(
-            self.build_lib,
-            self.get_ext_filename(self.get_ext_fullname(ext.name)))
-
-        # Don't try to load extensions for cross builds
-        if cross_compiling:
-            return
-
-        try:
-            imp.load_dynamic(ext.name, ext_filename)
-        except ImportError, why:
-            self.failed.append(ext.name)
-            self.announce('*** WARNING: renaming "%s" since importing it'
-                          ' failed: %s' % (ext.name, why), level=3)
-            assert not self.inplace
-            basename, tail = os.path.splitext(ext_filename)
-            newname = basename + "_failed" + tail
-            if os.path.exists(newname):
-                os.remove(newname)
-            os.rename(ext_filename, newname)
-
-            # XXX -- This relies on a Vile HACK in
-            # distutils.command.build_ext.build_extension().  The
-            # _built_objects attribute is stored there strictly for
-            # use here.
-            # If there is a failure, _built_objects may not be there,
-            # so catch the AttributeError and move on.
-            try:
-                for filename in self._built_objects:
-                    os.remove(filename)
-            except AttributeError:
-                self.announce('unable to remove files (ignored)')
-        except:
-            exc_type, why, tb = sys.exc_info()
-            self.announce('*** WARNING: importing extension "%s" '
-                          'failed with %s: %s' % (ext.name, exc_type, why),
-                          level=3)
-            self.failed.append(ext.name)
-
-    def add_multiarch_paths(self):
-        # Debian/Ubuntu multiarch support.
-        # https://wiki.ubuntu.com/MultiarchSpec
-        cc = sysconfig.get_config_var('CC')
-        tmpfile = os.path.join(self.build_temp, 'multiarch')
-        if not os.path.exists(self.build_temp):
-            os.makedirs(self.build_temp)
-        ret = os.system(
-            '%s -print-multiarch > %s 2> /dev/null' % (cc, tmpfile))
-        multiarch_path_component = ''
-        try:
-            if ret >> 8 == 0:
-                with open(tmpfile) as fp:
-                    multiarch_path_component = fp.readline().strip()
-        finally:
-            os.unlink(tmpfile)
-
-        if multiarch_path_component != '':
-            add_dir_to_list(self.compiler.library_dirs,
-                            '/usr/lib/' + multiarch_path_component)
-            add_dir_to_list(self.compiler.include_dirs,
-                            '/usr/include/' + multiarch_path_component)
-            return
-
-        if not find_executable('dpkg-architecture'):
-            return
-        opt = ''
-        if cross_compiling:
-            opt = '-t' + sysconfig.get_config_var('HOST_GNU_TYPE')
-        tmpfile = os.path.join(self.build_temp, 'multiarch')
-        if not os.path.exists(self.build_temp):
-            os.makedirs(self.build_temp)
-        ret = os.system(
-            'dpkg-architecture %s -qDEB_HOST_MULTIARCH > %s 2> /dev/null' %
-            (opt, tmpfile))
-        try:
-            if ret >> 8 == 0:
-                with open(tmpfile) as fp:
-                    multiarch_path_component = fp.readline().strip()
-                add_dir_to_list(self.compiler.library_dirs,
-                                '/usr/lib/' + multiarch_path_component)
-                add_dir_to_list(self.compiler.include_dirs,
-                                '/usr/include/' + multiarch_path_component)
-        finally:
-            os.unlink(tmpfile)
-
-    def add_gcc_paths(self):
-        gcc = sysconfig.get_config_var('CC')
-        tmpfile = os.path.join(self.build_temp, 'gccpaths')
-        if not os.path.exists(self.build_temp):
-            os.makedirs(self.build_temp)
-        ret = os.system('%s -E -v - </dev/null 2>%s 1>/dev/null' % (gcc, tmpfile))
-        is_gcc = False
-        in_incdirs = False
-        inc_dirs = []
-        lib_dirs = []
-        try:
-            if ret >> 8 == 0:
-                with open(tmpfile) as fp:
-                    for line in fp.readlines():
-                        if line.startswith("gcc version"):
-                            is_gcc = True
-                        elif line.startswith("#include <...>"):
-                            in_incdirs = True
-                        elif line.startswith("End of search list"):
-                            in_incdirs = False
-                        elif is_gcc and line.startswith("LIBRARY_PATH"):
-                            for d in line.strip().split("=")[1].split(":"):
-                                d = os.path.normpath(d)
-                                if '/gcc/' not in d:
-                                    add_dir_to_list(self.compiler.library_dirs,
-                                                    d)
-                        elif is_gcc and in_incdirs and '/gcc/' not in line:
-                            add_dir_to_list(self.compiler.include_dirs,
-                                            line.strip())
-        finally:
-            os.unlink(tmpfile)
-
-    def detect_modules(self):
-        # PCMDI Change
-        # Ensure that place we put tcl/tk/netcdf etc. is always used
-        libbase = os.environ.get('EXTERNALS', os.path.join(sys.prefix,'..','Externals'))
-        mylibdir = os.path.join(libbase,'lib')
-        myincdir = os.path.join(libbase,'include')
-        add_dir_to_list(self.compiler.library_dirs, mylibdir)
-        add_dir_to_list(self.compiler.include_dirs, myincdir)
-        # End PCMDI Changes
-        # Ensure that /usr/local is always used
-        if not cross_compiling:
-            add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-            add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-        if cross_compiling:
-            self.add_gcc_paths()
-        self.add_multiarch_paths()
-
-        # Add paths specified in the environment variables LDFLAGS and
-        # CPPFLAGS for header and library files.
-        # We must get the values from the Makefile and not the environment
-        # directly since an inconsistently reproducible issue comes up where
-        # the environment variable is not set even though the value were passed
-        # into configure and stored in the Makefile (issue found on OS X 10.3).
-        for env_var, arg_name, dir_list in (
-                ('LDFLAGS', '-R', self.compiler.runtime_library_dirs),
-                ('LDFLAGS', '-L', self.compiler.library_dirs),
-                ('CPPFLAGS', '-I', self.compiler.include_dirs)):
-            env_val = sysconfig.get_config_var(env_var)
-            if env_val:
-                # To prevent optparse from raising an exception about any
-                # options in env_val that it doesn't know about we strip out
-                # all double dashes and any dashes followed by a character
-                # that is not for the option we are dealing with.
-                #
-                # Please note that order of the regex is important!  We must
-                # strip out double-dashes first so that we don't end up with
-                # substituting "--Long" to "-Long" and thus lead to "ong" being
-                # used for a library directory.
-                env_val = re.sub(r'(^|\s+)-(-|(?!%s))' % arg_name[1],
-                                 ' ', env_val)
-                parser = optparse.OptionParser()
-                # Make sure that allowing args interspersed with options is
-                # allowed
-                parser.allow_interspersed_args = True
-                parser.error = lambda msg: None
-                parser.add_option(arg_name, dest="dirs", action="append")
-                options = parser.parse_args(env_val.split())[0]
-                if options.dirs:
-                    for directory in reversed(options.dirs):
-                        add_dir_to_list(dir_list, directory)
-
-        if os.path.normpath(sys.prefix) != '/usr' \
-                and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
-            # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
-            # (PYTHONFRAMEWORK is set) to avoid # linking problems when
-            # building a framework with different architectures than
-            # the one that is currently installed (issue #7473)
-            add_dir_to_list(self.compiler.library_dirs,
-                            sysconfig.get_config_var("LIBDIR"))
-            add_dir_to_list(self.compiler.include_dirs,
-                            sysconfig.get_config_var("INCLUDEDIR"))
-
-        try:
-            have_unicode = unicode
-        except NameError:
-            have_unicode = 0
-
-        # lib_dirs and inc_dirs are used to search for files;
-        # if a file is found in one of those directories, it can
-        # be assumed that no additional -I,-L directives are needed.
-        inc_dirs = self.compiler.include_dirs[:]
-        lib_dirs = self.compiler.library_dirs[:]
-        if not cross_compiling:
-            for d in (
-                '/usr/include',
-                ):
-                add_dir_to_list(inc_dirs, d)
-            for d in (
-                '/lib64', '/usr/lib64',
-                '/lib', '/usr/lib',
-                ):
-                add_dir_to_list(lib_dirs, d)
-        exts = []
-        missing = []
-
-        config_h = sysconfig.get_config_h_filename()
-        config_h_vars = sysconfig.parse_config_h(open(config_h))
-
-        srcdir = sysconfig.get_config_var('srcdir')
-
-        # Check for AtheOS which has libraries in non-standard locations
-        if host_platform == 'atheos':
-            lib_dirs += ['/system/libs', '/atheos/autolnk/lib']
-            lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
-            inc_dirs += ['/system/include', '/atheos/autolnk/include']
-            inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
-
-        # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
-        if host_platform in ['osf1', 'unixware7', 'openunix8']:
-            lib_dirs += ['/usr/ccs/lib']
-
-        # HP-UX11iv3 keeps files in lib/hpux folders.
-        if host_platform == 'hp-ux11':
-            lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32']
-
-        if host_platform == 'darwin':
-            # This should work on any unixy platform ;-)
-            # If the user has bothered specifying additional -I and -L flags
-            # in OPT and LDFLAGS we might as well use them here.
-            #   NOTE: using shlex.split would technically be more correct, but
-            # also gives a bootstrap problem. Let's hope nobody uses directories
-            # with whitespace in the name to store libraries.
-            cflags, ldflags = sysconfig.get_config_vars(
-                    'CFLAGS', 'LDFLAGS')
-            for item in cflags.split():
-                if item.startswith('-I'):
-                    inc_dirs.append(item[2:])
-
-            for item in ldflags.split():
-                if item.startswith('-L'):
-                    lib_dirs.append(item[2:])
-
-        # Check for MacOS X, which doesn't need libm.a at all
-        math_libs = ['m']
-        if host_platform in ['darwin', 'beos']:
-            math_libs = []
-
-        # XXX Omitted modules: gl, pure, dl, SGI-specific modules
-
-        #
-        # The following modules are all pretty straightforward, and compile
-        # on pretty much any POSIXish platform.
-        #
-
-        # Some modules that are normally always on:
-        #exts.append( Extension('_weakref', ['_weakref.c']) )
-
-        # array objects
-        exts.append( Extension('array', ['arraymodule.c']) )
-        # complex math library functions
-        exts.append( Extension('cmath', ['cmathmodule.c', '_math.c'],
-                               depends=['_math.h'],
-                               libraries=math_libs) )
-        # math library functions, e.g. sin()
-        exts.append( Extension('math',  ['mathmodule.c', '_math.c'],
-                               depends=['_math.h'],
-                               libraries=math_libs) )
-        # fast string operations implemented in C
-        exts.append( Extension('strop', ['stropmodule.c']) )
-        # time operations and variables
-        exts.append( Extension('time', ['timemodule.c'],
-                               libraries=math_libs) )
-        exts.append( Extension('datetime', ['datetimemodule.c', 'timemodule.c'],
-                               libraries=math_libs) )
-        # fast iterator tools implemented in C
-        exts.append( Extension("itertools", ["itertoolsmodule.c"]) )
-        # code that will be builtins in the future, but conflict with the
-        #  current builtins
-        exts.append( Extension('future_builtins', ['future_builtins.c']) )
-        # random number generator implemented in C
-        exts.append( Extension("_random", ["_randommodule.c"]) )
-        # high-performance collections
-        exts.append( Extension("_collections", ["_collectionsmodule.c"]) )
-        # bisect
-        exts.append( Extension("_bisect", ["_bisectmodule.c"]) )
-        # heapq
-        exts.append( Extension("_heapq", ["_heapqmodule.c"]) )
-        # operator.add() and similar goodies
-        exts.append( Extension('operator', ['operator.c']) )
-        # Python 3.1 _io library
-        exts.append( Extension("_io",
-            ["_io/bufferedio.c", "_io/bytesio.c", "_io/fileio.c",
-             "_io/iobase.c", "_io/_iomodule.c", "_io/stringio.c", "_io/textio.c"],
-             depends=["_io/_iomodule.h"], include_dirs=["Modules/_io"]))
-        # _functools
-        exts.append( Extension("_functools", ["_functoolsmodule.c"]) )
-        # _json speedups
-        exts.append( Extension("_json", ["_json.c"]) )
-        # Python C API test module
-        exts.append( Extension('_testcapi', ['_testcapimodule.c'],
-                               depends=['testcapi_long.h']) )
-        # profilers (_lsprof is for cProfile.py)
-        exts.append( Extension('_hotshot', ['_hotshot.c']) )
-        exts.append( Extension('_lsprof', ['_lsprof.c', 'rotatingtree.c']) )
-        # static Unicode character database
-        if have_unicode:
-            exts.append( Extension('unicodedata', ['unicodedata.c']) )
-        else:
-            missing.append('unicodedata')
-        # access to ISO C locale support
-        data = open('pyconfig.h').read()
-        m = re.search(r"#s*define\s+WITH_LIBINTL\s+1\s*", data)
-        if m is not None:
-            locale_libs = ['intl']
-        else:
-            locale_libs = []
-        if host_platform == 'darwin':
-            locale_extra_link_args = ['-framework', 'CoreFoundation']
-        else:
-            locale_extra_link_args = []
-
-
-        exts.append( Extension('_locale', ['_localemodule.c'],
-                               libraries=locale_libs,
-                               extra_link_args=locale_extra_link_args) )
-
-        # Modules with some UNIX dependencies -- on by default:
-        # (If you have a really backward UNIX, select and socket may not be
-        # supported...)
-
-        # fcntl(2) and ioctl(2)
-        libs = []
-        if (config_h_vars.get('FLOCK_NEEDS_LIBBSD', False)):
-            # May be necessary on AIX for flock function
-            libs = ['bsd']
-        exts.append( Extension('fcntl', ['fcntlmodule.c'], libraries=libs) )
-        # pwd(3)
-        exts.append( Extension('pwd', ['pwdmodule.c']) )
-        # grp(3)
-        exts.append( Extension('grp', ['grpmodule.c']) )
-        # spwd, shadow passwords
-        if (config_h_vars.get('HAVE_GETSPNAM', False) or
-                config_h_vars.get('HAVE_GETSPENT', False)):
-            exts.append( Extension('spwd', ['spwdmodule.c']) )
-        else:
-            missing.append('spwd')
-
-        # select(2); not on ancient System V
-        exts.append( Extension('select', ['selectmodule.c']) )
-
-        # Fred Drake's interface to the Python parser
-        exts.append( Extension('parser', ['parsermodule.c']) )
-
-        # cStringIO and cPickle
-        exts.append( Extension('cStringIO', ['cStringIO.c']) )
-        exts.append( Extension('cPickle', ['cPickle.c']) )
-
-        # Memory-mapped files (also works on Win32).
-        if host_platform not in ['atheos']:
-            exts.append( Extension('mmap', ['mmapmodule.c']) )
-        else:
-            missing.append('mmap')
-
-        # Lance Ellinghaus's syslog module
-        # syslog daemon interface
-        exts.append( Extension('syslog', ['syslogmodule.c']) )
-
-        # George Neville-Neil's timing module:
-        # Deprecated in PEP 4 http://www.python.org/peps/pep-0004.html
-        # http://mail.python.org/pipermail/python-dev/2006-January/060023.html
-        #exts.append( Extension('timing', ['timingmodule.c']) )
-
-        #
-        # Here ends the simple stuff.  From here on, modules need certain
-        # libraries, are platform-specific, or present other surprises.
-        #
-
-        # Multimedia modules
-        # These don't work for 64-bit platforms!!!
-        # These represent audio samples or images as strings:
-
-        # Operations on audio samples
-        # According to #993173, this one should actually work fine on
-        # 64-bit platforms.
-        exts.append( Extension('audioop', ['audioop.c']) )
-
-        # Disabled on 64-bit platforms
-        if sys.maxint != 9223372036854775807L:
-            # Operations on images
-            exts.append( Extension('imageop', ['imageop.c']) )
-        else:
-            missing.extend(['imageop'])
-
-        # readline
-        do_readline = self.compiler.find_library_file(lib_dirs, 'readline')
-        readline_termcap_library = ""
-        curses_library = ""
-        # Determine if readline is already linked against curses or tinfo.
-        if do_readline and find_executable('ldd'):
-            fp = os.popen("ldd %s" % do_readline)
-            ldd_output = fp.readlines()
-            ret = fp.close()
-            if ret is None or ret >> 8 == 0:
-                for ln in ldd_output:
-                    if 'curses' in ln:
-                        readline_termcap_library = re.sub(
-                            r'.*lib(n?cursesw?)\.so.*', r'\1', ln
-                        ).rstrip()
-                        break
-                    if 'tinfo' in ln: # termcap interface split out from ncurses
-                        readline_termcap_library = 'tinfo'
-                        break
-        # Issue 7384: If readline is already linked against curses,
-        # use the same library for the readline and curses modules.
-        if 'curses' in readline_termcap_library:
-            curses_library = readline_termcap_library
-        elif self.compiler.find_library_file(lib_dirs, 'ncursesw'):
-            curses_library = 'ncursesw'
-        elif self.compiler.find_library_file(lib_dirs, 'ncurses'):
-            curses_library = 'ncurses'
-        elif self.compiler.find_library_file(lib_dirs, 'curses'):
-            curses_library = 'curses'
-
-        if host_platform == 'darwin':
-            os_release = int(os.uname()[2].split('.')[0])
-            dep_target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
-            if dep_target and dep_target.split('.') < ['10', '5']:
-                os_release = 8
-            if os_release < 9:
-                # MacOSX 10.4 has a broken readline. Don't try to build
-                # the readline module unless the user has installed a fixed
-                # readline package
-                if find_file('readline/rlconf.h', inc_dirs, []) is None:
-                    do_readline = False
-        if do_readline:
-            if host_platform == 'darwin' and os_release < 9:
-                # In every directory on the search path search for a dynamic
-                # library and then a static library, instead of first looking
-                # for dynamic libraries on the entiry path.
-                # This way a staticly linked custom readline gets picked up
-                # before the (possibly broken) dynamic library in /usr/lib.
-                readline_extra_link_args = ('-Wl,-search_paths_first',)
-            else:
-                readline_extra_link_args = ()
-
-            readline_libs = ['readline']
-            if readline_termcap_library:
-                pass # Issue 7384: Already linked against curses or tinfo.
-            elif curses_library:
-                readline_libs.append(curses_library)
-            elif self.compiler.find_library_file(lib_dirs +
-                                                     ['/usr/lib/termcap'],
-                                                     'termcap'):
-                readline_libs.append('termcap')
-            exts.append( Extension('readline', ['readline.c'],
-                                   library_dirs=['/usr/lib/termcap'],
-                                   extra_link_args=readline_extra_link_args,
-                                   libraries=readline_libs) )
-        else:
-            missing.append('readline')
-
-        # crypt module.
-
-        if self.compiler.find_library_file(lib_dirs, 'crypt'):
-            libs = ['crypt']
-        else:
-            libs = []
-        exts.append( Extension('crypt', ['cryptmodule.c'], libraries=libs) )
-
-        # CSV files
-        exts.append( Extension('_csv', ['_csv.c']) )
-
-        # socket(2)
-        exts.append( Extension('_socket', ['socketmodule.c', 'timemodule.c'],
-                               depends=['socketmodule.h'],
-                               libraries=math_libs) )
-        # Detect SSL support for the socket module (via _ssl)
-        search_for_ssl_incs_in = [
-                              '/usr/local/ssl/include',
-                              '/usr/contrib/ssl/include/'
-                             ]
-        ssl_incs = find_file('openssl/ssl.h', inc_dirs,
-                             search_for_ssl_incs_in
-                             )
-        if ssl_incs is not None:
-            krb5_h = find_file('krb5.h', inc_dirs,
-                               ['/usr/kerberos/include'])
-            if krb5_h:
-                ssl_incs += krb5_h
-        ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
-                                     ['/usr/local/ssl/lib',
-                                      '/usr/contrib/ssl/lib/'
-                                     ] )
-
-        if (ssl_incs is not None and
-            ssl_libs is not None):
-            exts.append( Extension('_ssl', ['_ssl.c'],
-                                   include_dirs = ssl_incs,
-                                   library_dirs = ssl_libs,
-                                   libraries = ['ssl', 'crypto'],
-                                   depends = ['socketmodule.h']), )
-        else:
-            missing.append('_ssl')
-
-        # find out which version of OpenSSL we have
-        openssl_ver = 0
-        openssl_ver_re = re.compile(
-            '^\s*#\s*define\s+OPENSSL_VERSION_NUMBER\s+(0x[0-9a-fA-F]+)' )
-
-        # look for the openssl version header on the compiler search path.
-        opensslv_h = find_file('openssl/opensslv.h', [],
-                inc_dirs + search_for_ssl_incs_in)
-        if opensslv_h:
-            name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
-            if host_platform == 'darwin' and is_macosx_sdk_path(name):
-                name = os.path.join(macosx_sdk_root(), name[1:])
-            try:
-                incfile = open(name, 'r')
-                for line in incfile:
-                    m = openssl_ver_re.match(line)
-                    if m:
-                        openssl_ver = eval(m.group(1))
-            except IOError, msg:
-                print "IOError while reading opensshv.h:", msg
-                pass
-
-        min_openssl_ver = 0x00907000
-        have_any_openssl = ssl_incs is not None and ssl_libs is not None
-        have_usable_openssl = (have_any_openssl and
-                               openssl_ver >= min_openssl_ver)
-
-        if have_any_openssl:
-            if have_usable_openssl:
-                # The _hashlib module wraps optimized implementations
-                # of hash functions from the OpenSSL library.
-                exts.append( Extension('_hashlib', ['_hashopenssl.c'],
-                                       include_dirs = ssl_incs,
-                                       library_dirs = ssl_libs,
-                                       libraries = ['ssl', 'crypto']) )
-            else:
-                print ("warning: openssl 0x%08x is too old for _hashlib" %
-                       openssl_ver)
-                missing.append('_hashlib')
-        if COMPILED_WITH_PYDEBUG or not have_usable_openssl:
-            # The _sha module implements the SHA1 hash algorithm.
-            exts.append( Extension('_sha', ['shamodule.c']) )
-            # The _md5 module implements the RSA Data Security, Inc. MD5
-            # Message-Digest Algorithm, described in RFC 1321.  The
-            # necessary files md5.c and md5.h are included here.
-            exts.append( Extension('_md5',
-                            sources = ['md5module.c', 'md5.c'],
-                            depends = ['md5.h']) )
-
-        min_sha2_openssl_ver = 0x00908000
-        if COMPILED_WITH_PYDEBUG or openssl_ver < min_sha2_openssl_ver:
-            # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash
-            exts.append( Extension('_sha256', ['sha256module.c']) )
-            exts.append( Extension('_sha512', ['sha512module.c']) )
-
-        # Modules that provide persistent dictionary-like semantics.  You will
-        # probably want to arrange for at least one of them to be available on
-        # your machine, though none are defined by default because of library
-        # dependencies.  The Python module anydbm.py provides an
-        # implementation independent wrapper for these; dumbdbm.py provides
-        # similar functionality (but slower of course) implemented in Python.
-
-        # Sleepycat^WOracle Berkeley DB interface.
-        #  http://www.oracle.com/database/berkeley-db/db/index.html
-        #
-        # This requires the Sleepycat^WOracle DB code. The supported versions
-        # are set below.  Visit the URL above to download
-        # a release.  Most open source OSes come with one or more
-        # versions of BerkeleyDB already installed.
-
-        max_db_ver = (5, 3)
-        min_db_ver = (4, 3)
-        db_setup_debug = False   # verbose debug prints from this script?
-
-        def allow_db_ver(db_ver):
-            """Returns a boolean if the given BerkeleyDB version is acceptable.
-
-            Args:
-              db_ver: A tuple of the version to verify.
-            """
-            if not (min_db_ver <= db_ver <= max_db_ver):
-                return False
-            # Use this function to filter out known bad configurations.
-            if (4, 6) == db_ver[:2]:
-                # BerkeleyDB 4.6.x is not stable on many architectures.
-                arch = platform_machine()
-                if arch not in ('i386', 'i486', 'i586', 'i686',
-                                'x86_64', 'ia64'):
-                    return False
-            return True
-
-        def gen_db_minor_ver_nums(major):
-            if major == 5:
-                for x in range(max_db_ver[1]+1):
-                    if allow_db_ver((5, x)):
-                        yield x
-            elif major == 4:
-                for x in range(9):
-                    if allow_db_ver((4, x)):
-                        yield x
-            elif major == 3:
-                for x in (3,):
-                    if allow_db_ver((3, x)):
-                        yield x
-            else:
-                raise ValueError("unknown major BerkeleyDB version", major)
-
-        # construct a list of paths to look for the header file in on
-        # top of the normal inc_dirs.
-        db_inc_paths = [
-            '/usr/include/db4',
-            '/usr/local/include/db4',
-            '/opt/sfw/include/db4',
-            '/usr/include/db3',
-            '/usr/local/include/db3',
-            '/opt/sfw/include/db3',
-            # Fink defaults (http://fink.sourceforge.net/)
-            '/sw/include/db4',
-            '/sw/include/db3',
-        ]
-        # 4.x minor number specific paths
-        for x in gen_db_minor_ver_nums(4):
-            db_inc_paths.append('/usr/include/db4%d' % x)
-            db_inc_paths.append('/usr/include/db4.%d' % x)
-            db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
-            db_inc_paths.append('/usr/local/include/db4%d' % x)
-            db_inc_paths.append('/pkg/db-4.%d/include' % x)
-            db_inc_paths.append('/opt/db-4.%d/include' % x)
-            # MacPorts default (http://www.macports.org/)
-            db_inc_paths.append('/opt/local/include/db4%d' % x)
-        # 3.x minor number specific paths
-        for x in gen_db_minor_ver_nums(3):
-            db_inc_paths.append('/usr/include/db3%d' % x)
-            db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x)
-            db_inc_paths.append('/usr/local/include/db3%d' % x)
-            db_inc_paths.append('/pkg/db-3.%d/include' % x)
-            db_inc_paths.append('/opt/db-3.%d/include' % x)
-
-        if cross_compiling:
-            db_inc_paths = []
-
-        # Add some common subdirectories for Sleepycat DB to the list,
-        # based on the standard include directories. This way DB3/4 gets
-        # picked up when it is installed in a non-standard prefix and
-        # the user has added that prefix into inc_dirs.
-        std_variants = []
-        for dn in inc_dirs:
-            std_variants.append(os.path.join(dn, 'db3'))
-            std_variants.append(os.path.join(dn, 'db4'))
-            for x in gen_db_minor_ver_nums(4):
-                std_variants.append(os.path.join(dn, "db4%d"%x))
-                std_variants.append(os.path.join(dn, "db4.%d"%x))
-            for x in gen_db_minor_ver_nums(3):
-                std_variants.append(os.path.join(dn, "db3%d"%x))
-                std_variants.append(os.path.join(dn, "db3.%d"%x))
-
-        db_inc_paths = std_variants + db_inc_paths
-        db_inc_paths = [p for p in db_inc_paths if os.path.exists(p)]
-
-        db_ver_inc_map = {}
-
-        if host_platform == 'darwin':
-            sysroot = macosx_sdk_root()
-
-        class db_found(Exception): pass
-        try:
-            # See whether there is a Sleepycat header in the standard
-            # search path.
-            for d in inc_dirs + db_inc_paths:
-                f = os.path.join(d, "db.h")
-
-                if host_platform == 'darwin' and is_macosx_sdk_path(d):
-                    f = os.path.join(sysroot, d[1:], "db.h")
-
-                if db_setup_debug: print "db: looking for db.h in", f
-                if os.path.exists(f):
-                    f = open(f).read()
-                    m = re.search(r"#define\WDB_VERSION_MAJOR\W(\d+)", f)
-                    if m:
-                        db_major = int(m.group(1))
-                        m = re.search(r"#define\WDB_VERSION_MINOR\W(\d+)", f)
-                        db_minor = int(m.group(1))
-                        db_ver = (db_major, db_minor)
-
-                        # Avoid 4.6 prior to 4.6.21 due to a BerkeleyDB bug
-                        if db_ver == (4, 6):
-                            m = re.search(r"#define\WDB_VERSION_PATCH\W(\d+)", f)
-                            db_patch = int(m.group(1))
-                            if db_patch < 21:
-                                print "db.h:", db_ver, "patch", db_patch,
-                                print "being ignored (4.6.x must be >= 4.6.21)"
-                                continue
-
-                        if ( (db_ver not in db_ver_inc_map) and
-                            allow_db_ver(db_ver) ):
-                            # save the include directory with the db.h version
-                            # (first occurrence only)
-                            db_ver_inc_map[db_ver] = d
-                            if db_setup_debug:
-                                print "db.h: found", db_ver, "in", d
-                        else:
-                            # we already found a header for this library version
-                            if db_setup_debug: print "db.h: ignoring", d
-                    else:
-                        # ignore this header, it didn't contain a version number
-                        if db_setup_debug:
-                            print "db.h: no version number version in", d
-
-            db_found_vers = db_ver_inc_map.keys()
-            db_found_vers.sort()
-
-            while db_found_vers:
-                db_ver = db_found_vers.pop()
-                db_incdir = db_ver_inc_map[db_ver]
-
-                # check lib directories parallel to the location of the header
-                db_dirs_to_check = [
-                    db_incdir.replace("include", 'lib64'),
-                    db_incdir.replace("include", 'lib'),
-                ]
-
-                if host_platform != 'darwin':
-                    db_dirs_to_check = filter(os.path.isdir, db_dirs_to_check)
-
-                else:
-                    # Same as other branch, but takes OSX SDK into account
-                    tmp = []
-                    for dn in db_dirs_to_check:
-                        if is_macosx_sdk_path(dn):
-                            if os.path.isdir(os.path.join(sysroot, dn[1:])):
-                                tmp.append(dn)
-                        else:
-                            if os.path.isdir(dn):
-                                tmp.append(dn)
-                    db_dirs_to_check = tmp
-
-                # Look for a version specific db-X.Y before an ambiguous dbX
-                # XXX should we -ever- look for a dbX name?  Do any
-                # systems really not name their library by version and
-                # symlink to more general names?
-                for dblib in (('db-%d.%d' % db_ver),
-                              ('db%d%d' % db_ver),
-                              ('db%d' % db_ver[0])):
-                    dblib_file = self.compiler.find_library_file(
-                                    db_dirs_to_check + lib_dirs, dblib )
-                    if dblib_file:
-                        dblib_dir = [ os.path.abspath(os.path.dirname(dblib_file)) ]
-                        raise db_found
-                    else:
-                        if db_setup_debug: print "db lib: ", dblib, "not found"
-
-        except db_found:
-            if db_setup_debug:
-                print "bsddb using BerkeleyDB lib:", db_ver, dblib
-                print "bsddb lib dir:", dblib_dir, " inc dir:", db_incdir
-            db_incs = [db_incdir]
-            dblibs = [dblib]
-            # We add the runtime_library_dirs argument because the
-            # BerkeleyDB lib we're linking against often isn't in the
-            # system dynamic library search path.  This is usually
-            # correct and most trouble free, but may cause problems in
-            # some unusual system configurations (e.g. the directory
-            # is on an NFS server that goes away).
-            exts.append(Extension('_bsddb', ['_bsddb.c'],
-                                  depends = ['bsddb.h'],
-                                  library_dirs=dblib_dir,
-                                  runtime_library_dirs=dblib_dir,
-                                  include_dirs=db_incs,
-                                  libraries=dblibs))
-        else:
-            if db_setup_debug: print "db: no appropriate library found"
-            db_incs = None
-            dblibs = []
-            dblib_dir = None
-            missing.append('_bsddb')
-
-        # The sqlite interface
-        sqlite_setup_debug = False   # verbose debug prints from this script?
-
-        # We hunt for #define SQLITE_VERSION "n.n.n"
-        # We need to find >= sqlite version 3.0.8
-        sqlite_incdir = sqlite_libdir = None
-        sqlite_inc_paths = [ '/usr/include',
-                             '/usr/include/sqlite',
-                             '/usr/include/sqlite3',
-                             '/usr/local/include',
-                             '/usr/local/include/sqlite',
-                             '/usr/local/include/sqlite3',
-                           ]
-        if cross_compiling:
-            sqlite_inc_paths = []
-        MIN_SQLITE_VERSION_NUMBER = (3, 0, 8)
-        MIN_SQLITE_VERSION = ".".join([str(x)
-                                    for x in MIN_SQLITE_VERSION_NUMBER])
-
-        # Scan the default include directories before the SQLite specific
-        # ones. This allows one to override the copy of sqlite on OSX,
-        # where /usr/include contains an old version of sqlite.
-        if host_platform == 'darwin':
-            sysroot = macosx_sdk_root()
-
-        for d_ in inc_dirs + sqlite_inc_paths:
-            d = d_
-            if host_platform == 'darwin' and is_macosx_sdk_path(d):
-                d = os.path.join(sysroot, d[1:])
-
-            f = os.path.join(d, "sqlite3.h")
-            if os.path.exists(f):
-                if sqlite_setup_debug: print "sqlite: found %s"%f
-                incf = open(f).read()
-                m = re.search(
-                    r'\s*.*#\s*.*define\s.*SQLITE_VERSION\W*"([\d\.]*)"', incf)
-                if m:
-                    sqlite_version = m.group(1)
-                    sqlite_version_tuple = tuple([int(x)
-                                        for x in sqlite_version.split(".")])
-                    if sqlite_version_tuple >= MIN_SQLITE_VERSION_NUMBER:
-                        # we win!
-                        if sqlite_setup_debug:
-                            print "%s/sqlite3.h: version %s"%(d, sqlite_version)
-                        sqlite_incdir = d
-                        break
-                    else:
-                        if sqlite_setup_debug:
-                            print "%s: version %d is too old, need >= %s"%(d,
-                                        sqlite_version, MIN_SQLITE_VERSION)
-                elif sqlite_setup_debug:
-                    print "sqlite: %s had no SQLITE_VERSION"%(f,)
-
-        if sqlite_incdir:
-            sqlite_dirs_to_check = [
-                os.path.join(sqlite_incdir, '..', 'lib64'),
-                os.path.join(sqlite_incdir, '..', 'lib'),
-                os.path.join(sqlite_incdir, '..', '..', 'lib64'),
-                os.path.join(sqlite_incdir, '..', '..', 'lib'),
-            ]
-            sqlite_libfile = self.compiler.find_library_file(
-                                sqlite_dirs_to_check + lib_dirs, 'sqlite3')
-            if sqlite_libfile:
-                sqlite_libdir = [os.path.abspath(os.path.dirname(sqlite_libfile))]
-
-        if sqlite_incdir and sqlite_libdir:
-            sqlite_srcs = ['_sqlite/cache.c',
-                '_sqlite/connection.c',
-                '_sqlite/cursor.c',
-                '_sqlite/microprotocols.c',
-                '_sqlite/module.c',
-                '_sqlite/prepare_protocol.c',
-                '_sqlite/row.c',
-                '_sqlite/statement.c',
-                '_sqlite/util.c', ]
-
-            sqlite_defines = []
-            if host_platform != "win32":
-                sqlite_defines.append(('MODULE_NAME', '"sqlite3"'))
-            else:
-                sqlite_defines.append(('MODULE_NAME', '\\"sqlite3\\"'))
-
-            # Comment this out if you want the sqlite3 module to be able to load extensions.
-            sqlite_defines.append(("SQLITE_OMIT_LOAD_EXTENSION", "1"))
-
-            if host_platform == 'darwin':
-                # In every directory on the search path search for a dynamic
-                # library and then a static library, instead of first looking
-                # for dynamic libraries on the entire path.
-                # This way a statically linked custom sqlite gets picked up
-                # before the dynamic library in /usr/lib.
-                sqlite_extra_link_args = ('-Wl,-search_paths_first',)
-            else:
-                sqlite_extra_link_args = ()
-
-            exts.append(Extension('_sqlite3', sqlite_srcs,
-                                  define_macros=sqlite_defines,
-                                  include_dirs=["Modules/_sqlite",
-                                                sqlite_incdir],
-                                  library_dirs=sqlite_libdir,
-                                  extra_link_args=sqlite_extra_link_args,
-                                  libraries=["sqlite3",]))
-        else:
-            missing.append('_sqlite3')
-
-        # Look for Berkeley db 1.85.   Note that it is built as a different
-        # module name so it can be included even when later versions are
-        # available.  A very restrictive search is performed to avoid
-        # accidentally building this module with a later version of the
-        # underlying db library.  May BSD-ish Unixes incorporate db 1.85
-        # symbols into libc and place the include file in /usr/include.
-        #
-        # If the better bsddb library can be built (db_incs is defined)
-        # we do not build this one.  Otherwise this build will pick up
-        # the more recent berkeleydb's db.h file first in the include path
-        # when attempting to compile and it will fail.
-        f = "/usr/include/db.h"
-
-        if host_platform == 'darwin':
-            if is_macosx_sdk_path(f):
-                sysroot = macosx_sdk_root()
-                f = os.path.join(sysroot, f[1:])
-
-        if os.path.exists(f) and not db_incs:
-            data = open(f).read()
-            m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
-            if m is not None:
-                # bingo - old version used hash file format version 2
-                ### XXX this should be fixed to not be platform-dependent
-                ### but I don't have direct access to an osf1 platform and
-                ### seemed to be muffing the search somehow
-                libraries = host_platform == "osf1" and ['db'] or None
-                if libraries is not None:
-                    exts.append(Extension('bsddb185', ['bsddbmodule.c'],
-                                          libraries=libraries))
-                else:
-                    exts.append(Extension('bsddb185', ['bsddbmodule.c']))
-            else:
-                missing.append('bsddb185')
-        else:
-            missing.append('bsddb185')
-
-        dbm_order = ['gdbm']
-        # The standard Unix dbm module:
-        if host_platform not in ['cygwin']:
-            config_args = [arg.strip("'")
-                           for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
-            dbm_args = [arg for arg in config_args
-                        if arg.startswith('--with-dbmliborder=')]
-            if dbm_args:
-                dbm_order = [arg.split('=')[-1] for arg in dbm_args][-1].split(":")
-            else:
-                dbm_order = "ndbm:gdbm:bdb".split(":")
-            dbmext = None
-            for cand in dbm_order:
-                if cand == "ndbm":
-                    if find_file("ndbm.h", inc_dirs, []) is not None:
-                        # Some systems have -lndbm, others have -lgdbm_compat,
-                        # others don't have either
-                        if self.compiler.find_library_file(lib_dirs,
-                                                               'ndbm'):
-                            ndbm_libs = ['ndbm']
-                        elif self.compiler.find_library_file(lib_dirs,
-                                                             'gdbm_compat'):
-                            ndbm_libs = ['gdbm_compat']
-                        else:
-                            ndbm_libs = []
-                        print "building dbm using ndbm"
-                        dbmext = Extension('dbm', ['dbmmodule.c'],
-                                           define_macros=[
-                                               ('HAVE_NDBM_H',None),
-                                               ],
-                                           libraries=ndbm_libs)
-                        break
-
-                elif cand == "gdbm":
-                    if self.compiler.find_library_file(lib_dirs, 'gdbm'):
-                        gdbm_libs = ['gdbm']
-                        if self.compiler.find_library_file(lib_dirs,
-                                                               'gdbm_compat'):
-                            gdbm_libs.append('gdbm_compat')
-                        if find_file("gdbm/ndbm.h", inc_dirs, []) is not None:
-                            print "building dbm using gdbm"
-                            dbmext = Extension(
-                                'dbm', ['dbmmodule.c'],
-                                define_macros=[
-                                    ('HAVE_GDBM_NDBM_H', None),
-                                    ],
-                                libraries = gdbm_libs)
-                            break
-                        if find_file("gdbm-ndbm.h", inc_dirs, []) is not None:
-                            print "building dbm using gdbm"
-                            dbmext = Extension(
-                                'dbm', ['dbmmodule.c'],
-                                define_macros=[
-                                    ('HAVE_GDBM_DASH_NDBM_H', None),
-                                    ],
-                                libraries = gdbm_libs)
-                            break
-                elif cand == "bdb":
-                    if db_incs is not None:
-                        print "building dbm using bdb"
-                        dbmext = Extension('dbm', ['dbmmodule.c'],
-                                           library_dirs=dblib_dir,
-                                           runtime_library_dirs=dblib_dir,
-                                           include_dirs=db_incs,
-                                           define_macros=[
-                                               ('HAVE_BERKDB_H', None),
-                                               ('DB_DBM_HSEARCH', None),
-                                               ],
-                                           libraries=dblibs)
-                        break
-            if dbmext is not None:
-                exts.append(dbmext)
-            else:
-                missing.append('dbm')
-
-        # Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
-        if ('gdbm' in dbm_order and
-            self.compiler.find_library_file(lib_dirs, 'gdbm')):
-            exts.append( Extension('gdbm', ['gdbmmodule.c'],
-                                   libraries = ['gdbm'] ) )
-        else:
-            missing.append('gdbm')
-
-        # Unix-only modules
-        if host_platform not in ['win32']:
-            # Steen Lumholt's termios module
-            exts.append( Extension('termios', ['termios.c']) )
-            # Jeremy Hylton's rlimit interface
-            if host_platform not in ['atheos']:
-                exts.append( Extension('resource', ['resource.c']) )
-            else:
-                missing.append('resource')
-
-            # Sun yellow pages. Some systems have the functions in libc.
-            if (host_platform not in ['cygwin', 'atheos', 'qnx6'] and
-                find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None):
-                if (self.compiler.find_library_file(lib_dirs, 'nsl')):
-                    libs = ['nsl']
-                else:
-                    libs = []
-                exts.append( Extension('nis', ['nismodule.c'],
-                                       libraries = libs) )
-            else:
-                missing.append('nis')
-        else:
-            missing.extend(['nis', 'resource', 'termios'])
-
-        # Curses support, requiring the System V version of curses, often
-        # provided by the ncurses library.
-        panel_library = 'panel'
-        curses_incs = None
-        if curses_library.startswith('ncurses'):
-            if curses_library == 'ncursesw':
-                # Bug 1464056: If _curses.so links with ncursesw,
-                # _curses_panel.so must link with panelw.
-                panel_library = 'panelw'
-            curses_libs = [curses_library]
-            curses_incs = find_file('curses.h', inc_dirs,
-                                    [os.path.join(d, 'ncursesw') for d in inc_dirs])
-            exts.append( Extension('_curses', ['_cursesmodule.c'],
-                                   include_dirs = curses_incs,
-                                   libraries = curses_libs) )
-        elif curses_library == 'curses' and host_platform != 'darwin':
-                # OSX has an old Berkeley curses, not good enough for
-                # the _curses module.
-            if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
-                curses_libs = ['curses', 'terminfo']
-            elif (self.compiler.find_library_file(lib_dirs, 'termcap')):
-                curses_libs = ['curses', 'termcap']
-            else:
-                curses_libs = ['curses']
-
-            exts.append( Extension('_curses', ['_cursesmodule.c'],
-                                   libraries = curses_libs) )
-        else:
-            missing.append('_curses')
-
-        # If the curses module is enabled, check for the panel module
-        if (module_enabled(exts, '_curses') and
-            self.compiler.find_library_file(lib_dirs, panel_library)):
-            exts.append( Extension('_curses_panel', ['_curses_panel.c'],
-                                   include_dirs = curses_incs,
-                                   libraries = [panel_library] + curses_libs) )
-        else:
-            missing.append('_curses_panel')
-
-        # Andrew Kuchling's zlib module.  Note that some versions of zlib
-        # 1.1.3 have security problems.  See CERT Advisory CA-2002-07:
-        # http://www.cert.org/advisories/CA-2002-07.html
-        #
-        # zlib 1.1.4 is fixed, but at least one vendor (RedHat) has decided to
-        # patch its zlib 1.1.3 package instead of upgrading to 1.1.4.  For
-        # now, we still accept 1.1.3, because we think it's difficult to
-        # exploit this in Python, and we'd rather make it RedHat's problem
-        # than our problem <wink>.
-        #
-        # You can upgrade zlib to version 1.1.4 yourself by going to
-        # http://www.gzip.org/zlib/
-        zlib_inc = find_file('zlib.h', [], inc_dirs)
-        have_zlib = False
-        if zlib_inc is not None:
-            zlib_h = zlib_inc[0] + '/zlib.h'
-            version = '"0.0.0"'
-            version_req = '"1.1.3"'
-            if host_platform == 'darwin' and is_macosx_sdk_path(zlib_h):
-                zlib_h = os.path.join(macosx_sdk_root(), zlib_h[1:])
-            fp = open(zlib_h)
-            while 1:
-                line = fp.readline()
-                if not line:
-                    break
-                if line.startswith('#define ZLIB_VERSION'):
-                    version = line.split()[2]
-                    break
-            if version >= version_req:
-                if (self.compiler.find_library_file(lib_dirs, 'z')):
-                    if host_platform == "darwin":
-                        zlib_extra_link_args = ('-Wl,-search_paths_first',)
-                    else:
-                        zlib_extra_link_args = ()
-                    exts.append( Extension('zlib', ['zlibmodule.c'],
-                                           libraries = ['z'],
-                                           extra_link_args = zlib_extra_link_args))
-                    have_zlib = True
-                else:
-                    missing.append('zlib')
-            else:
-                missing.append('zlib')
-        else:
-            missing.append('zlib')
-
-        # Helper module for various ascii-encoders.  Uses zlib for an optimized
-        # crc32 if we have it.  Otherwise binascii uses its own.
-        if have_zlib:
-            extra_compile_args = ['-DUSE_ZLIB_CRC32']
-            libraries = ['z']
-            extra_link_args = zlib_extra_link_args
-        else:
-            extra_compile_args = []
-            libraries = []
-            extra_link_args = []
-        exts.append( Extension('binascii', ['binascii.c'],
-                               extra_compile_args = extra_compile_args,
-                               libraries = libraries,
-                               extra_link_args = extra_link_args) )
-
-        # Gustavo Niemeyer's bz2 module.
-        if (self.compiler.find_library_file(lib_dirs, 'bz2')):
-            if host_platform == "darwin":
-                bz2_extra_link_args = ('-Wl,-search_paths_first',)
-            else:
-                bz2_extra_link_args = ()
-            exts.append( Extension('bz2', ['bz2module.c'],
-                                   libraries = ['bz2'],
-                                   extra_link_args = bz2_extra_link_args) )
-        else:
-            missing.append('bz2')
-
-        # Interface to the Expat XML parser
-        #
-        # Expat was written by James Clark and is now maintained by a group of
-        # developers on SourceForge; see www.libexpat.org for more information.
-        # The pyexpat module was written by Paul Prescod after a prototype by
-        # Jack Jansen.  The Expat source is included in Modules/expat/.  Usage
-        # of a system shared libexpat.so is possible with --with-system-expat
-        # configure option.
-        #
-        # More information on Expat can be found at www.libexpat.org.
-        #
-        if '--with-system-expat' in sysconfig.get_config_var("CONFIG_ARGS"):
-            expat_inc = []
-            define_macros = []
-            expat_lib = ['expat']
-            expat_sources = []
-            expat_depends = []
-        else:
-            expat_inc = [os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')]
-            define_macros = [
-                ('HAVE_EXPAT_CONFIG_H', '1'),
-            ]
-            expat_lib = []
-            expat_sources = ['expat/xmlparse.c',
-                             'expat/xmlrole.c',
-                             'expat/xmltok.c']
-            expat_depends = ['expat/ascii.h',
-                             'expat/asciitab.h',
-                             'expat/expat.h',
-                             'expat/expat_config.h',
-                             'expat/expat_external.h',
-                             'expat/internal.h',
-                             'expat/latin1tab.h',
-                             'expat/utf8tab.h',
-                             'expat/xmlrole.h',
-                             'expat/xmltok.h',
-                             'expat/xmltok_impl.h'
-                             ]
-
-        exts.append(Extension('pyexpat',
-                              define_macros = define_macros,
-                              include_dirs = expat_inc,
-                              libraries = expat_lib,
-                              sources = ['pyexpat.c'] + expat_sources,
-                              depends = expat_depends,
-                              ))
-
-        # Fredrik Lundh's cElementTree module.  Note that this also
-        # uses expat (via the CAPI hook in pyexpat).
-
-        if os.path.isfile(os.path.join(srcdir, 'Modules', '_elementtree.c')):
-            define_macros.append(('USE_PYEXPAT_CAPI', None))
-            exts.append(Extension('_elementtree',
-                                  define_macros = define_macros,
-                                  include_dirs = expat_inc,
-                                  libraries = expat_lib,
-                                  sources = ['_elementtree.c'],
-                                  depends = ['pyexpat.c'] + expat_sources +
-                                      expat_depends,
-                                  ))
-        else:
-            missing.append('_elementtree')
-
-        # Hye-Shik Chang's CJKCodecs modules.
-        if have_unicode:
-            exts.append(Extension('_multibytecodec',
-                                  ['cjkcodecs/multibytecodec.c']))
-            for loc in ('kr', 'jp', 'cn', 'tw', 'hk', 'iso2022'):
-                exts.append(Extension('_codecs_%s' % loc,
-                                      ['cjkcodecs/_codecs_%s.c' % loc]))
-        else:
-            missing.append('_multibytecodec')
-            for loc in ('kr', 'jp', 'cn', 'tw', 'hk', 'iso2022'):
-                missing.append('_codecs_%s' % loc)
-
-        # Dynamic loading module
-        if sys.maxint == 0x7fffffff:
-            # This requires sizeof(int) == sizeof(long) == sizeof(char*)
-            dl_inc = find_file('dlfcn.h', [], inc_dirs)
-            if (dl_inc is not None) and (host_platform not in ['atheos']):
-                exts.append( Extension('dl', ['dlmodule.c']) )
-            else:
-                missing.append('dl')
-        else:
-            missing.append('dl')
-
-        # Thomas Heller's _ctypes module
-        self.detect_ctypes(inc_dirs, lib_dirs)
-
-        # Richard Oudkerk's multiprocessing module
-        if host_platform == 'win32':             # Windows
-            macros = dict()
-            libraries = ['ws2_32']
-
-        elif host_platform == 'darwin':          # Mac OSX
-            macros = dict()
-            libraries = []
-
-        elif host_platform == 'cygwin':          # Cygwin
-            macros = dict()
-            libraries = []
-
-        elif host_platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
-            # FreeBSD's P1003.1b semaphore support is very experimental
-            # and has many known problems. (as of June 2008)
-            macros = dict()
-            libraries = []
-
-        elif host_platform.startswith('openbsd'):
-            macros = dict()
-            libraries = []
-
-        elif host_platform.startswith('netbsd'):
-            macros = dict()
-            libraries = []
-
-        else:                                   # Linux and other unices
-            macros = dict()
-            libraries = ['rt']
-
-        if host_platform == 'win32':
-            multiprocessing_srcs = [ '_multiprocessing/multiprocessing.c',
-                                     '_multiprocessing/semaphore.c',
-                                     '_multiprocessing/pipe_connection.c',
-                                     '_multiprocessing/socket_connection.c',
-                                     '_multiprocessing/win32_functions.c'
-                                   ]
-
-        else:
-            multiprocessing_srcs = [ '_multiprocessing/multiprocessing.c',
-                                     '_multiprocessing/socket_connection.c'
-                                   ]
-            if (sysconfig.get_config_var('HAVE_SEM_OPEN') and not
-                sysconfig.get_config_var('POSIX_SEMAPHORES_NOT_ENABLED')):
-                multiprocessing_srcs.append('_multiprocessing/semaphore.c')
-
-        if sysconfig.get_config_var('WITH_THREAD'):
-            exts.append ( Extension('_multiprocessing', multiprocessing_srcs,
-                                    define_macros=macros.items(),
-                                    include_dirs=["Modules/_multiprocessing"]))
-        else:
-            missing.append('_multiprocessing')
-
-        # End multiprocessing
-
-
-        # Platform-specific libraries
-        if host_platform == 'linux2':
-            # Linux-specific modules
-            exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) )
-        else:
-            missing.append('linuxaudiodev')
-
-        if (host_platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
-                        'freebsd7', 'freebsd8')
-            or host_platform.startswith("gnukfreebsd")):
-            exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
-        else:
-            missing.append('ossaudiodev')
-
-        if host_platform == 'sunos5':
-            # SunOS specific modules
-            exts.append( Extension('sunaudiodev', ['sunaudiodev.c']) )
-        else:
-            missing.append('sunaudiodev')
-
-        if host_platform == 'darwin':
-            # _scproxy
-            exts.append(Extension("_scproxy", [os.path.join(srcdir, "Mac/Modules/_scproxy.c")],
-                extra_link_args= [
-                    '-framework', 'SystemConfiguration',
-                    '-framework', 'CoreFoundation'
-                ]))
-
-
-        if host_platform == 'darwin' and ("--disable-toolbox-glue" not in
-                sysconfig.get_config_var("CONFIG_ARGS")):
-
-            if int(os.uname()[2].split('.')[0]) >= 8:
-                # We're on Mac OS X 10.4 or later, the compiler should
-                # support '-Wno-deprecated-declarations'. This will
-                # surpress deprecation warnings for the Carbon extensions,
-                # these extensions wrap the Carbon APIs and even those
-                # parts that are deprecated.
-                carbon_extra_compile_args = ['-Wno-deprecated-declarations']
-            else:
-                carbon_extra_compile_args = []
-
-            # Mac OS X specific modules.
-            def macSrcExists(name1, name2=''):
-                if not name1:
-                    return None
-                names = (name1,)
-                if name2:
-                    names = (name1, name2)
-                path = os.path.join(srcdir, 'Mac', 'Modules', *names)
-                return os.path.exists(path)
-
-            def addMacExtension(name, kwds, extra_srcs=[]):
-                dirname = ''
-                if name[0] == '_':
-                    dirname = name[1:].lower()
-                cname = name + '.c'
-                cmodulename = name + 'module.c'
-                # Check for NNN.c, NNNmodule.c, _nnn/NNN.c, _nnn/NNNmodule.c
-                if macSrcExists(cname):
-                    srcs = [cname]
-                elif macSrcExists(cmodulename):
-                    srcs = [cmodulename]
-                elif macSrcExists(dirname, cname):
-                    # XXX(nnorwitz): If all the names ended with module, we
-                    # wouldn't need this condition.  ibcarbon is the only one.
-                    srcs = [os.path.join(dirname, cname)]
-                elif macSrcExists(dirname, cmodulename):
-                    srcs = [os.path.join(dirname, cmodulename)]
-                else:
-                    raise RuntimeError("%s not found" % name)
-
-                # Here's the whole point:  add the extension with sources
-                exts.append(Extension(name, srcs + extra_srcs, **kwds))
-
-            # Core Foundation
-            core_kwds = {'extra_compile_args': carbon_extra_compile_args,
-                         'extra_link_args': ['-framework', 'CoreFoundation'],
-                        }
-            addMacExtension('_CF', core_kwds, ['cf/pycfbridge.c'])
-            addMacExtension('autoGIL', core_kwds)
-
-
-
-            # Carbon
-            carbon_kwds = {'extra_compile_args': carbon_extra_compile_args,
-                           'extra_link_args': ['-framework', 'Carbon'],
-                          }
-            CARBON_EXTS = ['ColorPicker', 'gestalt', 'MacOS', 'Nav',
-                           'OSATerminology', 'icglue',
-                           # All these are in subdirs
-                           '_AE', '_AH', '_App', '_CarbonEvt', '_Cm', '_Ctl',
-                           '_Dlg', '_Drag', '_Evt', '_File', '_Folder', '_Fm',
-                           '_Help', '_Icn', '_IBCarbon', '_List',
-                           '_Menu', '_Mlte', '_OSA', '_Res', '_Qd', '_Qdoffs',
-                           '_Scrap', '_Snd', '_TE',
-                          ]
-            for name in CARBON_EXTS:
-                addMacExtension(name, carbon_kwds)
-
-            # Workaround for a bug in the version of gcc shipped with Xcode 3.
-            # The _Win extension should build just like the other Carbon extensions, but
-            # this actually results in a hard crash of the linker.
-            #
-            if '-arch ppc64' in cflags and '-arch ppc' in cflags:
-                win_kwds = {'extra_compile_args': carbon_extra_compile_args + ['-arch', 'i386', '-arch', 'ppc'],
-                               'extra_link_args': ['-framework', 'Carbon', '-arch', 'i386', '-arch', 'ppc'],
-                           }
-                addMacExtension('_Win', win_kwds)
-            else:
-                addMacExtension('_Win', carbon_kwds)
-
-
-            # Application Services & QuickTime
-            app_kwds = {'extra_compile_args': carbon_extra_compile_args,
-                        'extra_link_args': ['-framework','ApplicationServices'],
-                       }
-            addMacExtension('_Launch', app_kwds)
-            addMacExtension('_CG', app_kwds)
-
-            exts.append( Extension('_Qt', ['qt/_Qtmodule.c'],
-                        extra_compile_args=carbon_extra_compile_args,
-                        extra_link_args=['-framework', 'QuickTime',
-                                     '-framework', 'Carbon']) )
-
-
-        self.extensions.extend(exts)
-
-        # Call the method for detecting whether _tkinter can be compiled
-        self.detect_tkinter(inc_dirs, lib_dirs)
-
-        if '_tkinter' not in [e.name for e in self.extensions]:
-            missing.append('_tkinter')
-
-##         # Uncomment these lines if you want to play with xxmodule.c
-##         ext = Extension('xx', ['xxmodule.c'])
-##         self.extensions.append(ext)
-
-        return missing
-
-    def detect_tkinter_explicitly(self):
-        # Build _tkinter using explicit locations for Tcl/Tk.
-        #
-        # This is enabled when both arguments are given to ./configure:
-        #
-        #     --with-tcltk-includes="-I/path/to/tclincludes \
-        #                            -I/path/to/tkincludes"
-        #     --with-tcltk-libs="-L/path/to/tcllibs -ltclm.n \
-        #                        -L/path/to/tklibs -ltkm.n"
-        #
-        # These values can also be specified or overriden via make:
-        #    make TCLTK_INCLUDES="..." TCLTK_LIBS="..."
-        #
-        # This can be useful for building and testing tkinter with multiple
-        # versions of Tcl/Tk.  Note that a build of Tk depends on a particular
-        # build of Tcl so you need to specify both arguments and use care when
-        # overriding.
-
-        # The _TCLTK variables are created in the Makefile sharedmods target.
-        tcltk_includes = os.environ.get('_TCLTK_INCLUDES')
-        tcltk_libs = os.environ.get('_TCLTK_LIBS')
-        if not (tcltk_includes and tcltk_libs):
-            # Resume default configuration search.
-            return 0
-
-        extra_compile_args = tcltk_includes.split()
-        extra_link_args = tcltk_libs.split()
-        ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
-                        define_macros=[('WITH_APPINIT', 1)],
-                        extra_compile_args = extra_compile_args,
-                        extra_link_args = extra_link_args,
-                        )
-        self.extensions.append(ext)
-        return 1
-
-    def detect_tkinter_darwin(self, inc_dirs, lib_dirs):
-        # The _tkinter module, using frameworks. Since frameworks are quite
-        # different the UNIX search logic is not sharable.
-        from os.path import join, exists
-        framework_dirs = [
-            '/Library/Frameworks',
-            '/System/Library/Frameworks/',
-            join(os.getenv('HOME'), '/Library/Frameworks')
-        ]
-
-        sysroot = macosx_sdk_root()
-
-        # Find the directory that contains the Tcl.framework and Tk.framework
-        # bundles.
-        # XXX distutils should support -F!
-        for F in framework_dirs:
-            # both Tcl.framework and Tk.framework should be present
-
-
-            for fw in 'Tcl', 'Tk':
-                if is_macosx_sdk_path(F):
-                    if not exists(join(sysroot, F[1:], fw + '.framework')):
-                        break
-                else:
-                    if not exists(join(F, fw + '.framework')):
-                        break
-            else:
-                # ok, F is now directory with both frameworks. Continure
-                # building
-                break
-        else:
-            # Tk and Tcl frameworks not found. Normal "unix" tkinter search
-            # will now resume.
-            return 0
-
-        # For 8.4a2, we must add -I options that point inside the Tcl and Tk
-        # frameworks. In later release we should hopefully be able to pass
-        # the -F option to gcc, which specifies a framework lookup path.
-        #
-        include_dirs = [
-            join(F, fw + '.framework', H)
-            for fw in 'Tcl', 'Tk'
-            for H in 'Headers', 'Versions/Current/PrivateHeaders'
-        ]
-
-        # For 8.4a2, the X11 headers are not included. Rather than include a
-        # complicated search, this is a hard-coded path. It could bail out
-        # if X11 libs are not found...
-        include_dirs.append('/usr/X11R6/include')
-        frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
-
-        # All existing framework builds of Tcl/Tk don't support 64-bit
-        # architectures.
-        cflags = sysconfig.get_config_vars('CFLAGS')[0]
-        archs = re.findall('-arch\s+(\w+)', cflags)
-
-        if is_macosx_sdk_path(F):
-            fp = os.popen("file %s/Tk.framework/Tk | grep 'for architecture'"%(os.path.join(sysroot, F[1:]),))
-        else:
-            fp = os.popen("file %s/Tk.framework/Tk | grep 'for architecture'"%(F,))
-
-        detected_archs = []
-        for ln in fp:
-            a = ln.split()[-1]
-            if a in archs:
-                detected_archs.append(ln.split()[-1])
-        fp.close()
-
-        for a in detected_archs:
-            frameworks.append('-arch')
-            frameworks.append(a)
-
-        ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
-                        define_macros=[('WITH_APPINIT', 1)],
-                        include_dirs = include_dirs,
-                        libraries = [],
-                        extra_compile_args = frameworks[2:],
-                        extra_link_args = frameworks,
-                        )
-        self.extensions.append(ext)
-        return 1
-
-    def detect_tkinter(self, inc_dirs, lib_dirs):
-        # The _tkinter module.
-
-        # Check whether --with-tcltk-includes and --with-tcltk-libs were
-        # configured or passed into the make target.  If so, use these values
-        # to build tkinter and bypass the searches for Tcl and TK in standard
-        # locations.
-        if self.detect_tkinter_explicitly():
-            return
-
-        # Rather than complicate the code below, detecting and building
-        # AquaTk is a separate method. Only one Tkinter will be built on
-        # Darwin - either AquaTk, if it is found, or X11 based Tk.
-        if (host_platform == 'darwin' and
-            self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
-            return
-
-        # Assume we haven't found any of the libraries or include files
-        # The versions with dots are used on Unix, and the versions without
-        # dots on Windows, for detection by cygwin.
-        tcllib = tklib = tcl_includes = tk_includes = None
-        for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83',
-                        '8.2', '82', '8.1', '81', '8.0', '80']:
-            tklib = self.compiler.find_library_file(lib_dirs,
-                                                        'tk' + version)
-            tcllib = self.compiler.find_library_file(lib_dirs,
-                                                         'tcl' + version)
-            if tklib and tcllib:
-                # Exit the loop when we've found the Tcl/Tk libraries
-                break
-
-        # Now check for the header files
-        if tklib and tcllib:
-            # Check for the include files on Debian and {Free,Open}BSD, where
-            # they're put in /usr/include/{tcl,tk}X.Y
-            dotversion = version
-            if '.' not in dotversion and "bsd" in host_platform.lower():
-                # OpenBSD and FreeBSD use Tcl/Tk library names like libtcl83.a,
-                # but the include subdirs are named like .../include/tcl8.3.
-                dotversion = dotversion[:-1] + '.' + dotversion[-1]
-            tcl_include_sub = []
-            tk_include_sub = []
-            for dir in inc_dirs:
-                tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
-                tk_include_sub += [dir + os.sep + "tk" + dotversion]
-            tk_include_sub += tcl_include_sub
-            tcl_includes = find_file('tcl.h', inc_dirs, tcl_include_sub)
-            tk_includes = find_file('tk.h', inc_dirs, tk_include_sub)
-
-        if (tcllib is None or tklib is None or
-            tcl_includes is None or tk_includes is None):
-            self.announce("INFO: Can't locate Tcl/Tk libs and/or headers", 2)
-            return
-
-        # OK... everything seems to be present for Tcl/Tk.
-
-        include_dirs = [] ; libs = [] ; defs = [] ; added_lib_dirs = []
-        for dir in tcl_includes + tk_includes:
-            if dir not in include_dirs:
-                include_dirs.append(dir)
-
-        # Check for various platform-specific directories
-        if host_platform == 'sunos5':
-            include_dirs.append('/usr/openwin/include')
-            added_lib_dirs.append('/usr/openwin/lib')
-        elif os.path.exists('/usr/X11R6/include'):
-            include_dirs.append('/usr/X11R6/include')
-            added_lib_dirs.append('/usr/X11R6/lib64')
-            added_lib_dirs.append('/usr/X11R6/lib')
-        elif os.path.exists('/usr/X11R5/include'):
-            include_dirs.append('/usr/X11R5/include')
-            added_lib_dirs.append('/usr/X11R5/lib')
-        else:
-            # Assume default location for X11
-            include_dirs.append('/usr/X11/include')
-            added_lib_dirs.append('/usr/X11/lib')
-
-        # If Cygwin, then verify that X is installed before proceeding
-        if host_platform == 'cygwin':
-            x11_inc = find_file('X11/Xlib.h', [], include_dirs)
-            if x11_inc is None:
-                return
-
-        # Check for BLT extension
-        if self.compiler.find_library_file(lib_dirs + added_lib_dirs,
-                                               'BLT8.0'):
-            defs.append( ('WITH_BLT', 1) )
-            libs.append('BLT8.0')
-        elif self.compiler.find_library_file(lib_dirs + added_lib_dirs,
-                                                'BLT'):
-            defs.append( ('WITH_BLT', 1) )
-            libs.append('BLT')
-
-        # Add the Tcl/Tk libraries
-        libs.append('tk'+ version)
-        libs.append('tcl'+ version)
-
-        if host_platform in ['aix3', 'aix4']:
-            libs.append('ld')
-
-        # Finally, link with the X11 libraries (not appropriate on cygwin)
-        if host_platform != "cygwin":
-            libs.append('X11')
-
-        ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
-                        define_macros=[('WITH_APPINIT', 1)] + defs,
-                        include_dirs = include_dirs,
-                        libraries = libs,
-                        library_dirs = added_lib_dirs,
-                        )
-        self.extensions.append(ext)
-
-        # XXX handle these, but how to detect?
-        # *** Uncomment and edit for PIL (TkImaging) extension only:
-        #       -DWITH_PIL -I../Extensions/Imaging/libImaging  tkImaging.c \
-        # *** Uncomment and edit for TOGL extension only:
-        #       -DWITH_TOGL togl.c \
-        # *** Uncomment these for TOGL extension only:
-        #       -lGL -lGLU -lXext -lXmu \
-
-    def configure_ctypes_darwin(self, ext):
-        # Darwin (OS X) uses preconfigured files, in
-        # the Modules/_ctypes/libffi_osx directory.
-        srcdir = sysconfig.get_config_var('srcdir')
-        ffi_srcdir = os.path.abspath(os.path.join(srcdir, 'Modules',
-                                                  '_ctypes', 'libffi_osx'))
-        sources = [os.path.join(ffi_srcdir, p)
-                   for p in ['ffi.c',
-                             'x86/darwin64.S',
-                             'x86/x86-darwin.S',
-                             'x86/x86-ffi_darwin.c',
-                             'x86/x86-ffi64.c',
-                             'powerpc/ppc-darwin.S',
-                             'powerpc/ppc-darwin_closure.S',
-                             'powerpc/ppc-ffi_darwin.c',
-                             'powerpc/ppc64-darwin_closure.S',
-                             ]]
-
-        # Add .S (preprocessed assembly) to C compiler source extensions.
-        self.compiler.src_extensions.append('.S')
-
-        include_dirs = [os.path.join(ffi_srcdir, 'include'),
-                        os.path.join(ffi_srcdir, 'powerpc')]
-        ext.include_dirs.extend(include_dirs)
-        ext.sources.extend(sources)
-        return True
-
-    def configure_ctypes(self, ext):
-        if not self.use_system_libffi:
-            if host_platform == 'darwin':
-                return self.configure_ctypes_darwin(ext)
-
-            srcdir = sysconfig.get_config_var('srcdir')
-            ffi_builddir = os.path.join(self.build_temp, 'libffi')
-            ffi_srcdir = os.path.abspath(os.path.join(srcdir, 'Modules',
-                                         '_ctypes', 'libffi'))
-            ffi_configfile = os.path.join(ffi_builddir, 'fficonfig.py')
-
-            from distutils.dep_util import newer_group
-
-            config_sources = [os.path.join(ffi_srcdir, fname)
-                              for fname in os.listdir(ffi_srcdir)
-                              if os.path.isfile(os.path.join(ffi_srcdir, fname))]
-            if self.force or newer_group(config_sources,
-                                         ffi_configfile):
-                from distutils.dir_util import mkpath
-                mkpath(ffi_builddir)
-                config_args = [arg for arg in sysconfig.get_config_var("CONFIG_ARGS").split()
-                               if (('--host=' in arg) or ('--build=' in arg))]
-                if not self.verbose:
-                    config_args.append("-q")
-
-                # Pass empty CFLAGS because we'll just append the resulting
-                # CFLAGS to Python's; -g or -O2 is to be avoided.
-                cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \
-                      % (ffi_builddir, ffi_srcdir, " ".join(config_args))
-
-                res = os.system(cmd)
-                if res or not os.path.exists(ffi_configfile):
-                    print "Failed to configure _ctypes module"
-                    return False
-
-            fficonfig = {}
-            with open(ffi_configfile) as f:
-                exec f in fficonfig
-
-            # Add .S (preprocessed assembly) to C compiler source extensions.
-            self.compiler.src_extensions.append('.S')
-
-            include_dirs = [os.path.join(ffi_builddir, 'include'),
-                            ffi_builddir,
-                            os.path.join(ffi_srcdir, 'src')]
-            extra_compile_args = fficonfig['ffi_cflags'].split()
-
-            ext.sources.extend(os.path.join(ffi_srcdir, f) for f in
-                               fficonfig['ffi_sources'])
-            ext.include_dirs.extend(include_dirs)
-            ext.extra_compile_args.extend(extra_compile_args)
-        return True
-
-    def detect_ctypes(self, inc_dirs, lib_dirs):
-        self.use_system_libffi = False
-        include_dirs = []
-        extra_compile_args = []
-        extra_link_args = []
-        sources = ['_ctypes/_ctypes.c',
-                   '_ctypes/callbacks.c',
-                   '_ctypes/callproc.c',
-                   '_ctypes/stgdict.c',
-                   '_ctypes/cfield.c']
-        depends = ['_ctypes/ctypes.h']
-
-        if host_platform == 'darwin':
-            sources.append('_ctypes/malloc_closure.c')
-            sources.append('_ctypes/darwin/dlfcn_simple.c')
-            extra_compile_args.append('-DMACOSX')
-            include_dirs.append('_ctypes/darwin')
-# XXX Is this still needed?
-##            extra_link_args.extend(['-read_only_relocs', 'warning'])
-
-        elif host_platform == 'sunos5':
-            # XXX This shouldn't be necessary; it appears that some
-            # of the assembler code is non-PIC (i.e. it has relocations
-            # when it shouldn't. The proper fix would be to rewrite
-            # the assembler code to be PIC.
-            # This only works with GCC; the Sun compiler likely refuses
-            # this option. If you want to compile ctypes with the Sun
-            # compiler, please research a proper solution, instead of
-            # finding some -z option for the Sun compiler.
-            extra_link_args.append('-mimpure-text')
-
-        elif host_platform.startswith('hp-ux'):
-            extra_link_args.append('-fPIC')
-
-        ext = Extension('_ctypes',
-                        include_dirs=include_dirs,
-                        extra_compile_args=extra_compile_args,
-                        extra_link_args=extra_link_args,
-                        libraries=[],
-                        sources=sources,
-                        depends=depends)
-        ext_test = Extension('_ctypes_test',
-                             sources=['_ctypes/_ctypes_test.c'])
-        self.extensions.extend([ext, ext_test])
-
-        if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"):
-            return
-
-        if host_platform == 'darwin':
-            # OS X 10.5 comes with libffi.dylib; the include files are
-            # in /usr/include/ffi
-            inc_dirs.append('/usr/include/ffi')
-
-        ffi_inc = [sysconfig.get_config_var("LIBFFI_INCLUDEDIR")]
-        if not ffi_inc or ffi_inc[0] == '':
-            ffi_inc = find_file('ffi.h', [], inc_dirs)
-        if ffi_inc is not None:
-            ffi_h = ffi_inc[0] + '/ffi.h'
-            fp = open(ffi_h)
-            while 1:
-                line = fp.readline()
-                if not line:
-                    ffi_inc = None
-                    break
-                if line.startswith('#define LIBFFI_H'):
-                    break
-        ffi_lib = None
-        if ffi_inc is not None:
-            for lib_name in ('ffi_convenience', 'ffi_pic', 'ffi'):
-                if (self.compiler.find_library_file(lib_dirs, lib_name)):
-                    ffi_lib = lib_name
-                    break
-
-        if ffi_inc and ffi_lib:
-            ext.include_dirs.extend(ffi_inc)
-            ext.libraries.append(ffi_lib)
-            self.use_system_libffi = True
-
-
-class PyBuildInstall(install):
-    # Suppress the warning about installation into the lib_dynload
-    # directory, which is not in sys.path when running Python during
-    # installation:
-    def initialize_options (self):
-        install.initialize_options(self)
-        self.warn_dir=0
-
-class PyBuildInstallLib(install_lib):
-    # Do exactly what install_lib does but make sure correct access modes get
-    # set on installed directories and files. All installed files with get
-    # mode 644 unless they are a shared library in which case they will get
-    # mode 755. All installed directories will get mode 755.
-
-    so_ext = sysconfig.get_config_var("SO")
-
-    def install(self):
-        outfiles = install_lib.install(self)
-        self.set_file_modes(outfiles, 0644, 0755)
-        self.set_dir_modes(self.install_dir, 0755)
-        return outfiles
-
-    def set_file_modes(self, files, defaultMode, sharedLibMode):
-        if not self.is_chmod_supported(): return
-        if not files: return
-
-        for filename in files:
-            if os.path.islink(filename): continue
-            mode = defaultMode
-            if filename.endswith(self.so_ext): mode = sharedLibMode
-            log.info("changing mode of %s to %o", filename, mode)
-            if not self.dry_run: os.chmod(filename, mode)
-
-    def set_dir_modes(self, dirname, mode):
-        if not self.is_chmod_supported(): return
-        os.path.walk(dirname, self.set_dir_modes_visitor, mode)
-
-    def set_dir_modes_visitor(self, mode, dirname, names):
-        if os.path.islink(dirname): return
-        log.info("changing mode of %s to %o", dirname, mode)
-        if not self.dry_run: os.chmod(dirname, mode)
-
-    def is_chmod_supported(self):
-        return hasattr(os, 'chmod')
-
-SUMMARY = """
-Python is an interpreted, interactive, object-oriented programming
-language. It is often compared to Tcl, Perl, Scheme or Java.
-
-Python combines remarkable power with very clear syntax. It has
-modules, classes, exceptions, very high level dynamic data types, and
-dynamic typing. There are interfaces to many system calls and
-libraries, as well as to various windowing systems (X11, Motif, Tk,
-Mac, MFC). New built-in modules are easily written in C or C++. Python
-is also usable as an extension language for applications that need a
-programmable interface.
-
-The Python implementation is portable: it runs on many brands of UNIX,
-on Windows, DOS, OS/2, Mac, Amiga... If your favorite system isn't
-listed here, it may still be supported, if there's a C compiler for
-it. Ask around on comp.lang.python -- or just try compiling Python
-yourself.
-"""
-
-CLASSIFIERS = """
-Development Status :: 6 - Mature
-License :: OSI Approved :: Python Software Foundation License
-Natural Language :: English
-Programming Language :: C
-Programming Language :: Python
-Topic :: Software Development
-"""
-
-def main():
-    # turn off warnings when deprecated modules are imported
-    import warnings
-    warnings.filterwarnings("ignore",category=DeprecationWarning)
-    setup(# PyPI Metadata (PEP 301)
-          name = "Python",
-          version = sys.version.split()[0],
-          url = "http://www.python.org/%s" % sys.version[:3],
-          maintainer = "Guido van Rossum and the Python community",
-          maintainer_email = "python-dev@python.org",
-          description = "A high-level object-oriented programming language",
-          long_description = SUMMARY.strip(),
-          license = "PSF license",
-          classifiers = filter(None, CLASSIFIERS.split("\n")),
-          platforms = ["Many"],
-
-          # Build info
-          cmdclass = {'build_ext':PyBuildExt, 'install':PyBuildInstall,
-                      'install_lib':PyBuildInstallLib},
-          # The struct module is defined here, because build_ext won't be
-          # called unless there's at least one extension module defined.
-          ext_modules=[Extension('_struct', ['_struct.c'])],
-
-          # Scripts to install
-          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
-                     'Tools/scripts/2to3',
-                     'Lib/smtpd.py']
-        )
-
-# --install-platlib
-if __name__ == '__main__':
-    main()
diff --git a/pysrc/src/site-2.7.7.py b/pysrc/src/site-2.7.7.py
deleted file mode 100644
index c22c48ab5..000000000
--- a/pysrc/src/site-2.7.7.py
+++ /dev/null
@@ -1,602 +0,0 @@
-"""Append module search paths for third-party packages to sys.path.
-
-****************************************************************
-* This module is automatically imported during initialization. *
-****************************************************************
-
-In earlier versions of Python (up to 1.5a3), scripts or modules that
-needed to use site-specific modules would place ``import site''
-somewhere near the top of their code.  Because of the automatic
-import, this is no longer necessary (but code that does it still
-works).
-
-This will append site-specific paths to the module search path.  On
-Unix (including Mac OSX), it starts with sys.prefix and
-sys.exec_prefix (if different) and appends
-lib/python<version>/site-packages as well as lib/site-python.
-On other platforms (such as Windows), it tries each of the
-prefixes directly, as well as with lib/site-packages appended.  The
-resulting directories, if they exist, are appended to sys.path, and
-also inspected for path configuration files.
-
-A path configuration file is a file whose name has the form
-<package>.pth; its contents are additional directories (one per line)
-to be added to sys.path.  Non-existing directories (or
-non-directories) are never added to sys.path; no directory is added to
-sys.path more than once.  Blank lines and lines beginning with
-'#' are skipped. Lines starting with 'import' are executed.
-
-For example, suppose sys.prefix and sys.exec_prefix are set to
-/usr/local and there is a directory /usr/local/lib/python2.5/site-packages
-with three subdirectories, foo, bar and spam, and two path
-configuration files, foo.pth and bar.pth.  Assume foo.pth contains the
-following:
-
-  # foo package configuration
-  foo
-  bar
-  bletch
-
-and bar.pth contains:
-
-  # bar package configuration
-  bar
-
-Then the following directories are added to sys.path, in this order:
-
-  /usr/local/lib/python2.5/site-packages/bar
-  /usr/local/lib/python2.5/site-packages/foo
-
-Note that bletch is omitted because it doesn't exist; bar precedes foo
-because bar.pth comes alphabetically before foo.pth; and spam is
-omitted because it is not mentioned in either path configuration file.
-
-After these path manipulations, an attempt is made to import a module
-named sitecustomize, which can perform arbitrary additional
-site-specific customizations.  If this import fails with an
-ImportError exception, it is silently ignored.
-
-"""
-
-import sys
-import os
-import __builtin__
-import traceback
-
-# Prefixes for site-packages; add additional prefixes like /usr/local here
-PREFIXES = [sys.prefix, sys.exec_prefix]
-# Enable per user site-packages directory
-# set it to False to disable the feature or True to force the feature
-ENABLE_USER_SITE = None
-
-# for distutils.commands.install
-# These values are initialized by the getuserbase() and getusersitepackages()
-# functions, through the main() function when Python starts.
-USER_SITE = None
-USER_BASE = None
-
-
-def makepath(*paths):
-    dir = os.path.join(*paths)
-    try:
-        dir = os.path.abspath(dir)
-    except OSError:
-        pass
-    return dir, os.path.normcase(dir)
-
-
-def abs__file__():
-    """Set all module' __file__ attribute to an absolute path"""
-    for m in sys.modules.values():
-        if hasattr(m, '__loader__'):
-            continue   # don't mess with a PEP 302-supplied __file__
-        try:
-            m.__file__ = os.path.abspath(m.__file__)
-        except (AttributeError, OSError):
-            pass
-
-
-def removeduppaths():
-    """ Remove duplicate entries from sys.path along with making them
-    absolute"""
-    # This ensures that the initial path provided by the interpreter contains
-    # only absolute pathnames, even if we're running from the build directory.
-    L = []
-    known_paths = set()
-    for dir in sys.path:
-        # Filter out duplicate paths (on case-insensitive file systems also
-        # if they only differ in case); turn relative paths into absolute
-        # paths.
-        dir, dircase = makepath(dir)
-        if not dircase in known_paths:
-            L.append(dir)
-            known_paths.add(dircase)
-    sys.path[:] = L
-    return known_paths
-
-
-def _init_pathinfo():
-    """Return a set containing all existing directory entries from sys.path"""
-    d = set()
-    for dir in sys.path:
-        try:
-            if os.path.isdir(dir):
-                dir, dircase = makepath(dir)
-                d.add(dircase)
-        except TypeError:
-            continue
-    return d
-
-
-def addpackage(sitedir, name, known_paths):
-    """Process a .pth file within the site-packages directory:
-       For each line in the file, either combine it with sitedir to a path
-       and add that to known_paths, or execute it if it starts with 'import '.
-    """
-    if known_paths is None:
-        _init_pathinfo()
-        reset = 1
-    else:
-        reset = 0
-    fullname = os.path.join(sitedir, name)
-    try:
-        f = open(fullname, "rU")
-    except IOError:
-        return
-    with f:
-        for n, line in enumerate(f):
-            if line.startswith("#"):
-                continue
-            try:
-                if line.startswith(("import ", "import\t")):
-                    exec line
-                    continue
-                line = line.rstrip()
-                dir, dircase = makepath(sitedir, line)
-                if not dircase in known_paths and os.path.exists(dir):
-                    sys.path.append(dir)
-                    known_paths.add(dircase)
-            except Exception as err:
-                print >>sys.stderr, "Error processing line {:d} of {}:\n".format(
-                    n+1, fullname)
-                for record in traceback.format_exception(*sys.exc_info()):
-                    for line in record.splitlines():
-                        print >>sys.stderr, '  '+line
-                print >>sys.stderr, "\nRemainder of file ignored"
-                break
-    if reset:
-        known_paths = None
-    return known_paths
-
-
-def addsitedir(sitedir, known_paths=None):
-    """Add 'sitedir' argument to sys.path if missing and handle .pth files in
-    'sitedir'"""
-    if known_paths is None:
-        known_paths = _init_pathinfo()
-        reset = 1
-    else:
-        reset = 0
-    sitedir, sitedircase = makepath(sitedir)
-    if not sitedircase in known_paths:
-        sys.path.append(sitedir)        # Add path component
-    try:
-        names = os.listdir(sitedir)
-    except os.error:
-        return
-    dotpth = os.extsep + "pth"
-    names = [name for name in names if name.endswith(dotpth)]
-    for name in sorted(names):
-        addpackage(sitedir, name, known_paths)
-    if reset:
-        known_paths = None
-    return known_paths
-
-
-def check_enableusersite():
-    """Check if user site directory is safe for inclusion
-
-    The function tests for the command line flag (including environment var),
-    process uid/gid equal to effective uid/gid.
-
-    None: Disabled for security reasons
-    False: Disabled by user (command line option)
-    True: Safe and enabled
-    """
-    if sys.flags.no_user_site:
-        return False
-
-    if hasattr(os, "getuid") and hasattr(os, "geteuid"):
-        # check process uid == effective uid
-        if os.geteuid() != os.getuid():
-            return None
-    if hasattr(os, "getgid") and hasattr(os, "getegid"):
-        # check process gid == effective gid
-        if os.getegid() != os.getgid():
-            return None
-
-    return True
-
-def getuserbase():
-    """Returns the `user base` directory path.
-
-    The `user base` directory can be used to store data. If the global
-    variable ``USER_BASE`` is not initialized yet, this function will also set
-    it.
-    """
-    global USER_BASE
-    if USER_BASE is not None:
-        return USER_BASE
-    from sysconfig import get_config_var
-    USER_BASE = get_config_var('userbase')
-    return USER_BASE
-
-def getusersitepackages():
-    """Returns the user-specific site-packages directory path.
-
-    If the global variable ``USER_SITE`` is not initialized yet, this
-    function will also set it.
-    """
-    global USER_SITE
-    user_base = getuserbase() # this will also set USER_BASE
-
-    if USER_SITE is not None:
-        return USER_SITE
-
-    from sysconfig import get_path
-    import os
-
-    if sys.platform == 'darwin':
-        from sysconfig import get_config_var
-        if get_config_var('PYTHONFRAMEWORK'):
-            USER_SITE = get_path('purelib', 'osx_framework_user')
-            return USER_SITE
-
-    USER_SITE = get_path('purelib', '%s_user' % os.name)
-    return USER_SITE
-
-def addusersitepackages(known_paths):
-    """Add a per user site-package to sys.path
-
-    Each user has its own python directory with site-packages in the
-    home directory.
-    """
-    # get the per user site-package path
-    # this call will also make sure USER_BASE and USER_SITE are set
-    user_site = getusersitepackages()
-
-    if ENABLE_USER_SITE and os.path.isdir(user_site):
-        addsitedir(user_site, known_paths)
-    return known_paths
-
-def getsitepackages():
-    """Returns a list containing all global site-packages directories
-    (and possibly site-python).
-
-    For each directory present in the global ``PREFIXES``, this function
-    will find its `site-packages` subdirectory depending on the system
-    environment, and will return a list of full paths.
-    """
-    sitepackages = []
-    seen = set()
-
-    for prefix in PREFIXES:
-        if not prefix or prefix in seen:
-            continue
-        seen.add(prefix)
-
-        if sys.platform in ('os2emx', 'riscos'):
-            sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
-        elif os.sep == '/':
-            sitepackages.append(os.path.join(prefix, "lib",
-                                        "python" + sys.version[:3],
-                                        "site-packages"))
-            sitepackages.append(os.path.join(prefix, "lib", "site-python"))
-        else:
-            sitepackages.append(prefix)
-            sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
-        if sys.platform == "darwin":
-            # for framework builds *only* we add the standard Apple
-            # locations.
-            # DISABLED FOR UV-CDAT!
-            pass
-            #from sysconfig import get_config_var
-            #framework = get_config_var("PYTHONFRAMEWORK")
-            #if framework:
-            #    sitepackages.append(
-            #            os.path.join("/Library", framework,
-            #                sys.version[:3], "site-packages"))
-    return sitepackages
-
-def addsitepackages(known_paths):
-    """Add site-packages (and possibly site-python) to sys.path"""
-    for sitedir in getsitepackages():
-        if os.path.isdir(sitedir):
-            addsitedir(sitedir, known_paths)
-
-    return known_paths
-
-def setBEGINLIBPATH():
-    """The OS/2 EMX port has optional extension modules that do double duty
-    as DLLs (and must use the .DLL file extension) for other extensions.
-    The library search path needs to be amended so these will be found
-    during module import.  Use BEGINLIBPATH so that these are at the start
-    of the library search path.
-
-    """
-    dllpath = os.path.join(sys.prefix, "Lib", "lib-dynload")
-    libpath = os.environ['BEGINLIBPATH'].split(';')
-    if libpath[-1]:
-        libpath.append(dllpath)
-    else:
-        libpath[-1] = dllpath
-    os.environ['BEGINLIBPATH'] = ';'.join(libpath)
-
-
-def setquit():
-    """Define new builtins 'quit' and 'exit'.
-
-    These are objects which make the interpreter exit when called.
-    The repr of each object contains a hint at how it works.
-
-    """
-    if os.sep == ':':
-        eof = 'Cmd-Q'
-    elif os.sep == '\\':
-        eof = 'Ctrl-Z plus Return'
-    else:
-        eof = 'Ctrl-D (i.e. EOF)'
-
-    class Quitter(object):
-        def __init__(self, name):
-            self.name = name
-        def __repr__(self):
-            return 'Use %s() or %s to exit' % (self.name, eof)
-        def __call__(self, code=None):
-            # Shells like IDLE catch the SystemExit, but listen when their
-            # stdin wrapper is closed.
-            try:
-                sys.stdin.close()
-            except:
-                pass
-            raise SystemExit(code)
-    __builtin__.quit = Quitter('quit')
-    __builtin__.exit = Quitter('exit')
-
-
-class _Printer(object):
-    """interactive prompt objects for printing the license text, a list of
-    contributors and the copyright notice."""
-
-    MAXLINES = 23
-
-    def __init__(self, name, data, files=(), dirs=()):
-        self.__name = name
-        self.__data = data
-        self.__files = files
-        self.__dirs = dirs
-        self.__lines = None
-
-    def __setup(self):
-        if self.__lines:
-            return
-        data = None
-        for dir in self.__dirs:
-            for filename in self.__files:
-                filename = os.path.join(dir, filename)
-                try:
-                    fp = file(filename, "rU")
-                    data = fp.read()
-                    fp.close()
-                    break
-                except IOError:
-                    pass
-            if data:
-                break
-        if not data:
-            data = self.__data
-        self.__lines = data.split('\n')
-        self.__linecnt = len(self.__lines)
-
-    def __repr__(self):
-        self.__setup()
-        if len(self.__lines) <= self.MAXLINES:
-            return "\n".join(self.__lines)
-        else:
-            return "Type %s() to see the full %s text" % ((self.__name,)*2)
-
-    def __call__(self):
-        self.__setup()
-        prompt = 'Hit Return for more, or q (and Return) to quit: '
-        lineno = 0
-        while 1:
-            try:
-                for i in range(lineno, lineno + self.MAXLINES):
-                    print self.__lines[i]
-            except IndexError:
-                break
-            else:
-                lineno += self.MAXLINES
-                key = None
-                while key is None:
-                    key = raw_input(prompt)
-                    if key not in ('', 'q'):
-                        key = None
-                if key == 'q':
-                    break
-
-def setcopyright():
-    """Set 'copyright' and 'credits' in __builtin__"""
-    __builtin__.copyright = _Printer("copyright", sys.copyright)
-    if sys.platform[:4] == 'java':
-        __builtin__.credits = _Printer(
-            "credits",
-            "Jython is maintained by the Jython developers (www.jython.org).")
-    else:
-        __builtin__.credits = _Printer("credits", """\
-    Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands
-    for supporting Python development.  See www.python.org for more information.""")
-    here = os.path.dirname(os.__file__)
-    __builtin__.license = _Printer(
-        "license", "See http://www.python.org/%.3s/license.html" % sys.version,
-        ["LICENSE.txt", "LICENSE"],
-        [os.path.join(here, os.pardir), here, os.curdir])
-
-
-class _Helper(object):
-    """Define the builtin 'help'.
-    This is a wrapper around pydoc.help (with a twist).
-
-    """
-
-    def __repr__(self):
-        return "Type help() for interactive help, " \
-               "or help(object) for help about object."
-    def __call__(self, *args, **kwds):
-        import pydoc
-        return pydoc.help(*args, **kwds)
-
-def sethelper():
-    __builtin__.help = _Helper()
-
-def aliasmbcs():
-    """On Windows, some default encodings are not provided by Python,
-    while they are always available as "mbcs" in each locale. Make
-    them usable by aliasing to "mbcs" in such a case."""
-    if sys.platform == 'win32':
-        import locale, codecs
-        enc = locale.getdefaultlocale()[1]
-        if enc.startswith('cp'):            # "cp***" ?
-            try:
-                codecs.lookup(enc)
-            except LookupError:
-                import encodings
-                encodings._cache[enc] = encodings._unknown
-                encodings.aliases.aliases[enc] = 'mbcs'
-
-def setencoding():
-    """Set the string encoding used by the Unicode implementation.  The
-    default is 'ascii', but if you're willing to experiment, you can
-    change this."""
-    encoding = "ascii" # Default value set by _PyUnicode_Init()
-    if 0:
-        # Enable to support locale aware default string encodings.
-        import locale
-        loc = locale.getdefaultlocale()
-        if loc[1]:
-            encoding = loc[1]
-    if 0:
-        # Enable to switch off string to Unicode coercion and implicit
-        # Unicode to string conversion.
-        encoding = "undefined"
-    if encoding != "ascii":
-        # On Non-Unicode builds this will raise an AttributeError...
-        sys.setdefaultencoding(encoding) # Needs Python Unicode build !
-
-
-def execsitecustomize():
-    """Run custom site specific code, if available."""
-    try:
-        import sitecustomize
-    except ImportError:
-        pass
-    except Exception:
-        if sys.flags.verbose:
-            sys.excepthook(*sys.exc_info())
-        else:
-            print >>sys.stderr, \
-                "'import sitecustomize' failed; use -v for traceback"
-
-
-def execusercustomize():
-    """Run custom user specific code, if available."""
-    try:
-        import usercustomize
-    except ImportError:
-        pass
-    except Exception:
-        if sys.flags.verbose:
-            sys.excepthook(*sys.exc_info())
-        else:
-            print>>sys.stderr, \
-                "'import usercustomize' failed; use -v for traceback"
-
-
-def main():
-    global ENABLE_USER_SITE
-
-    abs__file__()
-    known_paths = removeduppaths()
-    if ENABLE_USER_SITE is None:
-        ENABLE_USER_SITE = check_enableusersite()
-    known_paths = addusersitepackages(known_paths)
-    known_paths = addsitepackages(known_paths)
-    if sys.platform == 'os2emx':
-        setBEGINLIBPATH()
-    setquit()
-    setcopyright()
-    sethelper()
-    aliasmbcs()
-    setencoding()
-    execsitecustomize()
-    if ENABLE_USER_SITE:
-        execusercustomize()
-    # Remove sys.setdefaultencoding() so that users cannot change the
-    # encoding after initialization.  The test for presence is needed when
-    # this module is run as a script, because this code is executed twice.
-    if hasattr(sys, "setdefaultencoding"):
-        del sys.setdefaultencoding
-
-main()
-
-def _script():
-    help = """\
-    %s [--user-base] [--user-site]
-
-    Without arguments print some useful information
-    With arguments print the value of USER_BASE and/or USER_SITE separated
-    by '%s'.
-
-    Exit codes with --user-base or --user-site:
-      0 - user site directory is enabled
-      1 - user site directory is disabled by user
-      2 - uses site directory is disabled by super user
-          or for security reasons
-     >2 - unknown error
-    """
-    args = sys.argv[1:]
-    if not args:
-        print "sys.path = ["
-        for dir in sys.path:
-            print "    %r," % (dir,)
-        print "]"
-        print "USER_BASE: %r (%s)" % (USER_BASE,
-            "exists" if os.path.isdir(USER_BASE) else "doesn't exist")
-        print "USER_SITE: %r (%s)" % (USER_SITE,
-            "exists" if os.path.isdir(USER_SITE) else "doesn't exist")
-        print "ENABLE_USER_SITE: %r" %  ENABLE_USER_SITE
-        sys.exit(0)
-
-    buffer = []
-    if '--user-base' in args:
-        buffer.append(USER_BASE)
-    if '--user-site' in args:
-        buffer.append(USER_SITE)
-
-    if buffer:
-        print os.pathsep.join(buffer)
-        if ENABLE_USER_SITE:
-            sys.exit(0)
-        elif ENABLE_USER_SITE is False:
-            sys.exit(1)
-        elif ENABLE_USER_SITE is None:
-            sys.exit(2)
-        else:
-            sys.exit(3)
-    else:
-        import textwrap
-        print textwrap.dedent(help % (sys.argv[0], os.pathsep))
-        sys.exit(10)
-
-if __name__ == '__main__':
-    _script()
diff --git a/pysrc/tcl.sh b/pysrc/tcl.sh
deleted file mode 100755
index d8c7fbf6c..000000000
--- a/pysrc/tcl.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-. ./prolog.sh
-# tcl
-cd tcl8*
-cd unix
-if (test "${OS}" = "Darwin") then  # MacIntosh OSX
-   ./configure --prefix=${prefix}/Externals
-else
-   ./configure --disable-shared --prefix=${prefix}/Externals
-fi
-
-if (test $? -ne 0) then
-    echo "tcl configuration failed.";
-    exit 1;
-fi
-make
-if (test $? -ne 0) then
-    echo "tcl make failed.";
-    exit 1;
-fi
-make install
-if (test $? -ne 0) then
-    echo "tcl install failed.";
-    exit 1;
-fi
diff --git a/pysrc/tk.sh b/pysrc/tk.sh
deleted file mode 100755
index 8878bbe75..000000000
--- a/pysrc/tk.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-. ./prolog.sh
-cd tk8*
-cd unix
-if (test "${OS}" = "Darwin") then  # MacIntosh OSX
-   ./configure --prefix=${prefix}/Externals
-else
-   ./configure --disable-shared --prefix=${prefix}/Externals
-fi
-
-if (test $? -ne 0) then
-    echo "tk configuration failed.";
-    exit 1;
-fi
-make
-if (test $? -ne 0) then
-    echo "tk make failed.";
-    exit 1;
-fi
-make install
-if (test $? -ne 0) then
-    echo "tk installation failed.";
-    exit 1;
-fi
diff --git a/pysrc/zlib.sh b/pysrc/zlib.sh
deleted file mode 100755
index c2497bc94..000000000
--- a/pysrc/zlib.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-. ./prolog.sh $*
-cd zlib-*
-CDMSARCH=`uname -m`
-if (test "${CDMSARCH}" = "ia64") then
-  export CC="gcc -fPIC"
-fi
-if (test "${CDMSARCH}" = "x86_64") then
-  export CC="gcc -fPIC"
-fi
-./configure --prefix=${prefix}/Externals
-if (test $? -ne 0) then
-    echo "zlib configuration failed.";
-    exit 1;
-fi
-make
-if (test $? -ne 0) then
-    echo "zlib make failed.";
-    exit 1;
-fi
-make install
-if (test $? -ne 0) then
-    echo "zlib installation failed.";
-    exit 1;
-fi
diff --git a/resources/uvcdat.icns b/resources/uvcdat.icns
deleted file mode 100644
index 3d1efc0aa54111774aafee3e215bf5348a602254..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 40131
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
Q%=BUHLa0YZslgKh05U7*6aWAK

diff --git a/resources/uvcdat.jpg b/resources/uvcdat.jpg
deleted file mode 100644
index 16835ba2c63dc69a4f985214044de61314878456..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 94795
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
bUD}W4J%4fWCaXxGM<V(V0+sme|8D{Sz7`<O

diff --git a/scripts/clean_script b/scripts/clean_script
deleted file mode 100755
index ebf3bfa96..000000000
--- a/scripts/clean_script
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-if ( test "$1" = "all" ) then
-   (cd pysrc >/dev/null ; ./clean_script)
-   (cd exsrc >/dev/null; ./clean_script)
-   (cd logs >/dev/null ; /bin/rm *.LOG >/dev/null 2>&1)
-fi
-
-(cd libcdms;./clean_script >cdms.LOG 2>&1; /bin/rm -f cdms.LOG rebuild.py rebuild.LOG >/dev/null 2>&1)
-(cd esg; /bin/rm -fr build *.LOG rebuild.py *.log >/dev/null 2>&1)
-(cd Packages; /bin/rm -fr vcs/cdatwrap */build */rebuild.py */*.LOG */Test/Good */*.log >/dev/null 2>&1)
-(cd Packages/visus/src/pyvisus ; /bin/rm -rf build >/dev/null 2>&1)
-(cd contrib;/bin/rm -fr */build */*.o */*.a */*.pyc */Src/*.o */Src/*.a */rebuild.py */*.LOG */Test/Good */*.log >/dev/null 2>&1)
-/bin/rm -fr build *.pyc installation/build installation/cdat_info.* *~ rebuild.py  >/dev/null 2>&1
-find . -name 'config.cache' -print -exec rm {} \; 
diff --git a/scripts/get_git_version.sh b/scripts/get_git_version.sh
deleted file mode 100755
index 7d27fa7fe..000000000
--- a/scripts/get_git_version.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env sh
-
-if [ "X"${CC} = "X" ] ; then
-    gcc show_git.c -o a.out ; ./a.out ; rm a.out
-else
-   ${CC} show_git.c -o a.out ; ./a.out ; rm a.out
-fi
diff --git a/scripts/git_hooks/commit-msg b/scripts/git_hooks/commit-msg
deleted file mode 100755
index 672bfaae2..000000000
--- a/scripts/git_hooks/commit-msg
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-# placeholder for custom commit-msg hooks
diff --git a/scripts/git_hooks/pre-commit b/scripts/git_hooks/pre-commit
deleted file mode 100755
index e7b50ac4a..000000000
--- a/scripts/git_hooks/pre-commit
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-# Reject commits directly to 'master' to encourage use of topic branches.
-if test -z "$HOOKS_ALLOW_COMMIT_MASTER"; then
-  if git symbolic-ref HEAD | egrep -q '^refs/heads/master$'; then
-    echo 'Please do not commit directly to "master".  Create a topic instead:
-
- git checkout -b my-topic
- git commit
-'
-    exit 1
-  fi
-fi
diff --git a/scripts/git_hooks/pre-push b/scripts/git_hooks/pre-push
deleted file mode 100755
index 424f890f9..000000000
--- a/scripts/git_hooks/pre-push
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-# Reject pushes directly to 'master' to encourage use of topic branches.
-if test -z "$HOOKS_ALLOW_PUSH_MASTER"; then
-  while IFS=' ' read local_ref local_sha1 remote_ref remote_sha1; do
-    if test "x$remote_ref" = "xrefs/heads/master"; then
-      echo 'Please do not push directly to "master".  Push to a topic instead:
-
-  git push '"$1"' '"$local_ref"':my-topic
-'
-      exit 1
-    fi
-  done
-fi
diff --git a/scripts/git_hooks/prepare-commit-msg b/scripts/git_hooks/prepare-commit-msg
deleted file mode 100755
index 1571a7d20..000000000
--- a/scripts/git_hooks/prepare-commit-msg
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-# placeholder for custom prepare-commit-msg hooks
diff --git a/scripts/git_setup/.gitattributes b/scripts/git_setup/.gitattributes
deleted file mode 100644
index 3323f94b9..000000000
--- a/scripts/git_setup/.gitattributes
+++ /dev/null
@@ -1,9 +0,0 @@
-.git*            export-ignore
-
-# Exclude from source archives files specific to Git work tree.
-*                export-ignore
-
-config*          eol=lf         whitespace=indent-with-non-tab
-git-*            eol=lf         whitespace=indent-with-non-tab
-tips             eol=lf         whitespace=indent-with-non-tab
-setup-*          eol=lf         whitespace=indent-with-non-tab
diff --git a/scripts/git_setup/LICENSE b/scripts/git_setup/LICENSE
deleted file mode 100644
index d64569567..000000000
--- a/scripts/git_setup/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/scripts/git_setup/NOTICE b/scripts/git_setup/NOTICE
deleted file mode 100644
index 0d32c02eb..000000000
--- a/scripts/git_setup/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Kitware Local Git Setup Scripts
-Copyright 2010-2012 Kitware, Inc.
-
-This product includes software developed at Kitware, Inc.
-(http://www.kitware.com/).
diff --git a/scripts/git_setup/README b/scripts/git_setup/README
deleted file mode 100644
index cf468fb68..000000000
--- a/scripts/git_setup/README
+++ /dev/null
@@ -1,80 +0,0 @@
-Kitware Local Git Setup Scripts
-
-
-Introduction
-------------
-
-This is a collection of local Git development setup scripts meant for
-inclusion in project source trees to aid their development workflow.
-Project-specific information needed by the scripts may be configured
-in a "config" file added next to them in the project.
-
-
-Import
-------
-
-A project may import these scripts into their source tree by
-initializing a subtree merge.  Bring up a Git prompt and set the
-current working directory inside a clone of the target project.
-Fetch the "setup" branch from the GitSetup repository:
-
- $ git fetch ../GitSetup setup:setup
-
-Prepare to merge the branch but place the content in a subdirectory.
-Any prefix (with trailing '/') may be chosen so long as it is used
-consistently within a project through the rest of these instructions:
-
- $ git merge -s ours --no-commit setup
- $ git read-tree -u --prefix=Utilities/GitSetup/ setup
-
-Commit the merge with an informative message:
-
- $ git commit
- ------------------------------------------------------------------------
- Merge branch 'setup'
-
- Add Utilities/GitSetup/ directory using subtree merge from
- the general GitSetup repository "setup" branch.
- ------------------------------------------------------------------------
-
-
-Configuration
--------------
-
-Read the "Project configuration instructions" comment in each script.
-Add a "config" file next to the scripts with desired configuration
-(optionally copy and modify "config.sample").  For example, to
-configure the "setup-hooks" script:
-
- $ git config -f Utilities/GitSetup/config hooks.url "$url"
-
-where "$url" is the project repository publishing the "hooks" branch.
-When finished, add and commit the configuration file:
-
- $ git add Utilities/GitSetup/config
- $ git commit
-
-
-Update
-------
-
-A project may update these scripts from the GitSetup repository.
-Bring up a Git prompt and set the current working directory inside a
-clone of the target project.  Fetch the "setup" branch from the
-GitSetup repository:
-
- $ git fetch ../GitSetup setup:setup
-
-Merge the "setup" branch into the subtree:
-
- $ git merge -X subtree=Utilities/GitSetup setup
-
-where "Utilities/GitSetup" is the same prefix used during the import
-setup, but without a trailing '/'.
-
-
-License
--------
-
-Distributed under the Apache License 2.0.
-See LICENSE and NOTICE for details.
diff --git a/scripts/git_setup/config b/scripts/git_setup/config
deleted file mode 100644
index 6fd06e8cc..000000000
--- a/scripts/git_setup/config
+++ /dev/null
@@ -1,2 +0,0 @@
-[hooks]
-	url = https://github.com/UV-CDAT/uvcdat
diff --git a/scripts/git_setup/config.sample b/scripts/git_setup/config.sample
deleted file mode 100644
index bba2382c3..000000000
--- a/scripts/git_setup/config.sample
+++ /dev/null
@@ -1,22 +0,0 @@
-# Kitware Local Git Setup Scripts - Sample Project Configuration
-#
-# Copy to "config" and edit as necessary.
-
-[hooks]
-	url = http://public.kitware.com/GitSetup.git
-	#branch = hooks
-
-[ssh]
-	host = public.kitware.com
-	key = id_git_public
-	request-url = https://www.kitware.com/Admin/SendPassword.cgi
-
-[stage]
-	#url = git://public.kitware.com/stage/Project.git
-	#pushurl = git@public.kitware.com:stage/Project.git
-
-[gerrit]
-	#project = Project
-	site = http://review.source.kitware.com
-	# pushurl placeholder "$username" is literal
-	pushurl = $username@review.source.kitware.com:Project
diff --git a/scripts/git_setup/git-gerrit-push b/scripts/git_setup/git-gerrit-push
deleted file mode 100755
index 2471490c2..000000000
--- a/scripts/git_setup/git-gerrit-push
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/env bash
-#=============================================================================
-# Copyright 2010-2012 Kitware, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#=============================================================================
-
-USAGE="[<remote>] [--no-topic] [--dry-run] [--]"
-OPTIONS_SPEC=
-SUBDIRECTORY_OK=Yes
-. "$(git --exec-path)/git-sh-setup"
-
-#-----------------------------------------------------------------------------
-
-remote=''
-refspecs=''
-no_topic=''
-dry_run=''
-
-# Parse the command line options.
-while test $# != 0; do
-	case "$1" in
-		--no-topic) no_topic=1 ;;
-		--dry-run)  dry_run=--dry-run ;;
-		--) shift; break ;;
-		-*) usage ;;
-		*) test -z "$remote" || usage ; remote="$1" ;;
-	esac
-	shift
-done
-test $# = 0 || usage
-
-# Default remote.
-test -n "$remote" || remote="gerrit"
-
-if test -z "$no_topic"; then
-	# Identify and validate the topic branch name.
-	topic="$(git symbolic-ref HEAD | sed -e 's|^refs/heads/||')"
-	if test "$topic" = "master"; then
-		die 'Please name your topic:
-		git checkout -b descriptive-name'
-	fi
-	refspecs="HEAD:refs/for/master/$topic"
-fi
-
-# Exit early if we have nothing to push.
-if test -z "$refspecs"; then
-	echo "Nothing to push!"
-	exit 0
-fi
-
-# Fetch the current upstream master branch head.
-# This helps the computation of a minimal pack to push.
-echo "Fetching $remote master"
-fetch_out=$(git fetch "$remote" master 2>&1) || die "$fetch_out"
-
-# Push.  Save output and exit code.
-echo "Pushing to $remote"
-push_stdout=$(git push --porcelain $dry_run "$remote" $refspecs); push_exit=$?
-echo "$push_stdout"
-
-# Reproduce the push exit code.
-exit $push_exit
diff --git a/scripts/git_setup/setup-gerrit b/scripts/git_setup/setup-gerrit
deleted file mode 100755
index 6d46e3ccf..000000000
--- a/scripts/git_setup/setup-gerrit
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/usr/bin/env bash
-#=============================================================================
-# Copyright 2010-2012 Kitware, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#=============================================================================
-
-# Run this script to set up the local Git repository to push to
-# a Gerrit Code Review instance for this project.
-
-# Project configuration instructions:
-#
-# - Run a Gerrit Code Review server
-#
-# - Populate adjacent "config" file with:
-#    gerrit.site = Top Gerrit URL (not project-specific)
-#    gerrit.project = Name of project in Gerrit
-#    gerrit.pushurl = Review site push URL with "$username" placeholder
-#    gerrit.remote = Gerrit remote name, if not "gerrit"
-#    gerrit.url = Gerrit project URL, if not "$site/p/$project"
-#                 optionally with "$username" placeholder
-
-die() {
-	echo 1>&2 "$@" ; exit 1
-}
-
-# Make sure we are inside the repository.
-cd "${BASH_SOURCE%/*}" &&
-
-# Load the project configuration.
-site=$(git config -f config --get gerrit.site) &&
-project=$(git config -f config --get gerrit.project) &&
-remote=$(git config -f config --get gerrit.remote ||
-	 echo "gerrit") &&
-fetchurl_=$(git config -f config --get gerrit.url ||
-	    echo "$site/p/$project") &&
-pushurl_=$(git config -f config --get gerrit.pushurl ||
-	   git config -f config --get gerrit.url) ||
-die 'This project is not configured to use Gerrit.'
-
-# Get current gerrit push URL.
-pushurl=$(git config --get remote."$remote".pushurl ||
-	  git config --get remote."$remote".url || echo '') &&
-
-# Tell user about current configuration.
-if test -n "$pushurl"; then
-	echo 'Remote "'"$remote"'" is currently configured to push to
-
-  '"$pushurl"'
-' &&
-	read -ep 'Reconfigure Gerrit? [y/N]: ' ans &&
-	if [ "$ans" == "y" ] || [ "$ans" == "Y" ]; then
-		setup=1
-	else
-		setup=''
-	fi
-else
-	echo 'Remote "'"$remote"'" is not yet configured.
-
-'"$project"' changes must be pushed to our Gerrit Code Review site:
-
-  '"$site/p/$project"'
-
-Register a Gerrit account and select a username (used below).
-You will need an OpenID:
-
-  http://openid.net/get-an-openid/
-' &&
-	read -ep 'Configure Gerrit? [Y/n]: ' ans &&
-	if [ "$ans" == "n" ] || [ "$ans" == "N" ]; then
-		exit 0
-	else
-		setup=1
-	fi
-fi &&
-
-# Perform setup if necessary.
-if test -n "$setup"; then
-	echo 'Sign-in to Gerrit to get/set your username at
-
-  '"$site"'/#/settings
-
-Add your SSH public keys at
-
-  '"$site"'/#/settings/ssh-keys
-' &&
-	read -ep "Gerrit username? [$USER]: " gu &&
-	if test -z "$gu"; then
-		gu="$USER"
-	fi &&
-	fetchurl="${fetchurl_/\$username/$gu}" &&
-	if test -z "$pushurl"; then
-		git remote add "$remote" "$fetchurl"
-	else
-		git config remote."$remote".url "$fetchurl"
-	fi &&
-	pushurl="${pushurl_/\$username/$gu}" &&
-	if test "$pushurl" != "$fetchurl"; then
-		git config remote."$remote".pushurl "$pushurl"
-	fi &&
-	echo 'Remote "'"$remote"'" is now configured to push to
-
-  '"$pushurl"'
-'
-fi &&
-
-# Optionally test Gerrit access.
-if test -n "$pushurl"; then
-	read -ep 'Test access to Gerrit (SSH)? [y/N]: ' ans &&
-	if [ "$ans" == "y" ] || [ "$ans" == "Y" ]; then
-		echo -n 'Testing Gerrit access by SSH...'
-		if git ls-remote --heads "$pushurl" >/dev/null; then
-			echo 'passed.'
-		else
-			echo 'failed.' &&
-			die 'Could not access Gerrit.  Add your SSH public keys at
-
-  '"$site"'/#/settings/ssh-keys
-'
-		fi
-	fi
-fi &&
-
-# Set up GerritId hook.
-hook=$(git config --get hooks.GerritId || echo '') &&
-if test -z "$hook"; then
-	echo '
-Enabling GerritId hook to add a "Change-Id" footer to commit
-messages for interaction with Gerrit.  Run
-
-  git config hooks.GerritId false
-
-to disable this feature (but you will be on your own).' &&
-	git config hooks.GerritId true
-else
-	echo 'GerritId hook already configured to "'"$hook"'".'
-fi
diff --git a/scripts/git_setup/setup-hooks b/scripts/git_setup/setup-hooks
deleted file mode 100755
index c07985ae5..000000000
--- a/scripts/git_setup/setup-hooks
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env bash
-#=============================================================================
-# Copyright 2010-2012 Kitware, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#=============================================================================
-
-# Run this script to set up local Git hooks for this project.
-
-# Project configuration instructions:
-#
-# - Publish a "hooks" branch in the project repository such that
-#   clones will have "refs/remotes/origin/hooks".
-#
-# - Populate adjacent "config" file with:
-#    hooks.url    = Repository URL publishing "hooks" branch
-#    hooks.branch = Repository branch instead of "hooks"
-
-egrep-q() {
-	egrep "$@" >/dev/null 2>/dev/null
-}
-
-die() {
-	echo 1>&2 "$@" ; exit 1
-}
-
-# Make sure we are inside the repository.
-cd "${BASH_SOURCE%/*}" &&
-
-# Select a hooks branch.
-if url=$(git config --get hooks.url); then
-	# Fetch hooks from locally configured repository.
-	branch=$(git config hooks.branch || echo hooks)
-elif git for-each-ref refs/remotes/origin/hooks 2>/dev/null |
-     egrep-q 'refs/remotes/origin/hooks$'; then
-	# Use hooks cloned from origin.
-	url=.. && branch=remotes/origin/hooks
-elif url=$(git config -f config --get hooks.url); then
-	# Fetch hooks from project-configured repository.
-	branch=$(git config -f config hooks.branch || echo hooks)
-else
-	die 'This project is not configured to install local hooks.'
-fi &&
-
-# Populate ".git/hooks".
-echo 'Setting up git hooks...' &&
-git_dir=$(git rev-parse --git-dir) &&
-cd "$git_dir/hooks" &&
-if ! test -e .git; then
-	git init -q || die 'Could not run git init for hooks.'
-fi &&
-git fetch -q "$url" "$branch" &&
-git reset -q --hard FETCH_HEAD || die 'Failed to install hooks'
diff --git a/scripts/git_setup/setup-ssh b/scripts/git_setup/setup-ssh
deleted file mode 100755
index 8920a5bd3..000000000
--- a/scripts/git_setup/setup-ssh
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/usr/bin/env bash
-#=============================================================================
-# Copyright 2010-2012 Kitware, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#=============================================================================
-
-# Run this script to set up ssh push access to the repository host.
-
-# Project configuration instructions:
-#
-# - Populate adjacent "config" file with:
-#    ssh.host = Repository host name
-#    ssh.user = Username on host, if not "git"
-#    ssh.key = Local ssh key name
-#    ssh.request-url = Web page URL to request ssh access
-
-egrep-q() {
-	egrep "$@" >/dev/null 2>/dev/null
-}
-
-die() {
-	echo 1>&2 "$@" ; exit 1
-}
-
-# Make sure we are inside the repository.
-cd "${BASH_SOURCE%/*}" &&
-
-# Load the project configuration.
-host=$(git config -f config --get ssh.host) &&
-user=$(git config -f config --get ssh.user || echo git) &&
-key=$(git config -f config --get ssh.key) &&
-request_url=$(git config -f config --get ssh.request-url) ||
-die 'This project is not configured for ssh push access.'
-
-# Check for existing configuration.
-if test -r ~/.ssh/config &&
-   egrep-q 'Host[= ]'"${host//\./\\.}" ~/.ssh/config; then
-	echo 'Host "'"$host"'" is already in ~/.ssh/config' &&
-	setup= &&
-	question='Test'
-else
-	echo 'Host "'"$host"'" not found in ~/.ssh/config' &&
-	setup=1 &&
-	question='Setup and test'
-fi &&
-
-# Ask the user whether to make changes.
-echo '' &&
-read -ep "${question} push access by ssh to $user@$host? [y/N]: " access &&
-if test "$access" != "y" -a "$access" != "Y"; then
-	exit 0
-fi &&
-
-# Setup host configuration if necessary.
-if test -n "$setup"; then
-	if ! test -d ~/.ssh; then
-		mkdir -p ~/.ssh &&
-		chmod 700 ~/.ssh
-	fi &&
-	if ! test -f ~/.ssh/config; then
-		touch ~/.ssh/config &&
-		chmod 600 ~/.ssh/config
-	fi &&
-	ssh_config='Host='"$host"'
-  IdentityFile ~/.ssh/'"$key" &&
-	echo "Adding to ~/.ssh/config:
-
-$ssh_config
-" &&
-	echo "$ssh_config" >> ~/.ssh/config &&
-	if ! test -e ~/.ssh/"$key"; then
-		if test -f ~/.ssh/id_rsa; then
-			# Take care of the common case.
-			ln -s id_rsa ~/.ssh/"$key"
-			echo '
-Assuming ~/.ssh/id_rsa is the private key corresponding to the public key for
-
-  '"$user@$host"'
-
-If this is incorrect place private key at "~/.ssh/'"$key"'".'
-		else
-			echo '
-Place the private key corresponding to the public key registered for
-
-  '"$user@$host"'
-
-at "~/.ssh/'"$key"'".'
-		fi
-		read -e -n 1 -p 'Press any key to continue...'
-	fi
-fi || exit 1
-
-# Test access configuration.
-echo 'Testing ssh push access to "'"$user@$host"'"...' &&
-if ! ssh "$user@$host" info; then
-	die 'No ssh push access to "'"$user@$host"'".  You may need to request access at
-
-  '"$request_url"'
-'
-fi
diff --git a/scripts/git_setup/setup-stage b/scripts/git_setup/setup-stage
deleted file mode 100755
index ce6ec4574..000000000
--- a/scripts/git_setup/setup-stage
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env bash
-#=============================================================================
-# Copyright 2010-2012 Kitware, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#=============================================================================
-
-# Run this script to set up the topic stage for pushing changes.
-
-# Project configuration instructions:
-#
-# - Run a Topic Stage repository next to the main project repository.
-#
-# - Populate adjacent "config" file with:
-#    stage.url = Topic Stage repository URL
-#    stage.pushurl = Topic Stage push URL if not "$url"
-
-egrep-q() {
-	egrep "$@" >/dev/null 2>/dev/null
-}
-
-die() {
-	echo 1>&2 "$@" ; exit 1
-}
-
-# Make sure we are inside the repository.
-cd "${BASH_SOURCE%/*}" &&
-
-# Load the project configuration.
-fetchurl_=$(git config -f config --get stage.url) &&
-pushurl_=$(git config -f config --get stage.pushurl || echo "$fetchurl_") &&
-remote=$(git config -f config --get stage.remote || echo 'stage') ||
-die 'This project is not configured to use a topic stage.'
-
-# Get current stage push URL.
-pushurl=$(git config --get remote."$remote".pushurl ||
-	  git config --get remote."$remote".url || echo '') &&
-
-# Tell user about current configuration.
-if test -n "$pushurl"; then
-	echo 'Remote "'"$remote"'" is currently configured to push to
-
-  '"$pushurl"'
-' &&
-	read -ep 'Reconfigure Topic Stage? [y/N]: ' ans &&
-	if [ "$ans" == "y" ] || [ "$ans" == "Y" ]; then
-		setup=1
-	else
-		setup=''
-	fi
-else
-	setup=1
-fi
-
-# Perform setup if necessary.
-if test -n "$setup"; then
-	echo 'Setting up the topic stage...' &&
-	fetchurl="${fetchurl_}" &&
-	if test -z "$pushurl"; then
-		git remote add "$remote" "$fetchurl"
-	else
-		git config remote."$remote".url "$fetchurl"
-	fi &&
-	pushurl="${pushurl_}" &&
-	if test "$pushurl" != "$fetchurl"; then
-		git config remote."$remote".pushurl "$pushurl"
-	fi &&
-	echo 'Remote "'"$remote"'" is now configured to push to
-
-  '"$pushurl"'
-'
-fi || die 'Could not configure the topic stage remote.'
diff --git a/scripts/git_setup/setup-user b/scripts/git_setup/setup-user
deleted file mode 100755
index 1af439c45..000000000
--- a/scripts/git_setup/setup-user
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-#=============================================================================
-# Copyright 2010-2012 Kitware, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#=============================================================================
-
-# Run this script to configure Git user info in this repository.
-
-# Project configuration instructions: NONE
-
-for (( ; ; )); do
-	user_name=$(git config user.name || echo '') &&
-	user_email=$(git config user.email || echo '') &&
-	if test -n "$user_name" -a -n "$user_email"; then
-		echo 'Your commits will record as Author:
-
-  '"$user_name <$user_email>"'
-' &&
-		read -ep 'Is the author name and email address above correct? [Y/n] ' correct &&
-		if test "$correct" != "n" -a "$correct" != "N"; then
-			break
-		fi
-	fi &&
-	read -ep 'Enter your full name e.g. "John Doe": ' name &&
-	read -ep 'Enter your email address e.g. "john@gmail.com": ' email &&
-	git config user.name "$name" &&
-	git config user.email "$email"
-done
diff --git a/scripts/git_setup/setup_aliases.sh b/scripts/git_setup/setup_aliases.sh
deleted file mode 100755
index 977170816..000000000
--- a/scripts/git_setup/setup_aliases.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-echo "Setting up useful Git aliases..." &&
-
-# General aliases that could be global
-git config alias.prepush 'log --graph --stat origin/master..' &&
-
-true
diff --git a/scripts/git_setup/tips b/scripts/git_setup/tips
deleted file mode 100755
index 784e1ed89..000000000
--- a/scripts/git_setup/tips
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-#=============================================================================
-# Copyright 2010-2012 Kitware, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#=============================================================================
-
-# This script makes optional suggestions for working with Git.
-
-# Project configuration instructions: NONE
-
-egrep-q() {
-	egrep "$@" >/dev/null 2>/dev/null
-}
-
-# Suggest color configuration.
-if test -z "$(git config --get color.ui)"; then
-	echo '
-One may enable color output from Git commands with
-
-  git config --global color.ui auto
-'
-fi
-
-# Suggest bash completion.
-if ! bash -i -c 'echo $PS1' | egrep-q '__git_ps1'; then
-	echo '
-A dynamic, informative Git shell prompt can be obtained by sourcing
-the git bash-completion script in your "~/.bashrc".  Set the PS1
-environmental variable as suggested in the comments at the top of the
-bash-completion script.  You may need to install the bash-completion
-package from your distribution to obtain it.
-'
-fi
-
-# Suggest merge tool.
-if test -z "$(git config --get merge.tool)"; then
-	echo '
-One may configure Git to load a merge tool with
-
-  git config merge.tool <toolname>
-
-See "git help mergetool" for more information.
-'
-fi
diff --git a/scripts/last_update_time.py b/scripts/last_update_time.py
deleted file mode 100644
index a0bd0aed4..000000000
--- a/scripts/last_update_time.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import os
-
-ln=os.popen('p4 changes -m 1 //depot/main/...').readlines()
-
-
-for l in ln:
-    sp=l.split()
-    date='_'.join(sp[3].split('/'))
-    date=sp[3]
-    print 'Last change on:',date, 'for more info run: p4 changes -m 1 //depot/main/...'
-    
-    
diff --git a/scripts/nightly.sh b/scripts/nightly.sh
deleted file mode 100755
index 29e23fa35..000000000
--- a/scripts/nightly.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-
-
-## script to build automatically (UV-)CDAT
-
-INSTALL_PATH=$1
-GIT_BRANCH=$2
-GIT_PATH=$3
-QMAKE_EXE=$4
-XTRA_ARGS=$5
-
-here=`pwd`
-
-: ${INSTALL_PATH:="/lgm/uvcdat/nightly"}
-: ${GIT_BRANCH:="next"}
-: ${GIT_PATH:="/git/uv-cdat"}
-: ${QMAKE_EXE:="/usr/bin/qmake"}
-#: ${XTRA_ARGS:="-DCDAT_USE_LIBXML2=ON -DCDAT_USE_SYSTEM_PNG=ON"}
-
-echo "XTRA_ARGS:"${XTRA_ARGS}
-
-cd ${GIT_PATH} ; \
-git checkout ${GIT_BRANCH} ; \
-git pull ; \
-/bin/rm -rf ${INSTALL_PATH} ; \
-cd ${here} ; \
-rm -rf build_nightly ;\ 
-mkdir build_nightly ;\
-cd build_nightly ;\
-cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_PATH} -DQT_QMAKE_EXECUTABLE=${QMAKE_EXE} ${XTRA_ARGS} ${GIT_PATH} ; \
-cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_PATH} -DQT_QMAKE_EXECUTABLE=${QMAKE_EXE} ${XTRA_ARGS} ${GIT_PATH} ; \
-pwd ; \
-make -j16 ; \
-
-
diff --git a/scripts/setup_for_development.sh b/scripts/setup_for_development.sh
deleted file mode 100755
index 190f39a81..000000000
--- a/scripts/setup_for_development.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-cd "${BASH_SOURCE%/*}/.." &&
-scripts/git_setup/setup-user && echo &&
-scripts/git_setup/setup-hooks && echo &&
-scripts/git_setup/setup_aliases.sh && echo &&
-scripts/git_setup/tips
-
-# Rebase master by default
-git config branch.master.rebase true
-
-# Configure remote push URL.
-if url="$(git config --get remote.origin.url)" &&
-   echo "$url" | egrep -q '^(https?|git)://github.com/UV-CDAT/uvcdat(\.git)?$' &&
-   ! pushurl="$(git config --get remote.origin.pushurl)"; then
-  pushurl='git@github.com:UV-CDAT/uvcdat.git'
-  echo 'Setting origin pushurl to '"$pushurl"
-  git config remote.origin.pushurl "$pushurl"
-fi
diff --git a/scripts/tarballit.sh b/scripts/tarballit.sh
deleted file mode 100755
index 1217260c6..000000000
--- a/scripts/tarballit.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env sh
-
-svn export http://www-pcmdi.llnl.gov/svn/repository/cdat/trunk $1
-tar czvf $1-everything.tar.gz  $1
-tar czvf $1-cdat.tar.gz --exclude $1/pysrc* --exclude $1/exsrc*  $1
-tar czvf $1-pysrc.tar.gz $1/pysrc
-tar czvf $1-exsrc.tar.gz $1/exsrc
diff --git a/tests/cdat/test_cdat.py b/tests/cdat/test_cdat.py
deleted file mode 100644
index 3c87d0c0b..000000000
--- a/tests/cdat/test_cdat.py
+++ /dev/null
@@ -1,500 +0,0 @@
-#!/usr/bin/env python
-version='%prog 1.0'
-usage = "usage: %prog [options] PACKAGE1, PACKAGE2, CONTRIB1, CONTRIB2, ..."
-import subprocess,os,sys
-import optparse
-import time
-import bz2,ftplib
-ftp_site = "climate.llnl.gov"
-ftp_dir = "Shadow"
-ftp_user = "cdat"
-ftp_password = "Changeme1"
-
-import cdat_info
-default_time_format = "%Y-%m-%d %H:%M:%S"
-
-def get_shadow_name(test_dir,test):
-    fnm = os.path.join(test_dir,test)[:-3]+'.shadow.bz2'
-    path = list(os.path.split(fnm))
-    while path[0]!='':
-        tmp = os.path.split(path.pop(0))
-        path.insert(0,tmp[1])
-        path.insert(0,tmp[0])
-    fnm2 = '.'.join(path[1:])
-    return fnm,fnm2
-
-def get_shadow_ftp(test_dir,test):
-    fnm,ftpnm = get_shadow_name(test_dir,test)
-    f = open(fnm,"w")
-    try:
-        ftp=ftplib.FTP(ftp_site)
-        ftp.login(ftp_user,ftp_password)
-        ftp.cwd(ftp_dir)
-        ftp.retrbinary('RETR %s' % ftpnm, f.write)
-        ftp.close()
-        f.close()
-        f = open(fnm)
-        s=f.read()
-        f.close()
-        s = bz2.decompress(s)
-        f = open(fnm[:-4],"w") # open w/o bz2 ext
-        f.write(s)
-        f.close()
-        os.remove(fnm)
-    except Exception,err:
-        f.close()
-        os.remove(fnm)
-        pass
-    
-
-def get_shadow_local(test_dir,test):
-    fnm = os.path.join(test_dir,test)[:-3]+'.shadow'
-    if os.path.exists(fnm):
-        f=open(fnm,"r")
-        s=f.read()
-        f.close()
-        shadow_dict=eval(s)
-    else:
-        shadow_dict={}
-    return shadow_dict
-
-def get_shadow(test_dir,test):
-    # first try from ftp
-    get_shadow_ftp(test_dir,test)
-    return get_shadow_local(test_dir,test)
-
-def set_shadow_local(test_dir,test,dict):
-    try:
-        fnm = os.path.join(test_dir,test)[:-3]+'.shadow'
-        os.remove(fnm)
-    except:
-        pass
-    try:
-        fnm = os.path.join(test_dir,test)[:-3]+'.shadow.bz2'
-        f=open(fnm,"w")
-        s= bz2.compress(repr(dict))
-        print >> f, s
-        f.close()
-    except Exception,err:
-        pass
-    return
-
-def put_shadow_ftp(test_dir,test):
-    fnm,ftpnm = get_shadow_name(test_dir,test)
-    try:
-        ftp=ftplib.FTP(ftp_site)
-        ftp.login(ftp_user,ftp_password)
-        ftp.cwd(ftp_dir)
-        f=open(fnm)
-        ftp.storbinary('STOR %s' % ftpnm, f)
-        ftp.close()
-        os.remove(fnm)
-    except Exception,err:
-        print 'Error putting ftp bz2',err
-        pass
-        
-def set_shadow(test_dir,test,dict):
-    set_shadow_local(test_dir,test,dict)
-    if int(o.upload)>0:
-        put_shadow_ftp(test_dir,test)
-    return
-
-def make_tests_string_machine(machine,dict):
-    details=""
-    details = "\t\t\tlast successful run: %s" % dict.get("last","never")
-    if dict.has_key("time"):
-        details+="\n\t\t\tduration (min,avg,max) %i, %i, %i seconds" % (dict["fastest"],dict["time"],dict["slowest"])
-    if dict.has_key("count") and o.verbose>1:
-        details+='\n\t\t\tSuccesfully tested %i times on at least : %i independent machines' % (dict["count"],len(dict["machines"]))
-    return details
-
-def make_tests_string(dict_all):
-    details=""
-    for os in dict_all.keys():
-        details += "\n\t\tOS: %s" % os
-        dict_os = dict_all[os]
-        for v in dict_os.keys():
-            details += "\n\t\t  Version: %s" % v
-            dict_system = dict_os[v]
-            for m in dict_system.keys():
-                details += "\n\t\t   Machine: %s" % m
-                dict=dict_system[m]
-                details+='\n'+make_tests_string_machine(m,dict)
-    return details
-
-def run_dir(test_dir,lst):
-    lst.sort()
-    passed=True
-    output={}
-    for test in lst:
-        if test[-3:]=='.py' and (test.lower()[:4]=='test' or test.lower()[:6]=='cdtest'):
-            Dict_all = get_shadow(test_dir,test)
-            if o.query_mode:
-                output[(test_dir,test)]=Dict_all
-                try:
-                    fnm = os.path.join(test_dir,test)[:-3]+'.shadow'
-                    os.remove(fnm)
-                except:
-                    pass
-                continue
-            myversion = ".".join(map(str,cdat_info.version()))
-            dict_all = Dict_all.get(myversion,{})
-            myos = os.uname()[0]
-            system = os.uname()[2]
-            machine = os.uname()[4]
-            dict_os = dict_all.get(myos,{})
-            dict_system = dict_os.get(system,{})
-            dict = dict_system.get(machine,{})
-            dict_system[machine] = dict
-            dict_os[system] = dict_system
-            dict_all[myos] = dict_os
-            details = ""
-            last = dict.get("last","1980-01-01 00:00:00") # ok ever ago!
-            format = dict.get("format",default_time_format)
-            tlast = time.strptime(last,format)
-            delta = time.mktime(tlast)-time.mktime(time.strptime(o.date,o.format))
-            if delta>0:
-                if o.verbose>0:
-                    print "\tRunning: %s" % (test)
-                    print "\t\tSuccessful run newer than threshold %s vs %s " % (last,o.date)
-                continue
-            if o.verbose>0:
-                print "\tRunning: %s" % (test)
-                if o.verbose<3 or dict_all.keys()==[]:
-                    details=make_tests_string_machine(machine,dict)
-                else:
-                    details+=make_tests_string(dict_all)
-                print details
-            t = time.time()
-            out,err= run_test(os.path.join(test_dir,test))
-            err2 = []
-            for l in err:
-                if l.find("Warning")>-1:
-                    pass
-                else:
-                    err2.append(l)
-            err=err2
-            t2 = time.time()
-            if err!=[]:
-                passed = False
-            if o.verbose>1:
-                for l in out:
-                    st='\t\t%s' % l.strip()
-                    print st
-            if o.verbose>0:
-                if err!=[]:
-                    print '\t        FAILED\n\n',err
-                    if o.verbose>1:
-                        for l in err:
-                            st='\t\t%s' % l.strip()
-                            print st
-                else:
-                    print '\t        PASSED\n\n'
-                    runtime = int(t2-t)+1
-                    fastest = dict.get("fastest",runtime+1)
-                    if fastest>runtime:
-                        fastest = runtime
-                    dict["fastest"]=fastest
-                    slowest = dict.get("slowest",runtime-1)
-                    if slowest<runtime:
-                        slowest = runtime
-                    dict["slowest"]=slowest
-                    dict["format"]=default_time_format
-                    dict["last"] = time.strftime(default_time_format,time.localtime())
-                    count=dict.get("count",0)
-                    count+=1
-                    dict["count"]=count
-                    avg = dict.get("time",0.)*(count-1)
-                    avg+=runtime
-                    avg/=count
-                    dict["time"] = avg
-                    machines = dict.get("machines",[])
-                    if int(o.upload)>1:
-                        mymachine = os.uname()[1]
-                    else:
-                        mymachine = "private"
-                    if not mymachine in machines:
-                        machines.append(mymachine)
-                        dict["machines"] = machines
-                        
-                    dict_system[machine] = dict
-                    dict_os[system] = dict_system
-                    dict_all[myos] = dict_os
-                    Dict_all[myversion] = dict_all
-                    output[(test_dir,test)]=dict
-                    if out==[] or str(out[-1]).lower().find('skipped')==-1:
-                        # ok the test havent been skipped
-                        # we can replace stat file
-                        set_shadow(test_dir,test,Dict_all)
-                    
-            if o.skip is False and passed is False:
-                sys.exit()
-    return output
-
-def run_test(test):
-    wd, test = os.path.split(test)
-    cmd = 'cd %s ; %s %s' % (wd, sys.executable, test)
-    if o.full_testing:
-        cmd+=' --full --extended'
-    if o.extended_testing:
-        cmd += ' --extended'
-    #print cmd
-    P=subprocess.Popen(cmd,stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True,shell=True)
-    
-    out = P.stdout.readlines()
-    err = P.stderr.readlines()
-    rmv =[]
-    for l in err:
-        for e in o.error_strings:
-            if l.find(e)>-1:
-                rmv.append(l)
-                break
-    for l in rmv:
-        err.remove(l)
-        
-    return out,err
-
-format = default_time_format
-date = time.strftime(format,time.localtime()) # Now!
-
-p=optparse.OptionParser(version=version,usage=usage)
-
-time_format_help_string = """format for time, default: %default                             
-Format can be constructed from the following keys:                        
-%a 	Locale's abbreviated weekday name.               
-%A 	Locale's full weekday name. 	              
-%b 	Locale's abbreviated month name.               
-%B 	Locale's full month name. 	                 
-%c 	Locale's appropriate date and time representation.                                      
-%d 	Day of the month as a decimal number [01,31]. 	
-%H 	Hour (24-hour clock) as a decimal number [00,23].                                            	
-%I 	Hour (12-hour clock) as a decimal number [01,12].                                                      	
-%j 	Day of the year as a decimal number [001,366]. 	                                             
-%m 	Month as a decimal number [01,12]. 	                 
-%M 	Minute as a decimal number [00,59]. 	                 
-%p 	Locale's equivalent of either AM or PM.        
-%S 	Second as a decimal number [00,61]. 	          
-%U 	Week number of the year (Sunday as the first day of the week) as a decimal number [00,53]. All days in a new year preceding the first Sunday are considered to be in week 0. 	                      
-%w 	Weekday as a decimal number [0(Sunday),6].                             	
-%W 	Week number of the year (Monday as the first day of the week) as a decimal number [00,53]. All days in a new year preceding the first Monday are considered to be in week 0.                                           
-%x 	Locale's appropriate date representation. 	         
-%X 	Locale's appropriate time representation. 	            
-%y 	Year without century as a decimal number [00,99].                        	              
-%Y 	Year with century as a decimal number. 	              
-%Z 	Time zone name (no characters if no time zone exists).                                               	
-%% 	A literal "%" character.                   
-"""
-
-## Adds options to test utility
-p.add_option("-a","--all","-A","--ALL",dest="all",help="Run test for ALL Packages and contributed Packages",action="store_true",default=False)
-p.add_option("-P","--packages",dest="all_packages",help="Run test on all packages",action="store_true",default=False)
-p.add_option("-C","--contribs",dest="all_contrib",help="Run test on all contributed packages",action="store_true",default=False)
-p.add_option("-p","--package",dest="Packages",metavar="PACKAGE",help="Run test on this package",action="append",type="string",default=[])
-p.add_option("-c","--contrib","--contributed",dest="Contribs",metavar="CONTRIBUTED",help="Run test on this contributed package",action="append",type="string",default=[])
-p.add_option("-s","--stop","--noerror",dest="skip",help="Stop on errors (default: %default)",action="store_false",default=False)
-p.add_option("-S","--nostop","--skip",dest="skip",help="Do not stop on errors",action="store_true",default=False)
-p.add_option("-v","--verbose",metavar="LEVEL",dest="verbose",help="Level of verbosity (0, 1, 2 or 3), default is %default",type="choice",default="1",choices=("0","1","2","3"))
-p.add_option("-u","--upload",metavar="LEVEL",dest="upload",help="Level of upload privacy (0, 1, or 2), 0 no data uploaded, 1 no private data uploaded, 2 uploads hostname, default is %default",type="choice",default="2",choices=("0","1","2"))
-p.add_option("-e","--okerror",metavar="ERROR STRING",dest="error_strings",help="Identify 'none' error merror messages (removes lines in error messages containing this)",default=["ppmtogif","pnmcolormap","pnmremap","ppmtogif","ppmquant","pnmcrop","Definition of","DeprecationWarning","self.nxo"],action="append",type="string")
-p.add_option("-d","--date",dest="date",type="string",help="Will run a test if last successfull time is older than 'date', default is now: %default                                      See --timeformat option for date format",default=date)
-p.add_option("-f","--timeformat",dest="format",type="string",help=time_format_help_string,default=default_time_format)
-p.add_option("-q","--query_mode",dest="query_mode",help="Runs a query of successfully run test only, does not execute anything",action="store_true",default=False)
-p.add_option("-F","--full",dest="full_testing",help="Full testing (more detailed testing) default is %default",default=False,action="store_true")
-
-
-# short test is default -jd082007
-p.add_option("-E","--extended",dest="extended_testing",help="Extended testing (runs testing completely) default is %default",default=False,action="store_true")
-
-
-(o,args) = p.parse_args()
-
-if int(o.upload)==2 and o.query_mode is False:
-    print 'Your upload level is set to 2\nThis means CDAT will recover your machine\'s name (only when running the test suite).\nTo turn this off use option: --upload=1 (no private data uploaded) or 0 (no data uploaded at all)'
-    print "Your machine's name (%s) will be stored for statistical purposes only" % os.uname()[1]
-    cont = raw_input("Do you wish to continue? (y/n) [y]")
-    if not cont.lower() in ['','y','yes']:
-        sys.exit()
-try:
-    time.strptime(o.date,o.format)
-except:
-    p.error('date must be in format: "%s", or specify format on command line (use --help)' % o.format)
-# Handles case where nothing is passed!
-if not (o.all_packages or o.all_contrib or o.all) and o.Packages==[] and o.Contribs==[] and args==[]:
-    (o,args) = p.parse_args(["-h"])
-
-if o.all:
-    o.all_packages=True
-    o.all_contrib=True
-
-# Append all the Packages
-packages=[]
-pckgs = os.listdir("Packages")
-pckgs.sort()
-for pk in pckgs:
-    if pk in ['cmor','cdms','regrid','Properties']:
-        continue
-    if os.path.isdir(os.path.join("Packages",pk)):
-        lst=[]
-        try:
-            dr = os.path.join("Packages",pk,"Test")
-            lst = os.listdir(os.path.join("Packages",pk,"Test"))
-        except:
-            pass
-        try:
-            lst = os.listdir(os.path.join("Packages",pk,"test"))
-        except:
-            pass
-        if lst!=[]:
-            packages.append(pk)
-            
-if o.all_packages:
-    for pk in packages:
-        if not pk in o.Packages:
-            o.Packages.append(pk)
-            
-contribs=o.Contribs
-if contribs==[]:
-    pckgs = os.listdir("contrib")
-    pckgs.sort()
-    for pk in pckgs:
-        if pk in ['spanlib']:
-            try:
-                import spanlib
-            except:
-                continue
-        if os.path.isdir(os.path.join("contrib",pk)):
-            lst=[]
-            try:
-                lst = os.listdir(os.path.join("contrib",pk,"Test"))
-            except:
-                pass
-            try:
-                lst = os.listdir(os.path.join("contrib",pk,"test"))
-            except:
-                pass
-            if lst!=[] and pk not in o.Contribs:
-                # first try to see if contrib has been built
-                contribs.append(pk)
-            
-if o.all_contrib:
-    for pk in contribs:
-        if pk not in o.Contribs:
-            o.Contribs.append(pk)
-
-#Now adds the extra arguments
-for pk in args:
-    ok=False
-    if pk in packages:
-        ok = True
-        if not pk in o.Packages:
-            o.Packages.append(pk)
-    if pk in contribs:
-        ok = True
-        if not pk in o.Contribs:
-            o.Contribs.append(pk)
-    if not ok:
-        if o.skip:
-            print 'Will skip Package:',pk
-        else:
-            print "Package %s does not exists or has not test suite" % pk
-            print 'type "%s --help" for help and usage' % sys.argv[0]
-            sys.exit()
-            
-        
-# Ok now runs the test to see if packages are good
-skipped=[]
-for pk in o.Packages:
-    if not pk in packages:
-        if o.skip:
-            print 'Will skip Package:',pk
-            skipped.append(pk)
-        else:
-            print "Package %s does not exists or has no test suite" % pk
-            print 'type "%s --help" for help and usage' % sys.argv[0]
-            sys.exit()
-for pk in skipped:
-    o.Packages.remove(pk)
-# Ok now runs the test to see if contribs are good
-skipped=[]
-for pk in o.Contribs:
-    if not pk in contribs:
-        if o.skip:
-            print 'Will skip Contributed Package:',pk
-            skipped.append(pk)            
-        else:
-            print "Contributed Package %s does not exists or has not test suite" % pk
-            print 'type "%s --help" for help and usage' % sys.argv[0]
-            print 'valid contributed packages: %s' % ' '.join(contribs)
-            sys.exit()
-for pk in skipped:
-    o.Contribs.remove(pk)
-o.verbose=int(o.verbose)
-results ={}
-for pk in o.Packages:
-    print "Running Test on Official Package: %s" % pk
-    test_dir = os.path.join("Packages",pk,"Test")
-    try:
-        lst = os.listdir(test_dir)
-    except:
-        test_dir = os.path.join("Packages",pk,"test")
-        lst = os.listdir(test_dir)
-    tmp = run_dir(test_dir,lst)
-    for k in tmp.keys():
-        results[k]=tmp[k]
-for pk in o.Contribs:
-    print "Running Test on Contributed Package: %s" % pk
-    test_dir = os.path.join("contrib",pk,"Test")
-    try:
-        lst = os.listdir(test_dir)
-    except:
-        test_dir = os.path.join("contrib",pk,"test")
-        lst = os.listdir(test_dir)
-    tmp = run_dir(test_dir,lst)
-    for k in tmp.keys():
-        results[k]=tmp[k]
-
-
-
-import cdat_info
-Packages=[]
-OS=[]
-Versions=[]
-Machines=[]
-CDATVersions=[]
-#code to display nicely all the results
-if o.query_mode:
-    for test in results.keys():
-        pnm =test[0]
-        if not pnm in Packages:
-            Packages.append(pnm)
-        CDATVersions=results[test]
-        oses = CDATVersions.get(str(cdat_info.version()),{})
-        for aos in oses.keys():
-            if not aos in OS:
-                OS.append(aos)
-            versions = oses[aos]
-            for v in versions.keys():
-                syst = versions[v]
-                for asys in syst:
-                    full = "%s_%s_%s" % (aos,v,asys)
-                    if not full in Versions:
-                        Versions.append(full)
-                    res = syst[asys]
-                    machines = res["machines"]
-                    for m in machines:
-                        if not m in Machines:
-                            Machines.append(m)
-    print 'Your version:',cdat_info.version()
-    print 'Total Test:',len(results.keys())
-    print 'Total Packages:',len(Packages)
-    print 'Total OS:',len(OS),'---',', '.join(OS)
-    print 'Total OS Versions:',len(Versions)
-    print 'Total Independent Machines:',len(Machines)
-## else:
-##     for test_dir,test in results.keys():
-##          print '\n\n'
-##          fn = test_dir+test
-##          print fn,'--------------'
-##          tr = results[test_dir,test]
-##          for t in tr:
-##               print '\t',t,':  ' ,tr[t] 
diff --git a/tests/cdat/test_exsrc_ok.py b/tests/cdat/test_exsrc_ok.py
deleted file mode 100644
index 923dfc9d7..000000000
--- a/tests/cdat/test_exsrc_ok.py
+++ /dev/null
@@ -1,107 +0,0 @@
-""" Test external packages dependencies for CDAT
-Prints out Packages that need to be installed and why
-"""
-import sys,os
-
-## Test 1: Pyfort
-min_ver=8.5
-a=os.popen4(sys.prefix+'/bin/pyfort -V')[1].readlines()
-sp=a[0].split()
-if sp[0]!='Pyfort':
-    print 'Pyfort : Not Present in your python distribution'
-elif float(sp[1])<min_ver:
-    print 'Pyfort : Version '+str(min_ver)+' minimum is required, you have: '+sp[1]
-
-## Test 2: Numeric
-min_ver=23.1
-try:
-    import Numeric
-    if float(Numeric.__version__)<min_ver:
-        print 'Numeric : Version '+str(min_ver)+' minimum is required, you have: '+Numeric.__version__
-except:
-    print 'Numeric : Not Present in your python distribution'
-
-## Test 3: Pmw
-min_ver=1.2
-try:
-    import Pmw
-    if float(Pmw.version())<min_ver:
-        print 'Pmw : Version '+str(min_ver)+' minimum is required, you have: '+Pmw.version()
-except:
-    print 'Pmw : Not Present in your python distribution'
-
-## Test 4: gplot
-a=os.popen4('which gplot')[1].readlines()[0]
-if a.find('not found')>-1:
-    print 'gplot : Not present on your system'
-
-## Test 5: xgks
-if not os.path.exists(sys.prefix+'/lib/xgksfonts'):
-    print 'xgks : xgksfonts directory not present in your python distribution'
-
-## Test 6: gifsicle
-a=os.popen4('which gifsicle')[1].readlines()[0]
-if a.find('not found')>-1:
-    print 'gifsicle : Not present on your system'
-
-## Test 7: ghostscript and  fonts
-a=os.popen4('which gs')[1].readlines()[0]
-if a.find('not found')>-1:
-    print 'ghostscript : Not present on your system'
-else:
-    jpeg=0
-    png=0
-    a=os.popen4('gs -h')[1].readlines()
-    while a.pop(0).find('Available devices:')<0:
-        continue
-    for l in a:
-        s=l.strip().split()
-        if 'jpeg' in s:
-            jpeg=1
-        if 'png16' in s:
-            png=1
-            
-    font=0
-    a=os.popen4('gs -h')[1].readlines()
-    while a.pop(0).find('Search path:')<0:
-        continue
-    for l in a:
-        if l[0]==' ': # path lines starts with blank
-            s=l.strip().split(':')
-            for p in s:
-                #print os.listdir(p.strip())
-                if os.path.exists(p.strip()+'/n022003l.afm'):
-                    font=1
-        else:
-            break
-    if jpeg==0 and png==0 and font==0:
-        print 'ghostscript : no jpeg nor png support built, missing extra fonts'
-    elif jpeg==0 and png==0:
-        print 'ghostscript : no jpeg nor png support built'
-    elif jpeg==0:
-        print 'ghostscript : no jpeg support built'
-    elif png==0:
-        print 'ghostscript : no png support built'
-    elif font==0:
-        print 'ghostscript : extra fonts not installed'
-            
-## Test 8: Netpbm/pbmplus
-a=os.popen4('which ppmtogif')[1].readlines()[0]
-if a.find('not found')>-1:
-    if sys.platform in ['linux2','darwin','cygwin']:
-        print 'netpbm : Not present on your system'
-    else:
-        print 'pbmplus : Not present on your system'
-
-
-## Test 9: R libraries (not python module)
-a=os.popen4('which R')[1].readlines()[0]
-if a.find('not found')>-1:
-    print 'R : Not present on your system'
-
-## Test 10: VTK
-try:
-    import vtk
-except:
-       print 'VTK : Not present on your Python'
- 
diff --git a/tests/test_script b/tests/test_script
deleted file mode 100755
index 883bb3b5b..000000000
--- a/tests/test_script
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# usage: ./test_script [-v] [targetdir]
-# -v prevents run of vcdat
-#
-unset PYTHONPATH
-unset PYTHONHOME
-unset PYTHONSTARTUP
-if (test "$1" = "-v") then
-    vopt=0; shift;
-else
-    vopt=1
-fi
-if (test $# -eq 0) then 
-    p=`which python`; v=`which vcdat`
-else
-    here=`pwd`;
-    cd $1/bin;
-    pdir=`pwd`;
-    p=$pdir/python; v=$pdir/vcdat;
-    cd $here
-fi
-prefix=`${p} -c "import sys; print sys.exec_prefix"`
-echo "Testing $p"
-(cd Packages/cdms/Test; $p cdtest.py) 
-if (test $vopt -eq 1) then
-    echo "Testing $v";
-    $v
-fi
-echo "-------------------------------------------------------------------"
-echo "Tests completed."
-
diff --git a/uvcdatspt/scripts/MHTScreenshots.py b/uvcdatspt/scripts/MHTScreenshots.py
deleted file mode 100644
index 4396c6074..000000000
--- a/uvcdatspt/scripts/MHTScreenshots.py
+++ /dev/null
@@ -1,170 +0,0 @@
-try: paraview.simple
-except: from paraview.simple import *
-
-import sys
-import os
-import paraview
-
-if len(sys.argv) != 3:
-    print 'Usage: pvbatch --symmetric MHTScreenshots.py <output file name> "<input file names>"'
-    sys.exit(1)
-
-print 'input file names are: ', sys.argv[2]
-print 'output file name is: ', sys.argv[1]
-
-# trying to import the library where I can specify the global and subcontrollers
-try:
-    import libvtkParallelPython as vtkParallel # requires LD_LIBRARY_PATH being properly set
-except ImportError:
-    import vtkParallelPython as vtkParallel # for a static build, i.e. jaguarpf, use this instead and don't worry about LD_LIBRARY_PATH
-
-paraview.options.batch = True # this may not be necessary
-paraview.simple._DisableFirstRenderCameraReset()
-
-def CreateTimeCompartments(globalController, timeCompartmentSize):
-    if globalController.GetNumberOfProcesses() == 1:
-        print 'single process'
-        return
-    elif globalController.GetNumberOfProcesses() % timeCompartmentSize != 0:
-        print 'number of processes must be an integer multiple of time compartment size'
-        return
-    elif timeCompartmentSize == globalController.GetNumberOfProcesses():
-        return globalController
-
-    gid = globalController.GetLocalProcessId()
-    timeCompartmentGroupId = int (gid / timeCompartmentSize )
-    newController = globalController.PartitionController(timeCompartmentGroupId, gid % timeCompartmentSize)
-    # must unregister if the reference count is greater than 1
-    if newController.GetReferenceCount() > 1:
-        newController.UnRegister(None)
-
-    #print gid, timeCompartmentGroupId, gid % timeCompartmentSize
-    print gid, ' of global comm is ', newController.GetLocalProcessId()
-    globalController.SetGlobalController(newController)
-    return newController
-
-def CheckReader(reader):
-    if hasattr(reader, "FileName") == False:
-        print "ERROR: Don't know how to set file name for ", reader.SMProxy.GetXMLName()
-        sys.exit(-1)
-
-    if hasattr(reader, "TimestepValues") == False:
-        print "ERROR: ", reader.SMProxy.GetXMLName(), " doesn't have time information"
-        sys.exit(-1)
-
-def CreateControllers(timeCompartmentSize):
-    pm = paraview.servermanager.vtkProcessModule.GetProcessModule()
-    globalController = pm.GetGlobalController()
-    if timeCompartmentSize > globalController.GetNumberOfProcesses():
-        timeCompartmentSize = globalController.GetNumberOfProcesses()
-
-    temporalController = CreateTimeCompartments(globalController, timeCompartmentSize)
-    return globalController, temporalController, timeCompartmentSize
-
-currentTimeStep = -1
-def UpdateCurrentTimeStep(globalController, timeCompartmentSize):
-    global currentTimeStep
-    if currentTimeStep == -1:
-        currentTimeStep = globalController.GetLocalProcessId() / timeCompartmentSize
-        return currentTimeStep
-
-    numTimeStepsPerIteration = globalController.GetNumberOfProcesses() / timeCompartmentSize
-    currentTimeStep = currentTimeStep + numTimeStepsPerIteration
-    return currentTimeStep
-
-def WriteImages(currentTimeStep, currentTime, views):
-    for view in views:
-        filename = view.tpFileName.replace("%t", str(currentTimeStep))
-        view.ViewTime = currentTime
-        WriteImage(filename, view, Magnification=view.tpMagnification)
-
-def WriteFiles(currentTimeStep, currentTime, writers):
-    for writer in writers:
-        originalfilename = writer.FileName
-        fname = originalfilename.replace("%t", str(currentTimeStep))
-        writer.FileName = fname
-        writer.UpdatePipeline(currentTime)
-        writer.FileName = originalfilename
-
-def IterateOverTimeSteps(globalController, timeCompartmentSize, timeSteps, writers, views):
-    currentTimeStep = UpdateCurrentTimeStep(globalController, timeCompartmentSize)
-    while currentTimeStep < len(timeSteps):
-        print globalController.GetLocalProcessId(), " is working on ", currentTimeStep
-        WriteImages(currentTimeStep, timeSteps[currentTimeStep], views)
-        WriteFiles(currentTimeStep, timeSteps[currentTimeStep], writers)
-        currentTimeStep = UpdateCurrentTimeStep(globalController, timeCompartmentSize)
-
-def CreateReader(ctor, args, fileInfo):
-    "Creates a reader, checks if it can be used, and sets the filenames"
-    reader = ctor()
-    CheckReader(reader)
-    import glob
-    files = glob.glob(fileInfo)
-    files.sort() # assume there is a logical ordering of the filenames that corresponds to time ordering
-    reader.FileName = files
-    for a in args:
-        s = "reader."+a
-        exec (s)
-
-    return reader
-
-def CreateWriter(ctor, filename, tp_writers):
-    writer = ctor()
-    writer.FileName = filename
-    tp_writers.append(writer)
-    return writer
-
-def CreateView(proxy_ctor, filename, magnification, width, height, tp_views):
-    view = proxy_ctor()
-    view.add_attribute("tpFileName", filename)
-    view.add_attribute("tpMagnification", magnification)
-    tp_views.append(view)
-    view.ViewSize = [width, height]
-    return view
-
-tp_writers = []
-tp_views = []
-# ==================== end of specialized temporal parallelism sections ==================
-
-timeCompartmentSize = 8
-globalController, temporalController, timeCompartmentSize = CreateControllers(timeCompartmentSize)
-
-in_msf_moc = CreateReader( MHTFileSeriesReader, [], sys.argv[2] )
-timeSteps = GetActiveSource().TimestepValues if len(GetActiveSource().TimestepValues)!=0 else [0]
-
-XYChartView1 = CreateView( CreateXYPlotView, sys.argv[1], 1, 549, 583, tp_views )
-XYChartView1.ShowAxis = [1, 1, 0, 0]
-XYChartView1.ShowAxisGrid = [1, 1, 0, 0]
-XYChartView1.AxisLabelsBottom = []
-XYChartView1.LegendLocation = 1
-XYChartView1.AxisLabelsLeft = []
-XYChartView1.ViewTime = 0.0
-XYChartView1.ShowLegend = 1
-XYChartView1.AxisRange = [0.0, 1.0, 0.0, 1.0, 0.0, 1.0, 0.0, 1.0]
-XYChartView1.AxisTitleFont = ['Arial', '12', '1', '0', 'Arial', '12', '1', '0', 'Arial', '12', '1', '0', 'Arial', '12', '1', '0']
-XYChartView1.AxisLabelColor = [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
-XYChartView1.AxisTitleColor = [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.5, 0.0, 0.0, 0.5]
-XYChartView1.ChartTitleColor = [0.0, 0.0, 0.0]
-XYChartView1.ChartTitleAlignment = 1
-XYChartView1.AxisColor = [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
-XYChartView1.AxisLabelsTop = []
-XYChartView1.AxisLabelFont = ['Arial', '12', '0', '0', 'Arial', '12', '0', '0', 'Arial', '12', '0', '0', 'Arial', '12', '0', '0']
-XYChartView1.ShowAxisLabels = [1, 1, 1, 1]
-XYChartView1.AxisLabelNotation = [0, 0, 0, 0]
-XYChartView1.AxisLabelPrecision = [2, 2, 2, 2]
-XYChartView1.AxisGridColor = [0.95, 0.95, 0.95, 0.95, 0.95, 0.95, 0.95, 0.95, 0.95, 0.95, 0.95, 0.95]
-XYChartView1.ChartTitle = ''
-XYChartView1.AxisLabelsRight = []
-XYChartView1.AxisBehavior = [0, 0, 0, 0]
-XYChartView1.AxisTitle = ['', '', '', '']
-XYChartView1.ChartTitleFont = ['Arial', '14', '0', '0']
-XYChartView1.AxisLogScale = [0, 0, 0, 0]
-
-DataRepresentation1 = Show() #GetDisplayProperties(in_msf_moc)
-DataRepresentation1.XArrayName = 'reader_mht_global'
-DataRepresentation1.SeriesVisibility = ['vtkOriginalIndices', '0']
-DataRepresentation1.SeriesVisibility = ['reader_mht_global', '1']
-
-IterateOverTimeSteps(globalController, timeCompartmentSize, timeSteps, tp_writers, tp_views)
-
-print 'ending'
diff --git a/uvcdatspt/scripts/MHTTemporalStatistics.py b/uvcdatspt/scripts/MHTTemporalStatistics.py
deleted file mode 100644
index 18cfca03c..000000000
--- a/uvcdatspt/scripts/MHTTemporalStatistics.py
+++ /dev/null
@@ -1,26 +0,0 @@
-print 'starting'
-import sys
-from paraview.simple import *
-
-if len(sys.argv) < 3:
-    print 'Usage: pvbatch MHTTemporalStatistics.py <output file name> <input file names>'
-    sys.exit(1)
-
-paraview.simple._DisableFirstRenderCameraReset()
-reader = MHTFileSeriesReader()
-print 'input file names are: ', sys.argv[2:len(sys.argv)]
-print 'output file name is: ', sys.argv[1]
-reader.FileName = sys.argv[2:len(sys.argv)]
-
-MultiBlockTemporalStatistics1 = MultiBlockTemporalStatistics()
-MultiBlockTemporalStatistics1.TimeStepType = 0
-MultiBlockTemporalStatistics1.SamplingMethod = 1
-MultiBlockTemporalStatistics1.TimeSpan = 0
-MultiBlockTemporalStatistics1.TimeStepLength = 1
-MultiBlockTemporalStatistics1.TimeCompartmentSize = 8
-
-writer = XMLMultiBlockDataWriter()
-writer.FileName = sys.argv[1]
-writer.UpdatePipeline()
-
-print 'ending'
diff --git a/uvcdatspt/scripts/MOCScreenshots.py b/uvcdatspt/scripts/MOCScreenshots.py
deleted file mode 100644
index 1cb05ea8f..000000000
--- a/uvcdatspt/scripts/MOCScreenshots.py
+++ /dev/null
@@ -1,535 +0,0 @@
-
-try: paraview.simple
-except: from paraview.simple import *
-
-import sys
-import os
-import paraview
-
-if len(sys.argv) != 3:
-    print 'Usage: pvbatch --symmetric MOCScreenshots.py <output file name> "<input file names>"'
-    sys.exit(1)
-
-print 'input file names are: ', sys.argv[2]
-print 'output file name is: ', sys.argv[1]
-
-# trying to import the library where I can specify the global and subcontrollers
-try:
-    import libvtkParallelPython as vtkParallel # requires LD_LIBRARY_PATH being properly set
-except ImportError:
-    import vtkParallelPython as vtkParallel # for a static build, i.e. jaguarpf, use this instead and don't worry about LD_LIBRARY_PATH
-
-paraview.options.batch = True # this may not be necessary
-paraview.simple._DisableFirstRenderCameraReset()
-
-def CreateTimeCompartments(globalController, timeCompartmentSize):
-    if globalController.GetNumberOfProcesses() == 1:
-        print 'single process'
-        return
-    elif globalController.GetNumberOfProcesses() % timeCompartmentSize != 0:
-        print 'number of processes must be an integer multiple of time compartment size'
-        return
-    elif timeCompartmentSize == globalController.GetNumberOfProcesses():
-        return globalController
-
-    gid = globalController.GetLocalProcessId()
-    timeCompartmentGroupId = int (gid / timeCompartmentSize )
-    newController = globalController.PartitionController(timeCompartmentGroupId, gid % timeCompartmentSize)
-    # must unregister if the reference count is greater than 1
-    if newController.GetReferenceCount() > 1:
-        newController.UnRegister(None)
-
-    #print gid, timeCompartmentGroupId, gid % timeCompartmentSize
-    print gid, ' of global comm is ', newController.GetLocalProcessId()
-    globalController.SetGlobalController(newController)
-    return newController
-
-def CheckReader(reader):
-    if hasattr(reader, "FileName") == False:
-        print "ERROR: Don't know how to set file name for ", reader.SMProxy.GetXMLName()
-        sys.exit(-1)
-
-    if hasattr(reader, "TimestepValues") == False:
-        print "ERROR: ", reader.SMProxy.GetXMLName(), " doesn't have time information"
-        sys.exit(-1)
-
-def CreateControllers(timeCompartmentSize):
-    pm = paraview.servermanager.vtkProcessModule.GetProcessModule()
-    globalController = pm.GetGlobalController()
-    if timeCompartmentSize > globalController.GetNumberOfProcesses():
-        timeCompartmentSize = globalController.GetNumberOfProcesses()
-
-    temporalController = CreateTimeCompartments(globalController, timeCompartmentSize)
-    return globalController, temporalController, timeCompartmentSize
-
-currentTimeStep = -1
-def UpdateCurrentTimeStep(globalController, timeCompartmentSize):
-    global currentTimeStep
-    if currentTimeStep == -1:
-        currentTimeStep = globalController.GetLocalProcessId() / timeCompartmentSize
-        return currentTimeStep
-
-    numTimeStepsPerIteration = globalController.GetNumberOfProcesses() / timeCompartmentSize
-    currentTimeStep = currentTimeStep + numTimeStepsPerIteration
-    return currentTimeStep
-
-def WriteImages(currentTimeStep, currentTime, views):
-    for view in views:
-        filename = view.tpFileName.replace("%t", str(currentTimeStep))
-        view.ViewTime = currentTime
-        WriteImage(filename, view, Magnification=view.tpMagnification)
-
-def WriteFiles(currentTimeStep, currentTime, writers):
-    for writer in writers:
-        originalfilename = writer.FileName
-        fname = originalfilename.replace("%t", str(currentTimeStep))
-        writer.FileName = fname
-        writer.UpdatePipeline(currentTime)
-        writer.FileName = originalfilename
-
-def IterateOverTimeSteps(globalController, timeCompartmentSize, timeSteps, writers, views):
-    currentTimeStep = UpdateCurrentTimeStep(globalController, timeCompartmentSize)
-    while currentTimeStep < len(timeSteps):
-        print globalController.GetLocalProcessId(), " is working on ", currentTimeStep
-        WriteImages(currentTimeStep, timeSteps[currentTimeStep], views)
-        WriteFiles(currentTimeStep, timeSteps[currentTimeStep], writers)
-        currentTimeStep = UpdateCurrentTimeStep(globalController, timeCompartmentSize)
-
-def CreateReader(ctor, args, fileInfo):
-    "Creates a reader, checks if it can be used, and sets the filenames"
-    reader = ctor()
-    CheckReader(reader)
-    import glob
-    files = glob.glob(fileInfo)
-    files.sort() # assume there is a logical ordering of the filenames that corresponds to time ordering
-    reader.FileName = files
-    for a in args:
-        s = "reader."+a
-        exec (s)
-
-    return reader
-
-def CreateWriter(ctor, filename, tp_writers):
-    writer = ctor()
-    writer.FileName = filename
-    tp_writers.append(writer)
-    return writer
-
-def CreateView(proxy_ctor, filename, magnification, width, height, tp_views):
-    view = proxy_ctor()
-    view.add_attribute("tpFileName", filename)
-    view.add_attribute("tpMagnification", magnification)
-    tp_views.append(view)
-    view.ViewSize = [width, height]
-    return view
-
-tp_writers = []
-tp_views = []
-# ==================== end of specialized temporal parallelism sections ==================
-
-timeCompartmentSize = 16
-globalController, temporalController, timeCompartmentSize = CreateControllers(timeCompartmentSize)
-
-RenderView1 = CreateView( CreateRenderView, sys.argv[1], 1, 549, 583, tp_views )
-RenderView1.LightSpecularColor = [1.0, 1.0, 1.0]
-RenderView1.InteractionMode = '3D'
-RenderView1.UseTexturedBackground = 0
-RenderView1.UseLight = 1
-RenderView1.CameraPosition = [15.0, -2624.999755859375, 14496.62787197619]
-RenderView1.FillLightKFRatio = 3.0
-RenderView1.Background2 = [0.0, 0.0, 0.16470588235294117]
-RenderView1.FillLightAzimuth = -10.0
-RenderView1.LODResolution = 50.0
-RenderView1.BackgroundTexture = []
-RenderView1.KeyLightAzimuth = 10.0
-RenderView1.StencilCapable = 1
-RenderView1.LightIntensity = 1.0
-RenderView1.CameraFocalPoint = [15.0, -2624.999755859375, 0.0]
-RenderView1.ImageReductionFactor = 2
-RenderView1.CameraViewAngle = 30.0
-RenderView1.CameraParallelScale = 3766.3151510583625
-RenderView1.EyeAngle = 2.0
-RenderView1.HeadLightKHRatio = 3.0
-RenderView1.StereoRender = 0
-RenderView1.KeyLightIntensity = 0.75
-RenderView1.BackLightAzimuth = 110.0
-RenderView1.OrientationAxesInteractivity = 0
-RenderView1.UseInteractiveRenderingForSceenshots = 0
-RenderView1.UseOffscreenRendering = 0
-RenderView1.Background = [1.0, 1.0, 1.0]
-RenderView1.UseOffscreenRenderingForScreenshots = 1
-RenderView1.NonInteractiveRenderDelay = 2
-RenderView1.CenterOfRotation = [15.0, -2624.999755859375, 0.0]
-RenderView1.CameraParallelProjection = 0
-RenderView1.CompressorConfig = 'vtkSquirtCompressor 0 3'
-RenderView1.HeadLightWarmth = 0.5
-RenderView1.MaximumNumberOfPeels = 4
-RenderView1.LightDiffuseColor = [1.0, 1.0, 1.0]
-RenderView1.StereoType = 'Red-Blue'
-RenderView1.DepthPeeling = 1
-RenderView1.BackLightKBRatio = 3.5
-RenderView1.StereoCapableWindow = 1
-RenderView1.CameraViewUp = [0.0, 1.0, 0.0]
-RenderView1.LightType = 'HeadLight'
-RenderView1.LightAmbientColor = [1.0, 1.0, 1.0]
-RenderView1.RemoteRenderThreshold = 3.0
-RenderView1.KeyLightElevation = 50.0
-RenderView1.CenterAxesVisibility = 0
-RenderView1.MaintainLuminance = 0
-RenderView1.StillRenderImageReductionFactor = 1
-RenderView1.BackLightWarmth = 0.5
-RenderView1.FillLightElevation = -75.0
-RenderView1.MultiSamples = 0
-RenderView1.FillLightWarmth = 0.4
-RenderView1.AlphaBitPlanes = 1
-RenderView1.LightSwitch = 0
-RenderView1.OrientationAxesVisibility = 0
-RenderView1.CameraClippingRange = [14351.66159325643, 14714.077290055833]
-RenderView1.BackLightElevation = 0.0
-RenderView1.ViewTime = 0.0
-RenderView1.OrientationAxesOutlineColor = [1.0, 1.0, 1.0]
-RenderView1.LODThreshold = 5.0
-RenderView1.CollectGeometryThreshold = 100.0
-RenderView1.UseGradientBackground = 0
-RenderView1.KeyLightWarmth = 0.6
-RenderView1.OrientationAxesLabelColor = [1.0, 1.0, 1.0]
-
-in_msf_moc = CreateReader( MOCFileSeriesReader, [],  sys.argv[2])
-timeSteps = GetActiveSource().TimestepValues if len(GetActiveSource().TimestepValues)!=0 else [0]
-Threshold1 = Threshold( guiName="Threshold1", Scalars=['POINTS', 'reader_moc_global'], ThresholdRange=[-1000.0, 592.3663330078125], AllScalars=1 )
-
-Transform1 = Transform( guiName="Transform1", Transform="Transform" )
-Transform1.Transform.Scale = [40.0, -1.0, 1.0]
-Transform1.Transform.Rotate = [0.0, 0.0, 0.0]
-Transform1.Transform.Translate = [0.0, 0.0, 0.0]
-
-a1_reader_moc_global_PiecewiseFunction = CreatePiecewiseFunction( Points=[0.0, 0.0, 1.0, 1.0] )
-
-a1_reader_moc_global_PVLookupTable = GetLookupTableForArray( "reader_moc_global", 1, Discretize=1, RGBPoints=[-151.5101776123047, 0.23, 0.299, 0.754, 592.3663330078125, 0.706, 0.016, 0.15], UseLogScale=0, VectorComponent=0, NanColor=[0.25, 0.0, 0.0], NumberOfTableValues=256, ColorSpace='Diverging', VectorMode='Magnitude', HSVWrap=0, ScalarRangeInitialized=1.0, LockScalarRange=0 )
-
-SetActiveSource(in_msf_moc)
-DataRepresentation1 = Show()
-DataRepresentation1.CubeAxesZAxisVisibility = 1
-DataRepresentation1.SelectionPointLabelColor = [0.5, 0.5, 0.5]
-DataRepresentation1.SelectionPointFieldDataArrayName = 'vtkOriginalPointIds'
-DataRepresentation1.SuppressLOD = 0
-DataRepresentation1.CubeAxesXGridLines = 0
-DataRepresentation1.CubeAxesYAxisTickVisibility = 1
-DataRepresentation1.Position = [0.0, 0.0, 0.0]
-DataRepresentation1.BackfaceRepresentation = 'Follow Frontface'
-DataRepresentation1.SelectionOpacity = 1.0
-DataRepresentation1.SelectionPointLabelShadow = 0
-DataRepresentation1.CubeAxesYGridLines = 0
-DataRepresentation1.OrientationMode = 'Direction'
-DataRepresentation1.Source.TipResolution = 6
-DataRepresentation1.ScaleMode = 'No Data Scaling Off'
-DataRepresentation1.Diffuse = 1.0
-DataRepresentation1.SelectionUseOutline = 0
-DataRepresentation1.CubeAxesZTitle = 'Z-Axis'
-DataRepresentation1.Specular = 0.1
-DataRepresentation1.SelectionVisibility = 1
-DataRepresentation1.InterpolateScalarsBeforeMapping = 1
-DataRepresentation1.CubeAxesZAxisTickVisibility = 1
-DataRepresentation1.Origin = [0.0, 0.0, 0.0]
-DataRepresentation1.CubeAxesVisibility = 0
-DataRepresentation1.Scale = [1.0, 1.0, 1.0]
-DataRepresentation1.SelectionCellLabelJustification = 'Left'
-DataRepresentation1.DiffuseColor = [1.0, 1.0, 1.0]
-DataRepresentation1.SelectionCellLabelOpacity = 1.0
-DataRepresentation1.Source = "Arrow"
-DataRepresentation1.Source.Invert = 0
-DataRepresentation1.Masking = 0
-DataRepresentation1.Opacity = 1.0
-DataRepresentation1.LineWidth = 1.0
-DataRepresentation1.MeshVisibility = 0
-DataRepresentation1.Visibility = 0
-DataRepresentation1.SelectionCellLabelFontSize = 18
-DataRepresentation1.CubeAxesCornerOffset = 0.0
-DataRepresentation1.SelectionPointLabelJustification = 'Left'
-DataRepresentation1.Ambient = 0.0
-DataRepresentation1.SelectOrientationVectors = ''
-DataRepresentation1.CubeAxesTickLocation = 'Inside'
-DataRepresentation1.BackfaceDiffuseColor = [1.0, 1.0, 1.0]
-DataRepresentation1.CubeAxesYAxisVisibility = 1
-DataRepresentation1.SelectionPointLabelFontFamily = 'Arial'
-DataRepresentation1.Source.ShaftResolution = 6
-DataRepresentation1.CubeAxesFlyMode = 'Closest Triad'
-DataRepresentation1.SelectScaleArray = ''
-DataRepresentation1.CubeAxesYTitle = 'Y-Axis'
-DataRepresentation1.ColorAttributeType = 'POINT_DATA'
-DataRepresentation1.SpecularPower = 100.0
-DataRepresentation1.Texture = []
-DataRepresentation1.SelectionCellLabelShadow = 0
-DataRepresentation1.AmbientColor = [1.0, 1.0, 1.0]
-DataRepresentation1.MapScalars = 1
-DataRepresentation1.PointSize = 2.0
-DataRepresentation1.Source.TipLength = 0.35
-DataRepresentation1.SelectionCellLabelFormat = ''
-DataRepresentation1.Scaling = 0
-DataRepresentation1.StaticMode = 0
-DataRepresentation1.SelectionCellLabelColor = [0.0, 1.0, 0.0]
-DataRepresentation1.Source.TipRadius = 0.1
-DataRepresentation1.EdgeColor = [0.0, 0.0, 0.5000076295109483]
-DataRepresentation1.CubeAxesXAxisTickVisibility = 1
-DataRepresentation1.SelectionCellLabelVisibility = 0
-DataRepresentation1.NonlinearSubdivisionLevel = 1
-DataRepresentation1.CubeAxesColor = [1.0, 1.0, 1.0]
-DataRepresentation1.Representation = 'Surface'
-DataRepresentation1.CustomBounds = [0.0, 1.0, 0.0, 1.0, 0.0, 1.0]
-DataRepresentation1.CubeAxesXAxisMinorTickVisibility = 1
-DataRepresentation1.Orientation = [0.0, 0.0, 0.0]
-DataRepresentation1.CubeAxesXTitle = 'X-Axis'
-DataRepresentation1.CubeAxesInertia = 1
-DataRepresentation1.BackfaceOpacity = 1.0
-DataRepresentation1.SelectionCellFieldDataArrayName = 'vtkOriginalCellIds'
-DataRepresentation1.SelectionColor = [1.0, 0.0, 1.0]
-DataRepresentation1.SelectionPointLabelVisibility = 0
-DataRepresentation1.SelectionPointLabelFontSize = 18
-DataRepresentation1.ScaleFactor = 1.0
-DataRepresentation1.BackfaceAmbientColor = [1.0, 1.0, 1.0]
-DataRepresentation1.Source.ShaftRadius = 0.03
-DataRepresentation1.SelectMaskArray = ''
-DataRepresentation1.SelectionLineWidth = 2.0
-DataRepresentation1.CubeAxesZAxisMinorTickVisibility = 1
-DataRepresentation1.CubeAxesXAxisVisibility = 1
-DataRepresentation1.Interpolation = 'Gouraud'
-DataRepresentation1.SelectionCellLabelFontFamily = 'Arial'
-DataRepresentation1.SelectionCellLabelItalic = 0
-DataRepresentation1.CubeAxesYAxisMinorTickVisibility = 1
-DataRepresentation1.CubeAxesZGridLines = 0
-DataRepresentation1.SelectionPointLabelFormat = ''
-DataRepresentation1.SelectionPointLabelOpacity = 1.0
-DataRepresentation1.Pickable = 1
-DataRepresentation1.CustomBoundsActive = [0, 0, 0]
-DataRepresentation1.SelectionRepresentation = 'Wireframe'
-DataRepresentation1.SelectionPointLabelBold = 0
-DataRepresentation1.ColorArrayName = 'reader_moc_global'
-DataRepresentation1.SelectionPointLabelItalic = 0
-DataRepresentation1.SpecularColor = [1.0, 1.0, 1.0]
-DataRepresentation1.LookupTable = a1_reader_moc_global_PVLookupTable
-DataRepresentation1.SelectionPointSize = 5.0
-DataRepresentation1.SelectionCellLabelBold = 0
-DataRepresentation1.Orient = 0
-
-SetActiveSource(Threshold1)
-DataRepresentation2 = Show()
-DataRepresentation2.CubeAxesZAxisVisibility = 1
-DataRepresentation2.SelectionPointLabelColor = [0.5, 0.5, 0.5]
-DataRepresentation2.SelectionPointFieldDataArrayName = 'vtkOriginalPointIds'
-DataRepresentation2.SuppressLOD = 0
-DataRepresentation2.CubeAxesXGridLines = 0
-DataRepresentation2.CubeAxesYAxisTickVisibility = 1
-DataRepresentation2.Position = [0.0, 0.0, 0.0]
-DataRepresentation2.BackfaceRepresentation = 'Follow Frontface'
-DataRepresentation2.SelectionOpacity = 1.0
-DataRepresentation2.SelectionPointLabelShadow = 0
-DataRepresentation2.CubeAxesYGridLines = 0
-DataRepresentation2.OrientationMode = 'Direction'
-DataRepresentation2.Source.TipResolution = 6
-DataRepresentation2.ScaleMode = 'No Data Scaling Off'
-DataRepresentation2.Diffuse = 1.0
-DataRepresentation2.SelectionUseOutline = 0
-DataRepresentation2.SelectionPointLabelFormat = ''
-DataRepresentation2.CubeAxesZTitle = 'Z-Axis'
-DataRepresentation2.Specular = 0.1
-DataRepresentation2.SelectionVisibility = 1
-DataRepresentation2.InterpolateScalarsBeforeMapping = 1
-DataRepresentation2.CubeAxesZAxisTickVisibility = 1
-DataRepresentation2.Origin = [0.0, 0.0, 0.0]
-DataRepresentation2.CubeAxesVisibility = 0
-DataRepresentation2.Scale = [1.0, 1.0, 1.0]
-DataRepresentation2.SelectionCellLabelJustification = 'Left'
-DataRepresentation2.DiffuseColor = [1.0, 1.0, 1.0]
-DataRepresentation2.SelectionCellLabelOpacity = 1.0
-DataRepresentation2.CubeAxesInertia = 1
-DataRepresentation2.Source = "Arrow"
-DataRepresentation2.Source.Invert = 0
-DataRepresentation2.Masking = 0
-DataRepresentation2.Opacity = 1.0
-DataRepresentation2.LineWidth = 1.0
-DataRepresentation2.MeshVisibility = 0
-DataRepresentation2.Visibility = 0
-DataRepresentation2.SelectionCellLabelFontSize = 18
-DataRepresentation2.CubeAxesCornerOffset = 0.0
-DataRepresentation2.SelectionPointLabelJustification = 'Left'
-DataRepresentation2.SelectionPointLabelVisibility = 0
-DataRepresentation2.SelectOrientationVectors = ''
-DataRepresentation2.CubeAxesTickLocation = 'Inside'
-DataRepresentation2.BackfaceDiffuseColor = [1.0, 1.0, 1.0]
-DataRepresentation2.CubeAxesYAxisVisibility = 1
-DataRepresentation2.SelectionPointLabelFontFamily = 'Arial'
-DataRepresentation2.Source.ShaftResolution = 6
-DataRepresentation2.CubeAxesFlyMode = 'Closest Triad'
-DataRepresentation2.SelectScaleArray = ''
-DataRepresentation2.CubeAxesYTitle = 'Y-Axis'
-DataRepresentation2.ColorAttributeType = 'POINT_DATA'
-DataRepresentation2.SpecularPower = 100.0
-DataRepresentation2.Texture = []
-DataRepresentation2.SelectionCellLabelShadow = 0
-DataRepresentation2.AmbientColor = [1.0, 1.0, 1.0]
-DataRepresentation2.MapScalars = 1
-DataRepresentation2.PointSize = 2.0
-DataRepresentation2.Source.TipLength = 0.35
-DataRepresentation2.SelectionCellLabelFormat = ''
-DataRepresentation2.Scaling = 0
-DataRepresentation2.StaticMode = 0
-DataRepresentation2.SelectionCellLabelColor = [0.0, 1.0, 0.0]
-DataRepresentation2.Source.TipRadius = 0.1
-DataRepresentation2.EdgeColor = [0.0, 0.0, 0.5000076295109483]
-DataRepresentation2.CubeAxesXAxisTickVisibility = 1
-DataRepresentation2.SelectionCellLabelVisibility = 0
-DataRepresentation2.NonlinearSubdivisionLevel = 1
-DataRepresentation2.CubeAxesColor = [1.0, 1.0, 1.0]
-DataRepresentation2.Representation = 'Surface'
-DataRepresentation2.CustomBounds = [0.0, 1.0, 0.0, 1.0, 0.0, 1.0]
-DataRepresentation2.CubeAxesXAxisMinorTickVisibility = 1
-DataRepresentation2.Orientation = [0.0, 0.0, 0.0]
-DataRepresentation2.CubeAxesXTitle = 'X-Axis'
-DataRepresentation2.ScalarOpacityUnitDistance = 287.4628538795667
-DataRepresentation2.BackfaceOpacity = 1.0
-DataRepresentation2.SelectionCellFieldDataArrayName = 'vtkOriginalCellIds'
-DataRepresentation2.SelectionColor = [1.0, 0.0, 1.0]
-DataRepresentation2.Ambient = 0.0
-DataRepresentation2.SelectionPointLabelFontSize = 18
-DataRepresentation2.ScaleFactor = 1.0
-DataRepresentation2.BackfaceAmbientColor = [1.0, 1.0, 1.0]
-DataRepresentation2.Source.ShaftRadius = 0.03
-DataRepresentation2.ScalarOpacityFunction = a1_reader_moc_global_PiecewiseFunction
-DataRepresentation2.SelectMaskArray = ''
-DataRepresentation2.SelectionLineWidth = 2.0
-DataRepresentation2.CubeAxesZAxisMinorTickVisibility = 1
-DataRepresentation2.CubeAxesXAxisVisibility = 1
-DataRepresentation2.Interpolation = 'Gouraud'
-DataRepresentation2.SelectMapper = 'Projected tetra'
-DataRepresentation2.SelectionCellLabelFontFamily = 'Arial'
-DataRepresentation2.SelectionCellLabelItalic = 0
-DataRepresentation2.CubeAxesYAxisMinorTickVisibility = 1
-DataRepresentation2.CubeAxesZGridLines = 0
-DataRepresentation2.ExtractedBlockIndex = 0
-DataRepresentation2.SelectionPointLabelOpacity = 1.0
-DataRepresentation2.Pickable = 1
-DataRepresentation2.CustomBoundsActive = [0, 0, 0]
-DataRepresentation2.SelectionRepresentation = 'Wireframe'
-DataRepresentation2.SelectionPointLabelBold = 0
-DataRepresentation2.ColorArrayName = 'reader_moc_global'
-DataRepresentation2.SelectionPointLabelItalic = 0
-DataRepresentation2.SpecularColor = [1.0, 1.0, 1.0]
-DataRepresentation2.LookupTable = a1_reader_moc_global_PVLookupTable
-DataRepresentation2.SelectionPointSize = 5.0
-DataRepresentation2.SelectionCellLabelBold = 0
-DataRepresentation2.Orient = 0
-
-SetActiveSource(Transform1)
-DataRepresentation3 = Show()
-DataRepresentation3.CubeAxesZAxisVisibility = 1
-DataRepresentation3.SelectionPointLabelColor = [0.5, 0.5, 0.5]
-DataRepresentation3.SelectionPointFieldDataArrayName = 'vtkOriginalPointIds'
-DataRepresentation3.SuppressLOD = 0
-DataRepresentation3.CubeAxesXGridLines = 0
-DataRepresentation3.CubeAxesYAxisTickVisibility = 1
-DataRepresentation3.Position = [0.0, 0.0, 0.0]
-DataRepresentation3.BackfaceRepresentation = 'Follow Frontface'
-DataRepresentation3.SelectionOpacity = 1.0
-DataRepresentation3.SelectionPointLabelShadow = 0
-DataRepresentation3.CubeAxesYGridLines = 0
-DataRepresentation3.OrientationMode = 'Direction'
-DataRepresentation3.Source.TipResolution = 6
-DataRepresentation3.ScaleMode = 'No Data Scaling Off'
-DataRepresentation3.Diffuse = 1.0
-DataRepresentation3.SelectionUseOutline = 0
-DataRepresentation3.SelectionPointLabelFormat = ''
-DataRepresentation3.CubeAxesZTitle = 'Z-Axis'
-DataRepresentation3.Specular = 0.1
-DataRepresentation3.SelectionVisibility = 1
-DataRepresentation3.InterpolateScalarsBeforeMapping = 1
-DataRepresentation3.CubeAxesZAxisTickVisibility = 1
-DataRepresentation3.Origin = [0.0, 0.0, 0.0]
-DataRepresentation3.CubeAxesVisibility = 0
-DataRepresentation3.Scale = [1.0, 1.0, 1.0]
-DataRepresentation3.SelectionCellLabelJustification = 'Left'
-DataRepresentation3.DiffuseColor = [1.0, 1.0, 1.0]
-DataRepresentation3.SelectionCellLabelOpacity = 1.0
-DataRepresentation3.CubeAxesInertia = 1
-DataRepresentation3.Source = "Arrow"
-DataRepresentation3.Source.Invert = 0
-DataRepresentation3.Masking = 0
-DataRepresentation3.Opacity = 1.0
-DataRepresentation3.LineWidth = 1.0
-DataRepresentation3.MeshVisibility = 0
-DataRepresentation3.Visibility = 1
-DataRepresentation3.SelectionCellLabelFontSize = 18
-DataRepresentation3.CubeAxesCornerOffset = 0.0
-DataRepresentation3.SelectionPointLabelJustification = 'Left'
-DataRepresentation3.SelectionPointLabelVisibility = 0
-DataRepresentation3.SelectOrientationVectors = ''
-DataRepresentation3.CubeAxesTickLocation = 'Inside'
-DataRepresentation3.BackfaceDiffuseColor = [1.0, 1.0, 1.0]
-DataRepresentation3.CubeAxesYAxisVisibility = 1
-DataRepresentation3.SelectionPointLabelFontFamily = 'Arial'
-DataRepresentation3.Source.ShaftResolution = 6
-DataRepresentation3.CubeAxesFlyMode = 'Closest Triad'
-DataRepresentation3.SelectScaleArray = ''
-DataRepresentation3.CubeAxesYTitle = 'Y-Axis'
-DataRepresentation3.ColorAttributeType = 'POINT_DATA'
-DataRepresentation3.SpecularPower = 100.0
-DataRepresentation3.Texture = []
-DataRepresentation3.SelectionCellLabelShadow = 0
-DataRepresentation3.AmbientColor = [1.0, 1.0, 1.0]
-DataRepresentation3.MapScalars = 1
-DataRepresentation3.PointSize = 2.0
-DataRepresentation3.Source.TipLength = 0.35
-DataRepresentation3.SelectionCellLabelFormat = ''
-DataRepresentation3.Scaling = 0
-DataRepresentation3.StaticMode = 0
-DataRepresentation3.SelectionCellLabelColor = [0.0, 1.0, 0.0]
-DataRepresentation3.Source.TipRadius = 0.1
-DataRepresentation3.EdgeColor = [0.0, 0.0, 0.5000076295109483]
-DataRepresentation3.CubeAxesXAxisTickVisibility = 1
-DataRepresentation3.SelectionCellLabelVisibility = 0
-DataRepresentation3.NonlinearSubdivisionLevel = 1
-DataRepresentation3.CubeAxesColor = [1.0, 1.0, 1.0]
-DataRepresentation3.Representation = 'Surface'
-DataRepresentation3.CustomBounds = [0.0, 1.0, 0.0, 1.0, 0.0, 1.0]
-DataRepresentation3.CubeAxesXAxisMinorTickVisibility = 1
-DataRepresentation3.Orientation = [0.0, 0.0, 0.0]
-DataRepresentation3.CubeAxesXTitle = 'X-Axis'
-DataRepresentation3.ScalarOpacityUnitDistance = 388.2163580108114
-DataRepresentation3.BackfaceOpacity = 1.0
-DataRepresentation3.SelectionCellFieldDataArrayName = 'vtkOriginalCellIds'
-DataRepresentation3.SelectionColor = [1.0, 0.0, 1.0]
-DataRepresentation3.Ambient = 0.0
-DataRepresentation3.SelectionPointLabelFontSize = 18
-DataRepresentation3.ScaleFactor = 1.0
-DataRepresentation3.BackfaceAmbientColor = [1.0, 1.0, 1.0]
-DataRepresentation3.Source.ShaftRadius = 0.03
-DataRepresentation3.ScalarOpacityFunction = a1_reader_moc_global_PiecewiseFunction
-DataRepresentation3.SelectMaskArray = ''
-DataRepresentation3.SelectionLineWidth = 2.0
-DataRepresentation3.CubeAxesZAxisMinorTickVisibility = 1
-DataRepresentation3.CubeAxesXAxisVisibility = 1
-DataRepresentation3.Interpolation = 'Gouraud'
-DataRepresentation3.SelectMapper = 'Projected tetra'
-DataRepresentation3.SelectionCellLabelFontFamily = 'Arial'
-DataRepresentation3.SelectionCellLabelItalic = 0
-DataRepresentation3.CubeAxesYAxisMinorTickVisibility = 1
-DataRepresentation3.CubeAxesZGridLines = 0
-DataRepresentation3.ExtractedBlockIndex = 0
-DataRepresentation3.SelectionPointLabelOpacity = 1.0
-DataRepresentation3.Pickable = 1
-DataRepresentation3.CustomBoundsActive = [0, 0, 0]
-DataRepresentation3.SelectionRepresentation = 'Wireframe'
-DataRepresentation3.SelectionPointLabelBold = 0
-DataRepresentation3.ColorArrayName = 'reader_moc_global'
-DataRepresentation3.SelectionPointLabelItalic = 0
-DataRepresentation3.SpecularColor = [1.0, 1.0, 1.0]
-DataRepresentation3.LookupTable = a1_reader_moc_global_PVLookupTable
-DataRepresentation3.SelectionPointSize = 5.0
-DataRepresentation3.SelectionCellLabelBold = 0
-DataRepresentation3.Orient = 0
-
-
-
-IterateOverTimeSteps(globalController, timeCompartmentSize, timeSteps, tp_writers, tp_views)
-
-
-print 'ending'
diff --git a/uvcdatspt/scripts/MOCTemporalStatistics.py b/uvcdatspt/scripts/MOCTemporalStatistics.py
deleted file mode 100644
index c6d51900b..000000000
--- a/uvcdatspt/scripts/MOCTemporalStatistics.py
+++ /dev/null
@@ -1,26 +0,0 @@
-print 'starting'
-import sys
-from paraview.simple import *
-
-if len(sys.argv) < 3:
-    print 'Usage: pvbatch MOCTemporalStatistics.py <output file name> <input file names>'
-    sys.exit(1)
-
-paraview.simple._DisableFirstRenderCameraReset()
-reader = MOCFileSeriesReader()
-print 'input file names are: ', sys.argv[2:len(sys.argv)]
-print 'output file name is: ', sys.argv[1]
-reader.FileName = sys.argv[2:len(sys.argv)]
-
-MultiBlockTemporalStatistics1 = MultiBlockTemporalStatistics()
-MultiBlockTemporalStatistics1.TimeStepType = 0
-MultiBlockTemporalStatistics1.SamplingMethod = 1
-MultiBlockTemporalStatistics1.TimeSpan = 0
-MultiBlockTemporalStatistics1.TimeStepLength = 1
-MultiBlockTemporalStatistics1.TimeCompartmentSize = 16
-
-writer = XMLMultiBlockDataWriter()
-writer.FileName = sys.argv[1]
-writer.UpdatePipeline()
-
-print 'ending'
diff --git a/uvcdatspt/scripts/MWehnerTemporalStatistics.py b/uvcdatspt/scripts/MWehnerTemporalStatistics.py
deleted file mode 100644
index d9f2f4c1a..000000000
--- a/uvcdatspt/scripts/MWehnerTemporalStatistics.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# Script for computing temporal statistics (average, minimum, maximum
-# and standard deviation) on hopper.nersc.gov. The input is a single
-# file that contains multipe time steps. The time compartment size is
-# a command line argument.
-
-import sys
-import time
-start = time.time()
-
-try: paraview.simple
-except: from paraview.simple import *
-paraview.simple._DisableFirstRenderCameraReset()
-
-import libvtkParallelPython
-import paraview
-pm = paraview.servermanager.vtkProcessModule.GetProcessModule()
-globalController = pm.GetGlobalController()
-pid = globalController.GetLocalProcessId()
-
-tcsize = sys.argv[1]
-
-fileName = "statsmwhenertwod.vtm"
-
-if pid == 0:
-    print 'starting script with tcsize of ', tcsize, ' and output filename using ', fileName
-
-V_cam5_1_amip_run2_cam2_h0_1994_nc = NetCDFReader( FileName=['/global/project/projectdirs/m1517/ACE/cam5.1/control/0.25_degre
-e/monthly/run2/zg_Amon_CAM5.1_0.25degree_control_v1.0_run2_197901-200512.nc'] )
-
-V_cam5_1_amip_run2_cam2_h0_1994_nc.Dimensions = '(plev, lat, lon)'
-V_cam5_1_amip_run2_cam2_h0_1994_nc.SphericalCoordinates = 0
-
-MultiBlockTemporalStatistics1 = MultiBlockTemporalStatistics()
-MultiBlockTemporalStatistics1.TimeStepType = 'Months'
-#MultiBlockTemporalStatistics1.SamplingMethod = 'Consecutive'
-MultiBlockTemporalStatistics1.SamplingMethod = 'Climatology'
-#MultiBlockTemporalStatistics1.TimeSpan = 'Year'
-MultiBlockTemporalStatistics1.TimeSpan = 'AllTimeSteps'
-MultiBlockTemporalStatistics1.TimeCompartmentSize = int(tcsize)
-
-writer = XMLMultiBlockDataWriter()
-writer.FileName = fileName
-
-writer.UpdatePipeline()
-if pid == 0:
-    print 'finished run in ', time.time()-start
-
diff --git a/uvcdatspt/scripts/POPGenerateImages.py b/uvcdatspt/scripts/POPGenerateImages.py
deleted file mode 100644
index 86f61e47f..000000000
--- a/uvcdatspt/scripts/POPGenerateImages.py
+++ /dev/null
@@ -1,310 +0,0 @@
-# Spatio-temporal script for generating images for POP NetCDF
-# output files. This one pseudo-colors by TEMP. It has a
-# time compartment size of 4 so the number of processes
-# also needs to be a multiple of 4. To run it, do:
-# mpirun -np <numprocs> ./pvbatch --symmetric POPGenerateImages.py
-
-try: paraview.simple
-except: from paraview.simple import *
-
-import sys
-import os
-import paraview
-
-# trying to import the library where I can specify the global and subcontrollers
-try:
-    import libvtkParallelPython as vtkParallel # requires LD_LIBRARY_PATH being properly set
-except ImportError:
-    import vtkParallelPython as vtkParallel # for a static build, i.e. jaguarpf, use this instead and don't worry about LD_LIBRARY_PATH
-
-paraview.options.batch = True # this may not be necessary
-paraview.simple._DisableFirstRenderCameraReset()
-
-def CreateTimeCompartments(globalController, timeCompartmentSize):
-    if globalController.GetNumberOfProcesses() == 1:
-        print 'single process'
-        return
-    elif globalController.GetNumberOfProcesses() % timeCompartmentSize != 0:
-        print 'number of processes must be an integer multiple of time compartment size'
-        return
-    elif timeCompartmentSize == globalController.GetNumberOfProcesses():
-        return globalController
-
-    gid = globalController.GetLocalProcessId()
-    timeCompartmentGroupId = int (gid / timeCompartmentSize )
-    newController = globalController.PartitionController(timeCompartmentGroupId, gid % timeCompartmentSize)
-    # must unregister if the reference count is greater than 1
-    if newController.GetReferenceCount() > 1:
-        newController.UnRegister(None)
-
-    #print gid, timeCompartmentGroupId, gid % timeCompartmentSize
-    print gid, ' of global comm is ', newController.GetLocalProcessId()
-    globalController.SetGlobalController(newController)
-    return newController
-
-def CheckReader(reader):
-    if hasattr(reader, "FileName") == False:
-        print "ERROR: Don't know how to set file name for ", reader.SMProxy.GetXMLName()
-        sys.exit(-1)
-
-    if hasattr(reader, "TimestepValues") == False:
-        print "ERROR: ", reader.SMProxy.GetXMLName(), " doesn't have time information"
-        sys.exit(-1)
-
-def CreateControllers(timeCompartmentSize):
-    pm = paraview.servermanager.vtkProcessModule.GetProcessModule()
-    globalController = pm.GetGlobalController()
-    if timeCompartmentSize > globalController.GetNumberOfProcesses():
-        timeCompartmentSize = globalController.GetNumberOfProcesses()
-
-    temporalController = CreateTimeCompartments(globalController, timeCompartmentSize)
-    return globalController, temporalController, timeCompartmentSize
-
-currentTimeStep = -1
-def UpdateCurrentTimeStep(globalController, timeCompartmentSize):
-    global currentTimeStep
-    if currentTimeStep == -1:
-        currentTimeStep = globalController.GetLocalProcessId() / timeCompartmentSize
-        return currentTimeStep
-
-    numTimeStepsPerIteration = globalController.GetNumberOfProcesses() / timeCompartmentSize
-    currentTimeStep = currentTimeStep + numTimeStepsPerIteration
-    return currentTimeStep
-
-def WriteImages(currentTimeStep, currentTime, views):
-    for view in views:
-        filename = view.tpFileName.replace("%t", str(currentTimeStep))
-        view.ViewTime = currentTime
-        WriteImage(filename, view, Magnification=view.tpMagnification)
-
-def WriteFiles(currentTimeStep, currentTime, writers):
-    for writer in writers:
-        originalfilename = writer.FileName
-        fname = originalfilename.replace("%t", str(currentTimeStep))
-        writer.FileName = fname
-        writer.UpdatePipeline(currentTime)
-        writer.FileName = originalfilename
-
-def IterateOverTimeSteps(globalController, timeCompartmentSize, timeSteps, writers, views):
-    currentTimeStep = UpdateCurrentTimeStep(globalController, timeCompartmentSize)
-    while currentTimeStep < len(timeSteps):
-        print globalController.GetLocalProcessId(), " is working on ", currentTimeStep
-        WriteImages(currentTimeStep, timeSteps[currentTimeStep], views)
-        WriteFiles(currentTimeStep, timeSteps[currentTimeStep], writers)
-        currentTimeStep = UpdateCurrentTimeStep(globalController, timeCompartmentSize)
-
-def CreateReader(ctor, args, fileInfo):
-    "Creates a reader, checks if it can be used, and sets the filenames"
-    reader = ctor()
-    CheckReader(reader)
-    import glob
-    files = glob.glob(fileInfo)
-    files.sort() # assume there is a logical ordering of the filenames that corresponds to time ordering
-    reader.FileName = files
-    for a in args:
-        s = "reader."+a
-        exec (s)
-
-    return reader
-
-def CreateWriter(ctor, filename, tp_writers):
-    writer = ctor()
-    writer.FileName = filename
-    tp_writers.append(writer)
-    return writer
-
-def CreateView(proxy_ctor, filename, magnification, width, height, tp_views):
-    view = proxy_ctor()
-    view.add_attribute("tpFileName", filename)
-    view.add_attribute("tpMagnification", magnification)
-    tp_views.append(view)
-    view.ViewSize = [width, height]
-    return view
-
-tp_writers = []
-tp_views = []
-# ==================== end of specialized temporal parallelism sections ==================
-
-timeCompartmentSize = 4
-globalController, temporalController, timeCompartmentSize = CreateControllers(timeCompartmentSize)
-
-RenderView1 = CreateView( CreateRenderView, "POP_TEMP_%t.png", 1, 549, 583, tp_views )
-RenderView1.LightSpecularColor = [1.0, 1.0, 1.0]
-RenderView1.InteractionMode = '3D'
-RenderView1.UseTexturedBackground = 0
-RenderView1.UseLight = 1
-RenderView1.CameraPosition = [24413625.828416377, -24592716.541236263, 5758186.884780747]
-RenderView1.FillLightKFRatio = 3.0
-RenderView1.Background2 = [0.0, 0.0, 0.165]
-RenderView1.FillLightAzimuth = -10.0
-RenderView1.LODResolution = 50.0
-RenderView1.BackgroundTexture = []
-RenderView1.KeyLightAzimuth = 10.0
-RenderView1.StencilCapable = 1
-RenderView1.LightIntensity = 1.0
-RenderView1.CameraFocalPoint = [1.78529588937719e-12, 1.4505529101189668e-12, 64147.750000000015]
-RenderView1.ImageReductionFactor = 2
-RenderView1.CameraViewAngle = 30.0
-RenderView1.CameraParallelScale = 30343845.664423227
-RenderView1.EyeAngle = 2.0
-RenderView1.HeadLightKHRatio = 3.0
-RenderView1.StereoRender = 0
-RenderView1.KeyLightIntensity = 0.75
-RenderView1.BackLightAzimuth = 110.0
-RenderView1.OrientationAxesInteractivity = 0
-RenderView1.UseInteractiveRenderingForSceenshots = 0
-RenderView1.UseOffscreenRendering = 0
-RenderView1.Background = [0.31999694819562063, 0.3400015259021897, 0.4299992370489052]
-RenderView1.UseOffscreenRenderingForScreenshots = 1
-RenderView1.NonInteractiveRenderDelay = 2
-RenderView1.CenterOfRotation = [0.0, 0.0, 64147.75]
-RenderView1.CameraParallelProjection = 0
-RenderView1.CompressorConfig = 'vtkSquirtCompressor 0 3'
-RenderView1.HeadLightWarmth = 0.5
-RenderView1.MaximumNumberOfPeels = 4
-RenderView1.LightDiffuseColor = [1.0, 1.0, 1.0]
-RenderView1.StereoType = 'Red-Blue'
-RenderView1.DepthPeeling = 1
-RenderView1.BackLightKBRatio = 3.5
-RenderView1.StereoCapableWindow = 1
-RenderView1.CameraViewUp = [0.0471859955443886, 0.2695389330828218, 0.9618327533293193]
-RenderView1.LightType = 'HeadLight'
-RenderView1.LightAmbientColor = [1.0, 1.0, 1.0]
-RenderView1.RemoteRenderThreshold = 3.0
-RenderView1.KeyLightElevation = 50.0
-RenderView1.CenterAxesVisibility = 0
-RenderView1.MaintainLuminance = 0
-RenderView1.StillRenderImageReductionFactor = 1
-RenderView1.BackLightWarmth = 0.5
-RenderView1.FillLightElevation = -75.0
-RenderView1.MultiSamples = 0
-RenderView1.FillLightWarmth = 0.4
-RenderView1.AlphaBitPlanes = 1
-RenderView1.LightSwitch = 0
-RenderView1.OrientationAxesVisibility = 0
-RenderView1.CameraClippingRange = [15039199.876017962, 60476974.08593859]
-RenderView1.BackLightElevation = 0.0
-RenderView1.ViewTime = 0.0
-RenderView1.OrientationAxesOutlineColor = [1.0, 1.0, 1.0]
-RenderView1.LODThreshold = 5.0
-RenderView1.CollectGeometryThreshold = 100.0
-RenderView1.UseGradientBackground = 0
-RenderView1.KeyLightWarmth = 0.6
-RenderView1.OrientationAxesLabelColor = [1.0, 1.0, 1.0]
-
-TEMP_t_t0_1_42l_oilspill12c_00060101_pop_nc = CreateReader( UnstructuredNetCDFPOPreader, ['Stride=[10, 10, 10]', 'VerticalVelocity=0', 'VOI=[0, -1, 0, -1, 0, -1]'], "/home/acbauer/DATA/UVCDAT/TEMP.t.t0.1_42l_oilspill12c.*.pop.nc" )
-timeSteps = GetActiveSource().TimestepValues if len(GetActiveSource().TimestepValues)!=0 else [0]
-a1_TEMP_PiecewiseFunction = CreatePiecewiseFunction( Points=[0.0, 0.0, 1.0, 1.0] )
-
-a1_TEMP_PVLookupTable = GetLookupTableForArray( "TEMP", 1, Discretize=1, RGBPoints=[-20.0, 0.23, 0.299, 0.754, 31.338409423828125, 0.706, 0.016, 0.15], UseLogScale=0, VectorComponent=0, NanColor=[0.25, 0.0, 0.0], NumberOfTableValues=256, ColorSpace='Diverging', VectorMode='Magnitude', HSVWrap=0, ScalarRangeInitialized=1.0, LockScalarRange=0 )
-
-DataRepresentation1 = Show()
-DataRepresentation1.CubeAxesZAxisVisibility = 1
-DataRepresentation1.SelectionPointLabelColor = [0.5, 0.5, 0.5]
-DataRepresentation1.SelectionPointFieldDataArrayName = 'vtkOriginalPointIds'
-DataRepresentation1.SuppressLOD = 0
-DataRepresentation1.CubeAxesXGridLines = 0
-DataRepresentation1.CubeAxesYAxisTickVisibility = 1
-DataRepresentation1.Position = [0.0, 0.0, 0.0]
-DataRepresentation1.BackfaceRepresentation = 'Follow Frontface'
-DataRepresentation1.SelectionOpacity = 1.0
-DataRepresentation1.SelectionPointLabelShadow = 0
-DataRepresentation1.CubeAxesYGridLines = 0
-DataRepresentation1.OrientationMode = 'Direction'
-DataRepresentation1.Source.TipResolution = 6
-DataRepresentation1.ScaleMode = 'No Data Scaling Off'
-DataRepresentation1.Diffuse = 1.0
-DataRepresentation1.SelectionUseOutline = 0
-DataRepresentation1.SelectionPointLabelFormat = ''
-DataRepresentation1.CubeAxesZTitle = 'Z-Axis'
-DataRepresentation1.Specular = 0.1
-DataRepresentation1.SelectionVisibility = 1
-DataRepresentation1.InterpolateScalarsBeforeMapping = 1
-DataRepresentation1.CubeAxesZAxisTickVisibility = 1
-DataRepresentation1.Origin = [0.0, 0.0, 0.0]
-DataRepresentation1.CubeAxesVisibility = 0
-DataRepresentation1.Scale = [1.0, 1.0, 1.0]
-DataRepresentation1.SelectionCellLabelJustification = 'Left'
-DataRepresentation1.DiffuseColor = [1.0, 1.0, 1.0]
-DataRepresentation1.SelectionCellLabelOpacity = 1.0
-DataRepresentation1.CubeAxesInertia = 1
-DataRepresentation1.Source = "Arrow"
-DataRepresentation1.Source.Invert = 0
-DataRepresentation1.Masking = 0
-DataRepresentation1.Opacity = 1.0
-DataRepresentation1.LineWidth = 1.0
-DataRepresentation1.MeshVisibility = 0
-DataRepresentation1.Visibility = 1
-DataRepresentation1.SelectionCellLabelFontSize = 18
-DataRepresentation1.CubeAxesCornerOffset = 0.0
-DataRepresentation1.SelectionPointLabelJustification = 'Left'
-DataRepresentation1.SelectionPointLabelVisibility = 0
-DataRepresentation1.SelectOrientationVectors = ''
-DataRepresentation1.CubeAxesTickLocation = 'Inside'
-DataRepresentation1.BackfaceDiffuseColor = [1.0, 1.0, 1.0]
-DataRepresentation1.CubeAxesYAxisVisibility = 1
-DataRepresentation1.SelectionPointLabelFontFamily = 'Arial'
-DataRepresentation1.Source.ShaftResolution = 6
-DataRepresentation1.CubeAxesFlyMode = 'Closest Triad'
-DataRepresentation1.SelectScaleArray = ''
-DataRepresentation1.CubeAxesYTitle = 'Y-Axis'
-DataRepresentation1.ColorAttributeType = 'POINT_DATA'
-DataRepresentation1.SpecularPower = 100.0
-DataRepresentation1.Texture = []
-DataRepresentation1.SelectionCellLabelShadow = 0
-DataRepresentation1.AmbientColor = [1.0, 1.0, 1.0]
-DataRepresentation1.MapScalars = 1
-DataRepresentation1.PointSize = 2.0
-DataRepresentation1.Source.TipLength = 0.35
-DataRepresentation1.SelectionCellLabelFormat = ''
-DataRepresentation1.Scaling = 0
-DataRepresentation1.StaticMode = 0
-DataRepresentation1.SelectionCellLabelColor = [0.0, 1.0, 0.0]
-DataRepresentation1.Source.TipRadius = 0.1
-DataRepresentation1.EdgeColor = [0.0, 0.0, 0.5000076295109483]
-DataRepresentation1.CubeAxesXAxisTickVisibility = 1
-DataRepresentation1.SelectionCellLabelVisibility = 0
-DataRepresentation1.NonlinearSubdivisionLevel = 1
-DataRepresentation1.CubeAxesColor = [1.0, 1.0, 1.0]
-DataRepresentation1.Representation = 'Surface'
-DataRepresentation1.CustomBounds = [0.0, 1.0, 0.0, 1.0, 0.0, 1.0]
-DataRepresentation1.CubeAxesXAxisMinorTickVisibility = 1
-DataRepresentation1.Orientation = [0.0, 0.0, 0.0]
-DataRepresentation1.CubeAxesXTitle = 'X-Axis'
-DataRepresentation1.ScalarOpacityUnitDistance = 313870.26193506655
-DataRepresentation1.BackfaceOpacity = 1.0
-DataRepresentation1.SelectionCellFieldDataArrayName = 'vtkOriginalCellIds'
-DataRepresentation1.SelectionColor = [1.0, 0.0, 1.0]
-DataRepresentation1.Ambient = 0.0
-DataRepresentation1.SelectionPointLabelFontSize = 18
-DataRepresentation1.ScaleFactor = 1.0
-DataRepresentation1.BackfaceAmbientColor = [1.0, 1.0, 1.0]
-DataRepresentation1.Source.ShaftRadius = 0.03
-DataRepresentation1.ScalarOpacityFunction = a1_TEMP_PiecewiseFunction
-DataRepresentation1.SelectMaskArray = ''
-DataRepresentation1.SelectionLineWidth = 2.0
-DataRepresentation1.CubeAxesZAxisMinorTickVisibility = 1
-DataRepresentation1.CubeAxesXAxisVisibility = 1
-DataRepresentation1.Interpolation = 'Gouraud'
-DataRepresentation1.SelectMapper = 'Projected tetra'
-DataRepresentation1.SelectionCellLabelFontFamily = 'Arial'
-DataRepresentation1.SelectionCellLabelItalic = 0
-DataRepresentation1.CubeAxesYAxisMinorTickVisibility = 1
-DataRepresentation1.CubeAxesZGridLines = 0
-DataRepresentation1.ExtractedBlockIndex = 0
-DataRepresentation1.SelectionPointLabelOpacity = 1.0
-DataRepresentation1.Pickable = 1
-DataRepresentation1.CustomBoundsActive = [0, 0, 0]
-DataRepresentation1.SelectionRepresentation = 'Wireframe'
-DataRepresentation1.SelectionPointLabelBold = 0
-DataRepresentation1.ColorArrayName = 'TEMP'
-DataRepresentation1.SelectionPointLabelItalic = 0
-DataRepresentation1.SpecularColor = [1.0, 1.0, 1.0]
-DataRepresentation1.LookupTable = a1_TEMP_PVLookupTable
-DataRepresentation1.SelectionPointSize = 5.0
-DataRepresentation1.SelectionCellLabelBold = 0
-DataRepresentation1.Orient = 0
-
-
-
-IterateOverTimeSteps(globalController, timeCompartmentSize, timeSteps, tp_writers, tp_views)
diff --git a/uvcdatspt/scripts/benchmark.py b/uvcdatspt/scripts/benchmark.py
deleted file mode 100644
index dca7f2ab8..000000000
--- a/uvcdatspt/scripts/benchmark.py
+++ /dev/null
@@ -1,626 +0,0 @@
-"""
-This module has utilities to benchmark paraview.
-
-First, when run standalone, this will do a simple rendering benchmark test. The
-test renders a sphere with various rendering settings and reports the rendering
-rate achieved in triangles/sec. run() is the entrypoint for that usage.
-
-Second, you can set up arbitrary pipelines and this module helps you obtain,
-interpret and report the information recorded by ParaView's logs.
-Do that like so:
-1) optionally, call maximize logs first
-2) setup and run your visualization pipeline (via GUI or script as you prefer)
-3) either
-- call print_logs() to print out the logs in raw format
-or
-- call parse_logs() to let the script identify and report on per frame and per
-filter execution times
-
-WARNING: This was meant for server side rendering, but it could work
-reasonably well when geometry is delivered to the client and rendered there
-if the script were changed to recognize MPIMoveData as end of frame and did
-something sensible on the server which has no other end of frame knowledge
-
-TODO: builtin mode shouldn't show server info, it is redundant
-TODO: this doesn't handle split render/data server mode
-TODO: the end of frame markers are heuristic, likely buggy, and have not
-been tried since before 3.9's view restructuring
-"""
-
-import time
-import sys
-from paraview.simple import *
-
-try:
-    import numpy
-    numpy_loaded = True
-except ImportError:
-    numpy_loaded = False
-
-import re
-import paraview
-import copy
-import pickle
-
-# a regular expression to parse filter execution time
-match_filter = re.compile(" *Execute (\w+) id: +(\d+), +(\d*.*\d+) +seconds")
-match_vfilter = re.compile(" *Execute (\w+) +, +(\d*.*\d+) +seconds")
-
-# a regular expression to parse overall rendering time
-match_still_render = re.compile(" *(Still) Render, +(\d*.*\d+) +seconds")
-match_interactive_render = \
-re.compile(" *(Interactive) Render, +(\d*.*\d+) +seconds")
-match_render = re.compile(" *(\w+|\w+ Dev) Render, +(\d*.*\d+) +seconds")
-match_icetrender = re.compile("(IceT Dev) Render, +(\d*.*\d+) +seconds")
-
-# more for parallel composite and delivery time
-match_composite = re.compile(" *Compositing, +(\d*.*\d+) +seconds")
-match_send = re.compile(" *Sending, +(\d*.*\d+) +seconds")
-match_receive = re.compile(" *Receiving, +(\d*.*\d+) +seconds")
-
-match_comp_xmit = \
-re.compile(" *TreeComp (Send|Receive) (\d+) " + \
-           "(to|from) (\d+) uchar (\d+), +(\d*.*\d+) +seconds")
-match_comp_comp = re.compile(" *TreeComp composite, *(\d*.*\d+) +seconds")
-
-showparse = False
-
-#icet composite message comes after the render messages,
-#where for bswap and manta it comes before so we have to treat icet differently
-icetquirk = False
-
-start_frame = 0
-default_log_threshold = dict()
-default_buffer_length = dict()
-
-class OneLog :
-    def __init__(self):
-        self.runmode = 'batch'
-        self.servertype = 'unified'
-        self.component = 0x10
-        self.rank = 0
-        self.lines = []
-
-    def componentString(self):
-        ret = ""
-        if self.component & 0x10:
-            ret = ret + " CLIENT "
-        if self.component & 0x4:
-            ret = ret + " RENDER "
-        if self.component & 0x1:
-            ret = ret + " DATA "
-        return ret
-
-    def print_log(self, showlines=False):
-        print "#RunMode:", self.runmode,
-        print "ServerType:", self.servertype,
-        print "Component:", self.componentString(),
-        print "processor#:", self.rank
-        if showlines:
-            for i in self.lines:
-                print i
-
-logs = []
-
-def maximize_logs () :
-    """
-    Convenience method to ask paraview to produce logs with lots of space and
-    highest resolution.
-    """
-    pm = paraview.servermanager.vtkProcessModule.GetProcessModule()
-    if pm == None:
-        return
-
-    # Not used here...
-    default_buffer_length[str(0x01)] = 1000000
-    default_buffer_length[str(0x04)] = 1000000
-    default_buffer_length[str(0x10)] = 1000000
-
-    default_log_threshold[str(0x01)] = 0.0
-    default_log_threshold[str(0x04)] = 0.0
-    default_log_threshold[str(0x10)] = 0.0
-
-
-def dump_logs( filename ) :
-    """
-    This saves off the logs we've gathered.
-    Ot allows you to run a benchmark somewhere, save off all of the details in
-    raw format, then load them somewhere else. You can then do a detailed
-    analysis and you always have the raw data to go back to.
-    """
-    global logs
-    f = open(filename, "w")
-    pickle.dump(logs, f)
-    f.close()
-
-def import_logs( filename ) :
-    """
-    This is for bringing in a saved log files and parse it after the fact.
-    TODO: add an option to load in raw parview logs in text format
-    """
-    global logs
-    logs = []
-    f = open(filename, "r")
-    logs = pickle.load(f)
-    f.close()
-
-def get_logs() :
-    """
-    This is for bringing in logs at run time to parse while running.
-    """
-    global logs
-    logs = []
-
-    pm = paraview.servermanager.vtkProcessModule.GetProcessModule()
-    if pm == None:
-        return
-
-    connectionId = paraview.servermanager.ActiveConnection.ID
-    session = paraview.servermanager.ActiveConnection.Session
-    pmOptions = pm.GetOptions()
-
-    """
-    vtkPVOptions::ProcessTypeEnum
-    PARAVIEW = 0x2,
-    PVCLIENT = 0x4,
-    PVSERVER = 0x8,
-    PVRENDER_SERVER = 0x10,
-    PVDATA_SERVER = 0x20,
-    PVBATCH = 0x40,
-    """
-    if pmOptions.GetProcessType() == 0x40:
-        runmode = 'batch'
-    else:
-        runmode = 'interactive'
-
-    """
-    vtkSMSession::RenderingMode
-    RENDERING_NOT_AVAILABLE = 0x00,
-    RENDERING_UNIFIED = 0x01,
-    RENDERING_SPLIT = 0x02
-    """
-    if session.GetRenderClientMode() == 0x01:
-        servertype = 'unified'
-    else:
-        servertype = 'split'
-
-    """
-    vtkProcessModule::SERVER_FLAGS
-    DATA_SERVER = 0x01,
-    DATA_SERVER_ROOT = 0x02,
-    RENDER_SERVER = 0x04,
-    RENDER_SERVER_ROOT = 0x08,
-    SERVERS = DATA_SERVER | RENDER_SERVER,
-    CLIENT = 0x10,
-    CLIENT_AND_SERVERS = DATA_SERVER | CLIENT | RENDER_SERVER
-    """
-    if runmode == 'batch':
-        components = [0x04]
-    else:
-        if servertype == 'unified':
-            components = [0x10, 0x04]
-        else:
-            components = [0x10, 0x04, 0x01]
-
-    for component in components:
-        timerInfo = paraview.servermanager.vtkPVTimerInformation()
-        if len(default_log_threshold) != 0:
-           timerInfo.SetLogThreshold(default_log_threshold[str(component)])
-        session.GatherInformation(component, timerInfo, 0)
-
-        for i in range(timerInfo.GetNumberOfLogs()):
-            alog = OneLog()
-            alog.runmode = runmode
-            alog.servertype = servertype
-            alog.component = component
-            alog.rank = i
-            for line in timerInfo.GetLog(i).split('\n'):
-                alog.lines.append(line)
-            logs.append(alog)
-
-def print_logs() :
-    global logs
-
-    if len(logs) == 0:
-        get_logs()
-
-    for i in logs:
-       i.print_log(True)
-
-def __process_frame() :
-    global filters
-    global current_frames_records
-    global frames
-    global start_frame
-
-    max = len(current_frames_records)
-
-    #determine ancestry of each record from order and indent
-    #subtract only immediate children from each record
-
-    #TODO: Make this an option
-    for x in xrange(max):
-        indent = current_frames_records[x]['indent']
-        minindent = 10000
-        for y in xrange(x+1,max):
-            indent2 = current_frames_records[y]['indent']
-            if indent2<=indent:
-                #found a record which is not a descendant
-                break
-            if indent2 < minindent:
-                minindent = indent2
-        for y in xrange(x+1,max):
-            indent2 = current_frames_records[y]['indent']
-            if indent2 == minindent:
-                current_frames_records[x]['local_duration'] = \
-                current_frames_records[x]['local_duration'] -\
-                current_frames_records[y]['duration']
-
-    for x in xrange(max):
-        #keep global statics per filter
-        record = current_frames_records[x]
-        id = record['id']
-        if id in filters:
-            srecord = filters[id]
-            srecord['duration'] = srecord['duration'] + record['duration']
-            srecord['local_duration'] = srecord['local_duration'] +\
-                                        record['local_duration']
-            srecord['count'] = srecord['count'] + 1
-            filters[id] = srecord
-        else:
-            filters[id] = copy.deepcopy(record)
-
-    #save off this frame and begin the next
-    frames.append(current_frames_records)
-    current_frames_records = []
-
-def __parse_line (line) :
-    """
-    Examine one line from the logs. If it is a report about a filter's
-    execution time, parse the relevant information out of the line and
-    collect those statistics. We record each filter's average execution
-    time as well as the each filters contribution to the each rendered frame.
-    """
-    global filters
-    global current_frames_records
-    global cnt
-    global show_input
-    global icetquirk
-
-    found = False
-
-    #find indent
-    cnt = 0
-    for c in range(len(line)):
-        if line[c] == " ":
-            cnt = cnt + 1
-        else:
-            break
-
-    #determine if this log comes from icet so we can
-    #do special case treatement for frame markings
-    icetline = False
-    match = match_icetrender.match(line)
-    if match != None:
-        icetquirk = True
-        icetline = True
-
-    match = match_filter.match(line)
-    if match != None:
-        found = True
-        if showparse:
-            print "FILT:", cnt, line
-        name = match.group(1)
-        id = match.group(2)
-        duration = match.group(3)
-
-    match = match_vfilter.match(line)
-    if match != None:
-        found = True
-        if showparse:
-            print "LFLT:", cnt, line
-        name = match.group(1)
-        id = name
-        duration = match.group(2)
-
-    match = match_comp_comp.match(line)
-    if match != None:
-        found = True
-        if showparse:
-            print "TCMP:", cnt, line
-        name = "tree comp"
-        id = name
-        duration = match.group(1)
-
-    match = match_comp_xmit.match(line)
-    if match != None:
-        found = True
-        if showparse:
-            print "TXMT:", cnt, line
-        name = match.group(1)
-        id = name
-        duration = match.group(6)
-
-    match = match_composite.match(line)
-    if match != None:
-        found = True
-        if showparse:
-            print "COMP:", cnt, line
-        name = 'composite'
-        id = 'comp'
-        duration = match.group(1)
-
-    match = match_send.match(line)
-    if match != None:
-        found = True
-        if showparse:
-            print "SEND:", cnt, line
-        name = 'send'
-        id = 'send'
-        duration = match.group(1)
-
-    match = match_receive.match(line)
-    if match != None:
-        found = True
-        if showparse:
-            print "RECV:", cnt, line
-        name = 'receive'
-        id = 'recv'
-        duration = match.group(1)
-
-    match = match_still_render.match(line)
-    if match != None:
-        found = True
-        if showparse:
-            print "STILL:", cnt, line
-        name = match.group(1)
-        id = 'still'
-        duration = match.group(2)
-
-    if match == None:
-        match = match_interactive_render.match(line)
-        if match != None:
-            found = True
-            if showparse:
-                print "INTER:", cnt, line
-            name = match.group(1)
-            id = 'inter'
-            duration = match.group(2)
-
-    if match == None:
-        match = match_render.match(line)
-        if match != None:
-            found = True
-            if showparse:
-                print "REND:", cnt, line
-            name = match.group(1)
-            id = 'render'
-            duration = match.group(2)
-
-    if found == False:
-        # we didn't find anything we recognized in this line, ignore it
-        if showparse:
-            print "????:", cnt, line
-        return
-
-    record = dict()
-    record['id'] = id
-    record['name'] = name
-    record['duration'] = float(duration)
-    record['local_duration'] = float(duration)
-    record['count'] = 1
-    record['indent'] = cnt
-
-    #watch for the beginning of the next frame/end of previous frame
-    if cnt == 0:
-        if (id == 'still') or \
-           (id == 'inter') or \
-           (icetquirk == False and id == 'comp') or \
-           (icetquirk == True and icetline == True) :
-            if showparse:
-                print "SOF" #start of frame
-            #decipher parent child information from records in the frame
-            #and save off newly gathered per filter and per frame statistics
-            __process_frame()
-
-    #keep a record of this execution as part for the current frame
-    current_frames_records.append(record)
-
-    return
-
-def parse_logs(show_parse = False, tabular = False) :
-    """
-    Parse the collected paraview log information.
-    This prints out per frame, and aggregated per filter statistics.
-
-    If show_parse is true, debugging information is shown about the parsing
-    process that allows you to verify that the derived stats are correct.
-    This includes each and echo of each log line collected, prepended by
-    the token type and indent scanned in, or ???? if the line is unrecognized
-    and ignored. Frame boundaries are denoted by SOF, indicating the preceeding
-    line was determined to be the start of the next frame.
-    """
-
-    global filters
-    global current_frames_records
-    global frames
-    global cnt
-    global showparse
-    global start_frame
-
-    showparse = show_parse
-
-    if len(logs) == 0:
-        get_logs()
-
-    for i in logs:
-        # per filter records
-        filters = dict()
-        filters.clear()
-        # per frame records
-        frames = []
-        # components of current frame
-        current_frames_records = []
-        cnt = 0
-
-        runmode = i.runmode
-        servertype = i.servertype
-        component = i.component
-        rank = i.rank
-        i.print_log(False)
-
-        for line in i.lines:
-            __parse_line(line)
-
-        #collect stats for the current frame in process but not officially ended
-        __process_frame()
-
-        #print out the gathered per frame information
-        if tabular:
-            frecs = dict()
-            line = "#framenum, "
-            for x in filters:
-                line += filters[x]['name'] + ":" + filters[x]['id']  + ", "
-            #print line
-            for cnt in xrange(start_frame, len(frames)):
-                line = ""
-                line += str(cnt) + ", "
-                printed = dict()
-                for x in filters:
-                    id = filters[x]['id']
-                    name = filters[x]['name']
-                    found = False
-                    for record in frames[cnt]:
-                        if 'id' in record:
-                            if record['id'] == id and \
-                            record['name'] == name and \
-                            not id in printed:
-                                found = True
-                                printed[id] = 1
-                                line += str(record['local_duration']) + ", "
-                                if not id in frecs:
-                                    frecs[id] = []
-                                frecs[id].append(record['local_duration'])
-                    if not found:
-                        line += "0, "
-                #print line
-            #print
-            for x in frecs.keys():
-                v = frecs[x]
-                print "# ", x, len(v),
-                if numpy_loaded:
-                    print numpy.min(v), numpy.mean(v), numpy.max(v),
-                    print numpy.std(v)
-        else:
-            print "#FRAME TIMINGS"
-            print "#filter id, filter type, inclusive duration, local duration"
-            for cnt in xrange(start_frame, len(frames)):
-                print "#Frame ", cnt
-                for record in frames[cnt]:
-                    if 'id' in record:
-                        print record['id'], ",",
-                        print record['name'], ",",
-                        print record['duration'], ",",
-                        print record['local_duration']
-        #print
-        #print
-
-        if not tabular:
-            #print out the gathered per filter information
-            print "#FILTER TIMINGS"
-            print "#filter id, filter type, count, "+\
-                  "sum inclusive duration, sum local duration"
-            for x in filters:
-                record = filters[x]
-                print record['id'], ",",
-                print record['name'], ",",
-                print record['count'], ",",
-                print record['duration'], ",",
-                print record['local_duration']
-            print
-
-def __render(ss, v, title, nframes):
-    print '============================================================'
-    print title
-    res = []
-    res.append(title)
-    for phires in (500, 1000):
-        ss.PhiResolution = phires
-        c = v.GetActiveCamera()
-        v.CameraPosition = [-3, 0, 0]
-        v.CameraFocalPoint = [0, 0, 0]
-        v.CameraViewUp = [0, 0, 1]
-        Render()
-        c1 = time.time()
-        for i in range(nframes):
-            c.Elevation(0.5)
-            Render()
-            if not servermanager.fromGUI:
-                sys.stdout.write(".")
-                sys.stdout.flush()
-        if not servermanager.fromGUI:
-            sys.stdout.write("\n")
-        tpr = (time.time() - c1)/nframes
-        ncells = ss.GetDataInformation().GetNumberOfCells()
-        print tpr, " secs/frame"
-        print ncells, " polys"
-        print ncells/tpr, " polys/sec"
-
-        res.append((ncells, ncells/tpr))
-    return res
-
-def run(filename=None, nframes=60):
-    """ Runs the benchmark. If a filename is specified, it will write the
-    results to that file as csv. The number of frames controls how many times
-    a particular configuration is rendered. Higher numbers lead to more accurate
-    averages. """
-    # Turn off progress printing
-    paraview.servermanager.SetProgressPrintingEnabled(0)
-
-    # Create a sphere source to use in the benchmarks
-    ss = Sphere(ThetaResolution=1000, PhiResolution=500)
-    rep = Show()
-    v = Render()
-    results = []
-
-    # Start with these defaults
-    #v.RemoteRenderThreshold = 0
-    obj = servermanager.misc.GlobalMapperProperties()
-    obj.GlobalImmediateModeRendering = 0
-
-    # Test different configurations
-    title = 'display lists, no triangle strips, solid color'
-    obj.GlobalImmediateModeRendering = 0
-    results.append(__render(ss, v, title, nframes))
-
-    title = 'no display lists, no triangle strips, solid color'
-    obj.GlobalImmediateModeRendering = 1
-    results.append(__render(ss, v, title, nframes))
-
-    # Color by normals
-    lt = servermanager.rendering.PVLookupTable()
-    rep.LookupTable = lt
-    rep.ColorAttributeType = 0 # point data
-    rep.ColorArrayName = "Normals"
-    lt.RGBPoints = [-1, 0, 0, 1, 0.0288, 1, 0, 0]
-    lt.ColorSpace = 'HSV'
-    lt.VectorComponent = 0
-
-    title = 'display lists, no triangle strips, color by array'
-    obj.GlobalImmediateModeRendering = 0
-    results.append(__render(ss, v, title, nframes))
-
-    title = 'no display lists, no triangle strips, color by array'
-    obj.GlobalImmediateModeRendering = 1
-    results.append(__render(ss, v, title, nframes))
-
-    if filename:
-        f = open(filename, "w")
-    else:
-        f = sys.stdout
-    print >>f, 'configuration, %d, %d' % (results[0][1][0], results[0][2][0])
-    for i in results:
-        print >>f, '"%s", %g, %g' % (i[0], i[1][1], i[2][1])
-
-if __name__ == "__main__":
-    run()
diff --git a/uvcdatspt/scripts/ocean.py b/uvcdatspt/scripts/ocean.py
deleted file mode 100644
index 932d4e2de..000000000
--- a/uvcdatspt/scripts/ocean.py
+++ /dev/null
@@ -1,187 +0,0 @@
-
-try: paraview.simple
-except: from paraview.simple import *
-
-import sys
-import os
-import paraview
-
-import benchmark
-
-# trying to import the library where I can specify the global and subcontrollers
-try:
-    import libvtkParallelPython as vtkParallel # requires LD_LIBRARY_PATH being properly set
-except ImportError:
-    import vtkParallelPython as vtkParallel # for a static build, i.e. jaguarpf, use this instead and don't worry about LD_LIBRARY_PATH
-
-
-# global variables
-timeCompartmentSize = 4
-input_files = "/home/boonth/Desktop/spatio/ocean_4/SALT*"
-iso_files = "/home/boonth/Desktop/spatio/ocean/salt_%i.pvtp"
-
-currentTimeStep = -1
-log_lines_per_file = 5
-
-
-# some initial setup
-benchmark.maximize_logs()
-
-pm = paraview.servermanager.vtkProcessModule.GetProcessModule()
-timer = paraview.vtk.vtkTimerLog()
-if len(sys.argv) < 1:
-    print 'usage: <num files>'
-else:
-    num_files = int(sys.argv[1])
-numprocs = pm.GetGlobalController().GetNumberOfProcesses()
-timer.SetMaxEntries(log_lines_per_file * num_files * numprocs + 2)
-pm.GetGlobalController().Barrier()
-timer.StartTimer()
-
-paraview.options.batch = True # this may not be necessary
-paraview.simple._DisableFirstRenderCameraReset()
-
-def CreateTimeCompartments(globalController, timeCompartmentSize):
-    if globalController.GetNumberOfProcesses() == 1:
-        print 'single process'
-        return
-    elif globalController.GetNumberOfProcesses() % timeCompartmentSize != 0:
-        print 'number of processes must be an integer multiple of time compartment size'
-        return
-    elif timeCompartmentSize == globalController.GetNumberOfProcesses():
-        return globalController
-
-    gid = globalController.GetLocalProcessId()
-    timeCompartmentGroupId = int (gid / timeCompartmentSize )
-    newController = globalController.PartitionController(timeCompartmentGroupId, gid % timeCompartmentSize)
-    # must unregister if the reference count is greater than 1
-    if newController.GetReferenceCount() > 1:
-        newController.UnRegister(None)
-
-    #print gid, timeCompartmentGroupId, gid % timeCompartmentSize
-    print gid, ' of global comm is ', newController.GetLocalProcessId()
-    globalController.SetGlobalController(newController)
-    return newController
-
-def CheckReader(reader):
-    if hasattr(reader, "FileName") == False:
-        print "ERROR: Don't know how to set file name for ", reader.SMProxy.GetXMLName()
-        sys.exit(-1)
-
-    if hasattr(reader, "TimestepValues") == False:
-        print "ERROR: ", reader.SMProxy.GetXMLName(), " doesn't have time information"
-        sys.exit(-1)
-
-def CreateControllers(timeCompartmentSize):
-    pm = paraview.servermanager.vtkProcessModule.GetProcessModule()
-    globalController = pm.GetGlobalController()
-    if timeCompartmentSize > globalController.GetNumberOfProcesses():
-        timeCompartmentSize = globalController.GetNumberOfProcesses()
-
-    temporalController = CreateTimeCompartments(globalController, timeCompartmentSize)
-    return globalController, temporalController, timeCompartmentSize
-
-def UpdateCurrentTimeStep(globalController, timeCompartmentSize):
-    global currentTimeStep
-    if currentTimeStep == -1:
-        currentTimeStep = globalController.GetLocalProcessId() / timeCompartmentSize
-        return currentTimeStep
-
-    numTimeStepsPerIteration = globalController.GetNumberOfProcesses() / timeCompartmentSize
-    currentTimeStep = currentTimeStep + numTimeStepsPerIteration
-    return currentTimeStep
-
-def WriteImages(currentTimeStep, currentTime, views):
-    for view in views:
-        filename = view.tpFileName.replace("%t", str(currentTimeStep))
-        view.ViewTime = currentTime
-        WriteImage(filename, view, Magnification=view.tpMagnification)
-
-def WriteFiles(currentTimeStep, currentTime, writers, reader, contour):
-    for writer in writers:
-        originalfilename = writer.FileName
-        fname = originalfilename.replace("%t", str(currentTimeStep))
-        #folder = (currentTimeStep % 3) + 1
-        #fname = originalfilename % (folder, currentTimeStep)
-        writer.FileName = fname
-        writer.UpdatePipeline(currentTime)
-        writer.FileName = originalfilename
-
-def IterateOverTimeSteps(globalController, timeCompartmentSize, timeSteps, writers, views, reader, contour):
-    currentTimeStep = UpdateCurrentTimeStep(globalController, timeCompartmentSize)
-    while currentTimeStep < len(timeSteps):
-        print globalController.GetLocalProcessId(), " is working on ", currentTimeStep
-        sys.stdout.flush()
-        WriteImages(currentTimeStep, timeSteps[currentTimeStep], views)
-        WriteFiles(currentTimeStep, timeSteps[currentTimeStep], writers, reader, contour)
-        currentTimeStep = UpdateCurrentTimeStep(globalController, timeCompartmentSize)
-
-def CreateReader(ctor, args, fileInfo):
-    "Creates a reader, checks if it can be used, and sets the filenames"
-    reader = ctor()
-    CheckReader(reader)
-    import glob
-    files = glob.glob(fileInfo)
-    files.sort() # assume there is a logical ordering of the filenames that corresponds to time ordering
-    reader.FileName = files
-    for a in args:
-        s = "reader."+a
-        exec (s)
-
-    return reader
-
-def CreateWriter(ctor, filename, tp_writers):
-    writer = ctor()
-    writer.FileName = filename
-    tp_writers.append(writer)
-    return writer
-
-def CreateView(proxy_ctor, filename, magnification, width, height, tp_views):
-    view = proxy_ctor()
-    view.add_attribute("tpFileName", filename)
-    view.add_attribute("tpMagnification", magnification)
-    tp_views.append(view)
-    view.ViewSize = [width, height]
-    return view
-
-def main():
-
-    global timer
-    global timeCompartmentSize
-
-    tp_writers = []
-    tp_views = []
-
-    # ============ end of specialized temporal parallelism sections ==========
-
-    globalController, temporalController, timeCompartmentSize = CreateControllers(timeCompartmentSize)
-
-    reader = CreateReader( NetCDFReader, ["Dimensions='(depth_t, t_lat, t_lon)'", 'ReplaceFillValueWithNan=0', 'VerticalBias=0.0', "OutputType='Automatic'", 'SphericalCoordinates=1', 'VerticalScale=1.0'], input_files )
-    timeSteps = GetActiveSource().TimestepValues
-    if len(timeSteps) == 0:
-        timeSteps = [0.0]
-    contour = Contour( guiName="contour", Isosurfaces=[0.03], ComputeNormals=1, ComputeGradients=0, ComputeScalars=0, ContourBy=['POINTS', 'SALT'], PointMergeMethod="Uniform Binning" )
-    contour.PointMergeMethod.Numberofpointsperbucket = 8
-    contour.PointMergeMethod.Divisions = [50, 50, 50]
-
-    ParallelPolyDataWriter2 = CreateWriter(XMLPPolyDataWriter,iso_files,tp_writers)
-
-    IterateOverTimeSteps(globalController, timeCompartmentSize, timeSteps, tp_writers, tp_views, reader, contour)
-
-    globalController.Barrier()
-    timer.StopTimer()
-
-    gid = globalController.GetLocalProcessId()
-    if gid == 0:
-        print 'all done! -- total time is', timer.GetElapsedTime(), 'seconds'
-
-    benchmark.get_logs()
-    if gid == 0:
-        benchmark.print_logs()
-
-if __name__ == '__main__':
-    if len(sys.argv) < 1:
-        print 'usage: <num files>'
-    else:
-        main()
-    
-- 
GitLab


From b93d3db6af2fca6e44a4c1d4109cffde29408cc9 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 7 Jun 2016 16:09:49 -0700
Subject: [PATCH 147/191] major cleanup part 2

---
 CMake/ESMP.patch                              |    33 -
 CMake/cdat_modules/basemap_deps.cmake         |     1 -
 CMake/cdat_modules/basemap_external.cmake     |    39 -
 CMake/cdat_modules/basemap_pkg.cmake          |    10 -
 CMake/cdat_modules/cairo_deps.cmake           |     1 -
 CMake/cdat_modules/cairo_external.cmake       |    18 -
 CMake/cdat_modules/cairo_pkg.cmake            |    14 -
 CMake/cdat_modules/cd77_deps.cmake            |     1 -
 CMake/cdat_modules/cd77_external.cmake        |    16 -
 CMake/cdat_modules/cd77_pkg.cmake             |    13 -
 CMake/cdat_modules/cdatlogger_deps.cmake      |     2 -
 CMake/cdat_modules/cdatlogger_external.cmake  |    16 -
 CMake/cdat_modules/cdatlogger_pkg.cmake       |     4 -
 CMake/cdat_modules/cffi_deps.cmake            |     1 -
 CMake/cdat_modules/cffi_external.cmake        |     6 -
 CMake/cdat_modules/cffi_pkg.cmake             |    10 -
 CMake/cdat_modules/clapack_deps.cmake         |     1 -
 CMake/cdat_modules/clapack_external.cmake     |    39 -
 CMake/cdat_modules/clapack_pkg.cmake          |    15 -
 CMake/cdat_modules/click_deps.cmake           |     1 -
 CMake/cdat_modules/click_external.cmake       |     6 -
 CMake/cdat_modules/click_pkg.cmake            |    13 -
 CMake/cdat_modules/cligj_deps.cmake           |     1 -
 CMake/cdat_modules/cligj_external.cmake       |     6 -
 CMake/cdat_modules/cligj_pkg.cmake            |    14 -
 CMake/cdat_modules/cmcurl_external.cmake      |    25 -
 CMake/cdat_modules/cmor_deps.cmake            |     1 -
 CMake/cdat_modules/cmor_external.cmake        |    22 -
 CMake/cdat_modules/cmor_pkg.cmake             |    14 -
 CMake/cdat_modules/configobj_deps.cmake       |     1 -
 CMake/cdat_modules/configobj_external.cmake   |    24 -
 CMake/cdat_modules/configobj_pkg.cmake        |    18 -
 CMake/cdat_modules/coverage_deps.cmake        |     1 -
 CMake/cdat_modules/coverage_external.cmake    |     4 -
 CMake/cdat_modules/coverage_pkg.cmake         |    10 -
 CMake/cdat_modules/cryptography_deps.cmake    |     1 -
 .../cdat_modules/cryptography_external.cmake  |    12 -
 CMake/cdat_modules/cryptography_pkg.cmake     |    10 -
 CMake/cdat_modules/curl_deps.cmake            |     1 -
 CMake/cdat_modules/curl_external.cmake        |    17 -
 CMake/cdat_modules/curl_pkg.cmake             |    13 -
 CMake/cdat_modules/curses_deps.cmake          |     1 -
 CMake/cdat_modules/curses_external.cmake      |    22 -
 CMake/cdat_modules/curses_pkg.cmake           |    16 -
 CMake/cdat_modules/cycler_deps.cmake          |     1 -
 CMake/cdat_modules/cycler_external.cmake      |    16 -
 CMake/cdat_modules/cycler_pkg.cmake           |    10 -
 CMake/cdat_modules/cython_deps.cmake          |     1 -
 CMake/cdat_modules/cython_external.cmake      |    21 -
 CMake/cdat_modules/cython_pkg.cmake           |    10 -
 CMake/cdat_modules/data_deps.cmake            |     1 -
 CMake/cdat_modules/data_pkg.cmake             |    17 -
 CMake/cdat_modules/dateutils_deps.cmake       |     1 -
 CMake/cdat_modules/dateutils_external.cmake   |    12 -
 CMake/cdat_modules/dateutils_pkg.cmake        |    11 -
 CMake/cdat_modules/distribute_deps.cmake      |     1 -
 CMake/cdat_modules/distribute_external.cmake  |    21 -
 CMake/cdat_modules/distribute_pkg.cmake       |    12 -
 CMake/cdat_modules/docutils_deps.cmake        |     1 -
 CMake/cdat_modules/docutils_external.cmake    |     6 -
 CMake/cdat_modules/docutils_pkg.cmake         |    12 -
 CMake/cdat_modules/enum34_deps.cmake          |     1 -
 CMake/cdat_modules/enum34_external.cmake      |     8 -
 CMake/cdat_modules/enum34_pkg.cmake           |    10 -
 CMake/cdat_modules/eof2_deps.cmake            |     1 -
 CMake/cdat_modules/eof2_external.cmake        |    16 -
 CMake/cdat_modules/eof2_pkg.cmake             |     9 -
 CMake/cdat_modules/eofs_deps.cmake            |     1 -
 CMake/cdat_modules/eofs_external.cmake        |    16 -
 CMake/cdat_modules/eofs_pkg.cmake             |    10 -
 CMake/cdat_modules/esmf_deps.cmake            |     5 -
 CMake/cdat_modules/esmf_external.cmake        |    78 -
 CMake/cdat_modules/esmf_pkg.cmake             |    57 -
 CMake/cdat_modules/ezget_deps.cmake           |     1 -
 CMake/cdat_modules/ezget_external.cmake       |    43 -
 CMake/cdat_modules/ezget_pkg.cmake            |    10 -
 CMake/cdat_modules/ffi_deps.cmake             |     1 -
 CMake/cdat_modules/ffi_external.cmake         |    16 -
 CMake/cdat_modules/ffi_pkg.cmake              |    13 -
 CMake/cdat_modules/ffmpeg_deps.cmake          |     1 -
 CMake/cdat_modules/ffmpeg_external.cmake      |    32 -
 CMake/cdat_modules/ffmpeg_pkg.cmake           |    14 -
 CMake/cdat_modules/fiona_deps.cmake           |     1 -
 CMake/cdat_modules/fiona_external.cmake       |     6 -
 CMake/cdat_modules/fiona_pkg.cmake            |    17 -
 CMake/cdat_modules/flake8_deps.cmake          |     1 -
 CMake/cdat_modules/flake8_external.cmake      |    19 -
 CMake/cdat_modules/flake8_pkg.cmake           |    17 -
 CMake/cdat_modules/fontconfig_deps.cmake      |     1 -
 CMake/cdat_modules/fontconfig_external.cmake  |    18 -
 CMake/cdat_modules/fontconfig_pkg.cmake       |    17 -
 CMake/cdat_modules/freetype_deps.cmake        |     1 -
 CMake/cdat_modules/freetype_external.cmake    |    24 -
 CMake/cdat_modules/freetype_pkg.cmake         |    18 -
 CMake/cdat_modules/g2clib_deps.cmake          |     1 -
 CMake/cdat_modules/g2clib_external.cmake      |    18 -
 CMake/cdat_modules/g2clib_pkg.cmake           |    11 -
 CMake/cdat_modules/gdal_deps.cmake            |     1 -
 CMake/cdat_modules/gdal_external.cmake        |    25 -
 CMake/cdat_modules/gdal_pkg.cmake             |    17 -
 CMake/cdat_modules/geos_deps.cmake            |     1 -
 CMake/cdat_modules/geos_external.cmake        |    16 -
 CMake/cdat_modules/geos_pkg.cmake             |    13 -
 CMake/cdat_modules/ghostscript_deps.cmake     |     1 -
 CMake/cdat_modules/ghostscript_external.cmake |    19 -
 CMake/cdat_modules/ghostscript_pkg.cmake      |     2 -
 CMake/cdat_modules/gifsicle_external.cmake    |    16 -
 CMake/cdat_modules/gsw_deps.cmake             |     1 -
 CMake/cdat_modules/gsw_external.cmake         |    24 -
 CMake/cdat_modules/gsw_pkg.cmake              |    18 -
 CMake/cdat_modules/gui_support_deps.cmake     |     1 -
 CMake/cdat_modules/gui_support_external.cmake |    20 -
 CMake/cdat_modules/gui_support_pkg.cmake      |     5 -
 CMake/cdat_modules/h5py_deps.cmake            |     1 -
 CMake/cdat_modules/h5py_external.cmake        |    24 -
 CMake/cdat_modules/h5py_pkg.cmake             |    18 -
 CMake/cdat_modules/hdf4_external.cmake        |    24 -
 CMake/cdat_modules/hdf5_deps.cmake            |     4 -
 CMake/cdat_modules/hdf5_external.cmake        |    40 -
 CMake/cdat_modules/hdf5_pkg.cmake             |    13 -
 CMake/cdat_modules/idna_deps.cmake            |     1 -
 CMake/cdat_modules/idna_external.cmake        |     6 -
 CMake/cdat_modules/idna_pkg.cmake             |    10 -
 CMake/cdat_modules/ipaddress_deps.cmake       |     1 -
 CMake/cdat_modules/ipaddress_external.cmake   |     6 -
 CMake/cdat_modules/ipaddress_pkg.cmake        |    10 -
 CMake/cdat_modules/ipython_deps.cmake         |     5 -
 CMake/cdat_modules/ipython_external.cmake     |     7 -
 CMake/cdat_modules/ipython_pkg.cmake          |    10 -
 CMake/cdat_modules/jasper_deps.cmake          |     1 -
 CMake/cdat_modules/jasper_external.cmake      |    20 -
 CMake/cdat_modules/jasper_pkg.cmake           |    10 -
 CMake/cdat_modules/jinja2_deps.cmake          |     1 -
 CMake/cdat_modules/jinja2_external.cmake      |     6 -
 CMake/cdat_modules/jinja2_pkg.cmake           |     9 -
 CMake/cdat_modules/jpeg_deps.cmake            |     1 -
 CMake/cdat_modules/jpeg_external.cmake        |    24 -
 CMake/cdat_modules/jpeg_pkg.cmake             |    12 -
 CMake/cdat_modules/lapack_deps.cmake          |     1 -
 CMake/cdat_modules/lapack_external.cmake      |    26 -
 CMake/cdat_modules/lapack_pkg.cmake           |    20 -
 CMake/cdat_modules/lats_deps.cmake            |     1 -
 CMake/cdat_modules/lats_external.cmake        |    44 -
 CMake/cdat_modules/lats_pkg.cmake             |    10 -
 CMake/cdat_modules/lepl_deps.cmake            |     1 -
 CMake/cdat_modules/lepl_external.cmake        |     5 -
 CMake/cdat_modules/lepl_pkg.cmake             |    12 -
 CMake/cdat_modules/libcdms_deps.cmake         |     7 -
 CMake/cdat_modules/libcdms_external.cmake     |    56 -
 CMake/cdat_modules/libcdms_pkg.cmake          |    12 -
 CMake/cdat_modules/libcf_deps.cmake           |     1 -
 CMake/cdat_modules/libcf_external.cmake       |    29 -
 CMake/cdat_modules/libcf_pkg.cmake            |    10 -
 CMake/cdat_modules/libdrs_deps.cmake          |     1 -
 CMake/cdat_modules/libdrs_external.cmake      |    49 -
 CMake/cdat_modules/libdrs_pkg.cmake           |    11 -
 CMake/cdat_modules/libdrsfortran_deps.cmake   |     1 -
 .../cdat_modules/libdrsfortran_external.cmake |    46 -
 CMake/cdat_modules/libdrsfortran_pkg.cmake    |    13 -
 CMake/cdat_modules/libxml2_deps.cmake         |     1 -
 CMake/cdat_modules/libxml2_external.cmake     |    17 -
 CMake/cdat_modules/libxml2_pkg.cmake          |    19 -
 CMake/cdat_modules/libxslt_deps.cmake         |     1 -
 CMake/cdat_modules/libxslt_external.cmake     |    20 -
 CMake/cdat_modules/libxslt_pkg.cmake          |    19 -
 CMake/cdat_modules/lxml_deps.cmake            |     1 -
 CMake/cdat_modules/lxml_external.cmake        |    26 -
 CMake/cdat_modules/lxml_pkg.cmake             |    13 -
 CMake/cdat_modules/markupsafe_deps.cmake      |     1 -
 CMake/cdat_modules/markupsafe_external.cmake  |     6 -
 CMake/cdat_modules/markupsafe_pkg.cmake       |     8 -
 CMake/cdat_modules/matplotlib_deps.cmake      |     1 -
 CMake/cdat_modules/matplotlib_external.cmake  |    38 -
 CMake/cdat_modules/matplotlib_pkg.cmake       |    17 -
 CMake/cdat_modules/mccabe_deps.cmake          |     1 -
 CMake/cdat_modules/mccabe_external.cmake      |    12 -
 CMake/cdat_modules/mccabe_pkg.cmake           |    17 -
 CMake/cdat_modules/md5_deps.cmake             |     1 -
 CMake/cdat_modules/md5_external.cmake         |     0
 CMake/cdat_modules/md5_pkg.cmake              |     3 -
 CMake/cdat_modules/mpi4py_deps.cmake          |     1 -
 CMake/cdat_modules/mpi4py_external.cmake      |    50 -
 CMake/cdat_modules/mpi4py_pkg.cmake           |    13 -
 CMake/cdat_modules/mpi_deps.cmake             |     1 -
 CMake/cdat_modules/mpi_external.cmake         |    16 -
 CMake/cdat_modules/mpi_pkg.cmake              |    14 -
 CMake/cdat_modules/myproxyclient_deps.cmake   |     1 -
 .../cdat_modules/myproxyclient_external.cmake |     6 -
 CMake/cdat_modules/myproxyclient_pkg.cmake    |    12 -
 CMake/cdat_modules/netcdf_deps.cmake          |     4 -
 CMake/cdat_modules/netcdf_external.cmake      |    31 -
 CMake/cdat_modules/netcdf_pkg.cmake           |    15 -
 CMake/cdat_modules/netcdfplus_deps.cmake      |     1 -
 CMake/cdat_modules/netcdfplus_external.cmake  |    18 -
 CMake/cdat_modules/netcdfplus_pkg.cmake       |    15 -
 CMake/cdat_modules/numexpr_deps.cmake         |     1 -
 CMake/cdat_modules/numexpr_external.cmake     |     6 -
 CMake/cdat_modules/numexpr_pkg.cmake          |    12 -
 CMake/cdat_modules/numpy_deps.cmake           |     1 -
 CMake/cdat_modules/numpy_external.cmake       |    45 -
 CMake/cdat_modules/numpy_pkg.cmake            |    16 -
 CMake/cdat_modules/ocgis_deps.cmake           |     1 -
 CMake/cdat_modules/ocgis_external.cmake       |    19 -
 CMake/cdat_modules/ocgis_pkg.cmake            |    12 -
 CMake/cdat_modules/openssl_deps.cmake         |     1 -
 CMake/cdat_modules/openssl_external.cmake     |    37 -
 CMake/cdat_modules/openssl_pkg.cmake          |    37 -
 CMake/cdat_modules/osmesa_deps.cmake          |     1 -
 CMake/cdat_modules/osmesa_external.cmake      |    26 -
 CMake/cdat_modules/osmesa_pkg.cmake           |    15 -
 CMake/cdat_modules/paraview_deps.cmake        |    17 -
 CMake/cdat_modules/paraview_external.cmake    |   262 -
 CMake/cdat_modules/paraview_pkg.cmake         |    11 -
 CMake/cdat_modules/pbmplus_external.cmake     |    32 -
 CMake/cdat_modules/pep8_deps.cmake            |     1 -
 CMake/cdat_modules/pep8_external.cmake        |    16 -
 CMake/cdat_modules/pep8_pkg.cmake             |    16 -
 CMake/cdat_modules/pip_deps.cmake             |     1 -
 CMake/cdat_modules/pip_external.cmake         |    21 -
 CMake/cdat_modules/pip_pkg.cmake              |    13 -
 CMake/cdat_modules/pixman_deps.cmake          |     1 -
 CMake/cdat_modules/pixman_external.cmake      |    21 -
 CMake/cdat_modules/pixman_pkg.cmake           |    19 -
 CMake/cdat_modules/pkgconfig_deps.cmake       |     1 -
 CMake/cdat_modules/pkgconfig_external.cmake   |    18 -
 CMake/cdat_modules/pkgconfig_pkg.cmake        |    22 -
 CMake/cdat_modules/pmw_deps.cmake             |     1 -
 CMake/cdat_modules/pmw_external.cmake         |    30 -
 CMake/cdat_modules/pmw_pkg.cmake              |    19 -
 CMake/cdat_modules/pnetcdf_deps.cmake         |     1 -
 CMake/cdat_modules/pnetcdf_external.cmake     |    17 -
 CMake/cdat_modules/pnetcdf_pkg.cmake          |    13 -
 CMake/cdat_modules/png_deps.cmake             |     1 -
 CMake/cdat_modules/png_external.cmake         |    45 -
 CMake/cdat_modules/png_pkg.cmake              |    14 -
 CMake/cdat_modules/proj4_deps.cmake           |     4 -
 CMake/cdat_modules/proj4_external.cmake       |    20 -
 CMake/cdat_modules/proj4_pkg.cmake            |    12 -
 CMake/cdat_modules/pyasn1_deps.cmake          |     1 -
 CMake/cdat_modules/pyasn1_external.cmake      |    12 -
 CMake/cdat_modules/pyasn1_pkg.cmake           |    10 -
 CMake/cdat_modules/pyclimate_deps.cmake       |     2 -
 CMake/cdat_modules/pyclimate_external.cmake   |     6 -
 CMake/cdat_modules/pyclimate_pkg.cmake        |    11 -
 CMake/cdat_modules/pycparser_deps.cmake       |     1 -
 CMake/cdat_modules/pycparser_external.cmake   |     6 -
 CMake/cdat_modules/pycparser_pkg.cmake        |    10 -
 CMake/cdat_modules/pyflakes_deps.cmake        |     1 -
 CMake/cdat_modules/pyflakes_external.cmake    |    12 -
 CMake/cdat_modules/pyflakes_pkg.cmake         |    17 -
 CMake/cdat_modules/pygments_deps.cmake        |     1 -
 CMake/cdat_modules/pygments_external.cmake    |     6 -
 CMake/cdat_modules/pygments_pkg.cmake         |     9 -
 CMake/cdat_modules/pylibxml2_deps.cmake       |     1 -
 CMake/cdat_modules/pylibxml2_external.cmake   |    17 -
 CMake/cdat_modules/pylibxml2_pkg.cmake        |    15 -
 CMake/cdat_modules/pynetcdf4_deps.cmake       |     1 -
 CMake/cdat_modules/pynetcdf4_external.cmake   |    19 -
 CMake/cdat_modules/pynetcdf4_pkg.cmake        |    13 -
 CMake/cdat_modules/pyopengl_external.cmake    |    29 -
 CMake/cdat_modules/pyopenssl_deps.cmake       |     1 -
 CMake/cdat_modules/pyopenssl_external.cmake   |     6 -
 CMake/cdat_modules/pyopenssl_pkg.cmake        |    10 -
 CMake/cdat_modules/pyparsing_deps.cmake       |     1 -
 CMake/cdat_modules/pyparsing_external.cmake   |     7 -
 CMake/cdat_modules/pyparsing_pkg.cmake        |    10 -
 CMake/cdat_modules/pyqt_deps.cmake            |     1 -
 CMake/cdat_modules/pyqt_external.cmake        |    28 -
 CMake/cdat_modules/pyqt_pkg.cmake             |    16 -
 CMake/cdat_modules/pyspharm_deps.cmake        |     1 -
 CMake/cdat_modules/pyspharm_external.cmake    |    25 -
 CMake/cdat_modules/pyspharm_pkg.cmake         |    11 -
 CMake/cdat_modules/pytables_deps.cmake        |     1 -
 CMake/cdat_modules/pytables_external.cmake    |    17 -
 CMake/cdat_modules/pytables_pkg.cmake         |    10 -
 CMake/cdat_modules/python_deps.cmake          |     1 -
 CMake/cdat_modules/python_external.cmake      |    66 -
 CMake/cdat_modules/python_pkg.cmake           |    59 -
 CMake/cdat_modules/pyzmq_deps.cmake           |     1 -
 CMake/cdat_modules/pyzmq_external.cmake       |    50 -
 CMake/cdat_modules/pyzmq_pkg.cmake            |     7 -
 CMake/cdat_modules/qt4_deps.cmake             |     1 -
 CMake/cdat_modules/qt4_pkg.cmake              |    10 -
 CMake/cdat_modules/qt_external.cmake          |    66 -
 CMake/cdat_modules/r_deps.cmake               |     4 -
 CMake/cdat_modules/r_external.cmake           |    51 -
 CMake/cdat_modules/r_pkg.cmake                |    13 -
 CMake/cdat_modules/readline_deps.cmake        |     1 -
 CMake/cdat_modules/readline_external.cmake    |    31 -
 CMake/cdat_modules/readline_pkg.cmake         |    11 -
 CMake/cdat_modules/rpy2_deps.cmake            |     1 -
 CMake/cdat_modules/rpy2_external.cmake        |    11 -
 CMake/cdat_modules/rpy2_pkg.cmake             |    11 -
 CMake/cdat_modules/sampledata_deps.cmake      |     1 -
 CMake/cdat_modules/sampledata_external.cmake  |    17 -
 CMake/cdat_modules/sampledata_pkg.cmake       |     2 -
 .../cdat_modules/scientificpython_deps.cmake  |     2 -
 .../scientificpython_external.cmake           |     5 -
 CMake/cdat_modules/scientificpython_pkg.cmake |     7 -
 CMake/cdat_modules/scikits_deps.cmake         |     1 -
 CMake/cdat_modules/scikits_external.cmake     |     5 -
 CMake/cdat_modules/scikits_pkg.cmake          |    10 -
 CMake/cdat_modules/scipy_deps.cmake           |     1 -
 CMake/cdat_modules/scipy_external.cmake       |    42 -
 CMake/cdat_modules/scipy_pkg.cmake            |    21 -
 CMake/cdat_modules/seawater_deps.cmake        |     1 -
 CMake/cdat_modules/seawater_external.cmake    |    24 -
 CMake/cdat_modules/seawater_pkg.cmake         |    18 -
 CMake/cdat_modules/setuptools_deps.cmake      |     1 -
 CMake/cdat_modules/setuptools_external.cmake  |    38 -
 CMake/cdat_modules/setuptools_pkg.cmake       |    10 -
 CMake/cdat_modules/shapely_deps.cmake         |     1 -
 CMake/cdat_modules/shapely_external.cmake     |     5 -
 CMake/cdat_modules/shapely_pkg.cmake          |    17 -
 CMake/cdat_modules/singledispatch_deps.cmake  |     1 -
 .../singledispatch_external.cmake             |    16 -
 CMake/cdat_modules/singledispatch_pkg.cmake   |    16 -
 CMake/cdat_modules/sip_deps.cmake             |     1 -
 CMake/cdat_modules/sip_external.cmake         |    13 -
 CMake/cdat_modules/sip_pkg.cmake              |    14 -
 CMake/cdat_modules/six_deps.cmake             |     1 -
 CMake/cdat_modules/six_external.cmake         |     6 -
 CMake/cdat_modules/six_pkg.cmake              |    10 -
 CMake/cdat_modules/sphinx_deps.cmake          |     1 -
 CMake/cdat_modules/sphinx_external.cmake      |     5 -
 CMake/cdat_modules/sphinx_pkg.cmake           |    14 -
 CMake/cdat_modules/spyder_deps.cmake          |     1 -
 CMake/cdat_modules/spyder_external.cmake      |     7 -
 CMake/cdat_modules/spyder_pkg.cmake           |     9 -
 CMake/cdat_modules/tcltk_deps.cmake           |     1 -
 CMake/cdat_modules/tcltk_external.cmake       |    62 -
 CMake/cdat_modules/tcltk_pkg.cmake            |    18 -
 CMake/cdat_modules/termcap_deps.cmake         |     1 -
 CMake/cdat_modules/termcap_external.cmake     |    16 -
 CMake/cdat_modules/termcap_pkg.cmake          |    16 -
 CMake/cdat_modules/tiff_deps.cmake            |     1 -
 CMake/cdat_modules/tiff_external.cmake        |    16 -
 CMake/cdat_modules/tiff_pkg.cmake             |    12 -
 CMake/cdat_modules/tornado_deps.cmake         |     1 -
 CMake/cdat_modules/tornado_external.cmake     |     5 -
 CMake/cdat_modules/tornado_pkg.cmake          |     7 -
 CMake/cdat_modules/udunits2_deps.cmake        |     1 -
 CMake/cdat_modules/udunits2_external.cmake    |    25 -
 CMake/cdat_modules/udunits2_pkg.cmake         |    14 -
 CMake/cdat_modules/uuid_deps.cmake            |     1 -
 CMake/cdat_modules/uuid_external.cmake        |    19 -
 CMake/cdat_modules/uuid_pkg.cmake             |    15 -
 CMake/cdat_modules/uvcmetrics_deps.cmake      |     1 -
 CMake/cdat_modules/uvcmetrics_external.cmake  |    42 -
 CMake/cdat_modules/uvcmetrics_pkg.cmake       |    14 -
 CMake/cdat_modules/vacumm_deps.cmake          |     1 -
 CMake/cdat_modules/vacumm_external.cmake      |    24 -
 CMake/cdat_modules/vacumm_pkg.cmake           |    18 -
 CMake/cdat_modules/visit_deps.cmake           |     1 -
 CMake/cdat_modules/visit_external.cmake       |   173 -
 CMake/cdat_modules/visit_pkg.cmake            |    10 -
 CMake/cdat_modules/vistrails_deps.cmake       |     1 -
 CMake/cdat_modules/vistrails_external.cmake   |    92 -
 CMake/cdat_modules/vistrails_pkg.cmake        |     6 -
 CMake/cdat_modules/vtk_deps.cmake             |    13 -
 CMake/cdat_modules/vtk_external.cmake         |   184 -
 CMake/cdat_modules/vtk_pkg.cmake              |     4 -
 CMake/cdat_modules/wget_deps.cmake            |     1 -
 CMake/cdat_modules/wget_external.cmake        |    16 -
 CMake/cdat_modules/wget_pkg.cmake             |    28 -
 CMake/cdat_modules/windfield_deps.cmake       |     1 -
 CMake/cdat_modules/windfield_external.cmake   |    16 -
 CMake/cdat_modules/windfield_pkg.cmake        |     9 -
 CMake/cdat_modules/windspharm_deps.cmake      |     1 -
 CMake/cdat_modules/windspharm_external.cmake  |    16 -
 CMake/cdat_modules/windspharm_pkg.cmake       |     9 -
 CMake/cdat_modules/x264_deps.cmake            |     2 -
 CMake/cdat_modules/x264_external.cmake        |    28 -
 CMake/cdat_modules/x264_pkg.cmake             |    13 -
 CMake/cdat_modules/xgks_external.cmake        |    21 -
 CMake/cdat_modules/yasm_deps.cmake            |     1 -
 CMake/cdat_modules/yasm_external.cmake        |    15 -
 CMake/cdat_modules/yasm_pkg.cmake             |    13 -
 CMake/cdat_modules/zlib_deps.cmake            |     1 -
 CMake/cdat_modules/zlib_external.cmake        |    55 -
 CMake/cdat_modules/zlib_pkg.cmake             |    24 -
 CMake/cdat_modules/zmq_deps.cmake             |     1 -
 CMake/cdat_modules/zmq_external.cmake         |    16 -
 CMake/cdat_modules/zmq_pkg.cmake              |    10 -
 .../CLAPACK_install_step.cmake.in             |    38 -
 .../ESMF_install_step.cmake.in                |    35 -
 .../ESMF_make_step.cmake.in                   |    45 -
 .../ESMP_install_step.cmake.in                |    34 -
 .../ESMP_patch_step.cmake.in                  |     9 -
 .../NUMPY_configure_step.cmake.in             |    42 -
 .../NUMPY_install_step.cmake.in               |    19 -
 .../NUMPY_make_step.cmake.in                  |    21 -
 .../PYLIBXML2_install_step.cmake.in           |    21 -
 .../PYLIBXML2_make_step.cmake.in              |    24 -
 .../cdat_modules_extra/PYLIBXML2_setup.py.in  |   243 -
 .../SCIPY_configure_step.cmake.in             |    62 -
 .../SCIPY_install_step.cmake.in               |    21 -
 .../SCIPY_make_step.cmake.in                  |    22 -
 .../basemap_install_step.cmake.in             |    20 -
 .../basemap_make_step.cmake.in                |    20 -
 CMake/cdat_modules_extra/cdat.in              |     4 -
 .../cdat_cmake_make_step.cmake.in             |    18 -
 .../cdat_common_environment.cmake.in          |    39 -
 .../cdat_configure_step.cmake.in              |    30 -
 .../cdat_download_sample_data.cmake.in        |    10 -
 .../cdat_install_step.cmake.in                |    13 -
 .../cdat_make_step.cmake.in                   |    18 -
 .../cdat_python_install_step.cmake.in         |    30 -
 .../cdat_python_step.cmake.in                 |    18 -
 .../cdatmpi_configure_step.cmake.in           |    22 -
 CMake/cdat_modules_extra/checked_get.sh.in    |    76 -
 .../checkout_testdata.cmake                   |   256 -
 .../cleanenv_configure_step.cmake.in          |    17 -
 .../configobj_build_step.cmake.in             |     6 -
 .../curses_patch_step.cmake.in                |     5 -
 .../ezget_Makefile.gfortran.in                |    78 -
 .../fetch_uvcmetrics_testdata.cmake           |    25 -
 .../ffmpeg_build_step.cmake.in                |    14 -
 CMake/cdat_modules_extra/git_clone.sh.in      |    10 -
 CMake/cdat_modules_extra/git_update.sh.in     |     8 -
 .../gsw_build_step.cmake.in                   |     6 -
 .../h5py_build_step.cmake.in                  |     6 -
 .../hdf5_patch_step.cmake.in                  |    10 -
 CMake/cdat_modules_extra/install.py.in        |   945 -
 .../jasper_configure_step.cmake.in            |    11 -
 .../jpeg_install_step.cmake.in                |    28 -
 .../lats_Makefile.gfortran.in                 |   208 -
 .../libcf_install_step.cmake.in               |    13 -
 .../libcf_make_step.cmake.in                  |    15 -
 .../libdrs_Makefile.Linux.gfortran.in         |    78 -
 .../libdrs_Makefile.Mac.fwrap.gfortran.in     |    85 -
 .../libdrs_Makefile.Mac.gfortran.in           |    89 -
 .../lxml_build_step.cmake.in                  |    19 -
 .../lxml_install_step.cmake.in                |    14 -
 .../matplotlib_build_step.cmake.in            |     6 -
 .../matplotlib_patch_step.cmake.in            |     9 -
 .../matplotlib_setup_cfg.in                   |    76 -
 .../mpi4py_install_step.cmake.in              |    21 -
 .../mpi4py_make_step.cmake.in                 |    20 -
 .../netcdf_patch_step.cmake.in                |     6 -
 .../paraview_download.sh.in                   |    19 -
 .../paraview_install_python_module.cmake.in   |    25 -
 .../pbmplus_configure_step.cmake.in           |     9 -
 .../pmw_install_step.cmake.in                 |    13 -
 .../cdat_modules_extra/pmw_make_step.cmake.in |    15 -
 CMake/cdat_modules_extra/predownload.py.in    |    88 -
 .../cdat_modules_extra/preofflinebuild.sh.in  |    11 -
 .../pyopengl_install_step.cmake.in            |    13 -
 .../pyopengl_make_step.cmake.in               |    13 -
 .../pyspharm_patch_step.cmake.in              |     6 -
 .../python_configure_step.cmake.in            |    42 -
 .../python_install_step.cmake.in              |    51 -
 .../python_make_step.cmake.in                 |    34 -
 .../python_patch_step.cmake.in                |    21 -
 CMake/cdat_modules_extra/python_setup.py.in   |  1918 --
 .../pyzmq_configure_step.cmake.in             |    20 -
 .../pyzmq_install_step.cmake.in               |    21 -
 CMake/cdat_modules_extra/reset_runtime.csh.in |    24 -
 CMake/cdat_modules_extra/reset_runtime.sh.in  |    16 -
 CMake/cdat_modules_extra/runpytest.in         |    26 -
 .../seawater_build_step.cmake.in              |     6 -
 CMake/cdat_modules_extra/setup_runtime.csh.in |   117 -
 CMake/cdat_modules_extra/setup_runtime.sh.in  |   111 -
 .../setuptools_install_step.cmake.in          |    13 -
 .../setuptools_make_step.cmake.in             |    13 -
 CMake/cdat_modules_extra/site.cfg.in          |     4 -
 .../udunits2_apple_configure.in               | 18006 ----------------
 CMake/cdat_modules_extra/uvcdat.in            |    64 -
 CMake/cdat_modules_extra/uvcdat.mac.in        |     6 -
 .../uvcmetrics_test_data_md5s.txt             |   232 -
 .../vacumm_build_step.cmake.in                |     6 -
 .../vtk_install_python_module.cmake.in        |    36 -
 .../xgks_configure_step.cmake.in              |    13 -
 CMake/curses_gcc5.patch                       |    30 -
 CMake/dummy.f90                               |     4 -
 CMake/fixName.py                              |    15 -
 CMake/fix_install_name.py.in                  |    33 -
 CMake/fixlink.py                              |    49 -
 CMake/install.py                              |    10 -
 CMake/netcdf_clang.patch                      |    12 -
 CMake/pyspharm_setup.patch                    |    19 -
 CMake/python_patch_step.cmake.in              |    15 -
 CMake/sqlite3_int64_v2.patch                  |    24 -
 CMake/test_python_ok.py                       |    19 -
 CMake/travis_build.cmake                      |    18 -
 CMake/travis_submit.cmake                     |    10 -
 CMake/uvcdat.plist                            |    38 -
 487 files changed, 29802 deletions(-)
 delete mode 100644 CMake/ESMP.patch
 delete mode 100644 CMake/cdat_modules/basemap_deps.cmake
 delete mode 100644 CMake/cdat_modules/basemap_external.cmake
 delete mode 100644 CMake/cdat_modules/basemap_pkg.cmake
 delete mode 100644 CMake/cdat_modules/cairo_deps.cmake
 delete mode 100644 CMake/cdat_modules/cairo_external.cmake
 delete mode 100644 CMake/cdat_modules/cairo_pkg.cmake
 delete mode 100644 CMake/cdat_modules/cd77_deps.cmake
 delete mode 100644 CMake/cdat_modules/cd77_external.cmake
 delete mode 100644 CMake/cdat_modules/cd77_pkg.cmake
 delete mode 100644 CMake/cdat_modules/cdatlogger_deps.cmake
 delete mode 100644 CMake/cdat_modules/cdatlogger_external.cmake
 delete mode 100644 CMake/cdat_modules/cdatlogger_pkg.cmake
 delete mode 100644 CMake/cdat_modules/cffi_deps.cmake
 delete mode 100644 CMake/cdat_modules/cffi_external.cmake
 delete mode 100644 CMake/cdat_modules/cffi_pkg.cmake
 delete mode 100644 CMake/cdat_modules/clapack_deps.cmake
 delete mode 100644 CMake/cdat_modules/clapack_external.cmake
 delete mode 100644 CMake/cdat_modules/clapack_pkg.cmake
 delete mode 100644 CMake/cdat_modules/click_deps.cmake
 delete mode 100644 CMake/cdat_modules/click_external.cmake
 delete mode 100644 CMake/cdat_modules/click_pkg.cmake
 delete mode 100644 CMake/cdat_modules/cligj_deps.cmake
 delete mode 100644 CMake/cdat_modules/cligj_external.cmake
 delete mode 100644 CMake/cdat_modules/cligj_pkg.cmake
 delete mode 100644 CMake/cdat_modules/cmcurl_external.cmake
 delete mode 100644 CMake/cdat_modules/cmor_deps.cmake
 delete mode 100644 CMake/cdat_modules/cmor_external.cmake
 delete mode 100644 CMake/cdat_modules/cmor_pkg.cmake
 delete mode 100644 CMake/cdat_modules/configobj_deps.cmake
 delete mode 100644 CMake/cdat_modules/configobj_external.cmake
 delete mode 100644 CMake/cdat_modules/configobj_pkg.cmake
 delete mode 100644 CMake/cdat_modules/coverage_deps.cmake
 delete mode 100644 CMake/cdat_modules/coverage_external.cmake
 delete mode 100644 CMake/cdat_modules/coverage_pkg.cmake
 delete mode 100644 CMake/cdat_modules/cryptography_deps.cmake
 delete mode 100644 CMake/cdat_modules/cryptography_external.cmake
 delete mode 100644 CMake/cdat_modules/cryptography_pkg.cmake
 delete mode 100644 CMake/cdat_modules/curl_deps.cmake
 delete mode 100644 CMake/cdat_modules/curl_external.cmake
 delete mode 100644 CMake/cdat_modules/curl_pkg.cmake
 delete mode 100644 CMake/cdat_modules/curses_deps.cmake
 delete mode 100644 CMake/cdat_modules/curses_external.cmake
 delete mode 100644 CMake/cdat_modules/curses_pkg.cmake
 delete mode 100644 CMake/cdat_modules/cycler_deps.cmake
 delete mode 100644 CMake/cdat_modules/cycler_external.cmake
 delete mode 100644 CMake/cdat_modules/cycler_pkg.cmake
 delete mode 100644 CMake/cdat_modules/cython_deps.cmake
 delete mode 100644 CMake/cdat_modules/cython_external.cmake
 delete mode 100644 CMake/cdat_modules/cython_pkg.cmake
 delete mode 100644 CMake/cdat_modules/data_deps.cmake
 delete mode 100644 CMake/cdat_modules/data_pkg.cmake
 delete mode 100644 CMake/cdat_modules/dateutils_deps.cmake
 delete mode 100644 CMake/cdat_modules/dateutils_external.cmake
 delete mode 100644 CMake/cdat_modules/dateutils_pkg.cmake
 delete mode 100644 CMake/cdat_modules/distribute_deps.cmake
 delete mode 100644 CMake/cdat_modules/distribute_external.cmake
 delete mode 100644 CMake/cdat_modules/distribute_pkg.cmake
 delete mode 100644 CMake/cdat_modules/docutils_deps.cmake
 delete mode 100644 CMake/cdat_modules/docutils_external.cmake
 delete mode 100644 CMake/cdat_modules/docutils_pkg.cmake
 delete mode 100644 CMake/cdat_modules/enum34_deps.cmake
 delete mode 100644 CMake/cdat_modules/enum34_external.cmake
 delete mode 100644 CMake/cdat_modules/enum34_pkg.cmake
 delete mode 100644 CMake/cdat_modules/eof2_deps.cmake
 delete mode 100644 CMake/cdat_modules/eof2_external.cmake
 delete mode 100644 CMake/cdat_modules/eof2_pkg.cmake
 delete mode 100644 CMake/cdat_modules/eofs_deps.cmake
 delete mode 100644 CMake/cdat_modules/eofs_external.cmake
 delete mode 100644 CMake/cdat_modules/eofs_pkg.cmake
 delete mode 100644 CMake/cdat_modules/esmf_deps.cmake
 delete mode 100644 CMake/cdat_modules/esmf_external.cmake
 delete mode 100644 CMake/cdat_modules/esmf_pkg.cmake
 delete mode 100644 CMake/cdat_modules/ezget_deps.cmake
 delete mode 100644 CMake/cdat_modules/ezget_external.cmake
 delete mode 100644 CMake/cdat_modules/ezget_pkg.cmake
 delete mode 100644 CMake/cdat_modules/ffi_deps.cmake
 delete mode 100644 CMake/cdat_modules/ffi_external.cmake
 delete mode 100644 CMake/cdat_modules/ffi_pkg.cmake
 delete mode 100644 CMake/cdat_modules/ffmpeg_deps.cmake
 delete mode 100644 CMake/cdat_modules/ffmpeg_external.cmake
 delete mode 100644 CMake/cdat_modules/ffmpeg_pkg.cmake
 delete mode 100644 CMake/cdat_modules/fiona_deps.cmake
 delete mode 100644 CMake/cdat_modules/fiona_external.cmake
 delete mode 100644 CMake/cdat_modules/fiona_pkg.cmake
 delete mode 100644 CMake/cdat_modules/flake8_deps.cmake
 delete mode 100644 CMake/cdat_modules/flake8_external.cmake
 delete mode 100644 CMake/cdat_modules/flake8_pkg.cmake
 delete mode 100644 CMake/cdat_modules/fontconfig_deps.cmake
 delete mode 100644 CMake/cdat_modules/fontconfig_external.cmake
 delete mode 100644 CMake/cdat_modules/fontconfig_pkg.cmake
 delete mode 100644 CMake/cdat_modules/freetype_deps.cmake
 delete mode 100644 CMake/cdat_modules/freetype_external.cmake
 delete mode 100644 CMake/cdat_modules/freetype_pkg.cmake
 delete mode 100644 CMake/cdat_modules/g2clib_deps.cmake
 delete mode 100644 CMake/cdat_modules/g2clib_external.cmake
 delete mode 100644 CMake/cdat_modules/g2clib_pkg.cmake
 delete mode 100644 CMake/cdat_modules/gdal_deps.cmake
 delete mode 100644 CMake/cdat_modules/gdal_external.cmake
 delete mode 100644 CMake/cdat_modules/gdal_pkg.cmake
 delete mode 100644 CMake/cdat_modules/geos_deps.cmake
 delete mode 100644 CMake/cdat_modules/geos_external.cmake
 delete mode 100644 CMake/cdat_modules/geos_pkg.cmake
 delete mode 100644 CMake/cdat_modules/ghostscript_deps.cmake
 delete mode 100644 CMake/cdat_modules/ghostscript_external.cmake
 delete mode 100644 CMake/cdat_modules/ghostscript_pkg.cmake
 delete mode 100644 CMake/cdat_modules/gifsicle_external.cmake
 delete mode 100644 CMake/cdat_modules/gsw_deps.cmake
 delete mode 100644 CMake/cdat_modules/gsw_external.cmake
 delete mode 100644 CMake/cdat_modules/gsw_pkg.cmake
 delete mode 100644 CMake/cdat_modules/gui_support_deps.cmake
 delete mode 100644 CMake/cdat_modules/gui_support_external.cmake
 delete mode 100644 CMake/cdat_modules/gui_support_pkg.cmake
 delete mode 100644 CMake/cdat_modules/h5py_deps.cmake
 delete mode 100644 CMake/cdat_modules/h5py_external.cmake
 delete mode 100644 CMake/cdat_modules/h5py_pkg.cmake
 delete mode 100644 CMake/cdat_modules/hdf4_external.cmake
 delete mode 100644 CMake/cdat_modules/hdf5_deps.cmake
 delete mode 100644 CMake/cdat_modules/hdf5_external.cmake
 delete mode 100644 CMake/cdat_modules/hdf5_pkg.cmake
 delete mode 100644 CMake/cdat_modules/idna_deps.cmake
 delete mode 100644 CMake/cdat_modules/idna_external.cmake
 delete mode 100644 CMake/cdat_modules/idna_pkg.cmake
 delete mode 100644 CMake/cdat_modules/ipaddress_deps.cmake
 delete mode 100644 CMake/cdat_modules/ipaddress_external.cmake
 delete mode 100644 CMake/cdat_modules/ipaddress_pkg.cmake
 delete mode 100644 CMake/cdat_modules/ipython_deps.cmake
 delete mode 100644 CMake/cdat_modules/ipython_external.cmake
 delete mode 100644 CMake/cdat_modules/ipython_pkg.cmake
 delete mode 100644 CMake/cdat_modules/jasper_deps.cmake
 delete mode 100644 CMake/cdat_modules/jasper_external.cmake
 delete mode 100644 CMake/cdat_modules/jasper_pkg.cmake
 delete mode 100644 CMake/cdat_modules/jinja2_deps.cmake
 delete mode 100644 CMake/cdat_modules/jinja2_external.cmake
 delete mode 100644 CMake/cdat_modules/jinja2_pkg.cmake
 delete mode 100644 CMake/cdat_modules/jpeg_deps.cmake
 delete mode 100644 CMake/cdat_modules/jpeg_external.cmake
 delete mode 100644 CMake/cdat_modules/jpeg_pkg.cmake
 delete mode 100644 CMake/cdat_modules/lapack_deps.cmake
 delete mode 100644 CMake/cdat_modules/lapack_external.cmake
 delete mode 100644 CMake/cdat_modules/lapack_pkg.cmake
 delete mode 100644 CMake/cdat_modules/lats_deps.cmake
 delete mode 100644 CMake/cdat_modules/lats_external.cmake
 delete mode 100644 CMake/cdat_modules/lats_pkg.cmake
 delete mode 100644 CMake/cdat_modules/lepl_deps.cmake
 delete mode 100644 CMake/cdat_modules/lepl_external.cmake
 delete mode 100644 CMake/cdat_modules/lepl_pkg.cmake
 delete mode 100644 CMake/cdat_modules/libcdms_deps.cmake
 delete mode 100644 CMake/cdat_modules/libcdms_external.cmake
 delete mode 100644 CMake/cdat_modules/libcdms_pkg.cmake
 delete mode 100644 CMake/cdat_modules/libcf_deps.cmake
 delete mode 100644 CMake/cdat_modules/libcf_external.cmake
 delete mode 100644 CMake/cdat_modules/libcf_pkg.cmake
 delete mode 100644 CMake/cdat_modules/libdrs_deps.cmake
 delete mode 100644 CMake/cdat_modules/libdrs_external.cmake
 delete mode 100644 CMake/cdat_modules/libdrs_pkg.cmake
 delete mode 100644 CMake/cdat_modules/libdrsfortran_deps.cmake
 delete mode 100644 CMake/cdat_modules/libdrsfortran_external.cmake
 delete mode 100644 CMake/cdat_modules/libdrsfortran_pkg.cmake
 delete mode 100644 CMake/cdat_modules/libxml2_deps.cmake
 delete mode 100644 CMake/cdat_modules/libxml2_external.cmake
 delete mode 100644 CMake/cdat_modules/libxml2_pkg.cmake
 delete mode 100644 CMake/cdat_modules/libxslt_deps.cmake
 delete mode 100644 CMake/cdat_modules/libxslt_external.cmake
 delete mode 100644 CMake/cdat_modules/libxslt_pkg.cmake
 delete mode 100644 CMake/cdat_modules/lxml_deps.cmake
 delete mode 100644 CMake/cdat_modules/lxml_external.cmake
 delete mode 100644 CMake/cdat_modules/lxml_pkg.cmake
 delete mode 100644 CMake/cdat_modules/markupsafe_deps.cmake
 delete mode 100644 CMake/cdat_modules/markupsafe_external.cmake
 delete mode 100644 CMake/cdat_modules/markupsafe_pkg.cmake
 delete mode 100644 CMake/cdat_modules/matplotlib_deps.cmake
 delete mode 100644 CMake/cdat_modules/matplotlib_external.cmake
 delete mode 100644 CMake/cdat_modules/matplotlib_pkg.cmake
 delete mode 100644 CMake/cdat_modules/mccabe_deps.cmake
 delete mode 100644 CMake/cdat_modules/mccabe_external.cmake
 delete mode 100644 CMake/cdat_modules/mccabe_pkg.cmake
 delete mode 100644 CMake/cdat_modules/md5_deps.cmake
 delete mode 100644 CMake/cdat_modules/md5_external.cmake
 delete mode 100644 CMake/cdat_modules/md5_pkg.cmake
 delete mode 100644 CMake/cdat_modules/mpi4py_deps.cmake
 delete mode 100644 CMake/cdat_modules/mpi4py_external.cmake
 delete mode 100644 CMake/cdat_modules/mpi4py_pkg.cmake
 delete mode 100644 CMake/cdat_modules/mpi_deps.cmake
 delete mode 100644 CMake/cdat_modules/mpi_external.cmake
 delete mode 100644 CMake/cdat_modules/mpi_pkg.cmake
 delete mode 100644 CMake/cdat_modules/myproxyclient_deps.cmake
 delete mode 100644 CMake/cdat_modules/myproxyclient_external.cmake
 delete mode 100644 CMake/cdat_modules/myproxyclient_pkg.cmake
 delete mode 100644 CMake/cdat_modules/netcdf_deps.cmake
 delete mode 100644 CMake/cdat_modules/netcdf_external.cmake
 delete mode 100644 CMake/cdat_modules/netcdf_pkg.cmake
 delete mode 100644 CMake/cdat_modules/netcdfplus_deps.cmake
 delete mode 100644 CMake/cdat_modules/netcdfplus_external.cmake
 delete mode 100644 CMake/cdat_modules/netcdfplus_pkg.cmake
 delete mode 100644 CMake/cdat_modules/numexpr_deps.cmake
 delete mode 100644 CMake/cdat_modules/numexpr_external.cmake
 delete mode 100644 CMake/cdat_modules/numexpr_pkg.cmake
 delete mode 100644 CMake/cdat_modules/numpy_deps.cmake
 delete mode 100644 CMake/cdat_modules/numpy_external.cmake
 delete mode 100644 CMake/cdat_modules/numpy_pkg.cmake
 delete mode 100644 CMake/cdat_modules/ocgis_deps.cmake
 delete mode 100644 CMake/cdat_modules/ocgis_external.cmake
 delete mode 100644 CMake/cdat_modules/ocgis_pkg.cmake
 delete mode 100644 CMake/cdat_modules/openssl_deps.cmake
 delete mode 100644 CMake/cdat_modules/openssl_external.cmake
 delete mode 100644 CMake/cdat_modules/openssl_pkg.cmake
 delete mode 100644 CMake/cdat_modules/osmesa_deps.cmake
 delete mode 100644 CMake/cdat_modules/osmesa_external.cmake
 delete mode 100644 CMake/cdat_modules/osmesa_pkg.cmake
 delete mode 100644 CMake/cdat_modules/paraview_deps.cmake
 delete mode 100644 CMake/cdat_modules/paraview_external.cmake
 delete mode 100644 CMake/cdat_modules/paraview_pkg.cmake
 delete mode 100644 CMake/cdat_modules/pbmplus_external.cmake
 delete mode 100644 CMake/cdat_modules/pep8_deps.cmake
 delete mode 100644 CMake/cdat_modules/pep8_external.cmake
 delete mode 100644 CMake/cdat_modules/pep8_pkg.cmake
 delete mode 100644 CMake/cdat_modules/pip_deps.cmake
 delete mode 100644 CMake/cdat_modules/pip_external.cmake
 delete mode 100644 CMake/cdat_modules/pip_pkg.cmake
 delete mode 100644 CMake/cdat_modules/pixman_deps.cmake
 delete mode 100644 CMake/cdat_modules/pixman_external.cmake
 delete mode 100644 CMake/cdat_modules/pixman_pkg.cmake
 delete mode 100644 CMake/cdat_modules/pkgconfig_deps.cmake
 delete mode 100644 CMake/cdat_modules/pkgconfig_external.cmake
 delete mode 100644 CMake/cdat_modules/pkgconfig_pkg.cmake
 delete mode 100644 CMake/cdat_modules/pmw_deps.cmake
 delete mode 100644 CMake/cdat_modules/pmw_external.cmake
 delete mode 100644 CMake/cdat_modules/pmw_pkg.cmake
 delete mode 100644 CMake/cdat_modules/pnetcdf_deps.cmake
 delete mode 100644 CMake/cdat_modules/pnetcdf_external.cmake
 delete mode 100644 CMake/cdat_modules/pnetcdf_pkg.cmake
 delete mode 100644 CMake/cdat_modules/png_deps.cmake
 delete mode 100644 CMake/cdat_modules/png_external.cmake
 delete mode 100644 CMake/cdat_modules/png_pkg.cmake
 delete mode 100644 CMake/cdat_modules/proj4_deps.cmake
 delete mode 100644 CMake/cdat_modules/proj4_external.cmake
 delete mode 100644 CMake/cdat_modules/proj4_pkg.cmake
 delete mode 100644 CMake/cdat_modules/pyasn1_deps.cmake
 delete mode 100644 CMake/cdat_modules/pyasn1_external.cmake
 delete mode 100644 CMake/cdat_modules/pyasn1_pkg.cmake
 delete mode 100644 CMake/cdat_modules/pyclimate_deps.cmake
 delete mode 100644 CMake/cdat_modules/pyclimate_external.cmake
 delete mode 100644 CMake/cdat_modules/pyclimate_pkg.cmake
 delete mode 100644 CMake/cdat_modules/pycparser_deps.cmake
 delete mode 100644 CMake/cdat_modules/pycparser_external.cmake
 delete mode 100644 CMake/cdat_modules/pycparser_pkg.cmake
 delete mode 100644 CMake/cdat_modules/pyflakes_deps.cmake
 delete mode 100644 CMake/cdat_modules/pyflakes_external.cmake
 delete mode 100644 CMake/cdat_modules/pyflakes_pkg.cmake
 delete mode 100644 CMake/cdat_modules/pygments_deps.cmake
 delete mode 100644 CMake/cdat_modules/pygments_external.cmake
 delete mode 100644 CMake/cdat_modules/pygments_pkg.cmake
 delete mode 100644 CMake/cdat_modules/pylibxml2_deps.cmake
 delete mode 100644 CMake/cdat_modules/pylibxml2_external.cmake
 delete mode 100644 CMake/cdat_modules/pylibxml2_pkg.cmake
 delete mode 100644 CMake/cdat_modules/pynetcdf4_deps.cmake
 delete mode 100644 CMake/cdat_modules/pynetcdf4_external.cmake
 delete mode 100644 CMake/cdat_modules/pynetcdf4_pkg.cmake
 delete mode 100644 CMake/cdat_modules/pyopengl_external.cmake
 delete mode 100644 CMake/cdat_modules/pyopenssl_deps.cmake
 delete mode 100644 CMake/cdat_modules/pyopenssl_external.cmake
 delete mode 100644 CMake/cdat_modules/pyopenssl_pkg.cmake
 delete mode 100644 CMake/cdat_modules/pyparsing_deps.cmake
 delete mode 100644 CMake/cdat_modules/pyparsing_external.cmake
 delete mode 100644 CMake/cdat_modules/pyparsing_pkg.cmake
 delete mode 100644 CMake/cdat_modules/pyqt_deps.cmake
 delete mode 100644 CMake/cdat_modules/pyqt_external.cmake
 delete mode 100644 CMake/cdat_modules/pyqt_pkg.cmake
 delete mode 100644 CMake/cdat_modules/pyspharm_deps.cmake
 delete mode 100644 CMake/cdat_modules/pyspharm_external.cmake
 delete mode 100644 CMake/cdat_modules/pyspharm_pkg.cmake
 delete mode 100644 CMake/cdat_modules/pytables_deps.cmake
 delete mode 100644 CMake/cdat_modules/pytables_external.cmake
 delete mode 100644 CMake/cdat_modules/pytables_pkg.cmake
 delete mode 100644 CMake/cdat_modules/python_deps.cmake
 delete mode 100644 CMake/cdat_modules/python_external.cmake
 delete mode 100644 CMake/cdat_modules/python_pkg.cmake
 delete mode 100644 CMake/cdat_modules/pyzmq_deps.cmake
 delete mode 100644 CMake/cdat_modules/pyzmq_external.cmake
 delete mode 100644 CMake/cdat_modules/pyzmq_pkg.cmake
 delete mode 100644 CMake/cdat_modules/qt4_deps.cmake
 delete mode 100644 CMake/cdat_modules/qt4_pkg.cmake
 delete mode 100644 CMake/cdat_modules/qt_external.cmake
 delete mode 100644 CMake/cdat_modules/r_deps.cmake
 delete mode 100644 CMake/cdat_modules/r_external.cmake
 delete mode 100644 CMake/cdat_modules/r_pkg.cmake
 delete mode 100644 CMake/cdat_modules/readline_deps.cmake
 delete mode 100644 CMake/cdat_modules/readline_external.cmake
 delete mode 100644 CMake/cdat_modules/readline_pkg.cmake
 delete mode 100644 CMake/cdat_modules/rpy2_deps.cmake
 delete mode 100644 CMake/cdat_modules/rpy2_external.cmake
 delete mode 100644 CMake/cdat_modules/rpy2_pkg.cmake
 delete mode 100644 CMake/cdat_modules/sampledata_deps.cmake
 delete mode 100644 CMake/cdat_modules/sampledata_external.cmake
 delete mode 100644 CMake/cdat_modules/sampledata_pkg.cmake
 delete mode 100644 CMake/cdat_modules/scientificpython_deps.cmake
 delete mode 100644 CMake/cdat_modules/scientificpython_external.cmake
 delete mode 100644 CMake/cdat_modules/scientificpython_pkg.cmake
 delete mode 100644 CMake/cdat_modules/scikits_deps.cmake
 delete mode 100644 CMake/cdat_modules/scikits_external.cmake
 delete mode 100644 CMake/cdat_modules/scikits_pkg.cmake
 delete mode 100644 CMake/cdat_modules/scipy_deps.cmake
 delete mode 100644 CMake/cdat_modules/scipy_external.cmake
 delete mode 100644 CMake/cdat_modules/scipy_pkg.cmake
 delete mode 100644 CMake/cdat_modules/seawater_deps.cmake
 delete mode 100644 CMake/cdat_modules/seawater_external.cmake
 delete mode 100644 CMake/cdat_modules/seawater_pkg.cmake
 delete mode 100644 CMake/cdat_modules/setuptools_deps.cmake
 delete mode 100644 CMake/cdat_modules/setuptools_external.cmake
 delete mode 100644 CMake/cdat_modules/setuptools_pkg.cmake
 delete mode 100644 CMake/cdat_modules/shapely_deps.cmake
 delete mode 100644 CMake/cdat_modules/shapely_external.cmake
 delete mode 100644 CMake/cdat_modules/shapely_pkg.cmake
 delete mode 100644 CMake/cdat_modules/singledispatch_deps.cmake
 delete mode 100644 CMake/cdat_modules/singledispatch_external.cmake
 delete mode 100644 CMake/cdat_modules/singledispatch_pkg.cmake
 delete mode 100644 CMake/cdat_modules/sip_deps.cmake
 delete mode 100644 CMake/cdat_modules/sip_external.cmake
 delete mode 100644 CMake/cdat_modules/sip_pkg.cmake
 delete mode 100644 CMake/cdat_modules/six_deps.cmake
 delete mode 100644 CMake/cdat_modules/six_external.cmake
 delete mode 100644 CMake/cdat_modules/six_pkg.cmake
 delete mode 100644 CMake/cdat_modules/sphinx_deps.cmake
 delete mode 100644 CMake/cdat_modules/sphinx_external.cmake
 delete mode 100644 CMake/cdat_modules/sphinx_pkg.cmake
 delete mode 100644 CMake/cdat_modules/spyder_deps.cmake
 delete mode 100644 CMake/cdat_modules/spyder_external.cmake
 delete mode 100644 CMake/cdat_modules/spyder_pkg.cmake
 delete mode 100644 CMake/cdat_modules/tcltk_deps.cmake
 delete mode 100644 CMake/cdat_modules/tcltk_external.cmake
 delete mode 100644 CMake/cdat_modules/tcltk_pkg.cmake
 delete mode 100644 CMake/cdat_modules/termcap_deps.cmake
 delete mode 100644 CMake/cdat_modules/termcap_external.cmake
 delete mode 100644 CMake/cdat_modules/termcap_pkg.cmake
 delete mode 100644 CMake/cdat_modules/tiff_deps.cmake
 delete mode 100644 CMake/cdat_modules/tiff_external.cmake
 delete mode 100644 CMake/cdat_modules/tiff_pkg.cmake
 delete mode 100644 CMake/cdat_modules/tornado_deps.cmake
 delete mode 100644 CMake/cdat_modules/tornado_external.cmake
 delete mode 100644 CMake/cdat_modules/tornado_pkg.cmake
 delete mode 100644 CMake/cdat_modules/udunits2_deps.cmake
 delete mode 100644 CMake/cdat_modules/udunits2_external.cmake
 delete mode 100644 CMake/cdat_modules/udunits2_pkg.cmake
 delete mode 100644 CMake/cdat_modules/uuid_deps.cmake
 delete mode 100644 CMake/cdat_modules/uuid_external.cmake
 delete mode 100644 CMake/cdat_modules/uuid_pkg.cmake
 delete mode 100644 CMake/cdat_modules/uvcmetrics_deps.cmake
 delete mode 100644 CMake/cdat_modules/uvcmetrics_external.cmake
 delete mode 100644 CMake/cdat_modules/uvcmetrics_pkg.cmake
 delete mode 100644 CMake/cdat_modules/vacumm_deps.cmake
 delete mode 100644 CMake/cdat_modules/vacumm_external.cmake
 delete mode 100644 CMake/cdat_modules/vacumm_pkg.cmake
 delete mode 100644 CMake/cdat_modules/visit_deps.cmake
 delete mode 100644 CMake/cdat_modules/visit_external.cmake
 delete mode 100644 CMake/cdat_modules/visit_pkg.cmake
 delete mode 100644 CMake/cdat_modules/vistrails_deps.cmake
 delete mode 100644 CMake/cdat_modules/vistrails_external.cmake
 delete mode 100644 CMake/cdat_modules/vistrails_pkg.cmake
 delete mode 100644 CMake/cdat_modules/vtk_deps.cmake
 delete mode 100644 CMake/cdat_modules/vtk_external.cmake
 delete mode 100644 CMake/cdat_modules/vtk_pkg.cmake
 delete mode 100644 CMake/cdat_modules/wget_deps.cmake
 delete mode 100644 CMake/cdat_modules/wget_external.cmake
 delete mode 100644 CMake/cdat_modules/wget_pkg.cmake
 delete mode 100644 CMake/cdat_modules/windfield_deps.cmake
 delete mode 100644 CMake/cdat_modules/windfield_external.cmake
 delete mode 100644 CMake/cdat_modules/windfield_pkg.cmake
 delete mode 100644 CMake/cdat_modules/windspharm_deps.cmake
 delete mode 100644 CMake/cdat_modules/windspharm_external.cmake
 delete mode 100644 CMake/cdat_modules/windspharm_pkg.cmake
 delete mode 100644 CMake/cdat_modules/x264_deps.cmake
 delete mode 100644 CMake/cdat_modules/x264_external.cmake
 delete mode 100644 CMake/cdat_modules/x264_pkg.cmake
 delete mode 100644 CMake/cdat_modules/xgks_external.cmake
 delete mode 100644 CMake/cdat_modules/yasm_deps.cmake
 delete mode 100644 CMake/cdat_modules/yasm_external.cmake
 delete mode 100644 CMake/cdat_modules/yasm_pkg.cmake
 delete mode 100644 CMake/cdat_modules/zlib_deps.cmake
 delete mode 100644 CMake/cdat_modules/zlib_external.cmake
 delete mode 100644 CMake/cdat_modules/zlib_pkg.cmake
 delete mode 100644 CMake/cdat_modules/zmq_deps.cmake
 delete mode 100644 CMake/cdat_modules/zmq_external.cmake
 delete mode 100644 CMake/cdat_modules/zmq_pkg.cmake
 delete mode 100644 CMake/cdat_modules_extra/CLAPACK_install_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/ESMF_install_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/ESMF_make_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/ESMP_install_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/ESMP_patch_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/NUMPY_configure_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/NUMPY_install_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/NUMPY_make_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/PYLIBXML2_install_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/PYLIBXML2_make_step.cmake.in
 delete mode 100755 CMake/cdat_modules_extra/PYLIBXML2_setup.py.in
 delete mode 100644 CMake/cdat_modules_extra/SCIPY_configure_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/SCIPY_install_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/SCIPY_make_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/basemap_install_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/basemap_make_step.cmake.in
 delete mode 100755 CMake/cdat_modules_extra/cdat.in
 delete mode 100644 CMake/cdat_modules_extra/cdat_cmake_make_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/cdat_common_environment.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/cdat_configure_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/cdat_download_sample_data.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/cdat_install_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/cdat_make_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/cdat_python_install_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/cdat_python_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/cdatmpi_configure_step.cmake.in
 delete mode 100755 CMake/cdat_modules_extra/checked_get.sh.in
 delete mode 100644 CMake/cdat_modules_extra/checkout_testdata.cmake
 delete mode 100644 CMake/cdat_modules_extra/cleanenv_configure_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/configobj_build_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/curses_patch_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/ezget_Makefile.gfortran.in
 delete mode 100644 CMake/cdat_modules_extra/fetch_uvcmetrics_testdata.cmake
 delete mode 100644 CMake/cdat_modules_extra/ffmpeg_build_step.cmake.in
 delete mode 100755 CMake/cdat_modules_extra/git_clone.sh.in
 delete mode 100755 CMake/cdat_modules_extra/git_update.sh.in
 delete mode 100644 CMake/cdat_modules_extra/gsw_build_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/h5py_build_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/hdf5_patch_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/install.py.in
 delete mode 100644 CMake/cdat_modules_extra/jasper_configure_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/jpeg_install_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/lats_Makefile.gfortran.in
 delete mode 100644 CMake/cdat_modules_extra/libcf_install_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/libcf_make_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/libdrs_Makefile.Linux.gfortran.in
 delete mode 100644 CMake/cdat_modules_extra/libdrs_Makefile.Mac.fwrap.gfortran.in
 delete mode 100644 CMake/cdat_modules_extra/libdrs_Makefile.Mac.gfortran.in
 delete mode 100644 CMake/cdat_modules_extra/lxml_build_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/lxml_install_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/matplotlib_build_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/matplotlib_patch_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/matplotlib_setup_cfg.in
 delete mode 100644 CMake/cdat_modules_extra/mpi4py_install_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/mpi4py_make_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/netcdf_patch_step.cmake.in
 delete mode 100755 CMake/cdat_modules_extra/paraview_download.sh.in
 delete mode 100644 CMake/cdat_modules_extra/paraview_install_python_module.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/pbmplus_configure_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/pmw_install_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/pmw_make_step.cmake.in
 delete mode 100755 CMake/cdat_modules_extra/predownload.py.in
 delete mode 100755 CMake/cdat_modules_extra/preofflinebuild.sh.in
 delete mode 100644 CMake/cdat_modules_extra/pyopengl_install_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/pyopengl_make_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/pyspharm_patch_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/python_configure_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/python_install_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/python_make_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/python_patch_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/python_setup.py.in
 delete mode 100644 CMake/cdat_modules_extra/pyzmq_configure_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/pyzmq_install_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/reset_runtime.csh.in
 delete mode 100644 CMake/cdat_modules_extra/reset_runtime.sh.in
 delete mode 100755 CMake/cdat_modules_extra/runpytest.in
 delete mode 100644 CMake/cdat_modules_extra/seawater_build_step.cmake.in
 delete mode 100755 CMake/cdat_modules_extra/setup_runtime.csh.in
 delete mode 100755 CMake/cdat_modules_extra/setup_runtime.sh.in
 delete mode 100644 CMake/cdat_modules_extra/setuptools_install_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/setuptools_make_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/site.cfg.in
 delete mode 100755 CMake/cdat_modules_extra/udunits2_apple_configure.in
 delete mode 100755 CMake/cdat_modules_extra/uvcdat.in
 delete mode 100755 CMake/cdat_modules_extra/uvcdat.mac.in
 delete mode 100644 CMake/cdat_modules_extra/uvcmetrics_test_data_md5s.txt
 delete mode 100644 CMake/cdat_modules_extra/vacumm_build_step.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/vtk_install_python_module.cmake.in
 delete mode 100644 CMake/cdat_modules_extra/xgks_configure_step.cmake.in
 delete mode 100644 CMake/curses_gcc5.patch
 delete mode 100644 CMake/dummy.f90
 delete mode 100644 CMake/fixName.py
 delete mode 100644 CMake/fix_install_name.py.in
 delete mode 100644 CMake/fixlink.py
 delete mode 100644 CMake/install.py
 delete mode 100644 CMake/netcdf_clang.patch
 delete mode 100644 CMake/pyspharm_setup.patch
 delete mode 100644 CMake/python_patch_step.cmake.in
 delete mode 100644 CMake/sqlite3_int64_v2.patch
 delete mode 100644 CMake/test_python_ok.py
 delete mode 100644 CMake/travis_build.cmake
 delete mode 100644 CMake/travis_submit.cmake
 delete mode 100644 CMake/uvcdat.plist

diff --git a/CMake/ESMP.patch b/CMake/ESMP.patch
deleted file mode 100644
index 9d1eb2c07..000000000
--- a/CMake/ESMP.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/ESMP_LoadESMF.py	2014-01-14 10:00:22.000000000 -0500
-+++ b/ESMP_LoadESMF.py	2014-01-14 10:40:57.000000000 -0500
-@@ -64,6 +64,14 @@
- #      esmfmk = c[2]
- 
-   try:
-+
-+    # If we are not dealing with an absolute path treat it a relative to the
-+    # current Python module.
-+    if not os.path.isabs(esmfmk):
-+      # Get the directory for this module
-+      rel_dir = os.path.dirname(os.path.realpath(__file__))
-+      esmfmk = os.path.abspath(os.path.join(rel_dir, esmfmk))
-+
-     MKFILE = open(esmfmk, 'r')
-   except:
-     raise IOError("File not found\n  %s") % esmfmk
-@@ -72,11 +80,12 @@
-   libsdir = 0
-   esmfos = 0
-   esmfabi = 0
-+
-+  libsdir = os.path.dirname(esmfmk)
-+
- #  MKFILE = open(esmfmk,'r')
-   for line in MKFILE:
--    if 'ESMF_LIBSDIR' in line:
--      libsdir = line.split("=")[1]
--    elif 'ESMF_OS:' in line:
-+    if 'ESMF_OS:' in line:
-       esmfos = line.split(":")[1]
-     elif 'ESMF_ABI:' in line:
-       esmfabi = line.split(":")[1]
diff --git a/CMake/cdat_modules/basemap_deps.cmake b/CMake/cdat_modules/basemap_deps.cmake
deleted file mode 100644
index 98520d1d0..000000000
--- a/CMake/cdat_modules/basemap_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(basemap_deps ${matplotlib_pkg} ${geos_pkg})
diff --git a/CMake/cdat_modules/basemap_external.cmake b/CMake/cdat_modules/basemap_external.cmake
deleted file mode 100644
index 53b3a59a1..000000000
--- a/CMake/cdat_modules/basemap_external.cmake
+++ /dev/null
@@ -1,39 +0,0 @@
-# The basemap external project 
-
-set(basemap_binary "${CMAKE_CURRENT_BINARY_DIR}/build/basemap")
-
-#configure_file(
-#  ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/basemap_configure_step.cmake.in
-#  ${cdat_CMAKE_BINARY_DIR}/basemap_configure_step.cmake @ONLY)
-# to build we also run a cmake -P script.
-# the script will set LD_LIBRARY_PATH so that 
-# python can run after it is built on linux
-configure_file(
-  ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/basemap_make_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/basemap_make_step.cmake @ONLY)
-
-configure_file(
-  ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/basemap_install_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/basemap_install_step.cmake @ONLY)
-
-#set(basemap_CONFIGURE_COMMAND ${CMAKE_COMMAND}
-#    -DCONFIG_TYPE=${CMAKE_CFG_INTDIR} -P ${cdat_CMAKE_BINARY_DIR}/basemap_configure_step.cmake)
-set(basemap_BUILD_COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/basemap_make_step.cmake)
-set(basemap_INSTALL_COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/basemap_install_step.cmake)
-
-# create an external project to download numpy,
-# and configure and build it
-ExternalProject_Add(basemap
-  URL ${basemap_URL}/${basemap_GZ}
-  URL_MD5 ${basemap_MD5}
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${basemap_binary}
-  BINARY_DIR ${basemap_binary}
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ${basemap_BUILD_COMMAND}
-  UPDATE_COMMAND ""
-  INSTALL_COMMAND ${basemap_INSTALL_COMMAND}
-  DEPENDS
-    ${basemap_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/basemap_pkg.cmake b/CMake/cdat_modules/basemap_pkg.cmake
deleted file mode 100644
index bfcaa6c07..000000000
--- a/CMake/cdat_modules/basemap_pkg.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set( basemap_MAJOR 1  )
-set( basemap_MINOR 0  )
-set( basemap_PATCH 5  )
-set(basemap_URL ${LLNL_URL})
-set(basemap_GZ basemap-${basemap_MAJOR}.${basemap_MINOR}.${basemap_PATCH}.tar.gz)
-set(basemap_MD5 089260ea2b3eebb9d63e1783d0b15298 )
-set(BASEMAP_VERSION ${basemap_MAJOR}.${basemap_MINOR}.${basemap_PATCH})
-set(BASEMAP_SOURCE ${basemap_URL}/${basemap_GZ})
-
-add_cdat_package_dependent(basemap "" "" ON "CDAT_BUILD_GRAPHICS" OFF)
diff --git a/CMake/cdat_modules/cairo_deps.cmake b/CMake/cdat_modules/cairo_deps.cmake
deleted file mode 100644
index 78b7fe0b3..000000000
--- a/CMake/cdat_modules/cairo_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(Cairo_deps ${pkgconfig_pkg} ${png_pkg} ${fontconfig_pkg} ${freetype_pkg} ${pixman_pkg} ${libxml2_pkg})
diff --git a/CMake/cdat_modules/cairo_external.cmake b/CMake/cdat_modules/cairo_external.cmake
deleted file mode 100644
index 1826425c1..000000000
--- a/CMake/cdat_modules/cairo_external.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-
-set(Cairo_source "${CMAKE_CURRENT_BINARY_DIR}/build/Cairo")
-set(Cairo_install "${cdat_EXTERNALS}")
-set(Cairo_conf_args --disable-static^^--enable-quartz=no^^--enable-win32=no^^--enable-skia=no^^--enable-os2=no^^--enable-beos=no^^--enable-drm=no^^--enable-gallium=no^^--enable-cogl=no)
-
-ExternalProject_Add(Cairo
-  LIST_SEPARATOR ^^
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${Cairo_source}
-  INSTALL_DIR ${Cairo_install}
-  URL ${CAIRO_URL}/${CAIRO_GZ}
-  URL_MD5 ${CAIRO_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DSKIP_LDFLAGS=YES -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -DCONFIGURE_ARGS=${Cairo_conf_args} -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  DEPENDS ${Cairo_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/cairo_pkg.cmake b/CMake/cdat_modules/cairo_pkg.cmake
deleted file mode 100644
index be1bcce3c..000000000
--- a/CMake/cdat_modules/cairo_pkg.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-set(CAIRO_MAJOR 1)
-set(CAIRO_MINOR 10)
-set(CAIRO_PATCH 2)
-set(CAIRO_MAJOR_SRC 1)
-set(CAIRO_MINOR_SRC 12)
-set(CAIRO_PATCH_SRC 14)
-set(CAIRO_URL ${LLNL_URL})
-set(CAIRO_GZ cairo-${CAIRO_MAJOR_SRC}.${CAIRO_MINOR_SRC}.${CAIRO_PATCH_SRC}.tar.gz)
-set(CAIRO_MD5 4a55de6dbbd2d22eee9eea78e6bdbbfd )
-set(CAIRO_SOURCE ${CAIRO_URL}/${CAIRO_GZ})
-set(CAIRO_VERSION ${CAIRO_MAJOR_SRC}.${CAIRO_MINOR_SRC}.${CAIRO_PATCH_SRC})
-
-add_cdat_package_dependent(Cairo "" "" OFF "CDAT_BUILD_GRAPHICS" OFF)
-
diff --git a/CMake/cdat_modules/cd77_deps.cmake b/CMake/cdat_modules/cd77_deps.cmake
deleted file mode 100644
index e18cdbd1d..000000000
--- a/CMake/cdat_modules/cd77_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(cd77_deps ${python_pkg} ${ezget_pkg} ${libcdms_pkg} ${setuptools_pkg} )
diff --git a/CMake/cdat_modules/cd77_external.cmake b/CMake/cdat_modules/cd77_external.cmake
deleted file mode 100644
index 00e3b0833..000000000
--- a/CMake/cdat_modules/cd77_external.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-# create an external project to install cd77
-# and configure and build it
-
-ExternalProject_Add(cd77
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/build/cd77
-  ${GIT_CMD_STR_cd77}
-  ${GIT_TAG_cd77}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ""
-  INSTALL_COMMAND env LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH} CFLAGS=$ENV{CFLAGS} LDFLAGS=$ENV{LDFLAGS} PKG_CONFIG_PATH=$ENV{PKG_CONFIG_PATH} PYTHONPATH=${PYTHONPATH} ${USR_ENVS} ${PYTHON_EXECUTABLE} setup.py install ${USER_INSTALL_OPTIONS} ${PRFX}
-  DEPENDS ${${nm}_deps}
-  ${ep_log_options}
-)
-
diff --git a/CMake/cdat_modules/cd77_pkg.cmake b/CMake/cdat_modules/cd77_pkg.cmake
deleted file mode 100644
index 3dc195aec..000000000
--- a/CMake/cdat_modules/cd77_pkg.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-set(cd77_VERSION 1.0.0)
-set(cd77_BRANCH master)
-set(cd77_REPOSITORY ${GIT_PROTOCOL}github.com/UV-CDAT/cd77.git )
-
-
-set(GIT_CMD_STR_cd77 GIT_REPOSITORY ${cd77_REPOSITORY})
-set(GIT_TAG_cd77 GIT_TAG "${cd77_BRANCH}")
-set (nm cd77)
-string(TOUPPER ${nm} uc_nm)
-
-if (CDAT_BUILD_PCMDI)
-  add_cdat_package(cd77 "" "" ON)
-endif()
diff --git a/CMake/cdat_modules/cdatlogger_deps.cmake b/CMake/cdat_modules/cdatlogger_deps.cmake
deleted file mode 100644
index c2cfeeb0b..000000000
--- a/CMake/cdat_modules/cdatlogger_deps.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-set (CDATLogger_deps ${cdat_pkg})
-
diff --git a/CMake/cdat_modules/cdatlogger_external.cmake b/CMake/cdat_modules/cdatlogger_external.cmake
deleted file mode 100644
index 69cb09c1a..000000000
--- a/CMake/cdat_modules/cdatlogger_external.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cmake_modules/CDATLogger.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/CDATLogger.cmake
-  @ONLY)
-
-ExternalProject_Add(CDATLogger
-  DOWNLOAD_DIR ""
-  SOURCE_DIR ${cdat_SOURCE_DIR}
-  BINARY_DIR ${cdat_build_dir}
-  BUILD_IN_SOURCE 0
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ""
-  INSTALL_COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/CDATLogger.cmake
-  DEPENDS ${CDATLogger_deps}
-)
diff --git a/CMake/cdat_modules/cdatlogger_pkg.cmake b/CMake/cdat_modules/cdatlogger_pkg.cmake
deleted file mode 100644
index f9e19bd05..000000000
--- a/CMake/cdat_modules/cdatlogger_pkg.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-set(CDATLOGGER_VERSION N/A)
-set(CDATLOGGER_SOURCE N/A)
-
-add_cdat_package(CDATLogger "" "" OFF)
diff --git a/CMake/cdat_modules/cffi_deps.cmake b/CMake/cdat_modules/cffi_deps.cmake
deleted file mode 100644
index 3e0620510..000000000
--- a/CMake/cdat_modules/cffi_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(CFFI_deps ${pip_pkg} ${six_pkg} ${ffi_pkg} ${pycparser_pkg} )
diff --git a/CMake/cdat_modules/cffi_external.cmake b/CMake/cdat_modules/cffi_external.cmake
deleted file mode 100644
index 1fdb495c4..000000000
--- a/CMake/cdat_modules/cffi_external.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-
-# create an external project to install MyProxyClient,
-# and configure and build it
-set(nm CFFI)
-
-include(pipinstaller)
diff --git a/CMake/cdat_modules/cffi_pkg.cmake b/CMake/cdat_modules/cffi_pkg.cmake
deleted file mode 100644
index 889da6bb7..000000000
--- a/CMake/cdat_modules/cffi_pkg.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(CFFI_MAJOR_SRC 1)
-set(CFFI_MINOR_SRC 5)
-set(CFFI_PATCH_SRC 2)
-
-set(CFFI_VERSION ${CFFI_MAJOR_SRC}.${CFFI_MINOR_SRC}.${CFFI_PATCH_SRC})
-set(CFFI_GZ cffi-${CFFI_VERSION}.tar.gz)
-set(CFFI_SOURCE ${LLNL_URL}/${CFFI_GZ})
-set(CFFI_MD5 fa766133f7299464c8bf857e0c966a82)
-
-add_cdat_package_dependent(CFFI "" "" OFF "CDAT_BUILD_LEAN" ON)
diff --git a/CMake/cdat_modules/clapack_deps.cmake b/CMake/cdat_modules/clapack_deps.cmake
deleted file mode 100644
index e0f544de8..000000000
--- a/CMake/cdat_modules/clapack_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(CLAPACK_deps ${pkgconfig_pkg})
diff --git a/CMake/cdat_modules/clapack_external.cmake b/CMake/cdat_modules/clapack_external.cmake
deleted file mode 100644
index bab6e0f94..000000000
--- a/CMake/cdat_modules/clapack_external.cmake
+++ /dev/null
@@ -1,39 +0,0 @@
-# The CLAPACK external project
-
-set(clapack_source "${CMAKE_CURRENT_BINARY_DIR}/LAPACK")
-set(clapack_binary "${CMAKE_CURRENT_BINARY_DIR}/LAPACK-build")
-set(clapack_install "${cdat_EXTERNALS}")
-set(NUMPY_LAPACK_binary ${clapack_binary})
-
-#
-# To fix compilation problem: relocation R_X86_64_32 against `a local symbol' can not be
-# used when making a shared object; recompile with -fPIC
-# See http://www.cmake.org/pipermail/cmake/2007-May/014350.html
-#
-if(UNIX AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  set(cdat_tpl_c_flags_LAPACK "-fPIC ${cdat_tpl_c_flags}")
-endif()
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/CLAPACK_install_step.cmake.in
-    ${cdat_CMAKE_BINARY_DIR}/CLAPACK_install_step.cmake
-    @ONLY)
-
-set(CLAPACK_INSTALL_COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/CLAPACK_install_step.cmake)
-
-ExternalProject_Add(CLAPACK
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${clapack_source}
-  BINARY_DIR ${clapack_binary}
-  INSTALL_DIR ${clapack_install}
-  URL ${CLAPACK_URL}/${CLAPACK_GZ}
-  URL_MD5 ${CLAPACK_MD5}
-  CMAKE_CACHE_ARGS
-    -DCMAKE_CXX_FLAGS:STRING=${cdat_tpl_cxx_flags}
-    -DCMAKE_C_FLAGS:STRING=${cdat_tpl_c_flags}
-    -DBUILD_SHARED_LIBS:BOOL=ON
-    -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-    ${CLAPACK_EXTRA_ARGS}
-  INSTALL_COMMAND ${CLAPACK_INSTALL_COMMAND}
-  DEPENDS ${CLAPACK_deps}
-  ${ep_log_options}
-  )
diff --git a/CMake/cdat_modules/clapack_pkg.cmake b/CMake/cdat_modules/clapack_pkg.cmake
deleted file mode 100644
index 38f156a44..000000000
--- a/CMake/cdat_modules/clapack_pkg.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-set(CLAPACK_MAJOR 3)
-set(CLAPACK_MINOR 2)
-set(CLAPACK_PATCH 1)
-set(CLAPACK_VERSION ${CLAPACK_MAJOR}.${CLAPACK_MINOR}.${CLAPACK_PATCH})
-set(CLAPACK_URL http://www.netlib.org/clapack)
-set(CLAPACK_GZ clapack-${CLAPACK_VERSION}-CMAKE.tgz)
-set(CLAPACK_MD5 4fd18eb33f3ff8c5d65a7d43913d661b)
-set(CLAPACK_SOURCE ${CLAPACK_URL}/${CLAPACK_GZ})
-
-if(NOT APPLE)
-  if(NOT CMAKE_Fortran_COMPILER)
-    add_cdat_package(CLAPACK "" "" OFF)
-  endif()
-endif()
-
diff --git a/CMake/cdat_modules/click_deps.cmake b/CMake/cdat_modules/click_deps.cmake
deleted file mode 100644
index ee4e50d5d..000000000
--- a/CMake/cdat_modules/click_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(CLICK_deps ${pip_pkg} ${six_pkg} ${ffi_pkg} ${pycparser_pkg} )
diff --git a/CMake/cdat_modules/click_external.cmake b/CMake/cdat_modules/click_external.cmake
deleted file mode 100644
index 0c89a3bf1..000000000
--- a/CMake/cdat_modules/click_external.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-
-# create an external project to install MyProxyClient,
-# and configure and build it
-set(nm CLICK)
-
-include(pipinstaller)
diff --git a/CMake/cdat_modules/click_pkg.cmake b/CMake/cdat_modules/click_pkg.cmake
deleted file mode 100644
index b0aef777c..000000000
--- a/CMake/cdat_modules/click_pkg.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-set(CLICK_MAJOR_SRC 4)
-set(CLICK_MINOR_SRC 1)
-
-set(CLICK_VERSION ${CLICK_MAJOR_SRC}.${CLICK_MINOR_SRC})
-set(CLICK_GZ click-${CLICK_VERSION}.tar.gz)
-set(CLICK_SOURCE ${LLNL_URL}/${CLICK_GZ})
-set(CLICK_MD5 6a3fa88c738f2f775ec6de126feb99a4)
-
-if (CDAT_BUILD_ALL)
-  add_cdat_package(CLICK "" "" ON)
-else()
-  add_cdat_package(CLICK "" "" OFF)
-endif()
diff --git a/CMake/cdat_modules/cligj_deps.cmake b/CMake/cdat_modules/cligj_deps.cmake
deleted file mode 100644
index ce62bdb2f..000000000
--- a/CMake/cdat_modules/cligj_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(CLIGJ_deps ${pip_pkg} ${six_pkg} ${ffi_pkg} ${pycparser_pkg} ${click_pkg} )
diff --git a/CMake/cdat_modules/cligj_external.cmake b/CMake/cdat_modules/cligj_external.cmake
deleted file mode 100644
index 805117570..000000000
--- a/CMake/cdat_modules/cligj_external.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-
-# create an external project to install MyProxyClient,
-# and configure and build it
-set(nm CLIGJ)
-
-include(pipinstaller)
diff --git a/CMake/cdat_modules/cligj_pkg.cmake b/CMake/cdat_modules/cligj_pkg.cmake
deleted file mode 100644
index 06adad506..000000000
--- a/CMake/cdat_modules/cligj_pkg.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-set(CLIGJ_MAJOR_SRC 0)
-set(CLIGJ_MINOR_SRC 3)
-set(CLIGJ_PATCH_SRC 0)
-
-set(CLIGJ_VERSION ${CLIGJ_MAJOR_SRC}.${CLIGJ_MINOR_SRC}.${CLIGJ_PATCH_SRC})
-set(CLIGJ_GZ cligj-${CLIGJ_VERSION}.tar.gz)
-set(CLIGJ_SOURCE ${LLNL_URL}/${CLIGJ_GZ})
-set(CLIGJ_MD5 cd135f171b4ef2c07ebd34731ccf09a5)
-
-if (CDAT_BUILD_ALL)
-  add_cdat_package(CLIGJ "" "" ON)
-else()
-  add_cdat_package(CLIGJ "" "" OFF)
-endif()
diff --git a/CMake/cdat_modules/cmcurl_external.cmake b/CMake/cdat_modules/cmcurl_external.cmake
deleted file mode 100644
index 8a6033f35..000000000
--- a/CMake/cdat_modules/cmcurl_external.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-# The cmCurl external project for Titan
-
-set(curl_source "${CMAKE_CURRENT_SOURCE_DIR}/cmcurl")
-set(curl_binary "${CMAKE_CURRENT_BINARY_DIR}/cmcurl")
-
-ExternalProject_Add(cmcurl
-  DOWNLOAD_COMMAND ""
-  SOURCE_DIR "${curl_source}"
-  BINARY_DIR "${curl_binary}"
-  CMAKE_GENERATOR ${gen}
-  CMAKE_ARGS
-    -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-    -DBUILD_SHARED_LIBS:BOOL=ON
-    -DBUILD_TESTING:BOOL=OFF
-    -DBUILD_CURL_TESTS:BOOL=OFF
-    -DBUILD_CURL_EXE:BOOL=OFF
-    -DCURL_DISABLE_LDAP:BOOL=ON
-    -DCURL_DISABLE_LDAPS:BOOL=ON
-    ${titan_compiler_args}
-    ${titan_binary_args}
-    ${cmcurl_EXTRA_ARGS}
-    -DTRIGGER_REBUILD:STRING=0
-  INSTALL_COMMAND ""
-  DEPENDS ${cmcurl_deps}
-)
diff --git a/CMake/cdat_modules/cmor_deps.cmake b/CMake/cdat_modules/cmor_deps.cmake
deleted file mode 100644
index 719a3c001..000000000
--- a/CMake/cdat_modules/cmor_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(CMOR_deps ${pkgconfig_pkg} ${python_pkg} ${hdf5_pkg} ${netcdf_pkg} ${zlib_pkg} ${uuid_pkg} ${udunits2_pkg} ${cdat_pkg})
diff --git a/CMake/cdat_modules/cmor_external.cmake b/CMake/cdat_modules/cmor_external.cmake
deleted file mode 100644
index 5cf405322..000000000
--- a/CMake/cdat_modules/cmor_external.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-set(cmor_source_dir  "${CMAKE_CURRENT_BINARY_DIR}/build/cmor")
-set(cmor_binary_dir  "${CMAKE_CURRENT_BINARY_DIR}/build/cmor")
-set(cmor_install_dir "${cdat_EXTERNALS}")
-
-set(cmor_configure_args --with-netcdf=${netcdf_install} --with-udunits2=${udunits_install} --with-uuid=${uuid_install} --enable-fortran=yes --with-python=${CMAKE_INSTALL_PREFIX} --prefix=${CMAKE_INSTALL_PREFIX})
-
-# it appears currently we only configure cmor but not build it.
-ExternalProject_Add(CMOR
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${cmor_source_dir}
-  BUILD_IN_SOURCE 1
-  ${GIT_CMD_STR_CMOR}
-  ${GIT_TAG}
-  INSTALL_DIR ${cmor_install_dir}
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND sh ${cmor_source_dir}/configure ${cmor_configure_args}
-  DEPENDS ${CMOR_deps}
-  ${ep_log_options}
-)
-if (DEFINED GIT_CMD_STR_CMOR)
-  unset(GIT_CMD_STR_CMOR)
-endif()
diff --git a/CMake/cdat_modules/cmor_pkg.cmake b/CMake/cdat_modules/cmor_pkg.cmake
deleted file mode 100644
index e3b785ac3..000000000
--- a/CMake/cdat_modules/cmor_pkg.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-set(CMOR_VERSION 2.9.2)
-set(CMOR_BRANCH uvcdat-2.4.0)
-set(CMOR_REPOSITORY ${GIT_PROTOCOL}github.com/PCMDI/cmor.git )
-
-set(GIT_CMD_STR_CMOR GIT_REPOSITORY ${CMOR_REPOSITORY})
-set(GIT_TAG GIT_TAG "${CMOR_BRANCH}")
-set (nm CMOR)
-string(TOUPPER ${nm} uc_nm)
-
-if (CDAT_BUILD_ALL)
-  add_cdat_package(CMOR "" "" ON)
-else()
-  add_cdat_package_dependent(CMOR "" "" ON "CDAT_BUILD_CMOR" OFF)
-endif()
diff --git a/CMake/cdat_modules/configobj_deps.cmake b/CMake/cdat_modules/configobj_deps.cmake
deleted file mode 100644
index 1835fd3b4..000000000
--- a/CMake/cdat_modules/configobj_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(configobj_deps ${python_pkg} ${six_pkg} ${setuptools_pkg})
diff --git a/CMake/cdat_modules/configobj_external.cmake b/CMake/cdat_modules/configobj_external.cmake
deleted file mode 100644
index ce77c8f03..000000000
--- a/CMake/cdat_modules/configobj_external.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-# configobj
-#
-set(configobj_source_dir "${CMAKE_CURRENT_BINARY_DIR}/build/configobj")
-
-configure_file(
-  "${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/configobj_build_step.cmake.in"
-  "${cdat_CMAKE_BINARY_DIR}/configobj_build_step.cmake"
-  @ONLY
-)
-
-set(configobj_build_command ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/configobj_build_step.cmake)
-
-ExternalProject_Add(configobj
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${configobj_source_dir}
-  URL ${CONFIGOBJ_URL}/${CONFIGOBJ_GZ}
-  URL_MD5 ${CONFIGOBJ_MD5}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ${configobj_build_command}
-  INSTALL_COMMAND ""
-  DEPENDS ${configobj_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/configobj_pkg.cmake b/CMake/cdat_modules/configobj_pkg.cmake
deleted file mode 100644
index c236b8694..000000000
--- a/CMake/cdat_modules/configobj_pkg.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-set( CONFIGOBJ_MAJOR 5 )
-set( CONFIGOBJ_MINOR 0 )
-set( CONFIGOBJ_PATCH 6 )
-set( CONFIGOBJ_VERSION ${CONFIGOBJ_MAJOR}.${CONFIGOBJ_MINOR}.${CONFIGOBJ_PATCH} )
-set( CONFIGOBJ_URL ${LLNL_URL} )
-set( CONFIGOBJ_GZ configobj-${CONFIGOBJ_VERSION}.tar.gz )
-set( CONFIGOBJ_MD5 e472a3a1c2a67bb0ec9b5d54c13a47d6 )
-
-set (nm CONFIGOBJ)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR}.${${nm}_MINOR}.${${nm}_PATCH})
-set(CONFIGOBJ_SOURCE ${CONFIGOBJ_URL}/${CONFIGOBJ_GZ})
-
-if (CDAT_BUILD_ALL)
-  add_cdat_package(configobj "" "" ON)
-else()
-  add_cdat_package(configobj "" "" OFF)
-endif()
diff --git a/CMake/cdat_modules/coverage_deps.cmake b/CMake/cdat_modules/coverage_deps.cmake
deleted file mode 100644
index d2744141d..000000000
--- a/CMake/cdat_modules/coverage_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(coverage_deps ${python_pkg} ${pip_pkg})
diff --git a/CMake/cdat_modules/coverage_external.cmake b/CMake/cdat_modules/coverage_external.cmake
deleted file mode 100644
index e09cfb7fb..000000000
--- a/CMake/cdat_modules/coverage_external.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-# External coverage.py package
-set(nm COVERAGE)
-
-include(pipinstaller)
diff --git a/CMake/cdat_modules/coverage_pkg.cmake b/CMake/cdat_modules/coverage_pkg.cmake
deleted file mode 100644
index 7e32eaa61..000000000
--- a/CMake/cdat_modules/coverage_pkg.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(COVERAGE_MAJOR_SRC 4)
-set(COVERAGE_MINOR_SRC 0)
-set(COVERAGE_PATCH_SRC 3)
-
-set(COVERAGE_VERSION ${COVERAGE_MAJOR_SRC}.${COVERAGE_MINOR_SRC}.${COVERAGE_PATCH_SRC})
-set(COVERAGE_GZ coverage-${COVERAGE_VERSION}.tar.gz)
-set(COVERAGE_SOURCE ${LLNL_URL}/${COVERAGE_GZ})
-set(COVERAGE_MD5 c7d3db1882484022c81bf619be7b6365)
-
-add_cdat_package_dependent(COVERAGE "" "" ON "CDAT_MEASURE_COVERAGE" OFF)
diff --git a/CMake/cdat_modules/cryptography_deps.cmake b/CMake/cdat_modules/cryptography_deps.cmake
deleted file mode 100644
index cad6e0ddd..000000000
--- a/CMake/cdat_modules/cryptography_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(CRYPTOGRAPHY_deps ${cffi_pkg} ${enum34_pkg} ${idna_pkg} ${ipaddress_pkg} ${openssl_pkg} ${pip_pkg} ${pyasn1_pkg} ${python_pkg})
diff --git a/CMake/cdat_modules/cryptography_external.cmake b/CMake/cdat_modules/cryptography_external.cmake
deleted file mode 100644
index 9e10cb4bb..000000000
--- a/CMake/cdat_modules/cryptography_external.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-
-# create an external project to install MyProxyClient,
-# and configure and build it
-set(nm CRYPTOGRAPHY)
-
-# Set LDFlags and CFlags to make it easier to find OpenSSL
-list(APPEND USR_ENVS
-  "LDFLAGS=-L${OPENSSL_LIBRARY_DIR} $ENV{LDFLAGS}"
-  "CFLAGS=-I${OPENSSL_INCLUDE_DIR} $ENV{CFLAGS}"
-  )
-
-include(pipinstaller)
diff --git a/CMake/cdat_modules/cryptography_pkg.cmake b/CMake/cdat_modules/cryptography_pkg.cmake
deleted file mode 100644
index 0b5671da1..000000000
--- a/CMake/cdat_modules/cryptography_pkg.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(CRYPTOGRAPHY_MAJOR_SRC 1)
-set(CRYPTOGRAPHY_MINOR_SRC 3)
-set(CRYPTOGRAPHY_PATCH_SRC 2)
-
-set(CRYPTOGRAPHY_VERSION ${CRYPTOGRAPHY_MAJOR_SRC}.${CRYPTOGRAPHY_MINOR_SRC}.${CRYPTOGRAPHY_PATCH_SRC})
-set(CRYPTOGRAPHY_GZ cryptography-${CRYPTOGRAPHY_VERSION}.tar.gz)
-set(CRYPTOGRAPHY_SOURCE ${LLNL_URL}/${CRYPTOGRAPHY_GZ})
-set(CRYPTOGRAPHY_MD5 0359190f291824dc8ad9e6d477a607b2)
-
-add_cdat_package_dependent(CRYPTOGRAPHY "" "" OFF "CDAT_BUILD_LEAN" OFF)
diff --git a/CMake/cdat_modules/curl_deps.cmake b/CMake/cdat_modules/curl_deps.cmake
deleted file mode 100644
index 432b4d319..000000000
--- a/CMake/cdat_modules/curl_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(CURL_deps ${pkgconfig_pkg} ${libXML2_pkg} ${zlib_pkg})
diff --git a/CMake/cdat_modules/curl_external.cmake b/CMake/cdat_modules/curl_external.cmake
deleted file mode 100644
index 6dd77c373..000000000
--- a/CMake/cdat_modules/curl_external.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-set(curl_source "${CMAKE_CURRENT_BINARY_DIR}/build/CURL")
-set(curl_install "${cdat_EXTERNALS}")
-
-ExternalProject_Add(CURL
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${curl_source}
-  INSTALL_DIR ${curl_install}
-  URL ${CURL_URL}/${CURL_GZ}
-  URL_MD5 ${CURL_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  DEPENDS ${CURL_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/curl_pkg.cmake b/CMake/cdat_modules/curl_pkg.cmake
deleted file mode 100644
index 6946ad58d..000000000
--- a/CMake/cdat_modules/curl_pkg.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-set(CURL_MAJOR 7)
-set(CURL_MINOR 22)
-set(CURL_PATCH 0)
-set(CURL_MAJOR_SRC 7)
-set(CURL_MINOR_SRC 33)
-set(CURL_PATCH_SRC 0)
-set(CURL_URL ${LLNL_URL})
-set(CURL_GZ curl-${CURL_MAJOR_SRC}.${CURL_MINOR_SRC}.${CURL_PATCH_SRC}.tar.gz)
-set(CURL_MD5 c8a4eaac7ce7b0d1bf458d62ccd4ef93 )
-set(CURL_VERSION ${CURL_MAJOR_SRC}.${CURL_MINOR_SRC}.${CURL_PATCH_SRC})
-set(CURL_SOURCE ${CURL_URL}/${CURL_GZ})
-
-add_cdat_package(CURL "" "" OFF)
diff --git a/CMake/cdat_modules/curses_deps.cmake b/CMake/cdat_modules/curses_deps.cmake
deleted file mode 100644
index 1926beb7c..000000000
--- a/CMake/cdat_modules/curses_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(curses_deps ${pkgconfig_pkg})
diff --git a/CMake/cdat_modules/curses_external.cmake b/CMake/cdat_modules/curses_external.cmake
deleted file mode 100644
index 2fe0ea547..000000000
--- a/CMake/cdat_modules/curses_external.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-set(curses_source "${CMAKE_CURRENT_BINARY_DIR}/build/curses")
-set(curses_install "${cdat_EXTERNALS}")
-set(curses_conf_args)
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/curses_patch_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/curses_patch_step.cmake
-  @ONLY)
-
-set(curses_PATCH_COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/curses_patch_step.cmake)
-
-ExternalProject_Add(Curses
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${curses_source}
-  INSTALL_DIR ${curses_install}
-  URL ${CURSES_URL}/${CURSES_GZ}
-  URL_MD5 ${CURSES_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ${curses_PATCH_COMMAND}
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCONFIGURE_ARGS=${curses_conf_args} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  DEPENDS ${curses_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/curses_pkg.cmake b/CMake/cdat_modules/curses_pkg.cmake
deleted file mode 100644
index 29b6d5240..000000000
--- a/CMake/cdat_modules/curses_pkg.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-set (package Curses)
-string(TOUPPER ${package} package_uc)
-
-set(${package_uc}_MAJOR_SRC 6)
-set(${package_uc}_MINOR_SRC 0)
-set(${package_uc}_PATCH_SRC 0)
-set(${package_uc}_URL ${LLNL_URL})
-#set(${package_uc}_GZ ncurses-${${package_uc}_MAJOR_SRC}.${${package_uc}_MINOR_SRC}.${${package_uc}_PATCH_SRC}.tar.gz)
-set(${package_uc}_GZ ncurses-${${package_uc}_MAJOR_SRC}.${${package_uc}_MINOR_SRC}.tar.gz)
-set(${pacakge_uc}_MD5 931959c0e1a9949999407b025cf44d3d)
-#set(${package_uc}_MD5 8cb9c412e5f2d96bc6f459aa8c6282a1)
-set(${package_uc}_SOURCE ${${package_uc}_URL}/${${package_uc}_GZ})
-set(${package_uc}_MD5 ${${package_uc}_MD5})
-
-set(${package_uc}_VERSION ${${package_uc}_MAJOR_SRC}.${${package_uc}_MINOR_SRC})
-add_cdat_package(${package} "" "" OFF)
diff --git a/CMake/cdat_modules/cycler_deps.cmake b/CMake/cdat_modules/cycler_deps.cmake
deleted file mode 100644
index 6c4db4535..000000000
--- a/CMake/cdat_modules/cycler_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(cycler_deps ${python_pkg} ${setuptools_pkg} ${six_pkg})
diff --git a/CMake/cdat_modules/cycler_external.cmake b/CMake/cdat_modules/cycler_external.cmake
deleted file mode 100644
index 5cd06b6e8..000000000
--- a/CMake/cdat_modules/cycler_external.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-# Cycler
-
-set(Cycler_source "${CMAKE_CURRENT_BINARY_DIR}/build/Cycler")
-
-ExternalProject_Add(Cycler
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${Cycler_source}
-  URL ${CYCLER_URL}/${CYCLER_GZ}
-  URL_MD5 ${CYCLER_MD5}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ${PYTHON_EXECUTABLE} setup.py build
-  INSTALL_COMMAND ${PYTHON_EXECUTABLE} setup.py install --old-and-unmanageable ${PYTHON_EXTRA_PREFIX}
-  DEPENDS ${cycler_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/cycler_pkg.cmake b/CMake/cdat_modules/cycler_pkg.cmake
deleted file mode 100644
index b2310801a..000000000
--- a/CMake/cdat_modules/cycler_pkg.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(CYCLER_MAJOR 0)
-set(CYCLER_MINOR 9)
-set(CYCLER_PATCH 0)
-set(CYCLER_VERSION ${CYCLER_MAJOR}.${CYCLER_MINOR}.${CYCLER_PATCH})
-set(CYCLER_URL ${LLNL_URL})
-set(CYCLER_GZ cycler-${CYCLER_VERSION}.tar.gz)
-set(CYCLER_MD5 c10ade5ca3f0aadf575eb25203b225a5)
-set(CYCLER_SOURCE ${CYCLER_URL}/${CYCLER_GZ})
-
-add_cdat_package_dependent(Cycler "" "" ON "CDAT_BUILD_GRAPHICS" OFF)
diff --git a/CMake/cdat_modules/cython_deps.cmake b/CMake/cdat_modules/cython_deps.cmake
deleted file mode 100644
index eab0a78be..000000000
--- a/CMake/cdat_modules/cython_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(Cython_deps ${pkgconfig_pkg} ${python_pkg} ${setuptools_pkg})
diff --git a/CMake/cdat_modules/cython_external.cmake b/CMake/cdat_modules/cython_external.cmake
deleted file mode 100644
index a059bdd30..000000000
--- a/CMake/cdat_modules/cython_external.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-# Cython
-#
-# --old-and-unmangeable solution avoids the use of eggs
-# and  forces to create a directory.
-# this seems to fix issues of the type encountered in 
-# bug #1192 and #1486
-
-set(Cython_source "${CMAKE_CURRENT_BINARY_DIR}/build/Cython")
-
-ExternalProject_Add(Cython
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${Cython_source}
-  URL ${CYTHON_URL}/${CYTHON_GZ}
-  URL_MD5 ${CYTHON_MD5}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ${PYTHON_EXECUTABLE} setup.py build
-  INSTALL_COMMAND ${PYTHON_EXECUTABLE} setup.py install --old-and-unmanageable ${PYTHON_EXTRA_PREFIX}
-  DEPENDS ${Cython_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/cython_pkg.cmake b/CMake/cdat_modules/cython_pkg.cmake
deleted file mode 100644
index 3d1fe53d5..000000000
--- a/CMake/cdat_modules/cython_pkg.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(CYTHON_MAJOR 0)
-set(CYTHON_MINOR 23)
-set(CYTHON_PATCH 4)
-set(CYTHON_VERSION ${CYTHON_MAJOR}.${CYTHON_MINOR}.${CYTHON_PATCH})
-set(CYTHON_URL ${LLNL_URL} )
-set(CYTHON_GZ Cython-${CYTHON_VERSION}.tar.gz)
-set(CYTHON_MD5 157df1f69bcec6b56fd97e0f2e057f6e)
-set(CYTHON_SOURCE ${CYTHON_URL}/${CYTHON_GZ})
-
-add_cdat_package_dependent(Cython "" "" OFF "CDAT_BUILD_LEAN" OFF)
diff --git a/CMake/cdat_modules/data_deps.cmake b/CMake/cdat_modules/data_deps.cmake
deleted file mode 100644
index 8b1378917..000000000
--- a/CMake/cdat_modules/data_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/CMake/cdat_modules/data_pkg.cmake b/CMake/cdat_modules/data_pkg.cmake
deleted file mode 100644
index d4be977a8..000000000
--- a/CMake/cdat_modules/data_pkg.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-# Do we download the data ?
-option(CDAT_DOWNLOAD_SAMPLE_DATA "Download sample data" ON)
-if (CDAT_BUILD_LEAN)
-    message("[INFO] Disabling download data for ESGF")
-    set(CDAT_DOWNLOAD_SAMPLE_DATA OFF)
-endif()
-
-if (OFFLINE_BUILD)
-    message("[INFO] Disabling download data for offline build")
-    set(CDAT_DOWNLOAD_SAMPLE_DATA OFF)
-endif()
-
-if (CDAT_DOWNLOAD_SAMPLE_DATA)
-  set(SAMPLE_DATA "")
-else()
-  set(SAMPLE_DATA --disable-sampledata)
-endif()
diff --git a/CMake/cdat_modules/dateutils_deps.cmake b/CMake/cdat_modules/dateutils_deps.cmake
deleted file mode 100644
index 08ee1bda7..000000000
--- a/CMake/cdat_modules/dateutils_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(DATEUTILS_deps ${python_pkg} ${pip_pkg} ${six_pkg})
diff --git a/CMake/cdat_modules/dateutils_external.cmake b/CMake/cdat_modules/dateutils_external.cmake
deleted file mode 100644
index e157432d1..000000000
--- a/CMake/cdat_modules/dateutils_external.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-
-# create an external project to install MyProxyClient,
-# and configure and build it
-# --old-and-unmangeable solution avoids the use of eggs
-# and  forces to create a directory.
-# this seems to fix issues of the type encountered in 
-# bug #1192 and #1486
-
-set(nm DATEUTILS)
-set(USER_INSTALL_OPTIONS --old-and-unmanageable)
-include(pipinstaller)
-unset(USER_INSTALL_OPTIONS)
diff --git a/CMake/cdat_modules/dateutils_pkg.cmake b/CMake/cdat_modules/dateutils_pkg.cmake
deleted file mode 100644
index 9b1fe3fd5..000000000
--- a/CMake/cdat_modules/dateutils_pkg.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-set(DATEUTILS_MAJOR_SRC 2)
-set(DATEUTILS_MINOR_SRC 2)
-set(DATEUTILS_PATCH_SRC -)
-
-set(DATEUTILS_VERSION ${DATEUTILS_MAJOR_SRC}.${DATEUTILS_MINOR_SRC}.${DATEUTILS_PATCH_SRC})
-set(DATEUTILS_VERSION ${DATEUTILS_MAJOR_SRC}.${DATEUTILS_MINOR_SRC})
-set(DATEUTILS_GZ python-dateutil-${DATEUTILS_VERSION}.tar.gz)
-set(DATEUTILS_SOURCE ${LLNL_URL}/${DATEUTILS_GZ})
-set(DATEUTILS_MD5 c1f654d0ff7e33999380a8ba9783fd5c)
-
-add_cdat_package_dependent(DATEUTILS "" "" OFF "NOT CDAT_BUILD_LEAN" OFF)
diff --git a/CMake/cdat_modules/distribute_deps.cmake b/CMake/cdat_modules/distribute_deps.cmake
deleted file mode 100644
index d6313c1c9..000000000
--- a/CMake/cdat_modules/distribute_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(distribute_deps  ${setuptools_pkg})
diff --git a/CMake/cdat_modules/distribute_external.cmake b/CMake/cdat_modules/distribute_external.cmake
deleted file mode 100644
index c8f536fa0..000000000
--- a/CMake/cdat_modules/distribute_external.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-# create an external project to install MyProxyClient,
-# and configure and build it
-
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-if (NOT OFFLINE_BUILD) 
-    set(EGG_GZ "distribute==${DISTRIBUTE_VERSION}")
-else ()
-    set(EGG_GZ ${CDAT_PACKAGE_CACHE_DIR}/${DISTRIBUTE_GZ})
-endif()
-
-ExternalProject_Add(distribute
-  DOWNLOAD_COMMAND ""
-  WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ""
-  INSTALL_COMMAND ${EASY_INSTALL_BINARY} ${EGG_GZ}
-  DEPENDS ${distribute_deps}
-  ${ep_log_options}
-  )
diff --git a/CMake/cdat_modules/distribute_pkg.cmake b/CMake/cdat_modules/distribute_pkg.cmake
deleted file mode 100644
index 2a0415f6b..000000000
--- a/CMake/cdat_modules/distribute_pkg.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-set(DISTRIBUTE_MAJOR_SRC 0)
-set(DISTRIBUTE_MINOR_SRC 6)
-set(DISTRIBUTE_PATCH_SRC 45)
-
-set (nm DISTRIBUTE)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-set(DISTRIBUTE_GZ distribute-${DISTRIBUTE_VERSION}.tar.gz)
-set(DISTRIBUTE_SOURCE ${LLNL_URL}/${DISTRIBUTE_GZ})
-set(DISTRIBUTE_MD5 8953f2c07e6700dabf2ec150129b8c31 )
-
-add_cdat_package(distribute "" "" OFF)
diff --git a/CMake/cdat_modules/docutils_deps.cmake b/CMake/cdat_modules/docutils_deps.cmake
deleted file mode 100644
index ef9fc3c52..000000000
--- a/CMake/cdat_modules/docutils_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(docutils_deps ${pip_pkg} ${jinja2_pkg})
diff --git a/CMake/cdat_modules/docutils_external.cmake b/CMake/cdat_modules/docutils_external.cmake
deleted file mode 100644
index 36bdaedb1..000000000
--- a/CMake/cdat_modules/docutils_external.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-# create an external project to install docutils,
-# and configure and build it
-
-set(nm docutils)
-set(OLD "OFF")
-include(pipinstaller)
diff --git a/CMake/cdat_modules/docutils_pkg.cmake b/CMake/cdat_modules/docutils_pkg.cmake
deleted file mode 100644
index 1aaa2505d..000000000
--- a/CMake/cdat_modules/docutils_pkg.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-set(docutils_MAJOR_SRC 0)
-set(docutils_MINOR_SRC 10)
-set(docutils_PATCH_SRC )
-
-set (nm docutils)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC})
-set(DOCUTILS_GZ docutils-${DOCUTILS_VERSION}.tar.gz)
-set(DOCUTILS_SOURCE ${LLNL_URL}/${DOCUTILS_GZ})
-set(DOCUTILS_MD5 d8d4660c08302c791b2d71a155a2f4bc )
-
-add_cdat_package_dependent(docutils "" "" OFF "CDAT_BUILD_GUI" OFF)
diff --git a/CMake/cdat_modules/enum34_deps.cmake b/CMake/cdat_modules/enum34_deps.cmake
deleted file mode 100644
index ed6c021a4..000000000
--- a/CMake/cdat_modules/enum34_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(ENUM34_deps ${python_pkg})
diff --git a/CMake/cdat_modules/enum34_external.cmake b/CMake/cdat_modules/enum34_external.cmake
deleted file mode 100644
index 2edf14978..000000000
--- a/CMake/cdat_modules/enum34_external.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-
-# create an external project to install MyProxyClient,
-# and configure and build it
-set(nm ENUM34)
-
-set(OLD OFF)
-include(pipinstaller)
-unset(OLD)
diff --git a/CMake/cdat_modules/enum34_pkg.cmake b/CMake/cdat_modules/enum34_pkg.cmake
deleted file mode 100644
index b4a57ec13..000000000
--- a/CMake/cdat_modules/enum34_pkg.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(ENUM34_MAJOR_SRC 1)
-set(ENUM34_MINOR_SRC 1)
-set(ENUM34_PATCH_SRC 2)
-
-set(ENUM34_VERSION ${ENUM34_MAJOR_SRC}.${ENUM34_MINOR_SRC}.${ENUM34_PATCH_SRC})
-set(ENUM34_GZ enum34-${ENUM34_VERSION}.tar.gz)
-set(ENUM34_SOURCE ${LLNL_URL}/${ENUM34_GZ})
-set(ENUM34_MD5 025bb71b3f9d2fad15d0ee53e48dc873)
-
-add_cdat_package_dependent(ENUM34 "" "" OFF "CDAT_BUILD_LEAN" OFF)
diff --git a/CMake/cdat_modules/eof2_deps.cmake b/CMake/cdat_modules/eof2_deps.cmake
deleted file mode 100644
index fc79a9356..000000000
--- a/CMake/cdat_modules/eof2_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(eof2_deps ${cdat_pkg})
diff --git a/CMake/cdat_modules/eof2_external.cmake b/CMake/cdat_modules/eof2_external.cmake
deleted file mode 100644
index d1d98ee83..000000000
--- a/CMake/cdat_modules/eof2_external.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-# EOF2
-#
-set(eof2_source "${CMAKE_CURRENT_BINARY_DIR}/build/eof2")
-
-ExternalProject_Add(eof2
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${eof2_source}
-  URL ${eof2_URL}/${eof2_GZ}
-  URL_MD5 ${eof2_MD5}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ${PYTHON_EXECUTABLE} setup.py build
-  INSTALL_COMMAND ${PYTHON_EXECUTABLE} setup.py install ${PYTHON_EXTRA_PREFIX}
-  DEPENDS ${eof2_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/eof2_pkg.cmake b/CMake/cdat_modules/eof2_pkg.cmake
deleted file mode 100644
index 89c374067..000000000
--- a/CMake/cdat_modules/eof2_pkg.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-set(eof2_MAJOR )
-set(eof2_MINOR )
-set(eof2_VERSION 620a921b46b)
-set(eof2_URL ${LLNL_URL} )
-set(eof2_GZ eof2-${eof2_VERSION}.zip)
-set(eof2_MD5 39e21a8633f272dc8dc748adb4c7f0e8)
-set(eof2_SOURCE ${eof2_URL}/${eof2_GZ})
-
-add_cdat_package_dependent(eof2 "" "" OFF "CDAT_BUILD_LEAN" ON)
diff --git a/CMake/cdat_modules/eofs_deps.cmake b/CMake/cdat_modules/eofs_deps.cmake
deleted file mode 100644
index 2746e30df..000000000
--- a/CMake/cdat_modules/eofs_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(eofs_deps ${cdat_pkg})
diff --git a/CMake/cdat_modules/eofs_external.cmake b/CMake/cdat_modules/eofs_external.cmake
deleted file mode 100644
index 23c9f26fd..000000000
--- a/CMake/cdat_modules/eofs_external.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-# Windfield`
-#
-set(eofs_source "${CMAKE_CURRENT_BINARY_DIR}/build/eofs")
-
-ExternalProject_Add(eofs
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${eofs_source}
-  URL ${eofs_URL}/${eofs_GZ}
-  URL_MD5 ${eofs_MD5}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ${PYTHON_EXECUTABLE} setup.py build
-  INSTALL_COMMAND ${PYTHON_EXECUTABLE} setup.py install ${PYTHON_EXTRA_PREFIX}
-  DEPENDS ${eofs_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/eofs_pkg.cmake b/CMake/cdat_modules/eofs_pkg.cmake
deleted file mode 100644
index 7fbe79aeb..000000000
--- a/CMake/cdat_modules/eofs_pkg.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(eofs_MAJOR_SRC 1)
-set(eofs_MINOR_SRC 1)
-set(eofs_PATCH_SRC 0)
-set(eofs_VERSION ${eofs_MAJOR_SRC}.${eofs_MINOR_SRC}.${eofs_PATCH_SRC})
-set(eofs_URL ${LLNL_URL})
-set(eofs_GZ eofs-${eofs_VERSION}.tar.gz)
-set(eofs_MD5 52fce9f666d540069c90a6c109fcb3b4)
-set(eofs_SOURCE ${eofs_URL}/${eofs_GZ})
-
-add_cdat_package_dependent(eofs "" "" OFF "CDAT_BUILD_LEAN" ON)
diff --git a/CMake/cdat_modules/esmf_deps.cmake b/CMake/cdat_modules/esmf_deps.cmake
deleted file mode 100644
index 631f2a9e4..000000000
--- a/CMake/cdat_modules/esmf_deps.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-set(ESMF_deps ${pkgconfig_pkg} ${python_pkg})
-
-if(CDAT_BUILD_ESMF_PARALLEL)
-  set(ESMF_deps ${mpi_pkg} ${ESMF_deps})
-endif()
diff --git a/CMake/cdat_modules/esmf_external.cmake b/CMake/cdat_modules/esmf_external.cmake
deleted file mode 100644
index eaf9518ad..000000000
--- a/CMake/cdat_modules/esmf_external.cmake
+++ /dev/null
@@ -1,78 +0,0 @@
-set(ESMF_source_dir "${CMAKE_CURRENT_BINARY_DIR}/build/ESMF" CACHE INTERNAL "")
-set(ESMF_source "${CMAKE_CURRENT_BINARY_DIR}/build/ESMF" CACHE INTERNAL "")
-set(ESMF_install "${cdat_EXTERNALS}" CACHE INTERNAL "")
-set(ESMF_pthreads "OFF")
-set(ESMF_os "${CDAT_BUILD_ESMF_OS}")
-set(ESMF_compiler "${CDAT_BUILD_ESMF_COMPILER}")
-set(ESMF_abi "${CDAT_BUILD_ESMF_ABI}")
-set(ESMF_openmp "ON")
-
-if(APPLE)
-  if("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" AND ${CMAKE_C_COMPILER_VERSION} VERSION_GREATER 4.2)
-    # xcode 5 clang does not support openmp
-    set(ESMF_openmp "OFF")
-  endif()
-endif()
-
-# Check if ESMF should be built in parallel
-set(emsf_enable_mpi FALSE)
-if(CDAT_BUILD_ESMF_PARALLEL)
-  set(emsf_enable_mpi TRUE)
-endif()
-
-if("${emsf_enable_mpi}")
-  set(ESMF_comm "${CDAT_BUILD_ESMF_COMM}")
-else()
-  message("[INFO] CDAT will build ESMF serial")
-  set(ESMF_comm "mpiuni")
-endif()
-
-configure_file(
-  ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/ESMF_make_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/ESMF_make_step.cmake
-  @ONLY
-)
-
-configure_file(
-  ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/ESMF_install_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/ESMF_install_step.cmake
-  @ONLY
-)
-
-set(ESMF_build_command ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/ESMF_make_step.cmake)
-set(ESMF_install_command ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/ESMF_install_step.cmake)
-
-# ESMF Python interface. Install after ESMF is done.
-set(ESMP_source "${ESMF_source_dir}/ESMP")
-
-configure_file(
-  ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/ESMP_install_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/ESMP_install_step.cmake
-  @ONLY
-)
-
-configure_file(
-  ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/ESMP_patch_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/ESMP_patch_step.cmake
-  @ONLY
-)
-
-set(ESMP_install_command ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/ESMP_install_step.cmake)
-set(ESMP_patch_command ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/ESMP_patch_step.cmake)
-
-ExternalProject_Add(ESMF
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${ESMF_source_dir}
-  INSTALL_DIR ${ESMF_install}
-  URL ${ESMF_URL}/${ESMF_GZ}
-  URL_MD5 ${ESMF_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ${ESMF_build_command}
-  INSTALL_COMMAND ${ESMF_install_command}
-  INSTALL_COMMAND ${ESMP_install_command}
-  PATCH_COMMAND ${ESMP_patch_command}
-  DEPENDS ${ESMF_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/esmf_pkg.cmake b/CMake/cdat_modules/esmf_pkg.cmake
deleted file mode 100644
index 0fde09269..000000000
--- a/CMake/cdat_modules/esmf_pkg.cmake
+++ /dev/null
@@ -1,57 +0,0 @@
-include(CMakeDependentOption)
-
-set(ESMF_MAJOR 6)
-set(ESMF_MINOR 3)
-set(ESMF_PATCH 0rp1)
-set(ESMP_MAJOR 01)
-set(ESMF_VERSION ${ESMF_MAJOR}_${ESMF_MINOR}_${ESMF_PATCH})
-set(ESMF_URL ${LLNL_URL})
-set(ESMF_GZ esmp.ESMF_${ESMF_VERSION}_ESMP_${ESMP_MAJOR}.tar.bz2)
-set(ESMF_MD5  a9be4fb51da1bc1fab027137297c5030 )
-set(ESMF_SOURCE ${ESMF_URL}/${ESMF_GZ})
-
-if (CDAT_BUILD_LEAN)
-    option(CDAT_BUILD_ESMF_ESMP "Build python version Earth System Modeling Framework" OFF)
-else ()
-    option(CDAT_BUILD_ESMF_ESMP "Build python version Earth System Modeling Framework" ON)
-endif()
-
-cmake_dependent_option(CDAT_BUILD_ESMF_PARALLEL
-  "Build parallel version of Earth System Modeling Framework library" ON
-  "CDAT_BUILD_PARALLEL" OFF
-)
-
-set(TXCMAKE_DIR ${cdat_SOURCE_DIR}/contrib/sciMake)
-include(${TXCMAKE_DIR}/sciFuncsMacros.cmake)
-include(${TXCMAKE_DIR}/sciFortranChecks.cmake)
-
-if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL GNU)
-  string(REGEX MATCHALL "[0-9]+\\." test_version_list ${Fortran_VERSION})
-  string(SUBSTRING ${Fortran_VERSION} 0 3 Fortran_MAJOR_VERSION)
-  LIST(GET test_version_list 0 Fortran_MAJOR_VERSION)
-  LIST(GET test_version_list 1 Fortran_MINOR_VERSION)
-else()
-  set(Fortran_MINOR_VERSION "")
-endif()
-
-if(CDAT_BUILD_ESMF_ESMP)
-    if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL GNU)
-      # GNU gfortran must be >= 4.3 last 4.2 gfortran release was 4.2.4
-      if(${Fortran_VERSION} VERSION_GREATER "4.2.9" AND ${Fortran_VERSION} VERSION_LESS "5.2.2")
-        ## On APPLE need to test for -arch as well!
-        add_cdat_package(ESMF "" "Build ESMF" ON)
-      else()
-        message(FATAL_ERROR "[ERROR] gfortran must be 4.3 <= version < 5.2.2; you have ${Fortran_VERSION}")
-      endif()
-    else()
-      add_cdat_package(ESMF "" "Build ESMF" ON)
-      message("[INFO] Fortran Compiler is: ${CMAKE_Fortran_COMPILER}")
-    endif()
-
-     # the following may need to be adjusted on Crays, otherwise the defaults will likely apply
-     set(CDAT_BUILD_ESMF_OS "${CMAKE_SYSTEM_NAME}" CACHE STRING "ESMF_OS env variable, may need to change to Unicos on Crays")
-     set(CDAT_BUILD_ESMF_COMPILER "gfortran" CACHE STRING "ESMF_COMPILER env variable, choices are gfortran, intel, pgi, g95, or nag")
-     set(CDAT_BUILD_ESMF_COMM "openmpi" CACHE STRING "ESMF_COMM env variable, choices are openmpi, mpiuni, mpi, mpich2, or mvapich2")
-     set(CDAT_BUILD_ESMF_ABI "64" CACHE STRING "ESMF_ABI env variable, choices are 32 or 64")
-endif()
-
diff --git a/CMake/cdat_modules/ezget_deps.cmake b/CMake/cdat_modules/ezget_deps.cmake
deleted file mode 100644
index e859d355d..000000000
--- a/CMake/cdat_modules/ezget_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(ezget_deps ${netcdf_pkg} ${libdrs_pkg} ${libcdms_pkg})
diff --git a/CMake/cdat_modules/ezget_external.cmake b/CMake/cdat_modules/ezget_external.cmake
deleted file mode 100644
index 078bebda0..000000000
--- a/CMake/cdat_modules/ezget_external.cmake
+++ /dev/null
@@ -1,43 +0,0 @@
-set(ezget_source "${CMAKE_CURRENT_BINARY_DIR}/build/ezget")
-set(ezget_install "${cdat_EXTERNALS}")
-
-configure_file(
-    ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/ezget_Makefile.gfortran.in
-    ${CMAKE_CURRENT_BINARY_DIR}/CMake/ezget_Makefile
-    )
-
-if(DEFINED GIT_CMD_STR_EZGET )
-    message("[INFO] [ezget] Installing ${nm} from ${GIT_CMD_STR_EZGET}")
-    include(GetGitRevisionDescription)
-    set(URL_STR )
-    set(URL_MD5_STR )
-else()
-    message("[INFO] [ezget] Installed ${nm} from tarball ${EZGET_GZ}")
-    set(URL_STR URL ${EZGET_URL}/${EZGET_GZ})
-    set(URL_MD5_STR URL_MD5 ${EZGET_MD5})
-    set(GIT_CMD_STR_EZGET )
-    set(GIT_TAG )
-endif()
-set(EZGET_MAKE_ARGS -f^^${CMAKE_CURRENT_BINARY_DIR}/CMake/ezget_Makefile)
-set(EZGET_MAKE_INSTALL_ARGS -f^^${CMAKE_CURRENT_BINARY_DIR}/CMake/ezget_Makefile^^install)
-set(EZGET_BUILD_ARGS -fPIC)
-
-ExternalProject_Add(ezget
-  LIST_SEPARATOR ^^
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${ezget_source}
-  INSTALL_DIR ${ezget_install}
-  ${URL_STR}
-  ${URL_MD5_STR}
-  ${GIT_CMD_STR_EZGET}
-  ${GIT_TAG}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ${CMAKE_COMMAND} -DADDITIONAL_CFLAGS=${EZGET_BUILD_ARGS} -Dmake=$(MAKE) -DBUILD_ARGS=${EZGET_MAKE_ARGS} -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
-  INSTALL_COMMAND ${CMAKE_COMMAND} -DADDITIONAL_CFLAGS=${EZGET_BUILD_ARGS} -Dmake=$(MAKE) -DBUILD_ARGS=${EZGET_MAKE_INSTALL_ARGS} -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
-  DEPENDS ${ezget_deps}
-  ${ep_log_options}
-)
-if (DEFINED GIT_CMD_STR_EZGET)
-  unset(GIT_CMD_STR_EZGET)
-endif()
diff --git a/CMake/cdat_modules/ezget_pkg.cmake b/CMake/cdat_modules/ezget_pkg.cmake
deleted file mode 100644
index a18d67cfd..000000000
--- a/CMake/cdat_modules/ezget_pkg.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(EZGET_VERSION 1.0.0)
-set(EZGET_BRANCH master)
-set(EZGET_REPOSITORY ${GIT_PROTOCOL}github.com/UV-CDAT/EzGet.git )
-
-set(GIT_CMD_STR_EZGET GIT_REPOSITORY ${EZGET_REPOSITORY})
-set(GIT_TAG GIT_TAG "${EZGET_BRANCH}")
-
-if (CDAT_BUILD_PCMDI)
-  add_cdat_package(ezget "" "" ON)
-endif()
diff --git a/CMake/cdat_modules/ffi_deps.cmake b/CMake/cdat_modules/ffi_deps.cmake
deleted file mode 100644
index 548c543fe..000000000
--- a/CMake/cdat_modules/ffi_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(FFI_deps ${pip_pkg})
diff --git a/CMake/cdat_modules/ffi_external.cmake b/CMake/cdat_modules/ffi_external.cmake
deleted file mode 100644
index df33e73ac..000000000
--- a/CMake/cdat_modules/ffi_external.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-
-set(ffi_source "${CMAKE_CURRENT_BINARY_DIR}/build/ffi-${FFI_MAJOR}.${FFI_MINOR}.${FFI_PATCH}")
-set(ffi_install "${cdat_EXTERNALS}")
-
-ExternalProject_Add(FFI
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${ffi_source}
-  INSTALL_DIR ${ffi_install}
-  URL ${FFI_URL}/${FFI_BZ2}
-  URL_MD5 ${FFI_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  DEPENDS ${FFI_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/ffi_pkg.cmake b/CMake/cdat_modules/ffi_pkg.cmake
deleted file mode 100644
index e7f0152d2..000000000
--- a/CMake/cdat_modules/ffi_pkg.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-set( FFI_MAJOR 3  )
-set( FFI_MINOR 1  )
-set( FFI_PATCH 5  )
-set(FFI_URL ${LLNL_URL})
-set(FFI_BZ2 libffi-${FFI_MAJOR}.${FFI_MINOR}.tar.gz)
-set(FFI_MD5 f5898b29bbfd70502831a212d9249d10)
-
-set (nm FFI)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR}.${${nm}_MINOR})
-set(FFI_SOURCE ${FFI_URL}/${FFI_BZ2})
-
-add_cdat_package_dependent(FFI "" "" ON "CDAT_BUILD_GRAPHICS" OFF)
diff --git a/CMake/cdat_modules/ffmpeg_deps.cmake b/CMake/cdat_modules/ffmpeg_deps.cmake
deleted file mode 100644
index b92781684..000000000
--- a/CMake/cdat_modules/ffmpeg_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(FFMPEG_deps ${pkgconfig_pkg} ${x264_pkg})
diff --git a/CMake/cdat_modules/ffmpeg_external.cmake b/CMake/cdat_modules/ffmpeg_external.cmake
deleted file mode 100644
index 1a2fe723a..000000000
--- a/CMake/cdat_modules/ffmpeg_external.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-# The FFMPEG external project for ParaView
-set(ffmpeg_source "${CMAKE_CURRENT_BINARY_DIR}/build/FFMPEG")
-set(ffmpeg_install "${cdat_EXTERNALS}")
-set(ENV{PATH} $ENV{PATH}:${cdat_EXTERNALS}/bin)
-
-find_program(YASM_BIN "yasm")
-
-if (NOT YASM_BIN)
-  set(ffmpeg_conf_args --disable-yasm^^--enable-gpl^^--enable-libx264^^--extra-cxxflags=${ffmpeg_source}^^--enable-shared^^--enable-zlib)
-else()
-  set(ffmpeg_conf_args --enable-gpl^^--enable-libx264^^--extra-cxxflags=${ffmpeg_source}^^--enable-shared^^--enable-zlib)
-endif()
-
-ExternalProject_Add(FFMPEG
-  LIST_SEPARATOR ^^
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${ffmpeg_source}
-  INSTALL_DIR ${ffmpeg_install}
-  URL ${FFMPEG_URL}/${FFMPEG_GZ}
-  URL_MD5 ${FFMPEG_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -DCONFIGURE_ARGS=${ffmpeg_conf_args} -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  DEPENDS ${FFMPEG_deps}
-  ${ep_log_options}
-  )
-
-set(FFMPEG_INCLUDE_DIR ${ffmpeg_install}/include)
-set(FFMPEG_avcodec_LIBRARY ${ffmpeg_install}/lib/libavcodec${_LINK_LIBRARY_SUFFIX})
-set(FFMPEG_avformat_LIBRARY ${ffmpeg_install}/lib/libavformat${_LINK_LIBRARY_SUFFIX})
-set(FFMPEG_avutil_LIBRARY ${ffmpeg_install}/lib/libavutil${_LINK_LIBRARY_SUFFIX})
-set(FFMPEG_swscale_LIBRARY ${ffmpeg_install}/lib/libswscale${_LINK_LIBRARY_SUFFIX})
diff --git a/CMake/cdat_modules/ffmpeg_pkg.cmake b/CMake/cdat_modules/ffmpeg_pkg.cmake
deleted file mode 100644
index 65db29865..000000000
--- a/CMake/cdat_modules/ffmpeg_pkg.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-set(FFMPEG_MAJOR_SRC 2)
-set(FFMPEG_MINOR_SRC 7)
-set(FFMPEG_PATCH_SRC 0)
-set(FFMPEG_URL ${LLNL_URL})
-set(FFMPEG_GZ ffmpeg-${FFMPEG_MAJOR_SRC}.${FFMPEG_MINOR_SRC}.tar.gz)
-set(FFMPEG_MD5 3ad0554981faf2c6deef23a1cd4c8c57)
-
-set (nm FFMPEG)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC})
-set(FFMPEG_SOURCE ${FFMPEG_URL}/${FFMPEG_GZ})
-set(FFMPEG_ROOT ${cdat_EXTERNALS} CACHE PATH "Path to FFMPEG root directory")
-
-add_cdat_package_dependent(FFMPEG "" "" ON "CDAT_BUILD_GRAPHICS" OFF) 
diff --git a/CMake/cdat_modules/fiona_deps.cmake b/CMake/cdat_modules/fiona_deps.cmake
deleted file mode 100644
index 624113df2..000000000
--- a/CMake/cdat_modules/fiona_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(Fiona_deps ${pkgconfig_pkg} ${pip_pkg} ${python_pkg} ${shapely_pkg} ${gdal_pkg} ${cligj_pkg})
diff --git a/CMake/cdat_modules/fiona_external.cmake b/CMake/cdat_modules/fiona_external.cmake
deleted file mode 100644
index 4d7e45c75..000000000
--- a/CMake/cdat_modules/fiona_external.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-# create an external project to install Fiona
-# and configure and build it
-set(nm Fiona)
-set(USR_ENVS "GDAL_CONFIG=${cdat_EXTERNALS}/bin/gdal-config")
-#set(USER_BUILD_EXT_OPTS "build_ext -I${cdat_EXTERNALS}/include -L${cdat_EXTERNALS}/lib -lgdal")
-include(pipinstaller)
diff --git a/CMake/cdat_modules/fiona_pkg.cmake b/CMake/cdat_modules/fiona_pkg.cmake
deleted file mode 100644
index 1cd902434..000000000
--- a/CMake/cdat_modules/fiona_pkg.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-set( FIONA_MAJOR_SRC 1  )
-set( FIONA_MINOR_SRC 6 )
-set( FIONA_PATCH_SRC 0  )
-set(FIONA_URL ${LLNL_URL})
-set(FIONA_GZ
-    Fiona-${FIONA_MAJOR_SRC}.${FIONA_MINOR_SRC}.${FIONA_PATCH_SRC}.tar.gz)
-set(FIONA_MD5 40f945898c550721db715f69658cf7e9 )
-set(FIONA_SOURCE ${FIONA_URL}/${FIONA_GZ})
-
-set (nm FIONA)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-if (CDAT_BUILD_ALL)
-  add_cdat_package(Fiona "" "" ON)
-else()
-  add_cdat_package(Fiona "" "" OFF)
-endif()
diff --git a/CMake/cdat_modules/flake8_deps.cmake b/CMake/cdat_modules/flake8_deps.cmake
deleted file mode 100644
index 490185ec0..000000000
--- a/CMake/cdat_modules/flake8_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(flake8_deps ${python_pkg} ${setuptools_pkg} ${pyflakes_pkg} ${pep8_pkg} ${mccabe_pkg})
diff --git a/CMake/cdat_modules/flake8_external.cmake b/CMake/cdat_modules/flake8_external.cmake
deleted file mode 100644
index 5f05cb3f8..000000000
--- a/CMake/cdat_modules/flake8_external.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-ExternalProject_Add(flake8
-  DOWNLOAD_DIR "${CMAKE_CURRENT_BINARY_DIR}"
-  SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/build/flake8"
-  URL "${FLAKE8_SOURCE}"
-  URL_MD5 ${FLAKE8_MD5}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND "${PYTHON_EXECUTABLE}" setup.py build
-  INSTALL_COMMAND "${PYTHON_EXECUTABLE}" setup.py install "${PYTHON_EXTRA_PREFIX}"
-  DEPENDS ${flake8_deps}
-  ${ep_log_options}
-  )
-
-if (APPLE)
-  set(FLAKE8_EXECUTABLE
-    "${CMAKE_INSTALL_PREFIX}/Library/Frameworks/Python.framework/Versions/${PYVER}/bin/flake8")
-else()
-  set(FLAKE8_EXECUTABLE "${CMAKE_INSTALL_PREFIX}/bin/flake8")
-endif()
diff --git a/CMake/cdat_modules/flake8_pkg.cmake b/CMake/cdat_modules/flake8_pkg.cmake
deleted file mode 100644
index f10ebf053..000000000
--- a/CMake/cdat_modules/flake8_pkg.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-set(nm flake8)
-string(TOUPPER ${nm} uc_nm)
-
-set(${uc_nm}_MAJOR 2)
-set(${uc_nm}_MINOR 4)
-set(${uc_nm}_PATCH 1)
-set(${uc_nm}_VERSION ${${uc_nm}_MAJOR}.${${uc_nm}_MINOR}.${${uc_nm}_PATCH})
-set(${uc_nm}_URL ${LLNL_URL})
-set(${uc_nm}_GZ ${nm}-${${uc_nm}_VERSION}.tar.gz)
-set(${uc_nm}_MD5 ed45d3db81a3b7c88bd63c6e37ca1d65)
-
-set(${uc_nm}_VERSION ${${uc_nm}_MAJOR}.${${uc_nm}_MINOR}.${${uc_nm}_PATCH})
-set(${uc_nm}_SOURCE ${${uc_nm}_URL}/${${uc_nm}_GZ})
-
-if(BUILD_TESTING)
-  add_cdat_package(${nm} "" "" ON)
-endif()
diff --git a/CMake/cdat_modules/fontconfig_deps.cmake b/CMake/cdat_modules/fontconfig_deps.cmake
deleted file mode 100644
index 87455d135..000000000
--- a/CMake/cdat_modules/fontconfig_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(fontconfig_deps ${pkgconfig_pkg} ${libxml2_pkg} ${freetype_pkg})
diff --git a/CMake/cdat_modules/fontconfig_external.cmake b/CMake/cdat_modules/fontconfig_external.cmake
deleted file mode 100644
index fa57bc888..000000000
--- a/CMake/cdat_modules/fontconfig_external.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-set(fontconfig_source "${CMAKE_CURRENT_BINARY_DIR}/build/fontconfig")
-set(fontconfig_install "${cdat_EXTERNALS}")
-
-ExternalProject_Add(fontconfig
-  LIST_SEPARATOR ^^
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${fontconfig_source}
-  INSTALL_DIR ${fontconfig_install}
-  URL ${FTCFG_URL}/${FTCFG_GZ}
-  URL_MD5 ${FTCFG_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -DCONFIGURE_ARGS=--disable-docs^^--enable-libxml2 -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  DEPENDS ${fontconfig_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/fontconfig_pkg.cmake b/CMake/cdat_modules/fontconfig_pkg.cmake
deleted file mode 100644
index 959811582..000000000
--- a/CMake/cdat_modules/fontconfig_pkg.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-set(FTCFG_MAJOR 2)
-set(FTCFG_MINOR 4)
-set(FTCFG_PATCH 2)
-set(FTCFG_MAJOR_SRC 2)
-set(FTCFG_MINOR_SRC 10)
-set(FTCFG_PATCH_SRC 1)
-set(FTCFG_URL ${LLNL_URL})
-set(FTCFG_GZ fontconfig-${FTCFG_MAJOR_SRC}.${FTCFG_MINOR_SRC}.${FTCFG_PATCH_SRC}.tar.gz)
-set(FTCFG_MD5 43808dd9153cff1c3ac302e94e024814)
-
-set (nm FTCFG)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-set(FONTCONFIG_VERSION ${FTCFG_VERSION})
-set(FONTCONFIG_SOURCE ${FTCFG_URL}/${FTCFG_GZ})
-
-add_cdat_package_dependent(fontconfig "" "" OFF "CDAT_BUILD_GRAPHICS" OFF)
diff --git a/CMake/cdat_modules/freetype_deps.cmake b/CMake/cdat_modules/freetype_deps.cmake
deleted file mode 100644
index 6d451c65f..000000000
--- a/CMake/cdat_modules/freetype_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(freetype_deps ${pkgconfig_pkg} ${png_pkg})
diff --git a/CMake/cdat_modules/freetype_external.cmake b/CMake/cdat_modules/freetype_external.cmake
deleted file mode 100644
index 3af294399..000000000
--- a/CMake/cdat_modules/freetype_external.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-
-set(freetype_source "${CMAKE_CURRENT_BINARY_DIR}/build/freetype")
-set(freetype_install "${cdat_EXTERNALS}")
-
-ExternalProject_Add(freetype
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${freetype_source}
-  INSTALL_DIR ${freetype_install}
-  URL ${FT_URL}/${FT_GZ}
-  URL_MD5 ${FT_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  DEPENDS ${freetype_deps}
-  ${ep_log_options}
-)
-
-#ln -sf @EXTERNALS@/include/freetype2/freetype @EXTERNALS@/include/freetype
-
-ExternalProject_Add_Step(freetype symlink
-  COMMAND ${CMAKE_COMMAND} -E create_symlink ${cdat_EXTERNALS}/include/freetype2/freetype ${cdat_EXTERNALS}/include/freetype
-  COMMENT "Symlink include/freetype2/freetype include directory as include/freetype"
-  DEPENDEES install
-)
diff --git a/CMake/cdat_modules/freetype_pkg.cmake b/CMake/cdat_modules/freetype_pkg.cmake
deleted file mode 100644
index 596ce205a..000000000
--- a/CMake/cdat_modules/freetype_pkg.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-set(FT_MAJOR 9)
-set(FT_MINOR 7)
-set(FT_PATCH 3)
-set(FT_MAJOR_SRC 2)
-set(FT_MINOR_SRC 4)
-set(FT_PATCH_SRC 10)
-set(FT_URL ${LLNL_URL})
-set(FT_GZ freetype-${FT_MAJOR_SRC}.${FT_MINOR_SRC}.${FT_PATCH_SRC}.tar.gz)
-set(FT_MD5 4b1887901730ff2e12562ef30fa521d5)
-
-set (nm FT)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-set(FREETYPE_VERSION ${FT_VERSION})
-set(FREETYPE_SOURCE ${FT_URL}/${FT_GZ})
-
-
-add_cdat_package_dependent(freetype "" "" OFF "CDAT_BUILD_GRAPHICS" OFF)
diff --git a/CMake/cdat_modules/g2clib_deps.cmake b/CMake/cdat_modules/g2clib_deps.cmake
deleted file mode 100644
index a2994c832..000000000
--- a/CMake/cdat_modules/g2clib_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(g2clib_deps ${pkgconfig_pkg} ${png_pkg} ${zlib_pkg} ${jasper_pkg})
diff --git a/CMake/cdat_modules/g2clib_external.cmake b/CMake/cdat_modules/g2clib_external.cmake
deleted file mode 100644
index 5a1406979..000000000
--- a/CMake/cdat_modules/g2clib_external.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-
-set(g2clib_source "${CMAKE_CURRENT_BINARY_DIR}/build/g2clib")
-set(g2clib_install "${cdat_EXTERNALS}")
-
-ExternalProject_Add(g2clib
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${g2clib_source}
-  INSTALL_DIR ${g2clib_install}
-  URL ${G2CLIB_URL}/${G2CLIB_GZ}
-  URL_MD5 ${G2CLIB_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ${CMAKE_COMMAND} -Dmake=$(MAKE) -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
-  INSTALL_COMMAND ${CMAKE_COMMAND} -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_install_step.cmake
-  DEPENDS ${g2clib_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/g2clib_pkg.cmake b/CMake/cdat_modules/g2clib_pkg.cmake
deleted file mode 100644
index 41580b8eb..000000000
--- a/CMake/cdat_modules/g2clib_pkg.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-set(G2CLIB_MAJOR 1)
-set(G2CLIB_MINOR 4)
-set(G2CLIB_PATCH 0b)
-set(G2CLIB_VERSION ${G2CLIB_MAJOR}.${G2CLIB_MINOR}.${G2CLIB_PATCH})
-set(G2CLIB_URL ${LLNL_URL})
-set(G2CLIB_GZ g2clib-${G2CLIB_VERSION}.tar.gz)
-set(G2CLIB_MD5 72378d980b2f4d6b09fd86e23e884a4b)
-set(G2CLIB_SOURCE ${G2CLIB_URL}/${G2CLIB_GZ})
-
-
-add_cdat_package(g2clib "" "" ON)
diff --git a/CMake/cdat_modules/gdal_deps.cmake b/CMake/cdat_modules/gdal_deps.cmake
deleted file mode 100644
index 3fbc8ce4d..000000000
--- a/CMake/cdat_modules/gdal_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(gdal_deps ${pkgconfig_pkg} ${python_pkg} ${uuid_pkg} ${netcdf_pkg} ${hdf5_pkg} ${curl_pkg} ${zlib_pkg} ${jasper_pkg} ${geos_pkg} ${setuptools_pkg} ${proj4_pkg})
diff --git a/CMake/cdat_modules/gdal_external.cmake b/CMake/cdat_modules/gdal_external.cmake
deleted file mode 100644
index 33e4c8e60..000000000
--- a/CMake/cdat_modules/gdal_external.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-set(gdal_source "${CMAKE_CURRENT_BINARY_DIR}/build/gdal")
-set(gdal_install "${cdat_EXTERNALS}")
-set(gdal_configure_args "--prefix=${cdat_EXTERNALS}^^--with-hdf5=${cdat_EXTERNALS}^^--with-netcdf=${cdat_EXTERNALS}^^--with-curl=${cdat_EXTERNALS}^^--with-geos=${cdat_EXTERNALS}/bin/geos-config^^--with-python=${PYTHON_EXECUTABLE}^^--with-jpeg=no^^--with-libtiff=internal^^--without-jpeg12^^--with-geotiff=internal^^--with-static-proj4=${cdat_EXTERNALS}/proj4")
-
-if (CDAT_BUILD_PARALLEL)
-  set(configure_file "cdatmpi_configure_step.cmake")
-else()
-  set(configure_file "cdat_configure_step.cmake")
-endif()
-message("[GDAL] CONF FILE IS:"${configure_file})
-ExternalProject_Add(gdal
-  LIST_SEPARATOR ^^
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${gdal_source}
-  INSTALL_DIR ${gdal_install}
-  URL ${GDAL_URL}/${GDAL_GZ}
-  URL_MD5 ${GDAL_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -DCONFIGURE_ARGS=${gdal_configure_args} -P ${cdat_CMAKE_BINARY_DIR}/${configure_file}
-  BUILD_COMMAND ${CMAKE_COMMAND} -Dmake=$(MAKE) -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
-  INSTALL_COMMAND ${CMAKE_COMMAND} -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_install_step.cmake
-  DEPENDS "${gdal_deps}"
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/gdal_pkg.cmake b/CMake/cdat_modules/gdal_pkg.cmake
deleted file mode 100644
index d8756b2bb..000000000
--- a/CMake/cdat_modules/gdal_pkg.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-set( GDAL_MAJOR 1  )
-set( GDAL_MINOR 11  )
-set( GDAL_PATCH 2  )
-set(GDAL_URL ${LLNL_URL})
-set(GDAL_GZ gdal-${GDAL_MAJOR}.${GDAL_MINOR}.${GDAL_PATCH}.tar.gz)
-set(GDAL_MD5 866a46f72b1feadd60310206439c1a76 )
-
-set (nm GDAL)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR}.${${nm}_MINOR}.${${nm}_PATCH})
-set(GDAL_SOURCE ${GDAL_URL}/${GDAL_GZ})
-
-if (CDAT_BUILD_ALL)
-  add_cdat_package(gdal "" "Build the Geospatial Data Abstraction Library (GDAL) and python osgeo module" ON)
-else()
-  add_cdat_package(gdal "" "Build the Geospatial Data Abstraction Library (GDAL) and python osgeo module" OFF)
-endif()
diff --git a/CMake/cdat_modules/geos_deps.cmake b/CMake/cdat_modules/geos_deps.cmake
deleted file mode 100644
index 3b1cbf81b..000000000
--- a/CMake/cdat_modules/geos_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(GEOS_deps ${pkgconfig_pkg})
diff --git a/CMake/cdat_modules/geos_external.cmake b/CMake/cdat_modules/geos_external.cmake
deleted file mode 100644
index d7f8e6567..000000000
--- a/CMake/cdat_modules/geos_external.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-
-set(geos_source "${CMAKE_CURRENT_BINARY_DIR}/build/geos-${GEOS_MAJOR}.${GEOS_MINOR}.${GEOS_PATCH}")
-set(geos_install "${cdat_EXTERNALS}")
-
-ExternalProject_Add(GEOS
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${geos_source}
-  INSTALL_DIR ${geos_install}
-  URL ${GEOS_URL}/${GEOS_BZ2}
-  URL_MD5 ${GEOS_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  DEPENDS ${GEOS_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/geos_pkg.cmake b/CMake/cdat_modules/geos_pkg.cmake
deleted file mode 100644
index d2927b020..000000000
--- a/CMake/cdat_modules/geos_pkg.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-set( GEOS_MAJOR 3  )
-set( GEOS_MINOR 3  )
-set( GEOS_PATCH 5  )
-set(GEOS_URL ${LLNL_URL})
-set(GEOS_BZ2 geos-${GEOS_MAJOR}.${GEOS_MINOR}.${GEOS_PATCH}.tar.bz2)
-set(GEOS_MD5 2ba61afb7fe2c5ddf642d82d7b16e75b)
-
-set (nm GEOS)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR}.${${nm}_MINOR}.${${nm}_PATCH})
-set(GEOS_SOURCE ${GEOS_URL}/${GEOS_BZ2})
-
-add_cdat_package_dependent(GEOS "" "" OFF "CDAT_BUILD_GRAPHICS" OFF)
diff --git a/CMake/cdat_modules/ghostscript_deps.cmake b/CMake/cdat_modules/ghostscript_deps.cmake
deleted file mode 100644
index 0f4bedf96..000000000
--- a/CMake/cdat_modules/ghostscript_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(ghostscript_deps ${pkgconfig_pkg} ${zlib_pkg} ${jpeg_pkg} ${png_pkg} ${fontconfig_pkg} ${freetype_pkg} ${pixman_pkg} ${libXSLT_pkg} ${libXML2_pkg})
diff --git a/CMake/cdat_modules/ghostscript_external.cmake b/CMake/cdat_modules/ghostscript_external.cmake
deleted file mode 100644
index fc322b66a..000000000
--- a/CMake/cdat_modules/ghostscript_external.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-
-set(ghostscript_source "${CMAKE_CURRENT_BINARY_DIR}/build/ghostscript")
-set(ghostscript_install "${cdat_EXTERNALS}")
-
-set(ghostscripts_args "--with-drivers=PS,BMP --disable-cups")
-
-ExternalProject_Add(ghostscript
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${ghostscript_source}
-  INSTALL_DIR ${ghostscript_install}
-  URL ${GS_URL}/${GS_GZ}
-  URL_MD5 ${GS_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -DCONFIGURE_ARGS=${ghostscripts_args} -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  BUILD_COMMAND ${CMAKE_COMMAND} -Dmake=$(MAKE) -DBUILD_ARGS=${ghostscript_source} -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
-  DEPENDS ${ghostscript_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/ghostscript_pkg.cmake b/CMake/cdat_modules/ghostscript_pkg.cmake
deleted file mode 100644
index d56e90ece..000000000
--- a/CMake/cdat_modules/ghostscript_pkg.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-add_cdat_package(ghostscript "" "" OFF)
-
diff --git a/CMake/cdat_modules/gifsicle_external.cmake b/CMake/cdat_modules/gifsicle_external.cmake
deleted file mode 100644
index 853f5d55a..000000000
--- a/CMake/cdat_modules/gifsicle_external.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-
-set(gifsicle_source "${CMAKE_CURRENT_BINARY_DIR}/build/gifsicle")
-set(gifsicle_install "${cdat_EXTERNALS}")
-
-ExternalProject_Add(gifsicle
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${gifsicle_source}
-  INSTALL_DIR ${gifsicle_install}
-  URL ${GIFSICLE_URL}/${GIFSICLE_GZ}
-  URL_MD5 ${GIFSICLE_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  DEPENDS ${gifsicle_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/gsw_deps.cmake b/CMake/cdat_modules/gsw_deps.cmake
deleted file mode 100644
index 9d0b19879..000000000
--- a/CMake/cdat_modules/gsw_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(gsw_deps ${python_pkg} ${numpy_pkg})
diff --git a/CMake/cdat_modules/gsw_external.cmake b/CMake/cdat_modules/gsw_external.cmake
deleted file mode 100644
index 24c3c0e58..000000000
--- a/CMake/cdat_modules/gsw_external.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-# gsw (Gibbs Seawater)
-#
-set(gsw_source_dir "${CMAKE_CURRENT_BINARY_DIR}/build/gsw")
-
-configure_file(
-  "${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/gsw_build_step.cmake.in"
-  "${cdat_CMAKE_BINARY_DIR}/gsw_build_step.cmake"
-  @ONLY
-)
-
-set(gsw_build_command ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/gsw_build_step.cmake)
-
-ExternalProject_Add(gsw
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${gsw_source_dir}
-  URL ${GSW_URL}/${GSW_GZ}
-  URL_MD5 ${GSW_MD5}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ${gsw_build_command}
-  INSTALL_COMMAND ""
-  DEPENDS ${gsw_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/gsw_pkg.cmake b/CMake/cdat_modules/gsw_pkg.cmake
deleted file mode 100644
index 127a403c0..000000000
--- a/CMake/cdat_modules/gsw_pkg.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-set( GSW_MAJOR 3 )
-set( GSW_MINOR 0 )
-set( GSW_PATCH 3 )
-set( GSW_VERSION ${GSW_MAJOR}.${GSW_MINOR}.${GSW_PATCH} )
-set( GSW_URL ${LLNL_URL} )
-set( GSW_GZ python-gsw-${GSW_VERSION}.tar.gz )
-set( GSW_MD5 a522a9ab6ab41fb70064e0378e904ffd )
-
-set (nm GSW)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR}.${${nm}_MINOR}.${${nm}_PATCH})
-set(GSW_SOURCE ${GSW_URL}/${GSW_GZ})
-
-if (CDAT_BUILD_ALL)
-  add_cdat_package(gsw "" "" ON)
-else()
-  add_cdat_package(gsw "" "" OFF)
-endif()
diff --git a/CMake/cdat_modules/gui_support_deps.cmake b/CMake/cdat_modules/gui_support_deps.cmake
deleted file mode 100644
index 3c7bc7379..000000000
--- a/CMake/cdat_modules/gui_support_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(gui_support_deps ${cdat_pkg})
diff --git a/CMake/cdat_modules/gui_support_external.cmake b/CMake/cdat_modules/gui_support_external.cmake
deleted file mode 100644
index 5d10b82e7..000000000
--- a/CMake/cdat_modules/gui_support_external.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-set(gui_support_source_dir "${cdat_SOURCE_DIR}/Packages/gui_support")
-set(gui_support_binary_dir "${CMAKE_CURRENT_BINARY_DIR}/build/gui_support-build")
-set(runtime_library_path ${CMAKE_INSTALL_PREFIX}/lib:${cdat_EXTERNALS}/lib)
-
-#  BUILD_COMMAND env EXTERNALS=${cdat_EXTERNALS} ${LIBRARY_PATH}=${runtime_library_path} ${PYTHON_EXECUTABLE} setup.py build
-#  INSTALL_COMMAND env EXTERNALS=${cdat_EXTERNALS} ${LIBRARY_PATH}=${runtime_library_path} ${PYTHON_EXECUTABLE} setup.py install --prefix=${CMAKE_INSTALL_PREFIX}
-ExternalProject_Add(gui_support
-  DOWNLOAD_DIR ""
-  SOURCE_DIR ${gui_support_source_dir}
-  BINARY_DIR ${gui_support_binary_dir}
-  BUILD_IN_SOURCE 0
-  BUILD_COMMAND ""
-#  BUILD_COMMAND env PYTHONPATH=$ENV{PYTHONPATH} LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH} EXTERNALS=${cdat_EXTERNALS}  ${PYTHON_EXECUTABLE} ${gui_support_source_dir}/setup.py build -b ${gui_support_binary_dir}
-  INSTALL_COMMAND env PYTHONPATH=$ENV{PYTHONPATH} LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH} EXTERNALS=${cdat_EXTERNALS} ${PYTHON_EXECUTABLE} ${gui_support_source_dir}/setup.py build -b ${gui_support_binary_dir} install ${PYTHON_EXTRA_PREFIX}
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ""
-  DEPENDS ${gui_support_deps}
-  ${ep_log_options}
-)
-
diff --git a/CMake/cdat_modules/gui_support_pkg.cmake b/CMake/cdat_modules/gui_support_pkg.cmake
deleted file mode 100644
index f4fcee7d6..000000000
--- a/CMake/cdat_modules/gui_support_pkg.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-set(GUI_SUPPORT_SOURCE N/A)
-set(GUI_SUPPORT_VERSION N/A)
-set(GUI_SUPPORT_MD5 N/A)
-
-add_cdat_package_dependent(gui_support "" "" OFF "CDAT_BUILD_GUI" OFF)
diff --git a/CMake/cdat_modules/h5py_deps.cmake b/CMake/cdat_modules/h5py_deps.cmake
deleted file mode 100644
index f1ce2f917..000000000
--- a/CMake/cdat_modules/h5py_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(h5py_deps ${python_pkg} ${hdf5_pkg} ${numpy_pkg} ${cython_pkg})
diff --git a/CMake/cdat_modules/h5py_external.cmake b/CMake/cdat_modules/h5py_external.cmake
deleted file mode 100644
index 83762f1e6..000000000
--- a/CMake/cdat_modules/h5py_external.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-# h5py
-#
-set(h5py_source_dir "${CMAKE_CURRENT_BINARY_DIR}/build/h5py")
-
-configure_file(
-  "${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/h5py_build_step.cmake.in"
-  "${cdat_CMAKE_BINARY_DIR}/h5py_build_step.cmake"
-  @ONLY
-)
-
-set(h5py_build_command ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/h5py_build_step.cmake)
-
-ExternalProject_Add(h5py
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${h5py_source_dir}
-  URL ${H5PY_URL}/${H5PY_GZ}
-  URL_MD5 ${H5PY_MD5}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ${h5py_build_command}
-  INSTALL_COMMAND ""
-  DEPENDS ${h5py_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/h5py_pkg.cmake b/CMake/cdat_modules/h5py_pkg.cmake
deleted file mode 100644
index 3a753fc2b..000000000
--- a/CMake/cdat_modules/h5py_pkg.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-set(H5PY_MAJOR 2)
-set(H5PY_MINOR 5)
-set(H5PY_PATCH 0)
-set(H5PY_VERSION ${H5PY_MAJOR}.${H5PY_MINOR}.${H5PY_PATCH})
-set(H5PY_URL ${LLNL_URL})
-set(H5PY_GZ h5py-${H5PY_VERSION}.tar.gz)
-set(H5PY_MD5 969c78e366e8e86dcd0376d945a72dd0)
-
-set (nm H5PY)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR}.${${nm}_MINOR}.${${nm}_PATCH})
-set(H5PY_SOURCE ${H5PY_URL}/${H5PY_GZ})
-
-if (CDAT_BUILD_ALL)
-  add_cdat_package(h5py "" "" ON)
-else()
-  add_cdat_package(h5py "" "" OFF)
-endif()
diff --git a/CMake/cdat_modules/hdf4_external.cmake b/CMake/cdat_modules/hdf4_external.cmake
deleted file mode 100644
index 7b34bef0b..000000000
--- a/CMake/cdat_modules/hdf4_external.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-
-set(HDF4_source "${CMAKE_CURRENT_BINARY_DIR}/HDF4")
-set(HDF4_install "${cdat_EXTERNALS}")
-
-if(NOT CMAKE_Fortran_COMPILER)
-  set(hdf4_configure_args --disable-fortran)
-else()
-  set(hdf4_configure_args --enable-fortran)
-endif()
-
-ExternalProject_Add(HDF4
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${HDF4_source}
-  INSTALL_DIR ${HDF4_install}
-  URL ${HDF4_URL}/${HDF4_GZ}
-  URL_MD5 ${HDF4_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -DCONFIGURE_ARGS=${hdf4_configure_args} -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  DEPENDS ${HDF4_deps}
-)
-
-set(HDF4_DIR "${HDF4_binary}" CACHE PATH "HDF4 binary directory" FORCE)
-mark_as_advanced(HDF4_DIR)
diff --git a/CMake/cdat_modules/hdf5_deps.cmake b/CMake/cdat_modules/hdf5_deps.cmake
deleted file mode 100644
index 45a66d741..000000000
--- a/CMake/cdat_modules/hdf5_deps.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-set(HDF5_deps ${pkgconfig_pkg} ${libxml2_pkg} ${libxslt_pkg} ${zlib_pkg})
-if (CDAT_BUILD_PARALLEL)
-  list(APPEND HDF5_deps ${mpi_pkg})
-endif()
diff --git a/CMake/cdat_modules/hdf5_external.cmake b/CMake/cdat_modules/hdf5_external.cmake
deleted file mode 100644
index 7f20675f7..000000000
--- a/CMake/cdat_modules/hdf5_external.cmake
+++ /dev/null
@@ -1,40 +0,0 @@
-
-set(HDF5_source "${CMAKE_CURRENT_BINARY_DIR}/build/HDF5")
-set(HDF5_install "${cdat_EXTERNALS}")
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/hdf5_patch_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/hdf5_patch_step.cmake
-  @ONLY)
-if (CDAT_BUILD_PARALLEL)
-  set(hdf5_configure_args "--enable-parallel")
-  set(hdf5_additional_cflags "-w -fPIC")
-  set(configure_file "cdatmpi_configure_step.cmake")
-else()
-  set(hdf5_configure_args "")
-  set(hdf5_additional_cflags "-w")
-  set(configure_file "cdat_configure_step.cmake")
-endif()
-# we disable HDF5 warnings because it has way too many of them.
-ExternalProject_Add(HDF5
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${HDF5_source}
-  INSTALL_DIR ${HDF5_install}
-  URL ${HDF5_URL}/${HDF5_GZ}
-  URL_MD5 ${HDF5_MD5}
-  BUILD_IN_SOURCE 1
-  #PATCH_COMMAND ${CMAKE_COMMAND} -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/hdf5_patch_step.cmake
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCONFIGURE_ARGS=${hdf5_configure_args} -DADDITIONAL_CFLAGS=${hdf5_additional_cflags} -DADDITIONAL_CPPFPAGS=-w -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/${configure_file}
-  BUILD_COMMAND ${CMAKE_COMMAND} -Dmake=$(MAKE) -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
-  INSTALL_COMMAND ${CMAKE_COMMAND} -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_install_step.cmake
-  LOG_BUILD 1
-  DEPENDS ${HDF5_deps}
-  ${ep_log_options}
-)
-
-if(WIN32)
-  set(HDF5_INCLUDE_DIR ${HDF5_install}/include)
-  set(HDF5_LIBRARY ${HDF5_install}/lib/hdf5dll${_LINK_LIBRARY_SUFFIX})
-else()
-  set(HDF5_INCLUDE_DIR ${HDF5_install}/include)
-  set(HDF5_LIBRARY ${HDF5_install}/lib/libhdf5${_LINK_LIBRARY_SUFFIX})
-endif()
diff --git a/CMake/cdat_modules/hdf5_pkg.cmake b/CMake/cdat_modules/hdf5_pkg.cmake
deleted file mode 100644
index 4599c9c95..000000000
--- a/CMake/cdat_modules/hdf5_pkg.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-set(HDF5_MAJOR_SRC 1)
-set(HDF5_MINOR_SRC 8)
-set(HDF5_PATCH_SRC 15)
-set(HDF5_URL ${LLNL_URL})
-set(HDF5_GZ hdf5-${HDF5_MAJOR_SRC}.${HDF5_MINOR_SRC}.${HDF5_PATCH_SRC}.tar.gz)
-set(HDF5_MD5 03cccb5b33dbe975fdcd8ae9dc021f24 )
-
-set (nm HDF5)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-set(HDF5_SOURCE ${HDF5_URL}/${HDF5_GZ})
-
-add_cdat_package(HDF5 "" "" ON)
diff --git a/CMake/cdat_modules/idna_deps.cmake b/CMake/cdat_modules/idna_deps.cmake
deleted file mode 100644
index e2aa851a8..000000000
--- a/CMake/cdat_modules/idna_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(IDNA_deps ${python_pkg} ${setuptools_pkg})
diff --git a/CMake/cdat_modules/idna_external.cmake b/CMake/cdat_modules/idna_external.cmake
deleted file mode 100644
index a987e968f..000000000
--- a/CMake/cdat_modules/idna_external.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-
-# create an external project to install MyProxyClient,
-# and configure and build it
-set(nm IDNA)
-
-include(pipinstaller)
diff --git a/CMake/cdat_modules/idna_pkg.cmake b/CMake/cdat_modules/idna_pkg.cmake
deleted file mode 100644
index 5bf853929..000000000
--- a/CMake/cdat_modules/idna_pkg.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(IDNA_MAJOR_SRC 2)
-set(IDNA_MINOR_SRC 0)
-set(IDNA_PATCH_SRC 0)
-
-set(IDNA_VERSION ${IDNA_MAJOR_SRC}.${IDNA_MINOR_SRC})
-set(IDNA_GZ idna-${IDNA_VERSION}.tar.gz)
-set(IDNA_SOURCE ${LLNL_URL}/${IDNA_GZ})
-set(IDNA_MD5 9ef51e6e51ea91b6c62426856c8a5b7c)
-
-add_cdat_package_dependent(IDNA "" "" OFF "CDAT_BUILD_LEAN" OFF)
diff --git a/CMake/cdat_modules/ipaddress_deps.cmake b/CMake/cdat_modules/ipaddress_deps.cmake
deleted file mode 100644
index ca515655f..000000000
--- a/CMake/cdat_modules/ipaddress_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(IPADDRESS_deps ${pip_pkg} ${python_pkg} ${setuptools_pkg})
diff --git a/CMake/cdat_modules/ipaddress_external.cmake b/CMake/cdat_modules/ipaddress_external.cmake
deleted file mode 100644
index 4773cea4c..000000000
--- a/CMake/cdat_modules/ipaddress_external.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-
-# create an external project to install MyProxyClient,
-# and configure and build it
-set(nm IPADDRESS)
-
-include(pipinstaller)
diff --git a/CMake/cdat_modules/ipaddress_pkg.cmake b/CMake/cdat_modules/ipaddress_pkg.cmake
deleted file mode 100644
index 68ce4f629..000000000
--- a/CMake/cdat_modules/ipaddress_pkg.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(IPADDRESS_MAJOR_SRC 1)
-set(IPADDRESS_MINOR_SRC 0)
-set(IPADDRESS_PATCH_SRC 16)
-
-set(IPADDRESS_VERSION ${IPADDRESS_MAJOR_SRC}.${IPADDRESS_MINOR_SRC}.${IPADDRESS_PATCH_SRC})
-set(IPADDRESS_GZ ipaddress-${IPADDRESS_VERSION}.tar.gz)
-set(IPADDRESS_SOURCE ${LLNL_URL}/${IPADDRESS_GZ})
-set(IPADDRESS_MD5 1e27b62aa20f5b6fc200b2bdbf0d0847)
-
-add_cdat_package_dependent(IPADDRESS "" "" OFF "CDAT_BUILD_LEAN" OFF)
diff --git a/CMake/cdat_modules/ipython_deps.cmake b/CMake/cdat_modules/ipython_deps.cmake
deleted file mode 100644
index 0828bdbd9..000000000
--- a/CMake/cdat_modules/ipython_deps.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-if (CDAT_BUILD_ALL)
-  set(IPYTHON_deps ${pip_pkg} ${tornado_pkg} ${numpy_pkg} ${numexpr_pkg})
-else ()
-  set(IPYTHON_deps ${pip_pkg} ${numpy_pkg})
-endif()
diff --git a/CMake/cdat_modules/ipython_external.cmake b/CMake/cdat_modules/ipython_external.cmake
deleted file mode 100644
index eab083a8e..000000000
--- a/CMake/cdat_modules/ipython_external.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# create an external project to install MyProxyClient,
-# and configure and build it
-set(nm IPYTHON)
-set(OLD OFF)
-include(pipinstaller)
-unset(OLD)
diff --git a/CMake/cdat_modules/ipython_pkg.cmake b/CMake/cdat_modules/ipython_pkg.cmake
deleted file mode 100644
index ce9193f5c..000000000
--- a/CMake/cdat_modules/ipython_pkg.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(IPYTHON_MAJOR 3)
-set(IPYTHON_MINOR 0)
-set(IPYTHON_PATCH 0)
-set(IPYTHON_VERSION ${IPYTHON_MAJOR}.${IPYTHON_MINOR}.${IPYTHON_PATCH})
-set(IPYTHON_URL ${LLNL_URL})
-set(IPYTHON_GZ ipython-${IPYTHON_VERSION}.tar.gz)
-set(IPYTHON_MD5 b3f00f3c0be036fafef3b0b9d663f27e)
-set(IPYTHON_SOURCE ${IPYTHON_URL}/${IPYTHON_GZ})
-
-add_cdat_package(IPYTHON "" "" ON)
diff --git a/CMake/cdat_modules/jasper_deps.cmake b/CMake/cdat_modules/jasper_deps.cmake
deleted file mode 100644
index 4e5186952..000000000
--- a/CMake/cdat_modules/jasper_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(jasper_deps ${pkgconfig_pkg} ${jpeg_pkg} ${zlib_pkg})
diff --git a/CMake/cdat_modules/jasper_external.cmake b/CMake/cdat_modules/jasper_external.cmake
deleted file mode 100644
index 81c9f5f8d..000000000
--- a/CMake/cdat_modules/jasper_external.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-
-set(jasper_source "${CMAKE_CURRENT_BINARY_DIR}/build/jasper")
-set(jasper_install "${cdat_EXTERNALS}")
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/jasper_configure_step.cmake.in
-    ${cdat_CMAKE_BINARY_DIR}/jasper_configure_step.cmake
-    @ONLY)
-
-ExternalProject_Add(jasper
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${jasper_source}
-  INSTALL_DIR ${jasper_install}
-  URL ${JASPER_URL}/${JASPER_GZ}
-  URL_MD5 ${JASPER_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/jasper_configure_step.cmake
-  DEPENDS ${jasper_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/jasper_pkg.cmake b/CMake/cdat_modules/jasper_pkg.cmake
deleted file mode 100644
index a4f898723..000000000
--- a/CMake/cdat_modules/jasper_pkg.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(JASPER_MAJOR 1)
-set(JASPER_MINOR 900)
-set(JASPER_PATCH 1)
-set(JASPER_VERSION ${JASPER_MAJOR}.${JASPER_MINOR}.${JASPER_PATCH})
-set(JASPER_URL ${LLNL_URL})
-set(JASPER_GZ jasper-${JASPER_VERSION}.tgz)
-set(JASPER_MD5 b5ae85050d034555790a3ccbc2522860)
-set(JASPER_SOURCE ${JASPER_URL}/${JASPER_GZ})
-
-add_cdat_package(jasper "" "" ON)
diff --git a/CMake/cdat_modules/jinja2_deps.cmake b/CMake/cdat_modules/jinja2_deps.cmake
deleted file mode 100644
index a8047b98a..000000000
--- a/CMake/cdat_modules/jinja2_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(jinja2_deps ${pip_pkg} ${markupsafe_pkg})
diff --git a/CMake/cdat_modules/jinja2_external.cmake b/CMake/cdat_modules/jinja2_external.cmake
deleted file mode 100644
index a50b6c79f..000000000
--- a/CMake/cdat_modules/jinja2_external.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-
-# create an external project to install MyProxyClient,
-# and configure and build it
-set(nm jinja2)
-
-include(pipinstaller)
diff --git a/CMake/cdat_modules/jinja2_pkg.cmake b/CMake/cdat_modules/jinja2_pkg.cmake
deleted file mode 100644
index ffabe31e3..000000000
--- a/CMake/cdat_modules/jinja2_pkg.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-set(jinja2_MAJOR_SRC 2)
-set(jinja2_MINOR_SRC 7)
-set(jinja2_PATCH_SRC )
-set(JINJA2_VERSION ${jinja2_MAJOR_SRC}.${jinja2_MINOR_SRC})
-set(JINJA2_GZ Jinja2-${JINJA2_VERSION}.tar.gz)
-set(JINJA2_SOURCE ${LLNL_URL}/${JINJA2_GZ})
-set(JINJA2_MD5 c2fb12cbbb523c57d3d15bfe4dc0e8fe )
-
-add_cdat_package_dependent(jinja2 "" "" OFF "CDAT_BUILD_GUI" OFF)
diff --git a/CMake/cdat_modules/jpeg_deps.cmake b/CMake/cdat_modules/jpeg_deps.cmake
deleted file mode 100644
index e7e6b16ba..000000000
--- a/CMake/cdat_modules/jpeg_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(jpeg_deps ${pkgconfig_pkg})
diff --git a/CMake/cdat_modules/jpeg_external.cmake b/CMake/cdat_modules/jpeg_external.cmake
deleted file mode 100644
index e5a6f62bf..000000000
--- a/CMake/cdat_modules/jpeg_external.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-
-set(jpeg_source "${CMAKE_CURRENT_BINARY_DIR}/build/jpeg")
-set(jpeg_install "${cdat_EXTERNALS}")
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/jpeg_install_step.cmake.in
-    ${cdat_CMAKE_BINARY_DIR}/jpeg_install_step.cmake
-    @ONLY)
-
-set(jpeg_INSTALL_COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/jpeg_install_step.cmake)
-
-ExternalProject_Add(jpeg
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${jpeg_source}
-  INSTALL_DIR ${jpeg_install}
-  URL ${JPEG_URL}/${JPEG_GZ}
-  URL_MD5 ${JPEG_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  INSTALL_COMMAND ${jpeg_INSTALL_COMMAND}
-  DEPENDS ${jpeg_deps}
-  ${ep_log_options}
-)
-
diff --git a/CMake/cdat_modules/jpeg_pkg.cmake b/CMake/cdat_modules/jpeg_pkg.cmake
deleted file mode 100644
index c30e433f7..000000000
--- a/CMake/cdat_modules/jpeg_pkg.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-set(JPEG_URL ${LLNL_URL})
-set(JPEG_GZ jpegsrc.v8c.tar.gz)
-set(JPEG_MD5 a2c10c04f396a9ce72894beb18b4e1f9)
-
-set(JPEG_VERSION v8c)
-set(JPEG_SOURCE ${JPEG_URL}/${JPEG_GZ})
-
-#grib2/jasper need this therefore cdms2 can't turn off
-#if (CDAT_BUILD_GRAPHICS)
-add_cdat_package(jpeg "" "" OFF)
-#endif()
-
diff --git a/CMake/cdat_modules/lapack_deps.cmake b/CMake/cdat_modules/lapack_deps.cmake
deleted file mode 100644
index cc8174699..000000000
--- a/CMake/cdat_modules/lapack_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(LAPACK_deps ${pkgconfig_pkg})
diff --git a/CMake/cdat_modules/lapack_external.cmake b/CMake/cdat_modules/lapack_external.cmake
deleted file mode 100644
index a8b3f6139..000000000
--- a/CMake/cdat_modules/lapack_external.cmake
+++ /dev/null
@@ -1,26 +0,0 @@
-# The LAPACK external project
-
-set(lapack_source "${CMAKE_CURRENT_BINARY_DIR}/build/LAPACK")
-set(lapack_binary "${CMAKE_CURRENT_BINARY_DIR}/build/LAPACK-build")
-set(lapack_install "${cdat_EXTERNALS}")
-set(NUMPY_LAPACK_binary ${lapack_binary})
-
-ExternalProject_Add(LAPACK
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${lapack_source}
-  BINARY_DIR ${lapack_binary}
-  INSTALL_DIR ${lapack_install}
-  URL ${LAPACK_URL}/${LAPACK_GZ}
-  URL_MD5 ${LAPACK_MD5}
-  CMAKE_ARGS
-    -DCMAKE_Fortran_COMPILER:FILEPATH=${CMAKE_Fortran_COMPILER}
-    -DCMAKE_CXX_FLAGS:STRING=${cdat_tpl_cxx_flags}
-    -DCMAKE_C_FLAGS:STRING=${cdat_tpl_c_flags}
-    -DBUILD_SHARED_LIBS:BOOL=ON
-    -DENABLE_TESTING:BOOL=OFF
-    -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-  DEPENDS ${LAPACK_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/lapack_pkg.cmake b/CMake/cdat_modules/lapack_pkg.cmake
deleted file mode 100644
index 3f5b9b81e..000000000
--- a/CMake/cdat_modules/lapack_pkg.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-set(LAPACK_MAJOR_SRC 3)
-set(LAPACK_MINOR_SRC 4)
-set(LAPACK_PATCH_SRC 2)
-
-set(LAPACK_URL ${LLNL_URL})
-set(LAPACK_GZ lapack-${LAPACK_MAJOR_SRC}.${LAPACK_MINOR_SRC}.${LAPACK_PATCH_SRC}.tgz)
-set(LAPACK_MD5 61bf1a8a4469d4bdb7604f5897179478 )
-
-set (nm LAPACK)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-
-#Removing apple exclusion for now
-set(LAPACK_SOURCE ${LAPACK_URL}/${LAPACK_GZ})
-
-if(NOT APPLE)
-  if(CMAKE_Fortran_COMPILER)
-    add_cdat_package(LAPACK "" "" OFF)
-  endif()
-endif()
diff --git a/CMake/cdat_modules/lats_deps.cmake b/CMake/cdat_modules/lats_deps.cmake
deleted file mode 100644
index 4f7aee7aa..000000000
--- a/CMake/cdat_modules/lats_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(lats_deps ${netcdf_pkg})
diff --git a/CMake/cdat_modules/lats_external.cmake b/CMake/cdat_modules/lats_external.cmake
deleted file mode 100644
index 519fc3a2e..000000000
--- a/CMake/cdat_modules/lats_external.cmake
+++ /dev/null
@@ -1,44 +0,0 @@
-
-set(lats_source "${CMAKE_CURRENT_BINARY_DIR}/build/lats")
-set(lats_install "${cdat_EXTERNALS}")
-
-configure_file(
-    ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/lats_Makefile.gfortran.in
-    ${CMAKE_CURRENT_BINARY_DIR}/CMake/lats_Makefile
-    )
-
-if(DEFINED GIT_CMD_STR_LATS )
-    message("[INFO] [lats] Installing ${nm} from ${GIT_CMD_STR_LATS}")
-    include(GetGitRevisionDescription)
-    set(URL_STR )
-    set(URL_MD5_STR )
-else()
-    message("[INFO] [lats] Installed ${nm} from tarball ${LATS_GZ}")
-    set(URL_STR URL ${LATS_URL}/${LATS_GZ})
-    set(URL_MD5_STR URL_MD5 ${LATS_MD5})
-    set(GIT_CMD_STR_LATS )
-    set(GIT_TAG )
-endif()
-set(LATS_MAKE_ARGS -f^^${CMAKE_CURRENT_BINARY_DIR}/CMake/lats_Makefile)
-set(LATS_MAKE_INSTALL_ARGS -f^^${CMAKE_CURRENT_BINARY_DIR}/CMake/lats_Makefile^^install)
-set(LATS_BUILD_ARGS -fPIC)
-
-ExternalProject_Add(lats
-  LIST_SEPARATOR ^^
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${lats_source}
-  INSTALL_DIR ${lats_install}
-  ${URL_STR}
-  ${URL_MD5_STR}
-  ${GIT_CMD_STR_LATS}
-  ${GIT_TAG}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ${CMAKE_COMMAND} -DADDITIONAL_CFLAGS=${LATS_BUILD_ARGS} -Dmake=$(MAKE) -DBUILD_ARGS=${LATS_MAKE_ARGS} -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
-  INSTALL_COMMAND ${CMAKE_COMMAND} -DADDITIONAL_CFLAGS=${LATS_BUILD_ARGS} -Dmake=$(MAKE) -DBUILD_ARGS=${LATS_MAKE_INSTALL_ARGS} -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
-  DEPENDS ${lats_deps}
-  ${ep_log_options}
-)
-if (DEFINED GIT_CMD_STR_LATS)
-  unset(GIT_CMD_STR_LATS)
-endif()
diff --git a/CMake/cdat_modules/lats_pkg.cmake b/CMake/cdat_modules/lats_pkg.cmake
deleted file mode 100644
index 545c0fe09..000000000
--- a/CMake/cdat_modules/lats_pkg.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(LATS_VERSION 1.0.0)
-set(LATS_BRANCH master)
-set(LATS_REPOSITORY ${GIT_PROTOCOL}github.com/UV-CDAT/lats.git )
-
-set(GIT_CMD_STR_LATS GIT_REPOSITORY ${LATS_REPOSITORY})
-set(GIT_TAG GIT_TAG "${LATS_BRANCH}")
-
-if (CDAT_BUILD_PCMDI)
-  add_cdat_package(lats "" "" ON)
-endif()
diff --git a/CMake/cdat_modules/lepl_deps.cmake b/CMake/cdat_modules/lepl_deps.cmake
deleted file mode 100644
index 0643a8540..000000000
--- a/CMake/cdat_modules/lepl_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(lepl_deps ${cdat_pkg} ${numexpr_pkg} ${pip_pkg})
diff --git a/CMake/cdat_modules/lepl_external.cmake b/CMake/cdat_modules/lepl_external.cmake
deleted file mode 100644
index 80b680e29..000000000
--- a/CMake/cdat_modules/lepl_external.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-# create an external project to install MyProxyClient,
-# and configure and build it
-set(nm lepl)
-
-include(pipinstaller)
diff --git a/CMake/cdat_modules/lepl_pkg.cmake b/CMake/cdat_modules/lepl_pkg.cmake
deleted file mode 100644
index 9551ef522..000000000
--- a/CMake/cdat_modules/lepl_pkg.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-set(lepl_MAJOR_SRC 5)
-set(lepl_MINOR_SRC 1)
-set(lepl_PATCH_SRC 3)
-
-set (nm lepl)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-set(LEPL_GZ LEPL-${LEPL_VERSION}.tar.gz)
-set(LEPL_SOURCE ${LLNL_URL}/${LEPL_GZ})
-set(LEPL_MD5 5f653984c57ad8efad828c5153660743 )
-
-add_cdat_package_dependent(lepl "" "" OFF "CDAT_BUILD_GUI" OFF)
diff --git a/CMake/cdat_modules/libcdms_deps.cmake b/CMake/cdat_modules/libcdms_deps.cmake
deleted file mode 100644
index 904227d3b..000000000
--- a/CMake/cdat_modules/libcdms_deps.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-set(libcdms_deps ${netcdf_pkg}
-              ${jasper_pkg} ${g2clib_pkg} ${tiff_pkg}
-              ${png_pkg} ${jpeg_pkg} )
-if (CDAT_BUILD_LIBDRS)
-    message("[INFO] ADDING LIBDRS TO LIBCDMS DEPNDENCIES")
-    LIST(APPEND libcdms_deps ${libdrs_pkg})
-endif()
diff --git a/CMake/cdat_modules/libcdms_external.cmake b/CMake/cdat_modules/libcdms_external.cmake
deleted file mode 100644
index 2ed64475c..000000000
--- a/CMake/cdat_modules/libcdms_external.cmake
+++ /dev/null
@@ -1,56 +0,0 @@
-set(libcdms_source "${CMAKE_CURRENT_BINARY_DIR}/build/libcdms")
-set(libcdms_install "${cdat_EXTERNALS}")
-
-if(APPLE)
-    set(WITHPNGLIB "/usr/X11R6/lib")
-else()
-    set(WITHPNGLIB "no")
-endif()
-
-if (CDAT_BUILD_LIBDRS)
-    message("[INFO] ENBLING DRS IN CDMS")
-    set(drs_opt --enable-drs^^--with-drslib=${cdat_EXTERNALS}/lib^^--with-drsinc=${cdat_EXTERNALS}/include^^--with-drsincf=${cdat_EXTERNALS}/include)
-else()
-    set(drs_opt "")
-endif()
-
-set(CONFIGURE_ARGS --srcdir=${libcdms_source}^^--enable-dap^^${drs_opt}^^--enable-hdf=no^^--enable-pp=yes^^--enable-ql=no^^--cache-file=/dev/null^^--prefix=${libcdms_install}^^--with-nclib=${cdat_EXTERNALS}/lib^^--with-ncinc=${cdat_EXTERNALS}/include^^--with-daplib=/lib^^--with-dapinc=/include^^--with-hdfinc=./include^^--with-hdflib=./lib^^--with-hdf5lib=${cdat_EXTERNALS}/lib^^--with-pnglib=${WITHPNGLIB}^^--with-grib2lib=${cdat_EXTERNALS}/lib^^--with-jasperlib=${cdat_EXTERNALS}/lib^^--with-grib2inc=${cdat_EXTERNALS}/include^^--enable-grib2)
-file(MAKE_DIRECTORY ${cdat_EXTERNALS}/man/man3)
-    
-
-if(DEFINED GIT_CMD_STR_LIBCDMS )
-    message("[INFO] [libcdms] Installing ${nm} from ${GIT_CMD_STR_LIBCDMS}")
-    include(GetGitRevisionDescription)
-    set(URL_STR )
-    set(URL_MD5_STR )
-else()
-    message("[INFO] [libcdms] Installed ${nm} from tarball ${LIBCDMS_GZ}")
-    set(URL_STR URL ${LIBCDMS_URL}/${LIBCDMS_GZ})
-    set(URL_MD5_STR URL_MD5 ${LIBCDMS_MD5})
-    set(GIT_CMD_STR_LIBCDMS )
-    set(GIT_TAG_LIBCDMS )
-endif()
-set(LIBCDMS_MAKE_ARGS -j1)
-set(LIBCDMS_BUILD_ARGS -fPIC)
-ExternalProject_Add(libcdms
-  LIST_SEPARATOR ^^
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${libcdms_source}
-  INSTALL_DIR ${libcdms_install}
-  ${URL_STR}
-  ${URL_MD5_STR}
-  ${GIT_CMD_STR_LIBCDMS}
-  ${GIT_TAG_LIBCDMS}
-  PATCH_COMMAND ${CMAKE_COMMAND} -E remove <SOURCE_DIR>/zconf.h
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DADDITIONAL_CFLAGS=${LIBCDMS_BUILD_ARGS}  -DCONFIGURE_ARGS=${CONFIGURE_ARGS} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  BUILD_COMMAND ${CMAKE_COMMAND} -DADDITIONAL_CFLAGS=${LIBCDMS_BUILD_ARGS} -Dmake=$(MAKE) -DBUILD_ARGS=${LIBCDMS_MAKE_ARGS} -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
-  DEPENDS ${libcdms_deps}
-  ${ep_log_options}
-)
-if (DEFINED GIT_CMD_STR)
-  unset(GIT_CMD_STR)
-endif()
-if (DEFINED GIT_CMD_STR_LIBCDMS)
-  unset(GIT_CMD_STR_LIBCDMS)
-endif()
diff --git a/CMake/cdat_modules/libcdms_pkg.cmake b/CMake/cdat_modules/libcdms_pkg.cmake
deleted file mode 100644
index eb7a722eb..000000000
--- a/CMake/cdat_modules/libcdms_pkg.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-set(LIBCDMS_VERSION 1.0.0)
-set(LIBCDMS_URL ${LLNL_URL})
-set(LIBCDMS_GZ libcdms-${LIBCDMS_VERSION}.tar.gz)
-set(LIBCDMS_SOURCE ${LIBCDMS_URL}/${LIBCDMS_GZ})
-set(LIBCDMS_MD5 ce71f54616f755d67fbbb6c81ca4fd62)
-set(LIBCDMS_BRANCH master)
-set(LIBCDMS_REPOSITORY ${GIT_PROTOCOL}github.com/UV-CDAT/libcdms.git )
-
-set(GIT_CMD_STR_LIBCDMS GIT_REPOSITORY ${LIBCDMS_REPOSITORY})
-set(GIT_TAG_LIBCDMS GIT_TAG "${LIBCDMS_BRANCH}")
-
-add_cdat_package(libcdms "" "" OFF)
diff --git a/CMake/cdat_modules/libcf_deps.cmake b/CMake/cdat_modules/libcf_deps.cmake
deleted file mode 100644
index 5673f4b88..000000000
--- a/CMake/cdat_modules/libcf_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(libcf_deps ${pkgconfig_pkg} ${python_pkg} ${netcdf_pkg} ${hdf5_pkg} ${curl_pkg} ${zlib_pkg} ${uuid_pkg} ${clapack_pkg} ${lapack_pkg} )
diff --git a/CMake/cdat_modules/libcf_external.cmake b/CMake/cdat_modules/libcf_external.cmake
deleted file mode 100644
index 9eeca6839..000000000
--- a/CMake/cdat_modules/libcf_external.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-
-set(libcf_source "${CMAKE_CURRENT_BINARY_DIR}/build/libcf")
-set(libcf_install "${cdat_EXTERNALS}")
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/libcf_make_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/libcf_make_step.cmake
-  @ONLY)
-  
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/libcf_install_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/libcf_install_step.cmake
-  @ONLY)
-
-set(libcf_build_command ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/libcf_make_step.cmake)
-set(libcf_install_command ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/libcf_install_step.cmake)
-
-ExternalProject_Add(libcf
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${libcf_source}
-  INSTALL_DIR ${libcf_install}
-  URL ${LIBCF_URL}/${LIBCF_GZ}
-  URL_MD5 ${LIBCF_MD5}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  PATCH_COMMAND ""
-  BUILD_COMMAND ${libcf_build_command}
-  INSTALL_COMMAND ${libcf_install_command}
-  DEPENDS ${libcf_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/libcf_pkg.cmake b/CMake/cdat_modules/libcf_pkg.cmake
deleted file mode 100644
index eed8c3497..000000000
--- a/CMake/cdat_modules/libcf_pkg.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(LIBCF_MAJOR 1)
-set(LIBCF_MINOR 0)
-set(LIBCF_PATCH beta11)
-set(LIBCF_VERSION ${LIBCF_MAJOR}.${LIBCF_MINOR}-${LIBCF_PATCH})
-set(LIBCF_URL ${LLNL_URL})
-set(LIBCF_GZ libcf-${LIBCF_VERSION}.tar.gz)
-set(LIBCF_MD5 aba4896eab79d36c7283fc7b75fb16ee)
-set(LIBCF_SOURCE ${LIBCF_URL}/${LIBCF_GZ})
-
-add_cdat_package_dependent(libcf "" "" OFF "CDAT_BUILD_LEAN" ON)
diff --git a/CMake/cdat_modules/libdrs_deps.cmake b/CMake/cdat_modules/libdrs_deps.cmake
deleted file mode 100644
index 1958c1f35..000000000
--- a/CMake/cdat_modules/libdrs_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(libdrs_deps ${netcdf_pkg} ${g2clib_pkg})
diff --git a/CMake/cdat_modules/libdrs_external.cmake b/CMake/cdat_modules/libdrs_external.cmake
deleted file mode 100644
index f1b289678..000000000
--- a/CMake/cdat_modules/libdrs_external.cmake
+++ /dev/null
@@ -1,49 +0,0 @@
-set(libdrs_source "${CMAKE_CURRENT_BINARY_DIR}/build/libdrs")
-set(libdrs_install "${cdat_EXTERNALS}")
-
-if (APPLE)
-    set(libdrs_make_file libdrs_Makefile.Mac.gfortran.in)
-else ()
-    set(libdrs_make_file libdrs_Makefile.Linux.gfortran.in)
-endif ()
-
-configure_file(
-    ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/${libdrs_make_file}
-    ${CMAKE_CURRENT_BINARY_DIR}/CMake/libdrs_Makefile
-    )
-
-if(DEFINED GIT_CMD_STR_LIBDRS )
-    message("[INFO] [libdrs] Installing ${nm} from ${GIT_CMD_STR_LIBDRS}")
-    include(GetGitRevisionDescription)
-    set(URL_STR )
-    set(URL_MD5_STR )
-else()
-    message("[INFO] [libdrs] Installed ${nm} from tarball ${LIBDRS_GZ}")
-    set(URL_STR URL ${LIBDRS_URL}/${LIBDRS_GZ})
-    set(URL_MD5_STR URL_MD5 ${LIBDRS_MD5})
-    set(GIT_CMD_STR_LIBDRS )
-    set(GIT_TAG )
-endif()
-set(LIBDRS_MAKE_ARGS -f^^${CMAKE_CURRENT_BINARY_DIR}/CMake/libdrs_Makefile)
-set(LIBDRS_MAKE_INSTALL_ARGS -f^^${CMAKE_CURRENT_BINARY_DIR}/CMake/libdrs_Makefile^^install)
-set(LIBDRS_BUILD_ARGS -fPIC)
-
-ExternalProject_Add(libdrs
-  LIST_SEPARATOR ^^
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${libdrs_source}
-  INSTALL_DIR ${libdrs_install}
-  ${URL_STR}
-  ${URL_MD5_STR}
-  ${GIT_CMD_STR_LIBDRS}
-  ${GIT_TAG}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ${CMAKE_COMMAND} -DADDITIONAL_CFLAGS=${LIBDRS_BUILD_ARGS} -Dmake=$(MAKE) -DBUILD_ARGS=${LIBDRS_MAKE_ARGS} -DWORKING_DIR=<SOURCE_DIR>/lib -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
-  INSTALL_COMMAND ${CMAKE_COMMAND} -DADDITIONAL_CFLAGS=${LIBDRS_BUILD_ARGS} -Dmake=$(MAKE) -DBUILD_ARGS=${LIBDRS_MAKE_INSTALL_ARGS} -DWORKING_DIR=<SOURCE_DIR>/lib -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
-  DEPENDS ${libdrs_deps}
-  ${ep_log_options}
-)
-if (DEFINED GIT_CMD_STR_LIBDRS)
-  unset(GIT_CMD_STR_LIBDRS)
-endif()
diff --git a/CMake/cdat_modules/libdrs_pkg.cmake b/CMake/cdat_modules/libdrs_pkg.cmake
deleted file mode 100644
index 6258a08d7..000000000
--- a/CMake/cdat_modules/libdrs_pkg.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-set(LIBDRS_VERSION 1.0.0)
-set(LIBDRS_URL ${LLNL_URL})
-set(LIBDRS_BRANCH master)
-set(LIBDRS_REPOSITORY ${GIT_PROTOCOL}github.com/UV-CDAT/libdrs.git )
-
-set(GIT_CMD_STR_LIBDRS GIT_REPOSITORY ${LIBDRS_REPOSITORY})
-set(GIT_TAG GIT_TAG "${LIBDRS_BRANCH}")
-if (CDAT_BUILD_PCMDI)
-  set(CDAT_BUILD_LIBDRS ON)
-  add_cdat_package(libdrs "" "" ON)
-endif()
diff --git a/CMake/cdat_modules/libdrsfortran_deps.cmake b/CMake/cdat_modules/libdrsfortran_deps.cmake
deleted file mode 100644
index c5db76f4b..000000000
--- a/CMake/cdat_modules/libdrsfortran_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(libdrsfortran_deps ${netcdf_pkg} ${g2clib_pkg} ${libcdms_pkg} ${libdrs_pkg})
diff --git a/CMake/cdat_modules/libdrsfortran_external.cmake b/CMake/cdat_modules/libdrsfortran_external.cmake
deleted file mode 100644
index ba6d738a4..000000000
--- a/CMake/cdat_modules/libdrsfortran_external.cmake
+++ /dev/null
@@ -1,46 +0,0 @@
-set(libdrs_source "${CMAKE_CURRENT_BINARY_DIR}/build/libdrs")
-set(libdrs_install "${cdat_EXTERNALS}")
-
-set(libdrsfortran_make_file libdrs_Makefile.Mac.fwrap.gfortran.in)
-
-configure_file(
-    ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/${libdrsfortran_make_file}
-    ${CMAKE_CURRENT_BINARY_DIR}/CMake/libdrsfortran_Makefile
-    )
-
-if(DEFINED GIT_CMD_STR_LIBDRSFORTRAN )
-    message("[INFO] [libdrs] Installing ${nm} from ${GIT_CMD_STR_LIBDRSFORTRAN}")
-    include(GetGitRevisionDescription)
-    set(URL_STR )
-    set(URL_MD5_STR )
-else()
-    message("[INFO] [libdrs] Installed ${nm} from tarball ${LIBDRSFORTRAN_GZ}")
-    set(URL_STR URL ${LIBDRSFORTRAN_URL}/${LIBDRSFORTRAN_GZ})
-    set(URL_MD5_STR URL_MD5 ${LIBDRSFORTRAN_MD5})
-    set(GIT_CMD_STR_LIBDRS )
-    set(GIT_TAG )
-endif()
-
-set(LIBDRS_MAKE_ARGS -f^^${CMAKE_CURRENT_BINARY_DIR}/CMake/libdrsfortran_Makefile)
-set(LIBDRS_MAKE_INSTALL_ARGS -f^^${CMAKE_CURRENT_BINARY_DIR}/CMake/libdrsfortran_Makefile^^install)
-set(LIBDRS_BUILD_ARGS -fPIC)
-
-ExternalProject_Add(libdrsfortran
-  LIST_SEPARATOR ^^
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${libdrs_source}
-  INSTALL_DIR ${libdrs_install}
-  ${URL_STR}
-  ${URL_MD5_STR}
-  ${GIT_CMD_STR_LIBDRSFORTRAN}
-  ${GIT_TAG}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ${CMAKE_COMMAND} -DADDITIONAL_CFLAGS=${LIBDRS_BUILD_ARGS} -Dmake=$(MAKE) -DBUILD_ARGS=${LIBDRS_MAKE_ARGS} -DWORKING_DIR=<SOURCE_DIR>/lib -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
-  INSTALL_COMMAND ${CMAKE_COMMAND} -DADDITIONAL_CFLAGS=${LIBDRS_BUILD_ARGS} -Dmake=$(MAKE) -DBUILD_ARGS=${LIBDRS_MAKE_INSTALL_ARGS} -DWORKING_DIR=<SOURCE_DIR>/lib -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
-  DEPENDS ${libdrsfortran_deps}
-  ${ep_log_options}
-)
-if (DEFINED GIT_CMD_STR_LIBDRS)
-  unset(GIT_CMD_STR_LIBDRS)
-endif()
diff --git a/CMake/cdat_modules/libdrsfortran_pkg.cmake b/CMake/cdat_modules/libdrsfortran_pkg.cmake
deleted file mode 100644
index 23e8e34a4..000000000
--- a/CMake/cdat_modules/libdrsfortran_pkg.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-set(LIBDRSFORTRAN_VERSION 1.0.0)
-set(LIBDRSFORTRAN_URL ${LLNL_URL})
-set(LIBDRSFORTRAN_BRANCH master)
-set(LIBDRSFORTRAN_REPOSITORY ${GIT_PROTOCOL}github.com/UV-CDAT/libdrs.git )
-
-set(GIT_CMD_STR_LIBDRSFORTRAN GIT_REPOSITORY ${LIBDRSFORTRAN_REPOSITORY})
-set(GIT_TAG GIT_TAG "${LIBDRSFORTRAN_BRANCH}")
-if (CDAT_BUILD_PCMDI)
-    if (APPLE)
-        set(CDAT_BUILD_LIBDRSFORTRAN ON)
-        add_cdat_package(libdrsfortran "" "" ON)
-    endif()
-endif()
diff --git a/CMake/cdat_modules/libxml2_deps.cmake b/CMake/cdat_modules/libxml2_deps.cmake
deleted file mode 100644
index cd79834e8..000000000
--- a/CMake/cdat_modules/libxml2_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(libXML2_deps ${pkgconfig_pkg} ${readline_pkg})
diff --git a/CMake/cdat_modules/libxml2_external.cmake b/CMake/cdat_modules/libxml2_external.cmake
deleted file mode 100644
index 59216b6b5..000000000
--- a/CMake/cdat_modules/libxml2_external.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-
-set(libXML2_source "${CMAKE_CURRENT_BINARY_DIR}/build/libXML2")
-set(libXML2_install "${cdat_EXTERNALS}")
-
-ExternalProject_Add(libXML2
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${libXML2_source}
-  INSTALL_DIR ${libXML2_install}
-  URL ${XML_URL}/${XML_GZ}
-  URL_MD5 ${XML_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  DEPENDS ${libXML2_deps}
-  ${ep_log_options}
-)
-
diff --git a/CMake/cdat_modules/libxml2_pkg.cmake b/CMake/cdat_modules/libxml2_pkg.cmake
deleted file mode 100644
index fd2f57ad2..000000000
--- a/CMake/cdat_modules/libxml2_pkg.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-set(XML_MAJOR 2)
-set(XML_MINOR 7)
-set(XML_PATCH 8)
-set(XML_MAJOR_SRC 2)
-set(XML_MINOR_SRC 7)
-set(XML_PATCH_SRC 8)
-set(XML_URL ${LLNL_URL})
-set(XML_GZ libxml2-${XML_MAJOR_SRC}.${XML_MINOR_SRC}.${XML_PATCH_SRC}.tar.gz)
-set(XML_MD5 8127a65e8c3b08856093099b52599c86)
-
-set (nm XML)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-set(LIBXML2_VERSION ${XML_VERSION})
-set(LIBXML2_SOURCE ${XML_URL}/${XML_GZ} )
-set(LIBXML2_MD5 ${XML_MD5})
-
-add_cdat_package(libXML2 "" "Bulid libxml2" OFF)
-
diff --git a/CMake/cdat_modules/libxslt_deps.cmake b/CMake/cdat_modules/libxslt_deps.cmake
deleted file mode 100644
index 31ab3ff7f..000000000
--- a/CMake/cdat_modules/libxslt_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(libXSLT_deps ${pkgconfig_pkg} ${readline_pkg} ${libxml2_pkg})
diff --git a/CMake/cdat_modules/libxslt_external.cmake b/CMake/cdat_modules/libxslt_external.cmake
deleted file mode 100644
index 2064cf209..000000000
--- a/CMake/cdat_modules/libxslt_external.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-
-set(libXSLT_source "${CMAKE_CURRENT_BINARY_DIR}/build/libXSLT")
-set(libXSLT_install "${cdat_EXTERNALS}")
-
-if(NOT LIBXML2_FOUND)
-  set(libXSLT_configure_args --with-libxml-prefix=${libXSLT_install})
-endif()
-
-ExternalProject_Add(libXSLT
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${libXSLT_source}
-  INSTALL_DIR ${libXSLT_install}
-  URL ${XSLT_URL}/${XSLT_GZ}
-  URL_MD5 ${XSLT_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCONFIGURE_ARGS=${libXSLT_configure_args} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  DEPENDS ${libXSLT_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/libxslt_pkg.cmake b/CMake/cdat_modules/libxslt_pkg.cmake
deleted file mode 100644
index d763d76ba..000000000
--- a/CMake/cdat_modules/libxslt_pkg.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-set(XSLT_MAJOR 1)
-set(XSLT_MINOR 1)
-set(XSLT_PATCH 22)
-set(XSLT_MAJOR_SRC 1)
-set(XSLT_MINOR_SRC 1)
-set(XSLT_PATCH_SRC 26)
-set(XSLT_URL ${LLNL_URL})
-set(XSLT_GZ libxslt-${XSLT_MAJOR_SRC}.${XSLT_MINOR_SRC}.${XSLT_PATCH_SRC}.tar.gz)
-set(XSLT_MD5 e61d0364a30146aaa3001296f853b2b9)
-
-set (nm XSLT)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-set(LIBXSLT_VERSION ${XSLT_VERSION})
-set(LIBXSLT_SOURCE ${XSLT_URL}/${XSLT_GZ})
-set(LIBXSLT_MD5 ${XSLT_MD5})
-
-add_cdat_package(libXSLT "" "Build xslt" OFF)
-
diff --git a/CMake/cdat_modules/lxml_deps.cmake b/CMake/cdat_modules/lxml_deps.cmake
deleted file mode 100644
index 52670d8f9..000000000
--- a/CMake/cdat_modules/lxml_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(lxml_deps ${cython_pkg} ${pip_pkg})
diff --git a/CMake/cdat_modules/lxml_external.cmake b/CMake/cdat_modules/lxml_external.cmake
deleted file mode 100644
index 3b8a91e15..000000000
--- a/CMake/cdat_modules/lxml_external.cmake
+++ /dev/null
@@ -1,26 +0,0 @@
-# create an external project to install lxml,
-# and configure and build it
-set(LXML_SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/build/lxml)
-set(LXML_BINARY_DIR ${LXML_SOURCE_DIR})
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/lxml_build_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/lxml_build_step.cmake @ONLY)
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/lxml_install_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/lxml_install_step.cmake @ONLY)
-
-set(LXML_BUILD_COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/lxml_build_step.cmake)
-set(LXML_INSTALL_COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/lxml_install_step.cmake)
-
-ExternalProject_Add(lxml
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${LXML_SOURCE_DIR}
-  URL ${LXML_URL}/${LXML_GZ}
-  URL_MD5 ${LXML_MD5}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ${LXML_BUILD_COMMAND}
-  INSTALL_COMMAND ${LXML_INSTALL_COMMAND}
- # INSTALL_COMMAND ${PYTHON_EXECUTABLE} setup.py install ${PYTHON_EXTRA_PREFIX}
-  DEPENDS ${lxml_deps}
-  ${ep_log_options}
- )
diff --git a/CMake/cdat_modules/lxml_pkg.cmake b/CMake/cdat_modules/lxml_pkg.cmake
deleted file mode 100644
index df4fb236d..000000000
--- a/CMake/cdat_modules/lxml_pkg.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-set(LXML_MAJOR_SRC 2)
-set(LXML_MINOR_SRC 3)
-set(LXML_PATCH_SRC 5)
-set(LXML_URL ${LLNL_URL})
-set(LXML_GZ lxml-${LXML_MAJOR_SRC}.${LXML_MINOR_SRC}.${LXML_PATCH_SRC}.tar.gz)
-set(LXML_MD5 730bb63383528b65eaa099d64ce276cf)
-
-set (nm LXML)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-set(LXML_SOURCE ${LXML_URL}/${LXML_GZ})
-
-add_cdat_package_dependent(lxml "" "" OFF "CDAT_BUILD_LEAN" ON)
diff --git a/CMake/cdat_modules/markupsafe_deps.cmake b/CMake/cdat_modules/markupsafe_deps.cmake
deleted file mode 100644
index 2b76bd653..000000000
--- a/CMake/cdat_modules/markupsafe_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(markupsafe_deps ${pip_pkg} ${pygments_pkg})
diff --git a/CMake/cdat_modules/markupsafe_external.cmake b/CMake/cdat_modules/markupsafe_external.cmake
deleted file mode 100644
index 9ea130d01..000000000
--- a/CMake/cdat_modules/markupsafe_external.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-
-# create an external project to install MyProxyClient,
-# and configure and build it
-set(nm markupsafe)
-
-include(pipinstaller)
diff --git a/CMake/cdat_modules/markupsafe_pkg.cmake b/CMake/cdat_modules/markupsafe_pkg.cmake
deleted file mode 100644
index b4e664655..000000000
--- a/CMake/cdat_modules/markupsafe_pkg.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-set(markupsafe_MAJOR_SRC 0)
-set(markupsafe_MINOR_SRC 18)
-set(markupsafe_PATCH_SRC )
-set(MARKUPSAFE_VERSION ${markupsafe_MAJOR_SRC}.${markupsafe_MINOR_SRC})
-set(MARKUPSAFE_GZ MarkupSafe-${MARKUPSAFE_VERSION}.tar.gz)
-set(MARKUPSAFE_SOURCE ${LLNL_URL}/${MARKUPSAFE_GZ})
-set(MARKUPSAFE_MD5 f8d252fd05371e51dec2fe9a36890687)
-add_cdat_package_dependent(markupsafe "" "" OFF "CDAT_BUILD_GUI" OFF)
diff --git a/CMake/cdat_modules/matplotlib_deps.cmake b/CMake/cdat_modules/matplotlib_deps.cmake
deleted file mode 100644
index 794a6a476..000000000
--- a/CMake/cdat_modules/matplotlib_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(Matplotlib_deps ${pyqt_pkg} ${freetype_pkg} ${cairo_pkg} ${numpy_pkg} ${png_pkg} ${six_pkg} ${dateutils_pkg} ${pyparsing_pkg} ${cycler_pkg})
diff --git a/CMake/cdat_modules/matplotlib_external.cmake b/CMake/cdat_modules/matplotlib_external.cmake
deleted file mode 100644
index 8cbbd53f6..000000000
--- a/CMake/cdat_modules/matplotlib_external.cmake
+++ /dev/null
@@ -1,38 +0,0 @@
-# Matplotlib
-#
-set(matplotlib_source_dir "${CMAKE_CURRENT_BINARY_DIR}/build/Matplotlib")
-
-if(CDAT_BUILD_GUI)
-  set(MATPLOTLIB_BACKEND "Qt4Agg")
-else()
-  set(MATPLOTLIB_BACKEND "Agg")
-endif()
-
-configure_file(
-  "${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/matplotlib_patch_step.cmake.in"
-  "${cdat_CMAKE_BINARY_DIR}/matplotlib_patch_step.cmake"
-  @ONLY
-)
-
-configure_file(
-  "${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/matplotlib_build_step.cmake.in"
-  "${cdat_CMAKE_BINARY_DIR}/matplotlib_build_step.cmake"
-  @ONLY
-)
-
-set(matplotlib_patch_command ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/matplotlib_patch_step.cmake)
-set(matplotlib_build_command ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/matplotlib_build_step.cmake)
-
-ExternalProject_Add(Matplotlib
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${matplotlib_source_dir}
-  URL ${MATPLOTLIB_URL}/${MATPLOTLIB_GZ}
-  URL_MD5 ${MATPLOTLIB_MD5}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ""
-  PATCH_COMMAND ${matplotlib_patch_command}
-  BUILD_COMMAND ${matplotlib_build_command}
-  INSTALL_COMMAND ""
-  DEPENDS ${Matplotlib_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/matplotlib_pkg.cmake b/CMake/cdat_modules/matplotlib_pkg.cmake
deleted file mode 100644
index 365a67c93..000000000
--- a/CMake/cdat_modules/matplotlib_pkg.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-set(MATPLOTLIB_MAJOR_MIN 1)
-set(MATPLOTLIB_MINOR_MIN 1)
-set(MATPLOTLIB_PATCH_MIN 0)
-set(MATPLOTLIB_MAJOR 1)
-set(MATPLOTLIB_MINOR 5)
-set(MATPLOTLIB_PATCH 1)
-set(MATPLOTLIB_VERSION ${MATPLOTLIB_MAJOR}.${MATPLOTLIB_MINOR}.${MATPLOTLIB_PATCH})
-set(MATPLOTLIB_URL ${LLNL_URL})
-set(MATPLOTLIB_GZ matplotlib-${MATPLOTLIB_VERSION}.tar.gz)
-set(MATPLOTLIB_MD5 b22dc4962f36aab919a7125b3b35953b)
-
-set(nm MATPLOTLIB)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR}.${${nm}_MINOR}.${${nm}_PATCH})
-set(MATPLOTLIB_SOURCE ${MATPLOTLIB_URL}/${MATPLOTLIB_GZ})
-
-add_cdat_package_dependent(Matplotlib "" "" ON "CDAT_BUILD_GRAPHICS" OFF)
diff --git a/CMake/cdat_modules/mccabe_deps.cmake b/CMake/cdat_modules/mccabe_deps.cmake
deleted file mode 100644
index 1d322a353..000000000
--- a/CMake/cdat_modules/mccabe_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(mccabe_deps ${python_pkg} ${setuptools_pkg})
diff --git a/CMake/cdat_modules/mccabe_external.cmake b/CMake/cdat_modules/mccabe_external.cmake
deleted file mode 100644
index 79e6561e5..000000000
--- a/CMake/cdat_modules/mccabe_external.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-ExternalProject_Add(mccabe
-  DOWNLOAD_DIR "${CMAKE_CURRENT_BINARY_DIR}"
-  SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/build/mccabe"
-  URL "${MCCABE_SOURCE}"
-  URL_MD5 ${MCCABE_MD5}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND "${PYTHON_EXECUTABLE}" setup.py build
-  INSTALL_COMMAND "${PYTHON_EXECUTABLE}" setup.py install "${PYTHON_EXTRA_PREFIX}"
-  DEPENDS ${mccabe_deps}
-  ${ep_log_options}
-  )
diff --git a/CMake/cdat_modules/mccabe_pkg.cmake b/CMake/cdat_modules/mccabe_pkg.cmake
deleted file mode 100644
index e2e3795a4..000000000
--- a/CMake/cdat_modules/mccabe_pkg.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-set(nm mccabe)
-string(TOUPPER ${nm} uc_nm)
-
-set(${uc_nm}_MAJOR 0)
-set(${uc_nm}_MINOR 3)
-set(${uc_nm}_PATCH 1)
-set(${uc_nm}_VERSION ${${uc_nm}_MAJOR}.${${uc_nm}_MINOR}.${${uc_nm}_PATCH})
-set(${uc_nm}_URL ${LLNL_URL})
-set(${uc_nm}_GZ ${nm}-${${uc_nm}_VERSION}.tar.gz)
-set(${uc_nm}_MD5 9a1570c470ff5db678cc0c03d5c0c237 )
-
-set(${uc_nm}_VERSION ${${uc_nm}_MAJOR}.${${uc_nm}_MINOR}.${${uc_nm}_PATCH})
-set(${uc_nm}_SOURCE ${${uc_nm}_URL}/${${uc_nm}_GZ})
-
-if(BUILD_TESTING)
-  add_cdat_package(${nm} "" "" ON)
-endif()
diff --git a/CMake/cdat_modules/md5_deps.cmake b/CMake/cdat_modules/md5_deps.cmake
deleted file mode 100644
index 3ba1ef597..000000000
--- a/CMake/cdat_modules/md5_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(MD5_deps)
diff --git a/CMake/cdat_modules/md5_external.cmake b/CMake/cdat_modules/md5_external.cmake
deleted file mode 100644
index e69de29bb..000000000
diff --git a/CMake/cdat_modules/md5_pkg.cmake b/CMake/cdat_modules/md5_pkg.cmake
deleted file mode 100644
index a4ac90144..000000000
--- a/CMake/cdat_modules/md5_pkg.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-find_package(MD5)
-set(MD5PRG ${MD5_EXECUTABLE})
-set(MD5CNT 1)
diff --git a/CMake/cdat_modules/mpi4py_deps.cmake b/CMake/cdat_modules/mpi4py_deps.cmake
deleted file mode 100644
index cbba65f4c..000000000
--- a/CMake/cdat_modules/mpi4py_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(Mpi4py_deps ${numpy_pkg} ${mpi_pkg})
diff --git a/CMake/cdat_modules/mpi4py_external.cmake b/CMake/cdat_modules/mpi4py_external.cmake
deleted file mode 100644
index 4c1484d29..000000000
--- a/CMake/cdat_modules/mpi4py_external.cmake
+++ /dev/null
@@ -1,50 +0,0 @@
-# The Mpi4py project 
-
-set(mpi4py_binary "${CMAKE_CURRENT_BINARY_DIR}/build/Mpi4py")
-
-# python can run after it is built on linux
-configure_file(
-  ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/mpi4py_make_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/mpi4py_make_step.cmake @ONLY)
-
-configure_file(
-  ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/mpi4py_install_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/mpi4py_install_step.cmake @ONLY)
-
-set(mpi4py_BUILD_COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/mpi4py_make_step.cmake)
-set(mpi4py_INSTALL_COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/mpi4py_install_step.cmake)
-
-set(Mpi4py_source "${CMAKE_CURRENT_BINARY_DIR}/build/Mpi4py")
-
-# create an external project to download numpy,
-# and configure and build it
-ExternalProject_Add(Mpi4py
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${Mpi4py_source}
-  URL ${MPI4PY_URL}/${MPI4PY_GZ}
-  URL_MD5 ${MPI4PY_MD5}
-  BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/mpi4py
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ${mpi4py_BUILD_COMMAND}
-  UPDATE_COMMAND ""
-  INSTALL_COMMAND ${mpi4py_INSTALL_COMMAND}
-  DEPENDS 
-    ${Mpi4py_deps}
-  ${ep_log_options}
-  )
-
-# Mpi4py
-#
-
-#ExternalProject_Add(Mpi4py
-#  DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}
-#  SOURCE_DIR ${Mpi4py_source}
-#  URL ${MPI4PY_URL}/${MPI4PY_GZ}
-#  URL_MD5 ${MPI4PY_MD5}
-#  BUILD_IN_SOURCE 1
-#  CONFIGURE_COMMAND ""
-#  BUILD_COMMAND ${PYTHON_EXECUTABLE} setup.py build
-#  INSTALL_COMMAND ${PYTHON_EXECUTABLE} setup.py install ${PYTHON_EXTRA_PREFIX}
-#  DEPENDS ${Mpi4py_deps}
-#  ${ep_log_options}
-#  )
diff --git a/CMake/cdat_modules/mpi4py_pkg.cmake b/CMake/cdat_modules/mpi4py_pkg.cmake
deleted file mode 100644
index e87d6be26..000000000
--- a/CMake/cdat_modules/mpi4py_pkg.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-set(MPI4PY_MAJOR 1)
-set(MPI4PY_MINOR 3)
-set(MPI4PY_VERSION ${MPI4PY_MAJOR}.${MPI4PY_MINOR})
-set(MPI4PY_URL http://uv-cdat.llnl.gov/cdat/resources)
-set(MPI4PY_GZ mpi4py-${MPI4PY_VERSION}.tar.gz)
-set(MPI4PY_MD5 978472a1a71f3142c866c9463dec7103)
-set(MPI4PY_SOURCE ${MPI4PY_URL}/${MPI4PY_GZ})
-
-add_cdat_package(Mpi4py "" "Bulid Mpi4py" OFF)
-if (CDAT_BUILD_PARALLEL)
-    set_property(CACHE CDAT_BUILD_MPI4PY PROPERTY VALUE ON)
-endif()
-
diff --git a/CMake/cdat_modules/mpi_deps.cmake b/CMake/cdat_modules/mpi_deps.cmake
deleted file mode 100644
index e134e5d1f..000000000
--- a/CMake/cdat_modules/mpi_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(MPI_deps ${pkgconfig_pkg})
diff --git a/CMake/cdat_modules/mpi_external.cmake b/CMake/cdat_modules/mpi_external.cmake
deleted file mode 100644
index 8fbe6a66f..000000000
--- a/CMake/cdat_modules/mpi_external.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-
-set(MPI_source "${CMAKE_CURRENT_BINARY_DIR}/build/MPI")
-set(MPI_install "${cdat_EXTERNALS}")
-
-ExternalProject_Add(MPI
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${MPI_source}
-  INSTALL_DIR ${MPI_install}
-  URL ${MPI_URL}/${MPI_GZ}
-  URL_MD5 ${MPI_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --disable-vt
-  DEPENDS ${MPI_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/mpi_pkg.cmake b/CMake/cdat_modules/mpi_pkg.cmake
deleted file mode 100644
index c3397cd0c..000000000
--- a/CMake/cdat_modules/mpi_pkg.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-set(MPI_MAJOR 1)
-set(MPI_MINOR 6)
-set(MPI_PATCH 4)
-set(MPI_URL ${LLNL_URL})
-set(MPI_GZ openmpi-${MPI_MAJOR}.${MPI_MINOR}.${MPI_PATCH}.tar.gz)
-set(MPI_MD5 70aa9b6271d904c6b337ca326e6613d1)
-set(MPI_SOURCE ${MPI_URL}/${MPI_GZ})
-set(MPI_VERSION ${MPI_MAJOR}.${MPI_MINOR}.${MPI_PATCH})
-
-add_cdat_package(MPI "" "Bulid MPI" OFF)
-
-if (CDAT_BUILD_PARALLEL)
-    set_property(CACHE CDAT_BUILD_MPI PROPERTY VALUE ON)
-endif()
diff --git a/CMake/cdat_modules/myproxyclient_deps.cmake b/CMake/cdat_modules/myproxyclient_deps.cmake
deleted file mode 100644
index a94e7aba7..000000000
--- a/CMake/cdat_modules/myproxyclient_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(MyProxyClient_deps  ${cryptography_pkg} ${pyopenssl_pkg} ${pip_pkg} ${pyasn1_pkg} ${setuptools_pkg})
diff --git a/CMake/cdat_modules/myproxyclient_external.cmake b/CMake/cdat_modules/myproxyclient_external.cmake
deleted file mode 100644
index eae57a9c7..000000000
--- a/CMake/cdat_modules/myproxyclient_external.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-
-# create an external project to install MyProxyClient,
-# and configure and build it
-set(nm MyProxyClient)
-
-include(pipinstaller)
diff --git a/CMake/cdat_modules/myproxyclient_pkg.cmake b/CMake/cdat_modules/myproxyclient_pkg.cmake
deleted file mode 100644
index 036b1bd0a..000000000
--- a/CMake/cdat_modules/myproxyclient_pkg.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-set(MYPROXYCLIENT_MAJOR_SRC 1)
-set(MYPROXYCLIENT_MINOR_SRC 3)
-set(MYPROXYCLIENT_PATCH_SRC 0)
-
-set (nm MYPROXYCLIENT)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-set(MYPROXYCLIENT_GZ MyProxyClient-${MYPROXYCLIENT_VERSION}.tar.gz)
-set(MYPROXYCLIENT_SOURCE ${LLNL_URL}/${MYPROXYCLIENT_GZ})
-set(MYPROXYCLIENT_MD5 829a299157f91f8ff8a6e5bc8ec1c09c )
-
-add_cdat_package_dependent(MyProxyClient "" "" OFF "CDAT_BUILD_LEAN" ON)
diff --git a/CMake/cdat_modules/netcdf_deps.cmake b/CMake/cdat_modules/netcdf_deps.cmake
deleted file mode 100644
index c8da9fa7b..000000000
--- a/CMake/cdat_modules/netcdf_deps.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-set(NetCDF_deps ${pkgconfig_pkg} ${hdf5_pkg} ${curl_pkg} ${zlib_pkg} ${jpeg_pkg} )
-if (CDAT_BUILD_PARALLEL)
-  list(APPEND NetCDF_deps ${mpi_pkg} )
-endif()
diff --git a/CMake/cdat_modules/netcdf_external.cmake b/CMake/cdat_modules/netcdf_external.cmake
deleted file mode 100644
index 3135cff49..000000000
--- a/CMake/cdat_modules/netcdf_external.cmake
+++ /dev/null
@@ -1,31 +0,0 @@
-set(netcdf_source "${CMAKE_CURRENT_BINARY_DIR}/build/netcdf")
-set(netcdf_install "${cdat_EXTERNALS}")
-set(netcdf_configure_args "--enable-netcdf-4")
-if (CDAT_BUILD_PARALLEL)
-  set(configure_file "cdatmpi_configure_step.cmake")
-else()
-  set(configure_file "cdat_configure_step.cmake")
-endif()
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/netcdf_patch_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/netcdf_patch_step.cmake
-  @ONLY)
-  
-set(netcdf_PATCH_COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/netcdf_patch_step.cmake)
-
-ExternalProject_Add(NetCDF
-  LIST_SEPARATOR ^^
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${netcdf_source}
-  INSTALL_DIR ${netcdf_install}
-  URL ${NC4_URL}/${NC4_GZ}
-  URL_MD5 ${NC4_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ${netcdf_PATCH_COMMAND}
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -DCONFIGURE_ARGS=${netcdf_configure_args} -P ${cdat_CMAKE_BINARY_DIR}/${configure_file}
-  BUILD_COMMAND ${CMAKE_COMMAND} -Dmake=$(MAKE) -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
-  INSTALL_COMMAND ${CMAKE_COMMAND} -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_install_step.cmake
-  DEPENDS ${NetCDF_deps}
-  ${ep_log_options}
-)
-
diff --git a/CMake/cdat_modules/netcdf_pkg.cmake b/CMake/cdat_modules/netcdf_pkg.cmake
deleted file mode 100644
index 9ea111ad8..000000000
--- a/CMake/cdat_modules/netcdf_pkg.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-set(NC4_MAJOR_SRC 4)
-set(NC4_MINOR_SRC 3)
-set(NC4_PATCH_SRC 3.1)
-set(NC4_URL ${LLNL_URL})
-set(NC4_GZ netcdf-${NC4_MAJOR_SRC}.${NC4_MINOR_SRC}.${NC4_PATCH_SRC}.tar.gz)
-set(NC4_MD5 5c9dad3705a3408d27f696e5b31fb88c )
-
-set (nm NC4)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-set(NETCDF_VERSION ${NC4_VERSION})
-set(NETCDF_SOURCE ${NC4_URL}/${NC4_GZ})
-set(NETCDF_MD5 ${NC4_MD5})
-
-add_cdat_package(NetCDF "" "" ON)
diff --git a/CMake/cdat_modules/netcdfplus_deps.cmake b/CMake/cdat_modules/netcdfplus_deps.cmake
deleted file mode 100644
index 7efe4f6ce..000000000
--- a/CMake/cdat_modules/netcdfplus_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(NetCDFPLUS_deps ${netcdf_pkg})
diff --git a/CMake/cdat_modules/netcdfplus_external.cmake b/CMake/cdat_modules/netcdfplus_external.cmake
deleted file mode 100644
index 130b82298..000000000
--- a/CMake/cdat_modules/netcdfplus_external.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-set(netcdfplus_source "${CMAKE_CURRENT_BINARY_DIR}/build/netcdf-c++")
-set(netcdfplus_install "${cdat_EXTERNALS}")
-set(netcdfplus_configure_args "")
-
-ExternalProject_Add(NetCDFPLUS
-  LIST_SEPARATOR ^^
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${netcdfplus_source}
-  INSTALL_DIR ${netcdfplus_install}
-  URL ${NC4PLUS_URL}/${NC4PLUS_GZ}
-  URL_MD5 ${NC4PLUS_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  DEPENDS ${NetCDFPLUS_deps}
-  ${ep_log_options}
-)
-
diff --git a/CMake/cdat_modules/netcdfplus_pkg.cmake b/CMake/cdat_modules/netcdfplus_pkg.cmake
deleted file mode 100644
index cec5f82ec..000000000
--- a/CMake/cdat_modules/netcdfplus_pkg.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-set(NC4PLUS_MAJOR_SRC 4)
-set(NC4PLUS_MINOR_SRC 2)
-set(NC4PLUS_PATCH_SRC 1.1)
-set(NC4PLUS_URL ${LLNL_URL})
-set(NC4PLUS_GZ netcdf-cxx-${NC4PLUS_MAJOR_SRC}.${NC4PLUS_MINOR_SRC}.tar.gz)
-set(NC4PLUS_MD5 0b09655cf977d768ced6c0d327dde176)
-
-set (nm NC4PLUS)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-set(NETCDFPLUS_VERSION ${NC4PLUS_VERSION})
-set(NETCDFPLUS_SOURCE ${NC4PLUS_URL}/${NC4PLUS_GZ})
-set(NETCDFPLUS_MD5 ${NC4PLUS_MD5})
-
-add_cdat_package_dependent(NetCDFPLUS "" "" OFF "CDAT_BUILD_GUI" OFF)
diff --git a/CMake/cdat_modules/numexpr_deps.cmake b/CMake/cdat_modules/numexpr_deps.cmake
deleted file mode 100644
index 5ba77a20d..000000000
--- a/CMake/cdat_modules/numexpr_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(Numexpr_deps ${pkgconfig_pkg} ${numpy_pkg} ${myproxyclient_pkg} ${pip_pkg})
diff --git a/CMake/cdat_modules/numexpr_external.cmake b/CMake/cdat_modules/numexpr_external.cmake
deleted file mode 100644
index a87913eb3..000000000
--- a/CMake/cdat_modules/numexpr_external.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-
-# create an external project to install MyProxyClient,
-# and configure and build it
-set(nm Numexpr)
-
-include(pipinstaller)
diff --git a/CMake/cdat_modules/numexpr_pkg.cmake b/CMake/cdat_modules/numexpr_pkg.cmake
deleted file mode 100644
index f8b18ab5c..000000000
--- a/CMake/cdat_modules/numexpr_pkg.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-set(NUMEXPR_MAJOR 2)
-set(NUMEXPR_MINOR 2)
-set(NUMEXPR_PATCH 2)
-#set(NUMEXPR_VERSION ${NUMEXPR_MAJOR}.${NUMEXPR_MINOR})
-set(NUMEXPR_VERSION ${NUMEXPR_MAJOR}.${NUMEXPR_MINOR}.${NUMEXPR_PATCH})
-# Following not needed any longer using easy_install
-set(NUMEXPR_URL ${LLNL_URL})
-set(NUMEXPR_GZ numexpr-${NUMEXPR_VERSION}.tar.gz)
-set(NUMEXPR_MD5 18103954044b3039c0a74a6006c8e0a7)
-set(NUMEXPR_SOURCE ${NUMEXPR_URL}/${NUMEXPR_GZ})
-
-add_cdat_package(Numexpr "" "" OFF)
diff --git a/CMake/cdat_modules/numpy_deps.cmake b/CMake/cdat_modules/numpy_deps.cmake
deleted file mode 100644
index 551192596..000000000
--- a/CMake/cdat_modules/numpy_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(NUMPY_deps ${pkgconfig_pkg} ${python_pkg} ${clapack_pkg} ${lapack_pkg})
diff --git a/CMake/cdat_modules/numpy_external.cmake b/CMake/cdat_modules/numpy_external.cmake
deleted file mode 100644
index 1e4b31349..000000000
--- a/CMake/cdat_modules/numpy_external.cmake
+++ /dev/null
@@ -1,45 +0,0 @@
-# The Numpy external project 
-
-set(NUMPY_binary "${CMAKE_CURRENT_BINARY_DIR}/build/NUMPY")
-
-# to configure numpy we run a cmake -P script
-# the script will create a site.cfg file
-# then run python setup.py config to verify setup
-configure_file(
-  ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/NUMPY_configure_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/NUMPY_configure_step.cmake @ONLY
-)
-
-# to build numpy we also run a cmake -P script.
-# the script will set LD_LIBRARY_PATH so that 
-# python can run after it is built on linux
-configure_file(
-  ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/NUMPY_make_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/NUMPY_make_step.cmake @ONLY
-)
-
-configure_file(
-  ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/NUMPY_install_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/NUMPY_install_step.cmake @ONLY
-)
-
-set(NUMPY_CONFIGURE_COMMAND ${CMAKE_COMMAND}
-    -DCONFIG_TYPE=${CMAKE_CFG_INTDIR} -P ${cdat_CMAKE_BINARY_DIR}/NUMPY_configure_step.cmake)
-set(NUMPY_BUILD_COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/NUMPY_make_step.cmake)
-set(NUMPY_INSTALL_COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/NUMPY_install_step.cmake)
-
-# create an external project to download numpy,
-# and configure and build it
-ExternalProject_Add(NUMPY
-  URL ${NUMPY_URL}/${NUMPY_GZ}
-  URL_MD5 ${NUMPY_MD5}
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${NUMPY_binary}
-  BINARY_DIR ${NUMPY_binary}
-  CONFIGURE_COMMAND ${NUMPY_CONFIGURE_COMMAND}
-  BUILD_COMMAND ${NUMPY_BUILD_COMMAND}
-  UPDATE_COMMAND ""
-  INSTALL_COMMAND ${NUMPY_INSTALL_COMMAND}
-  DEPENDS ${NUMPY_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/numpy_pkg.cmake b/CMake/cdat_modules/numpy_pkg.cmake
deleted file mode 100644
index bd67f5633..000000000
--- a/CMake/cdat_modules/numpy_pkg.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-set(NUMPY_MAJOR 1)
-set(NUMPY_MINOR 9)
-set(NUMPY_PATCH 0)
-set(NUMPY_MAJOR_SRC 1)
-set(NUMPY_MINOR_SRC 9)
-set(NUMPY_PATCH_SRC 0)
-set(NUMPY_URL ${LLNL_URL})
-set(NUMPY_GZ numpy-${NUMPY_MAJOR_SRC}.${NUMPY_MINOR_SRC}.${NUMPY_PATCH_SRC}.tar.gz)
-set(NUMPY_MD5 a93dfc447f3ef749b31447084839930b)
-set(NUMPY_SOURCE ${NUMPY_URL}/${NUMPY_GZ})
-
-set (nm NUMPY)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-add_cdat_package(NUMPY "" "" ON)
-set(NUMPY ${pkgconfig_pkg} ${python_pkg} ${clapack_pkg} ${lapack_pkg})
diff --git a/CMake/cdat_modules/ocgis_deps.cmake b/CMake/cdat_modules/ocgis_deps.cmake
deleted file mode 100644
index 4968421a1..000000000
--- a/CMake/cdat_modules/ocgis_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(ocgis_deps ${shapely_pkg} ${gdal_pkg} ${fiona_pkg} ${pynetcdf4_pkg})
diff --git a/CMake/cdat_modules/ocgis_external.cmake b/CMake/cdat_modules/ocgis_external.cmake
deleted file mode 100644
index db51295ba..000000000
--- a/CMake/cdat_modules/ocgis_external.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-set(ocgis_source "${CMAKE_CURRENT_BINARY_DIR}/build/ocgis")
-set(ocgis_install "${cdat_EXTERNALS}")
-
-ExternalProject_Add(ocgis
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${ocgis_source}
-  INSTALL_DIR ${ocgis_install}
-  BUILD_IN_SOURCE 1
-  ${GIT_CMD_STR_OCGIS}
-  ${GIT_TAG}
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ${PYTHON_EXECUTABLE} setup.py build
-  INSTALL_COMMAND env "PYTHONPATH=$ENV{PYTHONPATH}" "${PYTHON_EXECUTABLE}" setup.py install "${PYTHON_EXTRA_PREFIX}"
-  DEPENDS ${ocgis_deps}
-  ${ep_log_options}
-)
-if (DEFINED GIT_CMD_STR_OCGIS)
-  unset(GIT_CMD_STR_OCGIS)
-endif()
diff --git a/CMake/cdat_modules/ocgis_pkg.cmake b/CMake/cdat_modules/ocgis_pkg.cmake
deleted file mode 100644
index ad6d852ff..000000000
--- a/CMake/cdat_modules/ocgis_pkg.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-set(OCGIS_SOURCE ${OCGIS_URL}/${OCGIS_GZ})
-set(OCGIS_BRANCH next)
-set(OCGIS_REPOSITORY ${GIT_PROTOCOL}github.com/NCPP/ocgis.git )
-
-set(GIT_CMD_STR_OCGIS GIT_REPOSITORY ${OCGIS_REPOSITORY})
-set(GIT_TAG GIT_TAG "${OCGIS_BRANCH}")
-
-if (CDAT_BUILD_ALL)
-  add_cdat_package(ocgis "" "" ON)
-else()
-  add_cdat_package(ocgis "" "" OFF)
-endif()
diff --git a/CMake/cdat_modules/openssl_deps.cmake b/CMake/cdat_modules/openssl_deps.cmake
deleted file mode 100644
index 22b675b47..000000000
--- a/CMake/cdat_modules/openssl_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(OPENSSL_deps )
diff --git a/CMake/cdat_modules/openssl_external.cmake b/CMake/cdat_modules/openssl_external.cmake
deleted file mode 100644
index 752d3395c..000000000
--- a/CMake/cdat_modules/openssl_external.cmake
+++ /dev/null
@@ -1,37 +0,0 @@
-set (OPENSSL_SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/build/openssl")
-set (OPENSSL_INSTALL_DIR "${cdat_EXTERNALS}")
-
-execute_process (COMMAND uname -s COMMAND tr -d '\n'
-                 OUTPUT_VARIABLE HOST)
-STRING (TOLOWER ${HOST} HOST)
-execute_process (COMMAND uname -m COMMAND tr -d '\n'
-                 OUTPUT_VARIABLE ARCHITECTURE)
-
-get_filename_component (COMPILER "${CMAKE_C_COMPILER}" NAME_WE)
-
-if (APPLE)
-  if (ARCHITECTURE MATCHES "64$")
-    set (HOST "${HOST}64")
-  endif ()
-  set (COMPILER "cc")
-endif ()
-
-set (OPENSSL_CONF_ARGS "${HOST}-${ARCHITECTURE}-${COMPILER}")
-set (OPENSSL_CONF_ARGS
-    ${OPENSSL_CONF_ARGS}
-    "--prefix=${OPENSSL_INSTALL_DIR}")
-
-ExternalProject_Add (openssl
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${OPENSSL_SOURCE_DIR}
-  INSTALL_DIR ${OPENSSL_INSTALL_DIR}
-  URL ${OPENSSL_SOURCE_URL}
-  URL_MD5 ${OPENSSL_MD5}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ${OPENSSL_SOURCE_DIR}/Configure ${OPENSSL_CONF_ARGS}
-  DEPENDS ${OPENSSL_DEPS}
-  ${ep_log_options}
-  )
-
-set (OPENSSL_INCLUDE_DIR "${OPENSSL_INSTALL_DIR}/include")
-set (OPENSSL_LIBRARY_DIR "${OPENSSL_INSTALL_DIR}/lib")
diff --git a/CMake/cdat_modules/openssl_pkg.cmake b/CMake/cdat_modules/openssl_pkg.cmake
deleted file mode 100644
index 440d0f532..000000000
--- a/CMake/cdat_modules/openssl_pkg.cmake
+++ /dev/null
@@ -1,37 +0,0 @@
-option(CDAT_USE_SYSTEM_OPENSSL "Use system OpenSSL, if found." ON)
-mark_as_advanced(CDAT_USE_SYSTEM_OPENSSL)
-if(CDAT_USE_SYSTEM_OPENSSL)
-  find_package(OpenSSL QUIET)
-  if(OPENSSL_FOUND)
-    set(FILENAME_PATH_ARG "DIRECTORY")
-    if(CMAKE_VERSION VERSION_LESS 2.8.12)
-      # Support older version of GET_FILENAME_COMPONENT macro
-      # with legacy PATH argument
-      set(FILENAME_PATH_ARG "PATH")
-    endif(CMAKE_VERSION VERSION_LESS 2.8.12)
-    get_filename_component(OPENSSL_LIBRARY_DIR
-      "${OPENSSL_SSL_LIBRARY}" ${FILENAME_PATH_ARG})
-    message(STATUS "System OpenSSL found. "
-      "OpenSSL library directory: ${OPENSSL_LIBRARY_DIR}. "
-      "OpenSSL Version: ${OPENSSL_VERSION}")
-  endif(OPENSSL_FOUND)
-endif(CDAT_USE_SYSTEM_OPENSSL)
-
-if(NOT CDAT_USE_SYSTEM_OPENSSL OR NOT OPENSSL_FOUND)
-  set(OPENSSL_MAJOR_SRC 1)
-  set(OPENSSL_MINOR_SRC 0)
-  set(OPENSSL_PATCH_SRC 2e)
-  set(OPENSSL_VERSION
-    ${OPENSSL_MAJOR_SRC}.${OPENSSL_MINOR_SRC}.${OPENSSL_PATCH_SRC})
-  
-  message(STATUS "Compiling OpenSSL from source. Version: ${OPENSSL_VERSION}")
-
-  set(OPENSSL_URL ${LLNL_URL})
-  set(OPENSSL_GZ "openssl-${OPENSSL_VERSION}.tar.gz")
-  set(OPENSSL_MD5 5262bfa25b60ed9de9f28d5d52d77fc5)
-  set(OPENSSL_SOURCE_URL ${OPENSSL_URL}/${OPENSSL_GZ})
-  
-  # We've reached here because we need OpenSSL.
-  # Hence, defaulting to ON
-  add_cdat_package(openssl "" "" ON)
-endif(NOT CDAT_USE_SYSTEM_OPENSSL OR NOT OPENSSL_FOUND)
diff --git a/CMake/cdat_modules/osmesa_deps.cmake b/CMake/cdat_modules/osmesa_deps.cmake
deleted file mode 100644
index 2ee8b1857..000000000
--- a/CMake/cdat_modules/osmesa_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(osmesa_deps ${pkgconfig_pkg})
diff --git a/CMake/cdat_modules/osmesa_external.cmake b/CMake/cdat_modules/osmesa_external.cmake
deleted file mode 100644
index 23f4870a1..000000000
--- a/CMake/cdat_modules/osmesa_external.cmake
+++ /dev/null
@@ -1,26 +0,0 @@
-set(osmesa_source "${CMAKE_CURRENT_BINARY_DIR}/build/osmesa")
-set(osmesa_install "${cdat_EXTERNALS}")
-
-set(osmesa_conf_args "--with-driver=osmesa")
-set(osmesa_conf_args "${osmesa_conf_args}^^--disable-gallium")
-set(osmesa_conf_args "${osmesa_conf_args}^^--disable-gallium-intel")
-set(osmesa_conf_args "${osmesa_conf_args}^^--disable-egl")
-
-ExternalProject_Add(OSMesa
-  LIST_SEPARATOR ^^
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${osmesa_source}
-  INSTALL_DIR ${osmesa_install}
-  URL ${OSMESA_URL}/${OSMESA_GZ}
-  URL_MD5 ${OSMESA_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND
-    "${CMAKE_COMMAND}"
-      "-DCONFIGURE_ARGS=${osmesa_conf_args}"
-      "-DINSTALL_DIR=<INSTALL_DIR>"
-      "-DWORKING_DIR=<SOURCE_DIR>"
-      -P "${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake"
-  DEPENDS ${osmesa_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/osmesa_pkg.cmake b/CMake/cdat_modules/osmesa_pkg.cmake
deleted file mode 100644
index 1080dfb35..000000000
--- a/CMake/cdat_modules/osmesa_pkg.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-set(package OSMesa)
-string(TOUPPER ${package} package_uc)
-
-# We're using an older mesa (7.6.1) as it is known to work well in many
-# supercomputing environments.
-set(${package_uc}_MAJOR_SRC 7)
-set(${package_uc}_MINOR_SRC 6)
-set(${package_uc}_PATCH_SRC 1)
-set(${package_uc}_VERSION "${${package_uc}_MAJOR_SRC}.${${package_uc}_MINOR_SRC}.${${package_uc}_PATCH_SRC}")
-set(${package_uc}_URL ${LLNL_URL})
-set(${package_uc}_GZ "MesaLib-${${package_uc}_VERSION}.tar.gz")
-set(${package_uc}_MD5 e80fabad2e3eb7990adae773d6aeacba)
-set(${package_uc}_SOURCE "${${package_uc}_URL}/${${package_uc}_GZ}")
-
-add_cdat_package(${package} "7.6.1" "" OFF)
diff --git a/CMake/cdat_modules/paraview_deps.cmake b/CMake/cdat_modules/paraview_deps.cmake
deleted file mode 100644
index 6868b8da7..000000000
--- a/CMake/cdat_modules/paraview_deps.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-set(ParaView_deps ${pkgconfig_pkg} ${python_pkg} ${hdf5_pkg} ${png_pkg} ${jpeg_pkg} ${libxml2_pkg} ${freetype_pkg} ${netcdfplus_pkg} ${zlib_pkg})
-
-if (NOT CDAT_BUILD_GUI)
-  list(APPEND ParaView_deps ${qt_pkg})
-endif()
-
-if(CDAT_BUILD_PARALLEL)
-  list(APPEND ParaView_deps "${mpi_pkg}")
-endif()
-
-if(NOT CDAT_BUILD_LEAN)
-  list(APPEND ParaView_deps "${ffmpeg_pkg}")
-endif()
-
-if(CDAT_BUILD_OFFSCREEN)
-  list(APPEND ParaView_deps "${osmesa_pkg}")
-endif()
diff --git a/CMake/cdat_modules/paraview_external.cmake b/CMake/cdat_modules/paraview_external.cmake
deleted file mode 100644
index 5c20dbc2a..000000000
--- a/CMake/cdat_modules/paraview_external.cmake
+++ /dev/null
@@ -1,262 +0,0 @@
-set(ParaView_source "${CMAKE_CURRENT_BINARY_DIR}/build/ParaView")
-set(ParaView_binary "${CMAKE_CURRENT_BINARY_DIR}/build/ParaView-build")
-set(ParaView_install "${cdat_EXTERNALS}")
-
-if(QT_QMAKE_EXECUTABLE)
-  get_filename_component(QT_BINARY_DIR ${QT_QMAKE_EXECUTABLE} PATH)
-  get_filename_component(QT_ROOT ${QT_BINARY_DIR} PATH)
-endif()
-
-if(APPLE)
-  set(MACOSX_APP_INSTALL_PREFIX "${SB_EXTERNALS_DIR}") 
-endif()
-
-# Initialize
-set(ParaView_tpl_args)
-
-# VCS needs projections from GeoVis
-list(APPEND ParaView_tpl_args
-  -DModule_vtkViewsGeovis:BOOL=ON
-)
-list(APPEND ParaView_tpl_args
-  -DModule_vtklibproj4:BOOL=ON
-)
-
-# We would like to see CGM as well
-list(APPEND ParaView_tpl_args
-  -DModule_vtkIOCGM:BOOL=ON
-  )
-
-if(NOT CDAT_BUILD_LEAN)
-  list(APPEND ParaView_tpl_args -DPARAVIEW_ENABLE_FFMPEG:BOOL=ON)
-endif()
-
-if (CDAT_BUILD_PARALLEL)
-  list(APPEND ParaView_tpl_args
-    -DPARAVIEW_USE_MPI:BOOL=ON)
-  # Mac has issues with MPI4PY of ParaView. Also I don't know if we really need to build it
-  # See this bug: paraview.org/bug/view.php?id=13587
-  list(APPEND ParaView_tpl_args -DENABLE_MPI4PY:BOOL=OFF)
-
-  if(CDAT_BUILD_MPI)
-    if(UNIX)
-      set(ENV{LD_LIBRARY_PATH} "${cdat_EXTERNALS}/lib:$ENV{LD_LIBRARY_PATH}")
-    elseif(APPLE)
-      set(ENV{DYLD_FALLBACK_LIBRARY_PATH} "${cdat_EXTERNALS}/lib:$ENV{DYLD_FALLBACK_LIBRARY_PATH}")
-    endif()
-    list(APPEND ParaView_tpl_args
-      -DMPIEXEC:FILEPATH=${cdat_EXTERNALS}/bin/mpiexec
-      -DMPI_CXX_COMPILER:FILEPATH=${cdat_EXTERNALS}/bin/mpicxx
-      -DMPI_C_COMPILER:FILEPATH=${cdat_EXTERNALS}/bin/mpicc
-      -DMPI_C_INCLUDE_PATH:PATH=${cdat_EXTERNALS}/include
-      -DMPI_CXX_INCLUDE_PATH:PATH=${cdat_EXTERNALS}/include
-      -DMACOSX_APP_INSTALL_PREFIX:PATH=${MACOSX_APP_INSTALL_PREFIX}
-      -DVTK_MPIRUN_EXE:FILEPATH=${cdat_EXTERNALS}/bin/mpiexec)
-  endif()
-endif()
-
-set(_vtk_modules "vtkRenderingImage;vtkRenderingVolume;vtkRenderingLabel;vtkRenderingFreeType;vtkRenderingFreeTypeOpenGL;vtkRenderingVolumeOpenGL;vtkRenderingCore;vtkRenderingOpenGL;vtkGeovisCore;vtkViewsCore;vtkViewsGeovis;vtkInteractionImage;vtkInteractionStyle;vtkInteractionWidgets;vtkCommonTransforms;vtkCommonCore;vtkCommonComputationalGeometry;vtkCommonExecutionModel;vtkCommonSystem;vtkCommonMisc;vtkFiltersFlowPaths;vtkFiltersStatistics;vtkFiltersAMR;vtkFiltersGeneric;vtkFiltersSources;vtkFiltersModeling;vtkFiltersExtraction;vtkFiltersSelection;vtkFiltersSMP;vtkFiltersCore;vtkFiltersHybrid;vtkFiltersTexture;vtkFiltersGeneral;vtkFiltersImaging;vtkFiltersGeometry;vtkIOImage;vtkIOCore;vtkIOExport;vtkIOImport;vtkIOGeometry;vtkImagingColor;vtkImagingSources;vtkImagingCore;vtkImagingGeneral;vtkImagingMath")
-
-if(NOT CDAT_BUILD_LEAN)
-  list(APPEND _vtk_modules "vtkIOFFMPEG")
-endif()
-# Either we use cdat zlib and libxml or system zlib and libxml
-list(APPEND ParaView_tpl_args
-  -DVTK_USE_SYSTEM_ZLIB:BOOL=ON
-  -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON
-  -DVTK_USE_SYSTEM_HDF5:BOOL=ON
-  -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON
-  -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON
-)
-
-# Turn off testing and other non essential featues
-list(APPEND ParaView_tpl_args
-  -DBUILD_TESTING:BOOL=OFF
-  -DPARAVIEW_BUILD_PLUGIN_MobileRemoteControl:BOOL=OFF
-  -DPQWIDGETS_DISABLE_QTWEBKIT:BOOL=ON
-  -DModule_vtkIOGeoJSON:BOOL=ON
-  -DCMAKE_PREFIX_PATH:PATH=${cdat_EXTERNALS}
-)
-
-# Use cdat zlib
-#if(NOT CDAT_USE_SYSTEM_ZLIB)
-#  list(APPEND ParaView_tpl_args
-#    -DZLIB_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include
-#    -DZLIB_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
-#  )
-#endif()
-
-# Use cdat libxml
-#if(NOT CDAT_USE_SYSTEM_LIBXML2)
-#  list(APPEND ParaView_tpl_args
-#    -DLIBXML2_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include/libxml2
-#    -DLIBXML2_LIBRARIES:FILEPATH=${cdat_EXTERNALS}/lib/libxml2${_LINK_LIBRARY_SUFFIX}
-#    -DLIBXML2_XMLLINT_EXECUTABLE:FILEPATH=${cdat_EXTERNALS}/bin/xmllint
-#  )
-#endif()
-
-# Use cdat hdf5
-if(NOT CDAT_USE_SYSTEM_HDF5)
-  list(APPEND ParaView_tpl_args
-    -DHDF5_DIR:PATH=${cdat_EXTERNALS}/
-    -DHDF5_C_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include
-    -DHDF5_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include
-    -DHDF5_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libhdf5${_LINK_LIBRARY_SUFFIX}
-    -DHDF5_hdf5_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libhdf5${_LINK_LIBRARY_SUFFIX}
-    -DHDF5_hdf5_LIBRARY_RELEASE:FILEPATH=${cdat_EXTERNALS}/lib/libhdf5${_LINK_LIBRARY_SUFFIX}
-  )
-
-#  if(NOT CDAT_USE_SYSTEM_ZLIB)
-#    list(APPEND ParaView_tpl_args
-#      -DHDF5_z_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
-#      -DHDF5_z_LIBRARY_RELEASE:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
-#    )
-#  endif()
-endif()
-
-# Check if should build GUI
-if(CDAT_BUILD_GUI)
-  list(APPEND ParaView_tpl_args
-    -DPARAVIEW_BUILD_QT_GUI:BOOL=ON
-    -DVTK_QT_USE_WEBKIT:BOOL=OFF
-    -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
-    -DQT_QTUITOOLS_INCLUDE_DIR:PATH=${QT_ROOT}/include/QtUiTools
-    -DQT_BINARY_DIR:FILEPATH=${QT_BINARY_DIR})
-else()
-  list(APPEND ParaView_tpl_args
-    -DPARAVIEW_BUILD_QT_GUI:BOOL=OFF)
-endif()
-
-# Check if using R then only enable R support
-if (CDAT_BUILD_R OR CDAT_USE_SYSTEM_R)
-  list(APPEND ParaView_tpl_args
-    -DPARAVIEW_USE_GNU_R:BOOL=ON
-    -DR_COMMAND:PATH=${R_install}/bin/R
-    -DR_DIR:PATH=${R_install}/lib/R
-    -DR_INCLUDE_DIR:PATH=${R_install}/lib/R/include
-    -DR_LIBRARY_BASE:PATH=${R_install}/lib/R/lib/libR${_LINK_LIBRARY_SUFFIX}
-    -DR_LIBRARY_BLAS:PATH=${R_install}/lib/R/lib/libRblas${_LINK_LIBRARY_SUFFIX}
-    -DR_LIBRARY_LAPACK:PATH=${R_install}/lib/R/lib/libRlapack${_LINK_LIBRARY_SUFFIX}
-    -DR_LIBRARY_READLINE:PATH=)
-endif()
-
-if(UVCDAT_TESTDATA_LOCATION)
-  list(APPEND ParaView_tpl_args
-    -DUVCDAT_TestData:PATH=${UVCDAT_TESTDATA_LOCATION})
-endif()
-
-if(CDAT_BUILD_OFFSCREEN)
-  list(APPEND ParaView_tpl_args
-    "-DVTK_USE_X:BOOL=OFF"
-    "-DVTK_OPENGL_HAS_OSMESA:BOOL=ON"
-    "-DOPENGL_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include"
-    "-DOPENGL_gl_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libOSMesa${_LINK_LIBRARY_SUFFIX}"
-    "-DOPENGL_glu_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libGLU${_LINK_LIBRARY_SUFFIX}"
-    "-DOSMESA_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include"
-    "-DOSMESA_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libOSMesa${_LINK_LIBRARY_SUFFIX}"
-  )
-endif()
-
-include(GetGitRevisionDescription)
-set(paraview_branch ${PARAVIEW_BRANCH})
-
-get_git_head_revision(refspec sha)
-#if("${refspec}" STREQUAL "refs/heads/devel-master")
-#  set(paraview_branch uvcdat-next)
-#endif()
-
-string(REPLACE "//" "" GIT_PROTOCOL_PREFIX ${GIT_PROTOCOL})
-
-if (${GIT_PROTOCOL} STREQUAL "git://")
-  set(REPLACE_GIT_PROTOCOL_PREFIX "http:")
-else()
-  set(REPLACE_GIT_PROTOCOL_PREFIX "git:")
-endif()
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/paraview_download.sh.in
-  ${cdat_CMAKE_BINARY_DIR}/paraview_download.sh @ONLY
-  )
-
-if (NOT OFFLINE_BUILD)
-    set(DOWNLOAD_CMD_STR  DOWNLOAD_COMMAND ${cdat_CMAKE_BINARY_DIR}/paraview_download.sh)
-else ()
-    set(DOWNLOAD_CMD_STR)
-endif()
-
-set(_vtk_module_options)
-foreach(_module ${_vtk_modules})
-  list(APPEND _vtk_module_options "-DModule_${_module}:BOOL=ON")
-endforeach()
-ExternalProject_Add(ParaView
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${ParaView_source}
-  BINARY_DIR ${ParaView_binary}
-  INSTALL_DIR ${ParaView_install}
-  ${DOWNLOAD_CMD_STR}
-  GIT_TAG ${paraview_branch}
-  UPDATE_COMMAND ""
-  PATCH_COMMAND ""
-  CMAKE_CACHE_ARGS
-    -DBUILD_SHARED_LIBS:BOOL=ON
-    -DBUILD_TESTING:BOOL=${BUILD_TESTING}
-    -DCMAKE_BUILD_TYPE:STRING=${CMAKE_CFG_INTDIR}
-    -DCMAKE_CXX_FLAGS:STRING=${cdat_tpl_cxx_flags}
-    -DCMAKE_C_FLAGS:STRING=${cdat_tpl_c_flags}
-#    -DPARAVIEW_BUILD_AS_APPLICATION_BUNDLE:BOOL=OFF
-#    -DPARAVIEW_DISABLE_VTK_TESTING:BOOL=ON
-#    -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF
- #   -DPARAVIEW_TESTING_WITH_PYTHON:BOOL=OFF
-    -DINCLUDE_PYTHONHOME_PATHS:BOOL=OFF
-    ${cdat_compiler_args}
-    ${ParaView_tpl_args}
-    # Python
-    -DPARAVIEW_ENABLE_PYTHON:BOOL=ON
-    -DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE}
-    -DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE}
-    -DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY}
-    -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON
-    -DVTK_LEGACY_SILENT:BOOL=ON
-    ${_vtk_module_options}
-    -DPARAVIEW_DO_UNIX_STYLE_INSTALLS:BOOL=ON
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-  DEPENDS ${ParaView_deps}
-  ${ep_log_options}
-)
-
-# Install ParaView and VTK python modules via their setup.py files.
-
-#configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/vtk_install_python_module.cmake.in
-#  ${cdat_CMAKE_BINARY_DIR}/vtk_install_python_module.cmake
-#  @ONLY)
-
-#configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/paraview_install_python_module.cmake.in
-#  ${cdat_CMAKE_BINARY_DIR}/paraview_install_python_module.cmake
-#  @ONLY)
-
-#ExternalProject_Add_Step(ParaView InstallParaViewPythonModule
-#  COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/paraview_install_python_module.cmake
-#  DEPENDEES install
-#  WORKING_DIRECTORY ${cdat_CMAKE_BINARY_DIR}
-#  )
-
-#ExternalProject_Add_Step(ParaView InstallVTKPythonModule
-#  COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/vtk_install_python_module.cmake
-#  DEPENDEES install
-#  WORKING_DIRECTORY ${cdat_CMAKE_BINARY_DIR}
-#  )
-
-# symlinks of Externals/bin get placed in prefix/bin so we need to symlink paraview
-# libs into prefix/lib as well for pvserver to work.
-if(NOT EXISTS ${CMAKE_INSTALL_PREFIX}/lib)
-  message("making ${ParaView_install}/lib")
-  file(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib)
-endif()
-
-#ExternalProject_Add_Step(ParaView InstallParaViewLibSymlink
-#  COMMAND ${CMAKE_COMMAND} -E create_symlink ${ParaView_install}/lib/paraview-${PARAVIEW_MAJOR}.${PARAVIEW_MINOR} ${CMAKE_INSTALL_PREFIX}/lib/paraview-${PARAVIEW_MAJOR}.${PARAVIEW_MINOR}
-#  DEPENDEES install
-#  WORKING_DIRECTORY ${cdat_CMAKE_BINARY_DIR}
-#)
-unset(GIT_CMD_STR)
-
diff --git a/CMake/cdat_modules/paraview_pkg.cmake b/CMake/cdat_modules/paraview_pkg.cmake
deleted file mode 100644
index c5fe1743b..000000000
--- a/CMake/cdat_modules/paraview_pkg.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-set(PARAVIEW_MAJOR 4)
-set(PARAVIEW_MINOR 1)
-set(PARAVIEW_PATCH 0)
-set(PARAVIEW_VERSION ${PARAVIEW_MAJOR}.${PARAVIEW_MINOR}.${PARAVIEW_PATCH})
-set(PARAVIEW_URL ${LLNL_URL})
-set(PARAVIEW_GZ ParaView-${PARAVIEW_VERSION}c.tar.gz)
-set(PARAVIEW_MD5)
-set(PARAVIEW_BRANCH uvcdat-master)
-set(PARAVIEW_SOURCE ${GIT_PROTOCOL}github.com/UV-CDAT/ParaView.git )
-
-add_cdat_package_dependent(ParaView "" "" ON "CDAT_BUILD_GRAPHICS" OFF)
diff --git a/CMake/cdat_modules/pbmplus_external.cmake b/CMake/cdat_modules/pbmplus_external.cmake
deleted file mode 100644
index 03743c74c..000000000
--- a/CMake/cdat_modules/pbmplus_external.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-
-set(pbmplus_source "${CMAKE_CURRENT_BINARY_DIR}/build/pbmplus")
-set(pbmplus_install "${cdat_EXTERNALS}")
-
-#cp ../../exsrc/src/pbmplus/pbmplus.h . ; cp ../../exsrc/src/pbmplus/libpbm1.c pbm  ;cp ../../exsrc/src/pbmplus/Makefile .
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/pbmplus_configure_step.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/pbmplus_configure_step.cmake
-    @ONLY)
-
-ExternalProject_Add(pbmplus
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${pbmplus_source}
-  INSTALL_DIR ${pbmplus_install}
-  URL ${PBMPLUS_URL}/${PBMPLUS_GZ}
-  URL_MD5 ${PBMPLUS_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${cdat_external_patch_dir}/src/pbmplus/libpbm1.c ${pbmplus_source}/pbm/
-  BUILD_COMMAND ${CMAKE_COMMAND} -Dmake=$(MAKE) -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/pbmplus_configure_step.cmake
-  DEPENDS ${pbmplus_deps}
-  ${ep_log_options}
-)
-
-ExternalProject_Add_Step(pbmplus CopyPbmplusHeader
-  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${cdat_external_patch_dir}/src/pbmplus/pbmplus.h ${pbmplus_source}/
-  DEPENDEES patch
-  DEPENDERS configure
-  )
-
-#pbmplus install fails if this directory doesnt already exist.
-file(MAKE_DIRECTORY ${pbmplus_install}/man/mann)
diff --git a/CMake/cdat_modules/pep8_deps.cmake b/CMake/cdat_modules/pep8_deps.cmake
deleted file mode 100644
index e57f7cf7e..000000000
--- a/CMake/cdat_modules/pep8_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(pep8_deps ${python_pkg} ${setuptools_pkg})
diff --git a/CMake/cdat_modules/pep8_external.cmake b/CMake/cdat_modules/pep8_external.cmake
deleted file mode 100644
index c6dc541c7..000000000
--- a/CMake/cdat_modules/pep8_external.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-# The pep8 project
-
-set(pep8_binary "${CMAKE_CURRENT_BINARY_DIR}/build/pep8")
-
-ExternalProject_Add(pep8
-  DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}
-  SOURCE_DIR ${pep8_binary}
-  URL ${PEP8_SOURCE}
-  URL_MD5 ${PEP8_MD5}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ${PYTHON_EXECUTABLE} setup.py build
-  INSTALL_COMMAND ${PYTHON_EXECUTABLE} setup.py install ${PYTHON_EXTRA_PREFIX}
-  DEPENDS ${pep8_deps}
-  ${ep_log_options}
-  )
diff --git a/CMake/cdat_modules/pep8_pkg.cmake b/CMake/cdat_modules/pep8_pkg.cmake
deleted file mode 100644
index 723e4b8d3..000000000
--- a/CMake/cdat_modules/pep8_pkg.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-set( PEP8_MAJOR 1 )
-set( PEP8_MINOR 5 )
-set( PEP8_PATCH 7)
-set( PEP8_VERSION ${PEP8_MAJOR}.${PEP8_MINOR}.${PEP8_PATCH} )
-set( PEP8_URL ${LLNL_URL} )
-set( PEP8_GZ pep8-${PEP8_VERSION}.tar.gz )
-set( PEP8_MD5 f6adbdd69365ecca20513c709f9b7c93 )
-
-set (nm PEP8)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR}.${${nm}_MINOR}.${${nm}_PATCH})
-set(PEP8_SOURCE ${PEP8_URL}/${PEP8_GZ})
-
-if (BUILD_TESTING)
-  add_cdat_package(pep8 "" "" ON)
-endif()
diff --git a/CMake/cdat_modules/pip_deps.cmake b/CMake/cdat_modules/pip_deps.cmake
deleted file mode 100644
index 35c1383e5..000000000
--- a/CMake/cdat_modules/pip_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(pip_deps  ${setuptools_pkg})
diff --git a/CMake/cdat_modules/pip_external.cmake b/CMake/cdat_modules/pip_external.cmake
deleted file mode 100644
index 4c21cd6d3..000000000
--- a/CMake/cdat_modules/pip_external.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-# create an external project to install MyProxyClient,
-# and configure and build it
-set(nm pip)
-
-# create an external project to install MyProxyClient,
-# and configure and build it
-
-include(${cdat_CMAKE_BINARY_DIR}/cdat_common_environment.cmake)
-string(TOUPPER ${nm} uc_nm)
-
-ExternalProject_Add(${nm}
-    DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-    URL ${${uc_nm}_SOURCE}
-    URL_MD5 ${${uc_nm}_MD5} 
-    BUILD_IN_SOURCE 1
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ""
-    INSTALL_COMMAND ${EASY_INSTALL_BINARY} ${CDAT_PACKAGE_CACHE_DIR}/${${uc_nm}_GZ}
-    DEPENDS ${${nm}_deps}
-    ${ep_log_options}
-    )
diff --git a/CMake/cdat_modules/pip_pkg.cmake b/CMake/cdat_modules/pip_pkg.cmake
deleted file mode 100644
index 7e442f2f2..000000000
--- a/CMake/cdat_modules/pip_pkg.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-set(PIP_MAJOR_SRC 7)
-set(PIP_MINOR_SRC 1)
-set(PIP_PATCH_SRC 2)
-
-set (nm PIP)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-set(PIP_URL ${LLNL_URL})
-set(PIP_GZ pip-${PIP_VERSION}.tar.gz)
-set(PIP_SOURCE ${PIP_URL}/${PIP_GZ})
-set(PIP_MD5 3823d2343d9f3aaab21cf9c917710196)
-
-add_cdat_package(pip "" "" OFF)
diff --git a/CMake/cdat_modules/pixman_deps.cmake b/CMake/cdat_modules/pixman_deps.cmake
deleted file mode 100644
index 276a88585..000000000
--- a/CMake/cdat_modules/pixman_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(pixman_deps ${pkgconfig_pkg} ${zlib_pkg} ${freetype_pkg})
diff --git a/CMake/cdat_modules/pixman_external.cmake b/CMake/cdat_modules/pixman_external.cmake
deleted file mode 100644
index bd043c7a0..000000000
--- a/CMake/cdat_modules/pixman_external.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-
-set(pixman_source "${CMAKE_CURRENT_BINARY_DIR}/build/pixman")
-set(pixman_install "${cdat_EXTERNALS}")
-set(pixman_configure_args "--disable-gtk")
-
-ExternalProject_Add(pixman
-  LIST_SEPARATOR ^^
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${pixman_source}
-  INSTALL_DIR ${pixman_install}
-  URL ${PIX_URL}/${PIX_GZ}
-  URL_MD5 ${PIX_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCONFIGURE_ARGS=${pixman_configure_args} -DINSTALL_DIR=${pixman_install} -DWORKING_DIR=${pixman_source} -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  DEPENDS ${pixman_deps}
-  ${ep_log_options}
-)
-
-set(pixman_DIR "${pixman_binary}" CACHE PATH "pixman binary directory" FORCE)
-mark_as_advanced(pixman_DIR)
diff --git a/CMake/cdat_modules/pixman_pkg.cmake b/CMake/cdat_modules/pixman_pkg.cmake
deleted file mode 100644
index 10590199f..000000000
--- a/CMake/cdat_modules/pixman_pkg.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-set(PIX_MAJOR 0)
-set(PIX_MINOR 22)
-set(PIX_PATCH 2)
-set(PIX_MAJOR_SRC 0)
-set(PIX_MINOR_SRC 30)
-set(PIX_PATCH_SRC 0)
-set(PIX_URL ${LLNL_URL})
-set(PIX_GZ pixman-${PIX_MAJOR_SRC}.${PIX_MINOR_SRC}.${PIX_PATCH_SRC}.tar.gz)
-set(PIX_MD5 ae7ac97921dfa59086ca2231621a79c7 )
-
-
-set (nm PIX)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-set(PIXMAN_VERSION ${PIX_VERSION})
-set(PIXMAN_SOURCE ${PIX_URL}/${PIX_GZ})
-set(PIXMAN_MD5 ${PIX_MD5})
-
-add_cdat_package_dependent(pixman "" "" OFF "CDAT_BUILD_GRAPHICS" OFF)
diff --git a/CMake/cdat_modules/pkgconfig_deps.cmake b/CMake/cdat_modules/pkgconfig_deps.cmake
deleted file mode 100644
index 106cfb074..000000000
--- a/CMake/cdat_modules/pkgconfig_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(pkgconfig_deps ${wget_pkg})
diff --git a/CMake/cdat_modules/pkgconfig_external.cmake b/CMake/cdat_modules/pkgconfig_external.cmake
deleted file mode 100644
index 2b8bd158b..000000000
--- a/CMake/cdat_modules/pkgconfig_external.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-
-set(pkgconfig_source "${CMAKE_CURRENT_BINARY_DIR}/build/pkgconfig")
-set(pkgconfig_install "${cdat_EXTERNALS}")
-set(pkgconfig_config_args "--with-internal-glib")
-
-ExternalProject_Add(pkgconfig
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  URL ${PKG_URL}/${PKG_GZ}
-  URL_MD5 ${PKG_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  SOURCE_DIR ${pkgconfig_source}
-  INSTALL_DIR ${pkgconfig_install}
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCONFIGURE_ARGS=${pkgconfig_config_args} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  DEPENDS ${pkgconfig_deps}
-  ${ep_log_options}
-)
-
diff --git a/CMake/cdat_modules/pkgconfig_pkg.cmake b/CMake/cdat_modules/pkgconfig_pkg.cmake
deleted file mode 100644
index ca3927731..000000000
--- a/CMake/cdat_modules/pkgconfig_pkg.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-set(PKG_MAJOR 0)
-set(PKG_MINOR 9)
-set(PKG_PATCH 0)
-set(PKG_MAJOR_SRC 0)
-set(PKG_MINOR_SRC 28)
-set(PKG_PATCH_SRC 0)
-set(PKG_VERSION ${PKG_MAJOR_SRC}.${PKG_MINOR_SRC}.${PKG_PATCH_SRC})
-set(PKG_URL ${LLNL_URL})
-set(PKG_GZ pkg-config-${PKG_MAJOR_SRC}.${PKG_MINOR_SRC}.tar.gz)
-set(PKG_MD5 aa3c86e67551adc3ac865160e34a2a0d)
-set(PKGCONFIG_VERSION ${PKG_VERSION})
-set(PKGCONFIG_SOURCE ${PKG_URL}/${PKG_GZ})
-
-add_cdat_package(pkgconfig "" "" OFF)
-
-if(NOT CDAT_USE_SYSTEM_PKGCONFIG)
-  set(cdat_PKG_CONFIG_EXECUTABLE ${cdat_EXTERNALS}/bin/pkg-config)
-  set(ENV{PKG_CONFIG} "${cdat_PKG_CONFIG_EXECUTABLE}")
-  set(ENV{PKG_CONFIG_PATH} "${cdat_EXTERNALS}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}")
-  set(ENV{PKG_CONFIG} ${cdat_PKG_CONFIG_EXECUTABLE})
-endif()
-
diff --git a/CMake/cdat_modules/pmw_deps.cmake b/CMake/cdat_modules/pmw_deps.cmake
deleted file mode 100644
index 8e1435b25..000000000
--- a/CMake/cdat_modules/pmw_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(Pmw_deps ${pkgconfig_pkg} ${python_pkg})
diff --git a/CMake/cdat_modules/pmw_external.cmake b/CMake/cdat_modules/pmw_external.cmake
deleted file mode 100644
index 202ed810e..000000000
--- a/CMake/cdat_modules/pmw_external.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-
-set(Pmw_source "${CMAKE_CURRENT_BINARY_DIR}/build/Pmw")
-set(Pmw_install "${cdat_EXTERNALS}")
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/pmw_make_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/pmw_make_step.cmake
-  @ONLY)
-  
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/pmw_install_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/pmw_install_step.cmake
-  @ONLY)
-
-set(Pmw_build_command ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/pmw_make_step.cmake)
-set(Pmw_install_command ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/pmw_install_step.cmake)
-
-ExternalProject_Add(Pmw
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${Pmw_source}
-  INSTALL_DIR ${Pmw_install}
-  URL ${PMW_URL}/${PMW_GZ}
-  URL_MD5 ${PMW_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ${Pmw_build_command}
-  INSTALL_COMMAND ${Pmw_install_command}
-  DEPENDS ${Pmw_deps}
-  ${ep_log_options}
-)
-
diff --git a/CMake/cdat_modules/pmw_pkg.cmake b/CMake/cdat_modules/pmw_pkg.cmake
deleted file mode 100644
index f0a0031b5..000000000
--- a/CMake/cdat_modules/pmw_pkg.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-set(PMW_MAJOR 1)
-set(PMW_MINOR 3)
-set(PMW_MAJOR_SRC 1)
-set(PMW_MINOR_SRC 3)
-set(PMW_PATCH_SRC 2)
-set(PMW_URL ${LLNL_URL})
-set(PMW_GZ Pmw.${PMW_MAJOR_SRC}.${PMW_MINOR_SRC}.${PMW_PATCH_SRC}.tar.gz)
-set(PMW_MD5 7f30886fe9885ab3cf85dac6ce1fbda5)
-set(PMW_SOURCE ${PMW_URL}/${PMW_GZ})
-
-
-set (nm PMW)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-if (CDAT_BUILD_LEAN)
-    add_cdat_package_dependent(Pmw "" "" OFF "CDAT_BUILD_GUI" OFF)
-else()
-    add_cdat_package(Pmw "" "" OFF)
-endif()
diff --git a/CMake/cdat_modules/pnetcdf_deps.cmake b/CMake/cdat_modules/pnetcdf_deps.cmake
deleted file mode 100644
index 9b1966cce..000000000
--- a/CMake/cdat_modules/pnetcdf_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(PNETCDF_deps ${pkgconfig_pkg} ${mpi_pkg})
diff --git a/CMake/cdat_modules/pnetcdf_external.cmake b/CMake/cdat_modules/pnetcdf_external.cmake
deleted file mode 100644
index 431348b85..000000000
--- a/CMake/cdat_modules/pnetcdf_external.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-set(pnetcdf_source "${CMAKE_CURRENT_BINARY_DIR}/build/pnetcdf")
-set(pnetcdf_install "${cdat_EXTERNALS}")
-set(pnetcdf_configure_args "--with-mpi=${cdat_EXTERNALS}")
-set(pnetcdf_additional_cflags "-fPIC")
-
-ExternalProject_Add(PNETCDF
-  LIST_SEPARATOR ^^
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${pnetcdf_source}
-  INSTALL_DIR ${pnetcdf_install}
-  URL ${PNETCDF_URL}/${PNETCDF_GZ}
-  URL_MD5 ${PNETCDF_MD5}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DADDITIONAL_CFLAGS=${pnetcdf_additional_cflags} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -D CONFIGURE_ARGS=${pnetcdf_configure_args} -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  DEPENDS ${PNETCDF_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/pnetcdf_pkg.cmake b/CMake/cdat_modules/pnetcdf_pkg.cmake
deleted file mode 100644
index 02cf48e19..000000000
--- a/CMake/cdat_modules/pnetcdf_pkg.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-set(PNETCDF_MAJOR_SRC 1)
-set(PNETCDF_MINOR_SRC 6)
-set(PNETCDF_PATCH_SRC 0)
-set(PNETCDF_URL ${LLNL_URL})
-set(PNETCDF_GZ parallel-netcdf-${PNETCDF_MAJOR_SRC}.${PNETCDF_MINOR_SRC}.${PNETCDF_PATCH_SRC}.tar.gz)
-set(PNETCDF_MD5 4893a50ddcd487a312c64383bdeb2631)
-
-set (nm PNETCDF)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-set(PNETCDF_SOURCE ${PNETCDF_URL}/${PNETCDF_GZ})
-
-add_cdat_package(PNETCDF "" "" OFF)
diff --git a/CMake/cdat_modules/png_deps.cmake b/CMake/cdat_modules/png_deps.cmake
deleted file mode 100644
index 43bad1a48..000000000
--- a/CMake/cdat_modules/png_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(png_deps ${pkgconfig_pkg} ${zlib_pkg})
diff --git a/CMake/cdat_modules/png_external.cmake b/CMake/cdat_modules/png_external.cmake
deleted file mode 100644
index 3ba0b81a6..000000000
--- a/CMake/cdat_modules/png_external.cmake
+++ /dev/null
@@ -1,45 +0,0 @@
-# If Windows we use CMake otherwise ./configure
-if(WIN32)
-
-  set(png_source "${CMAKE_CURRENT_BINARY_DIR}/png")
-  set(png_binary "${CMAKE_CURRENT_BINARY_DIR}/png-build")
-  set(png_install "${cdat_EXTERNALS}")
-
-  ExternalProject_Add(png
-  URL ${PNG_URL}/${PNG_GZ}
-  URL_MD5 ${PNG_MD5}
-  UPDATE_COMMAND ""
-  SOURCE_DIR ${png_source}
-  BINARY_DIR ${png_binary}
-  CMAKE_CACHE_ARGS
-    -DCMAKE_CXX_FLAGS:STRING=${pv_tpl_cxx_flags}
-    -DCMAKE_C_FLAGS:STRING=${pv_tpl_c_flags}
-    -DCMAKE_BUILD_TYPE:STRING=${CMAKE_CFG_INTDIR}
-    ${pv_tpl_compiler_args}
-    -DZLIB_INCLUDE_DIR:STRING=${ZLIB_INCLUDE_DIR}
-    -DZLIB_LIBRARY:STRING=${ZLIB_LIBRARY}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-  DEPENDS ${png_dependencies}
-  ${ep_log_options}
-  )
-
-else()
-
-  set(png_source "${CMAKE_CURRENT_BINARY_DIR}/build/png")
-  set(png_install "${cdat_EXTERNALS}")
-
-  ExternalProject_Add(png
-    DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-    SOURCE_DIR ${png_source}
-    INSTALL_DIR ${png_install}
-    URL ${PNG_URL}/${PNG_GZ}
-    URL_MD5 ${PNG_MD5}
-    BUILD_IN_SOURCE 1
-    PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${cdat_external_patch_dir}/src/png/pngconf.h ${png_source}/pngconf.h
-    CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-    DEPENDS ${png_deps}
-    ${ep_log_options}
-  )
-
-endif()
diff --git a/CMake/cdat_modules/png_pkg.cmake b/CMake/cdat_modules/png_pkg.cmake
deleted file mode 100644
index 5a9f1e1f4..000000000
--- a/CMake/cdat_modules/png_pkg.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-set(PNG_MAJOR 1)
-set(PNG_MINOR 4)
-set(PNG_PATCH 1)
-set(PNG_MAJOR_SRC 1)
-set(PNG_MINOR_SRC 5)
-set(PNG_PATCH_SRC 1)
-set(PNG_VERSION ${PNG_MAJOR_SRC}.${PNG_MINOR_SRC}.${PNG_PATCH_SRC})
-set(PNG_URL ${LLNL_URL})
-set(PNG_GZ libpng-${PNG_VERSION}.tar.gz)
-set(PNG_MD5 220035f111ea045a51e290906025e8b5)
-set(PNG_SOURCE ${PNG_URL}/${PNG_GZ})
-
-# Turns out grib2 (therefore cdms2 needs it so dont turn this off
-add_cdat_package(png "" "" ON)
diff --git a/CMake/cdat_modules/proj4_deps.cmake b/CMake/cdat_modules/proj4_deps.cmake
deleted file mode 100644
index ec110453c..000000000
--- a/CMake/cdat_modules/proj4_deps.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-set(proj4_deps ${pkgconfig_pkg})
-if (CDAT_BUILD_PARALLEL)
-      list(APPEND proj4_deps ${mpi_pkg})
-endif()
diff --git a/CMake/cdat_modules/proj4_external.cmake b/CMake/cdat_modules/proj4_external.cmake
deleted file mode 100644
index 9bd122f5b..000000000
--- a/CMake/cdat_modules/proj4_external.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-set(proj4_source "${CMAKE_CURRENT_BINARY_DIR}/build/proj4")
-set(proj4_install "${cdat_EXTERNALS}/proj4")
-set(proj4_configure_args "")
-
-ExternalProject_Add(proj4
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${proj4_source}
-  INSTALL_DIR ${proj4_install}
-  BUILD_IN_SOURCE 1
-  URL ${PROJ4_SOURCE}
-  URL_MD5 ${PROJ4_MD5}
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -DCONFIGURE_ARGS=${proj4_configure_args} -P ${cdat_CMAKE_BINARY_DIR}/${configure_file}
-  BUILD_COMMAND ${CMAKE_COMMAND} -Dmake=$(MAKE) -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
-  INSTALL_COMMAND ${CMAKE_COMMAND} -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_install_step.cmake
-  DEPENDS ${proj4_deps}
-  ${ep_log_options}
-)
-if (DEFINED GIT_CMD_STR_PROJ4)
-  unset(GIT_CMD_STR_PROJ4)
-endif()
diff --git a/CMake/cdat_modules/proj4_pkg.cmake b/CMake/cdat_modules/proj4_pkg.cmake
deleted file mode 100644
index 8bf542f52..000000000
--- a/CMake/cdat_modules/proj4_pkg.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-set(PROJ4_URL ${LLNL_URL})
-set(PROJ4_MAJOR_SRC 4)
-set(PROJ4_MINOR_SRC 9)
-set(PROJ4_PATCH_SRC 2)
-set(PROJ4_GZ proj.4-${PROJ4_MAJOR_SRC}.${PROJ4_MINOR_SRC}.${PROJ4_PATCH_SRC}.tar.gz)
-set(PROJ4_SOURCE ${PROJ4_URL}/${PROJ4_GZ})
-set(PROJ4_MD5 a6059d05592948d5f205ba432e359bd7)
-if (CDAT_BUILD_ALL)
-  add_cdat_package(proj4 "" "" ON)
-else()
-  add_cdat_package_dependent(proj4 "" "" ON "CDAT_BUILD_PROJ4" OFF)
-endif()
diff --git a/CMake/cdat_modules/pyasn1_deps.cmake b/CMake/cdat_modules/pyasn1_deps.cmake
deleted file mode 100644
index bf438928f..000000000
--- a/CMake/cdat_modules/pyasn1_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(PYASN1_deps ${pip_pkg} ${python_pkg} ${setuptools_pkg})
diff --git a/CMake/cdat_modules/pyasn1_external.cmake b/CMake/cdat_modules/pyasn1_external.cmake
deleted file mode 100644
index dd35ee111..000000000
--- a/CMake/cdat_modules/pyasn1_external.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-
-# create an external project to install MyProxyClient,
-# and configure and build it
-set(nm PYASN1)
-
-# Set LDFlags and CFlags to make it easier to find OpenSSL
-list(APPEND USR_ENVS
-  "LDFLAGS=-L${OPENSSL_LIBRARY_DIR} $ENV{LDFLAGS}"
-  "CFLAGS=-I${OPENSSL_INCLUDE_DIR} $ENV{CFLAGS}"
-  )
-
-include(pipinstaller)
diff --git a/CMake/cdat_modules/pyasn1_pkg.cmake b/CMake/cdat_modules/pyasn1_pkg.cmake
deleted file mode 100644
index ff69f7c51..000000000
--- a/CMake/cdat_modules/pyasn1_pkg.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(PYASN1_MAJOR_SRC 0)
-set(PYASN1_MINOR_SRC 1)
-set(PYASN1_PATCH_SRC 9)
-
-set(PYASN1_VERSION ${PYASN1_MAJOR_SRC}.${PYASN1_MINOR_SRC}.${PYASN1_PATCH_SRC})
-set(PYASN1_GZ pyasn1-${PYASN1_VERSION}.tar.gz)
-set(PYASN1_SOURCE ${LLNL_URL}/${PYASN1_GZ})
-set(PYASN1_MD5 f00a02a631d4016818659d1cc38d229a)
-
-add_cdat_package_dependent(PYASN1 "" "" OFF "CDAT_BUILD_LEAN" OFF)
diff --git a/CMake/cdat_modules/pyclimate_deps.cmake b/CMake/cdat_modules/pyclimate_deps.cmake
deleted file mode 100644
index ee5768752..000000000
--- a/CMake/cdat_modules/pyclimate_deps.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-set(pyclimate_deps ${numpy_pkg} ${pip_pkg})
-
diff --git a/CMake/cdat_modules/pyclimate_external.cmake b/CMake/cdat_modules/pyclimate_external.cmake
deleted file mode 100644
index 4fe52288f..000000000
--- a/CMake/cdat_modules/pyclimate_external.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-# create an external project to install PyClimate
-# and configure and build it
-set(nm pyclimate)
-set(OLD OFF)
-include(pipinstaller)
-unset(OLD)
diff --git a/CMake/cdat_modules/pyclimate_pkg.cmake b/CMake/cdat_modules/pyclimate_pkg.cmake
deleted file mode 100644
index e151f3cff..000000000
--- a/CMake/cdat_modules/pyclimate_pkg.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-set(PYCLIMATE_VERSION 1.2.3)
-set(PYCLIMATE_URL ${LLNL_URL})
-set(PYCLIMATE_GZ PyClimate-${PYCLIMATE_VERSION}.tar.gz)
-set(PYCLIMATE_SOURCE ${PYCLIMATE_URL}/${PYCLIMATE_GZ})
-set(PYCLIMATE_MD5 094ffd0adedc3ede24736e0c0ff1699f)
-
-if (CDAT_BUILD_ALL)
-  add_cdat_package(pyclimate "" "" ON)
-else()
-  add_cdat_package(pyclimate "" "" OFF)
-endif()
diff --git a/CMake/cdat_modules/pycparser_deps.cmake b/CMake/cdat_modules/pycparser_deps.cmake
deleted file mode 100644
index 3efd2d4ee..000000000
--- a/CMake/cdat_modules/pycparser_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(PYCPARSER_deps ${python_pkg} ${pip_pkg})
diff --git a/CMake/cdat_modules/pycparser_external.cmake b/CMake/cdat_modules/pycparser_external.cmake
deleted file mode 100644
index f9b317f4f..000000000
--- a/CMake/cdat_modules/pycparser_external.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-
-# create an external project to install MyProxyClient,
-# and configure and build it
-set(nm PYCPARSER)
-
-include(pipinstaller)
diff --git a/CMake/cdat_modules/pycparser_pkg.cmake b/CMake/cdat_modules/pycparser_pkg.cmake
deleted file mode 100644
index 873a293dd..000000000
--- a/CMake/cdat_modules/pycparser_pkg.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(PYCPARSER_MAJOR_SRC 2)
-set(PYCPARSER_MINOR_SRC 13)
-set(PYCPARSER_PATCH_SRC )
-
-set(PYCPARSER_VERSION ${PYCPARSER_MAJOR_SRC}.${PYCPARSER_MINOR_SRC})
-set(PYCPARSER_GZ pycparser-${PYCPARSER_VERSION}.tar.gz)
-set(PYCPARSER_SOURCE ${LLNL_URL}/${PYCPARSER_GZ})
-set(PYCPARSER_MD5 e4fe1a2d341b22e25da0d22f034ef32f )
-
-add_cdat_package_dependent(PYCPARSER "" "" ON "CDAT_BUILD_LEAN" OFF)
diff --git a/CMake/cdat_modules/pyflakes_deps.cmake b/CMake/cdat_modules/pyflakes_deps.cmake
deleted file mode 100644
index 14a40726d..000000000
--- a/CMake/cdat_modules/pyflakes_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(pyflakes_deps ${python_pkg} ${setuptools_pkg})
diff --git a/CMake/cdat_modules/pyflakes_external.cmake b/CMake/cdat_modules/pyflakes_external.cmake
deleted file mode 100644
index 40a4774f7..000000000
--- a/CMake/cdat_modules/pyflakes_external.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-ExternalProject_Add(pyflakes
-  DOWNLOAD_DIR "${CMAKE_CURRENT_BINARY_DIR}"
-  SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/build/pyflakes"
-  URL "${PYFLAKES_SOURCE}"
-  URL_MD5 ${PYFLAKES_MD5}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND "${PYTHON_EXECUTABLE}" setup.py build
-  INSTALL_COMMAND "${PYTHON_EXECUTABLE}" setup.py install "${PYTHON_EXTRA_PREFIX}"
-  DEPENDS ${pyflakes_deps}
-  ${ep_log_options}
-  )
diff --git a/CMake/cdat_modules/pyflakes_pkg.cmake b/CMake/cdat_modules/pyflakes_pkg.cmake
deleted file mode 100644
index a83f881c7..000000000
--- a/CMake/cdat_modules/pyflakes_pkg.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-set(nm pyflakes)
-string(TOUPPER ${nm} uc_nm)
-
-set(${uc_nm}_MAJOR 0)
-set(${uc_nm}_MINOR 8)
-set(${uc_nm}_PATCH 1)
-set(${uc_nm}_VERSION ${${uc_nm}_MAJOR}.${${uc_nm}_MINOR}.${${uc_nm}_PATCH})
-set(${uc_nm}_URL ${LLNL_URL})
-set(${uc_nm}_GZ ${nm}-${${uc_nm}_VERSION}.tar.gz)
-set(${uc_nm}_MD5 905fe91ad14b912807e8fdc2ac2e2c23 )
-
-set(${uc_nm}_VERSION ${${uc_nm}_MAJOR}.${${uc_nm}_MINOR}.${${uc_nm}_PATCH})
-set(${uc_nm}_SOURCE ${${uc_nm}_URL}/${${uc_nm}_GZ})
-
-if(BUILD_TESTING)
-  add_cdat_package(${nm} "" "" ON)
-endif()
diff --git a/CMake/cdat_modules/pygments_deps.cmake b/CMake/cdat_modules/pygments_deps.cmake
deleted file mode 100644
index 8da947cd9..000000000
--- a/CMake/cdat_modules/pygments_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(pygments_deps ${pip_pkg} ${lepl_pkg})
diff --git a/CMake/cdat_modules/pygments_external.cmake b/CMake/cdat_modules/pygments_external.cmake
deleted file mode 100644
index 225a8b160..000000000
--- a/CMake/cdat_modules/pygments_external.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-
-# create an external project to install MyProxyClient,
-# and configure and build it
-set(nm pygments)
-
-include(pipinstaller)
diff --git a/CMake/cdat_modules/pygments_pkg.cmake b/CMake/cdat_modules/pygments_pkg.cmake
deleted file mode 100644
index 7bd13b2b5..000000000
--- a/CMake/cdat_modules/pygments_pkg.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-set(pygments_MAJOR_SRC 1)
-set(pygments_MINOR_SRC 6)
-set(pygments_PATCH_SRC )
-set(PYGMENTS_VERSION ${pygments_MAJOR_SRC}.${pygments_MINOR_SRC})
-set(PYGMENTS_GZ Pygments-${PYGMENTS_VERSION}.tar.gz)
-set(PYGMENTS_SOURCE ${LLNL_URL}/${PYGMENTS_GZ})
-set(PYGMENTS_MD5 a18feedf6ffd0b0cc8c8b0fbdb2027b1  )
-
-add_cdat_package_dependent(pygments "" "" OFF "CDAT_BUILD_GUI" OFF)
diff --git a/CMake/cdat_modules/pylibxml2_deps.cmake b/CMake/cdat_modules/pylibxml2_deps.cmake
deleted file mode 100644
index 8ff91e246..000000000
--- a/CMake/cdat_modules/pylibxml2_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(PYLIBXML2_deps ${pkgconfig_pkg} ${python_pkg} ${libxml2_pkg} ${libxslt_pkg})
diff --git a/CMake/cdat_modules/pylibxml2_external.cmake b/CMake/cdat_modules/pylibxml2_external.cmake
deleted file mode 100644
index f3d77fd17..000000000
--- a/CMake/cdat_modules/pylibxml2_external.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-
-set(libXML2_source "${CMAKE_CURRENT_BINARY_DIR}/build/libXML2")
-set(libXML2_install "${cdat_EXTERNALS}")
-
-ExternalProject_Add(PYLIBXML2
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${libXML2_source}
-  INSTALL_DIR ${libXML2_install}
-  URL ${XML_URL}/${XML_GZ}
-  URL_MD5 ${XML_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  DEPENDS ${PYLIBXML2_deps}
-  ${ep_log_options}
-)
-
diff --git a/CMake/cdat_modules/pylibxml2_pkg.cmake b/CMake/cdat_modules/pylibxml2_pkg.cmake
deleted file mode 100644
index e374227f7..000000000
--- a/CMake/cdat_modules/pylibxml2_pkg.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-set(PYLIBXML2_MAJOR 2)
-set(PYLIBXML2_MINOR 7)
-set(PYLIBXML2_PATCH 8)
-set(PYLIBXML2_MAJOR_SRC 2)
-set(PYLIBXML2_MINOR_SRC 7)
-set(PYLIBXML2_PATCH_SRC 8)
-set(PYLIBXML2_URL ${LLNL_URL})
-set(PYLIBXML2_GZ libxml2-${PYLIBXML2_MAJOR_SRC}.${PYLIBXML2_MINOR_SRC}.${PYLIBXML2_PATCH_SRC}.tar.gz)
-set(PYLIBXML2_MD5 8127a65e8c3b08856093099b52599c86)
-set(PYLIBXML2_SOURCE ${PYLIBXML2_URL}/${PYLIBXML2_GZ})
-
-set (nm PYLIBXML2)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-add_cdat_package(PYLIBXML2 "" "" OFF)
diff --git a/CMake/cdat_modules/pynetcdf4_deps.cmake b/CMake/cdat_modules/pynetcdf4_deps.cmake
deleted file mode 100644
index 176f1cd99..000000000
--- a/CMake/cdat_modules/pynetcdf4_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(pynetcdf4_deps ${pkgconfig_pkg} ${pip_pkg} ${python_pkg} ${netcdf_pkg} ${numpy_pkg})
diff --git a/CMake/cdat_modules/pynetcdf4_external.cmake b/CMake/cdat_modules/pynetcdf4_external.cmake
deleted file mode 100644
index f430b9e16..000000000
--- a/CMake/cdat_modules/pynetcdf4_external.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-# create an external project to install pynetcdf
-# and configure and build it
-
-# pynetcdf4
-#
-set(pynetcdf4_source "${CMAKE_CURRENT_BINARY_DIR}/build/pynetcdf4")
-
-ExternalProject_Add(pynetcdf4
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${pynetcdf4_source}
-  URL ${PYNETCDF4_URL}/${PYNETCDF4_GZ}
-  URL_MD5 ${PYNETCDF4_MD5}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND env "NETCDF4_DIR=${cdat_EXTERNALS}" "PYTHONPATH=$ENV{PYTHONPATH}" ${PYTHON_EXECUTABLE} setup.py build
-  INSTALL_COMMAND env "NETCDF4_DIR=${cdat_EXTERNALS}" "PYTHONPATH=$ENV{PYTHONPATH}" "${PYTHON_EXECUTABLE}" setup.py install "${PYTHON_EXTRA_PREFIX}"
-  DEPENDS ${pynetcdf4_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/pynetcdf4_pkg.cmake b/CMake/cdat_modules/pynetcdf4_pkg.cmake
deleted file mode 100644
index ebefb167b..000000000
--- a/CMake/cdat_modules/pynetcdf4_pkg.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-set( PYNETCDF4_MAJOR_SRC 1  )
-set( PYNETCDF4_MINOR_SRC 1 )
-set( PYNETCDF4_PATCH_SRC 9  )
-set(PYNETCDF4_URL ${LLNL_URL})
-set(PYNETCDF4_GZ
-  netCDF4-${PYNETCDF4_MAJOR_SRC}.${PYNETCDF4_MINOR_SRC}.${PYNETCDF4_PATCH_SRC}.tar.gz)
-set(PYNETCDF4_MD5 4ee7399e547f8b906e89da5529fa5ef4)
-set(PYNETCDF4_SOURCE ${PYNETCDF4_URL}/${PYNETCDF4_GZ})
-
-set (nm pynetcdf4)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-add_cdat_package(pynetcdf4 "" "" ON)
diff --git a/CMake/cdat_modules/pyopengl_external.cmake b/CMake/cdat_modules/pyopengl_external.cmake
deleted file mode 100644
index daf68bf40..000000000
--- a/CMake/cdat_modules/pyopengl_external.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-
-set(PyOpenGL_source "${CMAKE_CURRENT_BINARY_DIR}/PyOpenGL")
-set(PyOpenGL_install "${cdat_EXTERNALS}")
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/pyopengl_make_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/pyopengl_make_step.cmake
-  @ONLY)
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/pyopengl_install_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/pyopengl_install_step.cmake
-  @ONLY)
-
-set(PyOpenGL_build_command ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/pyopengl_make_step.cmake)
-set(PyOpenGL_install_command ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/pyopengl_install_step.cmake)
-
-ExternalProject_Add(PyOpenGL
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${PyOpenGL_source}
-  URL ${PYOPENGL_URL}/${PYOPENGL_GZ}
-  URL_MD5 ${PYOPENGL_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ${PyOpenGL_build_command}
-  INSTALL_COMMAND ${PyOpenGL_install_command}
-  DEPENDS ${PyOpenGL_deps}
-  ${ep_log_options}
-)
-
diff --git a/CMake/cdat_modules/pyopenssl_deps.cmake b/CMake/cdat_modules/pyopenssl_deps.cmake
deleted file mode 100644
index 6ab54642e..000000000
--- a/CMake/cdat_modules/pyopenssl_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(PYOPENSSL_deps ${python_pkg} ${pip_pkg} ${six_pkg} ${cryptography_pkg} ${cffi_pkg} ${ffi_pkg} ${pycparser_pkg} )
diff --git a/CMake/cdat_modules/pyopenssl_external.cmake b/CMake/cdat_modules/pyopenssl_external.cmake
deleted file mode 100644
index c0ed4c238..000000000
--- a/CMake/cdat_modules/pyopenssl_external.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-
-# create an external project to install MyProxyClient,
-# and configure and build it
-set(nm PYOPENSSL)
-
-include(pipinstaller)
diff --git a/CMake/cdat_modules/pyopenssl_pkg.cmake b/CMake/cdat_modules/pyopenssl_pkg.cmake
deleted file mode 100644
index d9e4d4bc4..000000000
--- a/CMake/cdat_modules/pyopenssl_pkg.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(PYOPENSSL_MAJOR_SRC 0)
-set(PYOPENSSL_MINOR_SRC 14)
-set(PYOPENSSL_PATCH_SRC 0)
-
-set(PYOPENSSL_VERSION ${PYOPENSSL_MAJOR_SRC}.${PYOPENSSL_MINOR_SRC})
-set(PYOPENSSL_GZ pyOpenSSL-${PYOPENSSL_VERSION}.tar.gz)
-set(PYOPENSSL_SOURCE ${LLNL_URL}/${PYOPENSSL_GZ})
-set(PYOPENSSL_MD5 8579ff3a1d858858acfba5f046a4ddf7)
-
-add_cdat_package_dependent(PYOPENSSL "" "" OFF "CDAT_BUILD_LEAN" OFF)
diff --git a/CMake/cdat_modules/pyparsing_deps.cmake b/CMake/cdat_modules/pyparsing_deps.cmake
deleted file mode 100644
index 79eea7913..000000000
--- a/CMake/cdat_modules/pyparsing_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(PYPARSING_deps ${python_pkg} ${pip_pkg} ${dateutils_pkg} ${six_pkg})
diff --git a/CMake/cdat_modules/pyparsing_external.cmake b/CMake/cdat_modules/pyparsing_external.cmake
deleted file mode 100644
index b72862852..000000000
--- a/CMake/cdat_modules/pyparsing_external.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# create an external project to install MyProxyClient,
-# and configure and build it
-set(nm PYPARSING)
-set(OLD OFF)
-include(pipinstaller)
-unset(OLD)
diff --git a/CMake/cdat_modules/pyparsing_pkg.cmake b/CMake/cdat_modules/pyparsing_pkg.cmake
deleted file mode 100644
index 8c6e265e0..000000000
--- a/CMake/cdat_modules/pyparsing_pkg.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(PYPARSING_MAJOR_SRC 2)
-set(PYPARSING_MINOR_SRC 0)
-set(PYPARSING_PATCH_SRC 2)
-
-set(PYPARSING_VERSION ${PYPARSING_MAJOR_SRC}.${PYPARSING_MINOR_SRC}.${PYPARSING_PATCH_SRC})
-set(PYPARSING_GZ pyparsing-${PYPARSING_VERSION}.tar.gz)
-set(PYPARSING_SOURCE ${LLNL_URL}/${PYPARSING_GZ})
-set(PYPARSING_MD5 b170c5d153d190df1a536988d88e95c1)
-
-add_cdat_package_dependent(PYPARSING "" "" OFF "NOT CDAT_BUILD_LEAN" OFF)
diff --git a/CMake/cdat_modules/pyqt_deps.cmake b/CMake/cdat_modules/pyqt_deps.cmake
deleted file mode 100644
index 023e6753a..000000000
--- a/CMake/cdat_modules/pyqt_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(PyQt_deps ${pkgconfig_pkg} ${qt_pkg} ${sip_pkg} ${python_pkg})
diff --git a/CMake/cdat_modules/pyqt_external.cmake b/CMake/cdat_modules/pyqt_external.cmake
deleted file mode 100644
index 5a00060e9..000000000
--- a/CMake/cdat_modules/pyqt_external.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-set(PyQt_source "${CMAKE_CURRENT_BINARY_DIR}/build/PyQt")
-set(PyQt_configure_command
-  env PYTHONPATH=${PYTHONPATH}
-  "${PYTHON_EXECUTABLE}" configure.py
-    -q "${QT_QMAKE_EXECUTABLE}"
-    --confirm-license
-    -b "${CMAKE_INSTALL_PREFIX}/bin"
-    -d "${PYTHON_SITE_PACKAGES}"
-    -v "${CMAKE_INSTALL_PREFIX}/include"
-    -v "${CMAKE_INSTALL_PREFIX}/share"
-    -p "${CMAKE_INSTALL_PREFIX}/share/plugins"
-    -n "${CMAKE_INSTALL_PREFIX}/share/qsci"
-    --assume-shared
-    -e QtGui -e QtHelp -e QtMultimedia -e QtNetwork -e QtDeclarative -e QtOpenGL
-    -e QtScript -e QtScriptTools -e QtSql -e QtSvg -e QtTest -e QtWebKit
-    -e QtXml -e QtXmlPatterns -e QtCore
-)
-
-ExternalProject_Add(PyQt
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${PyQt_source}
-  URL ${PYQT_URL}/${PYQT_GZ_${CMAKE_PLATFORM}}
-  URL_MD5 ${PYQT_MD5_${CMAKE_PLATFORM}}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ${PyQt_configure_command}
-  DEPENDS ${PyQt_deps}
-  ${ep_log_options}
-  )
diff --git a/CMake/cdat_modules/pyqt_pkg.cmake b/CMake/cdat_modules/pyqt_pkg.cmake
deleted file mode 100644
index a049bc728..000000000
--- a/CMake/cdat_modules/pyqt_pkg.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-set(PYQT_MAJOR 4)
-set(PYQT_MINOR 8)
-set(PYQT_PATCH 3)
-set(PYQT_MAJOR_SRC 4)
-set(PYQT_MINOR_SRC 11)
-set(PYQT_PATCH_SRC 3)
-set(PYQT_VERSION ${PYQT_MAJOR_SRC}.${PYQT_MINOR_SRC}.${PYQT_PATCH_SRC})
-set(PYQT_URL ${LLNL_URL})
-set(PYQT_GZ_APPLE PyQt-mac-gpl-${PYQT_VERSION}.tar.gz)
-set(PYQT_GZ_UNIX PyQt-x11-gpl-${PYQT_VERSION}.tar.gz)
-set(PYQT_MD5_APPLE 9bd050f1d0c91510ea8be9f41878144c )
-set(PYQT_MD5_UNIX 997c3e443165a89a559e0d96b061bf70 )
-set(PYQT_SOURCE ${PYQT_URL}/${PYQT_GZ_${CMAKE_PLATFORM}})
-set(PYQT_MD5 ${PYQT_MD5_${CMAKE_PLATFORM}})
-
-add_cdat_package_dependent(PyQt "" "" ON "CDAT_BUILD_GUI" OFF)
diff --git a/CMake/cdat_modules/pyspharm_deps.cmake b/CMake/cdat_modules/pyspharm_deps.cmake
deleted file mode 100644
index 181e0c271..000000000
--- a/CMake/cdat_modules/pyspharm_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(pyspharm_deps ${numpy_pkg})
diff --git a/CMake/cdat_modules/pyspharm_external.cmake b/CMake/cdat_modules/pyspharm_external.cmake
deleted file mode 100644
index 2c1de4f91..000000000
--- a/CMake/cdat_modules/pyspharm_external.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-
-# Pyspharm
-#
-set(pyspharm_source "${CMAKE_CURRENT_BINARY_DIR}/build/pyspharm")
-
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/pyspharm_patch_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/pyspharm_patch_step.cmake
-  @ONLY)
-  
-set(pyspharm_PATCH_COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/pyspharm_patch_step.cmake)
-
-ExternalProject_Add(pyspharm
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${pyspharm_source}
-  URL ${PYSPHARM_URL}/${PYSPHARM_GZ}
-  URL_MD5 ${PYSPHARM_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ${pyspharm_PATCH_COMMAND}
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND env LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH} PYTHONPATH=$ENV{PYTHONPATH} ${PYTHON_EXECUTABLE} setup.py build 
-  INSTALL_COMMAND env LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH} PYTHONPATH=$ENV{PYTHONPATH} ${PYTHON_EXECUTABLE} setup.py install --prefix=${PYTHON_SITE_PACKAGES_PREFIX}
-  DEPENDS ${pyspharm_deps}
-  ${ep_log_options}
-  )
diff --git a/CMake/cdat_modules/pyspharm_pkg.cmake b/CMake/cdat_modules/pyspharm_pkg.cmake
deleted file mode 100644
index c7e8eb166..000000000
--- a/CMake/cdat_modules/pyspharm_pkg.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-set(PYSPHARM_MAJOR 1)
-set(PYSPHARM_MINOR 0)
-set(PYSPHARM_PATCH 8)
-set(PYSPHARM_VERSION ${PYSPHARM_MAJOR}.${PYSPHARM_MINOR}.${PYSPHARM_PATCH})
-set(PYSPHARM_URL ${LLNL_URL})
-set(PYSPHARM_GZ pyspharm-${PYSPHARM_VERSION}.tar.gz)
-set(PYSPHARM_MD5 7b3a33dd3cbeaa4b8bf67ed5bd210931)
-set(PYSPHARM_SOURCE ${PYSPHARM_URL}/${PYSPHARM_GZ})
-
-add_cdat_package_dependent(pyspharm "" "" ${CDAT_BUILD_ALL}
-                           "NOT CDAT_BUILD_LEAN" OFF)
diff --git a/CMake/cdat_modules/pytables_deps.cmake b/CMake/cdat_modules/pytables_deps.cmake
deleted file mode 100644
index d44617773..000000000
--- a/CMake/cdat_modules/pytables_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(PyTables_deps ${pkgconfig_pkg} ${python_pkg} ${cython_pkg} ${numexpr_pkg} ${numpy_pkg} ${hdf5_pkg} ${libxml2_pkg} ${libxslt_pkg} ${zlib_pkg})
diff --git a/CMake/cdat_modules/pytables_external.cmake b/CMake/cdat_modules/pytables_external.cmake
deleted file mode 100644
index 42e7c6074..000000000
--- a/CMake/cdat_modules/pytables_external.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-include(${cdat_CMAKE_BINARY_DIR}/cdat_common_environment.cmake)
-
-# PyTables
-#
-set(PyTables_source "${CMAKE_CURRENT_BINARY_DIR}/build/PyTables")
-ExternalProject_Add(PyTables
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${PyTables_source}
-  URL ${PYTABLES_URL}/${PYTABLES_GZ}
-  URL_MD5 ${PYTABLES_MD5}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND env "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}" PYTHONPATH=$ENV{PYTHONPATH} ${PYTHON_EXECUTABLE} setup.py build --hdf5=${cdat_EXTERNALS}
-  INSTALL_COMMAND env "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}" PYTHONPATH=$ENV{PYTHONPATH} ${PYTHON_EXECUTABLE} setup.py install --hdf5=${cdat_EXTERNALS} ${PYTHON_EXTRA_PREFIX}
-  DEPENDS ${PyTables_deps}
-  ${ep_log_options}
-  )
diff --git a/CMake/cdat_modules/pytables_pkg.cmake b/CMake/cdat_modules/pytables_pkg.cmake
deleted file mode 100644
index 22faad22a..000000000
--- a/CMake/cdat_modules/pytables_pkg.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(PYTABLES_MAJOR 3)
-set(PYTABLES_MINOR 1)
-set(PYTABLES_PATCH 1)
-set(PYTABLES_VERSION ${PYTABLES_MAJOR}.${PYTABLES_MINOR}.${PYTABLES_PATCH})
-set(PYTABLES_URL ${LLNL_URL} )
-set(PYTABLES_GZ tables-${PYTABLES_VERSION}.tar.gz)
-set(PYTABLES_MD5 38d917f0c6dfb0bc28ce9ea0c3492524)
-set(PYTABLES_SOURCE ${PYTABLES_URL}/${PYTABLES_GZ})
-
-add_cdat_package_dependent(PyTables "" "" OFF "NOT CDAT_BUILD_LEAN" ${CDAT_BUILD_ALL})
diff --git a/CMake/cdat_modules/python_deps.cmake b/CMake/cdat_modules/python_deps.cmake
deleted file mode 100644
index 04864b10c..000000000
--- a/CMake/cdat_modules/python_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(Python_deps ${pkgconfig_pkg} ${readline_pkg} ${libxml2_pkg} ${libxslt_pkg} ${jpeg_pkg} ${png_pkg} ${tiff_pkg})
diff --git a/CMake/cdat_modules/python_external.cmake b/CMake/cdat_modules/python_external.cmake
deleted file mode 100644
index 0710a0663..000000000
--- a/CMake/cdat_modules/python_external.cmake
+++ /dev/null
@@ -1,66 +0,0 @@
-#-----------------------------------------------------------------------------
-set(proj Python)
-
-set(python_SOURCE_DIR ${cdat_BINARY_DIR}/build/Python)
-set(python_BUILD_IN_SOURCE 1)
-
-set(python_aqua_cdat no)
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/python_configure_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/python_configure_step.cmake
-  @ONLY)
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/python_make_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/python_make_step.cmake
-  @ONLY)
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/python_install_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/python_install_step.cmake
-  @ONLY)
-
-set(python_PATCH_COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/python_patch_step.cmake)
-
-if(APPLE)
-  set(python_CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/python_configure_step.cmake)
-  set(python_BUILD_COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/python_make_step.cmake)
-  set(python_INSTALL_COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/python_install_step.cmake)
-else()
-  set(python_CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/python_configure_step.cmake)
-  set(python_BUILD_COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/python_make_step.cmake)
-  set(python_INSTALL_COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/python_install_step.cmake)
-endif()
-
-ExternalProject_Add(${proj}
-  URL ${PYTHON_URL}/${PYTHON_GZ}
-  URL_MD5 ${PYTHON_MD5}
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${python_SOURCE_DIR}
-  BUILD_IN_SOURCE ${python_BUILD_IN_SOURCE}
-  UPDATE_COMMAND pwd
-  CONFIGURE_COMMAND ${python_CONFIGURE_COMMAND}
-  BUILD_COMMAND ${python_BUILD_COMMAND}
-  INSTALL_COMMAND ${python_INSTALL_COMMAND}
-  DEPENDS ${Python_deps}
-  ${ep_log_options}
-)
-
-#-----------------------------------------------------------------------------
-# Set PYTHON_INCLUDE and PYTHON_LIBRARY variables
-#
-set(PYTHON_SITE_PACKAGES ${CMAKE_INSTALL_PREFIX}/lib/python${PYVER}/site-packages)
-
-if(APPLE)
-  ExternalProject_Add_Step(${proj} change_plist_name
-    COMMAND ${CMAKE_INSTALL_PREFIX}/Library/Frameworks/Python.framework/Versions/${PYVER}/bin/python ${cdat_CMAKE_SOURCE_DIR}/fixName.py
-    DEPENDEES install
-  )
-  set(PYTHON_INCLUDE ${CMAKE_INSTALL_PREFIX}/Library/Frameworks/Python.framework/Versions/${PYVER}/Headers)
-  set(PYTHON_LIBRARY ${CMAKE_INSTALL_PREFIX}/Library/Frameworks/Python.framework/Versions/${PYVER}/Python)
-  set(PYTHON_LIBRARY_DIR ${CMAKE_INSTALL_PREFIX}/lib)
-  set(PYTHON_EXECUTABLE ${CMAKE_INSTALL_PREFIX}/bin/python)
-  #set(PYTHON_EXECUTABLE ${CMAKE_INSTALL_PREFIX}/Library/Frameworks/Python.framework/Versions/${PYTHON_MAJOR_SRC}.${PYTHON_MINOR_SRC}/bin/python)
-  set(PYTHON_SITE_PACKAGES ${CMAKE_INSTALL_PREFIX}/Library/Frameworks/Python.framework/Versions/${PYVER}/lib/python${PYVER}/site-packages)
-else()
-  set(PYTHON_INCLUDE ${CMAKE_INSTALL_PREFIX}/include/python${PYVER})
-  set(PYTHON_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/libpython${PYVER}.so)
-endif()
diff --git a/CMake/cdat_modules/python_pkg.cmake b/CMake/cdat_modules/python_pkg.cmake
deleted file mode 100644
index 36c97d702..000000000
--- a/CMake/cdat_modules/python_pkg.cmake
+++ /dev/null
@@ -1,59 +0,0 @@
-set(PYTHON_MAJOR_SRC 2)
-set(PYTHON_MINOR_SRC 7)
-set(PYTHON_PATCH_SRC 11)
-set(PYTHON_VERSION ${PYTHON_MAJOR_SRC}.${PYTHON_MINOR_SRC}.${PYTHON_PATCH_SRC})
-set(PYTHON_URL ${LLNL_URL})
-set(PYTHON_GZ Python-${PYTHON_VERSION}.tgz)
-set(PYTHON_MD5 6b6076ec9e93f05dd63e47eb9c15728b )
-set(PYVER ${PYTHON_MAJOR_SRC}.${PYTHON_MINOR_SRC})
-set(PYTHON_SOURCE ${PYTHON_URL}/${PYTHON_GZ})
-
-add_cdat_package(Python ${PYTHON_MAJOR_SRC}.${PYTHON_MINOR_SRC}.${PYTHON_PATCH_SRC} "" "")
-
-# FIXME: Name style
-set(CDAT_OS_XTRA_PATH "")
-
-set(PYTHON_SITE_PACKAGES_PREFIX ${CMAKE_INSTALL_PREFIX})
-if (APPLE)
-  set(PYTHON_SITE_PACKAGES_PREFIX ${CMAKE_INSTALL_PREFIX}/Library/Frameworks/Python.framework/Versions/${PYVER})
-endif()
-set(PYTHON_SITE_PACKAGES ${PYTHON_SITE_PACKAGES_PREFIX}/lib/python${PYVER}/site-packages)
-set(PYTHONPATH ${PYTHON_SITE_PACKAGES})
-
-if (CDAT_USE_SYSTEM_PYTHON)
-   find_package(PythonInterp)
-   set(PYVER ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
-   # \NOTE This is required or else FindPythonLibs may find whatever version is
-   # listed first internally and if that version exists on the system. For example
-   # a system might have python version 2.6 and 2.7 both installed.
-   set(Python_ADDITIONAL_VERSIONS ${PYVER})
-   find_package(PythonLibs)
-   set(PYTHON_SITE_PACKAGES ${CMAKE_INSTALL_PREFIX}/lib/python${PYVER}/site-packages)
-   message("[INFO] Using system python ${PYTHON_EXECUTABLE}")
-   message("[INFO] Putting packages in directory ${PYTHON_SITE_PACKAGES}")
-   set(PYTHON_EXTRA_PREFIX "--prefix=${CMAKE_INSTALL_PREFIX}")
-   message("[INFO] Setting up prefix for installing python packages into: ${PYTHON_EXTRA_PREFIX}")
-   set(ENV{LD_LIBRARY_PATH} $ENV{LD_LIBRARY_PATH})
-   set(PYTHONPATH "${PYTHON_SITE_PACKAGES}:$ENV{PYTHONPATH}")
-   set(ENV{PYTHONPATH} "${PYTHONPATH}")
-   message("[INFO] Set PYTHONPATH to $ENV{PYTHONPATH}")
-   get_filename_component(PYTHON_EXECUTABLE_PATH ${PYTHON_EXECUTABLE} PATH)
-   set(PYTHON_LIBRARY ${PYTHON_LIBRARIES})
-   message("[INFO] set PYTHON_LIBRARY TO" ${PYTHON_LIBRARY})
-   set(PYTHON_INCLUDE ${PYTHON_INCLUDE_DIRS})
-   if(APPLE)
-     set(CDAT_OS_XTRA_PATH ${CMAKE_INSTALL_PREFIX}/Library/Frameworks/Python.framework/Versions/${PYVER}/bin)
-   endif()
-else ()
-   set(PYTHON_EXECUTABLE ${CMAKE_INSTALL_PREFIX}/bin/python)
-   message("[INFO] Building python at ${PYTHON_EXECUTABLE}")
-   set(PYTHON_EXTRA_PREFIX "")
-   set(PYVER 2.7)
-   if (NOT APPLE)
-     set(EASY_INSTALL_BINARY ${CMAKE_INSTALL_PREFIX}/bin/easy_install)
-     set(PIP_BINARY ${CMAKE_INSTALL_PREFIX}/bin/pip)
-   else ()
-     set(EASY_INSTALL_BINARY ${CMAKE_INSTALL_PREFIX}/Library/Frameworks/Python.framework/Versions/${PYVER}/bin/easy_install)
-     set(PIP_BINARY ${CMAKE_INSTALL_PREFIX}/Library/Frameworks/Python.framework/Versions/${PYVER}/bin/pip)
-   endif()
-endif()
diff --git a/CMake/cdat_modules/pyzmq_deps.cmake b/CMake/cdat_modules/pyzmq_deps.cmake
deleted file mode 100644
index 507fc1180..000000000
--- a/CMake/cdat_modules/pyzmq_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(pyzmq_deps ${zmq_pkg} ${cython_pkg})
diff --git a/CMake/cdat_modules/pyzmq_external.cmake b/CMake/cdat_modules/pyzmq_external.cmake
deleted file mode 100644
index e931ce77e..000000000
--- a/CMake/cdat_modules/pyzmq_external.cmake
+++ /dev/null
@@ -1,50 +0,0 @@
-# The pyzmq project 
-
-set(pyzmq_binary "${CMAKE_CURRENT_BINARY_DIR}/build/pyzmq")
-
-# python can run after it is built on linux
-configure_file(
-  ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/pyzmq_configure_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/pyzmq_configure_step.cmake @ONLY)
-
-configure_file(
-  ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/pyzmq_install_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/pyzmq_install_step.cmake @ONLY)
-
-set(pyzmq_CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/pyzmq_configure_step.cmake)
-set(pyzmq_INSTALL_COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/pyzmq_install_step.cmake)
-
-set(pyzmq_source "${CMAKE_CURRENT_BINARY_DIR}/build/pyzmq")
-
-# create an external project to download numpy,
-# and configure and build it
-ExternalProject_Add(pyzmq
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${pyzmq_source}
-  BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/build/pyzmq
-  URL ${PYZMQ_SOURCE}
-  URL_MD5 ${PYZMQ_MD5}
-  CONFIGURE_COMMAND ${pyzmq_CONFIGURE_COMMAND}
-  BUILD_COMMAND ""
-  UPDATE_COMMAND ""
-  INSTALL_COMMAND ${pyzmq_INSTALL_COMMAND}
-  DEPENDS
-    ${pyzmq_deps}
-  ${ep_log_options}
-  )
-
-# pyzmq
-#
-
-#ExternalProject_Add(pyzmq
-#  DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}
-#  SOURCE_DIR ${pyzmq_source}
-#  URL ${PYZMQ_URL}/${PYZMQ_GZ}
-#  URL_MD5 ${PYZMQ_MD5}
-#  BUILD_IN_SOURCE 1
-#  CONFIGURE_COMMAND ""
-#  BUILD_COMMAND ${PYTHON_EXECUTABLE} setup.py build
-#  INSTALL_COMMAND ${PYTHON_EXECUTABLE} setup.py install ${PYTHON_EXTRA_PREFIX}
-#  DEPENDS ${pyzmq_deps}
-#  ${ep_log_options}
-#  )
diff --git a/CMake/cdat_modules/pyzmq_pkg.cmake b/CMake/cdat_modules/pyzmq_pkg.cmake
deleted file mode 100644
index dd5f0fa46..000000000
--- a/CMake/cdat_modules/pyzmq_pkg.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-set(PYZMQ_VERSION 14.3.1)
-set(PYZMQ_URL ${LLNL_URL})
-set(PYZMQ_GZ pyzmq-${PYZMQ_VERSION}.tar.gz)
-set(PYZMQ_MD5 7196b4a6fbf98022f17ffa924be3d68d)
-set(PYZMQ_SOURCE ${PYZMQ_URL}/${PYZMQ_GZ})
-
-add_cdat_package(pyzmq "" "" OFF)
diff --git a/CMake/cdat_modules/qt4_deps.cmake b/CMake/cdat_modules/qt4_deps.cmake
deleted file mode 100644
index 8b1378917..000000000
--- a/CMake/cdat_modules/qt4_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/CMake/cdat_modules/qt4_pkg.cmake b/CMake/cdat_modules/qt4_pkg.cmake
deleted file mode 100644
index ee6057e89..000000000
--- a/CMake/cdat_modules/qt4_pkg.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-if (CDAT_BUILD_GRAPHICS)
-  find_package(Qt4 4.7.2 REQUIRED)
-
-  if (CDAT_BUILD_GUI)
-    if (NOT DEFINED QT_QTOPENGL_INCLUDE_DIR)
-      message(FATAL_ERROR "QT_QTOPENGL_INCLUDE_DIR is not set but required")
-    endif()
-  endif()
-endif()
-
diff --git a/CMake/cdat_modules/qt_external.cmake b/CMake/cdat_modules/qt_external.cmake
deleted file mode 100644
index 86085efc6..000000000
--- a/CMake/cdat_modules/qt_external.cmake
+++ /dev/null
@@ -1,66 +0,0 @@
-
-set(qt_source "${CMAKE_CURRENT_BINARY_DIR}/build/Qt")
-set(qt_install_dir "${cdat_EXTERNALS}")
-
-if(WIN32)
-  # if jom is in the path use it as it will be faster
-  find_program(JOM jom)
-  mark_as_advanced(JOM)
-  if(JOM)
-    set(qt_build_program "${JOM}")
-  else()
-    set(qt_build_program nmake)
-  endif()
-  set(qt_install_dir ${qt_source})
-  configure_file(${Titan_CMAKE_DIR}/win_config_qt.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/win_config_qt.cmake )
-  set(qt_configure ${CMAKE_COMMAND}
-    -P ${CMAKE_CURRENT_BINARY_DIR}/win_config_qt.cmake)
-  set(qt_build ${qt_build_program})
-  set(qt_install "")
-else()
-  set(qt_configure echo yes | sh configure --prefix=${qt_install_dir} -release
-    -nomake examples -nomake demos -no-audio-backend -no-multimedia 
-    -phonon -opensource)
-  if ("-m32" STREQUAL "${CMAKE_CXX_FLAGS}")
-    set(qt_configure echo yes | sh ./configure -release
-      -nomake examples -nomake demos -no-audio-backend -no-multimedia 
-      --prefix=${qt_install_dir} -opensource
-      -platform linux-g++-32)
-  endif ()
-  set(qt_build ${MAKE})
-  set(qt_install make install)
-  if(APPLE)
-    exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE
-        _gcc_version_info)
-    string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]"
-        _gcc_version "${_gcc_version_info}")
-    if(NOT _gcc_version)
-      string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0"
-        _gcc_version "${_gcc_version_info}")
-    endif()
-    if(${_gcc_version} VERSION_GREATER 4.2.0)
-      # Then Qt should be built 64 bit
-      message(STATUS "Building 64 bit Qt using cocoa.")
-      set(qt_configure ${qt_configure} -arch x86_64 -cocoa)
-    else()
-      # Then Qt should be built 32 bit
-      message(STATUS "Building 32 bit Qt using carbon.")
-      set(qt_configure ${qt_configure} -arch x86 -carbon)
-    endif()
-  endif()
-endif()
-
-ExternalProject_Add(Qt
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  URL ${QT_URL}/${QT_GZ}
-  URL_MD5 ${QT_MD5}
-  SOURCE_DIR ${qt_source}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ${qt_configure}
-  DEPENDS ${Qt_deps}
-  )
-
-set(QT_QMAKE_EXECUTABLE "${qt_install_dir}/bin/qmake"
-    CACHE FILEPATH "Path to qmake executable" FORCE)
-
diff --git a/CMake/cdat_modules/r_deps.cmake b/CMake/cdat_modules/r_deps.cmake
deleted file mode 100644
index a7016962f..000000000
--- a/CMake/cdat_modules/r_deps.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-set(R_deps ${readline_pkg})
-if (CDAT_BUILD_PARALLEL)
-  list(APPEND R_deps ${mpi_pkg})
-endif()
diff --git a/CMake/cdat_modules/r_external.cmake b/CMake/cdat_modules/r_external.cmake
deleted file mode 100644
index af1d2d311..000000000
--- a/CMake/cdat_modules/r_external.cmake
+++ /dev/null
@@ -1,51 +0,0 @@
-
-set(R_source "${CMAKE_CURRENT_BINARY_DIR}/build/R")
-set(R_install "${cdat_EXTERNALS}")
-if (APPLE)
-    message("[INFO] Building R without X support for MacOS")
-    set(WITHX "no")
-    set(WITH_AQUA "yes")
-else ()
-    set(WITHX "yes")
-    set(WITH_AQUA "no")
-endif()
-
-if (CDAT_BUILD_PARALLEL)
-  message([INFO] Enabling openmp for R)
-  set(R_OPENMP "--enable-openmp")
-else ()
-  message([INFO] Disabling openmp for R)
-  set(R_OPENMP "--disable-openmp")
-endif ()
-
-list(APPEND USR_ENVS
-  "CPPFLAGS=-I${cdat_EXTERNALS}/include $ENV{CPPFLAGS}"
-  "LDFLAGS=-L${cdat_EXTERNALS}/lib"
-  )
-ExternalProject_Add(R
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${R_source}
-  INSTALL_DIR ${R_install}
-  URL ${R_URL}/${R_GZ}
-  URL_MD5 ${R_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  DEPENDS ${R_deps}
-  CONFIGURE_COMMAND env ${USR_ENVS} <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> LIBnn=lib --without-jpeglib --disable-R-framework --enable-R-shlib ${R_OPENMP} --without-cairo --without-ICU --without-system-xz --with-aqua=${WITH_AQUA} --without-tcltk --with-x=${WITHX}
-  INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM}  install
-  ${ep_log_options}
-)
-if(APPLE)
-    #change id and then change dependencies.. 
-    ExternalProject_Add_Step(R InstallNameToolR 
-        COMMAND install_name_tool -id ${R_install}/lib/R/lib/libR.dylib ${R_install}/lib/R/lib/libR.dylib 
-        COMMAND install_name_tool -id ${R_install}/lib/R/lib/libRblas.dylib ${R_install}/lib/R/lib/libRblas.dylib 
-        COMMAND install_name_tool -id ${R_install}/lib/R/lib/libRlapack.dylib ${R_install}/lib/R/lib/libRlapack.dylib 
-        COMMAND install_name_tool -change libRblas.dylib ${R_install}/lib/R/lib/libRblas.dylib ${R_install}/lib/R/lib/libR.dylib 
-        COMMAND install_name_tool -change libR.dylib ${R_install}/lib/R/lib/libR.dylib -change libRblas.dylib ${R_install}/lib/R/lib/libRblas.dylib ${R_install}//lib/R/lib/libRlapack.dylib 
-        DEPENDEES install 
-        WORKING_DIRECTORY ${cdat_CMAKE_BINARY_DIR}) 
-endif(APPLE)
-
-set(R_DIR "${R_binary}" CACHE PATH "R binary directory" FORCE)
-mark_as_advanced(R_DIR)
diff --git a/CMake/cdat_modules/r_pkg.cmake b/CMake/cdat_modules/r_pkg.cmake
deleted file mode 100644
index 8f7e53eb4..000000000
--- a/CMake/cdat_modules/r_pkg.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-set(R_MAJOR_SRC 3)
-set(R_MINOR_SRC 2)
-set(R_PATCH_SRC 2)
-set(R_URL ${LLNL_URL})
-set(R_GZ R-${R_MAJOR_SRC}.${R_MINOR_SRC}.${R_PATCH_SRC}.tar.gz)
-set(R_MD5 57cef5c2e210a5454da1979562a10e5b)
-set(R_SOURCE ${R_URL}/${R_GZ})
-
-set (nm R)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-add_cdat_package_dependent(R "" "Build R" ${CDAT_BUILD_ALL}
-                           "CDAT_BUILD_GUI" OFF)
diff --git a/CMake/cdat_modules/readline_deps.cmake b/CMake/cdat_modules/readline_deps.cmake
deleted file mode 100644
index e347b6dfb..000000000
--- a/CMake/cdat_modules/readline_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(readline_deps ${pkgconfig_pkg} ${curses_pkg})
diff --git a/CMake/cdat_modules/readline_external.cmake b/CMake/cdat_modules/readline_external.cmake
deleted file mode 100644
index 212f96171..000000000
--- a/CMake/cdat_modules/readline_external.cmake
+++ /dev/null
@@ -1,31 +0,0 @@
-set(readline_source "${CMAKE_CURRENT_BINARY_DIR}/build/readline")
-set(readline_install "${cdat_EXTERNALS}")
-set(readline_conf_args)
-
-set(readline_conf_args "--with-curses;--disable-static;--enable-shared")
-# with -fPIC
-IF(UNIX AND NOT WIN32)
-  FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
-  IF(CMAKE_UNAME)
-    EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE CMAKE_SYSTEM_PROCESSOR)
-    SET(CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR} CACHE INTERNAL
-"processor type (i386 and x86_64)")
-    IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
-      set(readline_conf_args "CFLAGS=-fPIC" ${readline_conf_args})
-    ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
-  ENDIF(CMAKE_UNAME)
-ENDIF(UNIX AND NOT WIN32)
-
-ExternalProject_Add(readline
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${readline_source}
-  INSTALL_DIR ${readline_install}
-  URL ${READLINE_URL}/${READLINE_GZ}
-  URL_MD5 ${READLINE_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${cdat_external_patch_dir}/src/readline/shobj-conf ${readline_source}/support/shobj-conf
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCONFIGURE_ARGS=${readline_conf_args} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  DEPENDS ${readline_deps}
-  ${ep_log_options}
-)
-
diff --git a/CMake/cdat_modules/readline_pkg.cmake b/CMake/cdat_modules/readline_pkg.cmake
deleted file mode 100644
index 86eb2679c..000000000
--- a/CMake/cdat_modules/readline_pkg.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-set(RL_MAJOR 5)
-set(RL_MINOR 2)
-set(RL_MAJOR_SRC 6)
-set(RL_MINOR_SRC 2)
-set(READLINE_URL ${LLNL_URL})
-set(READLINE_GZ readline-${RL_MAJOR_SRC}.${RL_MINOR_SRC}.tar.gz)
-set(READLINE_MD5 67948acb2ca081f23359d0256e9a271c)
-set(READLINE_VERSION ${RL_MAJOR_SRC}.${RL_MINOR_SRC})
-set(READLINE_SOURCE ${READLINE_URL}/${READLINE_GZ})
-
-add_cdat_package(readline "" "" OFF)
diff --git a/CMake/cdat_modules/rpy2_deps.cmake b/CMake/cdat_modules/rpy2_deps.cmake
deleted file mode 100644
index 3c3d4d90c..000000000
--- a/CMake/cdat_modules/rpy2_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(RPY2_deps ${python_pkg} ${pip_pkg} ${r_pkg} ${six_pkg} ${singledispatch_pkg} ${windfield_pkg})
diff --git a/CMake/cdat_modules/rpy2_external.cmake b/CMake/cdat_modules/rpy2_external.cmake
deleted file mode 100644
index d408ae22c..000000000
--- a/CMake/cdat_modules/rpy2_external.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-# create an external project to install RPY2,
-# and configure and build it
-set(nm RPY2)
-
-# Set PATH and R_HOME to find R
-list(APPEND USR_ENVS
-  "R_HOME=${cdat_EXTERNALS}/lib/R"
-  "PATH=${cdat_EXTERNALS}/bin:$ENV{PATH}"
-  )
-
-include(pipinstaller)
diff --git a/CMake/cdat_modules/rpy2_pkg.cmake b/CMake/cdat_modules/rpy2_pkg.cmake
deleted file mode 100644
index 5447bd3fb..000000000
--- a/CMake/cdat_modules/rpy2_pkg.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-set(RPY2_MAJOR_SRC 2)
-set(RPY2_MINOR_SRC 6)
-set(RPY2_PATCH_SRC 0)
-
-set(RPY2_VERSION ${RPY2_MAJOR_SRC}.${RPY2_MINOR_SRC}.${RPY2_PATCH_SRC})
-set(RPY2_GZ rpy2-${RPY2_VERSION}.tar.gz)
-set(RPY2_SOURCE ${LLNL_URL}/${RPY2_GZ})
-set(RPY2_MD5 679898fbc832d4f05a5efcf1a7eb1a68)
-
-add_cdat_package_dependent(RPY2 "" "" ${CDAT_BUILD_ALL}
-                           "NOT CDAT_BUILD_LEAN" OFF)
diff --git a/CMake/cdat_modules/sampledata_deps.cmake b/CMake/cdat_modules/sampledata_deps.cmake
deleted file mode 100644
index 785ca373e..000000000
--- a/CMake/cdat_modules/sampledata_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(sampledata_deps ${cdat_pkg})
diff --git a/CMake/cdat_modules/sampledata_external.cmake b/CMake/cdat_modules/sampledata_external.cmake
deleted file mode 100644
index 7b9a7027f..000000000
--- a/CMake/cdat_modules/sampledata_external.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-if (CDAT_DOWNLOAD_SAMPLE_DATA)
-  message("[INFO] ------------------------------------------------------------------------------------------------------------------------------")
-  configure_file(
-    "${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/cdat_download_sample_data.cmake.in"
-    "${cdat_CMAKE_BINARY_DIR}/cdat_download_sample_data.cmake"
-    @ONLY
-    )
-  set(sampledata_cmd ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/cdat_download_sample_data.cmake)
-  ExternalProject_Add(sampledata
-    SOURCE_DIR ${cdat_SOURCE_DIR}/Packages/dat
-    CONFIGURE_COMMAND ${sampledata_cmd}
-    BUILD_COMMAND ""
-    INSTALL_COMMAND ""
-    DEPENDS ${sampledata_deps}
-    ${ep_log_options}
-    )
-endif()
diff --git a/CMake/cdat_modules/sampledata_pkg.cmake b/CMake/cdat_modules/sampledata_pkg.cmake
deleted file mode 100644
index 821414e96..000000000
--- a/CMake/cdat_modules/sampledata_pkg.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-
-add_cdat_package(sampledata "" "" ON)
diff --git a/CMake/cdat_modules/scientificpython_deps.cmake b/CMake/cdat_modules/scientificpython_deps.cmake
deleted file mode 100644
index 8116fccd0..000000000
--- a/CMake/cdat_modules/scientificpython_deps.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-set(scientificpython_deps ${numpy_pkg} ${netcdf_pkg} ${cdat_pkg} ${pip_pkg})
-
diff --git a/CMake/cdat_modules/scientificpython_external.cmake b/CMake/cdat_modules/scientificpython_external.cmake
deleted file mode 100644
index ecd5c2c9a..000000000
--- a/CMake/cdat_modules/scientificpython_external.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-# create an external project to install ScientificPython
-# and configure and build it
-set(nm scientificpython)
-
-include(pipinstaller)
diff --git a/CMake/cdat_modules/scientificpython_pkg.cmake b/CMake/cdat_modules/scientificpython_pkg.cmake
deleted file mode 100644
index 206cdd7ca..000000000
--- a/CMake/cdat_modules/scientificpython_pkg.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-set(SCIENTIFICPYTHON_VERSION 2.8)
-set(SCIENTIFICPYTHON_URL ${LLNL_URL})
-set(SCIENTIFICPYTHON_GZ ScientificPython-${SCIENTIFICPYTHON_VERSION}.tar.gz)
-set(SCIENTIFICPYTHON_SOURCE ${SCIENTIFICPYTHON_URL}/${SCIENTIFICPYTHON_GZ})
-set(SCIENTIFICPYTHON_MD5 b87dd2b2c4be6b5421d906d39bcc59a7 )
-
-add_cdat_package_dependent(scientificpython "" "" OFF "CDAT_BUILD_LEAN" OFF)
diff --git a/CMake/cdat_modules/scikits_deps.cmake b/CMake/cdat_modules/scikits_deps.cmake
deleted file mode 100644
index 858e900f7..000000000
--- a/CMake/cdat_modules/scikits_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(scikits_deps ${pip_pkg} ${scipy_pkg})
diff --git a/CMake/cdat_modules/scikits_external.cmake b/CMake/cdat_modules/scikits_external.cmake
deleted file mode 100644
index eeff0fa01..000000000
--- a/CMake/cdat_modules/scikits_external.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-# create an external project to install MyProxyClient,
-# and configure and build it
-set(nm scikits)
-
-include(pipinstaller)
diff --git a/CMake/cdat_modules/scikits_pkg.cmake b/CMake/cdat_modules/scikits_pkg.cmake
deleted file mode 100644
index 83d79a250..000000000
--- a/CMake/cdat_modules/scikits_pkg.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(SCIKITS_MAJOR_SRC 0)
-set(SCIKITS_MINOR_SRC 12)
-set(SCIKITS_URL ${LLNL_URL})
-set(SCIKITS_GZ scikit-learn-${SCIKITS_MAJOR_SRC}.${SCIKITS_MINOR_SRC}.tar.gz)
-set(SCIKITS_MD5 0e1f6c60b43a4f447bf363583c1fc204 )
-set(SCIKITS_VERSION ${SCIKITS_MAJOR_SRC}.${SCIKITS_MINOR_SRC})
-set(SCIKITS_SOURCE ${SCIKITS_URL}/${SCIKITS_GZ})
-
-
-add_cdat_package_dependent(scikits "" "" OFF "CDAT_BUILD_LEAN" OFF)
diff --git a/CMake/cdat_modules/scipy_deps.cmake b/CMake/cdat_modules/scipy_deps.cmake
deleted file mode 100644
index f7ca69d03..000000000
--- a/CMake/cdat_modules/scipy_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(SCIPY_deps ${numpy_pkg} ${cython_pkg})
diff --git a/CMake/cdat_modules/scipy_external.cmake b/CMake/cdat_modules/scipy_external.cmake
deleted file mode 100644
index ebd0ca9e7..000000000
--- a/CMake/cdat_modules/scipy_external.cmake
+++ /dev/null
@@ -1,42 +0,0 @@
-# The Scipy external project 
-
-set(SCIPY_binary "${CMAKE_CURRENT_BINARY_DIR}/build/SCIPY")
-
-# to configure scipy we run a cmake -P script
-# the script will create a site.cfg file
-# then run python setup.py config to verify setup
-configure_file(
-  ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/SCIPY_configure_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/SCIPY_configure_step.cmake @ONLY)
-# to build scipy we also run a cmake -P script.
-# the script will set LD_LIBRARY_PATH so that 
-# python can run after it is built on linux
-configure_file(
-  ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/SCIPY_make_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/SCIPY_make_step.cmake @ONLY)
-
-configure_file(
-  ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/SCIPY_install_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/SCIPY_install_step.cmake @ONLY)
-
-set(SCIPY_CONFIGURE_COMMAND ${CMAKE_COMMAND}
-    -DCONFIG_TYPE=${CMAKE_CFG_INTDIR} -DCDAT_USE_SYSTEM_LAPACK:STRING=${CDAT_USE_SYSTEM_LAPACK} -DLAPACK_LIBRARIES:STRING=${LAPACK_LIBRARIES} -DBLAS_LIBRARIES:STRING=${BLAS_LIBRARIES} -P ${cdat_CMAKE_BINARY_DIR}/SCIPY_configure_step.cmake)
-set(SCIPY_BUILD_COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/SCIPY_make_step.cmake)
-set(SCIPY_INSTALL_COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/SCIPY_install_step.cmake)
-
-# create an external project to download scipy,
-# and configure and build it
-ExternalProject_Add(SCIPY
-  URL ${SCIPY_URL}/${SCIPY_GZ}
-  URL_MD5 ${SCIPY_MD5}
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${SCIPY_binary}
-  BINARY_DIR ${SCIPY_binary}
-  CONFIGURE_COMMAND ${SCIPY_CONFIGURE_COMMAND}
-  BUILD_COMMAND ${SCIPY_BUILD_COMMAND}
-  UPDATE_COMMAND ""
-  INSTALL_COMMAND ${SCIPY_INSTALL_COMMAND}
-  DEPENDS
-    ${SCIPY_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/scipy_pkg.cmake b/CMake/cdat_modules/scipy_pkg.cmake
deleted file mode 100644
index e582aecb6..000000000
--- a/CMake/cdat_modules/scipy_pkg.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-set(SCIPY_MAJOR 0)
-set(SCIPY_MINOR 17)
-set(SCIPY_PATCH 0)
-set(SCIPY_MAJOR_SRC 0)
-set(SCIPY_MINOR_SRC 17)
-set(SCIPY_PATCH_SRC 0)
-set(SCIPY_URL ${LLNL_URL})
-set(SCIPY_GZ scipy-${SCIPY_MAJOR_SRC}.${SCIPY_MINOR_SRC}.${SCIPY_PATCH_SRC}.tar.gz)
-set(SCIPY_MD5 298ca04ade82814b17f5cd2d9d4c7b70)
-set(SCIPY_SOURCE ${SCIPY_URL}/${SCIPY_GZ})
-
-set (nm SCIPY)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-
-add_cdat_package_dependent(SCIPY "" "" OFF "CDAT_BUILD_LEAN" ON)
-#if (CDAT_BUILD_ALL)
-#  add_cdat_package(scipy "" "" ON)
-#else()
-#  add_cdat_package(scipy "" "" OFF)
-#endif()
diff --git a/CMake/cdat_modules/seawater_deps.cmake b/CMake/cdat_modules/seawater_deps.cmake
deleted file mode 100644
index d8ca10270..000000000
--- a/CMake/cdat_modules/seawater_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(seawater_deps ${python_pkg} ${numpy_pkg})
diff --git a/CMake/cdat_modules/seawater_external.cmake b/CMake/cdat_modules/seawater_external.cmake
deleted file mode 100644
index a92c31447..000000000
--- a/CMake/cdat_modules/seawater_external.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-# seawater
-#
-set(seawater_source_dir "${CMAKE_CURRENT_BINARY_DIR}/build/seawater")
-
-configure_file(
-  "${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/seawater_build_step.cmake.in"
-  "${cdat_CMAKE_BINARY_DIR}/seawater_build_step.cmake"
-  @ONLY
-)
-
-set(seawater_build_command ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/seawater_build_step.cmake)
-
-ExternalProject_Add(seawater
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${seawater_source_dir}
-  URL ${SEAWATER_URL}/${SEAWATER_GZ}
-  URL_MD5 ${SEAWATER_MD5}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ${seawater_build_command}
-  INSTALL_COMMAND ""
-  DEPENDS ${seawater_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/seawater_pkg.cmake b/CMake/cdat_modules/seawater_pkg.cmake
deleted file mode 100644
index 81bde3ba7..000000000
--- a/CMake/cdat_modules/seawater_pkg.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-set(SEAWATER_MAJOR 3)
-set(SEAWATER_MINOR 3)
-set(SEAWATER_PATCH 4)
-set(SEAWATER_VERSION ${SEAWATER_MAJOR}.${SEAWATER_MINOR}.${SEAWATER_PATCH})
-set(SEAWATER_URL ${LLNL_URL})
-set(SEAWATER_GZ python-seawater-${SEAWATER_VERSION}.tar.gz)
-set(SEAWATER_MD5 0932193350f42c055e7f523578ec1b7c)
-
-set (nm SEAWATER)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR}.${${nm}_MINOR}.${${nm}_PATCH})
-set(SEAWATER_SOURCE ${SEAWATER_URL}/${SEAWATER_GZ})
-
-if (CDAT_BUILD_ALL)
-  add_cdat_package(seawater "" "" ON)
-else()
-  add_cdat_package(seawater "" "" OFF)
-endif()
diff --git a/CMake/cdat_modules/setuptools_deps.cmake b/CMake/cdat_modules/setuptools_deps.cmake
deleted file mode 100644
index 9e3879e6b..000000000
--- a/CMake/cdat_modules/setuptools_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(setuptools_deps ${pkgconfig_pkg} ${python_pkg})
diff --git a/CMake/cdat_modules/setuptools_external.cmake b/CMake/cdat_modules/setuptools_external.cmake
deleted file mode 100644
index cbea071a4..000000000
--- a/CMake/cdat_modules/setuptools_external.cmake
+++ /dev/null
@@ -1,38 +0,0 @@
-set(setuptools_source "${CMAKE_CURRENT_BINARY_DIR}/build/setuptools")
-set(setuptools_install "${cdat_EXTERNALS}")
-
-# 2012-03-19 C. Doutriaux Commented this out seems to not be able to pick pythonpath and ldlibrarypath
-# Seems to be way too complicated for what's  really needed
-#configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/setuptools_make_step.cmake.in
-#  ${cdat_CMAKE_BINARY_DIR}/setuptools_make_step.cmake
-#  @ONLY)
-
-#configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/setuptools_install_step.cmake.in
-#  ${cdat_CMAKE_BINARY_DIR}/setuptools_install_step.cmake
-#  @ONLY)
-
-#set(setuptools_build_command ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/setuptools_make_step.cmake)
-#set(setuptools_install_command ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/setuptools_install_step.cmake)
-  
-
-# old cmnd
-#  BUILD_COMMAND 
-#  INSTALL_COMMAND ${setuptools_install_command}
-
-ExternalProject_Add(setuptools
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${setuptools_source}
-  INSTALL_DIR ${setuptools_install}
-  URL ${SETUPTOOLS_URL}/${SETUPTOOLS_GZ}
-  URL_MD5 ${SETUPTOOLS_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND env PYTHONPATH=$ENV{PYTHONPATH} LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH} ${PYTHON_EXECUTABLE} setup.py build
-  INSTALL_COMMAND env PYTHONPATH=$ENV{PYTHONPATH} LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH} ${PYTHON_EXECUTABLE} setup.py install ${PYTHON_EXTRA_PREFIX}
-  DEPENDS ${setuptools_deps}
-  ${ep_log_options}
-)
-
-set(setuptools_DIR "${setuptools_binary}" CACHE PATH "setuptools binary directory" FORCE)
-mark_as_advanced(setuptools_DIR)
diff --git a/CMake/cdat_modules/setuptools_pkg.cmake b/CMake/cdat_modules/setuptools_pkg.cmake
deleted file mode 100644
index 97c8e93f7..000000000
--- a/CMake/cdat_modules/setuptools_pkg.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(SETUPTOOLS_MAJOR_SRC 19)
-set(SETUPTOOLS_MINOR_SRC 2)
-set(SETUPTOOLS_PATCH_SRC '')
-set(SETUPTOOLS_URL ${LLNL_URL})
-set(SETUPTOOLS_GZ setuptools-${SETUPTOOLS_MAJOR_SRC}.${SETUPTOOLS_MINOR_SRC}.tar.gz)
-set(SETUPTOOLS_MD5 78353b1f80375ca5e088f4b4627ffe03)
-set(SETUPTOOLS_VERSION ${SETUPTOOLS_MAJOR_SRC}.${SETUPTOOLS_MINOR_SRC})
-set(SETUPTOOLS_SOURCE ${SETUPTOOLS_URL}/${SETUPTOOLS_GZ})
-
-add_cdat_package(setuptools "" "" OFF)
diff --git a/CMake/cdat_modules/shapely_deps.cmake b/CMake/cdat_modules/shapely_deps.cmake
deleted file mode 100644
index e4cf1bcff..000000000
--- a/CMake/cdat_modules/shapely_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(Shapely_deps ${pkgconfig_pkg} ${pip_pkg} ${python_pkg} ${geos_pkg})
diff --git a/CMake/cdat_modules/shapely_external.cmake b/CMake/cdat_modules/shapely_external.cmake
deleted file mode 100644
index a04192050..000000000
--- a/CMake/cdat_modules/shapely_external.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-# create an external project to install MyProxyClient,
-# and configure and build it
-set(nm Shapely)
-set(USR_ENVS "GEOS_CONFIG=${cdat_EXTERNALS}/bin/geos-config")
-include(pipinstaller)
diff --git a/CMake/cdat_modules/shapely_pkg.cmake b/CMake/cdat_modules/shapely_pkg.cmake
deleted file mode 100644
index 115520652..000000000
--- a/CMake/cdat_modules/shapely_pkg.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-set( SHAPELY_MAJOR_SRC 1  )
-set( SHAPELY_MINOR_SRC 5 )
-set( SHAPELY_PATCH_SRC 13  )
-set(SHAPELY_URL ${LLNL_URL})
-set(SHAPELY_GZ
-    Shapely-${SHAPELY_MAJOR_SRC}.${SHAPELY_MINOR_SRC}.${SHAPELY_PATCH_SRC}.tar.gz)
-set(SHAPELY_MD5 5ee549862ae84326f5f5525bbd0b8a50)
-set(SHAPELY_SOURCE ${SHAPELY_URL}/${SHAPELY_GZ})
-
-set (nm SHAPELY)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-if (CDAT_BUILD_ALL)
-  add_cdat_package(Shapely "" "" ON)
-else()
-  add_cdat_package(Shapely "" "" OFF)
-endif()
diff --git a/CMake/cdat_modules/singledispatch_deps.cmake b/CMake/cdat_modules/singledispatch_deps.cmake
deleted file mode 100644
index 5ad0c5ed4..000000000
--- a/CMake/cdat_modules/singledispatch_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(singledispatch_deps ${python_pkg} ${setuptools_pkg} ${six_pkg})
diff --git a/CMake/cdat_modules/singledispatch_external.cmake b/CMake/cdat_modules/singledispatch_external.cmake
deleted file mode 100644
index 893edf6ae..000000000
--- a/CMake/cdat_modules/singledispatch_external.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-# The singledispatch project
-
-set(singledispatch_binary "${CMAKE_CURRENT_BINARY_DIR}/build/singledispatch")
-
-ExternalProject_Add(singledispatch
-  DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}
-  SOURCE_DIR ${singledispatch_binary}
-  URL ${SINGLEDISPATCH_SOURCE}
-  URL_MD5 ${SINGLEDISPATCH_MD5}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ${PYTHON_EXECUTABLE} setup.py build
-  INSTALL_COMMAND ${PYTHON_EXECUTABLE} setup.py install ${PYTHON_EXTRA_PREFIX}
-  DEPENDS ${singledispatch_deps}
-  ${ep_log_options}
-  )
diff --git a/CMake/cdat_modules/singledispatch_pkg.cmake b/CMake/cdat_modules/singledispatch_pkg.cmake
deleted file mode 100644
index c5eb273ac..000000000
--- a/CMake/cdat_modules/singledispatch_pkg.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-set( SINGLEDISPATCH_MAJOR 3 )
-set( SINGLEDISPATCH_MINOR 4 )
-set( SINGLEDISPATCH_PATCH 0.3)
-set( SINGLEDISPATCH_VERSION ${SINGLEDISPATCH_MAJOR}.${SINGLEDISPATCH_MINOR}.${SINGLEDISPATCH_PATCH} )
-set( SINGLEDISPATCH_URL ${LLNL_URL} )
-set( SINGLEDISPATCH_GZ singledispatch-${SINGLEDISPATCH_VERSION}.tar.gz )
-set( SINGLEDISPATCH_MD5 af2fc6a3d6cc5a02d0bf54d909785fcb )
-
-set (nm SINGLEDISPATCH)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR}.${${nm}_MINOR}.${${nm}_PATCH})
-set(SINGLEDISPATCH_SOURCE ${SINGLEDISPATCH_URL}/${SINGLEDISPATCH_GZ})
-
-if (BUILD_TESTING)
-  add_cdat_package(singledispatch "" "" ON)
-endif()
diff --git a/CMake/cdat_modules/sip_deps.cmake b/CMake/cdat_modules/sip_deps.cmake
deleted file mode 100644
index ee888d435..000000000
--- a/CMake/cdat_modules/sip_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(SIP_deps ${pkgconfig_pkg} ${python_pkg})
diff --git a/CMake/cdat_modules/sip_external.cmake b/CMake/cdat_modules/sip_external.cmake
deleted file mode 100644
index bbf4f461f..000000000
--- a/CMake/cdat_modules/sip_external.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-set(SIP_configure_command ${PYTHON_EXECUTABLE} ${cdat_BINARY_DIR}/build/SIP/configure.py -b ${CMAKE_INSTALL_PREFIX}/bin -d ${PYTHON_SITE_PACKAGES} -e ${CMAKE_INSTALL_PREFIX}/include -v ${CMAKE_INSTALL_PREFIX}/share CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER})
-
-ExternalProject_Add(SIP
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  URL ${SIP_URL}/${SIP_GZ}
-  URL_MD5 ${SIP_MD5}
-  SOURCE_DIR ${cdat_BINARY_DIR}/build/SIP
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ${SIP_configure_command}
-  DEPENDS ${SIP_deps}
-  ${ep_log_options}
-)
-
diff --git a/CMake/cdat_modules/sip_pkg.cmake b/CMake/cdat_modules/sip_pkg.cmake
deleted file mode 100644
index c2beefbd3..000000000
--- a/CMake/cdat_modules/sip_pkg.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-set(SIP_MAJOR 4)
-set(SIP_MINOR 12)
-set(SIP_PATCH 1)
-set(SIP_MAJOR_SRC 4)
-set(SIP_MINOR_SRC 16)
-set(SIP_PATCH_SRC 4)
-set(SIP_VERSION ${SIP_MAJOR_SRC}.${SIP_MINOR_SRC}.${SIP_PATCH_SRC})
-set(SIP_URL http://www.riverbankcomputing.com/static/Downloads/sip${SIP_MAJOR_SRC})
-set(SIP_URL ${LLNL_URL})
-set(SIP_GZ sip-${SIP_MAJOR_SRC}.${SIP_MINOR_SRC}.${SIP_PATCH_SRC}.tar.gz)
-set(SIP_MD5 a9840670a064dbf8f63a8f653776fec9 )
-set(SIP_SOURCE ${SIP_URL}/${SIP_GZ})
-
-add_cdat_package_dependent(SIP "" "" OFF "CDAT_BUILD_GUI" OFF)
diff --git a/CMake/cdat_modules/six_deps.cmake b/CMake/cdat_modules/six_deps.cmake
deleted file mode 100644
index 20fb4f54f..000000000
--- a/CMake/cdat_modules/six_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(SIX_deps ${python_pkg} ${pip_pkg})
diff --git a/CMake/cdat_modules/six_external.cmake b/CMake/cdat_modules/six_external.cmake
deleted file mode 100644
index 5a1ae27de..000000000
--- a/CMake/cdat_modules/six_external.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-
-# create an external project to install MyProxyClient,
-# and configure and build it
-set(nm SIX)
-
-include(pipinstaller)
diff --git a/CMake/cdat_modules/six_pkg.cmake b/CMake/cdat_modules/six_pkg.cmake
deleted file mode 100644
index e8daac58a..000000000
--- a/CMake/cdat_modules/six_pkg.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(SIX_MAJOR_SRC 1)
-set(SIX_MINOR_SRC 9)
-set(SIX_PATCH_SRC 0)
-
-set(SIX_VERSION ${SIX_MAJOR_SRC}.${SIX_MINOR_SRC}.${SIX_PATCH_SRC})
-set(SIX_GZ six-${SIX_VERSION}.tar.gz)
-set(SIX_SOURCE ${LLNL_URL}/${SIX_GZ})
-set(SIX_MD5 476881ef4012262dfc8adc645ee786c4)
-
-add_cdat_package_dependent(SIX "" "" ON "CDAT_BUILD_LEAN" OFF)
diff --git a/CMake/cdat_modules/sphinx_deps.cmake b/CMake/cdat_modules/sphinx_deps.cmake
deleted file mode 100644
index 8e0e9f2a1..000000000
--- a/CMake/cdat_modules/sphinx_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(Sphinx_deps ${pip_pkg} ${docutils_pkg})
diff --git a/CMake/cdat_modules/sphinx_external.cmake b/CMake/cdat_modules/sphinx_external.cmake
deleted file mode 100644
index 41cf3d2c1..000000000
--- a/CMake/cdat_modules/sphinx_external.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-# create an external project to install MyProxyClient,
-# and configure and build it
-set(nm Sphinx)
-
-include(pipinstaller)
diff --git a/CMake/cdat_modules/sphinx_pkg.cmake b/CMake/cdat_modules/sphinx_pkg.cmake
deleted file mode 100644
index 536d6e042..000000000
--- a/CMake/cdat_modules/sphinx_pkg.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-set(SPHINX_MAJOR_SRC 1)
-set(SPHINX_MINOR_SRC 2)
-set(SPHINX_PATCH_SRC 2)
-
-set (nm SPHINX)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-set(SPHINX_URL ${LLNL_URL})
-set(SPHINX_GZ Sphinx-${SPHINX_VERSION}.tar.gz)
-set(SPHINX_SOURCE ${SPHINX_URL}/${SPHINX_GZ})
-set(SPHINX_MD5 3dc73ccaa8d0bfb2d62fb671b1f7e8a4)
-
-add_cdat_package_dependent(Sphinx "" "" OFF "CDAT_BUILD_GUI" OFF)
-
diff --git a/CMake/cdat_modules/spyder_deps.cmake b/CMake/cdat_modules/spyder_deps.cmake
deleted file mode 100644
index b543e68ad..000000000
--- a/CMake/cdat_modules/spyder_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(spyder_deps ${pyzmq_pkg} ${pyqt_pkg} ${python_pkg} ${pip_pkg} ${numpy_pkg} ${scipy_pkg} ${sphinx_pkg} ${matplotlib_pkg})
diff --git a/CMake/cdat_modules/spyder_external.cmake b/CMake/cdat_modules/spyder_external.cmake
deleted file mode 100644
index dede73c00..000000000
--- a/CMake/cdat_modules/spyder_external.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-# create an external project to install spyder,
-# and configure and build it
-
-set (nm spyder)
-set(OLD "OFF")
-include(pipinstaller)
-
diff --git a/CMake/cdat_modules/spyder_pkg.cmake b/CMake/cdat_modules/spyder_pkg.cmake
deleted file mode 100644
index 664f2c319..000000000
--- a/CMake/cdat_modules/spyder_pkg.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-set(SPYDER_MAJOR_SRC 2)
-set(SPYDER_MINOR_SRC 3)
-set(SPYDER_PATCH_SRC 8)
-set(SPYDER_URL ${LLNL_URL})
-set(SPYDER_ZIP spyder-${SPYDER_MAJOR_SRC}.${SPYDER_MINOR_SRC}.${SPYDER_PATCH_SRC}.zip)
-set(SPYDER_SOURCE ${SPYDER_URL}/${SPYDER_ZIP})
-set(SPYDER_MD5 fb890dc956f606c43d560558159f3491)
-
-add_cdat_package_dependent(spyder "" "" OFF "CDAT_BUILD_GUI" OFF)
diff --git a/CMake/cdat_modules/tcltk_deps.cmake b/CMake/cdat_modules/tcltk_deps.cmake
deleted file mode 100644
index 4f4bf38e9..000000000
--- a/CMake/cdat_modules/tcltk_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(TclTk_deps ${pkgconfig_pkg} ${libxml2_pkg} ${libxslt_pkg} ${jpeg_pkg} ${png_pkg} ${tiff_pkg})
diff --git a/CMake/cdat_modules/tcltk_external.cmake b/CMake/cdat_modules/tcltk_external.cmake
deleted file mode 100644
index 9c8baa5f6..000000000
--- a/CMake/cdat_modules/tcltk_external.cmake
+++ /dev/null
@@ -1,62 +0,0 @@
-
-set(tcl_source "${CMAKE_CURRENT_BINARY_DIR}/build/tcl")
-set(tk_source "${CMAKE_CURRENT_BINARY_DIR}/build/tk")
-set(tcltk_install "${cdat_EXTERNALS}")
-
-set(tcltk_configure_args --enable-shared)
-
-# tcl
-#
-set(proj tcl-${TCLTK_MAJOR}.${TCLTK_MINOR})
-
-ExternalProject_Add(${proj}
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${tcl_source}
-  INSTALL_DIR ${tcltk_install}
-  URL ${TCLTK_URL}/${TCL_GZ}
-  URL_MD5 ${TCL_MD5}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR>/unix -DCONFIGURE_ARGS=${tcltk_configure_args} -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  BUILD_COMMAND ${CMAKE_COMMAND} -Dmake=$(MAKE) -DWORKING_DIR=<SOURCE_DIR>/unix -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
-  INSTALL_COMMAND ${CMAKE_COMMAND} -DWORKING_DIR=<SOURCE_DIR>/unix -P ${cdat_CMAKE_BINARY_DIR}/cdat_install_step.cmake
-  DEPENDS ${TclTk_deps}
-  ${ep_log_options}
-)
-
-# tk
-#
-set(proj tk-${TCLTK_MAJOR}.${TCLTK_MINOR})
-
-ExternalProject_Add(${proj}
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${tk_source}
-  INSTALL_DIR ${tcltk_install}
-  URL ${TCLTK_URL}/${TK_GZ}
-  URL_MD5 ${TK_MD5}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR>/unix -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  BUILD_COMMAND ${CMAKE_COMMAND} -Dmake=$(MAKE) -DWORKING_DIR=<SOURCE_DIR>/unix -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
-  INSTALL_COMMAND ${CMAKE_COMMAND} -DWORKING_DIR=<SOURCE_DIR>/unix -P ${cdat_CMAKE_BINARY_DIR}/cdat_install_step.cmake
-  DEPENDS tcl-${TCLTK_MAJOR}.${TCLTK_MINOR}
-  ${ep_log_options}
-)
-
-ExternalProject_Add_Step(${proj} symlink
-  COMMAND ${CMAKE_COMMAND} -E create_symlink "wish${TCLTK_MAJOR}.${TCLTK_MINOR}" wish
-  WORKING_DIRECTORY ${tcltk_install}/bin
-  COMMENT "Linking wish${TCLTK_MAJOR}.${TCLTK_MINOR} to wish"
-  DEPENDEES install
-)
-
-# tcltk
-#
-
-ExternalProject_Add(TclTk
-  DOWNLOAD_COMMAND ""
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ""
-  INSTALL_COMMAND ""
-  DEPENDS tk-${TCLTK_MAJOR}.${TCLTK_MINOR}
-  ${ep_log_options}
-)
-
diff --git a/CMake/cdat_modules/tcltk_pkg.cmake b/CMake/cdat_modules/tcltk_pkg.cmake
deleted file mode 100644
index 1296043e2..000000000
--- a/CMake/cdat_modules/tcltk_pkg.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-set(TCLTK_MAJOR 8)
-set(TCLTK_MINOR 5)
-set(TCLTK_PATCH 9)
-set(TCLTK_VERSION ${TCLTK_MAJOR}.${TCLTK_MINOR}.${TCLTK_PATCH})
-set(TCLTK_URL ${LLNL_URL})
-set(TCL_GZ tcl${TCLTK_MAJOR}.${TCLTK_MINOR}.${TCLTK_PATCH}-src.tar.gz)
-set(TK_GZ tk${TCLTK_MAJOR}.${TCLTK_MINOR}.${TCLTK_PATCH}-src.tar.gz)
-set(TCL_MD5 8512d8db3233041dd68a81476906012a)
-set(TK_MD5 7cdeb9feb61593f58a0ae61f2497580e)
-# Two sources here, need to fake it
-set(TCLTK_SOURCE "${TCLTK_URL}/${TCL_GZ} ${TCL_MD5}")
-set(TCLTK_MD5 "${TCLTK_URL}/${TK_GZ} ${TK_MD5}")
-
-if (CDAT_BUILD_ESGF)
-    add_cdat_package(TclTk "" "" OFF)
-else()
-    add_cdat_package_dependent(TclTk "" "" OFF "CDAT_BUILD_GUI" OFF)
-endif()
diff --git a/CMake/cdat_modules/termcap_deps.cmake b/CMake/cdat_modules/termcap_deps.cmake
deleted file mode 100644
index 3c9a6f3af..000000000
--- a/CMake/cdat_modules/termcap_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(termcap_deps ${pkgconfig_pkg})
diff --git a/CMake/cdat_modules/termcap_external.cmake b/CMake/cdat_modules/termcap_external.cmake
deleted file mode 100644
index cf57c940a..000000000
--- a/CMake/cdat_modules/termcap_external.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-set(termcap_source "${CMAKE_CURRENT_BINARY_DIR}/build/termcap")
-set(termcap_install "${cdat_EXTERNALS}")
-set(termcap_conf_args)
-
-ExternalProject_Add(termcap
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${termcap_source}
-  INSTALL_DIR ${termcap_install}
-  URL ${TCAP_URL}/${TCAP_GZ}
-  URL_MD5 ${TCAP_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCONFIGURE_ARGS=${termcap_conf_args} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  DEPENDS ${termcap_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/termcap_pkg.cmake b/CMake/cdat_modules/termcap_pkg.cmake
deleted file mode 100644
index 11e6a0e92..000000000
--- a/CMake/cdat_modules/termcap_pkg.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-set(TCAP_MAJOR_SRC 1)
-set(TCAP_MINOR_SRC 3)
-set(TCAP_PATCH_SRC 1)
-set(TCAP_URL ${LLNL_URL})
-set(TCAP_GZ termcap-${TCAP_MAJOR_SRC}.${TCAP_MINOR_SRC}.${TCAP_PATCH_SRC}.tar.gz)
-set(TCAP_MD5 ffe6f86e63a3a29fa53ac645faaabdfa)
-set(TERMCAP_SOURCE ${TCAP_URL}/${TCAP_GZ})
-set(TERMCAP_MD5 ${TCAP_MD5})
-
-set (nm TCAP)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-set(TERMCAP_VERSION ${TCAP_VERSION})
-
-add_cdat_package(termcap "" "" OFF)
-
diff --git a/CMake/cdat_modules/tiff_deps.cmake b/CMake/cdat_modules/tiff_deps.cmake
deleted file mode 100644
index 3a05e71e9..000000000
--- a/CMake/cdat_modules/tiff_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(tiff_deps ${pkgconfig_pkg} ${jpeg_pkg} ${zlib_pkg})
diff --git a/CMake/cdat_modules/tiff_external.cmake b/CMake/cdat_modules/tiff_external.cmake
deleted file mode 100644
index 248a9929d..000000000
--- a/CMake/cdat_modules/tiff_external.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-
-set(tiff_source "${CMAKE_CURRENT_BINARY_DIR}/build/tiff")
-set(tiff_install "${cdat_EXTERNALS}")
-
-ExternalProject_Add(tiff
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${tiff_source}
-  INSTALL_DIR ${tiff_install}
-  URL ${TIFF_URL}/${TIFF_GZ}
-  URL_MD5 ${TIFF_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  DEPENDS ${tiff_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/tiff_pkg.cmake b/CMake/cdat_modules/tiff_pkg.cmake
deleted file mode 100644
index 09a6a191a..000000000
--- a/CMake/cdat_modules/tiff_pkg.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-set(TIFF_MAJOR 3)
-set(TIFF_MINOR 9)
-set(TIFF_PATCH 4)
-set(TIFF_URL ${LLNL_URL})
-set(TIFF_GZ tiff-${TIFF_MAJOR}.${TIFF_MINOR}.${TIFF_PATCH}.tar.gz)
-set(TIFF_MD5 2006c1bdd12644dbf02956955175afd6)
-set(TIFF_SOURCE ${TIFF_URL}/${TIFF_GZ})
-
-set (nm TIFF)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR}.${${nm}_MINOR}.${${nm}_PATCH})
-add_cdat_package_dependent(tiff "" "" ON "CDAT_BUILD_GRAPHICS" OFF)
diff --git a/CMake/cdat_modules/tornado_deps.cmake b/CMake/cdat_modules/tornado_deps.cmake
deleted file mode 100644
index 6c8e9f67d..000000000
--- a/CMake/cdat_modules/tornado_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(tornado_deps ${spyder_pkg} ${pyzmq_deps} ${pip_pkg})
diff --git a/CMake/cdat_modules/tornado_external.cmake b/CMake/cdat_modules/tornado_external.cmake
deleted file mode 100644
index 3531582b0..000000000
--- a/CMake/cdat_modules/tornado_external.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-# create an external project to install MyProxyClient,
-# and configure and build it
-set(nm tornado)
-
-include(pipinstaller)
diff --git a/CMake/cdat_modules/tornado_pkg.cmake b/CMake/cdat_modules/tornado_pkg.cmake
deleted file mode 100644
index a40c77381..000000000
--- a/CMake/cdat_modules/tornado_pkg.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-set(TORNADO_VERSION 3.1)
-set(TORNADO_URL ${LLNL_URL})
-set(TORNADO_GZ tornado-${TORNADO_VERSION}.tar.gz)
-set(TORNADO_SOURCE ${TORNADO_URL}/${TORNADO_GZ})
-set(TORNADO_MD5 2348d626095c5675753287e9af0c321f )
-
-add_cdat_package(tornado "" "" OFF)
diff --git a/CMake/cdat_modules/udunits2_deps.cmake b/CMake/cdat_modules/udunits2_deps.cmake
deleted file mode 100644
index b032ce41d..000000000
--- a/CMake/cdat_modules/udunits2_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(udunits2_deps ${pkgconfig_pkg})
diff --git a/CMake/cdat_modules/udunits2_external.cmake b/CMake/cdat_modules/udunits2_external.cmake
deleted file mode 100644
index c70b20fd9..000000000
--- a/CMake/cdat_modules/udunits2_external.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-set(udunits_source "${CMAKE_CURRENT_BINARY_DIR}/build/udunits2")
-set(udunits_install "${cdat_EXTERNALS}")
-
-set(udunits_patch_command "")
-if(APPLE)
-  # Modified configure file to workaround random flex failures
-  set(udunits_patch_command
-    ${CMAKE_COMMAND} -E copy_if_different
-      "${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/udunits2_apple_configure.in"
-      "${udunits_source}/configure")
-endif()
-
-ExternalProject_Add(udunits2
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${udunits_source}
-  INSTALL_DIR ${udunits_install}
-  URL ${UDUNITS2_URL}/${UDUNITS2_GZ}
-  URL_MD5 ${UDUNITS2_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ${udunits_patch_command}
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  DEPENDS ${udunits2_deps}
-  ${ep_log_options}
-)
-
diff --git a/CMake/cdat_modules/udunits2_pkg.cmake b/CMake/cdat_modules/udunits2_pkg.cmake
deleted file mode 100644
index b114ac770..000000000
--- a/CMake/cdat_modules/udunits2_pkg.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-set(UDUNITS2_URL ${LLNL_URL})
-set(UDUNITS2_MAJOR_SRC 2)
-set(UDUNITS2_MINOR_SRC 2)
-set(UDUNITS2_PATCH_SRC 17)
-set(UDUNITS2_URL ${LLNL_URL})
-set(UDUNITS2_GZ udunits-${UDUNITS2_MAJOR_SRC}.${UDUNITS2_MINOR_SRC}.${UDUNITS2_PATCH_SRC}.tar.gz)
-set(UDUNITS2_MD5 b81ab8f24125ce18702ab7b3ca4d566f )
-set(UDUNITS2_SOURCE ${UDUNITS2_URL}/${UDUNITS2_GZ})
-
-set (nm UDUNITS2)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-
-add_cdat_package_dependent(udunits2 "" "" OFF "CDAT_BUILD_LEAN" OFF)
diff --git a/CMake/cdat_modules/uuid_deps.cmake b/CMake/cdat_modules/uuid_deps.cmake
deleted file mode 100644
index 2f2b9e4ba..000000000
--- a/CMake/cdat_modules/uuid_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(uuid_deps ${pkgconfig_pkg} )
diff --git a/CMake/cdat_modules/uuid_external.cmake b/CMake/cdat_modules/uuid_external.cmake
deleted file mode 100644
index a53deeb79..000000000
--- a/CMake/cdat_modules/uuid_external.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-
-set(uuid_source "${CMAKE_CURRENT_BINARY_DIR}/build/uuid")
-set(uuid_install "${cdat_EXTERNALS}")
-
-ExternalProject_Add(uuid
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${uuid_source}
-  INSTALL_DIR ${uuid_install}
-  URL ${UUID_URL}/${UUID_GZ}
-  URL_MD5 ${UUID_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  DEPENDS ${uuid_deps}
-  ${ep_log_options}
-)
-
-set(uuid_DIR "${uuid_binary}" CACHE PATH "uuid binary directory" FORCE)
-mark_as_advanced(uuid_DIR)
diff --git a/CMake/cdat_modules/uuid_pkg.cmake b/CMake/cdat_modules/uuid_pkg.cmake
deleted file mode 100644
index d05bfb620..000000000
--- a/CMake/cdat_modules/uuid_pkg.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-set(UUID_MAJOR_SRC 1)
-set(UUID_MINOR_SRC 6)
-set(UUID_PATCH_SRC 2)
-set(UUID_URL ${LLNL_URL})
-set(UUID_GZ uuid-${UUID_MAJOR_SRC}.${UUID_MINOR_SRC}.${UUID_PATCH_SRC}.tar.gz)
-set(UUID_MD5 5db0d43a9022a6ebbbc25337ae28942f)
-set(UUID_SOURCE ${UUID_URL}/${UUID_GZ})
-
-set (nm UUID)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-#apparently libcf needs it
-add_cdat_package_dependent(uuid "" "" OFF "CDAT_BUILD_LEAN" ON)
-#add_cdat_package(uuid "" "" OFF)
-
diff --git a/CMake/cdat_modules/uvcmetrics_deps.cmake b/CMake/cdat_modules/uvcmetrics_deps.cmake
deleted file mode 100644
index a01e906ae..000000000
--- a/CMake/cdat_modules/uvcmetrics_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(UVCMETRICS_deps ${cdat_pkg} )
diff --git a/CMake/cdat_modules/uvcmetrics_external.cmake b/CMake/cdat_modules/uvcmetrics_external.cmake
deleted file mode 100644
index 4a9ad2d1e..000000000
--- a/CMake/cdat_modules/uvcmetrics_external.cmake
+++ /dev/null
@@ -1,42 +0,0 @@
-
-if (CDAT_DOWNLOAD_UVCMETRICS_TESTDATA)
-  set(UVCMETRICS_DOWNLOAD_FILES "")
-
-  file(READ "${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/uvcmetrics_test_data_md5s.txt" UVCMETRICS_FILES)
-  string(REGEX REPLACE ";" "\\\\;" UVCMETRICS_FILES "${UVCMETRICS_FILES}")
-  string(REGEX REPLACE "\n" ";" UVCMETRICS_FILES "${UVCMETRICS_FILES}")
-
-  foreach(line ${UVCMETRICS_FILES})
-    string(REGEX REPLACE " +" ";" line "${line}")
-    list(GET line 1 base_file_path)
-    list(GET line 0 FILE_MD5)
-
-    string(STRIP "${base_file_path}" base_file_path)
-    string(STRIP "${FILE_MD5}" FILE_MD5)
-
-    set(FILE_PATH "${UVCMETRICS_TEST_DATA_DIRECTORY}/${base_file_path}")
-    list(APPEND UVCMETRICS_DOWNLOAD_FILES "${FILE_PATH}")
-
-    set(FILE_URL "${LLNL_URL}/../sample_data/uvcmetrics_2.4.1/${base_file_path}")
-
-    add_custom_command(
-      OUTPUT "${FILE_PATH}"
-      COMMAND "${CMAKE_COMMAND}"
-        -D FILE_URL="${FILE_URL}"
-        -D FILE_MD5="${FILE_MD5}"
-        -D FILE_PATH="${FILE_PATH}"
-        -P "${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/fetch_uvcmetrics_testdata.cmake"
-      DEPENDS "${uvcmetrics_data_keyfile}"
-      COMMENT "Downloading ${base_file_path}"
-    )
-  endforeach()
-
-  add_custom_target(uvcmetrics_test_data ALL DEPENDS ${UVCMETRICS_DOWNLOAD_FILES})
-endif()
-
-set(GIT_CMD_STR GIT_REPOSITORY "${UVCMETRICS_SOURCE}")
-set(GIT_TAG GIT_TAG "${UVCMETRICS_BRANCH}")
-set(nm UVCMETRICS)
-set(OLD OFF)
-include(pipinstaller)
-unset(OLD)
diff --git a/CMake/cdat_modules/uvcmetrics_pkg.cmake b/CMake/cdat_modules/uvcmetrics_pkg.cmake
deleted file mode 100644
index 2f8294042..000000000
--- a/CMake/cdat_modules/uvcmetrics_pkg.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-set (nm UVCMETRICS)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_TAG})
-set(UVCMETRICS_URL ${LLNL_URL})
-set(UVCMETRICS_ZIP uvcmetrics-${UVCMETRICS_VERSION}.zip)
-#set(UVCMETRICS_SOURCE ${UVCMETRICS_URL}/${UVCMETRICS_ZIP})
-set(UVCMETRICS_SOURCE ${GIT_PROTOCOL}github.com/UV-CDAT/uvcmetrics.git )
-set(UVCMETRICS_MD5)
-set(UVCMETRICS_BRANCH master)
-
-if (NOT CDAT_BUILD_LEAN)
-  add_cdat_package(UVCMETRICS "" "" ON)
-endif()
-
diff --git a/CMake/cdat_modules/vacumm_deps.cmake b/CMake/cdat_modules/vacumm_deps.cmake
deleted file mode 100644
index 9472871dd..000000000
--- a/CMake/cdat_modules/vacumm_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(vacumm_deps ${python_pkg} ${numpy_pkg} ${scipy_pkg} ${matplotlib_pkg} ${basemap_pkg} ${configobj_pkg} ${setuptools_pkg})
diff --git a/CMake/cdat_modules/vacumm_external.cmake b/CMake/cdat_modules/vacumm_external.cmake
deleted file mode 100644
index 0cf4556ff..000000000
--- a/CMake/cdat_modules/vacumm_external.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-# vacumm
-#
-set(vacumm_source_dir "${CMAKE_CURRENT_BINARY_DIR}/build/vacumm")
-
-configure_file(
-  "${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/vacumm_build_step.cmake.in"
-  "${cdat_CMAKE_BINARY_DIR}/vacumm_build_step.cmake"
-  @ONLY
-  )
-
-set(vacumm_build_command ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/vacumm_build_step.cmake)
-
-ExternalProject_Add(vacumm
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${vacumm_source_dir}
-  URL ${VACUMM_URL}/${VACUMM_GZ}
-  URL_MD5 ${VACUMM_MD5}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ${vacumm_build_command}
-  INSTALL_COMMAND ""
-  DEPENDS ${vacumm_deps}
-  ${ep_log_options}
-  )
diff --git a/CMake/cdat_modules/vacumm_pkg.cmake b/CMake/cdat_modules/vacumm_pkg.cmake
deleted file mode 100644
index 7dea0632e..000000000
--- a/CMake/cdat_modules/vacumm_pkg.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-set(VACUMM_MAJOR 3)
-set(VACUMM_MINOR 0)
-set(VACUMM_PATCH 0)
-set(VACUMM_VERSION ${VACUMM_MAJOR}.${VACUMM_MINOR}.${VACUMM_PATCH})
-set(VACUMM_URL ${LLNL_URL} )
-set(VACUMM_GZ vacumm-${VACUMM_VERSION}.tar.gz)
-set(VACUMM_MD5 b468fa72ddba9d0cd39d51164bef1dd4)
-
-set (nm VACUMM)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR}.${${nm}_MINOR}.${${nm}_PATCH})
-set(VACUMM_SOURCE ${VACUMM_URL}/${VACUMM_GZ})
-
-if (CDAT_BUILD_ALL)
-  add_cdat_package(vacumm "" "" ON)
-else()
-  add_cdat_package(vacumm "" "" OFF)
-endif()
diff --git a/CMake/cdat_modules/visit_deps.cmake b/CMake/cdat_modules/visit_deps.cmake
deleted file mode 100644
index 023429df2..000000000
--- a/CMake/cdat_modules/visit_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(VisIt_deps ${pkgconfig_pkg} ${sip_pkg} ${pyqt_pkg} ${paraview_pkg} ${r_pkg})
diff --git a/CMake/cdat_modules/visit_external.cmake b/CMake/cdat_modules/visit_external.cmake
deleted file mode 100644
index 7fbdb404c..000000000
--- a/CMake/cdat_modules/visit_external.cmake
+++ /dev/null
@@ -1,173 +0,0 @@
-set(VisIt_source "${CMAKE_CURRENT_BINARY_DIR}/build/VisIt")
-set(VisIt_binary "${CMAKE_CURRENT_BINARY_DIR}/build/VisIt")
-set(VisIt_install "${CMAKE_INSTALL_PREFIX}")
-
-if(QT_QMAKE_EXECUTABLE)
-  get_filename_component(QT_BINARY_DIR ${QT_QMAKE_EXECUTABLE} PATH)
-  get_filename_component(QT_ROOT ${QT_BINARY_DIR} PATH)
-endif()
-
-GET_FILENAME_COMPONENT(CMAKE_PATH_VAR ${CMAKE_COMMAND} PATH)
-SET(VISIT_C_FLAGS "${CMAKE_C_FLAGS} -I${cdat_EXTERNALS}/include")
-GET_FILENAME_COMPONENT(VISIT_C_COMPILER ${CMAKE_C_COMPILER} NAME)
-SET(VISIT_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${cdat_EXTERNALS}/include")
-GET_FILENAME_COMPONENT(VISIT_CXX_COMPILER ${CMAKE_CXX_COMPILER} NAME)
-SET(VISIT_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${cdat_EXTERNALS}/lib")
-
-MACRO(DETERMINE_VISIT_ARCHITECTURE ARCH)
-    IF(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-        IF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc")
-            SET(${ARCH} linux-ppc)
-        ELSEIF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64")
-            SET(${ARCH} linux-ppc64)
-        ELSEIF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
-            SET(${ARCH} linux-x86_64)
-        ELSEIF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ia64")
-            SET(${ARCH} linux-ia64)
-        ELSE(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc")
-            SET(${ARCH} linux-intel)
-        ENDIF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc")
-    ELSEIF(${CMAKE_SYSTEM_NAME} STREQUAL "AIX")
-        IF($ENV{OBJECT_MODE} STREQUAL "32")
-            SET(${ARCH} "ibm-aix-pwr")
-        ELSE($ENV{OBJECT_MODE} STREQUAL "32")
-            SET(${ARCH} "ibm-aix-pwr64")
-        ENDIF($ENV{OBJECT_MODE} STREQUAL "32")
-    ELSEIF(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-        IF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386")
-            EXECUTE_PROCESS(COMMAND uname -r
-               OUTPUT_STRIP_TRAILING_WHITESPACE
-               OUTPUT_VARIABLE _OSX_VERSION)
-            STRING(SUBSTRING ${_OSX_VERSION} 0 1 _OSX_MAJOR_VERSION)
-            IF(${_OSX_MAJOR_VERSION} STREQUAL "1")
-                # This will match 10, 11, 12, ...
-                SET(${ARCH} darwin-x86_64)
-            ELSE(${_OSX_MAJOR_VERSION} STREQUAL "1")
-                SET(${ARCH} darwin-i386)
-            ENDIF(${_OSX_MAJOR_VERSION} STREQUAL "1")
-        ELSE(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386")
-            SET(${ARCH} darwin-x86_64)
-        ENDIF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386")
-    ELSEIF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-        SET(${ARCH} "freebsd-${CMAKE_SYSTEM_VERSION}")
-    ELSEIF(${CMAKE_SYSTEM_NAME} STREQUAL "IRIX")
-        SET(${ARCH} sgi-irix6-mips2)
-    ELSEIF(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
-        SET(${ARCH} "sun4-${CMAKE_SYSTEM_VERSION}-sparc")
-    ELSEIF(${CMAKE_SYSTEM_NAME} STREQUAL "Tru64")
-        SET(${ARCH} dec-osf1-alpha)
-    ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-        # Unhandled case. Make up a string.
-        SET(VISITARCHTMP "${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
-        STRING(TOLOWER ${VISITARCHTMP} ${ARCH})
-    ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-ENDMACRO(DETERMINE_VISIT_ARCHITECTURE ARCH)
-
-# Note this is a workaround to handle build on APPLE
-IF(APPLE)
-  SET(VISIT_INSTALL_PLATFORM "darwin-x86_64")
-ELSE(APPLE)
-  DETERMINE_VISIT_ARCHITECTURE(VISIT_INSTALL_PLATFORM)
-ENDIF(APPLE)
-
-SET(VISIT_HOSTNAME "visit-uvcdat-build")
-
-
-#Add VisIt to ExternalProject
-ExternalProject_Add(VisIt
-  #DOWNLOAD_DIR ${VisIt_source} #${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${VisIt_source}
-  BINARY_DIR ${VisIt_binary}
-  INSTALL_DIR ${VisIt_install}
-  #SVN_REPOSITORY ${VISIT_SVN}
-  URL ${VISIT_URL}/${VISIT_GZ}
-  #URL_MD5 ${VISIT_MD5}
-  PATCH_COMMAND ""
-  #CONFIGURE_COMMAND ""
-  BUILD_COMMAND ""
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${VisIt_install} -DCMAKE_INSTALL_NAME_DIR=${VisIt_install}/${VISIT_VERSION}/${VISIT_INSTALL_PLATFORM}/lib -DVISIT_CONFIG_SITE:FILEPATH=${VisIt_source}/${VISIT_HOSTNAME}.cmake
-  DEPENDS ${VisIt_deps}
-  ${ep_log_options}
-)
-
-if(NOT EXISTS ${CMAKE_INSTALL_PREFIX}/lib)
-  file(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib)
-endif()
-
-#add references to VisIt's cmake
-SET(TMP_STR1 "FILE(APPEND ${VisIt_source}/${VISIT_HOSTNAME}.cmake \"VISIT_OPTION_DEFAULT(VISIT_OSX_USE_RPATH TYPE BOOL ON)\\n\")\n")
-SET(TMP_STR2 "FILE(APPEND ${VisIt_source}/${VISIT_HOSTNAME}.cmake \"VISIT_OPTION_DEFAULT(VISIT_QT_SKIP_INSTALL TYPE BOOL ON)\\n\")\n")
-SET(TMP_STR3 "FILE(APPEND ${VisIt_source}/${VISIT_HOSTNAME}.cmake \"VISIT_OPTION_DEFAULT(VISIT_PYTHON_SKIP_INSTALL TYPE BOOL ON)\\n\")\n")
-SET(TMP_STR4 "FILE(APPEND ${VisIt_source}/${VISIT_HOSTNAME}.cmake \"VISIT_OPTION_DEFAULT(VISIT_HEADERS_SKIP_INSTALL TYPE BOOL ON)\\n\")\n")
-SET(TMP_STR5 "FILE(APPEND ${VisIt_source}/${VISIT_HOSTNAME}.cmake \"VISIT_OPTION_DEFAULT(VISIT_VTK_SKIP_INSTALL TYPE BOOL ON)\\n\")\n")
-SET(TMP_STR6 "FILE(APPEND ${VisIt_source}/${VISIT_HOSTNAME}.cmake \"VISIT_OPTION_DEFAULT(VISIT_R_SKIP_INSTALL TYPE BOOL ON)\\n\")\n")
-SET(TMP_STR7 "FILE(APPEND ${VisIt_source}/${VISIT_HOSTNAME}.cmake \"add_definitions(-DEXTERNAL_VTK_BUILD)\\n\")\n")
-SET(TMP_STR8 "FILE(APPEND ${VisIt_source}/${VISIT_HOSTNAME}.cmake \"VISIT_OPTION_DEFAULT(CMAKE_EXE_LINKER_FLAGS \\\"\\\${CMAKE_EXE_LINKER_FLAGS} ${VISIT_LINKER_FLAGS}\\\")\\n\")\n")
-SET(TMP_STR9 "FILE(APPEND ${VisIt_source}/${VISIT_HOSTNAME}.cmake \"VISIT_OPTION_DEFAULT(VISIT_C_FLAGS \\\"\\\${VISIT_C_FLAGS} ${VISIT_C_FLAGS}\\\")\\n\")\n")
-SET(TMP_STR10 "FILE(APPEND ${VisIt_source}/${VISIT_HOSTNAME}.cmake \"VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS \\\"\\\${VISIT_CXX_FLAGS} ${VISIT_CXX_FLAGS}\\\")\\n\")\n")
-
-FILE(WRITE   ${CMAKE_BINARY_DIR}/visit.cmake ${TMP_STR1})
-FILE(APPEND  ${CMAKE_BINARY_DIR}/visit.cmake ${TMP_STR2})
-FILE(APPEND  ${CMAKE_BINARY_DIR}/visit.cmake ${TMP_STR3})
-FILE(APPEND  ${CMAKE_BINARY_DIR}/visit.cmake ${TMP_STR4})
-FILE(APPEND  ${CMAKE_BINARY_DIR}/visit.cmake ${TMP_STR5})
-FILE(APPEND  ${CMAKE_BINARY_DIR}/visit.cmake ${TMP_STR6})
-FILE(APPEND  ${CMAKE_BINARY_DIR}/visit.cmake ${TMP_STR7})
-FILE(APPEND  ${CMAKE_BINARY_DIR}/visit.cmake ${TMP_STR8})
-FILE(APPEND  ${CMAKE_BINARY_DIR}/visit.cmake ${TMP_STR9})
-FILE(APPEND  ${CMAKE_BINARY_DIR}/visit.cmake ${TMP_STR10})
-
-# Before install step
-#load VisIt installation 
-ExternalProject_Add_Step(VisIt BuildVisItPatch_Step1
- COMMAND sed -e s/<object.h>/"object.h"/g ${VisIt_source}/databases/DDCMD/avtDDCMDFileFormat.C > ${VisIt_source}/databases/DDCMD/avtDDCMDFileFormat.C_tmp
- COMMAND mv ${VisIt_source}/databases/DDCMD/avtDDCMDFileFormat.C_tmp ${VisIt_source}/databases/DDCMD/avtDDCMDFileFormat.C
-  COMMAND echo yes | svn_bin/build_visit --gpl --console --cc ${VISIT_C_COMPILER} --cxx ${VISIT_CXX_COMPILER} --alt-vtk-dir ${ParaView_binary}/VTK --alt-pyqt-dir ${CMAKE_INSTALL_PREFIX} --alt-R-dir ${cdat_EXTERNALS} --alt-netcdf-dir ${cdat_EXTERNALS} --alt-hdf5-dir ${cdat_EXTERNALS} --thirdparty-path ${CMAKE_CURRENT_BINARY_DIR}/visit-thirdparty --cmake-bin-dir ${CMAKE_PATH_VAR} --alt-python-dir ${CMAKE_INSTALL_PREFIX} --alt-qt-dir ${QT_ROOT} --no-visit --makeflags -j${VISIT_PARALLEL_PROCESSORS} --log-file ${CMAKE_BINARY_DIR}/logs/VisIt-build-out.log --no-mesa --visit-build-hostname ${VisIt_source}/${VISIT_HOSTNAME}.cmake
-  COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/visit.cmake 
-  DEPENDEES patch
-  DEPENDERS configure
-  WORKING_DIRECTORY ${VisIt_source})
-
-#After installation
-#Make symlinks of VisIt's lib, plugins, 
-#move pyqt_pyqtviewer.so and plugin into python site-packages
-message("COMMAND1: ${CMAKE_COMMAND} -E create_symlink ${VisIt_install}/${VISIT_VERSION}/${VISIT_INSTALL_PLATFORM}/lib ${CMAKE_INSTALL_PREFIX}/lib/VisIt-${VISIT_VERSION}")
-
-message("COMMAND2: ${CMAKE_COMMAND} -E create_symlink ${VisIt_install}/${VISIT_VERSION}/${VISIT_INSTALL_PLATFORM}/plugins ${CMAKE_INSTALL_PREFIX}/lib/VisIt-${VISIT_VERSION}-plugins")
-
-ExternalProject_Add_Step(VisIt InstallVisItLibSymLink
-  COMMAND ${CMAKE_COMMAND} -E create_symlink ${VisIt_install}/${VISIT_VERSION}/${VISIT_INSTALL_PLATFORM}/lib ${CMAKE_INSTALL_PREFIX}/lib/VisIt-${VISIT_VERSION}
-  COMMAND ${CMAKE_COMMAND} -E create_symlink ${VisIt_install}/${VISIT_VERSION}/${VISIT_INSTALL_PLATFORM}/plugins ${CMAKE_INSTALL_PREFIX}/lib/VisIt-${VISIT_VERSION}-plugins
-  DEPENDEES install
-  WORKING_DIRECTORY ${cdat_CMAKE_BINARY_DIR})
-
-FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/visit_install_patch "MESSAGE(STATUS \"Executing VisIt post installation steps\")\n")
-FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/visit_install_patch "file(GLOB hdf5_files ${HDF5_install}/lib/libhdf5*${_LINK_LIBRARY_SUFFIX}*)\n")
-FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/visit_install_patch "file(COPY \${hdf5_files} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/VisIt-${VISIT_VERSION}/)\n")
-
-FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/visit_install_patch "file(GLOB netcdf_files ${netcdf_install}/lib/libnetcdf*${_LINK_LIBRARY_SUFFIX}*)\n")
-FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/visit_install_patch "file(COPY \${netcdf_files} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/VisIt-${VISIT_VERSION}/)\n")
-
-FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/visit_install_patch "file(GLOB z_files ${zlib_install}/lib/libz*${_LINK_LIBRARY_SUFFIX}*)\n")
-FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/visit_install_patch "file(COPY \${z_files} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/VisIt-${VISIT_VERSION}/)\n")
-
-FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/visit_install_patch "file(GLOB curl_files ${curl_install}/lib/libcurl*${_LINK_LIBRARY_SUFFIX}*)\n")
-FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/visit_install_patch "file(COPY \${curl_files} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/VisIt-${VISIT_VERSION}/)\n")
-
-ExternalProject_Add_Step(VisIt InstallVisItExternalLibraries
-  COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/visit_install_patch
-  DEPENDEES InstallVisItLibSymLink
-  WORKING_DIRECTORY ${cdat_CMAKE_BINARY_DIR}
-  )
-
-# clean up un-necessary database readers
-ExternalProject_Add_Step(VisIt RemoveUnnecessaryDatabaseReaders
-  COMMAND find . ! \( -iname "*netcdf*" -o -iname "*image*" -o -iname "*hdf5*" -o -iname "*pixie*" -o -iname "*vtk*" -o -iname "*mtk*" -o -iname "*xdmf*" \) -type f -delete
-  DEPENDEES install
-  WORKING_DIRECTORY ${VisIt_install}/${VISIT_VERSION}/${VISIT_INSTALL_PLATFORM}/plugins/databases)
-
-FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/r_ismev_package "r = getOption('repos'); r['CRAN'] = 'http://cran.us.r-project.org'; options(repos = r); rm(r); install.packages('ismev')")
-
-ExternalProject_Add_Step(VisIt AddRDependencies
-  COMMAND ${cdat_EXTERNALS}/bin/Rscript ${CMAKE_CURRENT_BINARY_DIR}/r_ismev_package
-  DEPENDEES install)
diff --git a/CMake/cdat_modules/visit_pkg.cmake b/CMake/cdat_modules/visit_pkg.cmake
deleted file mode 100644
index df8c7fab1..000000000
--- a/CMake/cdat_modules/visit_pkg.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(VISIT_MAJOR 2)
-set(VISIT_MINOR 6)
-set(VISIT_PATCH 0)
-set(VISIT_VERSION ${VISIT_MAJOR}.${VISIT_MINOR}.${VISIT_PATCH})
-set(VISIT_URL http://vis.lbl.gov/~visit)
-set(VISIT_GZ visit${VISIT_VERSION}.tar.gz)
-set(VISIT_MD5 cb7ff3e7d6e487a11786644a3b49331e )
-set(VISIT_SOURCE ${VISIT_URL}/${VISIT_GZ})
-
-add_cdat_package_dependent(VisIt "" "Build VisIt" OFF "CDAT_BUILD_GUI" OFF)
diff --git a/CMake/cdat_modules/vistrails_deps.cmake b/CMake/cdat_modules/vistrails_deps.cmake
deleted file mode 100644
index 98ae7150f..000000000
--- a/CMake/cdat_modules/vistrails_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(vistrails_deps ${python_pkg} ${cython_pkg} ${scipy_pkg})
diff --git a/CMake/cdat_modules/vistrails_external.cmake b/CMake/cdat_modules/vistrails_external.cmake
deleted file mode 100644
index ae8027c26..000000000
--- a/CMake/cdat_modules/vistrails_external.cmake
+++ /dev/null
@@ -1,92 +0,0 @@
-# Create an external project to clone vistrails,
-# and configure and build it
-
-include(GetGitRevisionDescription)
-set(vistrails_branch ${VISTRAILS_BRANCH})
-
-get_git_head_revision(refspec sha)
-
-string(REGEX REPLACE ".+/(.+)" "\\1" _branch "${refspec}")
-
-# Did we extract out the branch?
-if (NOT _branch STREQUAL "${refspec}")
-    # Get the remote the branh if from
-    get_git_remote_for_branch(${_branch} _remote)
-
-    if (_remote)
-        git_remote_url(${_remote} _url)
-
-        if (_url)
-            if(_url MATCHES "^.*uvcdat.git")
-              if(_branch STREQUAL "master")
-                set(vistrails_branch ${VISTRAILS_BRANCH})
-              elseif(_branch STREQUAL "release")
-                set(vistrails_branch ${VISTRAILS_BRANCH})
-              endif()
-            elseif(_url MATCHES "^.*uvcdat-devel.git")
-              set(vistrails_branch uvcdat-next)
-            endif()
-        endif()
-    endif()
-else()
-    message(WARNING "Unable to branch from '${refspec}' using default VisTrails branch")
-endif()
-
-if("${refspec}" STREQUAL "refs/heads/devel-master")
-  set(vistrails_branch uvcdat-next)
-endif()
-
-message("[INFO] Using vistrails branch: ${vistrails_branch}")
-
-set(vistrails_tag_point_message "Specify branch of vistrails to be used for UVCDAT")
-set(VISTRAILS_TAG_POINT ${vistrails_branch} CACHE STRING "${vistrails_tag_point_message}")
-set(vistrails_url "${VISTRAILS_SOURCE}")
-
-if(CDAT_AUTO_UPDATE_VISTRAILS_TAG_POINT)
-  set(VISTRAILS_TAG_POINT ${vistrails_branch} CACHE STRING "${vistrails_tag_point_message}" FORCE)
-endif()
-
-# For configure purposes
-set(SOURCE_DIR "${CMAKE_INSTALL_PREFIX}/vistrails")
-set(BRANCH ${VISTRAILS_TAG_POINT})
-set(GIT_URL "${vistrails_url}")
-set(GIT_TARGET "vistrails")
-
-option(CDAT_DELETE_VISTRAILS_HISTORY "Delete GIT history of vistrails" OFF)
-option(CDAT_AUTO_UPDATE_VISTRAILS_TAG_POINT "Delete GIT history of vistrails" ON)
-
-set(vistrails_install_command ${cdat_BINARY_DIR}/git_clone_vistrails.sh)
-if(EXISTS "${SOURCE_DIR}")
-  configure_file(
-    ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/git_update.sh.in
-    ${cdat_BINARY_DIR}/git_update_vistrails.sh
-    @ONLY
-  )
-  set(vistrails_install_command ${cdat_BINARY_DIR}/git_update_vistrails.sh)
-else()
-  configure_file(
-    ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/git_clone.sh.in
-    ${cdat_BINARY_DIR}/git_clone_vistrails.sh
-    @ONLY
-  )
-endif()
-
-ExternalProject_Add(vistrails
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${CMAKE_INSTALL_PREFIX}
-  BUILD_IN_SOURCE 0
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ""
-  INSTALL_COMMAND ${vistrails_install_command}
-  DEPENDS ${vistrails_DEPENDENCIES}
-  ${EP_LOG_OPTIONS}
-)
-
-if(CDAT_DELETE_VISTRAILS_HISTORY)
-  ExternalProject_Add_Step(vistrails after_install
-    COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_INSTALL_PREFIX}/vistrails/.git
-    DEPENDEES install
-    WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/vistrails
-  )
-endif()
-
diff --git a/CMake/cdat_modules/vistrails_pkg.cmake b/CMake/cdat_modules/vistrails_pkg.cmake
deleted file mode 100644
index de4704436..000000000
--- a/CMake/cdat_modules/vistrails_pkg.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-set(VISTRAILS_VERSION ${VISTRAILS_TAG_POINT})
-set(VISTRAILS_SOURCE "${GIT_PROTOCOL}github.com/UV-CDAT/VisTrails.git")
-set(VISTRAILS_VERSION uvcdat-2.4.0)
-set(VISTRAILS_MD5)
-set(VISTRAILS_BRANCH uvcdat-2.4.0)
-add_cdat_package_dependent(vistrails "" "" ON "CDAT_BUILD_GUI" OFF)
diff --git a/CMake/cdat_modules/vtk_deps.cmake b/CMake/cdat_modules/vtk_deps.cmake
deleted file mode 100644
index 015636f1f..000000000
--- a/CMake/cdat_modules/vtk_deps.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-set(VTK_deps ${pkgconfig_pkg} ${python_pkg} ${tiff_pkg} ${hdf5_pkg} ${freetype_pkg} ${netcdfplus_pkg} ${netcdf_pkg} ${proj4_pkg})
-
-if (NOT CDAT_BUILD_GUI)
-  list(APPEND VTK_deps ${qt_pkg})
-endif()
-
-if(NOT CDAT_BUILD_LEAN)
-  list(APPEND VTK_deps ${ffmpeg_pkg})
-endif()
-
-if(CDAT_BUILD_OFFSCREEN)
-  list(APPEND VTK_deps ${osmesa_pkg})
-endif()
diff --git a/CMake/cdat_modules/vtk_external.cmake b/CMake/cdat_modules/vtk_external.cmake
deleted file mode 100644
index 8e926a66c..000000000
--- a/CMake/cdat_modules/vtk_external.cmake
+++ /dev/null
@@ -1,184 +0,0 @@
-set(vtk_source "${CMAKE_CURRENT_BINARY_DIR}/build/VTK")
-set(vtk_binary "${CMAKE_CURRENT_BINARY_DIR}/build/VTK-build")
-set(vtk_install "${cdat_EXTERNALS}")
-
-set(GIT_CMD_STR GIT_REPOSITORY "${VTK_SOURCE}")
-
-set(_vtk_modules
-  vtkCommonComputationalGeometry
-  vtkCommonCore
-  vtkCommonExecutionModel
-  vtkCommonMisc
-  vtkCommonSystem
-  vtkCommonTransforms
-  vtkFiltersAMR
-  vtkFiltersCore
-  vtkFiltersExtraction
-  vtkFiltersFlowPaths
-  vtkFiltersGeneral
-  vtkFiltersGeneric
-  vtkFiltersGeometry
-  vtkFiltersHybrid
-  vtkFiltersImaging
-  vtkFiltersModeling
-  vtkFiltersSelection
-  vtkFiltersSMP
-  vtkFiltersSources
-  vtkFiltersStatistics
-  vtkFiltersTexture
-  vtkGeovisCore
-  vtkImagingColor
-  vtkImagingCore
-  vtkImagingGeneral
-  vtkImagingMath
-  vtkImagingSources
-  vtkImagingStencil
-  vtkInteractionImage
-  vtkInteractionStyle
-  vtkInteractionWidgets
-  vtkIOCore
-  vtkIOExport
-  vtkIOExportOpenGL
-  vtkIOGeometry
-  vtkIOImage
-  vtkIOImport
-  vtkRenderingCore
-  vtkRenderingFreeType
-  vtkRenderingFreeTypeOpenGL
-  vtkRenderingImage
-  vtkRenderingLabel
-  vtkRenderingOpenGL
-  vtkRenderingVolume
-  vtkRenderingVolumeOpenGL
-  vtkViewsCore
-  vtkViewsGeovis
-)
-
-if(NOT CDAT_BUILD_LEAN)
-  list(APPEND _vtk_modules "vtkIOFFMPEG")
-endif()
-
-# Either we use cdat zlib and libxml or system zlib and libxml
-list(APPEND vtk_build_args
-  -DVTK_USE_SYSTEM_ZLIB:BOOL=ON
-  -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON
-  -DVTK_USE_SYSTEM_HDF5:BOOL=ON
-  -DVTK_USE_SYSTEM_NETCDF:BOOL=ON
-  -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON
-  -DVTK_USE_SYSTEM_LIBPROJ4:BOOL=ON
-  -DVTK_RENDERING_BACKEND:STRING=OpenGL
-  -DLIBPROJ4_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/proj4/include
-  -DLIBPROJ4_LIBRARIES:FILEPATH=${cdat_EXTERNALS}/proj4/lib/libproj${_LINK_LIBRARY_SUFFIX}
-#
-)
-if (APPLE)
-  list(APPEND vtk_build_args
-    -DVTK_USE_SYSTEM_PNG:BOOL=OFF
-    -DVTK_USE_SYSTEM_JPEG:BOOL=OFF
-    )
-else()
-  list(APPEND vtk_build_args
-    -DVTK_USE_SYSTEM_PNG:BOOL=ON
-    -DVTK_USE_SYSTEM_JPEG:BOOL=ON
-  )
-endif()
-
-# Turn off testing and other non essential featues
-list(APPEND vtk_build_args
-  -DBUILD_TESTING:BOOL=OFF
-  -DCMAKE_PREFIX_PATH:PATH=${cdat_EXTERNALS}
-)
-
-# Use cdat zlib
-#if(NOT CDAT_USE_SYSTEM_ZLIB)
-#  list(APPEND vtk_build_args
-#    -DZLIB_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include
-#       -DZLIB_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
-#  )
-#endif()
-
-# Use cdat libxml
-#if(NOT CDAT_USE_SYSTEM_LIBXML2)
-#  list(APPEND vtk_build_args
-#    -DLIBXML2_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include/libxml2
-#    -DLIBXML2_LIBRARIES:FILEPATH=${cdat_EXTERNALS}/lib/libxml2${_LINK_LIBRARY_SUFFIX}
-#    -DLIBXML2_XMLLINT_EXECUTABLE:FILEPATH=${cdat_EXTERNALS}/bin/xmllint
-#  )
-#endif()
-
-# Use cdat hdf5
-if(NOT CDAT_USE_SYSTEM_HDF5)
-  list(APPEND vtk_build_args
-    -DHDF5_DIR:PATH=${cdat_EXTERNALS}/
-    -DHDF5_C_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include
-    -DHDF5_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include
-    -DHDF5_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libhdf5${_LINK_LIBRARY_SUFFIX}
-    -DHDF5_hdf5_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libhdf5${_LINK_LIBRARY_SUFFIX}
-    -DHDF5_hdf5_LIBRARY_RELEASE:FILEPATH=${cdat_EXTERNALS}/lib/libhdf5${_LINK_LIBRARY_SUFFIX}
-  )
-
-#  if(NOT CDAT_USE_SYSTEM_ZLIB)
-#    list(APPEND vtk_build_args
-#      -DHDF5_z_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
-#      -DHDF5_z_LIBRARY_RELEASE:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
-#    )
-#  endif()
-endif()
-
-if(CDAT_BUILD_OFFSCREEN)
-  list(APPEND vtk_build_args
-    "-DVTK_USE_X:BOOL=OFF"
-    "-DVTK_OPENGL_HAS_OSMESA:BOOL=ON"
-    "-DOPENGL_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include"
-    "-DOPENGL_gl_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libOSMesa${_LINK_LIBRARY_SUFFIX}"
-    "-DOPENGL_glu_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libGLU${_LINK_LIBRARY_SUFFIX}"
-    "-DOSMESA_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include"
-    "-DOSMESA_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libOSMesa${_LINK_LIBRARY_SUFFIX}"
-  )
-endif()
-
-if(CDAT_BUILD_WEB)
-  list(APPEND vtk_build_args
-    "-DVTK_Group_Web:BOOL=ON"
-  )
-endif()
-
-set(_vtk_module_options)
-foreach(_module ${_vtk_modules})
-  list(APPEND _vtk_module_options "-DModule_${_module}:BOOL=ON")
-endforeach()
-
-ExternalProject_Add(VTK
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${vtk_source}
-  BINARY_DIR ${vtk_binary}
-  INSTALL_DIR ${vtk_install}
-  ${GIT_CMD_STR}
-  GIT_TAG ${VTK_BRANCH}
-  UPDATE_COMMAND ""
-  PATCH_COMMAND ""
-  CMAKE_CACHE_ARGS
-    -DBUILD_SHARED_LIBS:BOOL=ON
-    -DBUILD_TESTING:BOOL=OFF
-    -DCMAKE_CXX_FLAGS:STRING=${cdat_tpl_cxx_flags}
-    -DCMAKE_C_FLAGS:STRING=${cdat_tpl_c_flags}
-    -DCMAKE_BUILD_TYPE:STRING=${CMAKE_CFG_INTDIR}
-    ${cdat_compiler_args}
-    ${vtk_build_args}
-    -DVTK_WRAP_PYTHON:BOOL=ON
-    -DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE}
-    -DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE}
-    -DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY}
-    -DPYTHON_MAJOR_VERSION:STRING=${PYTHON_MAJOR}
-    -DPYTHON_MINOR_VERSION:STRING=${PYTHON_MINOR}
-    -DVTK_Group_Rendering:BOOL=OFF
-    -DVTK_Group_StandAlone:BOOL=OFF
-    -DVTK_LEGACY_SILENT:BOOL=ON
-    ${_vtk_module_options}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-  DEPENDS ${VTK_deps}
-  ${ep_log_options}
-)
-
-unset(GIT_CMD_STR)
diff --git a/CMake/cdat_modules/vtk_pkg.cmake b/CMake/cdat_modules/vtk_pkg.cmake
deleted file mode 100644
index 35504cbac..000000000
--- a/CMake/cdat_modules/vtk_pkg.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-set(VTK_SOURCE ${GIT_PROTOCOL}github.com/UV-CDAT/VTK.git )
-set(VTK_MD5)
-set(VTK_BRANCH uvcdat-master)
-add_cdat_package_dependent(VTK "" "" ON "CDAT_BUILD_GRAPHICS" OFF)
diff --git a/CMake/cdat_modules/wget_deps.cmake b/CMake/cdat_modules/wget_deps.cmake
deleted file mode 100644
index 5c0406531..000000000
--- a/CMake/cdat_modules/wget_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(wget_deps)
diff --git a/CMake/cdat_modules/wget_external.cmake b/CMake/cdat_modules/wget_external.cmake
deleted file mode 100644
index 157c00038..000000000
--- a/CMake/cdat_modules/wget_external.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-set(wget_source "${CMAKE_CURRENT_BINARY_DIR}/build/wget")
-set(wget_install "${cdat_EXTERNALS}")
-
-ExternalProject_Add(Wget
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${wget_source}
-  INSTALL_DIR ${wget_install}
-  URL ${WGET_URL}/${WGET_GZ}
-  URL_MD5 ${WGET_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  DEPENDS ${wget_deps}
-  ${ep_log_options}
-)
-
diff --git a/CMake/cdat_modules/wget_pkg.cmake b/CMake/cdat_modules/wget_pkg.cmake
deleted file mode 100644
index 879dfc87d..000000000
--- a/CMake/cdat_modules/wget_pkg.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-set(LLNL_URL http://uv-cdat.llnl.gov/cdat/resources)
-set(WGET_MAJOR 1)
-set(WGET_MINOR 12)
-set(WGET_PATCH)
-set(WGET_URL ${LLNL_URL})
-set(WGET_GZ wget-${WGET_MAJOR}.${WGET_MINOR}.tar.gz)
-set(WGET_MD5 141461b9c04e454dc8933c9d1f2abf83)
-set(WGET_SOURCE ${WGET_URL}/${WGET_GZ})
-
-add_cdat_package(Wget "" "Build Wget" SYSTEM)
-
-set (nm WGET)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR}.${${nm}_MINOR})
-if(CDAT_BUILD_WGET)
-  if(WIN32)
-    set(WGET_EXECUTABLE ${cdat_EXTERNALS}/bin/wget.exe)
-  else()
-    set(WGET_EXECUTABLE ${cdat_EXTERNALS}/bin/wget)
-  endif()
-endif()
-if (${WGET_EXECUTABLE} STREQUAL "WGET_EXECUTABLE-NOTFOUND")
-    set(WGET_EXECUTABLE ${cdat_EXTERNALS}/bin/wget)
-endif()
-message("[INFO] WGET_EXECUTABLE is set to ${WGET_EXECUTABLE}")
-
-set(HASWGET ${WGET_EXECUTABLE})
-
diff --git a/CMake/cdat_modules/windfield_deps.cmake b/CMake/cdat_modules/windfield_deps.cmake
deleted file mode 100644
index bef69919b..000000000
--- a/CMake/cdat_modules/windfield_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(windfield_deps ${cdat_pkg})
diff --git a/CMake/cdat_modules/windfield_external.cmake b/CMake/cdat_modules/windfield_external.cmake
deleted file mode 100644
index 0be2b03c2..000000000
--- a/CMake/cdat_modules/windfield_external.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-# Windfield`
-#
-set(windfield_source "${CMAKE_CURRENT_BINARY_DIR}/build/windfield")
-
-ExternalProject_Add(windfield
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${windfield_source}
-  URL ${windfield_URL}/${windfield_GZ}
-  URL_MD5 ${windfield_MD5}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ${PYTHON_EXECUTABLE} setup.py build
-  INSTALL_COMMAND ${PYTHON_EXECUTABLE} setup.py install ${PYTHON_EXTRA_PREFIX}
-  DEPENDS ${windfield_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/windfield_pkg.cmake b/CMake/cdat_modules/windfield_pkg.cmake
deleted file mode 100644
index 1296543c6..000000000
--- a/CMake/cdat_modules/windfield_pkg.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-set(windfield_MAJOR )
-set(windfield_MINOR )
-set(windfield_VERSION 547534c636efc)
-set(windfield_URL ${LLNL_URL} )
-set(windfield_GZ windfield-${windfield_VERSION}.tar.bz2)
-set(windfield_MD5 48989935760da881424b6adb2cb96f44 )
-set(windfield_SOURCE ${windfield_URL}/${windfield_GZ})
-
-add_cdat_package_dependent(windfield "" "" OFF "CDAT_BUILD_LEAN" ON)
diff --git a/CMake/cdat_modules/windspharm_deps.cmake b/CMake/cdat_modules/windspharm_deps.cmake
deleted file mode 100644
index a6a45a3a9..000000000
--- a/CMake/cdat_modules/windspharm_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(windspharm_deps ${cdat_pkg})
diff --git a/CMake/cdat_modules/windspharm_external.cmake b/CMake/cdat_modules/windspharm_external.cmake
deleted file mode 100644
index a1c93750e..000000000
--- a/CMake/cdat_modules/windspharm_external.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-# windspharm
-#
-set(windspharm_source "${CMAKE_CURRENT_BINARY_DIR}/build/windspharm")
-
-ExternalProject_Add(windspharm
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${windspharm_source}
-  URL ${windspharm_URL}/${windspharm_GZ}
-  URL_MD5 ${windspharm_MD5}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ${PYTHON_EXECUTABLE} setup.py build
-  INSTALL_COMMAND env "PYTHONPATH=$ENV{PYTHONPATH}" "${PYTHON_EXECUTABLE}" setup.py install "${PYTHON_EXTRA_PREFIX}"
-  DEPENDS ${windspharm_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/windspharm_pkg.cmake b/CMake/cdat_modules/windspharm_pkg.cmake
deleted file mode 100644
index 4293b1a1c..000000000
--- a/CMake/cdat_modules/windspharm_pkg.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-set(windspharm_MAJOR )
-set(windspharm_MINOR )
-set(windspharm_VERSION 76a47fca1a)
-set(windspharm_URL ${LLNL_URL} )
-set(windspharm_GZ windspharm-${windspharm_VERSION}.zip)
-set(windspharm_MD5 8456da340724d332955f2ec946204cad)
-set(windspharm_SOURCE ${windspharm_URL}/${windspharm_GZ})
-
-add_cdat_package_dependent(windspharm "" "" OFF "CDAT_BUILD_LEAN" ON)
diff --git a/CMake/cdat_modules/x264_deps.cmake b/CMake/cdat_modules/x264_deps.cmake
deleted file mode 100644
index c4169909e..000000000
--- a/CMake/cdat_modules/x264_deps.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-# Not necessary in theory, but fixes race condition that was being experienced on Ubuntu
-set(X264_deps ${pkgconfig_pkg})
diff --git a/CMake/cdat_modules/x264_external.cmake b/CMake/cdat_modules/x264_external.cmake
deleted file mode 100644
index ad75bd4b9..000000000
--- a/CMake/cdat_modules/x264_external.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-# The X264 external project for ParaView
-set(x264_source "${CMAKE_CURRENT_BINARY_DIR}/build/X264")
-set(x264_install "${cdat_EXTERNALS}")
-set(ENV{PATH} $ENV{PATH}:${cdat_EXTERNALS}/bin)
-
-find_program(YASM_BIN "yasm")
-
-if (NOT YASM_BIN)
-  set(x264_conf_args --disable-asm^^--enable-shared)
-else()
-  set(x264_conf_args --enable-shared)
-endif()
-
-ExternalProject_Add(X264
-  LIST_SEPARATOR ^^
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${x264_source}
-  INSTALL_DIR ${x264_install}
-  URL ${X264_URL}/${X264_GZ}
-  URL_MD5 ${X264_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -DCONFIGURE_ARGS=${x264_conf_args} -DBASH_CONFIGURE=ON -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  DEPENDS ${X264_deps}
-  ${ep_log_options}
-  )
-
-set(X264_INCLUDE_DIR ${x264_install}/include)
diff --git a/CMake/cdat_modules/x264_pkg.cmake b/CMake/cdat_modules/x264_pkg.cmake
deleted file mode 100644
index ba832b026..000000000
--- a/CMake/cdat_modules/x264_pkg.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-set(X264_DATE 20151006)
-set(X264_TIME 2245)
-set(X264_ADDENDUM "")
-set(X264_URL ${LLNL_URL})
-set(X264_GZ x264-snapshot-${X264_DATE}-${X264_TIME}${X264_ADDENDUM}.tar.gz)
-set(X264_MD5 e8f5a0fc8db878bcdd256715472fe379)
-
-set (nm X264)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_DATE}.${${nm}_TIME})
-set(X264_SOURCE ${X264_URL}/${X264_GZ})
-
-add_cdat_package_dependent(X264 "" "" ON "CDAT_BUILD_GRAPHICS" OFF)
diff --git a/CMake/cdat_modules/xgks_external.cmake b/CMake/cdat_modules/xgks_external.cmake
deleted file mode 100644
index 1dcf22297..000000000
--- a/CMake/cdat_modules/xgks_external.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-
-set(xgks_source "${CMAKE_CURRENT_BINARY_DIR}/build/xgks")
-set(xgks_install "${cdat_EXTERNALS}")
-
-configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/xgks_configure_step.cmake.in
-  ${cdat_CMAKE_BINARY_DIR}/xgks_configure_step.cmake
-  @ONLY)
-
-#cp -f build/xgks*/port/misc/udposix.h /home/partyd/Projects/uv-cdat/make-install/Externals/include
-
-ExternalProject_Add(xgks
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${xgks_source}
-  INSTALL_DIR ${xgks_install}
-  URL ${XGKS_URL}/${XGKS_GZ}
-  URL_MD5 ${XGKS_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/xgks_configure_step.cmake
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/yasm_deps.cmake b/CMake/cdat_modules/yasm_deps.cmake
deleted file mode 100644
index 86ac65b48..000000000
--- a/CMake/cdat_modules/yasm_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(YASM_deps ${pkgconfig_pkg})
diff --git a/CMake/cdat_modules/yasm_external.cmake b/CMake/cdat_modules/yasm_external.cmake
deleted file mode 100644
index 9c1744b2d..000000000
--- a/CMake/cdat_modules/yasm_external.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-set(YASM_source "${CMAKE_CURRENT_BINARY_DIR}/build/YASM")
-set(YASM_install "${cdat_EXTERNALS}")
-
-ExternalProject_Add(YASM
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${YASM_source}
-  INSTALL_DIR ${YASM_install}
-  URL ${YASM_URL}/${YASM_GZ}
-  URL_MD5 ${YASM_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${CMAKE_COMMAND}  -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  DEPENDS ${YASM_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/yasm_pkg.cmake b/CMake/cdat_modules/yasm_pkg.cmake
deleted file mode 100644
index d4669fe88..000000000
--- a/CMake/cdat_modules/yasm_pkg.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-set(YASM_MAJOR_SRC 1)
-set(YASM_MINOR_SRC 2)
-set(YASM_PATCH_SRC 0)
-set(YASM_URL ${LLNL_URL})
-set(YASM_GZ yasm-${YASM_MAJOR_SRC}.${YASM_MINOR_SRC}.${YASM_PATCH_SRC}.tar.gz)
-set(YASM_MD5 4cfc0686cf5350dd1305c4d905eb55a6)
-set(YASM_SOURCE ${YASM_URL}/${YASM_GZ})
-
-set (nm YASM)
-string(TOUPPER ${nm} uc_nm)
-set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
-add_cdat_package(YASM "" "" OFF)
-
diff --git a/CMake/cdat_modules/zlib_deps.cmake b/CMake/cdat_modules/zlib_deps.cmake
deleted file mode 100644
index 3f2626fb6..000000000
--- a/CMake/cdat_modules/zlib_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(zlib_deps ${pkgconfig_pkg})
diff --git a/CMake/cdat_modules/zlib_external.cmake b/CMake/cdat_modules/zlib_external.cmake
deleted file mode 100644
index 09b6fd533..000000000
--- a/CMake/cdat_modules/zlib_external.cmake
+++ /dev/null
@@ -1,55 +0,0 @@
-
-# If Windows we use CMake otherwise ./configure
-if(WIN32)
-
-  set(zlib_source "${CMAKE_CURRENT_BINARY_DIR}/zlib")
-  set(zlib_binary "${CMAKE_CURRENT_BINARY_DIR}/zlib-build")
-  set(zlib_install "${cdat_EXTERNALS}")
-
-  ExternalProject_Add(zlib
-    DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-    SOURCE_DIR ${zlib_source}
-    BINARY_DIR ${zlib_build}
-    INSTALL_DIR ${zlib_install}
-    URL ${ZLIB_URL}/${ZLIB_GZ}
-    URL_MD5 ${ZLIB_MD5}
-    PATCH_COMMAND ${CMAKE_COMMAND} -E remove <SOURCE_DIR>/zconf.h
-    CMAKE_CACHE_ARGS
-      -DCMAKE_CXX_FLAGS:STRING=${pv_tpl_cxx_flags}
-      -DCMAKE_C_FLAGS:STRING=${pv_tpl_c_flags}
-      -DCMAKE_BUILD_TYPE:STRING=${CMAKE_CFG_INTDIR}
-      ${pv_tpl_compiler_args}
-      ${zlib_EXTRA_ARGS}
-    CMAKE_ARGS
-      -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-    ${ep_log_options}
-  )
-
-else()
-
-  set(zlib_source "${CMAKE_CURRENT_BINARY_DIR}/build/zlib")
-  set(zlib_install "${cdat_EXTERNALS}")
-  set(CONFIGURE_ARGS --shared)
-
-  ExternalProject_Add(zlib
-    DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-    SOURCE_DIR ${zlib_source}
-    INSTALL_DIR ${zlib_install}
-    URL ${ZLIB_URL}/${ZLIB_GZ}
-    URL_MD5 ${ZLIB_MD5}
-    PATCH_COMMAND ${CMAKE_COMMAND} -E remove <SOURCE_DIR>/zconf.h
-    BUILD_IN_SOURCE 1
-    CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCONFIGURE_ARGS=${CONFIGURE_ARGS} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cleanenv_configure_step.cmake
-    DEPENDS ${zlib_deps}
-    ${ep_log_options}
-  )
-
-endif()
-
-set(ZLIB_INCLUDE_DIR ${zlib_install}/include)
-
-if(WIN32)
-  set(ZLIB_LIBRARY optimized ${zlib_install}/lib/zlib${_LINK_LIBRARY_SUFFIX} debug ${zlib_install}/lib/zlibd${_LINK_LIBRARY_SUFFIX})
-else()
-  set(ZLIB_LIBRARY ${ZLIB_LIBRARY_PATH}/libz${_LINK_LIBRARY_SUFFIX})
-endif()
diff --git a/CMake/cdat_modules/zlib_pkg.cmake b/CMake/cdat_modules/zlib_pkg.cmake
deleted file mode 100644
index a34c30885..000000000
--- a/CMake/cdat_modules/zlib_pkg.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-set(ZLIB_PATCH_SRC 5 CACHE INTEGER "Version of ZLIB to use")
-MARK_AS_ADVANCED(ZLIB_PATCH_SRC)
-if (ZLIB_PATCH_SRC EQUAL 3)
-  set(ZLIB_MD5 debc62758716a169df9f62e6ab2bc634)
-elseif (ZLIB_PATCH_SRC EQUAL 5)
-  set(ZLIB_MD5 c735eab2d659a96e5a594c9e8541ad63)
-elseif (ZLIB_PATCH_SRC EQUAL 7)
-  set(ZLIB_MD5 60df6a37c56e7c1366cca812414f7b85)
-elseif (ZLIB_PATCH_SRC EQUAL 8)
-  set(ZLIB_MD5 44d667c142d7cda120332623eab69f40)
-else ()
-  message(FATAL_ERROR "error: invalid zlib patch number: '${ZLIB_PATCH_SRC}' valid: 3, 5, 7 or 8")
-endif()
-
-set(ZLIB_MAJOR_SRC 1)
-set(ZLIB_MINOR_SRC 2)
-#ZLIB_PATH_SRC and md5 is configured in CMakeLists.txt because on some RedHat system we need to change it ; # I don't believe this is true anymore durack1 23 Nov 2014
-#set(ZLIB_PATCH_SRC 8)
-set(ZLIB_VERSION ${ZLIB_MAJOR_SRC}.${ZLIB_MINOR_SRC}.${ZLIB_PATCH_SRC})
-set(ZLIB_URL ${LLNL_URL})
-set(ZLIB_GZ zlib-${ZLIB_VERSION}.tar.gz)
-set(ZLIB_SOURCE ${ZLIB_URL}/${ZLIB_GZ})
-
-add_cdat_package(zlib "" "" OFF)
diff --git a/CMake/cdat_modules/zmq_deps.cmake b/CMake/cdat_modules/zmq_deps.cmake
deleted file mode 100644
index 1ef560a28..000000000
--- a/CMake/cdat_modules/zmq_deps.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(ZMQ_deps ${sphinx_pkg} ${pip_pkg})
diff --git a/CMake/cdat_modules/zmq_external.cmake b/CMake/cdat_modules/zmq_external.cmake
deleted file mode 100644
index c4637b4b4..000000000
--- a/CMake/cdat_modules/zmq_external.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-
-set(zmq_source "${CMAKE_CURRENT_BINARY_DIR}/build/ZMQ")
-set(zmq_install "${cdat_EXTERNALS}")
-
-ExternalProject_Add(ZMQ
-  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
-  SOURCE_DIR ${zmq_source}
-  INSTALL_DIR ${zmq_install}
-  URL ${ZMQ_URL}/${ZMQ_GZ}
-  URL_MD5 ${ZMQ_MD5}
-  BUILD_IN_SOURCE 1
-  PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
-  DEPENDS ${ZMQ_deps}
-  ${ep_log_options}
-)
diff --git a/CMake/cdat_modules/zmq_pkg.cmake b/CMake/cdat_modules/zmq_pkg.cmake
deleted file mode 100644
index 26776a9f9..000000000
--- a/CMake/cdat_modules/zmq_pkg.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(ZMQ_MAJOR 4)
-set(ZMQ_MINOR 0)
-set(ZMQ_PATCH 4)
-set(ZMQ_VERSION ${ZMQ_MAJOR}.${ZMQ_MINOR}.${ZMQ_PATCH})
-set(ZMQ_URL ${LLNL_URL})
-set(ZMQ_GZ zeromq-${ZMQ_VERSION}.tar.gz)
-set(ZMQ_MD5 f3c3defbb5ef6cc000ca65e529fdab3b)
-set(ZMQ_SOURCE ${ZMQ_URL}/${ZMQ_GZ})
-
-add_cdat_package(ZMQ "" "" OFF)
diff --git a/CMake/cdat_modules_extra/CLAPACK_install_step.cmake.in b/CMake/cdat_modules_extra/CLAPACK_install_step.cmake.in
deleted file mode 100644
index cd9a7e539..000000000
--- a/CMake/cdat_modules_extra/CLAPACK_install_step.cmake.in
+++ /dev/null
@@ -1,38 +0,0 @@
-
-if(WIN32)
-
-  EXECUTE_PROCESS(
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different "@clapack_binary@/SRC/Release/lapack@_LINK_LIBRARY_SUFFIX@" "@clapack_install@/lib/"
-    )
-
-  EXECUTE_PROCESS(
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different "@clapack_binary@/BLAS/SRC/Release/blas@_LINK_LIBRARY_SUFFIX@" "@clapack_install@/lib/"
-    )
-
-  EXECUTE_PROCESS(
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different "@clapack_binary@/F2CLIBS/libf2c/Release/libf2c@_LINK_LIBRARY_SUFFIX@" "@clapack_install@/lib/"
-    )
-
-  EXECUTE_PROCESS(
-    COMMAND ${CMAKE_COMMAND} -E copy_directory "@clapack_source@/include" "@clapack_install@/include"
-    )
-
-else()
-
-  EXECUTE_PROCESS(
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different "@clapack_binary@/SRC/liblapack@_LINK_LIBRARY_SUFFIX@" "@clapack_install@/lib/"
-    )
-
-  EXECUTE_PROCESS(
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different "@clapack_binary@/BLAS/SRC/libblas@_LINK_LIBRARY_SUFFIX@" "@clapack_install@/lib/"
-    )
-
-  EXECUTE_PROCESS(
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different "@clapack_binary@/F2CLIBS/libf2c/libf2c@_LINK_LIBRARY_SUFFIX@" "@clapack_install@/lib/"
-    )
-
-  EXECUTE_PROCESS(
-    COMMAND ${CMAKE_COMMAND} -E copy_directory "@clapack_source@/include" "@clapack_install@/include"
-    )
-
-endif()
diff --git a/CMake/cdat_modules_extra/ESMF_install_step.cmake.in b/CMake/cdat_modules_extra/ESMF_install_step.cmake.in
deleted file mode 100644
index 8e754914f..000000000
--- a/CMake/cdat_modules_extra/ESMF_install_step.cmake.in
+++ /dev/null
@@ -1,35 +0,0 @@
-
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-set(ENV{ESMF_DIR} @ESMF_source@/esmf)
-set(ENV{ESMF_INSTALL_PREFIX} @ESMF_install@)
-set(ENV{ESMF_PTHREADS} @ESMF_pthreads@)
-set(ENV{ESMF_OS} @ESMF_os@)
-set(ENV{ESMF_COMPILER} @ESMF_compiler@)
-set(ENV{ESMF_COMM} @ESMF_comm@)
-set(ENV{ESMF_ABI} @ESMF_abi@)
-set(ENV{ESMF_OPENMP} @ESMF_openmp@)
-set(ENV{ESMF_MOAB} OFF)
-set(ENV{ESMF_ARRAYLITE} TRUE)
-set(ENV{CFLAGS} ${cdat_osx_flags_fortran})
-set(ENV{CXXFLAGS} ${cdat_osx_cxxflags_fortran})
-set(ENV{CPPFLAGS} ${cdat_osx_flags_fortran})
-set(ENV{FFLAGS} ${cdat_osx_flags_fortran})
-
-execute_process(
-  COMMAND make install
-  WORKING_DIRECTORY @ESMF_source@/esmf
-  OUTPUT_VARIABLE CDAT_OUT
-  ERROR_VARIABLE CDAT_ERR
-  RESULT_VARIABLE res)
-
-set(ESMF_source @ESMF_source@)
-set(ESMF_install @ESMF_install@)
-set(ESMF_COMM @mpiuni@)
-set(ESMF_pthreads @ESMF_pthreads@)
-
-if(NOT ${res} EQUAL 0)
-  message("Install Errors detected: \n${CDAT_OUT}\n${CDAT_ERR}")
-  message(FATAL_ERROR "Error in Install")
-endif()
-message("Install succeeded.")
diff --git a/CMake/cdat_modules_extra/ESMF_make_step.cmake.in b/CMake/cdat_modules_extra/ESMF_make_step.cmake.in
deleted file mode 100644
index 224067164..000000000
--- a/CMake/cdat_modules_extra/ESMF_make_step.cmake.in
+++ /dev/null
@@ -1,45 +0,0 @@
-
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-set(ENV{ESMF_DIR} @ESMF_source@/esmf)
-set(ENV{ESMF_INSTALL_PREFIX} @ESMF_install@)
-set(ENV{ESMF_PTHREADS} @ESMF_pthreads@)
-set(ENV{ESMF_OS} @ESMF_os@)
-set(ENV{ESMF_COMPILER} @ESMF_compiler@)
-set(ENV{ESMF_COMM} @ESMF_comm@)
-set(ENV{ESMF_ABI} @ESMF_abi@)
-set(ENV{ESMF_OPENMP} @ESMF_openmp@)
-set(ENV{ESMF_MOAB} OFF)
-set(ENV{ESMF_ARRAYLITE} TRUE)
-set(ENV{CFLAGS} ${cdat_osx_flags_fortran})
-set(ENV{CXXFLAGS} ${cdat_osx_cxxflags_fortran})
-set(ENV{CPPFLAGS} ${cdat_osx_flags_fortran})
-set(ENV{FFLAGS} ${cdat_osx_flags_fortran})
-
-
-
-## Store the configuration used to build ESMF
-set(outfile @ESMF_source@/set_esmf_env_ser.sh)
-file(WRITE ${outfile} "# ESMF compiled with these environment variables\n\n")
-file(APPEND ${outfile} "export ESMF_DIR=@ESMF_source@/esmf\n")
-file(APPEND ${outfile} "export ESMF_INSTALL_PREFIX=@ESMF_install@\n")
-file(APPEND ${outfile} "export ESMF_THREADS=@ESMF_pthreads@\n")
-file(APPEND ${outfile} "export ESMF_COMM=@ESMF_COMM@\n")
-file(APPEND ${outfile} "\n")
-file(APPEND ${outfile} "# Full information regarding the install is found in:\n")
-file(GLOB_RECURSE ESMF_mkfile "@ESMF_install@/lib/libO/e*.mk")
-file(APPEND ${outfile} "# "${ESMF_mkfile}"\n")
-
-# make should be detected by CMAKE at some point
-execute_process(
-  COMMAND make 
-  WORKING_DIRECTORY @ESMF_source@/esmf
-  OUTPUT_VARIABLE CDAT_OUT
-  ERROR_VARIABLE CDAT_ERR
-  RESULT_VARIABLE res)
-
-if(NOT ${res} EQUAL 0)
-  message("Make Errors detected: \n${CDAT_OUT}\n${CDAT_ERR}")
-  message(FATAL_ERROR "Error in Make:\n" ${res})
-endif()
-message("Make succeeded.")
diff --git a/CMake/cdat_modules_extra/ESMP_install_step.cmake.in b/CMake/cdat_modules_extra/ESMP_install_step.cmake.in
deleted file mode 100644
index 3d5d01f42..000000000
--- a/CMake/cdat_modules_extra/ESMP_install_step.cmake.in
+++ /dev/null
@@ -1,34 +0,0 @@
-
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-file(GLOB_RECURSE ESMP_esmfmkfile "@cdat_EXTERNALS@/lib/libO/*.mk")
-
-set(ENV{ESMFMKFILE} ${ESMP_esmfmkfile})
-foreach( item ${ESMP_esmfmkfile})
-  message("item " ${item})
-endforeach( item ${ESMP_esmfmkfile})
-
-execute_process(
-  COMMAND "@PYTHON_EXECUTABLE@" generateESMP_Config.py
-  WORKING_DIRECTORY @ESMP_source@
-  OUTPUT_VARIABLE CDAT_OUT
-  ERROR_VARIABLE CDAT_ERR
-  RESULT_VARIABLE res)
-
-if(NOT ${res} EQUAL 0)
-  message("Install Errors detected: \n${CDAT_OUT}\n${CDAT_ERR}")
-  message(FATAL_ERROR "Error in Install")
-endif()
-
-if(NOT EXISTS @ESMP_source@/src/ESMP_Config.py)
-  message(FATAL_ERROR "ESMP_Config.py not created")
-endif()
-
-file(INSTALL @ESMP_source@ DESTINATION @PYTHON_SITE_PACKAGES@)
-
-if(NOT EXISTS @PYTHON_SITE_PACKAGES@/ESMP/src/ESMP_Config.py)
-  message(FATAL_ERROR "Install process failed")
-endif()
-
-
-message("Install succeeded.")
diff --git a/CMake/cdat_modules_extra/ESMP_patch_step.cmake.in b/CMake/cdat_modules_extra/ESMP_patch_step.cmake.in
deleted file mode 100644
index 823fcdb8a..000000000
--- a/CMake/cdat_modules_extra/ESMP_patch_step.cmake.in
+++ /dev/null
@@ -1,9 +0,0 @@
-# Patch ESMP_LoadESMF.py to allow relative loading of config file
-if(NOT WIN32)
-  execute_process(
-    WORKING_DIRECTORY @ESMP_source@/src
-    COMMAND patch -p1 
-    INPUT_FILE @cdat_CMAKE_SOURCE_DIR@/ESMP.patch
-  )
-endif()
-
diff --git a/CMake/cdat_modules_extra/NUMPY_configure_step.cmake.in b/CMake/cdat_modules_extra/NUMPY_configure_step.cmake.in
deleted file mode 100644
index cee8497ed..000000000
--- a/CMake/cdat_modules_extra/NUMPY_configure_step.cmake.in
+++ /dev/null
@@ -1,42 +0,0 @@
-message("Configuring NUMPY:\n@NUMPY_binary@")
-set(ENV{@LIBRARY_PATH@} "@CMAKE_INSTALL_PREFIX@/lib:@cdat_EXTERNALS@/lib:$ENV{@LIBRARY_PATH@}")
-set(ENV{VS_UNICODE_OUTPUT} "")
-
-# As explained in site.cfg.example - See http://projects.scipy.org/numpy/browser/trunk/site.cfg.example
-# Directories listed in variable such as library_dirs or source_dirs should be separated using os.pathsep
-# On windows, the separator is ";" and ":" on unix-like platform
-set(path_sep ":")
-if(WIN32)
-  set(path_sep ";")
-endif()
-
-# As explained in site.cfg.example, the library name without the prefix "lib" should be used.
-# Nevertheless, on windows, only "libf2c" leads to a successful configuration and
-# installation of NUMPY
-set(f2c_libname "f2c")
-if(WIN32)
-  set(f2c_libname "libf2c")
-endif()
-
-# setup the site.cfg file
-file(WRITE "@NUMPY_binary@/site.cfg"
-"
-[blas]
-library_dirs = @cdat_EXTERNALS@/lib${path_sep}@cdat_EXTERNALS@/lib
-libraries = blas,${f2c_libname}
-
-[lapack]
-library_dirs = @cdat_EXTERNALS@/lib
-lapack_libs = lapack
-")
-
-execute_process(
-  COMMAND "@PYTHON_EXECUTABLE@" setup.py config
-  WORKING_DIRECTORY "@NUMPY_binary@"
-  RESULT_VARIABLE res
-  )
-
-if(NOT ${res} EQUAL 0)
-  message(FATAL_ERROR "Error in config of NUMPY")
-endif()
-message("Numpy config worked.")
diff --git a/CMake/cdat_modules_extra/NUMPY_install_step.cmake.in b/CMake/cdat_modules_extra/NUMPY_install_step.cmake.in
deleted file mode 100644
index feac845d5..000000000
--- a/CMake/cdat_modules_extra/NUMPY_install_step.cmake.in
+++ /dev/null
@@ -1,19 +0,0 @@
-message("Installing NUMPY:\n@NUMPY_PREFIX_ARGS@")
-set(ENV{@LIBRARY_PATH@} "@CMAKE_INSTALL_PREFIX@/lib:@cdat_EXTERNALS@/lib:$ENV{@LIBRARY_PATH@}")
-set(ENV{VS_UNICODE_OUTPUT} "")
-
-if(APPLE)
-    set(ENV{CFLAGS} "@cdat_osx_arch_flag@ @cdat_osx_version_flag@ @cdat_osx_sysroot@")
-endif()
-
-execute_process(
-  COMMAND "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
-  WORKING_DIRECTORY "@NUMPY_binary@"
-  RESULT_VARIABLE res
-)
-
-if(NOT ${res} EQUAL 0)
-  message("NUMPY Errors detected: \n${NUMPY_OUT}\n${NUMPY_ERR}")
-  message(FATAL_ERROR "Error in config of NUMPY")
-endif()
-message("Numpy install succeeded.")
diff --git a/CMake/cdat_modules_extra/NUMPY_make_step.cmake.in b/CMake/cdat_modules_extra/NUMPY_make_step.cmake.in
deleted file mode 100644
index 94b92ebd2..000000000
--- a/CMake/cdat_modules_extra/NUMPY_make_step.cmake.in
+++ /dev/null
@@ -1,21 +0,0 @@
-set(ENV{@LIBRARY_PATH@} "@CMAKE_INSTALL_PREFIX@/lib:@cdat_EXTERNALS@/lib:$ENV{@LIBRARY_PATH@}")
-set(ENV{VS_UNICODE_OUTPUT} "")
-
-if(APPLE)
-    set(ENV{CFLAGS} "@cdat_osx_arch_flag@ @cdat_osx_version_flag@ @cdat_osx_sysroot@")
-    set(ENV{LDFLAGS} "$ENV{LDFLAGS}")
-else()
-    set(ENV{LDFLAGS} "$ENV{LDFLAGS} -shared")
-endif()
-
-execute_process(
-  COMMAND "@PYTHON_EXECUTABLE@" setup.py build
-  WORKING_DIRECTORY "@NUMPY_binary@"
-  RESULT_VARIABLE res
-  OUTPUT_VARIABLE NUMPY_OUT
-  OUTPUT_VARIABLE NUMPY_ERR)
-
-if(NOT ${res} EQUAL 0)
-  message("[ERROR] NUMPY Errors detected: \n${NUMPY_OUT}\n${NUMPY_ERR}")
-  message(FATAL_ERROR "[ERROR] Error in config of NUMPY")
-endif()
diff --git a/CMake/cdat_modules_extra/PYLIBXML2_install_step.cmake.in b/CMake/cdat_modules_extra/PYLIBXML2_install_step.cmake.in
deleted file mode 100644
index 4a6e82762..000000000
--- a/CMake/cdat_modules_extra/PYLIBXML2_install_step.cmake.in
+++ /dev/null
@@ -1,21 +0,0 @@
-message("Installing PYLIBXML2:\n@PYLIBXML2_PREFIX_ARGS@")
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-set(ENV{@LIBRARY_PATH@} "@CMAKE_INSTALL_PREFIX@/lib:@cdat_EXTERNALS@/lib:$ENV{@LIBRARY_PATH@}")
-
-if(APPLE)
-    set(ENV{CFLAGS} "@cdat_osx_arch_flag@ @cdat_osx_version_flag@ @cdat_osx_sysroot@")
-endif()
-
-execute_process(
-  COMMAND env  @LIBRARY_PATH@="$ENV{LD_LIBRARY_PATH}" "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
-  WORKING_DIRECTORY "@PYLIBXML2_binary@/python"
-  RESULT_VARIABLE res
-  OUTPUT_VARIABLE PYLIBXML2_OUT
-  OUTPUT_VARIABLE PYLIBXML2_ERR
-)
-
-if(NOT ${res} EQUAL 0)
-  message("libxml2-python bindings Errors detected: \n${PYLIBXML2_OUT}\n${PYLIBXML2_ERR}")
-  message(FATAL_ERROR "Error in config of PYLIBXML2")
-endif()
-message("libxml2-python bindings install succeeded.")
diff --git a/CMake/cdat_modules_extra/PYLIBXML2_make_step.cmake.in b/CMake/cdat_modules_extra/PYLIBXML2_make_step.cmake.in
deleted file mode 100644
index 562cb24ff..000000000
--- a/CMake/cdat_modules_extra/PYLIBXML2_make_step.cmake.in
+++ /dev/null
@@ -1,24 +0,0 @@
-message("Building libxml2 python bindings:\n@PYLIBXML2_binary@")
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-set(ENV{@LIBRARY_PATH@} "@CMAKE_INSTALL_PREFIX@/lib:@cdat_EXTERNALS@/lib:$ENV{@LIBRARY_PATH@}")
-set(ENV{VS_UNICODE_OUTPUT} "")
-if(APPLE)
-    set(ENV{CFLAGS} "@cdat_osx_arch_flag@ @cdat_osx_version_flag@ @cdat_osx_sysroot@")
-endif()
-
-set(cdat_EXTERNALS @cdat_EXTERNALS@)
-configure_file(@cdat_CMAKE_SOURCE_DIR@/cdat_modules_extra/PYLIBXML2_setup.py.in
-  @cdat_BINARY_DIR@/build/PYLIBXML2/python/setup.py)
-
-execute_process(
-  COMMAND env  @LIBRARY_PATH@="$ENV{LD_LIBRARY_PATH}" "@PYTHON_EXECUTABLE@" setup.py build
-  WORKING_DIRECTORY "@PYLIBXML2_binary@/python"
-  RESULT_VARIABLE res
-  OUTPUT_VARIABLE PYLIBXML2_OUT
-  OUTPUT_VARIABLE PYLIBXML2_ERR)
-
-if(NOT ${res} EQUAL 0)
-  message("libxml2-python bindings Errors detected: \n${PYLIBXML2_OUT}\n${PYLIBXML2_ERR}")
-  message(FATAL_ERROR "Error in config of PYLIBXML2")
-endif()
-message("libxml2_python bindings build worked.")
diff --git a/CMake/cdat_modules_extra/PYLIBXML2_setup.py.in b/CMake/cdat_modules_extra/PYLIBXML2_setup.py.in
deleted file mode 100755
index 22fdbfb9b..000000000
--- a/CMake/cdat_modules_extra/PYLIBXML2_setup.py.in
+++ /dev/null
@@ -1,243 +0,0 @@
-#!/usr/bin/python -u
-#
-# Setup script for libxml2 and libxslt if found
-#
-import sys, os
-from distutils.core import setup, Extension
-
-# Below ROOT, we expect to find include, include/libxml2, lib and bin.
-# On *nix, it is not needed (but should not harm), 
-# on Windows, it is set by configure.js.
-ROOT = r'/usr' 
-
-# Thread-enabled libxml2
-with_threads = 1
-
-# If this flag is set (windows only), 
-# a private copy of the dlls are included in the package.
-# If this flag is not set, the libxml2 and libxslt
-# dlls must be found somewhere in the PATH at runtime.
-WITHDLLS = 1 and sys.platform.startswith('win')
-
-def missing(file):
-    if os.access(file, os.R_OK) == 0:
-        return 1
-    return 0
-
-try:
-    HOME = os.environ['HOME']
-except:
-    HOME="C:"
-
-if WITHDLLS:
-    # libxml dlls (expected in ROOT/bin)
-    dlls = [ 'iconv.dll','libxml2.dll','libxslt.dll','libexslt.dll' ]
-    dlls = map(lambda dll: os.path.join(ROOT,'bin',dll),dlls)
-
-    # create __init__.py for the libxmlmods package
-    if not os.path.exists("libxmlmods"):
-        os.mkdir("libxmlmods")
-        open("libxmlmods/__init__.py","w").close()
-
-    def altImport(s):
-        s = s.replace("import libxml2mod","from libxmlmods import libxml2mod")
-        s = s.replace("import libxsltmod","from libxmlmods import libxsltmod")
-        return s
-
-if sys.platform.startswith('win'):
-    libraryPrefix = 'lib'
-    platformLibs = []
-else:
-    libraryPrefix = ''
-    platformLibs = ["m","z"]
-
-# those are examined to find 
-# - libxml2/libxml/tree.h
-# - iconv.h 
-# - libxslt/xsltconfig.h
-includes_dir = [
-"/usr/include",
-"/usr/local/include",
-"/opt/include",
-os.path.join(ROOT,'include'),
-HOME,
-"@cdat_EXTERNALS@/include"
-];
-
-xml_includes=""
-for dir in includes_dir:
-    if not missing(dir + "/libxml2/libxml/tree.h"):
-        xml_includes=dir + "/libxml2"
-	break;
-
-if xml_includes == "":
-    print "failed to find headers for libxml2: update includes_dir"
-    sys.exit(1)
-
-iconv_includes=""
-for dir in includes_dir:
-    if not missing(dir + "/iconv.h"):
-        iconv_includes=dir
-	break;
-
-if iconv_includes == "":
-    print "failed to find headers for libiconv: update includes_dir"
-    sys.exit(1)
-
-# those are added in the linker search path for libraries
-libdirs = [
-os.path.join(ROOT,'lib'),
-]
-
-xml_files = ["libxml2-api.xml", "libxml2-python-api.xml",
-             "libxml.c", "libxml.py", "libxml_wrap.h", "types.c",
-	     "xmlgenerator.py", "README", "TODO", "drv_libxml2.py"]
-
-xslt_files = ["libxslt-api.xml", "libxslt-python-api.xml",
-             "libxslt.c", "libxsl.py", "libxslt_wrap.h",
-	     "xsltgenerator.py"]
-
-if missing("libxml2-py.c") or missing("libxml2.py"):
-    try:
-	try:
-	    import xmlgenerator
-	except:
-	    import generator
-    except:
-	print "failed to find and generate stubs for libxml2, aborting ..."
-	print sys.exc_type, sys.exc_value
-	sys.exit(1)
-
-    head = open("libxml.py", "r")
-    generated = open("libxml2class.py", "r")
-    result = open("libxml2.py", "w")
-    for line in head.readlines():
-        if WITHDLLS:
-            result.write(altImport(line))
-        else:
-            result.write(line)
-    for line in generated.readlines():
-	result.write(line)
-    head.close()
-    generated.close()
-    result.close()
-
-with_xslt=0
-if missing("libxslt-py.c") or missing("libxslt.py"):
-    if missing("xsltgenerator.py") or missing("libxslt-api.xml"):
-        print "libxslt stub generator not found, libxslt not built"
-    else:
-	try:
-	    import xsltgenerator
-	except:
-	    print "failed to generate stubs for libxslt, aborting ..."
-	    print sys.exc_type, sys.exc_value
-	else:
-	    head = open("libxsl.py", "r")
-	    generated = open("libxsltclass.py", "r")
-	    result = open("libxslt.py", "w")
-	    for line in head.readlines():
-                if WITHDLLS:
-                    result.write(altImport(line))
-                else:
-                    result.write(line)
-	    for line in generated.readlines():
-		result.write(line)
-	    head.close()
-	    generated.close()
-	    result.close()
-	    with_xslt=1
-else:
-    with_xslt=1
-
-if with_xslt == 1:
-    xslt_includes=""
-    for dir in includes_dir:
-	if not missing(dir + "/libxslt/xsltconfig.h"):
-	    xslt_includes=dir + "/libxslt"
-	    break;
-
-    if xslt_includes == "":
-	print "failed to find headers for libxslt: update includes_dir"
-	with_xslt = 0
-
-
-descr = "libxml2 package"
-modules = [ 'libxml2', 'drv_libxml2' ]
-if WITHDLLS:
-    modules.append('libxmlmods.__init__')
-c_files = ['libxml2-py.c', 'libxml.c', 'types.c' ]
-includes= [xml_includes, iconv_includes]
-libs    = [libraryPrefix + "xml2"] + platformLibs
-macros  = []
-if with_threads:
-    macros.append(('_REENTRANT','1'))
-if with_xslt == 1:
-    descr = "libxml2 and libxslt package"
-    if not sys.platform.startswith('win'):
-        #
-        # We are gonna build 2 identical shared libs with merge initializing
-        # both libxml2mod and libxsltmod
-        #
-        c_files = c_files + ['libxslt-py.c', 'libxslt.c']
-        xslt_c_files = c_files
-        macros.append(('MERGED_MODULES', '1'))
-    else:
-        #
-        # On windows the MERGED_MODULE option is not needed
-        # (and does not work)
-        #
-        xslt_c_files = ['libxslt-py.c', 'libxslt.c', 'types.c']
-    libs.insert(0, libraryPrefix + 'exslt')
-    libs.insert(0, libraryPrefix + 'xslt')
-    includes.append(xslt_includes)
-    modules.append('libxslt')
-
-
-extens=[Extension('libxml2mod', c_files, include_dirs=includes,
-                  library_dirs=libdirs, 
-                  libraries=libs, define_macros=macros)] 
-if with_xslt == 1:
-    extens.append(Extension('libxsltmod', xslt_c_files, include_dirs=includes,
-			    library_dirs=libdirs, 
-                            libraries=libs, define_macros=macros))
-
-if missing("MANIFEST"):
-
-    manifest = open("MANIFEST", "w")
-    manifest.write("setup.py\n")
-    for file in xml_files:
-        manifest.write(file + "\n")
-    if with_xslt == 1:
-	for file in xslt_files:
-	    manifest.write(file + "\n")
-    manifest.close()
-
-if WITHDLLS:
-    ext_package = "libxmlmods"
-    if sys.version >= "2.2":
-        base = "lib/site-packages/"
-    else:
-        base = ""
-    data_files = [(base+"libxmlmods",dlls)]
-else:
-    ext_package = None
-    data_files = []
-
-setup (name = "libxml2-python",
-       # On *nix, the version number is created from setup.py.in
-       # On windows, it is set by configure.js
-       version = "2.7.8",
-       description = descr,
-       author = "Daniel Veillard",
-       author_email = "veillard@redhat.com",
-       url = "http://xmlsoft.org/python.html",
-       licence="MIT Licence",
-       py_modules=modules,
-       ext_modules=extens,
-       ext_package=ext_package,
-       data_files=data_files,
-       )
-
-sys.exit(0)
-
diff --git a/CMake/cdat_modules_extra/SCIPY_configure_step.cmake.in b/CMake/cdat_modules_extra/SCIPY_configure_step.cmake.in
deleted file mode 100644
index 00d381497..000000000
--- a/CMake/cdat_modules_extra/SCIPY_configure_step.cmake.in
+++ /dev/null
@@ -1,62 +0,0 @@
-message("Configuring SCIPY:\n@SCIPY_binary@")
-set(ENV{@LIBRARY_PATH@} "@CMAKE_INSTALL_PREFIX@/lib:@cdat_EXTERNALS@/lib:$ENV{@LIBRARY_PATH@}")
-set(ENV{VS_UNICODE_OUTPUT} "")
-set(ENV{PYTHONPATH} "@PYTHONPATH@")
-set(ENV{PATH} "@SB_BIN_DIR@:$ENV{PATH}")
-
-# As explained in site.cfg.example - See http://projects.scipy.org/scipy/browser/trunk/site.cfg.example
-# Directories listed in variable such as library_dirs or source_dirs should be separated using os.pathsep
-# On windows, the separator is ";" and ":" on unix-like platform
-set(path_sep ":")
-if(WIN32)
-  set(path_sep ";")
-endif()
-
-# As explained in site.cfg.example, the library name without the prefix "lib" should be used.
-# Nevertheless, on windows, only "libf2c" leads to a successful configuration and
-# installation of SCIPY
-set(f2c_libname "f2c")
-if(WIN32)
-  set(f2c_libname "libf2c")
-endif()
-
-set(_blas_dirs)
-set(_lapack_dirs)
-
-if (CDAT_USE_SYSTEM_LAPACK)
-  foreach(_path ${BLAS_LIBRARIES})
-    get_filename_component(_dir ${_path} PATH)
-    list(APPEND _blas_dirs ${_dir})
-  endforeach()
-
-  foreach(_path ${LAPACK_LIBRARIES})
-    get_filename_component(_dir ${_path} PATH)
-    list(APPEND _lapack_dirs ${_dir})
-  endforeach()
-else()
-  set(_blas_dirs @cdat_EXTERNALS@/lib)
-  set(_lapack_dirs @cdat_EXTERNALS@/lib)
-endif()
-
-# setup the site.cfg file
-file(WRITE "@SCIPY_binary@/site.cfg"
-"
-[blas]
-library_dirs = ${_blas_dirs}
-libraries = blas,${f2c_libname}
-
-[lapack]
-library_dirs = ${_lapack_dirs}
-lapack_libs = lapack
-")
-
-execute_process(
-  COMMAND "@PYTHON_EXECUTABLE@" setup.py config
-  WORKING_DIRECTORY "@SCIPY_binary@"
-  RESULT_VARIABLE res
-  )
-
-if(NOT ${res} EQUAL 0)
-  message(FATAL_ERROR "Error in config of SCIPY")
-endif()
-message("Scipy config worked.")
diff --git a/CMake/cdat_modules_extra/SCIPY_install_step.cmake.in b/CMake/cdat_modules_extra/SCIPY_install_step.cmake.in
deleted file mode 100644
index 34a3e9eda..000000000
--- a/CMake/cdat_modules_extra/SCIPY_install_step.cmake.in
+++ /dev/null
@@ -1,21 +0,0 @@
-message("Installing SCIPY:\n@SCIPY_PREFIX_ARGS@")
-set(ENV{@LIBRARY_PATH@} "@CMAKE_INSTALL_PREFIX@/lib:@cdat_EXTERNALS@/lib:$ENV{@LIBRARY_PATH@}")
-set(ENV{VS_UNICODE_OUTPUT} "")
-set(ENV{PYTHONPATH} "@PYTHONPATH@")
-set(ENV{PATH} "@SB_BIN_DIR@:$ENV{PATH}")
-
-if(APPLE)
-    set(ENV{CFLAGS} "@cdat_osx_arch_flag@ @cdat_osx_version_flag@ @cdat_osx_sysroot@")
-endif()
-
-execute_process(
-  COMMAND "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
-  WORKING_DIRECTORY "@SCIPY_binary@"
-  RESULT_VARIABLE res
-)
-
-if(NOT ${res} EQUAL 0)
-  message("SCIPY Errors detected: \n${SCIPY_OUT}\n${SCIPY_ERR}")
-  message(FATAL_ERROR "Error in config of SCIPY")
-endif()
-message("Scipy install succeeded.")
diff --git a/CMake/cdat_modules_extra/SCIPY_make_step.cmake.in b/CMake/cdat_modules_extra/SCIPY_make_step.cmake.in
deleted file mode 100644
index c8d533cb1..000000000
--- a/CMake/cdat_modules_extra/SCIPY_make_step.cmake.in
+++ /dev/null
@@ -1,22 +0,0 @@
-message("Building SCIPY:\n@SCIPY_binary@")
-set(ENV{@LIBRARY_PATH@} "@CMAKE_INSTALL_PREFIX@/lib:@cdat_EXTERNALS@/lib:$ENV{@LIBRARY_PATH@}")
-set(ENV{VS_UNICODE_OUTPUT} "")
-set(ENV{PYTHONPATH} "@PYTHONPATH@")
-set(ENV{PATH} "@SB_BIN_DIR@:$ENV{PATH}")
-
-if(APPLE)
-    set(ENV{CFLAGS} "@cdat_osx_arch_flag@ @cdat_osx_version_flag@ @cdat_osx_sysroot@")
-endif()
-
-execute_process(
-  COMMAND "@PYTHON_EXECUTABLE@" setup.py build
-  WORKING_DIRECTORY "@SCIPY_binary@"
-  RESULT_VARIABLE res
-  OUTPUT_VARIABLE SCIPY_OUT
-  OUTPUT_VARIABLE SCIPY_ERR)
-
-if(NOT ${res} EQUAL 0)
-  message("SCIPY Errors detected: \n${SCIPY_OUT}\n${SCIPY_ERR}")
-  message(FATAL_ERROR "Error in config of SCIPY")
-endif()
-message("Scipy build worked.")
diff --git a/CMake/cdat_modules_extra/basemap_install_step.cmake.in b/CMake/cdat_modules_extra/basemap_install_step.cmake.in
deleted file mode 100644
index 95cb49de7..000000000
--- a/CMake/cdat_modules_extra/basemap_install_step.cmake.in
+++ /dev/null
@@ -1,20 +0,0 @@
-message("Installing basemap:\n@basemap_PREFIX_ARGS@")
-set(ENV{@LIBRARY_PATH@} "@CMAKE_INSTALL_PREFIX@/lib:@cdat_EXTERNALS@/lib:$ENV{@LIBRARY_PATH@}")
-set(ENV{VS_UNICODE_OUTPUT} "")
-set(ENV{GEOS_DIR} "@cdat_EXTERNALS@")
-
-if(APPLE)
-    set(ENV{CFLAGS} "@cdat_osx_arch_flag@ @cdat_osx_version_flag@ @cdat_osx_sysroot@")
-endif()
-
-execute_process(
-  COMMAND "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
-  WORKING_DIRECTORY "@basemap_binary@"
-  RESULT_VARIABLE res
-)
-
-if(NOT ${res} EQUAL 0)
-  message("basemap Errors detected: \n${basemap_OUT}\n${basemap_ERR}")
-  message(FATAL_ERROR "Error in config of basemap")
-endif()
-message("Numpy install succeeded.")
diff --git a/CMake/cdat_modules_extra/basemap_make_step.cmake.in b/CMake/cdat_modules_extra/basemap_make_step.cmake.in
deleted file mode 100644
index 0789e4dda..000000000
--- a/CMake/cdat_modules_extra/basemap_make_step.cmake.in
+++ /dev/null
@@ -1,20 +0,0 @@
-message("Building basemap:\n@basemap_binary@")
-set(ENV{@LIBRARY_PATH@} "@CMAKE_INSTALL_PREFIX@/lib:@cdat_EXTERNALS@/lib:$ENV{@LIBRARY_PATH@}")
-set(ENV{VS_UNICODE_OUTPUT} "")
-set(ENV{GEOS_DIR} "@cdat_EXTERNALS@")
-if(APPLE)
-    set(ENV{CFLAGS} "@cdat_osx_arch_flag@ @cdat_osx_version_flag@ @cdat_osx_sysroot@")
-endif()
-
-execute_process(
-  COMMAND "@PYTHON_EXECUTABLE@" setup.py build
-  WORKING_DIRECTORY "@basemap_binary@"
-  RESULT_VARIABLE res
-  OUTPUT_VARIABLE basemap_OUT
-  OUTPUT_VARIABLE basemap_ERR)
-
-if(NOT ${res} EQUAL 0)
-  message("basemap Errors detected: \n${basemap_OUT}\n${basemap_ERR}")
-  message(FATAL_ERROR "Error in config of basemap")
-endif()
-message("basemap build worked.")
diff --git a/CMake/cdat_modules_extra/cdat.in b/CMake/cdat_modules_extra/cdat.in
deleted file mode 100755
index 7bfcf620b..000000000
--- a/CMake/cdat_modules_extra/cdat.in
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-# source is not portable whereas . is
-. "@CMAKE_INSTALL_PREFIX@/bin/setup_runtime.sh"
-python@PYVER@ "$@"
diff --git a/CMake/cdat_modules_extra/cdat_cmake_make_step.cmake.in b/CMake/cdat_modules_extra/cdat_cmake_make_step.cmake.in
deleted file mode 100644
index 5f5674fc1..000000000
--- a/CMake/cdat_modules_extra/cdat_cmake_make_step.cmake.in
+++ /dev/null
@@ -1,18 +0,0 @@
-
-if(NOT APPLE)
-  include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-endif()
-
-execute_process(
-  COMMAND make "${BUILD_ARGS}"
-  OUTPUT_VARIABLE CDAT_OUT
-  ERROR_VARIABLE  CDAT_ERR
-  WORKING_DIRECTORY "${WORKING_DIR}"
-  RESULT_VARIABLE res)
-
-if(NOT ${res} EQUAL 0)
-  message("Make Errors detected: \n${CDAT_OUT}\n${CDAT_ERR}")
-  message(FATAL_ERROR "Error in Make")
-endif()
-message("Make succeeded.")
-
diff --git a/CMake/cdat_modules_extra/cdat_common_environment.cmake.in b/CMake/cdat_modules_extra/cdat_common_environment.cmake.in
deleted file mode 100644
index 7a29f8005..000000000
--- a/CMake/cdat_modules_extra/cdat_common_environment.cmake.in
+++ /dev/null
@@ -1,39 +0,0 @@
-message("[INFO] ADDITIONAL CFLAGS ${ADDITIONAL_CFLAGS}")
-set(ENV{PATH} "@SB_BIN_DIR@:@cdat_EXTERNALS@/bin:$ENV{PATH}")
-set(ENV{@LIBRARY_PATH@} "@CMAKE_INSTALL_PREFIX@/lib:@cdat_EXTERNALS@/lib:@cdat_EXTERNALS@/lib64:@cdat_EXTERNALS@/lib/paraview-@PARAVIEW_MAJOR@.@PARAVIEW_MINOR@:$ENV{@LIBRARY_PATH@}")
-if (NOT DEFINED SKIP_LDFLAGS)
- set(ENV{LDFLAGS} "-L@cdat_EXTERNALS@/lib -L@cdat_EXTERNALS@/lib64 @cdat_external_link_directories@ -Wl,-rpath,@cdat_EXTERNALS@/lib64 @cdat_rpath_flag@@CMAKE_INSTALL_PREFIX@/lib @cdat_rpath_flag@@cdat_EXTERNALS@/lib")
-endif()
-set(ENV{CFLAGS} "-I@cdat_EXTERNALS@/include -I@cdat_EXTERNALS@/lib/libffi-3.1/include @cdat_osx_flags@ @cdat_external_include_directories@ ${ADDITIONAL_CFLAGS}")
-set(ENV{CPPFLAGS} "-I@cdat_EXTERNALS@/include -I@cdat_EXTERNALS@/lib/libffi-3.1/include @cdat_osx_cppflags@ @cdat_external_include_directories@ ${ADDITIONAL_CPPFLAGS}")
-set(ENV{CXXFLAGS} "-I@cdat_EXTERNALS@/include -I@cdat_EXTERNALS@/lib/libffi-3.1/include @cdat_osx_cxxflags@ ${ADDITIONAL_CXXFLAGS}")
-set(ENV{PKG_CONFIG_PATH} "@cdat_EXTERNALS@/lib/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig:$ENV{PKG_CONFIG_PATH}")
-set(ENV{PKG_CONFIG} "@cdat_PKG_CONFIG_EXECUTABLE@")
-set(ENV{FC} "")
-set(ENV{FCFLAGS} "")
-set(ENV{FCLIBS} "")
-set(ENV{F77} "")
-set(ENV{FFLAGS} "")
-set(ENV{FLIBS} "")
-set(ENV{LD_X11} "") # for xgks
-set(ENV{PYTHONPATH} @PYTHONPATH@)
-set(ENV{CC} @CMAKE_C_COMPILER@)
-
-if(APPLE)
-  set(ENV{MAC_OSX_DEPLOYMENT_TARGET} "@CMAKE_OSX_DEPLOYMENT_TARGET@")
-endif()
-
-set(ENV{EXTERNALS} "@cdat_EXTERNALS@")
-
-set(PYTHONUSERBASE @PYTHON_SITE_PACKAGES_PREFIX@)
-#if ("@EGG_INSTALLER@" STREQUAL "PIP")
-#    # Set python userbase so that pip install packages locally
-#    set(PYTHONUSERBASE @CMAKE_INSTALL_PREFIX@)
-#    set(EGG_CMD env @LIBRARY_PATH@=$ENV{@LIBRARY_PATH@} PYTHONUSERBASE=${PYTHONUSERBASE} @PIP_BINARY@ install --user -v --download-cache @CDAT_PACKAGE_CACHE_DIR@ )
-#    if (NOT "${PIP_CERTIFICATE}" STREQUAL "")
-#        set(EGG_CMD ${EGG_CMD} --cert=${PIP_CERTIFICATE})
-#    endif()
-#else()
-#    set(EGG_CMD env @LD_LIBRARY_PATH@=$ENV{@LIBRARY_PATH@} @EASY_INSTALL_BINARY@ )
-#endif()
-
diff --git a/CMake/cdat_modules_extra/cdat_configure_step.cmake.in b/CMake/cdat_modules_extra/cdat_configure_step.cmake.in
deleted file mode 100644
index 32ecb43f0..000000000
--- a/CMake/cdat_modules_extra/cdat_configure_step.cmake.in
+++ /dev/null
@@ -1,30 +0,0 @@
-set(ENV{PKG_CONFIG_PATH} "@cdat_EXTERNALS@/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:$ENV{PKG_CONFIG_PATH}")
-set(ENV{PKG_CONFIG} "@cdat_PKG_CONFIG_EXECUTABLE@")
-
-if (BASH_CONFIGURE)
-	set(CONFIGURE_SHELL "bash")
-else()
-	set(CONFIGURE_SHELL "sh")
-endif()
-
-if (CONF_PATH_XTRA)
-  message("[INFO] configure is in subdirectory: ${CONF_PATH_XTRA}")
-else()
-  set(CONF_PATH_XTRA ".")
-endif()
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-message("CONFIGURE_ARGS IS ${CONFIGURE_ARGS}")
-message("LD_ARGS IS $ENV{@LIBRARY_PATH@}")
-message("CFLAGS : $ENV{CFLAGS}")
-
-execute_process(
-  COMMAND env CC=$ENV{CC} CFLAGS=$ENV{CFLAGS} LD_LIBRARY_PATH=$ENV{@LIBRARY_PATH@} DYLD_FALLBACK_LIBRARY_PATH=$ENV{@LIBRARY_PATH@} @LIBRARY_PATH@=$ENV{@LIBRARY_PATH@} PKG_CONFIG=$ENV{PKG_CONFIG} PKG_CONFIG_PATH=$ENV{PKG_CONFIG_PATH} ${CONFIGURE_SHELL} ${CONF_PATH_XTRA}/configure --prefix=${INSTALL_DIR} ${CONFIGURE_ARGS}
-  WORKING_DIRECTORY "${WORKING_DIR}"
-  RESULT_VARIABLE res)
-
-if(NOT ${res} EQUAL 0)
-  message("Config Errors detected: \n${CDAT_OUT}\n${CDAT_ERR}")
-  message(FATAL_ERROR "Error in config")
-endif()
-message("Config succeeded.")
diff --git a/CMake/cdat_modules_extra/cdat_download_sample_data.cmake.in b/CMake/cdat_modules_extra/cdat_download_sample_data.cmake.in
deleted file mode 100644
index f8cf8e0fa..000000000
--- a/CMake/cdat_modules_extra/cdat_download_sample_data.cmake.in
+++ /dev/null
@@ -1,10 +0,0 @@
-file(READ @cdat_SOURCE_DIR@/Packages/dat/files.txt SAMPLE_FILES)
-string(REPLACE "\n" ";" SAMPLE_LIST ${SAMPLE_FILES})
-foreach(SAMPLE_FILE ${SAMPLE_LIST})
-  STRING(REPLACE "  " ";" DOWNLOAD_LIST ${SAMPLE_FILE})
-  LIST(GET DOWNLOAD_LIST 0 MD5)
-  LIST(GET DOWNLOAD_LIST 1 FILE_NM)
-  message("[INFO] Attempting to download http://uv-cdat.llnl.gov/cdat/sample_data/${FILE_NM} WITH MD5 ${MD5} to @CMAKE_INSTALL_PREFIX@/share/uvcdat/sample_data/${FILE_NM}")
-  file(DOWNLOAD http://uv-cdat.llnl.gov/cdat/sample_data/${FILE_NM} @CMAKE_INSTALL_PREFIX@/share/uvcdat/sample_data/${FILE_NM} EXPECTED_MD5=${MD5})
-endforeach()
-set(res 0)
diff --git a/CMake/cdat_modules_extra/cdat_install_step.cmake.in b/CMake/cdat_modules_extra/cdat_install_step.cmake.in
deleted file mode 100644
index 62fe3fa78..000000000
--- a/CMake/cdat_modules_extra/cdat_install_step.cmake.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-execute_process(
-  COMMAND make install ${INSTALL_ARGS}
-  WORKING_DIRECTORY "${WORKING_DIR}"
-  RESULT_VARIABLE res)
-
-if(NOT ${res} EQUAL 0)
-  message("Install Errors detected: \n${CDAT_OUT}\n${CDAT_ERR}")
-  message(FATAL_ERROR "Error in install")
-endif()
-message("Install succeeded.")
diff --git a/CMake/cdat_modules_extra/cdat_make_step.cmake.in b/CMake/cdat_modules_extra/cdat_make_step.cmake.in
deleted file mode 100644
index 59a4f113e..000000000
--- a/CMake/cdat_modules_extra/cdat_make_step.cmake.in
+++ /dev/null
@@ -1,18 +0,0 @@
-
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-if(NOT ${make})
-  set(make make)
-endif()
-execute_process(
-  COMMAND env CFLAGS=$ENV{CFLAGS} LDFLAGS=$ENV{LDFLAGS} CPPFLAGS=$ENV{CPPFLAGS} CXXFLAGS=$ENV{CXXFLAG} ${make} -j ${BUILD_ARGS}
-  WORKING_DIRECTORY "${WORKING_DIR}"
-  OUTPUT_VARIABLE CDAT_OUT
-  ERROR_VARIABLE CDAT_ERR
-  RESULT_VARIABLE res)
-
-if(NOT ${res} EQUAL 0)
-  message("[ERROR] Make Errors detected: \n${CDAT_OUT}\n${CDAT_ERR}")
-  message(FATAL_ERROR "Error in Make")
-endif()
-
diff --git a/CMake/cdat_modules_extra/cdat_python_install_step.cmake.in b/CMake/cdat_modules_extra/cdat_python_install_step.cmake.in
deleted file mode 100644
index 87855421a..000000000
--- a/CMake/cdat_modules_extra/cdat_python_install_step.cmake.in
+++ /dev/null
@@ -1,30 +0,0 @@
-
-if(NOT APPLE)
-  set(ENV{@LIBRARY_PATH@} "@CMAKE_INSTALL_PREFIX@/lib:@cdat_EXTERNALS@/lib:$ENV{@LIBRARY_PATH@}")
-endif()
-
-set(ENV{CPPFLAGS} "-I@cdat_EXTERNALS@/include -I@cdat_EXTERNALS@/include/cairo @ADDITIONAL_CPPFLAGS@")
-set(ENV{CXXFLAGS} "-I@cdat_EXTERNALS@/include -I@cdat_EXTERNALS@/include/cairo @ADDITIONAL_CXXFLAGS@")
-set(ENV{CFLAGS} "-w -I@cdat_EXTERNALS@/include -I@cdat_EXTERNALS@/include/cairo @ADDITIONAL_CFLAGS@")
-set(ENV{LOCNCCONFIG} "@cdat_EXTERNALS@/bin/nc-config")
-set(ENV{EXTERNALS} "@cdat_EXTERNALS@")
-set(ENV{PKG_CONFIG_PATH} "@cdat_EXTERNALS@/lib/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig:$ENV{PKG_CONFIG_PATH}")
-set(ENV{PKG_CONFIG} "@cdat_PKG_CONFIG_EXECUTABLE@")
-
-message("Running cdat install with path: " $ENV{PATH})
-
-if(APPLE)
-  set(ENV{MAC_OSX_DEPLOYMENT_TARGET} "@CMAKE_OSX_DEPLOYMENT_TARGET@")
-endif()
-
-execute_process(
-    COMMAND  "@PYTHON_EXECUTABLE@" @cdat_CMAKE_SOURCE_DIR@/install.py @cdat_xtra_flags@ --enable-pp @SAMPLE_DATA@ @PYTHON_EXTRA_PREFIX@ @CDMS_ONLY@
-  WORKING_DIRECTORY "@WORKING_DIR@"
-  RESULT_VARIABLE res)
-
-if(NOT ${res} EQUAL 0)
-  message("Make Errors detected: \n${CDAT_OUT}\n${CDAT_ERR}")
-  message(FATAL_ERROR "Error in Python Install. ${res}")
-endif()
-message("Make succeeded.")
-
diff --git a/CMake/cdat_modules_extra/cdat_python_step.cmake.in b/CMake/cdat_modules_extra/cdat_python_step.cmake.in
deleted file mode 100644
index cf32905a1..000000000
--- a/CMake/cdat_modules_extra/cdat_python_step.cmake.in
+++ /dev/null
@@ -1,18 +0,0 @@
-
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-if(NOT ${make})
-  set(make make)
-endif()
-
-execute_process(
-  COMMAND ${make} ${BUILD_ARGS}
-  WORKING_DIRECTORY "${WORKING_DIR}"
-  RESULT_VARIABLE res)
-
-if(NOT ${res} EQUAL 0)
-  message("Make Errors detected: \n${CDAT_OUT}\n${CDAT_ERR}")
-  message(FATAL_ERROR "Error in Make")
-endif()
-message("Make succeeded.")
-
diff --git a/CMake/cdat_modules_extra/cdatmpi_configure_step.cmake.in b/CMake/cdat_modules_extra/cdatmpi_configure_step.cmake.in
deleted file mode 100644
index b8dd0172d..000000000
--- a/CMake/cdat_modules_extra/cdatmpi_configure_step.cmake.in
+++ /dev/null
@@ -1,22 +0,0 @@
-set(ENV{PKG_CONFIG_PATH} "@cdat_EXTERNALS@/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:$ENV{PKG_CONFIG_PATH}")
-set(ENV{PKG_CONFIG} "@cdat_PKG_CONFIG_EXECUTABLE@")
-
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-set(ENV{CC} mpicc)
-set(ENV{CXX} mpicxx)
-
-message("CONFIGURE_ARGS IS ${CONFIGURE_ARGS}")
-message("LD_ARGS IS $ENV{@LIBRARY_PATH@}")
-message("CFLAGS : $ENV{CFLAGS}")
-
-execute_process(
-  COMMAND env CC=$ENV{CC} CFLAGS=$ENV{CFLAGS} LD_LIBRARY_PATH=$ENV{@LIBRARY_PATH@} DYLD_FALLBACK_LIBRARY_PATH=$ENV{@LIBRARY_PATH@} @LIBRARY_PATH@=$ENV{@LIBRARY_PATH@} PKG_CONFIG=$ENV{PKG_CONFIG} PKG_CONFIG_PATH=$ENV{PKG_CONFIG_PATH} sh configure --prefix=${INSTALL_DIR} ${CONFIGURE_ARGS}
-  WORKING_DIRECTORY "${WORKING_DIR}"
-  RESULT_VARIABLE res)
-
-if(NOT ${res} EQUAL 0)
-  message("Config Errors detected: \n${CDAT_OUT}\n${CDAT_ERR}")
-  message(FATAL_ERROR "Error in config")
-endif()
-message("Config succeeded.")
diff --git a/CMake/cdat_modules_extra/checked_get.sh.in b/CMake/cdat_modules_extra/checked_get.sh.in
deleted file mode 100755
index 7a38feab4..000000000
--- a/CMake/cdat_modules_extra/checked_get.sh.in
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/env bash
-
-# Does an md5 check between local and remote resource
-# returns 0 (success) iff there is no match and thus indicating that
-# an update is available.
-# USAGE: checked_for_update [file] http://www.foo.com/file
-#
-check_for_update() {
-    local local_file
-    local remote_file
-    if (( $# == 1 )); then
-        remote_file=${1}
-        local_file=$(readlink -f ${1##*/})
-    elif (( $# == 2 )); then
-        local_file="../sources/"${1}
-        remote_file=${2}
-    else
-        echo "function \"checked_for_update\":  Called with incorrect number of args! (fatal)"
-        exit 1
-    fi                      
-    echo "Local file is:",${local_file}
-    [ ! -e ${local_file} ] && echo " WARNING: Could not find local file ${local_file}" && return 0
-    diff <(@MD5PRG@ ${local_file} | tr -s " " | cut -d " " -f @MD5CNT@ ) <(more ../md5s.txt | grep ${1} | tr -s " " | cut -d " " -f 1) >& /dev/null
-    [ $? != 0 ] && echo " Update Available @ ${remote_file}" && return 0
-    echo " ==> ${local_file} is up to date"
-    return 1
-}
-
-# If an update is available then pull it down... then check the md5 sums again!
-#
-#  Yes, this results in 3 network calls to pull down a file, but it
-#  saves total bandwidth and it also allows the updating from the
-#  network process to be cronttab-able while parsimonious with
-#  resources.  It is also very good practice to make sure that code
-#  being executed is the RIGHT code!
-#
-# NOTE: Has multiple return values test for (( $? > 1 )) when looking or errors
-#       A return value fo 1 only means that the file is up-to-date and there
-#       Is no reason to fetch it.
-#
-# USAGE: checked_get [file] http://www.foo.com/file
-#
-checked_get() {
-    check_for_update $@
-    [ $? != 0 ] && return 1
-
-    local local_file
-    local remote_file
-    if (( $# == 1 )); then
-        remote_file=${1}
-        local_file=${1##*/}
-    elif (( $# == 2 )); then
-        local_file="../sources/"${1}
-        remote_file=${2}
-    else
-        echo "function \"checked_get\":  Called with incorrect number of args! (fatal)"
-        exit 1
-    fi                      
-    echo "Local file 2 :",${local_file}
-    if [ -e ${local_file} ]; then
-	cp -v ${local_file} ${local_file}.bak 
-	chmod 600 ${local_file}.bak
-#	return 0
-    fi
-    @HASWGET@ -O ${local_file} ${remote_file}
-    [ $? != 0 ] && echo " ERROR: Problem pulling down [${remote_file}]" && return 2
-    diff <(@MD5PRG@ ${local_file} | tr -s " " | cut -d " " -f @MD5CNT@ ) <(more ../md5s.txt | grep ${1} | tr -s " " | cut -d " " -f 1) >& /dev/null
-#    diff <(md5sum ${local_file} | tr -s " " | cut -d " " -f 1) <(curl ${remote_file}.md5 | tr -s " " | cut -d " " -f 1) >& /dev/null
-    [ $? != 0 ] && echo " WARNING: Could not verify this file!" && return 3
-    echo "[VERIFIED]"
-    return 0
-}
-
-checked_get $@
-echo ${1}" is where i get the tared stuff"
-tar xzf "../sources/"${1}
diff --git a/CMake/cdat_modules_extra/checkout_testdata.cmake b/CMake/cdat_modules_extra/checkout_testdata.cmake
deleted file mode 100644
index d914fa3ca..000000000
--- a/CMake/cdat_modules_extra/checkout_testdata.cmake
+++ /dev/null
@@ -1,256 +0,0 @@
-# Usage:
-# cmake -DGIT_EXECUTABLE=[git executable]
-#       -DTESTDATA_URL=[uvcdat-testdata url]
-#       -DTESTDATA_DIR=[local testdata directory]
-#       -DSOURCE_DIR=[uvcdat source root]
-#       -P checkout_testdata.cmake
-#
-# This script creates and syncs a clone of the uvcdat-testdata directory.
-#
-# In detail:
-#
-# 1) Check if the TESTDATA_DIR exists.
-#    If not, clone the repo and exit.
-# 2) Check if the TESTDATA_DIR is a git repo with TESTDATA_URL as its origin.
-#    If not, abort with a warning message.
-# 3) Check if the TESTDATA_DIR repo is clean.
-#    If not, abort with an warning message.
-# 4) Fetch the current git branch name for the SOURCE_DIR repo.
-#    If the current HEAD is not a named branch, use master.
-# 5) Update the remote branches in the TESTDATA_DIR repo.
-# 6) Check if the desired branch exists in TESTDATA_DIR's origin remote.
-# 7) Check if the desired branch exists in TESTDATA_DIR as a local branch.
-# 8) If the neither the local or remote branch exist, use master.
-# 9) Check out the local <branch> in TESTDATA_DIR repo.
-# 10) If the remote branch exists, or we are using master, run
-#     'git pull origin <branch>:<branch>' to fetch/update the local branch from
-#     the remote.
-#
-# Any failures are handled via non-fatal warnings. This is to allow the project
-# to build when access to the repo is not available.
-
-# 1) Clone and exit if the target directory doesn't exist.
-if(NOT EXISTS "${TESTDATA_DIR}")
-  message("Cloning \"${TESTDATA_URL}\" into \"${TESTDATA_DIR}\"...")
-
-  # Use depth=1 to avoid fetching the full history. Use "git pull --unshallow"
-  # to backfill the history if needed.
-  # --no-single-branch fetches the tip of all remote branches -- this is needed
-  # for auto-updating the testdata when the source branch changes.
-  execute_process(COMMAND
-    "${GIT_EXECUTABLE}"
-      clone --depth=1 --no-single-branch "${TESTDATA_URL}" "${TESTDATA_DIR}"
-    RESULT_VARIABLE RESULT
-    ERROR_VARIABLE OUTPUT
-    OUTPUT_VARIABLE OUTPUT)
-
-  string(STRIP "${OUTPUT}" OUTPUT)
-
-  message("${OUTPUT}")
-
-  if(NOT RESULT EQUAL 0)
-    message("Could not clone test data repo! "
-            "Baseline images will not be available.")
-    return()
-  endif()
-endif()
-
-# bots merge master in and mess the following, always rechecking master
-# bots check out the correct branches
-# following keyword skips the branch checking
-if (CDAT_CHECKOUT_BASELINE_MATCHING_BRANCH)
-    message("[INFO] Trying to find matching branch on baseline repo")
-    # 2) Is TESTDATA_DIR a clone of TESTDATA_URL?
-    execute_process(COMMAND
-      "${GIT_EXECUTABLE}" config --get remote.origin.url
-      WORKING_DIRECTORY "${TESTDATA_DIR}"
-      RESULT_VARIABLE RESULT
-      ERROR_VARIABLE OUTPUT
-      OUTPUT_VARIABLE OUTPUT)
-
-    if(NOT RESULT EQUAL 0)
-      message("Cannot update uvcdat-testdata checkout at \"${TESTDATA_DIR}\". "
-              "Directory exists and is not a git repository. "
-              "Baseline images may be out of date.")
-      return()
-    endif()
-
-    string(STRIP "${OUTPUT}" OUTPUT)
-
-    if(NOT "${TESTDATA_URL}" STREQUAL "${OUTPUT}")
-      message("Cannot update uvcdat-testdata checkout at \"${TESTDATA_DIR}\". "
-              "Directory is a git clone of \"${OUTPUT}\", not \"${TESTDATA_URL}\". "
-              "Baseline images may be out of date.")
-      return()
-    endif()
-
-    # 3) Is the current testdata repo clean? Don't want to clobber any local mods.
-    # Update the index first:
-    execute_process(COMMAND
-      "${GIT_EXECUTABLE}" update-index -q --refresh
-      WORKING_DIRECTORY "${TESTDATA_DIR}"
-      RESULT_VARIABLE RESULT
-      ERROR_VARIABLE OUTPUT
-      OUTPUT_VARIABLE OUTPUT)
-
-    if(NOT RESULT EQUAL 0)
-      message("Cannot update uvcdat-testdata checkout at \"${TESTDATA_DIR}\". "
-              "Error updating current index with 'git update-index -q --refresh':\n."
-              "${OUTPUT}\n"
-              "Baseline images may be out of date.")
-      return()
-    endif()
-
-    # Now check if the index is dirty:
-    execute_process(COMMAND
-      "${GIT_EXECUTABLE}" diff-index --name-only HEAD "--"
-      WORKING_DIRECTORY "${TESTDATA_DIR}"
-      RESULT_VARIABLE RESULT
-      ERROR_VARIABLE OUTPUT
-      OUTPUT_VARIABLE OUTPUT)
-
-    if(NOT RESULT EQUAL 0)
-      message("Cannot update uvcdat-testdata checkout at \"${TESTDATA_DIR}\". "
-              "Error checking current index with 'git diff-index --name-only HEAD --':\n."
-              "${OUTPUT}\n"
-              "Baseline images may be out of date.")
-      return()
-    endif()
-
-    string(STRIP "${OUTPUT}" OUTPUT)
-
-    if(NOT "${OUTPUT}" STREQUAL "")
-      message("Cannot update uvcdat-testdata checkout at \"${TESTDATA_DIR}\". "
-              "Current checkout is not clean. The following files have modifications:\n"
-              "${OUTPUT}\n"
-              "Baseline images may be out of date.")
-      return()
-    endif()
-
-    # 4) Get the current branch name of the source repo.
-    execute_process(COMMAND
-      "${GIT_EXECUTABLE}" rev-parse --abbrev-ref HEAD
-      WORKING_DIRECTORY "${SOURCE_DIR}"
-      RESULT_VARIABLE RESULT
-      ERROR_VARIABLE OUTPUT
-      OUTPUT_VARIABLE OUTPUT)
-
-    if(NOT RESULT EQUAL 0)
-      message("Cannot update uvcdat-testdata checkout at \"${TESTDATA_DIR}\". "
-              "Cannot determine current branch name of source directory. "
-              "Baseline images may be out of date.")
-      return()
-    endif()
-
-    string(STRIP "${OUTPUT}" BRANCH)
-
-    # If BRANCH is "HEAD", we're not on a named branch. Just use master in that
-    # case.
-    if("${BRANCH}" STREQUAL "HEAD")
-      message("The current source directory at '${SOURCE_DIR}' is not on a named "
-              "branch. Using the 'master' branch of the testdata repo.")
-      set(BRANCH "master")
-    endif()
-
-    # 5) Update the remote branches available on the testdata repo.
-    execute_process(COMMAND
-      "${GIT_EXECUTABLE}" fetch --depth=1
-      WORKING_DIRECTORY "${TESTDATA_DIR}"
-      RESULT_VARIABLE RESULT
-      ERROR_VARIABLE OUTPUT
-      OUTPUT_VARIABLE OUTPUT)
-
-    if(NOT RESULT EQUAL 0)
-      message("Cannot update uvcdat-testdata checkout at \"${TESTDATA_DIR}\". "
-              "Error updating remote branches with "
-              "'git fetch --depth=1':\n."
-              "${OUTPUT}\n"
-              "Baseline images may be out of date.")
-      return()
-    endif()
-
-    # 6) Check if the desired branch exists in TESTDATA_DIR's origin remote.
-    execute_process(COMMAND
-      "${GIT_EXECUTABLE}" branch -a --list "*${BRANCH}"
-      WORKING_DIRECTORY "${TESTDATA_DIR}"
-      RESULT_VARIABLE RESULT
-      ERROR_VARIABLE OUTPUT
-      OUTPUT_VARIABLE OUTPUT)
-
-    if(NOT RESULT EQUAL 0)
-      message("Cannot update uvcdat-testdata checkout at \"${TESTDATA_DIR}\". "
-              "Error obtaining full branch list:\n${OUTPUT}"
-              "Baseline images may be out of date.")
-      return()
-    endif()
-
-    message("Testing if remote branch 'origin/${BRANCH}' exists...")
-    string(FIND "${OUTPUT}" " remotes/origin/${BRANCH}\n" POS)
-    if(NOT POS EQUAL -1)
-      message("Remote branch exists.")
-      set(REMOTE_EXISTS "YES")
-    else()
-      message("Remote branch does not exist.")
-      set(REMOTE_EXISTS "NO")
-    endif()
-
-    # 7) Check if the desired branch exists locally:
-    message("Testing if local branch '${BRANCH}' exists...")
-    string(FIND "${OUTPUT}" " ${BRANCH}\n" POS) # Leading space in regex intended
-    if(NOT POS EQUAL -1)
-      message("Local branch exists.")
-      set(LOCAL_EXISTS "YES")
-    else()
-      message("Local branch does not exist.")
-      set(LOCAL_EXISTS "NO")
-    endif()
-
-    # 8) If the neither the local or remote branch exist, use master.
-    if(NOT REMOTE_EXISTS AND NOT LOCAL_EXISTS)
-      set(BRANCH "master")
-      set(REMOTE_EXISTS "YES")
-      set(LOCAL_EXISTS "YES")
-    endif()
-
-    # 9) Check out the desired branch in TESTDATA_DIR repo.
-    message("Checking out branch '${BRANCH}' in repo '${TESTDATA_DIR}'.")
-    execute_process(COMMAND
-      "${GIT_EXECUTABLE}" checkout "${BRANCH}"
-      WORKING_DIRECTORY "${TESTDATA_DIR}"
-      RESULT_VARIABLE RESULT
-      ERROR_VARIABLE OUTPUT
-      OUTPUT_VARIABLE OUTPUT)
-
-    if(NOT RESULT EQUAL 0)
-      message("Cannot update uvcdat-testdata checkout at \"${TESTDATA_DIR}\". "
-              "Error executing 'git checkout ${BRANCH}':\n."
-              "${OUTPUT}\n"
-              "Baseline images may be out of date.")
-      return()
-    endif()
-
-    # 10) If the remote branch exists, or we are using master, run
-    #     'git pull origin <branch>:<branch>' to fetch/update the local branch from
-    #     the remote.
-    if(REMOTE_EXISTS)
-      message("Updating \"${TESTDATA_DIR}:${BRANCH}\" from "
-              "\"${TESTDATA_URL}:${BRANCH}\"...")
-      execute_process(COMMAND
-        "${GIT_EXECUTABLE}" pull origin "${BRANCH}:${BRANCH}"
-        WORKING_DIRECTORY "${TESTDATA_DIR}"
-        RESULT_VARIABLE RESULT
-        ERROR_VARIABLE OUTPUT
-        OUTPUT_VARIABLE OUTPUT)
-
-      string(STRIP "${OUTPUT}" OUTPUT)
-
-      message("${OUTPUT}")
-
-      if(NOT RESULT EQUAL 0)
-        message("Error updating testdata repo! "
-                "Baseline images may be out of date.")
-      endif()
-    endif()
-else()
-    message("[INFO] NOT trying to switch branch on baseline (only bots should turn this on)")
-endif()
diff --git a/CMake/cdat_modules_extra/cleanenv_configure_step.cmake.in b/CMake/cdat_modules_extra/cleanenv_configure_step.cmake.in
deleted file mode 100644
index a3872f373..000000000
--- a/CMake/cdat_modules_extra/cleanenv_configure_step.cmake.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#set(ENV{PKG_CONFIG_PATH} "@cdat_EXTERNALS@/lib/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:$ENV{PKG_CONFIG_PATH}")
-#set(ENV{PKG_CONFIG} "@cdat_PKG_CONFIG_EXECUTABLE@")
-
-#include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-#message(CONGIFURE_ARGS IS ${CONFIGURE_ARGS})
-
-execute_process(
-  COMMAND sh configure --prefix=${INSTALL_DIR} ${CONFIGURE_ARGS}
-  WORKING_DIRECTORY "${WORKING_DIR}"
-  RESULT_VARIABLE res)
-
-if(NOT ${res} EQUAL 0)
-  message("Config Errors detected: \n${CDAT_OUT}\n${CDAT_ERR}")
-  message(FATAL_ERROR "Error in config")
-endif()
-message("Config succeeded.")
diff --git a/CMake/cdat_modules_extra/configobj_build_step.cmake.in b/CMake/cdat_modules_extra/configobj_build_step.cmake.in
deleted file mode 100644
index 5edd0af43..000000000
--- a/CMake/cdat_modules_extra/configobj_build_step.cmake.in
+++ /dev/null
@@ -1,6 +0,0 @@
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-execute_process(
-  COMMAND "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
-  WORKING_DIRECTORY "@configobj_source_dir@"
-)
diff --git a/CMake/cdat_modules_extra/curses_patch_step.cmake.in b/CMake/cdat_modules_extra/curses_patch_step.cmake.in
deleted file mode 100644
index 04c28afdc..000000000
--- a/CMake/cdat_modules_extra/curses_patch_step.cmake.in
+++ /dev/null
@@ -1,5 +0,0 @@
-execute_process(
-  WORKING_DIRECTORY @curses_source@
-  COMMAND patch -Np1
-  INPUT_FILE @cdat_CMAKE_SOURCE_DIR@/curses_gcc5.patch
-)
diff --git a/CMake/cdat_modules_extra/ezget_Makefile.gfortran.in b/CMake/cdat_modules_extra/ezget_Makefile.gfortran.in
deleted file mode 100644
index 7e0987908..000000000
--- a/CMake/cdat_modules_extra/ezget_Makefile.gfortran.in
+++ /dev/null
@@ -1,78 +0,0 @@
-# EZGet Makefile
-#
-# Usage:
-#
-# Change DEBUG as needed.
-# Check the paths specified here for whether they are right for you.
-# Provide a path to fcddrs.h, or copy it (it's in cdat/libcdms/include)
-# make
-#
-#--------------------------------------------------------------------
-LIBNAME = ezget
-#jfp was CDMSLIB = /usr/local/lib
-#jfp was CDMSINC = /usr/local/include
-CDMSLIB = @cdat_EXTERNALS@/lib
-CDMSINC = @cdat_EXTERNALS@/include
-DEBUG = -O 
-# DEBUG = -g -save-temps -O0
-# Requires Absoft FORTRAN
-FC = gfortran
-CC = gcc
-#ARCHOPT = -arch x86_64
-#ARCHOPT = -arch i386
-ARCHOPT = -m64 -mtune=native
-# FOPTS = -fcray-pointer $(ARCHOPT) -W
-FOPTS = -fcray-pointer $(ARCHOPT) -W -Dgfortran -Dsun -D__linux -D__linux_gfortran -fpic -fPIC -I ../../libdrs/lib -I ../include -I @cdat_EXTERNALS@/include
-FFLAGS = $(DEBUG) $(FOPTS)
-INSTALL_LIB = @cdat_EXTERNALS@/lib
-INSTALL_INC = @cdat_EXTERNALS@/include
-CPPFLAGS = $(ARCHOPT)
-CPP = cpp
-
-FOBJECTS = Src/$(LIBNAME).o
-FINCLUDES = drsdef.h drscom.h cycle.h
-# FINCLUDES = 
-FSOURCES = $(FOBJECTS:.o=.F)
-
-COBJECTS = 
-CINCLUDES = drscdf.h
-CSOURCES = $(COBJECTS:.o=.c)
-
-OBJECTS = $(FOBJECTS) $(COBJECTS)
-SOURCES = $(FSOURCES) $(CSOURCES)
-INCLUDES = $(FINCLUDES) $(CINCLUDES)
-#--------------------------------------------------------------------
-
-all: lib$(LIBNAME).a 
-#lib$(LIBNAME).so
-
-shared: drsdef.h lib$(LIBNAME).so
-
-lib$(LIBNAME).a: $(OBJECTS)
-	ar rv lib$(LIBNAME).a $?
-
-lib$(LIBNAME).so: $(OBJECTS)
-	$(CC) $(ARCHOPT) -lgfortran -L@cdat_EXTERNALS@/lib -L$(CDMSLIB) -I$(CDMSINC) -lcdms  -shared -o lib$(LIBNAME).so $(OBJECTS)
-
-#--------------------------------------------------------------------
-
-install: lib$(LIBNAME).a
-	cp lib$(LIBNAME).a $(INSTALL_LIB); chmod 644 $(INSTALL_LIB)/lib$(LIBNAME).a
-#	cp drsdef.h $(INSTALL_INC); chmod 644 $(INSTALL_INC)/drsdef.h
-
-#--------------------------------------------------------------------------
-
-# Miscellaneous junk
-
-tags:
-	etags $(SOURCES) $(INCLUDES)
-
-clean:
-	-rm -f Src/*.o
-	-rm -f *~
-	-rm -f core
-	
-.SUFFIXES: .F .o
-
-.F.o:
-	cd Src ; $(FC) $(FFLAGS) -c ../$<
diff --git a/CMake/cdat_modules_extra/fetch_uvcmetrics_testdata.cmake b/CMake/cdat_modules_extra/fetch_uvcmetrics_testdata.cmake
deleted file mode 100644
index 996ae0a28..000000000
--- a/CMake/cdat_modules_extra/fetch_uvcmetrics_testdata.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-# used variables:
-#   FILE_URL    The url where the file is available
-#   FILE_PATH   The destination for the file
-#   FILE_MD5    The expected md5
-
-# check if the file already exists
-if(EXISTS "${FILE_PATH}")
-  # check md5sum
-  file(MD5 "${FILE_PATH}" output_md5)
-
-  if(${output_md5} STREQUAL ${FILE_MD5})
-    return() # nothing to do
-  endif()
-endif()
-
-# add a build target to download the file
-file(DOWNLOAD "${FILE_URL}" "${FILE_PATH}" STATUS stat)
-list(GET stat 0 exit_code)
-list(GET stat 1 msg)
-
-# fail on error
-if(NOT exit_code EQUAL 0)
-  file(REMOVE "${FILE_PATH}")
-  message(FATAL_ERROR "Error downloading: ${msg}")
-endif()
diff --git a/CMake/cdat_modules_extra/ffmpeg_build_step.cmake.in b/CMake/cdat_modules_extra/ffmpeg_build_step.cmake.in
deleted file mode 100644
index d0ef31f29..000000000
--- a/CMake/cdat_modules_extra/ffmpeg_build_step.cmake.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-if(APPLE)
-  set(ENV{MACOSX_DEPLOYMENT_TARGET} "@CMAKE_OSX_DEPLOYMENT_TARGET@")
-  set(ENV{CFLAGS} "@cdat_osx_arch_flag@ @cdat_osx_version_flag@ @cdat_osx_sysroot@")
-endif()
-
-set(ENV{PATH} $ENV{PATH}:@cdat_EXTERNALS@/bin)
-
-EXECUTE_PROCESS(
-  #    COMMAND sh configure --disable-static --disable-network --disable-zlib --disable-ffserver --disable-ffplay --disable-decoders --enable-shared --enable-swscale --prefix=@ffmpeg_install@
-  COMMAND make
-  WORKING_DIRECTORY "@ffmpeg_source@"
-  RESULT_VARIABLE rv
-  )
diff --git a/CMake/cdat_modules_extra/git_clone.sh.in b/CMake/cdat_modules_extra/git_clone.sh.in
deleted file mode 100755
index 05bb4d3fd..000000000
--- a/CMake/cdat_modules_extra/git_clone.sh.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-cd "@CMAKE_INSTALL_PREFIX@"
-"@GIT_EXECUTABLE@" clone --no-checkout --depth 1 -b @BRANCH@ @GIT_URL@ "@GIT_TARGET@"
-cd "@GIT_TARGET@"
-if "@GIT_EXECUTABLE@" rev-parse --symbolic-full-name @BRANCH@ | grep -q '^refs/tags/'; then
-    "@GIT_EXECUTABLE@" checkout @BRANCH@
-else
-    "@GIT_EXECUTABLE@" checkout origin/@BRANCH@
-fi
diff --git a/CMake/cdat_modules_extra/git_update.sh.in b/CMake/cdat_modules_extra/git_update.sh.in
deleted file mode 100755
index a8b3b7954..000000000
--- a/CMake/cdat_modules_extra/git_update.sh.in
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-cd "@SOURCE_DIR@"
-"@GIT_EXECUTABLE@" fetch origin --prune
-if "@GIT_EXECUTABLE@" rev-parse --symbolic-full-name @BRANCH@ | grep -q '^refs/tags/'; then
-    "@GIT_EXECUTABLE@" checkout -f @BRANCH@
-else
-    "@GIT_EXECUTABLE@" checkout -f origin/@BRANCH@
-fi
diff --git a/CMake/cdat_modules_extra/gsw_build_step.cmake.in b/CMake/cdat_modules_extra/gsw_build_step.cmake.in
deleted file mode 100644
index 1a344eb81..000000000
--- a/CMake/cdat_modules_extra/gsw_build_step.cmake.in
+++ /dev/null
@@ -1,6 +0,0 @@
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-execute_process(
-  COMMAND "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
-  WORKING_DIRECTORY "@gsw_source_dir@"
-)
diff --git a/CMake/cdat_modules_extra/h5py_build_step.cmake.in b/CMake/cdat_modules_extra/h5py_build_step.cmake.in
deleted file mode 100644
index 47e740028..000000000
--- a/CMake/cdat_modules_extra/h5py_build_step.cmake.in
+++ /dev/null
@@ -1,6 +0,0 @@
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-execute_process(
-  COMMAND "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
-  WORKING_DIRECTORY "@h5py_source_dir@"
-)
diff --git a/CMake/cdat_modules_extra/hdf5_patch_step.cmake.in b/CMake/cdat_modules_extra/hdf5_patch_step.cmake.in
deleted file mode 100644
index 588e26535..000000000
--- a/CMake/cdat_modules_extra/hdf5_patch_step.cmake.in
+++ /dev/null
@@ -1,10 +0,0 @@
-execute_process(
-  COMMAND
-  "@CMAKE_COMMAND@" -E copy_if_different @cdat_SOURCE_DIR@/exsrc/src/h5diff_correct_ansi.c ${WORKING_DIR}/tools/lib/h5diff.c
-  RESULT_VARIABLE errcode
-)
-if("${errcode}" STREQUAL "0")
-    message(STATUS "h5diff.c replaced")
-else()
-    message(FATAL_ERROR "Replacing h5diff.c failed: ${errcode}")
-endif()
diff --git a/CMake/cdat_modules_extra/install.py.in b/CMake/cdat_modules_extra/install.py.in
deleted file mode 100644
index 58398539d..000000000
--- a/CMake/cdat_modules_extra/install.py.in
+++ /dev/null
@@ -1,945 +0,0 @@
-import sys, getopt, os, shutil, string, glob, tempfile, hashlib
-from distutils.core import setup
-
-build_dir = os.getcwd()
-logdir = os.path.join(build_dir, 'logs').replace(" ","\ ")
-
-# Create logs directory if it does not exits
-if not os.path.exists(logdir):
-  os.makedirs(logdir)
-
-base_build_dir = os.path.join(build_dir, '..')
-os.environ['BUILD_DIR'] = build_dir
-
-current_dir = os.path.dirname(__file__)
-src_dir = os.path.join(current_dir, '..')
-installation_script_dir = os.path.join(src_dir, 'installation')
-here = installation_script_dir
-
-sys.path.append(src_dir)
-sys.path.append(build_dir)
-sys.path.append(installation_script_dir)
-
-control_script_path = os.path.join(installation_script_dir, 'control.py')
-execfile(control_script_path, globals(), globals())
-
-global target_prefix
-target_prefix = sys.prefix
-for i in range(len(sys.argv)):
-    a = sys.argv[i]
-    if a=='--prefix':
-        target_prefix=sys.argv[i+1]
-    sp = a.split("--prefix=")
-    if len(sp)==2:
-        target_prefix=sp[1]
-
-try:
-    os.makedirs(os.path.join(target_prefix,'bin'))
-except Exception,err:
-    pass
-try:
-    os.makedirs(os.path.join(target_prefix,'include'))
-except Exception,err:
-    pass
-try:
-    os.makedirs(os.path.join(target_prefix,'lib'))
-except Exception,err:
-    pass
-
-cdms_include_directory = os.path.join(target_prefix, 'include', 'cdms')
-cdms_library_directory = os.path.join(target_prefix, 'lib')
-
-version_file_path = os.path.join(base_build_dir, 'version')
-Version = open(version_file_path).read().strip()
-version = Version.split(".")
-for i in range(len(version)):
-    try:
-        version[i]=int(version[i])
-    except:
-        version[i]=version[i].strip()
-
-def norm(path):
-    "normalize a path"
-    return os.path.normpath(os.path.abspath(os.path.expanduser(path)))
-
-def testlib (dir, name):
-    "Test if there is a library in a certain directory with basic name."
-    if os.path.isfile(os.path.join(dir, 'lib' + name + '.a')):
-        return 1
-    if os.path.isfile(os.path.join(dir, 'lib' + name + '.so')):
-        return 1
-    if os.path.isfile(os.path.join(dir, 'lib' + name + '.sl')):
-        return 1
-    return 0
-
-def configure (configuration_files):
-    global action, target_prefix
-    options={}
-    execfile(os.path.join(installation_script_dir, 'standard.py'), globals(), options)
-    for file in configuration_files:
-        print >>sys.stderr, 'Reading configuration:', file
-        execfile(os.path.join(src_dir, file), globals(), options)
-
-    # Retrieve action
-    action = options['action']
-    # Establish libraries and directories for CDUNIF/CDMS
-    netcdf_directory = norm(options.get('netcdf_directory',os.environ['EXTERNALS']))
-    netcdf_include_directory = norm(options.get('netcdf_include_directory',
-                                           os.path.join(os.environ['EXTERNALS'],'include')))
-
-    #hdf5_library_directory = norm(os.path.join(os.environ.get('HDF5LOC',os.path.join(os.environ["EXTERNALS"])), 'lib'))
-    if (sys.platform in ['mac',]):
-        cdunif_library_directories = [cdms_library_directory,"/usr/X11R6/lib"]
-    else:
-        cdunif_library_directories = [cdms_library_directory]
-
-    options['CDMS_INCLUDE_DAP']="yes"
-##     if options.get('CDMS_INCLUDE_DAP','no')=='yes':
-##         netcdf_include_directory=norm(os.path.join(options['CDMS_DAP_DIR'],'include','libnc-dap'))
-##         netcdf_library_directory=norm(os.path.join(options['CDMS_DAP_DIR'],'lib'))
-##         dap_include=[norm(os.path.join(options['CDMS_DAP_DIR'],'include','libdap'))]
-##         dap_lib_dir=[norm(os.path.join(options['CDMS_DAP_DIR'],'lib'))]
-## ##         dap_lib=['dap','stdc++','nc-dap','dap','curl','z','ssl','crypto','dl','z','xml2','rx','z']
-## ##         if (sys.platform in ['linux2',]):
-## ##            dap_lib=['nc-dap','dap','stdc++','curl','z','ssl','xml2']
-## ##         elif (sys.platform in ['darwin',]):
-## ##            dap_lib=['nc-dap','dap','stdc++','curl','z','ssl','pthread','xml2','z']
-##         dap_lib=['nc-dap','dap','stdc++','curl','z','ssl','pthread','xml2']
-##         dap_lib = ['stdc++']
-##         dap_lib_dir=[]
-##         Libs=os.popen(norm(os.path.join(options['CDMS_DAP_DIR'],'bin','ncdap-config'))+' --libs').readlines()
-##         Libs+=os.popen(norm(os.path.join(options['CDMS_DAP_DIR'],'bin','dap-config'))+' --client-libs').readlines()
-##         for libs in Libs:
-##             libs=libs.split()
-##             for l in libs:
-##                 if l[:2]=='-l':
-##                     dap_lib.append(l[2:])
-##                 elif l[:2]=='-L'and l[2:] not in dap_lib_dir:
-##                     dap_lib_dir.append(l[2:])
-##         dap_lib.append("dap")
-##         dap_lib.append("xml2")
-##         netcdfname='nc-dap'
-## ##         print 'daplib:',dap_lib
-##     else:
-    if 1:
-        ## dap_include = [os.path.join(hdf5path,"include"),os.path.join(os.environ['EXTERNALS'],'include')]
-        dap_include = []
-        Dirs=os.popen('%s --cflags' % os.environ.get("LOCNCCONFIG","nc-config")).readlines()[0]
-        for d in Dirs.split():
-            if d[:2]=="-I":
-                dnm = d[2:]
-                if not dnm in dap_include:
-                    dap_include.append(dnm)
-        dap_lib = ['stdc++']
-        dap_lib = []
-        dap_lib_dir=[]
-        ## Libs=os.popen(norm(os.path.join(os.environ['EXTERNALS'],'bin','nc-config'))+' --libs').readlines()
-        Libs=os.popen('%s --libs' % os.environ.get("LOCNCCONFIG","nc-config")).readlines()
-        for libs in Libs:
-            libs=libs.split()
-            for l in libs:
-                if l[:2]=='-l':
-                    dap_lib.append(l[2:])
-                elif l[:2]=='-L'and l[2:] not in dap_lib_dir:
-                    if l[-3:]!='lib':
-                        l+='/lib'
-                    dap_lib_dir.append(l[2:])
-
-##         if enable_netcdf3==True:
-##             dap_include=[]
-##             dap_lib_dir=[]
-##         else:
-##             dap_include = [os.path.join(hdf5path,"include"),os.path.join(os.environ['EXTERNALS'],'include')]
-##             dap_lib_dir = [os.path.join(hdf5path,"lib"),os.path.join(os.environ['EXTERNALS'],'lib')]
-##         if enable_netcdf3 is True:
-##             daplib=[]
-##         else:
-##             dap_lib=['hdf5_hl','hdf5','m','z','dap','nc-dap','dapclient','curl','stdc++','xml2']
-##             # for now turn off the dap crap
-##             dap_lib=['hdf5_hl','hdf5','m','z']
-        netcdfname='netcdf'
-
-    if options.get('CDMS_INCLUDE_HDF','no')=='yes':
-        hdf_libraries = ['mfhdf','df','jpeg','z']
-        hdf_include=[norm(os.path.join(options['CDMS_HDF_DIR'],'include'))]
-        hdf_lib_dir=[norm(os.path.join(options['CDMS_HDF_DIR'],'lib'))]
-    else:
-        hdf_libraries = []
-        hdf_include=[]
-        hdf_lib_dir=[]
-
-    PNG_VERSION=""
-    if (sys.platform in ['darwin']):
-        PNG_VERSION="15"
-
-    grib2_libraries = ["grib2c","png"+PNG_VERSION,"jasper"]
-    ## if netcdf_library_directory not in cdunif_library_directories:
-    ##     cdunif_library_directories.append(netcdf_library_directory)
-    cdunif_include_directories = [cdms_include_directory]
-    ## if netcdf_include_directory not in cdunif_include_directories:
-    ##     cdunif_include_directories.append(netcdf_include_directory)
-
-
-    if sys.platform == "sunos5":
-        cdunif_include_directories.append('/usr/include')
-
-    drs_file = "@cdatEXTERNALS@/lib/libdrs.a"
-
-    # Establish location of X11 include and library directories
-    if options['x11include'] or options['x11libdir']:
-        if options['x11include']:
-            options['x11include'] = norm(options['x11include'])
-        if options['x11libdir']:
-            options['x11libdir'] = norm(options['x11libdir'])
-    else:
-        for x in x11search:
-            if os.path.isdir(x):
-                if options['x11include']:
-                    options['x11include'].append(os.path.join(x, 'include'))
-                    options['x11libdir'].append(os.path.join(x, 'lib'))
-                else:
-                    options['x11include']=[norm(os.path.join(x, 'include'))]
-                    options['x11libdir']=[norm(os.path.join(x, 'lib'))]
-        else:
-            for w in x11OSF1lib:
-                if testlib(w, 'X11'):
-                    if not options['x11libdir']:
-                        options['x11libdir'] = [norm(w),]
-                    else:
-                        options['x11libdir'].append(norm(w))
-            for w in x11OSF1include:
-                if os.path.isdir(w):
-                    if not options['x11include']:
-                        options['x11include'] = [norm(w),]
-                    else:
-                        options['x11include'].append(norm(w))
-    # Check that we have both set correctly.
-    if not (options['x11include'] and \
-            options['x11libdir']
-            ):
-        print >>sys.stderr, """
-Failed to find X11 directories. Please see README.txt for instructions.
-"""
-        print options
-        raise SystemExit, 1
-
-    # Write cdat_info.py
-    os.chdir(installation_script_dir)
-    print 'Version is: ',Version
-    f = open(os.path.join(build_dir, 'cdat_info.py'), 'w')
-    sys.path.append(build_dir)
-    print >> f,"""
-Version = '%s'
-ping_checked = False
-check_in_progress = False
-def version():
-    return %s
-""" % (Version,str(version))
-    if options.get('CDMS_INCLUDE_DRS','no') == 'yes':
-        print >>f, """
-def get_drs_dirs ():
-    #import Pyfort, os
-    import os
-    #c = Pyfort.get_compiler('default')
-    drs_dir, junk = os.path.split(drs_file)
-    #return c.dirlist + [drs_dir]
-    return [drs_dir,"/usr/local/gfortran/lib","/usr/local/lib"]
-
-def get_drs_libs ():
-    #import Pyfort
-    #c = Pyfort.get_compiler('default')
-    return ['drs','gfortran'] + %s
-""" % repr(options.get("COMPILER_EXTRA_LIBS",[]))
-    else:
-        print >>f, """
-def get_drs_dirs ():
-    return []
-def get_drs_libs():
-    return []
-"""
-
-    print >>f, """\
-
-sleep=60 #minutes  (int required)
-
-actions_sent = {}
-
-SOURCE = 'CDAT'
-
-def get_version():
-  return Version
-
-def get_prefix():
-  import os,sys
-  try:
-    uv_setup_pth = os.environ["UVCDAT_SETUP_PATH"]
-    if os.uname()[0] == "Darwin":
-      uv_setup_pth = os.path.join(uv_setup_pth,
-          "Library","Frameworks","Python.framework","Versions",
-          "%%i.%%i" %% (sys.version_info.major,sys.version_info.minor)
-          )
-    return uv_setup_pth
-  except KeyError:
-    raise RuntimeError("UVCDAT environment not configured. Please source the setup_runtime script.")
-
-def get_sampledata_path():
-  import os
-  try:
-    return os.path.join(os.environ["UVCDAT_SETUP_PATH"],
-                        "share", "uvcdat", "sample_data")
-  except KeyError:
-    raise RuntimeError("UVCDAT environment not configured. Please source the setup_runtime script.")
-
-def runCheck():
-    import cdat_info,os
-    if cdat_info.ping_checked is False:
-        check_in_progress = True
-        val = None
-        envanom = os.environ.get("UVCDAT_ANONYMOUS_LOG",None)
-        if envanom is not None:
-            if envanom.lower() in ['true','yes','y','ok']:
-                val = True
-            elif envanom.lower() in ['false','no','n','not']:
-                val = False
-            else:
-                import warnings
-                warnings.warn("UVCDAT logging environment variable UVCDAT_ANONYMOUS_LOG should be set to 'True' or 'False', you have it set to '%%s', will be ignored" %% envanom)
-        if val is None: # No env variable looking in .uvcdat
-            fanom = os.path.join(os.environ["HOME"],".uvcdat",".anonymouslog")
-            if os.path.exists(fanom):
-                f=open(fanom)
-                for l in f.readlines():
-                    sp = l.strip().split("UVCDAT_ANONYMOUS_LOG:")
-                    if len(sp)>1:
-                        try:
-                            val = eval(sp[1])
-                        except:
-                            pass
-                f.close()
-
-        reload(cdat_info)
-        return val
-
-def askAnonymous(val):
-        import cdat_info,os
-        while cdat_info.ping_checked is False and not val in [True, False]: # couldn't get a valid value from env or file
-            val2 = raw_input("Allow anonymous logging usage to help improve UV-CDAT? (you can also set the environment variable UVCDAT_ANONYMOUS_LOG to yes or     no) [yes/no]")
-            if val2.lower() in ['y','yes','ok']:
-                val = True
-            elif val2.lower() in ['n','no','not']:
-                val = False
-            if val in [True,False]: # store result for next time
-                try:
-                    fanom = os.path.join(os.environ["HOME"],".uvcdat",".anonymouslog")
-                    if not os.path.exists(os.path.join(os.environ["HOME"],".uvcdat")):
-                        os.makedirs(os.path.join(os.environ["HOME"],".uvcdat"))
-                    f=open(fanom,"w")
-                    print >>f, "#Store information about allowing UVCDAT anonymous logging"
-                    print >>f, "# Need sto be True or False"
-                    print >>f, "UVCDAT_ANONYMOUS_LOG: %%s" %% val
-                    f.close()
-                except Exception,err:
-                    pass
-        else:
-            if cdat_info.ping_checked:
-                val = cdat_info.ping
-        cdat_info.ping = val
-        cdat_info.ping_checked = True
-        check_in_progress = False
-
-def pingPCMDIdb(*args,**kargs):
-    import cdat_info,os
-    while cdat_info.check_in_progress:
-       reload(cdat_info)
-    val = cdat_info.runCheck()
-    if val is False:
-      cdat_info.ping_checked = True
-      cdat_info.ping = False
-      return
-    try:
-      if not cdat_info.ping:
-        return
-    except:
-      pass
-    cdat_info.askAnonymous(val)
-    import threading
-    kargs['target']=pingPCMDIdbThread
-    kargs['args']=args
-    t = threading.Thread(**kargs)
-    t.start()
-
-def pingPCMDIdbThread(*args,**kargs):
-    import threading
-    kargs['target']=submitPing
-    kargs['args']=args
-    t = threading.Thread(**kargs)
-    t.start()
-    import time
-    time.sleep(5) # Lets wait 5 seconds top for this ping to work
-    if t.isAlive():
-        try:
-            t._Thread__stop()
-        except:
-            pass
-def submitPing(source,action,source_version=None):
-  try:
-    import urllib2,sys,os,cdat_info,hashlib,urllib
-    if source in ['cdat','auto',None]:
-      source = cdat_info.SOURCE
-    if cdat_info.ping:
-      if not source in actions_sent.keys():
-        actions_sent[source]=[]
-      elif action in actions_sent[source]:
-        return
-      else:
-        actions_sent[source].append(action)
-      data={}
-      uname = os.uname()
-      data['platform']=uname[0]
-      data['platform_version']=uname[2]
-      data['hashed_hostname']=hashlib.sha1(uname[1]).hexdigest()
-      data['source']=source
-      if source_version is None:
-        data['source_version']=cdat_info.get_version()
-      else:
-        data['source_version']=source_version
-      data['action']=action
-      data['sleep']=cdat_info.sleep
-      data['hashed_username']=hashlib.sha1(os.getlogin()).hexdigest()
-      urllib2.urlopen('http://uv-cdat.llnl.gov/UVCDATUsage/log/add/',urllib.urlencode(data))
-  except Exception,err:
-    pass
-
-CDMS_INCLUDE_DAP = %s
-CDMS_DAP_DIR = %s
-CDMS_HDF_DIR = %s
-CDMS_GRIB2LIB_DIR = %s
-CDMS_INCLUDE_GRIB2LIB = %s
-CDMS_INCLUDE_DRS = %s
-CDMS_INCLUDE_HDF = %s
-CDMS_INCLUDE_PP = %s
-CDMS_INCLUDE_QL = %s
-drs_file = %s
-netcdf_directory = %s
-netcdf_include_directory = %s
-cdunif_include_directories = %s + %s + %s
-cdunif_library_directories = %s + %s + %s + get_drs_dirs()
-cdunif_libraries = %s + %s + get_drs_libs() + %s + %s
-x11include = %s
-x11libdir = %s
-mathlibs = %s
-action = %s
-externals = %s
-""" % (
-        repr(options.get('CDMS_INCLUDE_DAP','no')),
-        repr(options.get('CDMS_DAP_DIR','.')),
-        repr(options.get('CDMS_HDF_DIR','.')),
-        repr(options.get('CDMS_GRIB2LIB_DIR',os.environ['EXTERNALS'])),
-        repr(options.get('CDMS_INCLUDE_GRIB2LIB',"yes")),
-        repr(options['CDMS_INCLUDE_DRS']),
-        repr(options['CDMS_INCLUDE_HDF']),
-        repr(options['CDMS_INCLUDE_PP']),
-        repr(options['CDMS_INCLUDE_QL']),
-        repr(drs_file),
-        repr(netcdf_directory),
-        repr(netcdf_include_directory),
-        repr(cdunif_include_directories),repr(dap_include),repr(hdf_include),
-        repr(cdunif_library_directories),repr(dap_lib_dir),repr(hdf_lib_dir),
-        repr(['cdms', netcdfname]),repr(dap_lib),repr(hdf_libraries),repr(grib2_libraries),
-        repr(options['x11include']),
-        repr(options['x11libdir']),
-        repr(options['mathlibs']),
-        repr(options['action']),
-        repr(os.environ['EXTERNALS']),
-        )
-    if enable_aqua:
-	print >> f,'enable_aqua = True'
-    else:
-        print >>f, 'enable_aqua = False'
-    f.close()
-    cdat_info_path = os.path.join(os.environ['BUILD_DIR'], 'cdat_info')
-    if not norun:
-      # Install the configuration
-      #would be best to add 'clean' but it gives stupid warning error
-      sys.argv[1:]=['-q', 'install', '--prefix=%s' % target_prefix]
-      setup (name="cdat_info",
-       version="0.0",
-       package_dir = { 'cdat_info' : os.path.dirname(cdat_info_path)},
-      )
-      os.system('/bin/rm -fr build')
-
-    py_prefix = os.path.join(target_prefix,'lib','python%i.%i' % sys.version_info[:2],'site-packages')
-    cdat_info_src_path = os.path.join(build_dir, 'cdat_info.py')
-    cdat_info_dst_path = os.path.join(py_prefix, 'cdat_info.py')
-    if os.path.isfile(cdat_info_src_path):
-        shutil.copyfile(cdat_info_src_path, cdat_info_dst_path)
-    else:
-       print>>sys.stderr, 'Failed to copy %s to %s' % (cdat_info_src_path, cdat_info_dst_path)
-
-    os.chdir(here)
-    print >>sys.stderr, 'Configuration installed.'
-
-def usage():
-    f = open('HELP.txt')
-    lines = f.readlines()
-    f.close()
-    for line in lines[10:-9]:
-        sys.stdout.write(line)
-    print '\tDefault Packages'
-    print '\t----------------'
-    packages.append('\n\tContributed Packages\n\t--------------------')
-    #execfile('installation/contrib.py',globals(),globals())
-    for p in packages:
-        print '\t\t',p
-
-def main(arglist):
-    global norun, echo, force, do_configure, silent, action, logdir, enable_aqua,target_prefix, enable_netcdf3, hdf5path,zpath
-    enable_aqua = False
-    enable_cdms1 = False
-    enable_netcdf3=False
-    optlist, control_names = getopt.getopt(arglist,
-                       "c:defhnPl",
-                       ["enable-cdms-only",
-                        "configuration=",
-                        "debug",
-                        "prefix=",
-                        "echo",
-                        "force",
-                        "help",
-                        "with-externals=",
-                        "norun",
-                        "PCMDI",
-                        "pcmdi",
-                        "psql","enable-psql",
-                        "enable-hdf4","enable-HDF4",
-                        "with-HDF4=","with-hdf4=",
-                        "disable-hdf4","disable-HDF4",
-                        "disable-contrib",
-                        "enable-pp",
-                        "enable-drs","enable-DRS",
-                        "disable-externals-build",
-                        "disable-pp",
-                        ## Bellow are the arguments that could be passed to exsrc, nothing done with them
-                        "disable-R","disable-r",
-                        #"disable-VTK","disable-vtk",
-                        "disable-XGKS","disable-xgks",
-                        "disable-Pyfort","disable-pyfort",
-                        "disable-NetCDF","disable-netcdf","disable-NETCDF",
-                        "disable-Numeric","disable-numeric",
-                        "disable-gplot","disable-GPLOT","disable-Gplot",
-                        "disable-gifsicle","disable-GIFSICLE",
-                        "disable-gifmerge","disable-GIFMERGE",
-                        "disable-pbmplus","disable-PBMPLUS",
-                        "disable-netpbm","disable-NETPBM",
-                        "disable-Pmw","disable-pmw",
-                        "disable-ioapi",
-                        "disable-cairo",
-                        "disable-ffmpeg",
-                        "disable-freetype",
-                        "disable-sampledata",
-                        "enable-ioapi",
-                        "enable-R","enable-r",
-                        "enable-numpy","disable-numpy",
-                        "enable-scipy","disable-scipy",
-                        "enable-ipython","disable-ipython",
-                        #"enable-VTK","enable-vtk",
-                        "enable-XGKS","enable-xgks",
-                        "enable-Pyfort","enable-pyfort",
-                        "enable-NetCDF","enable-netcdf","enable-NETCDF","enable-netcdf-fortran","enable-NETCDF-Fortran",
-                        "enable-Numeric","enable-numeric",
-                        "enable-gplot","enable-GPlot","enable-GPLOT",
-                        "enable-gifsicle","enable-GIFSICLE",
-                        "enable-gifmerge","enable-GIFMERGE",
-                        "enable-pbmplus","enable-PBMPLUS",
-                        "enable-netpbm","enable-NETPBM",
-                        "enable-Pmw","enable-pmw",
-                        "enable-aqua","enable-Aqua","enable-AQUA",
-                        "enable-cairo",
-                        "enable-ffmpeg",
-                        "enable-freetype",
-                        "enable-cdms1",
-                        "enable-netcdf3",
-                        "enable-spanlib",
-                        "disable-spanlib"
-                        "disable-tkbuild",
-                        "enable-qt",
-                        "enable-vcs-legacy",
-                        "enable-qt-framework",
-                        "with-qt=",
-                        "with-qt-lib=",
-                        "with-qt-inc=",
-                        "with-qt-bin=",
-                        "qt-debug",
-                        "list",
-                       ]
-                    )
-    configuration_files = []
-    nodap=0
-    nopp=0
-    nohdf=0
-    selfhdf=0
-    selfdap=0
-    selfpp=0
-    showlist=0
-    qtfw=False
-    qtinc=None
-    qtlib=None
-    qtbin=None
-    qt=False
-    control_names = ['contrib']
-    sampleData = True
-##     prefix_target = sys.exec_prefix
-    externals = os.environ.get("EXTERNALS",os.path.join(sys.prefix,"Externals"))
-    hdf5path = None
-    zpath = None
-
-    for i in range(len(optlist)):
-        letter=optlist[i][0]
-        if letter == "--enable-vcs-legacy":
-            qt=True
-        if letter == "--enable-qt":
-            qt=True
-        if letter == "--enable-qt-framework":
-            qtfw=True
-        if letter == "--with-qt":
-            qtinc=os.path.join(optlist[i][1],"include")
-            qtlib=os.path.join(optlist[i][1],"lib")
-            qtbin=os.path.join(optlist[i][1],"bin")
-        if letter == "--with-qt-inc":
-            qtinc=optlist[i][1]
-        if letter == "--with-qt-bin":
-            qtbin=optlist[i][1]
-        if letter == "--with-qt-lib":
-            qtlib=optlist[i][1]
-        if letter == "--enable-cdms-only":
-            control_names = ['cdmsonly']+control_names
-            if 'contrib' in control_names:
-                control_names.pop(control_names.index('contrib'))
-        elif letter == "--with-externals":
-            externals = optlist[i][1]
-        elif letter in ["-c",  "--configuration"]:
-            m = False
-            n = optlist[i][1]
-            if os.path.isfile(n):
-                m = n
-            elif os.path.isfile(n + '.py'):
-                m = n + '.py'
-            elif os.path.isfile(os.path.join('installation', n)):
-                m = os.path.join('installation', n)
-            elif os.path.isfile(os.path.join('installation', n + '.py')):
-                m = os.path.join('installation', n + '.py')
-            if m:
-                configuration_files.append(m)
-            else:
-                print >>sys.stderr, "Cannot find configuration file", optlist[i][1]
-            force = 1
-            do_configure = 1
-        elif letter in ["-d", "--debug"]:
-            debug_file = os.path.join('installation','debug.py')
-            configuration_files.append(debug_file)
-            force = 1
-            do_configure = 1
-        elif letter in ["-e", "--echo"]:
-            echo = 1
-        elif letter in ["--enable-cdms1"]:
-            enable_cdms1 = True
-        elif letter in ["--enable-netcdf3"]:
-            enable_netcdf3 = True
-	elif letter in ["--enable-aqua","--enable-Aqua","--enable-AQUA"]:
-	    enable_aqua = True
-        elif letter in ["-f", "--force"]:
-            force = 1
-            do_configure = 1
-        elif letter in ["-h", "--help"]:
-            usage()
-            raise SystemExit, 1
-        elif letter in ["-P", "--PCMDI", "--pcmdi"]:
-            configuration_files.append(os.path.join('installation', 'pcmdi.py'))
-            force=1
-            do_configure=1  # Need libcdms built a certain way too.
-        elif letter in ["--psql", "--enable-psql"]:
-            configuration_files.append(os.path.join('installation', 'psql.py'))
-            do_configure=1  # Need libcdms built a certain way too.
-##         elif letter in ["--with-OpenDAP", "--with-opendap", "--with-OPENDAP","--enable-opendap","--enable-OpenDAP","--enable-OPENDAP"]:
-##             configuration_files.append(os.path.join('installation', 'DAP.py'))
-##             do_configure=1  # Need libcdms built a certain way too.
-##             selfdap=1
-##         elif letter in ["--with-HDF4", "--with-hdf4",'--enable-hdf4','--enable-HDF4']:
-##             configuration_files.append(os.path.join('installation', 'HDF.py'))
-##             do_configure=1  # Need libcdms built a certain way too.
-##             selfhdf=1
-        elif letter in ["--with-hdf5",]:
-            hdf5path = optlist[i][1]
-        elif letter in ["--with-z",]:
-            zpath = optlist[i][1]
-        elif letter in ["--prefix"]:
-            target_prefix = optlist[i][1]
-        elif letter in ['--enable-drs','--enable-DRS']:
-            configuration_files.append(os.path.join('installation', 'pcmdi.py'))
-            do_configure=1  # Need libcdms built a certain way too.
-        elif letter in ['--enable-pp','--enable-PP']:
-            configuration_files.append(os.path.join('installation', 'pp.py'))
-            do_configure=1  # Need libcdms built a certain way too.
-            selfpp=1
-##         elif letter in ["--enable-NetCDF","--enable-NETCDF","--enable-netcdf",
-##                         "--enable-netcdf-fortran",
-##                         "--disable-opendap","--disable-OpenDAP","--disable-OPENDAP"]:
-##             nodap=1
-##         elif letter in ["--disable-hdf4","--disable-HDF4"]:
-##             nohdf=1
-        elif letter in ["--disable-pp","--disable-PP"]:
-            nohdf=1
-        elif letter in ["--disable-sampledata",]:
-            sampleData = False
-        elif letter in ["-n", "--norun"]:
-            norun = 1
-        elif letter in ['--list','-l']:
-            showlist=1
-        elif letter in ['--disable-contrib']:
-            for i in range(len(control_names)):
-                if control_names[i]=='contrib':
-                    control_names.pop(i)
-                    i=i-1
-    CDMS_INCLUDE_DAP='yes'
-    if nopp==1 and selfpp==1:
-        raise "Error you chose to both enable and disable PP support !"
-    if nohdf==1 and selfhdf==1:
-        raise "Error you chose to both enable and disable HDF !"
-##     if (nodap==0 and selfdap==0) and (sys.platform in ['linux2','darwin']):
-##         configuration_files.append(os.path.join('installation', 'DAP.py'))
-##         do_configure=1  # Need libcdms built a certain way too.
-##     if (nohdf==0 and selfhdf==0) and (sys.platform in ['linux2','darwin']):
-##         configuration_files.append(os.path.join('installation', 'HDF.py'))
-##         do_configure=1  # Need libcdms built a certain way too.
-    if (nopp==0 and selfpp==0) and (sys.platform in ['linux2','darwin']):
-        configuration_files.append(os.path.join('installation', 'pp.py'))
-        do_configure=1  # Need libcdms built a certain way too.
-
-    if hdf5path is None: hdf5path= os.path.join(externals)
-    if zpath is None: zpath= externals
-    os.environ['EXTERNALS']=externals
-
-    control_files = []
-    for n in control_names:
-        m = ''
-        if os.path.isfile(n):
-            m = n
-        elif os.path.isfile(n + '.py'):
-            m = n + '.py'
-        elif os.path.isfile(os.path.join('installation', n)):
-            m = os.path.join('installation', n)
-        elif os.path.isfile(os.path.join('installation', n + '.py')):
-            m = os.path.join('installation', n + '.py')
-        elif os.path.isfile(os.path.join(src_dir, 'installation', n + '.py')):
-            m = os.path.join(src_dir, 'installation', n + '.py')
-
-        if m:
-            control_files.append(m)
-        else:
-            print >>sys.stderr, 'Cannot find control file', n
-            raise SystemExit, 1
-
-    for control_file in control_files:
-        print 'Running:',control_file
-        execfile(control_file, globals(), globals())
-
-    if showlist:
-        print 'List of Packages that would be installed:'
-        for p in packages:
-            print p
-        sys.exit()
-    if force:
-        os.system('./scripts/clean_script')
-
-    sys.path.insert(0,os.path.join(target_prefix,'lib','python%i.%i' % sys.version_info[:2],'site-packages'))
-    if do_configure:
-        force = 1
-        if os.path.isfile(os.path.join(build_dir, 'cdat_info.py')):
-            os.unlink(os.path.join(build_dir, 'cdat_info.py'))
-        print >>sys.stderr, 'Configuring & installing scripts.'
-        configure(configuration_files)
-        images_path = os.path.join(src_dir, 'images')
-        os.chdir(images_path)
-        scripts = glob.glob('*')
-        for script in scripts:
-            if script[-1] == '~': continue
-            if script == "README.txt": continue
-            target = os.path.join(target_prefix, 'bin', script)
-            if os.path.isfile(target): os.unlink(target)
-            shutil.copy(script, target)
-        os.chdir(here)
-    else:
-        import cdat_info
-        action = cdat_info.action
-
-    # Install CDMS
-    cdms_library_file = os.path.join(cdms_library_directory, 'libcdms.a')
-    #if force or not os.path.isfile(cdms_library_file):
-    #    install('libcdms', action)
-    #    if (sys.platform in ['darwin',]):
-    #       os.system('ranlib '+os.path.join(target_prefix,'lib','libcdms.a'))
-
-    # Install Packages
-    package_errors=0
-    package_failed=[]
-    if enable_cdms1:
-        packages.append("Packages/regrid")
-        packages.append("Packages/cdms")
-    for p in packages:
-        h = os.getcwd()
-        oldcmd=action["setup.py"]+""
-        action['setup.py'] = action['setup.py'].strip()[:-1]+" build -b "+ os.environ['BUILD_DIR']+"/"+p
-        try:
-            if p == "Packages/vcs":
-                action["setup.py"]=oldcmd.strip()[:-1]+" --old-and-unmanageable; "
-                if qtfw:
-                    action["setup.py"]=oldcmd.strip()[:-1]+" --enable-qt-framework ; "
-                if qt:
-                    action["setup.py"]=oldcmd.strip()[:-1]+" --enable-qt ; "
-                if qtinc is not None:
-                    action["setup.py"]=action["setup.py"].strip()[:-1]+" --with-qt-inc=%s ; "%qtinc
-                if qtlib is not None:
-                    action["setup.py"]=action["setup.py"].strip()[:-1]+" --with-qt-lib=%s ; "%qtlib
-                if qtbin is not None:
-                    action["setup.py"]=action["setup.py"].strip()[:-1]+" --with-qt-bin=%s ; "%qtbin
-            install(p, action)
-        except:
-            package_errors+=1
-            package_failed.append(p)
-            os.chdir(h)
-            print >>sys.stderr, 'Error: Installation of Package:',p,'FAILED'
-        action["setup.py"]=oldcmd
-
-    # Celebrate
-    if echo:
-        print "Simulated build complete."
-    elif not silent:
-        print >>sys.stderr, finish
-        if package_errors!=0:
-            print >>sys.stderr, '\n              --- WARNING ---\n'
-            print >>sys.stderr,package_errors,'Packages reported as FAILED, see logs\n'
-            for p in package_failed:
-                print >>sys.stderr,'\t\t',p
-            print >>sys.stderr
-        print >>sys.stderr, '******************************************************\n'
-        """
-        ******************************************************
-        CDAT has been installed in %s .
-        Please make sure all modules built successfully
-        (see above build messages)
-        ******************************************************
-        """ %(target_prefix,)
-
-def _install(file, action):
-    h = os.getcwd()
-    absfile = os.path.abspath(file)
-    print 'absfile ', absfile
-    dirname, basename = os.path.split(absfile)
-    dirfinal = os.path.split(dirname)[-1]
-    os.chdir(dirname)
-    name, ext = os.path.splitext(basename)
-    if ext.lower() == ".pfp":
-        p1 = action['*.pfp']
-    elif action.has_key(absfile):
-        p1 = action[absfile]
-    elif action.has_key(file):
-        p1 = action[file]
-    elif action.has_key(basename):
-        p1 = action[basename]
-    else:
-        print "Do not know what to do with", file, "in", dirname
-        print >>sys.stderr, "Do not know what to do with", file, "in", dirname
-        raise SystemExit, 1
-
-    if log:
-        logfile = os.path.join(logdir, dirfinal+".LOG")
-        if not silent:
-            print >>sys.stderr, "Processing", dirfinal + ', log =', logfile
-    else:
-        logfile = tempfile.mktemp()
-        if not silent:
-            print >>sys.stderr, "Processing", dirfinal
-    p1 = p1 % { 'filename': file }
-    sep = " > %s 2>&1 ; " % logfile
-    p = sep.join(p1.split(";"))
-##     os.environ["CFLAGS"]="%s -L%s/lib" % (os.environ.get("CFLAGS",""), os.environ["EXTERNALS"])
-    add_lib = "-L%s/lib" % (os.environ["EXTERNALS"],)
-    cflags_current = os.environ.get("CFLAGS","")
-    if cflags_current.find(add_lib) == -1:
-        os.environ["CFLAGS"]="%s %s" % (cflags_current, add_lib)
-    p = 'env CFLAGS="%s" %s' % (os.environ["CFLAGS"],p)
-    if echo:
-        print >> sys.stderr, p
-    print norun
-    if norun:
-        r = 0
-    else:
-        #print '====>executing: ', p
-        r = os.system(p)
-    if r:
-        print >>sys.stderr, "Install failed in directory", dirname
-        print >>sys.stderr, "Log=", logfile
-        raise SystemExit, 1
-    elif not log and not norun:
-        os.unlink(logfile)
-
-    f = open(os.path.join(build_dir, 'rebuild.py'), 'w')
-    print >>f, """
-import os
-j = os.system(%s)
-if j:
-    print 'Compilation failed'
-    raise SystemExit, 1
-""" % (repr(p1+ " 1>LOG.rebuild"),)
-    f.close()
-    os.chdir(h)
-
-def install (arg, action):
-    arg = os.path.normpath(arg)
-    installer = ''
-    arg = os.path.join(src_dir, arg)
-    if os.path.isdir(arg):
-        for x in (glob.glob(os.path.join(arg, '*.pfp')) + \
-                 ['autogen.sh',
-                  'install.py',
-                  'setup.py',
-                  'install_script',
-                  'Makefile',
-                  'makefile'] ):
-            name = os.path.join(arg,x)
-            if os.path.isfile(name):
-                installer = name
-                break
-        else:
-            print >>sys.stderr, "Cannot find installation instructions in", arg
-            raise SystemExit, 1
-    elif os.path.isfile(arg):
-        installer = arg
-        designator, junk = os.path.split(arg)
-    else:
-        print >>sys.stderr, "Cannot find", arg
-        raise SystemExit
-
-    _install(installer, action)
-
-
-if __name__ == "__main__":
-    arglist = sys.argv[1:]
-    main(arglist)
-    ## This parts creates links from Externals...
-    try:
-        import cdat_info
-        externals = cdat_info.externals
-    except:
-        externals = os.path.join(sys.prefix,"Externals")
-    externals = os.environ.get("EXTERNALS",externals)
-    externals_path = os.path.join(externals,'bin')
-    files = os.listdir(externals_path)
-    for file in files:
-        fnm = os.path.join(sys.prefix,'bin',file)
-        if not os.path.exists(fnm) and not os.path.islink(fnm):
-            try:
-                os.symlink(os.path.join(externals_path,file),fnm)
-            except:
-                pass
-
diff --git a/CMake/cdat_modules_extra/jasper_configure_step.cmake.in b/CMake/cdat_modules_extra/jasper_configure_step.cmake.in
deleted file mode 100644
index ff0cccad7..000000000
--- a/CMake/cdat_modules_extra/jasper_configure_step.cmake.in
+++ /dev/null
@@ -1,11 +0,0 @@
-# On linux 64, gdal picks the static jasper library, make sure only shared libraries
-# are built (Alex Pletzer)
-
-# Make sure to pick up image and other libraries built by the superbuild
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-EXECUTE_PROCESS(
-  COMMAND sh configure --enable-shared --disable-static --prefix=@jasper_install@
-  WORKING_DIRECTORY "@jasper_source@"
-  RESULT_VARIABLE rv
-  )
diff --git a/CMake/cdat_modules_extra/jpeg_install_step.cmake.in b/CMake/cdat_modules_extra/jpeg_install_step.cmake.in
deleted file mode 100644
index ab724cc8a..000000000
--- a/CMake/cdat_modules_extra/jpeg_install_step.cmake.in
+++ /dev/null
@@ -1,28 +0,0 @@
-
-execute_process(
-  COMMAND make install ${INSTALL_ARGS}
-  WORKING_DIRECTORY "${WORKING_DIR}"
-  RESULT_VARIABLE res)
-
-#cp build/jpeg*/lib* /Users/partyd/Kitware/uv-cdat/make-file-install/Externals/lib
-#cp build/jpeg*/*.h /Users/partyd/Kitware/uv-cdat/make-file-install/Externals/include
-
-file(GLOB jpeglibs "@jpeg_source@/lib*")
-file(GLOB jpegheaders "@jpeg_source@/*.h")
-
-
-foreach(lib ${jpeglibs})
-  execute_process(
-    COMMAND "@CMAKE_COMMAND@" -E copy_if_different ${lib} @jpeg_install@/lib
-    RESULT_VARIABLE res
-    OUTPUT_VARIABLE CDAT_OUT
-    OUTPUT_VARIABLE CDAT_ERR)
-endforeach()
-
-foreach(header ${jpegheaders})
-    execute_process(
-      COMMAND "@CMAKE_COMMAND@" -E copy_if_different ${header} @jpeg_install@/include
-      RESULT_VARIABLE res
-      OUTPUT_VARIABLE CDAT_OUT
-      OUTPUT_VARIABLE CDAT_ERR)
-endforeach()
\ No newline at end of file
diff --git a/CMake/cdat_modules_extra/lats_Makefile.gfortran.in b/CMake/cdat_modules_extra/lats_Makefile.gfortran.in
deleted file mode 100644
index 566a6b5bc..000000000
--- a/CMake/cdat_modules_extra/lats_Makefile.gfortran.in
+++ /dev/null
@@ -1,208 +0,0 @@
-# Generated automatically from Makefile.in by configure.
-# -*-Mode: indented-text;-*-
-# Makefile:    LATS makefile
-#
-# Copyright:   1996, Regents of the University of California
-#	       This software may not be distributed to others without
-#	       permission of the author.
-#
-# Author:      Bob Drach, Lawrence Livermore National Laboratory
-#              drach@llnl.gov
-#
-# Version:     $Id: Makefile.in,v 1.12 1996/10/29 00:20:44 drach Exp $
-#
-# Revision History:
-#
-# $Log: Makefile.in,v $
-# Revision 1.12  1996/10/29  00:20:44  drach
-# - Removed name conflicts with CDMS
-#
-# Revision 1.11  1996/10/22 19:04:57  fiorino
-# latsgrib bug in .ctl creator
-#
-# Revision 1.10  1996/10/16 22:09:51  drach
-# - Added automatic gribmap generation
-# - Restricted LATS_GRADS_GRIB convention to one grid per file
-#
-# Revision 1.9  1996/09/30 18:54:46  drach
-# - permit installation without the sources being present
-# - separate FORTRAN debug flag, since -O doesn't work on the Cray
-#
-# Revision 1.8  1996/09/17 16:52:31  drach
-# - Misc. cleanup
-#
-# Revision 1.7  1996/08/29 19:27:17  drach
-# - Cleaned up configuration macros, Makefile.in for portability
-#
-# Revision 1.6  1996/08/27 19:39:03  drach
-# - Added FORTRAN test
-# - Ported to other UNIX platforms
-#
-# Revision 1.5  1996/07/12 00:36:21  drach
-# - (GRIB) use undefined flag only when set via lats_miss_XX
-# - (GRIB) use delta when checking for missing data
-# - (GRIB) define maximum and default precision
-# - fixed lats_vartab to work correctly.
-# - Added report of routine names, vertical dimension types
-#
-# Revision 1.4  1996/06/27 19:19:34  drach
-# - Misc. cleanup
-#
-# Revision 1.3  1996/06/27 01:32:49  drach
-# - Fixed up file permissions on install
-#
-# Revision 1.2  1996/06/27 01:02:38  drach
-# - Added installation directives
-#
-# Revision 1.1  1996/06/12 18:09:23  drach
-# - Initial versions
-#
-#
-#
-# Note: to generate Makefile from Makefile.in:
-#    ./configure --cache-file=/dev/null \
-#        [--with-ncinc=<netCDF include directory>] \
-#        [--with-nclib=<netCDF library directory>] \
-#	 [--prefix=<installation directory]
-
-# Install prefix for architecture-independent files
-prefix=@cdat_EXTERNALS@
-
-# Install prefix for architecture-dependent files
-exec_prefix=    $(prefix)
-
-# Expanded directories
-BINDIR=$(exec_prefix)/bin
-INCLUDEDIR=$(prefix)/include
-LIBDIR=$(exec_prefix)/lib
-MANDIR=$(prefix)/man
-PARMDIR=$(prefix)/lib/lats
-
-CC = cc
-CFLAGS = -I.  -I@cdat_EXTERNALS@/include $(DEBUG) -I/usr/include/malloc
-CPPFLAGS =  -DHAVE_NETCDF -DLATS_CHANGE_GRADS_NAMES -DSTNDALN=1 -DBYTEORDER=1 -DGRADS_CRAY=0
-DEBUG = -O
-DEFS =  -DOS_NAME=Linux -DOS_MAJOR=2 
-FC = gfortran
-FDEBUG =
-FFLAGS = -I.  $(FDEBUG)A -Wno-all
-INSTALL = /usr/bin/install -c
-INSTALL_PROGRAM = /usr/bin/install -c
-LDFLAGS = -L. -llats -L@cdat_EXTERNALS@/lib -lnetcdf  -lm
-OS = linux
-RANLIB = :
-
-# Shell to run make subcommands
-SHELL = /bin/sh
-
-#
-#	mf configuration
-#
-LATSLSVER="1.0"
-
-# Do not change values below this line
-#
-LIBRARY		= liblats.a 
-
-OBJS		= lats.o latsint.o latsnc.o latsgrib.o latstime.o latsstat.o latsfort.o fgbds.o \
-		  fgutil.o latsgribmap.o gaddes.o gagmap.o gamach.o gautil.o
-
-all:		$(LIBRARY) latsls
-
-latsls:	        latsls.o latsint.o
-		$(CC) latsls.o latsint.o $(CPPFLAGS) $(CFLAGS)  -o latsls
-
-$(LIBRARY):	$(OBJS)
-		ar rv $(LIBRARY) $?
-		$(RANLIB) $(LIBRARY)
-
-install:	libinstall
-
-libinstall:
-		-if test ! -d $(PARMDIR); \
-		then mkdir $(PARMDIR); \
-		fi
-		echo "LIBDIR"$(LIBDIR)
-		$(INSTALL_PROGRAM) -m 644 $(LIBRARY) $(LIBDIR)/$(LIBRARY)
-		(cd $(LIBDIR); $(RANLIB) $(LIBRARY))
-		$(INSTALL_PROGRAM) -m 644 lats.h $(INCLUDEDIR)/lats.h
-		$(INSTALL_PROGRAM) -m 644 lats.inc $(INCLUDEDIR)/lats.inc
-		$(INSTALL_PROGRAM) -m 644 amip2.parms $(PARMDIR)/amip2.parms
-
-test:		$(LIBRARY) testnc wgrib testgrib testf
-		@echo "test netCDF"
-		@if test -f testnc.nc; \
-		then rm -f testnc.nc; \
-		fi
-		@testnc
-		@rm -f testnc.nc
-		@echo "test GRIB"
-		@if test -f testgrib.grb; \
-		then rm -f testgrib.grb; \
-		fi
-		@if test -f testgrib.ctl; \
-		then rm -f testgrib.ctl; \
-		fi
-		@if test -f testgrib.bin; \
-		then rm -f testgrib.bin; \
-		fi
-		@testgrib
-		@rm -f testgrib.grb
-		@rm -f testgrib.ctl
-		@rm -f testgrib.bin
-		@echo "test FORTRAN"
-		@if test -f testf.nc; \
-		then rm -f testf.ne; \
-		fi
-		@testf
-		@rm -f testf.nc
-
-lats.o:		lats.c latsint.h lats.h
-latsint.o:	latsint.c latsint.h lats.h latsparm.h
-latsnc.o:	latsnc.c latsint.h lats.h
-latsgrib.o:	latsgrib.c fgrib.h fgrib_init.h latsint.h lats.h
-latstime.o:	latstime.c latsint.h lats.h latstime.h
-latsstat.o:	latsstat.c latsint.h lats.h
-latsfort.o:	latsfort.c lats.h cfortran.h
-fgbds.o:	grads.h fgbds.c fgrib.h
-fgutil.o:	fgutil.c fgrib.h
-latsgribmap.o:	grads.h gagmap.h
-gaddes.o:	grads.h
-gagmap.o:	grads.h gagmap.h
-gamach.o:	grads.h
-gautil.o:	grads.h
-latsls.o:	latsint.h latsls.c latsint.o
-		$(CC) -c latsls.c $(CPPFLAGS) $(DEFS) $(CFLAGS) -DLATSLS_VERSION=\"$(LATSLSVER)\"
-
-.SUFFIXES: .F
-
-.c.o:
-	$(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c $<
-
-.c:
-	$(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -o $@ $< $(LDFLAGS)
-
-.F:
-	case $(OS) in \
-	     'aix') \
-		    /usr/ccs/lib/cpp -P $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $(DEFS) $< $@.f; \
-		    $(FC) $(FFLAGS) $(LDFLAGS) $(LIBS) $@.f -o $@; \
-		    rm $@.f; \
-		    ;; \
-	     *) \
-		    $(FC) $(CPPFLAGS) $(INCLUDES) $(DEFS) $(FFLAGS) -o $@ $< $(LDFLAGS) $(LIBS); \
-		    ;; \
-	esac
-	
-clean:
-	-rm -f *.o core *.~*~ testnc testgrib testf testf.f
-
-distclean: clean
-	-rm -f $(LIBRARY) testnc testnc.nc testgrib testgrib.grb \
-	testgrib.ctl testgrib.bin testgrib.gmp testf.nc latsls wgrib
-
-settest:
-	cp liblats.a lib/
-	cp wgrib bin/
-	cp latsls bin/
-
diff --git a/CMake/cdat_modules_extra/libcf_install_step.cmake.in b/CMake/cdat_modules_extra/libcf_install_step.cmake.in
deleted file mode 100644
index f5c293642..000000000
--- a/CMake/cdat_modules_extra/libcf_install_step.cmake.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-execute_process(
-  COMMAND "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
-  WORKING_DIRECTORY @libcf_source@
-  RESULT_VARIABLE res)
-
-if(NOT ${res} EQUAL 0)
-  message("Install Errors detected: \n${CDAT_OUT}\n${CDAT_ERR}")
-  message(FATAL_ERROR "Error in Install")
-endif()
-message("Install succeeded.")
diff --git a/CMake/cdat_modules_extra/libcf_make_step.cmake.in b/CMake/cdat_modules_extra/libcf_make_step.cmake.in
deleted file mode 100644
index 790efaa63..000000000
--- a/CMake/cdat_modules_extra/libcf_make_step.cmake.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-execute_process(
-  COMMAND "@PYTHON_EXECUTABLE@" setup.py build
-  WORKING_DIRECTORY @libcf_source@
-  OUTPUT_VARIABLE CDAT_OUT
-  ERROR_VARIABLE CDAT_ERR
-  RESULT_VARIABLE res)
-
-if(NOT ${res} EQUAL 0)
-  message("Make Errors detected: \n${CDAT_OUT}\n${CDAT_ERR}")
-  message(FATAL_ERROR "Error in Make")
-endif()
-message("Make succeeded.")
diff --git a/CMake/cdat_modules_extra/libdrs_Makefile.Linux.gfortran.in b/CMake/cdat_modules_extra/libdrs_Makefile.Linux.gfortran.in
deleted file mode 100644
index 77a49c002..000000000
--- a/CMake/cdat_modules_extra/libdrs_Makefile.Linux.gfortran.in
+++ /dev/null
@@ -1,78 +0,0 @@
-# DRS library Makefile
-#
-# Usage:
-#
-# To make DRS library (libdrs.a) for Linux, with Absoft FORTRAN:
-#	% make
-#
-#--------------------------------------------------------------------
-
-#jfp was DEBUG = -O
-DEBUG = -g -O
-FC = gfortran
-CC = gcc
-ARCHOPT = -mtune=native
-#ARCHOPT = -arch i386
-#ARCHOPT =
-FOPTS = -fcray-pointer $(ARCHOPT) -W
-# FFLAGS = $(DEBUG) $(FOPTS) -Dsun -D__linux -D__linux_pgi -byteswapio
-FFLAGS = $(DEBUG) $(FOPTS) -Dgfortran -Dsun -D__linux -D__linux_gfortran -fpic
-# FFLAGS = $(DEBUG) $(FOPTS) -Dsun -D__linux -D__linux_pgi -Dgfortran -Dmac
-CFLAGS = $(DEBUG) $(ARCHOPT) -Dsun -D__linux -D__linux_gfortran -fpic
-INSTALL_LIB = @cdat_EXTERNALS@/lib
-INSTALL_INC = @cdat_EXTERNALS@/include
-#CPPFLAGS = -Dmac -Dsun -D__linux -D__linux_pgi $(ARCHOPT)
-CPPFLAGS = -D__linux $(ARCHOPT) -fpic
-#CPPFLAGS = -Dmac $(ARCHOPT) -Dsun -byteswapio
-CPP = cpp
-
-FOBJECTS = getdat.o idenc.o putdat.o clavdb.o getdim.o iflun.o setdim.o getnam.o mvnbc.o cluvdb.o getnd.o bnsrch.o drserr.o seterr.o getind.o compnm.o dictlk.o putvdm.o setnam.o setdat.o setvdm.o getrge.o savdb.o putdat1.o getdat1.o getvdim.o inqlun.o inqdict.o prdict.o rdtrans.o wrtrans.o setrep.o gettbuf.o getrge2.o getelemd.o setcdim.o getcdim.o getedim.o confnm.o putdic.o getpelem.o mimem.o redat.o wrdat.o cllun.o readhd.o writehd.o wrdic.o redic.o aslun.o drssync.o drsreadb.o drsautosync.o midate.o d_floor.o cddrsfwrap.o
-FINCLUDES = drsdef.h drscom.h cycle.h
-FSOURCES = $(FOBJECTS:.o=.F)
-
-COBJECTS = ctoi.o getslab.o drsc.o drstrunc.o cddrs_fc.o
-CINCLUDES = drscdf.h
-CSOURCES = $(COBJECTS:.o=.c)
-
-OBJECTS = $(FOBJECTS) $(COBJECTS)
-SOURCES = $(FSOURCES) $(CSOURCES)
-INCLUDES = $(FINCLUDES) $(CINCLUDES)
-#--------------------------------------------------------------------
-
-all: drsdef.h libdrs.a libdrs.so
-
-shared: drsdef.h libdrs.so
-
-libdrs.a: $(OBJECTS)
-	ar rv libdrs.a $?
-
-libdrs.so: $(OBJECTS)
-	$(CC) $(ARCHOPT) -lgfortran  -shared -o libdrs.so $(OBJECTS)
-
-drsdef.h: drsdef.HH
-	$(CPP) -P $(CPPFLAGS) drsdef.HH drsdef.h
-#--------------------------------------------------------------------
-
-install: libdrs.a
-	cp libdrs.a $(INSTALL_LIB); chmod 644 $(INSTALL_LIB)/libdrs.a
-	cp drsdef.h $(INSTALL_INC); chmod 644 $(INSTALL_INC)/drsdef.h
-	cp drscdf.h $(INSTALL_INC); chmod 644 $(INSTALL_INC)/drscdf.h
-#	install -f $(INSTALL_LIB) -m 644 libdrs.a
-#	install -f $(INSTALL_INC) -m 644 drsdef.h
-#	install -f $(INSTALL_INC) -m 644 drscdf.h
-
-#--------------------------------------------------------------------------
-
-# Miscellaneous junk
-
-tags:
-	etags $(SOURCES) $(INCLUDES)
-
-clean:
-	-rm -f *.o
-	-rm -f *~
-	-rm -f core
-.SUFFIXES: .F .o
-
-.F.o:
-	$(FC) $(FFLAGS) -c $<
diff --git a/CMake/cdat_modules_extra/libdrs_Makefile.Mac.fwrap.gfortran.in b/CMake/cdat_modules_extra/libdrs_Makefile.Mac.fwrap.gfortran.in
deleted file mode 100644
index 9cdb8773f..000000000
--- a/CMake/cdat_modules_extra/libdrs_Makefile.Mac.fwrap.gfortran.in
+++ /dev/null
@@ -1,85 +0,0 @@
-# DRS library Makefile
-#
-# Usage:
-#
-# To make DRS library (libdrs.a) for Linux, with Absoft FORTRAN:
-#	% make
-# This makefile is set up for a 64-bit Macintosh and gfortran/gcc 4.6.0
-# but see comments for how to use older Macs and older gfortran/gcc.
-#
-#--------------------------------------------------------------------
-
-# DEBUG = -O
-DEBUG = -g -O -save-temps
-FC = /usr/local/bin/gfortran
-CC = gcc
-#ARCHOPT = -arch x86_64
-#ARCHOPT = -arch i386
-ARCHOPT = -m64
-
-FOPTS = -fcray-pointer $(ARCHOPT) -W
-# FFLAGS = $(DEBUG) $(FOPTS) -Dsun -D__linux -D__linux_pgi -byteswapio
-# FFLAGS = $(DEBUG) $(FOPTS) -Dsun -D__linux -D__linux_pgi -Dgfortran -Dmac
-FFLAGS = $(DEBUG) $(FOPTS) -Dsun -Dgfortran -D__linux -D__linux_gfortran -Dmac -Dmac64
-CFLAGS = $(DEBUG) $(ARCHOPT)
-INSTALL_LIB = @cdat_EXTERNALS@/lib
-INSTALL_INC = @cdat_EXTERNALS@/include
-# Somehow CPPFLAGS ends out on the gcc lines...
-#CPPFLAGS = -Dmac -Dsun -D__linux -D__linux_pgi $(ARCHOPT)
-#CPPFLAGS = -Dmac $(ARCHOPT) -Dsun -byteswapio   note that byteswapio is never referenced
-#CPPFLAGS = -Dsun -D__linux -D__linux_gfortran -Dmac $(ARCHOPT)
-CPPFLAGS = -Dsun -D__linux -D__linux_gfortran -Dmac -Dmac64 $(ARCHOPT)
-CPP = cpp
-
-FOBJECTS = getdat.o idenc.o putdat.o clavdb.o getdim.o iflun.o setdim.o getnam.o mvnbc.o cluvdb.o getnd.o bnsrch.o drserr.o seterr.o getind.o compnm.o dictlk.o putvdm.o setnam.o setdat.o setvdm.o getrge.o savdb.o putdat1.o getdat1.o getvdim.o inqlun.o inqdict.o prdict.o rdtrans.o wrtrans.o setrep.o gettbuf.o getrge2.o getelemd.o setcdim.o getcdim.o getedim.o confnm.o putdic.o getpelem.o mimem.o redat.o wrdat.o cllun.o readhd.o writehd.o wrdic.o redic.o aslun.o drssync.o drsreadb.o drsautosync.o midate.o d_floor.o mac.o cddrsfwrap.o
-FINCLUDES = drsdef.h drscom.h cycle.h
-FSOURCES = $(FOBJECTS:.o=.F)
-
-COBJECTS = ctoi.o getslab.o drsc.o drstrunc.o macintosh.o cddrs_fc.o
-CINCLUDES = drscdf.h
-CSOURCES = $(COBJECTS:.o=.c)
-
-OBJECTS = $(FOBJECTS) $(COBJECTS)
-SOURCES = $(FSOURCES) $(CSOURCES)
-INCLUDES = $(FINCLUDES) $(CINCLUDES)
-#--------------------------------------------------------------------
-
-all: drsdef.h libdrs.a libdrs.so
-
-shared: drsdef.h libdrs.so
-
-libdrs.a: $(OBJECTS)
-	ar rv libdrs.a $?
-
-# formerly in libdrs.so, needed for Fortran->cdms link: -lcdms
-libdrs.so: $(OBJECTS)
-	$(CC) $(ARCHOPT) -headerpad_max_install_names -L/usr/X11R6/lib -L/usr/local/gfortran/lib -lgfortran  -L/usr/local/lib/ -L@cdat_EXTERNALS@/lib -lnetcdf -lgrib2c  -lquadmath -lcdms -shared -lpng15 -ljasper -o libdrs.so $(OBJECTS)
-
-drsdef.h: drsdef.HH
-	$(CPP) -P $(CPPFLAGS) drsdef.HH drsdef.h
-#--------------------------------------------------------------------
-
-install: libdrs.a
-	cp libdrs.a $(INSTALL_LIB); chmod 644 $(INSTALL_LIB)/libdrs.a
-	cp drsdef.h $(INSTALL_INC); chmod 644 $(INSTALL_INC)/drsdef.h
-	cp drscdf.h $(INSTALL_INC); chmod 644 $(INSTALL_INC)/drscdf.h
-#	install -f $(INSTALL_LIB) -m 644 libdrs.a
-#	install -f $(INSTALL_INC) -m 644 drsdef.h
-#	install -f $(INSTALL_INC) -m 644 drscdf.h
-
-#--------------------------------------------------------------------------
-
-# Miscellaneous junk
-
-tags:
-	etags $(SOURCES) $(INCLUDES)
-
-clean:
-	-rm -f *.o
-	-rm -f *~
-	-rm -f core
-
-.SUFFIXES: .F .o
-
-.F.o:
-	$(FC) $(FFLAGS) -c $<
diff --git a/CMake/cdat_modules_extra/libdrs_Makefile.Mac.gfortran.in b/CMake/cdat_modules_extra/libdrs_Makefile.Mac.gfortran.in
deleted file mode 100644
index d139f0b29..000000000
--- a/CMake/cdat_modules_extra/libdrs_Makefile.Mac.gfortran.in
+++ /dev/null
@@ -1,89 +0,0 @@
-# DRS library Makefile
-#
-# Usage:
-#
-# To make DRS library (libdrs.a) for Linux, with Absoft FORTRAN:
-#	% make
-# This makefile is set up for a 64-bit Macintosh and gfortran/gcc 4.6.0
-# but see comments for how to use older Macs and older gfortran/gcc.
-#
-#--------------------------------------------------------------------
-
-# DEBUG = -O
-DEBUG = -g -O -save-temps
-FC = /usr/local/bin/gfortran
-CC = gcc
-#ARCHOPT = -arch x86_64
-#ARCHOPT = -arch i386
-ARCHOPT = -m64
-
-FOPTS = -fcray-pointer $(ARCHOPT) -W
-# FFLAGS = $(DEBUG) $(FOPTS) -Dsun -D__linux -D__linux_pgi -byteswapio
-# FFLAGS = $(DEBUG) $(FOPTS) -Dsun -D__linux -D__linux_pgi -Dgfortran -Dmac
-FFLAGS = $(DEBUG) $(FOPTS) -Dsun -Dgfortran -D__linux -D__linux_gfortran -Dmac -Dmac64
-CFLAGS = $(DEBUG) $(ARCHOPT)
-INSTALL_LIB = @cdat_EXTERNALS@/lib
-INSTALL_INC = @cdat_EXTERNALS@/include
-# Somehow CPPFLAGS ends out on the gcc lines...
-#CPPFLAGS = -Dmac -Dsun -D__linux -D__linux_pgi $(ARCHOPT)
-#CPPFLAGS = -Dmac $(ARCHOPT) -Dsun -byteswapio   note that byteswapio is never referenced
-#CPPFLAGS = -Dsun -D__linux -D__linux_gfortran -Dmac $(ARCHOPT)
-CPPFLAGS = -Dsun -D__linux -D__linux_gfortran -Dmac -Dmac64 $(ARCHOPT)
-CPP = cpp
-
-FOBJECTS = getdat.o idenc.o putdat.o clavdb.o getdim.o iflun.o setdim.o getnam.o mvnbc.o cluvdb.o getnd.o bnsrch.o drserr.o seterr.o getind.o compnm.o dictlk.o putvdm.o setnam.o setdat.o setvdm.o getrge.o savdb.o putdat1.o getdat1.o getvdim.o inqlun.o inqdict.o prdict.o rdtrans.o wrtrans.o setrep.o gettbuf.o getrge2.o getelemd.o setcdim.o getcdim.o getedim.o confnm.o putdic.o getpelem.o mimem.o redat.o wrdat.o cllun.o readhd.o writehd.o wrdic.o redic.o aslun.o drssync.o drsreadb.o drsautosync.o midate.o d_floor.o mac.o
-# formerly in FOBJECTS, needed for Fortran->cdms link:  cddrsfwrap.o
-# .. cddrsfwrap.o is a Fortran wrapper for libcdms; not really part of libdrs.
-FINCLUDES = drsdef.h drscom.h cycle.h
-FSOURCES = $(FOBJECTS:.o=.F)
-
-COBJECTS = ctoi.o getslab.o drsc.o drstrunc.o macintosh.o
-# formerly in COBJECTS, needed for Fortran->cdms link: cddrs_fc.o
-# ... cddrs_fc.o is C code to support the Fortran wrapper for libcdms; not really part of libdrs.
-CINCLUDES = drscdf.h
-CSOURCES = $(COBJECTS:.o=.c)
-
-OBJECTS = $(FOBJECTS) $(COBJECTS)
-SOURCES = $(FSOURCES) $(CSOURCES)
-INCLUDES = $(FINCLUDES) $(CINCLUDES)
-#--------------------------------------------------------------------
-
-all: drsdef.h libdrs.a libdrs.so
-
-shared: drsdef.h libdrs.so
-
-libdrs.a: $(OBJECTS)
-	ar rv libdrs.a $?
-
-# formerly in libdrs.so, needed for Fortran->cdms link: -lcdms
-libdrs.so: $(OBJECTS)
-	$(CC) $(ARCHOPT) -headerpad_max_install_names -L/usr/local/gfortran/lib -lgfortran  -L/usr/local/lib/ -L@cdat_EXTERNALS@/lib -lnetcdf -lgrib2c  -lquadmath -shared -o libdrs.so $(OBJECTS)
-
-drsdef.h: drsdef.HH
-	$(CPP) -P $(CPPFLAGS) drsdef.HH drsdef.h
-#--------------------------------------------------------------------
-
-install: libdrs.a
-	cp libdrs.a $(INSTALL_LIB); chmod 644 $(INSTALL_LIB)/libdrs.a
-	cp drsdef.h $(INSTALL_INC); chmod 644 $(INSTALL_INC)/drsdef.h
-	cp drscdf.h $(INSTALL_INC); chmod 644 $(INSTALL_INC)/drscdf.h
-#	install -f $(INSTALL_LIB) -m 644 libdrs.a
-#	install -f $(INSTALL_INC) -m 644 drsdef.h
-#	install -f $(INSTALL_INC) -m 644 drscdf.h
-
-#--------------------------------------------------------------------------
-
-# Miscellaneous junk
-
-tags:
-	etags $(SOURCES) $(INCLUDES)
-
-clean:
-	-rm -f *.o
-	-rm -f *~
-	-rm -f core
-
-.SUFFIXES: .F .o
-
-.F.o:
-	$(FC) $(FFLAGS) -c $<
diff --git a/CMake/cdat_modules_extra/lxml_build_step.cmake.in b/CMake/cdat_modules_extra/lxml_build_step.cmake.in
deleted file mode 100644
index dca0940b9..000000000
--- a/CMake/cdat_modules_extra/lxml_build_step.cmake.in
+++ /dev/null
@@ -1,19 +0,0 @@
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-set(ENV{CFLAGS} "-I@cdat_EXTERNALS@/include/libxml2 $ENV{CFLAGS}")
-set(ENV{CXXFLAGS} "-I@cdat_EXTERNALS@/include/libxml2 $ENV{CXXFLAGS}")
-set(ENV{CPPFLAGS} "-I@cdat_EXTERNALS@/include/libxml2 $ENV{CPPFLAGS}")
-
-execute_process(
-  COMMAND "@PYTHON_EXECUTABLE@" setup.py build
-  WORKING_DIRECTORY "@LXML_SOURCE_DIR@"
-  RESULT_VARIABLE res
-  OUTPUT_VARIABLE LXML_OUT
-  OUTPUT_VARIABLE LXML_ERR)
-
-if(NOT ${res} EQUAL 0)
-  message("LXML Errors detected: \n${LXML_OUT}\n${LXML_ERR}")
-  message(FATAL_ERROR "Error in config of LXML")
-endif()
-message("lxml build worked.")
-
diff --git a/CMake/cdat_modules_extra/lxml_install_step.cmake.in b/CMake/cdat_modules_extra/lxml_install_step.cmake.in
deleted file mode 100644
index 21651e44e..000000000
--- a/CMake/cdat_modules_extra/lxml_install_step.cmake.in
+++ /dev/null
@@ -1,14 +0,0 @@
-message("Installing LXML:\n@LXML_PREFIX_ARGS@")
-
-execute_process(
-  COMMAND "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
-  WORKING_DIRECTORY "@LXML_BINARY_DIR@"
-  RESULT_VARIABLE res
-)
-
-if(NOT ${res} EQUAL 0)
-  message("LXML Errors detected: \n${LXML_OUT}\n${LXML_ERR}")
-  message(FATAL_ERROR "Error in config of LXML")
-endif()
-message("lxml install succeeded.")
-
diff --git a/CMake/cdat_modules_extra/matplotlib_build_step.cmake.in b/CMake/cdat_modules_extra/matplotlib_build_step.cmake.in
deleted file mode 100644
index bb0102cf5..000000000
--- a/CMake/cdat_modules_extra/matplotlib_build_step.cmake.in
+++ /dev/null
@@ -1,6 +0,0 @@
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-execute_process(
-  COMMAND "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
-  WORKING_DIRECTORY "@matplotlib_source_dir@"
-)
diff --git a/CMake/cdat_modules_extra/matplotlib_patch_step.cmake.in b/CMake/cdat_modules_extra/matplotlib_patch_step.cmake.in
deleted file mode 100644
index 6c28091a3..000000000
--- a/CMake/cdat_modules_extra/matplotlib_patch_step.cmake.in
+++ /dev/null
@@ -1,9 +0,0 @@
-set(INSTALL_DIR "@cdat_EXTERNALS@")
-
-configure_file(
-  "@cdat_CMAKE_SOURCE_DIR@/cdat_modules_extra/matplotlib_setup_cfg.in"
-  "@matplotlib_source_dir@/setup.cfg"
-  @ONLY
-)
-
-set(ENV{LD_LIBRARY_PATH} "${INSTALL_DIR}/lib;$ENV{LD_LIBRARY_PATH}")
diff --git a/CMake/cdat_modules_extra/matplotlib_setup_cfg.in b/CMake/cdat_modules_extra/matplotlib_setup_cfg.in
deleted file mode 100644
index 5dc914fe2..000000000
--- a/CMake/cdat_modules_extra/matplotlib_setup_cfg.in
+++ /dev/null
@@ -1,76 +0,0 @@
-# Rename this file to setup.cfg to modify matplotlib's
-# build options.
-
-[egg_info]
-
-[directories]
-# Uncomment to override the default basedir in setupext.py.
-# This can be a single directory or a space-delimited list of directories.
-# basedirlist = @INSTALL_DIR@
-
-[status]
-# To suppress display of the dependencies and their versions
-# at the top of the build log, uncomment the following line:
-#suppress = True
-#
-# Uncomment to insert lots of diagnostic prints in extension code
-#verbose = True
-
-[provide_packages]
-# By default, matplotlib checks for a few dependencies and
-# installs them if missing. This feature can be turned off
-# by uncommenting the following lines. Acceptible values are:
-#     True: install, overwrite an existing installation
-#     False: do not install
-#     auto: install only if the package is unavailable. This
-#           is the default behavior
-#
-## Date/timezone support:
-#pytz = False
-#dateutil = False
-
-[gui_support]
-# Matplotlib supports multiple GUI toolkits, including Cocoa,
-# GTK, Fltk, MacOSX, Qt, Qt4, Tk, and WX. Support for many of
-# these toolkits requires AGG, the Anti-Grain Geometry library,
-# which is provided by matplotlib and built by default.
-#
-# Some backends are written in pure Python, and others require
-# extension code to be compiled. By default, matplotlib checks
-# for these GUI toolkits during installation and, if present,
-# compiles the required extensions to support the toolkit. GTK
-# support requires the GTK runtime environment and PyGTK. Wx
-# support requires wxWidgets and wxPython. Tk support requires
-# Tk and Tkinter. The other GUI toolkits do not require any
-# extension code, and can be used as long as the libraries are
-# installed on your system.
-#
-# You can uncomment any the following lines if you know you do
-# not want to use the GUI toolkit. Acceptible values are:
-#     True: build the extension. Exits with a warning if the
-#           required dependencies are not available
-#     False: do not build the extension
-#     auto: build if the required dependencies are available,
-#           otherwise skip silently. This is the default
-#           behavior
-#
-gtk = False
-gtkagg = False
-tkagg = False
-macosx = False
-qt5agg = False
-
-[rc_options]
-# User-configurable options
-#
-# Default backend, one of: Agg, Cairo, CocoaAgg, GTK, GTKAgg, GTKCairo,
-# FltkAgg, MacOSX, Pdf, Ps, QtAgg, Qt4Agg, SVG, TkAgg, WX, WXAgg.
-#
-# The Agg, Ps, Pdf and SVG backends do not require external
-# dependencies. Do not choose GTK, GTKAgg, GTKCairo, MacOSX, TkAgg or WXAgg
-# if you have disabled the relevent extension modules.  Agg will be used
-# by default.
-#
-backend = @MATPLOTLIB_BACKEND@
-backend.qt4 = PyQt4
-#
diff --git a/CMake/cdat_modules_extra/mpi4py_install_step.cmake.in b/CMake/cdat_modules_extra/mpi4py_install_step.cmake.in
deleted file mode 100644
index 582bbbf9e..000000000
--- a/CMake/cdat_modules_extra/mpi4py_install_step.cmake.in
+++ /dev/null
@@ -1,21 +0,0 @@
-message("Installing mpi4py:\n@mpi4py_PREFIX_ARGS@")
-set(ENV{@LIBRARY_PATH@} "@CMAKE_INSTALL_PREFIX@/lib:@cdat_EXTERNALS@/lib:$ENV{@LIBRARY_PATH@}")
-set(ENV{VS_UNICODE_OUTPUT} "")
-
-if(APPLE)
-    set(ENV{CFLAGS} "@cdat_osx_arch_flag@ @cdat_osx_version_flag@ @cdat_osx_sysroot@")
-endif()
-
-execute_process(
-  COMMAND env  @LIBRARY_PATH@="$ENV{LD_LIBRARY_PATH}" "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
-  WORKING_DIRECTORY "@mpi4py_binary@"
-  RESULT_VARIABLE res
-  OUTPUT_VARIABLE mpi4py_OUT
-  OUTPUT_VARIABLE mpi4py_ERR
-)
-
-if(NOT ${res} EQUAL 0)
-  message("mpi4py Errors detected: \n${mpi4py_OUT}\n${mpi4py_ERR}")
-  message(FATAL_ERROR "Error in config of mpi4py")
-endif()
-message("Mpi4py install succeeded.")
diff --git a/CMake/cdat_modules_extra/mpi4py_make_step.cmake.in b/CMake/cdat_modules_extra/mpi4py_make_step.cmake.in
deleted file mode 100644
index 96f160201..000000000
--- a/CMake/cdat_modules_extra/mpi4py_make_step.cmake.in
+++ /dev/null
@@ -1,20 +0,0 @@
-message("Building Mpi4py:\n@mpi4py_binary@")
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-set(ENV{@LIBRARY_PATH@} "@CMAKE_INSTALL_PREFIX@/lib:@cdat_EXTERNALS@/lib:$ENV{@LIBRARY_PATH@}")
-set(ENV{VS_UNICODE_OUTPUT} "")
-if(APPLE)
-    set(ENV{CFLAGS} "@cdat_osx_arch_flag@ @cdat_osx_version_flag@ @cdat_osx_sysroot@")
-endif()
-
-execute_process(
-  COMMAND env  @LIBRARY_PATH@="$ENV{LD_LIBRARY_PATH}" "@PYTHON_EXECUTABLE@" setup.py build
-  WORKING_DIRECTORY "@mpi4py_binary@"
-  RESULT_VARIABLE res
-  OUTPUT_VARIABLE mpi4py_OUT
-  OUTPUT_VARIABLE mpi4py_ERR)
-
-if(NOT ${res} EQUAL 0)
-  message("Mpi4py Errors detected: \n${mpi4py_OUT}\n${mpi4py_ERR}")
-  message(FATAL_ERROR "Error in config of mpi4py")
-endif()
-message("mpi4py build worked.")
diff --git a/CMake/cdat_modules_extra/netcdf_patch_step.cmake.in b/CMake/cdat_modules_extra/netcdf_patch_step.cmake.in
deleted file mode 100644
index e16a54148..000000000
--- a/CMake/cdat_modules_extra/netcdf_patch_step.cmake.in
+++ /dev/null
@@ -1,6 +0,0 @@
-  execute_process(
-    WORKING_DIRECTORY @netcdf_source@
-    COMMAND patch -p1
-    INPUT_FILE @cdat_CMAKE_SOURCE_DIR@/netcdf_clang.patch
-  )
-
diff --git a/CMake/cdat_modules_extra/paraview_download.sh.in b/CMake/cdat_modules_extra/paraview_download.sh.in
deleted file mode 100755
index dee9d7f79..000000000
--- a/CMake/cdat_modules_extra/paraview_download.sh.in
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-cd @CMAKE_CURRENT_BINARY_DIR@/build/
-
-"@GIT_EXECUTABLE@" clone @PARAVIEW_SOURCE@
-cd ParaView
-"@GIT_EXECUTABLE@" checkout @paraview_branch@
-"@GIT_EXECUTABLE@" submodule init
-
-SUBMODULES=`git submodule status | sed 's/.* //' | sed ':a;N;$!ba;s/\n/ /g'`
-
-for SUBMODULE in $SUBMODULES
-do 
-  tmp=`git config  --get submodule.$SUBMODULE.url`
-  tmp=`echo $tmp | sed 's/@REPLACE_GIT_PROTOCOL_PREFIX@/@GIT_PROTOCOL_PREFIX@/g'`
-  git config "submodule.$SUBMODULE.url" $tmp
-done
-
-"@GIT_EXECUTABLE@" submodule update --recursive
diff --git a/CMake/cdat_modules_extra/paraview_install_python_module.cmake.in b/CMake/cdat_modules_extra/paraview_install_python_module.cmake.in
deleted file mode 100644
index aafa3a971..000000000
--- a/CMake/cdat_modules_extra/paraview_install_python_module.cmake.in
+++ /dev/null
@@ -1,25 +0,0 @@
-
-set(ENV${CC} "@CMAKE_C_COMPILER@")
-set(ENV${CXX} "@CMAKE_CXX_COMPILER@")
-set(ENV${CPP} "@CMAKE_CXX_COMPILER@")
-
-set(ENV{@LIBRARY_PATH@} "@cdat_EXTERNALS@/lib:$ENV{@LIBRARY_PATH@}")
-set(ENV{LDFLAGS} "-L@cdat_EXTERNALS@/lib @cdat_external_link_directories@ @cdat_rpath_flag@@CMAKE_INSTALL_PREFIX@/lib @cdat_rpath_flag@@cdat_EXTERNALS@/lib")
-set(ENV{CFLAGS} "-I@cdat_EXTERNALS@/include @cdat_osx_flags@ @cdat_external_include_directories@")
-set(ENV{CPPFLAGS} "-I@cdat_EXTERNALS@/include @cdat_osx_cppflags@ @cdat_external_include_directories@")
-set(ENV{CXXFLAGS} "-I@cdat_EXTERNALS@/include @cdat_osx_cxxflags@")
-
-set(ENV{EXTERNALS} "@cdat_EXTERNALS@")
-
-execute_process(
-  COMMAND env PYTHONPATH=@PYTHONPATH@ "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
-  WORKING_DIRECTORY @ParaView_binary@/Utilities/VTKPythonWrapping
-  RESULT_VARIABLE res)
-
-if(NOT ${res} EQUAL 0)
-  message("Make Errors detected: \n${CDAT_OUT}\n${CDAT_ERR}")
-  message(FATAL_ERROR "Error in VTK Python Install")
-endif()
-
-message("Install succeeded.")
-
diff --git a/CMake/cdat_modules_extra/pbmplus_configure_step.cmake.in b/CMake/cdat_modules_extra/pbmplus_configure_step.cmake.in
deleted file mode 100644
index 09cbc2ad8..000000000
--- a/CMake/cdat_modules_extra/pbmplus_configure_step.cmake.in
+++ /dev/null
@@ -1,9 +0,0 @@
-
-set(EXTERNALS @pbmplus_install@)
-configure_file(@cdat_external_patch_dir@/src/pbmplus/Makefile.in
-  @pbmplus_source@/Makefile
-  @ONLY)
-
-configure_file(@cdat_external_patch_dir@/src/pbmplus/pnm/Makefile.in
-  ${pbmplus_source}/pnm/Makefile
-  @ONLY)
diff --git a/CMake/cdat_modules_extra/pmw_install_step.cmake.in b/CMake/cdat_modules_extra/pmw_install_step.cmake.in
deleted file mode 100644
index 769aa7454..000000000
--- a/CMake/cdat_modules_extra/pmw_install_step.cmake.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-execute_process(
-  COMMAND "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
-  WORKING_DIRECTORY @Pmw_source@/src
-  RESULT_VARIABLE res)
-
-if(NOT ${res} EQUAL 0)
-  message("Install Errors detected: \n${CDAT_OUT}\n${CDAT_ERR}")
-  message(FATAL_ERROR "Error in Install")
-endif()
-message("Install succeeded.")
diff --git a/CMake/cdat_modules_extra/pmw_make_step.cmake.in b/CMake/cdat_modules_extra/pmw_make_step.cmake.in
deleted file mode 100644
index a1d3f9759..000000000
--- a/CMake/cdat_modules_extra/pmw_make_step.cmake.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-execute_process(
-  COMMAND "@PYTHON_EXECUTABLE@" setup.py build
-  WORKING_DIRECTORY @Pmw_source@/src
-  OUTPUT_VARIABLE CDAT_OUT
-  ERROR_VARIABLE CDAT_ERR
-  RESULT_VARIABLE res)
-
-if(NOT ${res} EQUAL 0)
-  message("Make Errors detected: \n${CDAT_OUT}\n${CDAT_ERR}")
-  message(FATAL_ERROR "Error in Make")
-endif()
-message("Make succeeded.")
diff --git a/CMake/cdat_modules_extra/predownload.py.in b/CMake/cdat_modules_extra/predownload.py.in
deleted file mode 100755
index 3a3af9104..000000000
--- a/CMake/cdat_modules_extra/predownload.py.in
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/usr/bin/python
-
-import shlex
-import subprocess
-import urllib2
-import os
-
-fileName = "@PARTS_BUILT_INFO@"
-fetched_data = "@cdat_BINARY_DIR@/fetched_for_offline"
-try:
-    os.makedirs(fetched_data)
-except:
-    pass
-try:
-    os.makedirs(os.path.join(fetched_data,"contrib"))
-except:
-    pass
-
-
-def fetch(url,md5=None):
-    try:
-        import hashlib
-        HAS_HASHLIB=True
-    except:
-        HAS_HASHLIB=False
-    if md5 is None:
-        HAS_HASHLIB=False
-
-    print "Fetching: ",url
-    if HAS_HASHLIB:
-        print "Will control md5"
-    u = urllib2.urlopen(url)
-    nm = os.path.join(fetched_data,url.split("/")[-1])
-    f=open(nm,'w')
-    sz = 65536
-    if HAS_HASHLIB:
-        hsh =hashlib.md5()
-    buf = u.read(sz)
-    while len(buf)>0:
-        f.write(buf)
-        if HAS_HASHLIB:
-            hsh.update(buf)
-        buf=u.read(sz)
-    f.close()
-    if HAS_HASHLIB and hsh.hexdigest()!=md5:
-        raise Exception,"Error downloading file: %s, md5 does not match" % nm
-
-def processFile(name):
-    f=open(name)
-    for ln in f.xreadlines():
-        sp = ln.split()
-        nm = sp[0]
-        ver = sp[1]
-        try:
-            url = sp[2]
-        except:
-            url = None
-        try:
-            md5 = sp[3]
-        except:
-            md5 = None
-        try:
-            url2 = sp[4]
-        except:
-            url2 = None
-        try:
-            md5b = sp[5]
-        except:
-            md5b = None
-        if url=="N/A":
-            continue
-        elif url.find("git://")>-1 or url.strip()[-4:]==".git":
-            if md5 is None:
-                md5 = "master"
-            nm  = url.split("/")[-1][:-4]
-            cmd = "git clone --depth 1 -b %s %s %s/%s " % (md5,url,fetched_data,nm)
-            subprocess.Popen(shlex.split(cmd))
-        elif url is not None:
-            fetch(url,md5)
-        if url2 is not None:
-            fetch(url2,md5b)
-    ## Ok now does the git submodules
-    for c in ["eof2","windfield","sciMake","windspharm","eofs"]:
-        cmd = "cp -rf @cdat_SOURCE_DIR@/contrib/%s %s/contrib" % (c,fetched_data)
-        subprocess.Popen(shlex.split(cmd))
-if __name__ == "__main__":
-    processFile(fileName)
-
diff --git a/CMake/cdat_modules_extra/preofflinebuild.sh.in b/CMake/cdat_modules_extra/preofflinebuild.sh.in
deleted file mode 100755
index b42dacfde..000000000
--- a/CMake/cdat_modules_extra/preofflinebuild.sh.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-fetched_data="fetched_for_offline"
-cp ${fetched_data}/*gz ${fetched_data}/*bz2 ${fetched_data}/*zip @cdat_BINARY_DIR@
-cp -r ${fetched_data}/contrib @cdat_SOURCE_DIR@
-cp -rf ${fetched_data}/vistrails @CMAKE_INSTALL_PREFIX@
-cp -rf ${fetched_data}/paraview-*/* @cdat_BINARY_DIR@/build/ParaView
-tar -xf @cdat_BINARY_DIR@/visit*.gz -C @cdat_BINARY_DIR@
-rm -rf @cdat_BINARY_DIR@/build/VisIt
-mv @cdat_BINARY_DIR@/src @cdat_BINARY_DIR@/build/VisIt
-
diff --git a/CMake/cdat_modules_extra/pyopengl_install_step.cmake.in b/CMake/cdat_modules_extra/pyopengl_install_step.cmake.in
deleted file mode 100644
index 910bef7e2..000000000
--- a/CMake/cdat_modules_extra/pyopengl_install_step.cmake.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-execute_process(
-  COMMAND "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
-  WORKING_DIRECTORY @PyOpenGL_source@
-  RESULT_VARIABLE res)
-
-if(NOT ${res} EQUAL 0)
-  message("Config Errors detected: \n${CDAT_OUT}\n${CDAT_ERR}")
-  message(FATAL_ERROR "Error in config")
-endif()
-message("Config succeeded.")
diff --git a/CMake/cdat_modules_extra/pyopengl_make_step.cmake.in b/CMake/cdat_modules_extra/pyopengl_make_step.cmake.in
deleted file mode 100644
index 41fe74e84..000000000
--- a/CMake/cdat_modules_extra/pyopengl_make_step.cmake.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-execute_process(
-  COMMAND "@PYTHON_EXECUTABLE@" setup.py build
-  WORKING_DIRECTORY @PyOpenGL_source@
-  RESULT_VARIABLE res)
-
-if(NOT ${res} EQUAL 0)
-  message("Config Errors detected: \n${CDAT_OUT}\n${CDAT_ERR}")
-  message(FATAL_ERROR "Error in config")
-endif()
-message("Config succeeded.")
diff --git a/CMake/cdat_modules_extra/pyspharm_patch_step.cmake.in b/CMake/cdat_modules_extra/pyspharm_patch_step.cmake.in
deleted file mode 100644
index 54bf52d5f..000000000
--- a/CMake/cdat_modules_extra/pyspharm_patch_step.cmake.in
+++ /dev/null
@@ -1,6 +0,0 @@
-  execute_process(
-    WORKING_DIRECTORY @pyspharm_source@
-    COMMAND patch 
-    INPUT_FILE @cdat_CMAKE_SOURCE_DIR@/pyspharm_setup.patch
-  )
-
diff --git a/CMake/cdat_modules_extra/python_configure_step.cmake.in b/CMake/cdat_modules_extra/python_configure_step.cmake.in
deleted file mode 100644
index 27f653275..000000000
--- a/CMake/cdat_modules_extra/python_configure_step.cmake.in
+++ /dev/null
@@ -1,42 +0,0 @@
-CMAKE_POLICY(SET CMP0012 NEW)
-
-set(ENV${CC} "@CMAKE_C_COMPILER@")
-set(ENV${CXX} "@CMAKE_CXX_COMPILER@")
-set(ENV${CPP} "@CMAKE_CXX_COMPILER@")
-
-set(ENV{PATH} "@cdat_EXTERNALS@/bin:$ENV{PATH}")
-set(ENV{@LIBRARY_PATH@} "@cdat_EXTERNALS@/lib:$ENV{@LIBRARY_PATH@}")
-set(ENV{LDFLAGS} "-L@cdat_EXTERNALS@/lib @cdat_external_link_directories@  @cdat_rpath_flag@@CMAKE_INSTALL_PREFIX@/lib @cdat_rpath_flag@@cdat_EXTERNALS@/lib @cdat_osx_ld_flags@ $ENV{LDFLAGS}")
-set(ENV{CFLAGS} "-I@cdat_EXTERNALS@/include -L@cdat_EXTERNALS@/lib @cdat_osx_flags@ @cdat_external_include_directories@  ${ADDITIONAL_CFLAGS} $ENV{CFLAGS}")
-set(ENV{CPPFLAGS} "-I@cdat_EXTERNALS@/include -L@cdat_EXTERNALS@/lib @cdat_osx_cppflags@ @cdat_external_include_directories@ ${ADDITIONAL_CPPFLAGS} $ENV{CPPFLAGS}")
-set(ENV{CXXFLAGS} "-I@cdat_EXTERNALS@/include -L@cdat_EXTERNALS@/lib @cdat_osx_cxxflags@ @cdat_external_include_directories@ ${ADDITIONAL_CXXFLAGS} $ENV{CXXFLAGS}")
-set(ENV{PKG_CONFIG_PATH} "@cdat_EXTERNALS@/lib/pkgconfig")
-set(ENV{PKG_CONFIG} "@cdat_PKG_CONFIG_EXECUTABLE@")
-set(ENV{FC} "")
-set(ENV{FCFLAGS} "")
-set(ENV{FCLIBS} "")
-set(ENV{F77} "")
-set(ENV{FFLAGS} "")
-set(ENV{FLIBS} "")
-set(ENV{LD_X11} "") # for xgks
-set(ENV{OPT} "")
-
-set(ENV{EXTERNALS} "@cdat_EXTERNALS@")
-
-if(APPLE)
-  set(ENV{AQUA_CDAT} "no")
-  set(ENV{MAC_OSX_DEPLOYMENT_TARGET} "@CMAKE_OSX_DEPLOYMENT_TARGET@")
-  unset(ENV{MAKEFLAGS})
-  if(@_CURRENT_OSX_SDK_VERSION@ VERSION_LESS "10.11")
-    set(library_param --prefix=@CMAKE_INSTALL_PREFIX@ --with-system-expat --enable-framework=@CMAKE_INSTALL_PREFIX@/Library/Frameworks)
-  else()
-    set(library_param --prefix=@CMAKE_INSTALL_PREFIX@  --enable-framework=@CMAKE_INSTALL_PREFIX@/Library/Frameworks)
-  endif()
-elseif(UNIX)
-  set(library_param --prefix=@CMAKE_INSTALL_PREFIX@ --enable-shared --enable-unicode=ucs4)
-endif()
-
-EXECUTE_PROCESS(
-  COMMAND sh configure ${library_param}
-  WORKING_DIRECTORY "@python_SOURCE_DIR@"
-  )
diff --git a/CMake/cdat_modules_extra/python_install_step.cmake.in b/CMake/cdat_modules_extra/python_install_step.cmake.in
deleted file mode 100644
index 74a63d181..000000000
--- a/CMake/cdat_modules_extra/python_install_step.cmake.in
+++ /dev/null
@@ -1,51 +0,0 @@
-
-set(ENV${CC} "@CMAKE_C_COMPILER@")
-set(ENV${CXX} "@CMAKE_CXX_COMPILER@")
-set(ENV${CPP} "@CMAKE_CXX_COMPILER@")
-
-# During install for what ever reason python will fail if these are set.
-
-set(ENV{PATH} "@cdat_EXTERNALS@/bin:$ENV{PATH}")
-if(NOT APPLE)
-  set(ENV{@LIBRARY_PATH@} "@cdat_EXTERNALS@/lib:$ENV{@LIBRARY_PATH@}")
-endif()
-set(ENV{LDFLAGS} "-L@cdat_EXTERNALS@/lib @cdat_external_link_directories@  @cdat_rpath_flag@@CMAKE_INSTALL_PREFIX@/lib @cdat_rpath_flag@@cdat_EXTERNALS@/lib  @cdat_osx_ld_flags@")
-set(ENV{CFLAGS} "-I@cdat_EXTERNALS@/include -L@cdat_EXTERNALS@/lib @cdat_osx_flags@ @cdat_external_include_directories@  ${ADDITIONAL_CFLAGS}")
-set(ENV{CPPFLAGS} "-I@cdat_EXTERNALS@/include -L@cdat_EXTERNALS@/lib @cdat_osx_cppflags@ @cdat_external_include_directories@ ${ADDITIONAL_CPPFLAGS}")
-set(ENV{CXXFLAGS} "-I@cdat_EXTERNALS@/include -L@cdat_EXTERNALS@/lib @cdat_osx_cxxflags@ @cdat_external_include_directories@ ${ADDITIONAL_CXXFLAGS}")
-set(ENV{PKG_CONFIG_PATH} "@cdat_EXTERNALS@/lib/pkgconfig")
-set(ENV{PKG_CONFIG} "@cdat_PKG_CONFIG_EXECUTABLE@")
-set(ENV{FC} "")
-set(ENV{FCFLAGS} "")
-set(ENV{FCLIBS} "")
-set(ENV{F77} "")
-set(ENV{FFLAGS} "")
-set(ENV{FLIBS} "")
-set(ENV{LD_X11} "") # for xgks
-set(ENV{OPT} "")
-
-set(ENV{EXTERNALS} "@cdat_EXTERNALS@")
-
-if(APPLE)
-  set(ENV{AQUA_CDAT} "no")
-  set(ENV{MAC_OSX_DEPLOYMENT_TARGET} "@CMAKE_OSX_DEPLOYMENT_TARGET@")
-  unset(ENV{MAKEFLAGS})
- 
-  EXECUTE_PROCESS(
-    COMMAND make frameworkinstallunixtools
-    WORKING_DIRECTORY "@python_SOURCE_DIR@"
-  )
-
-  EXECUTE_PROCESS(
-    COMMAND make frameworkinstall
-    WORKING_DIRECTORY "@python_SOURCE_DIR@"
-  )
-
-else()
-
-  EXECUTE_PROCESS(
-    COMMAND make install
-    WORKING_DIRECTORY "@python_SOURCE_DIR@"
-  )
-
-endif()
diff --git a/CMake/cdat_modules_extra/python_make_step.cmake.in b/CMake/cdat_modules_extra/python_make_step.cmake.in
deleted file mode 100644
index 674463f89..000000000
--- a/CMake/cdat_modules_extra/python_make_step.cmake.in
+++ /dev/null
@@ -1,34 +0,0 @@
-
-set(ENV${CC} "@CMAKE_C_COMPILER@")
-set(ENV${CXX} "@CMAKE_CXX_COMPILER@")
-set(ENV${CPP} "@CMAKE_CXX_COMPILER@")
-
-set(ENV{PATH} "@cdat_EXTERNALS@/bin:$ENV{PATH}")
-set(ENV{@LIBRARY_PATH@} "@cdat_EXTERNALS@/lib:$ENV{@LIBRARY_PATH@}")
-set(ENV{LDFLAGS} "-L@cdat_EXTERNALS@/lib @cdat_external_link_directories@  @cdat_rpath_flag@@CMAKE_INSTALL_PREFIX@/lib @cdat_rpath_flag@@cdat_EXTERNALS@/lib  @cdat_osx_ld_flags@ $ENV{LDFLAGS}")
-set(ENV{CFLAGS} "-I@cdat_EXTERNALS@/include -L@cdat_EXTERNALS@/lib @cdat_osx_flags@ @cdat_external_include_directories@  ${ADDITIONAL_CFLAGS} $ENV{CFLAGS}")
-set(ENV{CPPFLAGS} "-I@cdat_EXTERNALS@/include -L@cdat_EXTERNALS@/lib @cdat_osx_cppflags@ @cdat_external_include_directories@ ${ADDITIONAL_CPPFLAGS} $ENV{CPPFLAGS}")
-set(ENV{CXXFLAGS} "-I@cdat_EXTERNALS@/include -L@cdat_EXTERNALS@/lib @cdat_osx_cxxflags@ @cdat_external_include_directories@ ${ADDITIONAL_CXXFLAGS} $ENV{CXXFLAGS}")
-set(ENV{PKG_CONFIG_PATH} "@cdat_EXTERNALS@/lib/pkgconfig")
-set(ENV{PKG_CONFIG} "@cdat_PKG_CONFIG_EXECUTABLE@")
-set(ENV{FC} "")
-set(ENV{FCFLAGS} "")
-set(ENV{FCLIBS} "")
-set(ENV{F77} "")
-set(ENV{FFLAGS} "")
-set(ENV{FLIBS} "")
-set(ENV{LD_X11} "") # for xgks
-set(ENV{OPT} "")
-
-set(ENV{EXTERNALS} "@cdat_EXTERNALS@")
-
-if(APPLE)
-  set(ENV{AQUA_CDAT} "no")
-  set(ENV{MAC_OSX_DEPLOYMENT_TARGET} "@CMAKE_OSX_DEPLOYMENT_TARGET@")
-  unset(ENV{MAKEFLAGS})
-endif()
-
-EXECUTE_PROCESS( 
-  COMMAND make
-  WORKING_DIRECTORY "@python_SOURCE_DIR@"
-  )
diff --git a/CMake/cdat_modules_extra/python_patch_step.cmake.in b/CMake/cdat_modules_extra/python_patch_step.cmake.in
deleted file mode 100644
index ff2843efb..000000000
--- a/CMake/cdat_modules_extra/python_patch_step.cmake.in
+++ /dev/null
@@ -1,21 +0,0 @@
-execute_process(
-  COMMAND
-  "@CMAKE_COMMAND@" -E copy_if_different "@cdat_SOURCE_DIR@/pysrc/src/setup-@PYTHON_VERSION@.py" "@python_SOURCE_DIR@/setup.py"
-  RESULT_VARIABLE errcode
-)
-if("${errcode}" STREQUAL "0")
-    message(STATUS "setup.py replaced")
-else()
-    message(FATAL_ERROR "Replacing setup.py failed: ${errcode}")
-endif()
-
-execute_process(
-  COMMAND
-  "@CMAKE_COMMAND@" -E copy_if_different "@cdat_SOURCE_DIR@/pysrc/src/site-@PYTHON_VERSION@.py" "@python_SOURCE_DIR@/Lib/site.py"
-  RESULT_VARIABLE errcode
-)
-if("${errcode}" STREQUAL "0")
-    message(STATUS "site.py replaced")
-else()
-    message(FATAL_ERROR "Replacing site.py failed: ${errcode}")
-endif()
diff --git a/CMake/cdat_modules_extra/python_setup.py.in b/CMake/cdat_modules_extra/python_setup.py.in
deleted file mode 100644
index 106853088..000000000
--- a/CMake/cdat_modules_extra/python_setup.py.in
+++ /dev/null
@@ -1,1918 +0,0 @@
-# Autodetecting setup.py script for building the Python extensions
-#
-
-__version__ = "$Revision: 78785 $"
-
-import sys, os, imp, re, optparse
-from glob import glob
-from platform import machine as platform_machine
-
-from distutils import log
-from distutils import sysconfig
-from distutils import text_file
-from distutils.errors import *
-from distutils.core import Extension, setup
-from distutils.command.build_ext import build_ext
-from distutils.command.install import install
-from distutils.command.install_lib import install_lib
-
-# This global variable is used to hold the list of modules to be disabled.
-disabled_module_list = []
-
-def add_dir_to_list(dirlist, dir):
-    """Add the directory 'dir' to the list 'dirlist' (at the front) if
-    1) 'dir' is not already in 'dirlist'
-    2) 'dir' actually exists, and is a directory."""
-    if dir is not None and os.path.isdir(dir) and dir not in dirlist:
-        dirlist.insert(0, dir)
-
-def find_file(filename, std_dirs, paths):
-    """Searches for the directory where a given file is located,
-    and returns a possibly-empty list of additional directories, or None
-    if the file couldn't be found at all.
-
-    'filename' is the name of a file, such as readline.h or libcrypto.a.
-    'std_dirs' is the list of standard system directories; if the
-        file is found in one of them, no additional directives are needed.
-    'paths' is a list of additional locations to check; if the file is
-        found in one of them, the resulting list will contain the directory.
-    """
-
-    # Check the standard locations
-    for dir in std_dirs:
-        f = os.path.join(dir, filename)
-        if os.path.exists(f): return []
-
-    # Check the additional directories
-    for dir in paths:
-        f = os.path.join(dir, filename)
-        if os.path.exists(f):
-            return [dir]
-
-    # Not found anywhere
-    return None
-
-def find_library_file(compiler, libname, std_dirs, paths):
-    result = compiler.find_library_file(std_dirs + paths, libname)
-    if result is None:
-        return None
-
-    # Check whether the found file is in one of the standard directories
-    dirname = os.path.dirname(result)
-    for p in std_dirs:
-        # Ensure path doesn't end with path separator
-        p = p.rstrip(os.sep)
-        if p == dirname:
-            return [ ]
-
-    # Otherwise, it must have been in one of the additional directories,
-    # so we have to figure out which one.
-    for p in paths:
-        # Ensure path doesn't end with path separator
-        p = p.rstrip(os.sep)
-        if p == dirname:
-            return [p]
-    else:
-        assert False, "Internal error: Path not found in std_dirs or paths"
-
-def module_enabled(extlist, modname):
-    """Returns whether the module 'modname' is present in the list
-    of extensions 'extlist'."""
-    extlist = [ext for ext in extlist if ext.name == modname]
-    return len(extlist)
-
-def find_module_file(module, dirlist):
-    """Find a module in a set of possible folders. If it is not found
-    return the unadorned filename"""
-    list = find_file(module, [], dirlist)
-    if not list:
-        return module
-    if len(list) > 1:
-        log.info("WARNING: multiple copies of %s found"%module)
-    return os.path.join(list[0], module)
-
-class PyBuildExt(build_ext):
-
-    def __init__(self, dist):
-        build_ext.__init__(self, dist)
-        self.failed = []
-
-    def build_extensions(self):
-
-        # Detect which modules should be compiled
-        missing = self.detect_modules()
-
-        # Remove modules that are present on the disabled list
-        extensions = [ext for ext in self.extensions
-                      if ext.name not in disabled_module_list]
-        # move ctypes to the end, it depends on other modules
-        ext_map = dict((ext.name, i) for i, ext in enumerate(extensions))
-        if "_ctypes" in ext_map:
-            ctypes = extensions.pop(ext_map["_ctypes"])
-            extensions.append(ctypes)
-        self.extensions = extensions
-
-        # Fix up the autodetected modules, prefixing all the source files
-        # with Modules/ and adding Python's include directory to the path.
-        (srcdir,) = sysconfig.get_config_vars('srcdir')
-        if not srcdir:
-            # Maybe running on Windows but not using CYGWIN?
-            raise ValueError("No source directory; cannot proceed.")
-
-        # Figure out the location of the source code for extension modules
-        # (This logic is copied in distutils.test.test_sysconfig,
-        # so building in a separate directory does not break test_distutils.)
-        moddir = os.path.join(os.getcwd(), srcdir, 'Modules')
-        moddir = os.path.normpath(moddir)
-        srcdir, tail = os.path.split(moddir)
-        srcdir = os.path.normpath(srcdir)
-        moddir = os.path.normpath(moddir)
-
-        moddirlist = [moddir]
-        incdirlist = ['./Include']
-
-        # Platform-dependent module source and include directories
-        platform = self.get_platform()
-        if platform in ('darwin', 'mac') and ("--disable-toolbox-glue" not in
-            sysconfig.get_config_var("CONFIG_ARGS")):
-            # Mac OS X also includes some mac-specific modules
-            macmoddir = os.path.join(os.getcwd(), srcdir, 'Mac/Modules')
-            moddirlist.append(macmoddir)
-            incdirlist.append('./Mac/Include')
-
-        alldirlist = moddirlist + incdirlist
-
-        # Fix up the paths for scripts, too
-        self.distribution.scripts = [os.path.join(srcdir, filename)
-                                     for filename in self.distribution.scripts]
-
-        # Python header files
-        headers = glob("Include/*.h") + ["pyconfig.h"]
-
-        for ext in self.extensions[:]:
-            ext.sources = [ find_module_file(filename, moddirlist)
-                            for filename in ext.sources ]
-            if ext.depends is not None:
-                ext.depends = [find_module_file(filename, alldirlist)
-                               for filename in ext.depends]
-            else:
-                ext.depends = []
-            # re-compile extensions if a header file has been changed
-            ext.depends.extend(headers)
-
-            ext.include_dirs.append( '.' ) # to get config.h
-            for incdir in incdirlist:
-                ext.include_dirs.append( os.path.join(srcdir, incdir) )
-
-            # If a module has already been built statically,
-            # don't build it here
-            if ext.name in sys.builtin_module_names:
-                self.extensions.remove(ext)
-
-        if platform != 'mac':
-            # Parse Modules/Setup and Modules/Setup.local to figure out which
-            # modules are turned on in the file.
-            remove_modules = []
-            for filename in ('Modules/Setup', 'Modules/Setup.local'):
-                input = text_file.TextFile(filename, join_lines=1)
-                while 1:
-                    line = input.readline()
-                    if not line: break
-                    line = line.split()
-                    remove_modules.append(line[0])
-                input.close()
-
-            for ext in self.extensions[:]:
-                if ext.name in remove_modules:
-                    self.extensions.remove(ext)
-
-        # When you run "make CC=altcc" or something similar, you really want
-        # those environment variables passed into the setup.py phase.  Here's
-        # a small set of useful ones.
-        compiler = os.environ.get('CC')
-        args = {}
-        # unfortunately, distutils doesn't let us provide separate C and C++
-        # compilers
-        if compiler is not None:
-            (ccshared,cflags) = sysconfig.get_config_vars('CCSHARED','CFLAGS')
-            args['compiler_so'] = compiler + ' ' + ccshared + ' ' + cflags
-        self.compiler.set_executables(**args)
-
-        build_ext.build_extensions(self)
-
-        longest = max([len(e.name) for e in self.extensions])
-        if self.failed:
-            longest = max(longest, max([len(name) for name in self.failed]))
-
-        def print_three_column(lst):
-            lst.sort(key=str.lower)
-            # guarantee zip() doesn't drop anything
-            while len(lst) % 3:
-                lst.append("")
-            for e, f, g in zip(lst[::3], lst[1::3], lst[2::3]):
-                print "%-*s   %-*s   %-*s" % (longest, e, longest, f,
-                                              longest, g)
-
-        if missing:
-            print
-            print "Failed to find the necessary bits to build these modules:"
-            print_three_column(missing)
-            print ("To find the necessary bits, look in setup.py in"
-                   " detect_modules() for the module's name.")
-            print
-
-        if self.failed:
-            failed = self.failed[:]
-            print
-            print "Failed to build these modules:"
-            print_three_column(failed)
-            print
-
-    def build_extension(self, ext):
-
-        if ext.name == '_ctypes':
-            if not self.configure_ctypes(ext):
-                return
-
-        try:
-            build_ext.build_extension(self, ext)
-        except (CCompilerError, DistutilsError), why:
-            self.announce('WARNING: building of extension "%s" failed: %s' %
-                          (ext.name, sys.exc_info()[1]))
-            self.failed.append(ext.name)
-            return
-        # Workaround for Mac OS X: The Carbon-based modules cannot be
-        # reliably imported into a command-line Python
-        if 'Carbon' in ext.extra_link_args:
-            self.announce(
-                'WARNING: skipping import check for Carbon-based "%s"' %
-                ext.name)
-            return
-
-        if self.get_platform() == 'darwin' and (
-                sys.maxint > 2**32 and '-arch' in ext.extra_link_args):
-            # Don't bother doing an import check when an extension was
-            # build with an explicit '-arch' flag on OSX. That's currently
-            # only used to build 32-bit only extensions in a 4-way
-            # universal build and loading 32-bit code into a 64-bit
-            # process will fail.
-            self.announce(
-                'WARNING: skipping import check for "%s"' %
-                ext.name)
-            return
-
-        # Workaround for Cygwin: Cygwin currently has fork issues when many
-        # modules have been imported
-        if self.get_platform() == 'cygwin':
-            self.announce('WARNING: skipping import check for Cygwin-based "%s"'
-                % ext.name)
-            return
-        ext_filename = os.path.join(
-            self.build_lib,
-            self.get_ext_filename(self.get_ext_fullname(ext.name)))
-        try:
-            imp.load_dynamic(ext.name, ext_filename)
-        except ImportError, why:
-            self.failed.append(ext.name)
-            self.announce('*** WARNING: renaming "%s" since importing it'
-                          ' failed: %s' % (ext.name, why), level=3)
-            assert not self.inplace
-            basename, tail = os.path.splitext(ext_filename)
-            newname = basename + "_failed" + tail
-            if os.path.exists(newname):
-                os.remove(newname)
-            os.rename(ext_filename, newname)
-
-            # XXX -- This relies on a Vile HACK in
-            # distutils.command.build_ext.build_extension().  The
-            # _built_objects attribute is stored there strictly for
-            # use here.
-            # If there is a failure, _built_objects may not be there,
-            # so catch the AttributeError and move on.
-            try:
-                for filename in self._built_objects:
-                    os.remove(filename)
-            except AttributeError:
-                self.announce('unable to remove files (ignored)')
-        except:
-            exc_type, why, tb = sys.exc_info()
-            self.announce('*** WARNING: importing extension "%s" '
-                          'failed with %s: %s' % (ext.name, exc_type, why),
-                          level=3)
-            self.failed.append(ext.name)
-
-    def get_platform(self):
-        # Get value of sys.platform
-        for platform in ['cygwin', 'beos', 'darwin', 'atheos', 'osf1']:
-            if sys.platform.startswith(platform):
-                return platform
-        return sys.platform
-
-    def detect_modules(self):
-        # Ensure that /usr/local is always used
-        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-
-        # Add paths specified in the environment variables LDFLAGS and
-        # CPPFLAGS for header and library files.
-        # We must get the values from the Makefile and not the environment
-        # directly since an inconsistently reproducible issue comes up where
-        # the environment variable is not set even though the value were passed
-        # into configure and stored in the Makefile (issue found on OS X 10.3).
-        for env_var, arg_name, dir_list in (
-                ('LDFLAGS', '-R', self.compiler.runtime_library_dirs),
-                ('LDFLAGS', '-L', self.compiler.library_dirs),
-                ('CPPFLAGS', '-I', self.compiler.include_dirs)):
-            env_val = sysconfig.get_config_var(env_var)
-            if env_val:
-                # To prevent optparse from raising an exception about any
-                # options in env_val that it doesn't know about we strip out
-                # all double dashes and any dashes followed by a character
-                # that is not for the option we are dealing with.
-                #
-                # Please note that order of the regex is important!  We must
-                # strip out double-dashes first so that we don't end up with
-                # substituting "--Long" to "-Long" and thus lead to "ong" being
-                # used for a library directory.
-                env_val = re.sub(r'(^|\s+)-(-|(?!%s))' % arg_name[1],
-                                 ' ', env_val)
-                parser = optparse.OptionParser()
-                # Make sure that allowing args interspersed with options is
-                # allowed
-                parser.allow_interspersed_args = True
-                parser.error = lambda msg: None
-                parser.add_option(arg_name, dest="dirs", action="append")
-                options = parser.parse_args(env_val.split())[0]
-                if options.dirs:
-                    for directory in reversed(options.dirs):
-                        add_dir_to_list(dir_list, directory)
-
-        if os.path.normpath(sys.prefix) != '/usr':
-            add_dir_to_list(self.compiler.library_dirs,
-                            sysconfig.get_config_var("LIBDIR"))
-            add_dir_to_list(self.compiler.include_dirs,
-                            sysconfig.get_config_var("INCLUDEDIR"))
-
-        try:
-            have_unicode = unicode
-        except NameError:
-            have_unicode = 0
-
-        # lib_dirs and inc_dirs are used to search for files;
-        # if a file is found in one of those directories, it can
-        # be assumed that no additional -I,-L directives are needed.
-        lib_dirs = self.compiler.library_dirs + [
-            '/lib64', '/usr/lib64',
-            '/lib', '/usr/lib',
-            ]
-        inc_dirs = self.compiler.include_dirs + ['/usr/include']
-        exts = []
-        missing = []
-
-        config_h = sysconfig.get_config_h_filename()
-        config_h_vars = sysconfig.parse_config_h(open(config_h))
-
-        platform = self.get_platform()
-        (srcdir,) = sysconfig.get_config_vars('srcdir')
-
-        # Check for AtheOS which has libraries in non-standard locations
-        if platform == 'atheos':
-            lib_dirs += ['/system/libs', '/atheos/autolnk/lib']
-            lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
-            inc_dirs += ['/system/include', '/atheos/autolnk/include']
-            inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
-
-        # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
-        if platform in ['osf1', 'unixware7', 'openunix8']:
-            lib_dirs += ['/usr/ccs/lib']
-
-        if platform == 'darwin':
-            # This should work on any unixy platform ;-)
-            # If the user has bothered specifying additional -I and -L flags
-            # in OPT and LDFLAGS we might as well use them here.
-            #   NOTE: using shlex.split would technically be more correct, but
-            # also gives a bootstrap problem. Let's hope nobody uses directories
-            # with whitespace in the name to store libraries.
-            cflags, ldflags = sysconfig.get_config_vars(
-                    'CFLAGS', 'LDFLAGS')
-            for item in cflags.split():
-                if item.startswith('-I'):
-                    inc_dirs.append(item[2:])
-
-            for item in ldflags.split():
-                if item.startswith('-L'):
-                    lib_dirs.append(item[2:])
-
-        # Check for MacOS X, which doesn't need libm.a at all
-        math_libs = ['m']
-        if platform in ['darwin', 'beos', 'mac']:
-            math_libs = []
-
-        # XXX Omitted modules: gl, pure, dl, SGI-specific modules
-
-        #
-        # The following modules are all pretty straightforward, and compile
-        # on pretty much any POSIXish platform.
-        #
-
-        # Some modules that are normally always on:
-        exts.append( Extension('_weakref', ['_weakref.c']) )
-
-        # array objects
-        exts.append( Extension('array', ['arraymodule.c']) )
-        # complex math library functions
-        exts.append( Extension('cmath', ['cmathmodule.c'],
-                               libraries=math_libs) )
-
-        # math library functions, e.g. sin()
-        exts.append( Extension('math',  ['mathmodule.c'],
-                               libraries=math_libs) )
-        # fast string operations implemented in C
-        exts.append( Extension('strop', ['stropmodule.c']) )
-        # time operations and variables
-        exts.append( Extension('time', ['timemodule.c'],
-                               libraries=math_libs) )
-        exts.append( Extension('datetime', ['datetimemodule.c', 'timemodule.c'],
-                               libraries=math_libs) )
-        # fast iterator tools implemented in C
-        exts.append( Extension("itertools", ["itertoolsmodule.c"]) )
-        # code that will be builtins in the future, but conflict with the
-        #  current builtins
-        exts.append( Extension('future_builtins', ['future_builtins.c']) )
-        # random number generator implemented in C
-        exts.append( Extension("_random", ["_randommodule.c"]) )
-        # high-performance collections
-        exts.append( Extension("_collections", ["_collectionsmodule.c"]) )
-        # bisect
-        exts.append( Extension("_bisect", ["_bisectmodule.c"]) )
-        # heapq
-        exts.append( Extension("_heapq", ["_heapqmodule.c"]) )
-        # operator.add() and similar goodies
-        exts.append( Extension('operator', ['operator.c']) )
-        # Python 3.0 _fileio module
-        exts.append( Extension("_fileio", ["_fileio.c"]) )
-        # Python 3.0 _bytesio module
-        exts.append( Extension("_bytesio", ["_bytesio.c"]) )
-        # _functools
-        exts.append( Extension("_functools", ["_functoolsmodule.c"]) )
-        # _json speedups
-        exts.append( Extension("_json", ["_json.c"]) )
-        # Python C API test module
-        exts.append( Extension('_testcapi', ['_testcapimodule.c'],
-                               depends=['testcapi_long.h']) )
-        # profilers (_lsprof is for cProfile.py)
-        exts.append( Extension('_hotshot', ['_hotshot.c']) )
-        exts.append( Extension('_lsprof', ['_lsprof.c', 'rotatingtree.c']) )
-        # static Unicode character database
-        if have_unicode:
-            exts.append( Extension('unicodedata', ['unicodedata.c']) )
-        else:
-            missing.append('unicodedata')
-        # access to ISO C locale support
-        data = open('pyconfig.h').read()
-        m = re.search(r"#s*define\s+WITH_LIBINTL\s+1\s*", data)
-        if m is not None:
-            locale_libs = ['intl']
-        else:
-            locale_libs = []
-        if platform == 'darwin':
-            locale_extra_link_args = ['-framework', 'CoreFoundation']
-        else:
-            locale_extra_link_args = []
-
-
-        exts.append( Extension('_locale', ['_localemodule.c'],
-                               libraries=locale_libs,
-                               extra_link_args=locale_extra_link_args) )
-
-        # Modules with some UNIX dependencies -- on by default:
-        # (If you have a really backward UNIX, select and socket may not be
-        # supported...)
-
-        # fcntl(2) and ioctl(2)
-        exts.append( Extension('fcntl', ['fcntlmodule.c']) )
-        if platform not in ['mac']:
-            # pwd(3)
-            exts.append( Extension('pwd', ['pwdmodule.c']) )
-            # grp(3)
-            exts.append( Extension('grp', ['grpmodule.c']) )
-            # spwd, shadow passwords
-            if (config_h_vars.get('HAVE_GETSPNAM', False) or
-                    config_h_vars.get('HAVE_GETSPENT', False)):
-                exts.append( Extension('spwd', ['spwdmodule.c']) )
-            else:
-                missing.append('spwd')
-        else:
-            missing.extend(['pwd', 'grp', 'spwd'])
-
-        # select(2); not on ancient System V
-        exts.append( Extension('select', ['selectmodule.c']) )
-
-        # Fred Drake's interface to the Python parser
-        exts.append( Extension('parser', ['parsermodule.c']) )
-
-        # cStringIO and cPickle
-        exts.append( Extension('cStringIO', ['cStringIO.c']) )
-        exts.append( Extension('cPickle', ['cPickle.c']) )
-
-        # Memory-mapped files (also works on Win32).
-        if platform not in ['atheos', 'mac']:
-            exts.append( Extension('mmap', ['mmapmodule.c']) )
-        else:
-            missing.append('mmap')
-
-        # Lance Ellinghaus's syslog module
-        if platform not in ['mac']:
-            # syslog daemon interface
-            exts.append( Extension('syslog', ['syslogmodule.c']) )
-        else:
-            missing.append('syslog')
-
-        # George Neville-Neil's timing module:
-        # Deprecated in PEP 4 http://www.python.org/peps/pep-0004.html
-        # http://mail.python.org/pipermail/python-dev/2006-January/060023.html
-        #exts.append( Extension('timing', ['timingmodule.c']) )
-
-        #
-        # Here ends the simple stuff.  From here on, modules need certain
-        # libraries, are platform-specific, or present other surprises.
-        #
-
-        # Multimedia modules
-        # These don't work for 64-bit platforms!!!
-        # These represent audio samples or images as strings:
-
-        # Operations on audio samples
-        # According to #993173, this one should actually work fine on
-        # 64-bit platforms.
-        exts.append( Extension('audioop', ['audioop.c']) )
-
-        # Disabled on 64-bit platforms
-        if sys.maxint != 9223372036854775807L:
-            # Operations on images
-            exts.append( Extension('imageop', ['imageop.c']) )
-        else:
-            missing.extend(['imageop'])
-
-        # readline
-        do_readline = self.compiler.find_library_file(lib_dirs, 'readline')
-        if platform == 'darwin':
-            os_release = int(os.uname()[2].split('.')[0])
-            dep_target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
-            if dep_target and dep_target.split('.') < ['10', '5']:
-                os_release = 8
-            if os_release < 9:
-                # MacOSX 10.4 has a broken readline. Don't try to build
-                # the readline module unless the user has installed a fixed
-                # readline package
-                if find_file('readline/rlconf.h', inc_dirs, []) is None:
-                    do_readline = False
-        if do_readline:
-            if platform == 'darwin' and os_release < 9:
-                # In every directory on the search path search for a dynamic
-                # library and then a static library, instead of first looking
-                # for dynamic libraries on the entiry path.
-                # This way a staticly linked custom readline gets picked up
-                # before the (broken) dynamic library in /usr/lib.
-                readline_extra_link_args = ('-Wl,-search_paths_first',)
-            else:
-                readline_extra_link_args = ()
-
-            readline_libs = ['readline']
-            if self.compiler.find_library_file(lib_dirs,
-                                                 'ncursesw'):
-                readline_libs.append('ncursesw')
-            elif self.compiler.find_library_file(lib_dirs,
-                                                 'ncurses'):
-                readline_libs.append('ncurses')
-            elif self.compiler.find_library_file(lib_dirs, 'curses'):
-                readline_libs.append('curses')
-            elif self.compiler.find_library_file(lib_dirs +
-                                               ['/usr/lib/termcap'],
-                                               'termcap'):
-                readline_libs.append('termcap')
-            exts.append( Extension('readline', ['readline.c'],
-                                   library_dirs=['/usr/lib/termcap'],
-                                   extra_link_args=readline_extra_link_args,
-                                   libraries=readline_libs) )
-        else:
-            missing.append('readline')
-
-        if platform not in ['mac']:
-            # crypt module.
-
-            if self.compiler.find_library_file(lib_dirs, 'crypt'):
-                libs = ['crypt']
-            else:
-                libs = []
-            exts.append( Extension('crypt', ['cryptmodule.c'], libraries=libs) )
-        else:
-            missing.append('crypt')
-
-        # CSV files
-        exts.append( Extension('_csv', ['_csv.c']) )
-
-        # socket(2)
-        exts.append( Extension('_socket', ['socketmodule.c'],
-                               depends = ['socketmodule.h']) )
-        # Detect SSL support for the socket module (via _ssl)
-        search_for_ssl_incs_in = [
-                              '/usr/local/ssl/include',
-                              '/usr/contrib/ssl/include/'
-                             ]
-        ssl_incs = find_file('openssl/ssl.h', inc_dirs,
-                             search_for_ssl_incs_in
-                             )
-        if ssl_incs is not None:
-            krb5_h = find_file('krb5.h', inc_dirs,
-                               ['/usr/kerberos/include'])
-            if krb5_h:
-                ssl_incs += krb5_h
-        ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
-                                     ['/usr/local/ssl/lib',
-                                      '/usr/contrib/ssl/lib/'
-                                     ] )
-
-        if (ssl_incs is not None and
-            ssl_libs is not None):
-            exts.append( Extension('_ssl', ['_ssl.c'],
-                                   include_dirs = ssl_incs,
-                                   library_dirs = ssl_libs,
-                                   libraries = ['ssl', 'crypto'],
-                                   depends = ['socketmodule.h']), )
-        else:
-            missing.append('_ssl')
-
-        # find out which version of OpenSSL we have
-        openssl_ver = 0
-        openssl_ver_re = re.compile(
-            '^\s*#\s*define\s+OPENSSL_VERSION_NUMBER\s+(0x[0-9a-fA-F]+)' )
-        for ssl_inc_dir in inc_dirs + search_for_ssl_incs_in:
-            name = os.path.join(ssl_inc_dir, 'openssl', 'opensslv.h')
-            if os.path.isfile(name):
-                try:
-                    incfile = open(name, 'r')
-                    for line in incfile:
-                        m = openssl_ver_re.match(line)
-                        if m:
-                            openssl_ver = eval(m.group(1))
-                            break
-                except IOError:
-                    pass
-
-            # first version found is what we'll use (as the compiler should)
-            if openssl_ver:
-                break
-
-        #print 'openssl_ver = 0x%08x' % openssl_ver
-
-        if (ssl_incs is not None and
-            ssl_libs is not None and
-            openssl_ver >= 0x00907000):
-            # The _hashlib module wraps optimized implementations
-            # of hash functions from the OpenSSL library.
-            exts.append( Extension('_hashlib', ['_hashopenssl.c'],
-                                   include_dirs = ssl_incs,
-                                   library_dirs = ssl_libs,
-                                   libraries = ['ssl', 'crypto']) )
-            # these aren't strictly missing since they are unneeded.
-            #missing.extend(['_sha', '_md5'])
-        else:
-            # The _sha module implements the SHA1 hash algorithm.
-            exts.append( Extension('_sha', ['shamodule.c']) )
-            # The _md5 module implements the RSA Data Security, Inc. MD5
-            # Message-Digest Algorithm, described in RFC 1321.  The
-            # necessary files md5.c and md5.h are included here.
-            exts.append( Extension('_md5',
-                            sources = ['md5module.c', 'md5.c'],
-                            depends = ['md5.h']) )
-            missing.append('_hashlib')
-
-        if (openssl_ver < 0x00908000):
-            # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash
-            exts.append( Extension('_sha256', ['sha256module.c']) )
-            exts.append( Extension('_sha512', ['sha512module.c']) )
-
-        # Modules that provide persistent dictionary-like semantics.  You will
-        # probably want to arrange for at least one of them to be available on
-        # your machine, though none are defined by default because of library
-        # dependencies.  The Python module anydbm.py provides an
-        # implementation independent wrapper for these; dumbdbm.py provides
-        # similar functionality (but slower of course) implemented in Python.
-
-        # Sleepycat^WOracle Berkeley DB interface.
-        #  http://www.oracle.com/database/berkeley-db/db/index.html
-        #
-        # This requires the Sleepycat^WOracle DB code. The supported versions
-        # are set below.  Visit the URL above to download
-        # a release.  Most open source OSes come with one or more
-        # versions of BerkeleyDB already installed.
-
-        max_db_ver = (4, 7)
-        min_db_ver = (3, 3)
-        db_setup_debug = False   # verbose debug prints from this script?
-
-        def allow_db_ver(db_ver):
-            """Returns a boolean if the given BerkeleyDB version is acceptable.
-
-            Args:
-              db_ver: A tuple of the version to verify.
-            """
-            if not (min_db_ver <= db_ver <= max_db_ver):
-                return False
-            # Use this function to filter out known bad configurations.
-            if (4, 6) == db_ver[:2]:
-                # BerkeleyDB 4.6.x is not stable on many architectures.
-                arch = platform_machine()
-                if arch not in ('i386', 'i486', 'i586', 'i686',
-                                'x86_64', 'ia64'):
-                    return False
-            return True
-
-        def gen_db_minor_ver_nums(major):
-            if major == 4:
-                for x in range(max_db_ver[1]+1):
-                    if allow_db_ver((4, x)):
-                        yield x
-            elif major == 3:
-                for x in (3,):
-                    if allow_db_ver((3, x)):
-                        yield x
-            else:
-                raise ValueError("unknown major BerkeleyDB version", major)
-
-        # construct a list of paths to look for the header file in on
-        # top of the normal inc_dirs.
-        db_inc_paths = [
-            '/usr/include/db4',
-            '/usr/local/include/db4',
-            '/opt/sfw/include/db4',
-            '/usr/include/db3',
-            '/usr/local/include/db3',
-            '/opt/sfw/include/db3',
-            # Fink defaults (http://fink.sourceforge.net/)
-            '/sw/include/db4',
-            '/sw/include/db3',
-        ]
-        # 4.x minor number specific paths
-        for x in gen_db_minor_ver_nums(4):
-            db_inc_paths.append('/usr/include/db4%d' % x)
-            db_inc_paths.append('/usr/include/db4.%d' % x)
-            db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
-            db_inc_paths.append('/usr/local/include/db4%d' % x)
-            db_inc_paths.append('/pkg/db-4.%d/include' % x)
-            db_inc_paths.append('/opt/db-4.%d/include' % x)
-            # MacPorts default (http://www.macports.org/)
-            db_inc_paths.append('/opt/local/include/db4%d' % x)
-        # 3.x minor number specific paths
-        for x in gen_db_minor_ver_nums(3):
-            db_inc_paths.append('/usr/include/db3%d' % x)
-            db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x)
-            db_inc_paths.append('/usr/local/include/db3%d' % x)
-            db_inc_paths.append('/pkg/db-3.%d/include' % x)
-            db_inc_paths.append('/opt/db-3.%d/include' % x)
-
-        # Add some common subdirectories for Sleepycat DB to the list,
-        # based on the standard include directories. This way DB3/4 gets
-        # picked up when it is installed in a non-standard prefix and
-        # the user has added that prefix into inc_dirs.
-        std_variants = []
-        for dn in inc_dirs:
-            std_variants.append(os.path.join(dn, 'db3'))
-            std_variants.append(os.path.join(dn, 'db4'))
-            for x in gen_db_minor_ver_nums(4):
-                std_variants.append(os.path.join(dn, "db4%d"%x))
-                std_variants.append(os.path.join(dn, "db4.%d"%x))
-            for x in gen_db_minor_ver_nums(3):
-                std_variants.append(os.path.join(dn, "db3%d"%x))
-                std_variants.append(os.path.join(dn, "db3.%d"%x))
-
-        db_inc_paths = std_variants + db_inc_paths
-        db_inc_paths = [p for p in db_inc_paths if os.path.exists(p)]
-
-        db_ver_inc_map = {}
-
-        class db_found(Exception): pass
-        try:
-            # See whether there is a Sleepycat header in the standard
-            # search path.
-            for d in inc_dirs + db_inc_paths:
-                f = os.path.join(d, "db.h")
-                if db_setup_debug: print "db: looking for db.h in", f
-                if os.path.exists(f):
-                    f = open(f).read()
-                    m = re.search(r"#define\WDB_VERSION_MAJOR\W(\d+)", f)
-                    if m:
-                        db_major = int(m.group(1))
-                        m = re.search(r"#define\WDB_VERSION_MINOR\W(\d+)", f)
-                        db_minor = int(m.group(1))
-                        db_ver = (db_major, db_minor)
-
-                        # Avoid 4.6 prior to 4.6.21 due to a BerkeleyDB bug
-                        if db_ver == (4, 6):
-                            m = re.search(r"#define\WDB_VERSION_PATCH\W(\d+)", f)
-                            db_patch = int(m.group(1))
-                            if db_patch < 21:
-                                print "db.h:", db_ver, "patch", db_patch,
-                                print "being ignored (4.6.x must be >= 4.6.21)"
-                                continue
-
-                        if ( (db_ver not in db_ver_inc_map) and
-                            allow_db_ver(db_ver) ):
-                            # save the include directory with the db.h version
-                            # (first occurrence only)
-                            db_ver_inc_map[db_ver] = d
-                            if db_setup_debug:
-                                print "db.h: found", db_ver, "in", d
-                        else:
-                            # we already found a header for this library version
-                            if db_setup_debug: print "db.h: ignoring", d
-                    else:
-                        # ignore this header, it didn't contain a version number
-                        if db_setup_debug:
-                            print "db.h: no version number version in", d
-
-            db_found_vers = db_ver_inc_map.keys()
-            db_found_vers.sort()
-
-            while db_found_vers:
-                db_ver = db_found_vers.pop()
-                db_incdir = db_ver_inc_map[db_ver]
-
-                # check lib directories parallel to the location of the header
-                db_dirs_to_check = [
-                    db_incdir.replace("include", 'lib64'),
-                    db_incdir.replace("include", 'lib'),
-                ]
-                db_dirs_to_check = filter(os.path.isdir, db_dirs_to_check)
-
-                # Look for a version specific db-X.Y before an ambiguoius dbX
-                # XXX should we -ever- look for a dbX name?  Do any
-                # systems really not name their library by version and
-                # symlink to more general names?
-                for dblib in (('db-%d.%d' % db_ver),
-                              ('db%d%d' % db_ver),
-                              ('db%d' % db_ver[0])):
-                    dblib_file = self.compiler.find_library_file(
-                                    db_dirs_to_check + lib_dirs, dblib )
-                    if dblib_file:
-                        dblib_dir = [ os.path.abspath(os.path.dirname(dblib_file)) ]
-                        raise db_found
-                    else:
-                        if db_setup_debug: print "db lib: ", dblib, "not found"
-
-        except db_found:
-            if db_setup_debug:
-                print "bsddb using BerkeleyDB lib:", db_ver, dblib
-                print "bsddb lib dir:", dblib_dir, " inc dir:", db_incdir
-            db_incs = [db_incdir]
-            dblibs = [dblib]
-            # We add the runtime_library_dirs argument because the
-            # BerkeleyDB lib we're linking against often isn't in the
-            # system dynamic library search path.  This is usually
-            # correct and most trouble free, but may cause problems in
-            # some unusual system configurations (e.g. the directory
-            # is on an NFS server that goes away).
-            exts.append(Extension('_bsddb', ['_bsddb.c'],
-                                  depends = ['bsddb.h'],
-                                  library_dirs=dblib_dir,
-                                  runtime_library_dirs=dblib_dir,
-                                  include_dirs=db_incs,
-                                  libraries=dblibs))
-        else:
-            if db_setup_debug: print "db: no appropriate library found"
-            db_incs = None
-            dblibs = []
-            dblib_dir = None
-            missing.append('_bsddb')
-
-        # The sqlite interface
-        sqlite_setup_debug = False   # verbose debug prints from this script?
-
-        # We hunt for #define SQLITE_VERSION "n.n.n"
-        # We need to find >= sqlite version 3.0.8
-        sqlite_incdir = sqlite_libdir = None
-        sqlite_inc_paths = [ '/usr/include',
-                             '/usr/include/sqlite',
-                             '/usr/include/sqlite3',
-                             '/usr/local/include',
-                             '/usr/local/include/sqlite',
-                             '/usr/local/include/sqlite3',
-                           ]
-        MIN_SQLITE_VERSION_NUMBER = (3, 0, 8)
-        MIN_SQLITE_VERSION = ".".join([str(x)
-                                    for x in MIN_SQLITE_VERSION_NUMBER])
-
-        # Scan the default include directories before the SQLite specific
-        # ones. This allows one to override the copy of sqlite on OSX,
-        # where /usr/include contains an old version of sqlite.
-        for d in inc_dirs + sqlite_inc_paths:
-            f = os.path.join(d, "sqlite3.h")
-            if os.path.exists(f):
-                if sqlite_setup_debug: print "sqlite: found %s"%f
-                incf = open(f).read()
-                m = re.search(
-                    r'\s*.*#\s*.*define\s.*SQLITE_VERSION\W*"(.*)"', incf)
-                if m:
-                    sqlite_version = m.group(1)
-                    sqlite_version_tuple = tuple([int(x)
-                                        for x in sqlite_version.split(".")])
-                    if sqlite_version_tuple >= MIN_SQLITE_VERSION_NUMBER:
-                        # we win!
-                        if sqlite_setup_debug:
-                            print "%s/sqlite3.h: version %s"%(d, sqlite_version)
-                        sqlite_incdir = d
-                        break
-                    else:
-                        if sqlite_setup_debug:
-                            print "%s: version %d is too old, need >= %s"%(d,
-                                        sqlite_version, MIN_SQLITE_VERSION)
-                elif sqlite_setup_debug:
-                    print "sqlite: %s had no SQLITE_VERSION"%(f,)
-
-        if sqlite_incdir:
-            sqlite_dirs_to_check = [
-                os.path.join(sqlite_incdir, '..', 'lib64'),
-                os.path.join(sqlite_incdir, '..', 'lib'),
-                os.path.join(sqlite_incdir, '..', '..', 'lib64'),
-                os.path.join(sqlite_incdir, '..', '..', 'lib'),
-            ]
-            sqlite_libfile = self.compiler.find_library_file(
-                                sqlite_dirs_to_check + lib_dirs, 'sqlite3')
-            if sqlite_libfile:
-                sqlite_libdir = [os.path.abspath(os.path.dirname(sqlite_libfile))]
-
-        if sqlite_incdir and sqlite_libdir:
-            sqlite_srcs = ['_sqlite/cache.c',
-                '_sqlite/connection.c',
-                '_sqlite/cursor.c',
-                '_sqlite/microprotocols.c',
-                '_sqlite/module.c',
-                '_sqlite/prepare_protocol.c',
-                '_sqlite/row.c',
-                '_sqlite/statement.c',
-                '_sqlite/util.c', ]
-
-            sqlite_defines = []
-            if sys.platform != "win32":
-                sqlite_defines.append(('MODULE_NAME', '"sqlite3"'))
-            else:
-                sqlite_defines.append(('MODULE_NAME', '\\"sqlite3\\"'))
-
-
-            if sys.platform == 'darwin':
-                # In every directory on the search path search for a dynamic
-                # library and then a static library, instead of first looking
-                # for dynamic libraries on the entiry path.
-                # This way a staticly linked custom sqlite gets picked up
-                # before the dynamic library in /usr/lib.
-                sqlite_extra_link_args = ('-Wl,-search_paths_first',)
-            else:
-                sqlite_extra_link_args = ()
-
-            exts.append(Extension('_sqlite3', sqlite_srcs,
-                                  define_macros=sqlite_defines,
-                                  include_dirs=["Modules/_sqlite",
-                                                sqlite_incdir],
-                                  library_dirs=sqlite_libdir,
-                                  runtime_library_dirs=sqlite_libdir,
-                                  extra_link_args=sqlite_extra_link_args,
-                                  libraries=["sqlite3",]))
-        else:
-            missing.append('_sqlite3')
-
-        # Look for Berkeley db 1.85.   Note that it is built as a different
-        # module name so it can be included even when later versions are
-        # available.  A very restrictive search is performed to avoid
-        # accidentally building this module with a later version of the
-        # underlying db library.  May BSD-ish Unixes incorporate db 1.85
-        # symbols into libc and place the include file in /usr/include.
-        #
-        # If the better bsddb library can be built (db_incs is defined)
-        # we do not build this one.  Otherwise this build will pick up
-        # the more recent berkeleydb's db.h file first in the include path
-        # when attempting to compile and it will fail.
-        f = "/usr/include/db.h"
-        if os.path.exists(f) and not db_incs:
-            data = open(f).read()
-            m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
-            if m is not None:
-                # bingo - old version used hash file format version 2
-                ### XXX this should be fixed to not be platform-dependent
-                ### but I don't have direct access to an osf1 platform and
-                ### seemed to be muffing the search somehow
-                libraries = platform == "osf1" and ['db'] or None
-                if libraries is not None:
-                    exts.append(Extension('bsddb185', ['bsddbmodule.c'],
-                                          libraries=libraries))
-                else:
-                    exts.append(Extension('bsddb185', ['bsddbmodule.c']))
-            else:
-                missing.append('bsddb185')
-        else:
-            missing.append('bsddb185')
-
-        # The standard Unix dbm module:
-        if platform not in ['cygwin']:
-            if find_file("ndbm.h", inc_dirs, []) is not None:
-                # Some systems have -lndbm, others don't
-                if self.compiler.find_library_file(lib_dirs, 'ndbm'):
-                    ndbm_libs = ['ndbm']
-                else:
-                    ndbm_libs = []
-                exts.append( Extension('dbm', ['dbmmodule.c'],
-                                       define_macros=[('HAVE_NDBM_H',None)],
-                                       libraries = ndbm_libs ) )
-            elif self.compiler.find_library_file(lib_dirs, 'gdbm'):
-                gdbm_libs = ['gdbm']
-                if self.compiler.find_library_file(lib_dirs, 'gdbm_compat'):
-                    gdbm_libs.append('gdbm_compat')
-                if find_file("gdbm/ndbm.h", inc_dirs, []) is not None:
-                    exts.append( Extension(
-                        'dbm', ['dbmmodule.c'],
-                        define_macros=[('HAVE_GDBM_NDBM_H',None)],
-                        libraries = gdbm_libs ) )
-                elif find_file("gdbm-ndbm.h", inc_dirs, []) is not None:
-                    exts.append( Extension(
-                        'dbm', ['dbmmodule.c'],
-                        define_macros=[('HAVE_GDBM_DASH_NDBM_H',None)],
-                        libraries = gdbm_libs ) )
-                else:
-                    missing.append('dbm')
-            elif db_incs is not None:
-                exts.append( Extension('dbm', ['dbmmodule.c'],
-                                       library_dirs=dblib_dir,
-                                       runtime_library_dirs=dblib_dir,
-                                       include_dirs=db_incs,
-                                       define_macros=[('HAVE_BERKDB_H',None),
-                                                      ('DB_DBM_HSEARCH',None)],
-                                       libraries=dblibs))
-            else:
-                missing.append('dbm')
-
-        # Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
-        if (self.compiler.find_library_file(lib_dirs, 'gdbm')):
-            exts.append( Extension('gdbm', ['gdbmmodule.c'],
-                                   libraries = ['gdbm'] ) )
-        else:
-            missing.append('gdbm')
-
-        # Unix-only modules
-        if platform not in ['mac', 'win32']:
-            # Steen Lumholt's termios module
-            exts.append( Extension('termios', ['termios.c']) )
-            # Jeremy Hylton's rlimit interface
-            if platform not in ['atheos']:
-                exts.append( Extension('resource', ['resource.c']) )
-            else:
-                missing.append('resource')
-
-            # Sun yellow pages. Some systems have the functions in libc.
-            if (platform not in ['cygwin', 'atheos', 'qnx6'] and
-                find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None):
-                if (self.compiler.find_library_file(lib_dirs, 'nsl')):
-                    libs = ['nsl']
-                else:
-                    libs = []
-                exts.append( Extension('nis', ['nismodule.c'],
-                                       libraries = libs) )
-            else:
-                missing.append('nis')
-        else:
-            missing.extend(['nis', 'resource', 'termios'])
-
-        # Curses support, requiring the System V version of curses, often
-        # provided by the ncurses library.
-        panel_library = 'panel'
-        if (self.compiler.find_library_file(lib_dirs, 'ncursesw')):
-            curses_libs = ['ncursesw']
-            # Bug 1464056: If _curses.so links with ncursesw,
-            # _curses_panel.so must link with panelw.
-            panel_library = 'panelw'
-            exts.append( Extension('_curses', ['_cursesmodule.c'],
-                                   libraries = curses_libs) )
-        elif (self.compiler.find_library_file(lib_dirs, 'ncurses')):
-            curses_libs = ['ncurses']
-            exts.append( Extension('_curses', ['_cursesmodule.c'],
-                                   libraries = curses_libs) )
-        elif (self.compiler.find_library_file(lib_dirs, 'curses')
-              and platform != 'darwin'):
-                # OSX has an old Berkeley curses, not good enough for
-                # the _curses module.
-            if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
-                curses_libs = ['curses', 'terminfo']
-            elif (self.compiler.find_library_file(lib_dirs, 'termcap')):
-                curses_libs = ['curses', 'termcap']
-            else:
-                curses_libs = ['curses']
-
-            exts.append( Extension('_curses', ['_cursesmodule.c'],
-                                   libraries = curses_libs) )
-        else:
-            missing.append('_curses')
-
-        # If the curses module is enabled, check for the panel module
-        if (module_enabled(exts, '_curses') and
-            self.compiler.find_library_file(lib_dirs, panel_library)):
-            exts.append( Extension('_curses_panel', ['_curses_panel.c'],
-                                   libraries = [panel_library] + curses_libs) )
-        else:
-            missing.append('_curses_panel')
-
-        # Andrew Kuchling's zlib module.  Note that some versions of zlib
-        # 1.1.3 have security problems.  See CERT Advisory CA-2002-07:
-        # http://www.cert.org/advisories/CA-2002-07.html
-        #
-        # zlib 1.1.4 is fixed, but at least one vendor (RedHat) has decided to
-        # patch its zlib 1.1.3 package instead of upgrading to 1.1.4.  For
-        # now, we still accept 1.1.3, because we think it's difficult to
-        # exploit this in Python, and we'd rather make it RedHat's problem
-        # than our problem <wink>.
-        #
-        # You can upgrade zlib to version 1.1.4 yourself by going to
-        # http://www.gzip.org/zlib/
-        zlib_inc = find_file('zlib.h', [], inc_dirs)
-        have_zlib = False
-        if zlib_inc is not None:
-            zlib_h = zlib_inc[0] + '/zlib.h'
-            version = '"0.0.0"'
-            version_req = '"1.1.3"'
-            fp = open(zlib_h)
-            while 1:
-                line = fp.readline()
-                if not line:
-                    break
-                if line.startswith('#define ZLIB_VERSION'):
-                    version = line.split()[2]
-                    break
-            if version >= version_req:
-                if (self.compiler.find_library_file(lib_dirs, 'z')):
-                    if sys.platform == "darwin":
-                        zlib_extra_link_args = ('-Wl,-search_paths_first',)
-                    else:
-                        zlib_extra_link_args = ()
-                    exts.append( Extension('zlib', ['zlibmodule.c'],
-                                           libraries = ['z'],
-                                           extra_link_args = zlib_extra_link_args))
-                    have_zlib = True
-                else:
-                    missing.append('zlib')
-            else:
-                missing.append('zlib')
-        else:
-            missing.append('zlib')
-
-        # Helper module for various ascii-encoders.  Uses zlib for an optimized
-        # crc32 if we have it.  Otherwise binascii uses its own.
-        if have_zlib:
-            extra_compile_args = ['-DUSE_ZLIB_CRC32']
-            libraries = ['z']
-            extra_link_args = zlib_extra_link_args
-        else:
-            extra_compile_args = []
-            libraries = []
-            extra_link_args = []
-        exts.append( Extension('binascii', ['binascii.c'],
-                               extra_compile_args = extra_compile_args,
-                               libraries = libraries,
-                               extra_link_args = extra_link_args) )
-
-        # Gustavo Niemeyer's bz2 module.
-        if (self.compiler.find_library_file(lib_dirs, 'bz2')):
-            if sys.platform == "darwin":
-                bz2_extra_link_args = ('-Wl,-search_paths_first',)
-            else:
-                bz2_extra_link_args = ()
-            exts.append( Extension('bz2', ['bz2module.c'],
-                                   libraries = ['bz2'],
-                                   extra_link_args = bz2_extra_link_args) )
-        else:
-            missing.append('bz2')
-
-        # Interface to the Expat XML parser
-        #
-        # Expat was written by James Clark and is now maintained by a
-        # group of developers on SourceForge; see www.libexpat.org for
-        # more information.  The pyexpat module was written by Paul
-        # Prescod after a prototype by Jack Jansen.  The Expat source
-        # is included in Modules/expat/.  Usage of a system
-        # shared libexpat.so/expat.dll is not advised.
-        #
-        # More information on Expat can be found at www.libexpat.org.
-        #
-        expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')
-        define_macros = [
-            ('HAVE_EXPAT_CONFIG_H', '1'),
-        ]
-
-        exts.append(Extension('pyexpat',
-                              define_macros = define_macros,
-                              include_dirs = [expatinc],
-                              sources = ['pyexpat.c',
-                                         'expat/xmlparse.c',
-                                         'expat/xmlrole.c',
-                                         'expat/xmltok.c',
-                                         ],
-                              ))
-
-        # Fredrik Lundh's cElementTree module.  Note that this also
-        # uses expat (via the CAPI hook in pyexpat).
-
-        if os.path.isfile(os.path.join(srcdir, 'Modules', '_elementtree.c')):
-            define_macros.append(('USE_PYEXPAT_CAPI', None))
-            exts.append(Extension('_elementtree',
-                                  define_macros = define_macros,
-                                  include_dirs = [expatinc],
-                                  sources = ['_elementtree.c'],
-                                  ))
-        else:
-            missing.append('_elementtree')
-
-        # Hye-Shik Chang's CJKCodecs modules.
-        if have_unicode:
-            exts.append(Extension('_multibytecodec',
-                                  ['cjkcodecs/multibytecodec.c']))
-            for loc in ('kr', 'jp', 'cn', 'tw', 'hk', 'iso2022'):
-                exts.append(Extension('_codecs_%s' % loc,
-                                      ['cjkcodecs/_codecs_%s.c' % loc]))
-        else:
-            missing.append('_multibytecodec')
-            for loc in ('kr', 'jp', 'cn', 'tw', 'hk', 'iso2022'):
-                missing.append('_codecs_%s' % loc)
-
-        # Dynamic loading module
-        if sys.maxint == 0x7fffffff:
-            # This requires sizeof(int) == sizeof(long) == sizeof(char*)
-            dl_inc = find_file('dlfcn.h', [], inc_dirs)
-            if (dl_inc is not None) and (platform not in ['atheos']):
-                exts.append( Extension('dl', ['dlmodule.c']) )
-            else:
-                missing.append('dl')
-        else:
-            missing.append('dl')
-
-        # Thomas Heller's _ctypes module
-        self.detect_ctypes(inc_dirs, lib_dirs)
-
-        # Richard Oudkerk's multiprocessing module
-        if platform == 'win32':             # Windows
-            macros = dict()
-            libraries = ['ws2_32']
-
-        elif platform == 'darwin':          # Mac OSX
-            macros = dict(
-                HAVE_SEM_OPEN=1,
-                HAVE_SEM_TIMEDWAIT=0,
-                HAVE_FD_TRANSFER=1,
-                HAVE_BROKEN_SEM_GETVALUE=1
-                )
-            libraries = []
-
-        elif platform == 'cygwin':          # Cygwin
-            macros = dict(
-                HAVE_SEM_OPEN=1,
-                HAVE_SEM_TIMEDWAIT=1,
-                HAVE_FD_TRANSFER=0,
-                HAVE_BROKEN_SEM_UNLINK=1
-                )
-            libraries = []
-
-        elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
-            # FreeBSD's P1003.1b semaphore support is very experimental
-            # and has many known problems. (as of June 2008)
-            macros = dict(                  # FreeBSD
-                HAVE_SEM_OPEN=0,
-                HAVE_SEM_TIMEDWAIT=0,
-                HAVE_FD_TRANSFER=1,
-                )
-            libraries = []
-
-        elif platform.startswith('openbsd'):
-            macros = dict(                  # OpenBSD
-                HAVE_SEM_OPEN=0,            # Not implemented
-                HAVE_SEM_TIMEDWAIT=0,
-                HAVE_FD_TRANSFER=1,
-                )
-            libraries = []
-
-        elif platform.startswith('netbsd'):
-            macros = dict(                  # at least NetBSD 5
-                HAVE_SEM_OPEN=1,
-                HAVE_SEM_TIMEDWAIT=0,
-                HAVE_FD_TRANSFER=1,
-                HAVE_BROKEN_SEM_GETVALUE=1
-                )
-            libraries = []
-
-        else:                                   # Linux and other unices
-            macros = dict(
-                HAVE_SEM_OPEN=1,
-                HAVE_SEM_TIMEDWAIT=1,
-                HAVE_FD_TRANSFER=1
-                )
-            libraries = ['rt']
-
-        if platform == 'win32':
-            multiprocessing_srcs = [ '_multiprocessing/multiprocessing.c',
-                                     '_multiprocessing/semaphore.c',
-                                     '_multiprocessing/pipe_connection.c',
-                                     '_multiprocessing/socket_connection.c',
-                                     '_multiprocessing/win32_functions.c'
-                                   ]
-
-        else:
-            multiprocessing_srcs = [ '_multiprocessing/multiprocessing.c',
-                                     '_multiprocessing/socket_connection.c'
-                                   ]
-
-            if macros.get('HAVE_SEM_OPEN', False):
-                multiprocessing_srcs.append('_multiprocessing/semaphore.c')
-
-        if sysconfig.get_config_var('WITH_THREAD'):
-            exts.append ( Extension('_multiprocessing', multiprocessing_srcs,
-                                    define_macros=macros.items(),
-                                    include_dirs=["Modules/_multiprocessing"]))
-        else:
-            missing.append('_multiprocessing')
-
-        # End multiprocessing
-
-
-        # Platform-specific libraries
-        if platform == 'linux2':
-            # Linux-specific modules
-            exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) )
-        else:
-            missing.append('linuxaudiodev')
-
-        if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
-                        'freebsd7', 'freebsd8'):
-            exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
-        else:
-            missing.append('ossaudiodev')
-
-        if platform == 'sunos5':
-            # SunOS specific modules
-            exts.append( Extension('sunaudiodev', ['sunaudiodev.c']) )
-        else:
-            missing.append('sunaudiodev')
-
-        if platform == 'darwin':
-            # _scproxy
-            exts.append(Extension("_scproxy", [os.path.join(srcdir, "Mac/Modules/_scproxy.c")],
-                extra_link_args= [
-                    '-framework', 'SystemConfiguration',
-                    '-framework', 'CoreFoundation'
-                ]))
-
-
-        if platform == 'darwin' and ("--disable-toolbox-glue" not in
-                sysconfig.get_config_var("CONFIG_ARGS")):
-
-            if int(os.uname()[2].split('.')[0]) >= 8:
-                # We're on Mac OS X 10.4 or later, the compiler should
-                # support '-Wno-deprecated-declarations'. This will
-                # surpress deprecation warnings for the Carbon extensions,
-                # these extensions wrap the Carbon APIs and even those
-                # parts that are deprecated.
-                carbon_extra_compile_args = ['-Wno-deprecated-declarations']
-            else:
-                carbon_extra_compile_args = []
-
-            # Mac OS X specific modules.
-            def macSrcExists(name1, name2=''):
-                if not name1:
-                    return None
-                names = (name1,)
-                if name2:
-                    names = (name1, name2)
-                path = os.path.join(srcdir, 'Mac', 'Modules', *names)
-                return os.path.exists(path)
-
-            def addMacExtension(name, kwds, extra_srcs=[]):
-                dirname = ''
-                if name[0] == '_':
-                    dirname = name[1:].lower()
-                cname = name + '.c'
-                cmodulename = name + 'module.c'
-                # Check for NNN.c, NNNmodule.c, _nnn/NNN.c, _nnn/NNNmodule.c
-                if macSrcExists(cname):
-                    srcs = [cname]
-                elif macSrcExists(cmodulename):
-                    srcs = [cmodulename]
-                elif macSrcExists(dirname, cname):
-                    # XXX(nnorwitz): If all the names ended with module, we
-                    # wouldn't need this condition.  ibcarbon is the only one.
-                    srcs = [os.path.join(dirname, cname)]
-                elif macSrcExists(dirname, cmodulename):
-                    srcs = [os.path.join(dirname, cmodulename)]
-                else:
-                    raise RuntimeError("%s not found" % name)
-
-                # Here's the whole point:  add the extension with sources
-                exts.append(Extension(name, srcs + extra_srcs, **kwds))
-
-            # Core Foundation
-            core_kwds = {'extra_compile_args': carbon_extra_compile_args,
-                         'extra_link_args': ['-framework', 'CoreFoundation'],
-                        }
-            addMacExtension('_CF', core_kwds, ['cf/pycfbridge.c'])
-            addMacExtension('autoGIL', core_kwds)
-
-
-
-            # Carbon
-            carbon_kwds = {'extra_compile_args': carbon_extra_compile_args,
-                           'extra_link_args': ['-framework', 'Carbon'],
-                          }
-            CARBON_EXTS = ['ColorPicker', 'gestalt', 'MacOS', 'Nav',
-                           'OSATerminology', 'icglue',
-                           # All these are in subdirs
-                           '_AE', '_AH', '_App', '_CarbonEvt', '_Cm', '_Ctl',
-                           '_Dlg', '_Drag', '_Evt', '_File', '_Folder', '_Fm',
-                           '_Help', '_Icn', '_IBCarbon', '_List',
-                           '_Menu', '_Mlte', '_OSA', '_Res', '_Qd', '_Qdoffs',
-                           '_Scrap', '_Snd', '_TE',
-                          ]
-            for name in CARBON_EXTS:
-                addMacExtension(name, carbon_kwds)
-
-            # Workaround for a bug in the version of gcc shipped with Xcode 3.
-            # The _Win extension should build just like the other Carbon extensions, but
-            # this actually results in a hard crash of the linker.
-            #
-            if '-arch ppc64' in cflags and '-arch ppc' in cflags:
-                win_kwds = {'extra_compile_args': carbon_extra_compile_args + ['-arch', 'i386', '-arch', 'ppc'],
-                               'extra_link_args': ['-framework', 'Carbon', '-arch', 'i386', '-arch', 'ppc'],
-                           }
-                addMacExtension('_Win', win_kwds)
-            else:
-                addMacExtension('_Win', carbon_kwds)
-
-
-            # Application Services & QuickTime
-            app_kwds = {'extra_compile_args': carbon_extra_compile_args,
-                        'extra_link_args': ['-framework','ApplicationServices'],
-                       }
-            addMacExtension('_Launch', app_kwds)
-            addMacExtension('_CG', app_kwds)
-
-            exts.append( Extension('_Qt', ['qt/_Qtmodule.c'],
-                        extra_compile_args=carbon_extra_compile_args,
-                        extra_link_args=['-framework', 'QuickTime',
-                                     '-framework', 'Carbon']) )
-
-
-        self.extensions.extend(exts)
-
-        # Call the method for detecting whether _tkinter can be compiled
-        self.detect_tkinter(inc_dirs, lib_dirs)
-
-        if '_tkinter' not in [e.name for e in self.extensions]:
-            missing.append('_tkinter')
-
-        return missing
-
-    def detect_tkinter_darwin(self, inc_dirs, lib_dirs):
-        # The _tkinter module, using frameworks. Since frameworks are quite
-        # different the UNIX search logic is not sharable.
-        from os.path import join, exists
-        framework_dirs = [
-            '/Library/Frameworks',
-            '/System/Library/Frameworks/',
-            join(os.getenv('HOME'), '/Library/Frameworks')
-        ]
-
-        # Find the directory that contains the Tcl.framework and Tk.framework
-        # bundles.
-        # XXX distutils should support -F!
-        for F in framework_dirs:
-            # both Tcl.framework and Tk.framework should be present
-            for fw in 'Tcl', 'Tk':
-                if not exists(join(F, fw + '.framework')):
-                    break
-            else:
-                # ok, F is now directory with both frameworks. Continure
-                # building
-                break
-        else:
-            # Tk and Tcl frameworks not found. Normal "unix" tkinter search
-            # will now resume.
-            return 0
-
-        # For 8.4a2, we must add -I options that point inside the Tcl and Tk
-        # frameworks. In later release we should hopefully be able to pass
-        # the -F option to gcc, which specifies a framework lookup path.
-        #
-        include_dirs = [
-            join(F, fw + '.framework', H)
-            for fw in 'Tcl', 'Tk'
-            for H in 'Headers', 'Versions/Current/PrivateHeaders'
-        ]
-
-        # For 8.4a2, the X11 headers are not included. Rather than include a
-        # complicated search, this is a hard-coded path. It could bail out
-        # if X11 libs are not found...
-        include_dirs.append('/usr/X11R6/include')
-        frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
-
-        # All existing framework builds of Tcl/Tk don't support 64-bit
-        # architectures.
-        cflags = sysconfig.get_config_vars('CFLAGS')[0]
-        archs = re.findall('-arch\s+(\w+)', cflags)
-        fp = os.popen("file %s/Tk.framework/Tk | grep 'for architecture'"%(F,))
-        detected_archs = []
-        for ln in fp:
-            a = ln.split()[-1]
-            if a in archs:
-                detected_archs.append(ln.split()[-1])
-        fp.close()
-
-        for a in detected_archs:
-            frameworks.append('-arch')
-            frameworks.append(a)
-
-        ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
-                        define_macros=[('WITH_APPINIT', 1)],
-                        include_dirs = include_dirs,
-                        libraries = [],
-                        extra_compile_args = frameworks[2:],
-                        extra_link_args = frameworks,
-                        )
-        self.extensions.append(ext)
-        return 1
-
-
-    def detect_tkinter(self, inc_dirs, lib_dirs):
-        # The _tkinter module.
-
-        # Rather than complicate the code below, detecting and building
-        # AquaTk is a separate method. Only one Tkinter will be built on
-        # Darwin - either AquaTk, if it is found, or X11 based Tk.
-        platform = self.get_platform()
-        if (platform == 'darwin' and
-            self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
-            return
-
-        # Assume we haven't found any of the libraries or include files
-        # The versions with dots are used on Unix, and the versions without
-        # dots on Windows, for detection by cygwin.
-        tcllib = tklib = tcl_includes = tk_includes = None
-        for version in ['8.4', '84']:
-            tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version)
-            tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' + version)
-            if tklib and tcllib:
-                # Exit the loop when we've found the Tcl/Tk libraries
-                break
-
-        # Now check for the header files
-        if tklib and tcllib:
-            # Check for the include files on Debian and {Free,Open}BSD, where
-            # they're put in /usr/include/{tcl,tk}X.Y
-            dotversion = version
-            if '.' not in dotversion and "bsd" in sys.platform.lower():
-                # OpenBSD and FreeBSD use Tcl/Tk library names like libtcl83.a,
-                # but the include subdirs are named like .../include/tcl8.3.
-                dotversion = dotversion[:-1] + '.' + dotversion[-1]
-            tcl_include_sub = []
-            tk_include_sub = []
-            for dir in inc_dirs:
-                tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
-                tk_include_sub += [dir + os.sep + "tk" + dotversion]
-            tk_include_sub += tcl_include_sub
-            tcl_includes = find_file('tcl.h', inc_dirs, tcl_include_sub)
-            tk_includes = find_file('tk.h', inc_dirs, tk_include_sub)
-
-        if (tcllib is None or tklib is None or
-            tcl_includes is None or tk_includes is None):
-            self.announce("INFO: Can't locate Tcl/Tk libs and/or headers", 2)
-            return
-
-        # OK... everything seems to be present for Tcl/Tk.
-
-        include_dirs = [] ; libs = [] ; defs = [] ; added_lib_dirs = []
-        for dir in tcl_includes + tk_includes:
-            if dir not in include_dirs:
-                include_dirs.append(dir)
-
-        # Check for various platform-specific directories
-        if platform == 'sunos5':
-            include_dirs.append('/usr/openwin/include')
-            added_lib_dirs.append('/usr/openwin/lib')
-        elif os.path.exists('/usr/X11R6/include'):
-            include_dirs.append('/usr/X11R6/include')
-            added_lib_dirs.append('/usr/X11R6/lib64')
-            added_lib_dirs.append('/usr/X11R6/lib')
-        elif os.path.exists('/usr/X11R5/include'):
-            include_dirs.append('/usr/X11R5/include')
-            added_lib_dirs.append('/usr/X11R5/lib')
-        else:
-            # Assume default location for X11
-            include_dirs.append('/usr/X11/include')
-            added_lib_dirs.append('/usr/X11/lib')
-
-        # If Cygwin, then verify that X is installed before proceeding
-        if platform == 'cygwin':
-            x11_inc = find_file('X11/Xlib.h', [], include_dirs)
-            if x11_inc is None:
-                return
-
-        # Check for BLT extension
-        if self.compiler.find_library_file(lib_dirs + added_lib_dirs,
-                                           'BLT8.0'):
-            defs.append( ('WITH_BLT', 1) )
-            libs.append('BLT8.0')
-        elif self.compiler.find_library_file(lib_dirs + added_lib_dirs,
-                                           'BLT'):
-            defs.append( ('WITH_BLT', 1) )
-            libs.append('BLT')
-
-        # Add the Tcl/Tk libraries
-        libs.append('tk'+ version)
-        libs.append('tcl'+ version)
-
-        if platform in ['aix3', 'aix4']:
-            libs.append('ld')
-
-        # Finally, link with the X11 libraries (not appropriate on cygwin)
-        if platform != "cygwin":
-            libs.append('X11')
-
-        ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
-                        define_macros=[('WITH_APPINIT', 1)] + defs,
-                        include_dirs = include_dirs,
-                        libraries = libs,
-                        library_dirs = added_lib_dirs,
-                        )
-        self.extensions.append(ext)
-
-##         # Uncomment these lines if you want to play with xxmodule.c
-##         ext = Extension('xx', ['xxmodule.c'])
-##         self.extensions.append(ext)
-
-        # XXX handle these, but how to detect?
-        # *** Uncomment and edit for PIL (TkImaging) extension only:
-        #       -DWITH_PIL -I../Extensions/Imaging/libImaging  tkImaging.c \
-        # *** Uncomment and edit for TOGL extension only:
-        #       -DWITH_TOGL togl.c \
-        # *** Uncomment these for TOGL extension only:
-        #       -lGL -lGLU -lXext -lXmu \
-
-    def configure_ctypes_darwin(self, ext):
-        # Darwin (OS X) uses preconfigured files, in
-        # the Modules/_ctypes/libffi_osx directory.
-        (srcdir,) = sysconfig.get_config_vars('srcdir')
-        ffi_srcdir = os.path.abspath(os.path.join(srcdir, 'Modules',
-                                                  '_ctypes', 'libffi_osx'))
-        sources = [os.path.join(ffi_srcdir, p)
-                   for p in ['ffi.c',
-                             'x86/darwin64.S',
-                             'x86/x86-darwin.S',
-                             'x86/x86-ffi_darwin.c',
-                             'x86/x86-ffi64.c',
-                             'powerpc/ppc-darwin.S',
-                             'powerpc/ppc-darwin_closure.S',
-                             'powerpc/ppc-ffi_darwin.c',
-                             'powerpc/ppc64-darwin_closure.S',
-                             ]]
-
-        # Add .S (preprocessed assembly) to C compiler source extensions.
-        self.compiler.src_extensions.append('.S')
-
-        include_dirs = [os.path.join(ffi_srcdir, 'include'),
-                        os.path.join(ffi_srcdir, 'powerpc')]
-        ext.include_dirs.extend(include_dirs)
-        ext.sources.extend(sources)
-        return True
-
-    def configure_ctypes(self, ext):
-        if not self.use_system_libffi:
-            if sys.platform == 'darwin':
-                return self.configure_ctypes_darwin(ext)
-
-            (srcdir,) = sysconfig.get_config_vars('srcdir')
-            ffi_builddir = os.path.join(self.build_temp, 'libffi')
-            ffi_srcdir = os.path.abspath(os.path.join(srcdir, 'Modules',
-                                         '_ctypes', 'libffi'))
-            ffi_configfile = os.path.join(ffi_builddir, 'fficonfig.py')
-
-            from distutils.dep_util import newer_group
-
-            config_sources = [os.path.join(ffi_srcdir, fname)
-                              for fname in os.listdir(ffi_srcdir)
-                              if os.path.isfile(os.path.join(ffi_srcdir, fname))]
-            if self.force or newer_group(config_sources,
-                                         ffi_configfile):
-                from distutils.dir_util import mkpath
-                mkpath(ffi_builddir)
-                config_args = []
-
-                # Pass empty CFLAGS because we'll just append the resulting
-                # CFLAGS to Python's; -g or -O2 is to be avoided.
-                cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \
-                      % (ffi_builddir, ffi_srcdir, " ".join(config_args))
-
-                res = os.system(cmd)
-                if res or not os.path.exists(ffi_configfile):
-                    print "Failed to configure _ctypes module"
-                    return False
-
-            fficonfig = {}
-            exec open(ffi_configfile) in fficonfig
-
-            # Add .S (preprocessed assembly) to C compiler source extensions.
-            self.compiler.src_extensions.append('.S')
-
-            include_dirs = [os.path.join(ffi_builddir, 'include'),
-                            ffi_builddir,
-                            os.path.join(ffi_srcdir, 'src')]
-            extra_compile_args = fficonfig['ffi_cflags'].split()
-
-            ext.sources.extend(os.path.join(ffi_srcdir, f) for f in
-                               fficonfig['ffi_sources'])
-            ext.include_dirs.extend(include_dirs)
-            ext.extra_compile_args.extend(extra_compile_args)
-        return True
-
-    def detect_ctypes(self, inc_dirs, lib_dirs):
-        self.use_system_libffi = False
-        include_dirs = []
-        extra_compile_args = []
-        extra_link_args = []
-        sources = ['_ctypes/_ctypes.c',
-                   '_ctypes/callbacks.c',
-                   '_ctypes/callproc.c',
-                   '_ctypes/stgdict.c',
-                   '_ctypes/cfield.c',
-                   '_ctypes/malloc_closure.c']
-        depends = ['_ctypes/ctypes.h']
-
-        if sys.platform == 'darwin':
-            sources.append('_ctypes/darwin/dlfcn_simple.c')
-            extra_compile_args.append('-DMACOSX')
-            include_dirs.append('_ctypes/darwin')
-# XXX Is this still needed?
-##            extra_link_args.extend(['-read_only_relocs', 'warning'])
-
-        elif sys.platform == 'sunos5':
-            # XXX This shouldn't be necessary; it appears that some
-            # of the assembler code is non-PIC (i.e. it has relocations
-            # when it shouldn't. The proper fix would be to rewrite
-            # the assembler code to be PIC.
-            # This only works with GCC; the Sun compiler likely refuses
-            # this option. If you want to compile ctypes with the Sun
-            # compiler, please research a proper solution, instead of
-            # finding some -z option for the Sun compiler.
-            extra_link_args.append('-mimpure-text')
-
-        elif sys.platform.startswith('hp-ux'):
-            extra_link_args.append('-fPIC')
-
-        ext = Extension('_ctypes',
-                        include_dirs=include_dirs,
-                        extra_compile_args=extra_compile_args,
-                        extra_link_args=extra_link_args,
-                        libraries=[],
-                        sources=sources,
-                        depends=depends)
-        ext_test = Extension('_ctypes_test',
-                             sources=['_ctypes/_ctypes_test.c'])
-        self.extensions.extend([ext, ext_test])
-
-        if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"):
-            return
-
-        if sys.platform == 'darwin':
-            # OS X 10.5 comes with libffi.dylib; the include files are
-            # in /usr/include/ffi
-            inc_dirs.append('/usr/include/ffi')
-
-        ffi_inc = find_file('ffi.h', [], inc_dirs)
-        if ffi_inc is not None:
-            ffi_h = ffi_inc[0] + '/ffi.h'
-            fp = open(ffi_h)
-            while 1:
-                line = fp.readline()
-                if not line:
-                    ffi_inc = None
-                    break
-                if line.startswith('#define LIBFFI_H'):
-                    break
-        ffi_lib = None
-        if ffi_inc is not None:
-            for lib_name in ('ffi_convenience', 'ffi_pic', 'ffi'):
-                if (self.compiler.find_library_file(lib_dirs, lib_name)):
-                    ffi_lib = lib_name
-                    break
-
-        if ffi_inc and ffi_lib:
-            ext.include_dirs.extend(ffi_inc)
-            ext.libraries.append(ffi_lib)
-            self.use_system_libffi = True
-
-
-class PyBuildInstall(install):
-    # Suppress the warning about installation into the lib_dynload
-    # directory, which is not in sys.path when running Python during
-    # installation:
-    def initialize_options (self):
-        install.initialize_options(self)
-        self.warn_dir=0
-
-class PyBuildInstallLib(install_lib):
-    # Do exactly what install_lib does but make sure correct access modes get
-    # set on installed directories and files. All installed files with get
-    # mode 644 unless they are a shared library in which case they will get
-    # mode 755. All installed directories will get mode 755.
-
-    so_ext = sysconfig.get_config_var("SO")
-
-    def install(self):
-        outfiles = install_lib.install(self)
-        self.set_file_modes(outfiles, 0644, 0755)
-        self.set_dir_modes(self.install_dir, 0755)
-        return outfiles
-
-    def set_file_modes(self, files, defaultMode, sharedLibMode):
-        if not self.is_chmod_supported(): return
-        if not files: return
-
-        for filename in files:
-            if os.path.islink(filename): continue
-            mode = defaultMode
-            if filename.endswith(self.so_ext): mode = sharedLibMode
-            log.info("changing mode of %s to %o", filename, mode)
-            if not self.dry_run: os.chmod(filename, mode)
-
-    def set_dir_modes(self, dirname, mode):
-        if not self.is_chmod_supported(): return
-        os.path.walk(dirname, self.set_dir_modes_visitor, mode)
-
-    def set_dir_modes_visitor(self, mode, dirname, names):
-        if os.path.islink(dirname): return
-        log.info("changing mode of %s to %o", dirname, mode)
-        if not self.dry_run: os.chmod(dirname, mode)
-
-    def is_chmod_supported(self):
-        return hasattr(os, 'chmod')
-
-SUMMARY = """
-Python is an interpreted, interactive, object-oriented programming
-language. It is often compared to Tcl, Perl, Scheme or Java.
-
-Python combines remarkable power with very clear syntax. It has
-modules, classes, exceptions, very high level dynamic data types, and
-dynamic typing. There are interfaces to many system calls and
-libraries, as well as to various windowing systems (X11, Motif, Tk,
-Mac, MFC). New built-in modules are easily written in C or C++. Python
-is also usable as an extension language for applications that need a
-programmable interface.
-
-The Python implementation is portable: it runs on many brands of UNIX,
-on Windows, DOS, OS/2, Mac, Amiga... If your favorite system isn't
-listed here, it may still be supported, if there's a C compiler for
-it. Ask around on comp.lang.python -- or just try compiling Python
-yourself.
-"""
-
-CLASSIFIERS = """
-Development Status :: 6 - Mature
-License :: OSI Approved :: Python Software Foundation License
-Natural Language :: English
-Programming Language :: C
-Programming Language :: Python
-Topic :: Software Development
-"""
-
-def main():
-    # turn off warnings when deprecated modules are imported
-    import warnings
-    warnings.filterwarnings("ignore",category=DeprecationWarning)
-    setup(# PyPI Metadata (PEP 301)
-          name = "Python",
-          version = sys.version.split()[0],
-          url = "http://www.python.org/%s" % sys.version[:3],
-          maintainer = "Guido van Rossum and the Python community",
-          maintainer_email = "python-dev@python.org",
-          description = "A high-level object-oriented programming language",
-          long_description = SUMMARY.strip(),
-          license = "PSF license",
-          classifiers = filter(None, CLASSIFIERS.split("\n")),
-          platforms = ["Many"],
-
-          # Build info
-          cmdclass = {'build_ext':PyBuildExt, 'install':PyBuildInstall,
-                      'install_lib':PyBuildInstallLib},
-          # The struct module is defined here, because build_ext won't be
-          # called unless there's at least one extension module defined.
-          ext_modules=[Extension('_struct', ['_struct.c'])],
-
-          # Scripts to install
-          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
-                     'Tools/scripts/2to3',
-                     'Lib/smtpd.py']
-        )
-
-# --install-platlib
-if __name__ == '__main__':
-    main()
diff --git a/CMake/cdat_modules_extra/pyzmq_configure_step.cmake.in b/CMake/cdat_modules_extra/pyzmq_configure_step.cmake.in
deleted file mode 100644
index 96a849a05..000000000
--- a/CMake/cdat_modules_extra/pyzmq_configure_step.cmake.in
+++ /dev/null
@@ -1,20 +0,0 @@
-message("Building PyZMQ:\n@pyzmq_binary@")
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-set(ENV{@LIBRARY_PATH@} "@CMAKE_INSTALL_PREFIX@/lib:@cdat_EXTERNALS@/lib:$ENV{@LIBRARY_PATH@}")
-set(ENV{VS_UNICODE_OUTPUT} "")
-if(APPLE)
-    set(ENV{CFLAGS} "@cdat_osx_arch_flag@ @cdat_osx_version_flag@ @cdat_osx_sysroot@")
-endif()
-
-execute_process(
-  COMMAND env  @LIBRARY_PATH@="$ENV{LD_LIBRARY_PATH}" "@PYTHON_EXECUTABLE@" setup.py configure --zmq=@cdat_EXTERNALS@
-  WORKING_DIRECTORY "@pyzmq_binary@"
-  RESULT_VARIABLE res
-  OUTPUT_VARIABLE pyzmq_OUT
-  OUTPUT_VARIABLE pyzmq_ERR)
-
-if(NOT ${res} EQUAL 0)
-    message("PyZMQ errors detected: \n${pyzmq_OUT}\n${pyzmq_ERR}")
-  message(FATAL_ERROR "Error in config of pyzmq")
-endif()
-message("pyzmq build worked.")
diff --git a/CMake/cdat_modules_extra/pyzmq_install_step.cmake.in b/CMake/cdat_modules_extra/pyzmq_install_step.cmake.in
deleted file mode 100644
index da21d89c1..000000000
--- a/CMake/cdat_modules_extra/pyzmq_install_step.cmake.in
+++ /dev/null
@@ -1,21 +0,0 @@
-message("Installing pyzmq:\n@pyzmq_PREFIX_ARGS@")
-set(ENV{@LIBRARY_PATH@} "@CMAKE_INSTALL_PREFIX@/lib:@cdat_EXTERNALS@/lib:$ENV{@LIBRARY_PATH@}")
-set(ENV{VS_UNICODE_OUTPUT} "")
-
-if(APPLE)
-    set(ENV{CFLAGS} "@cdat_osx_arch_flag@ @cdat_osx_version_flag@ @cdat_osx_sysroot@")
-endif()
-
-execute_process(
-  COMMAND env  @LIBRARY_PATH@="$ENV{LD_LIBRARY_PATH}" "@PYTHON_EXECUTABLE@" setup.py install --zmq=@cdat_EXTERNALS@ --prefix=@PYTHON_SITE_PACKAGES_PREFIX@
-  WORKING_DIRECTORY "@pyzmq_binary@"
-  RESULT_VARIABLE res
-  OUTPUT_VARIABLE pyzmq_OUT
-  OUTPUT_VARIABLE pyzmq_ERR
-)
-
-if(NOT ${res} EQUAL 0)
-  message("pyzmq Errors detected: \n${pyzmq_OUT}\n${pyzmq_ERR}")
-  message(FATAL_ERROR "Error in config of pyzmq")
-endif()
-message("pyzmq install succeeded.")
diff --git a/CMake/cdat_modules_extra/reset_runtime.csh.in b/CMake/cdat_modules_extra/reset_runtime.csh.in
deleted file mode 100644
index c4ed68faa..000000000
--- a/CMake/cdat_modules_extra/reset_runtime.csh.in
+++ /dev/null
@@ -1,24 +0,0 @@
-# First of all reset variables
-foreach v ( PATH LD_LIBRARY_PATH DYLD_LIBRARY_PATH PYTHONPATH prompt )
-    set tmp="UVCDAT_ORIGINAL_"${v}
-    if ( `eval echo \$\?$tmp` ) then
-        echo ${v}" env variable reset"
-        set vv=`eval echo \$$tmp`
-        setenv ${v} ${vv}
-        unsetenv ${tmp}
-    endif
-end
-
-# Now variables for which we may have changed value or created
-foreach v ( OPAL_PREFIX LIBOVERLAY_SCROLLBAR )
-    set tmp="UVCDAT_ORIGINAL_"${v}
-    if ( `eval echo \$\?$tmp` ) then
-        echo ${v}" env variable reset"
-        set vv=`eval echo \$$tmp`
-        setenv ${v} ${vv}
-    else
-        unsetenv ${tmp}
-    endif
-end
-unsetenv UVCDAT_PROMPT_STRING
-unsetenv UVCDAT_SETUP_PATH
diff --git a/CMake/cdat_modules_extra/reset_runtime.sh.in b/CMake/cdat_modules_extra/reset_runtime.sh.in
deleted file mode 100644
index 37f957727..000000000
--- a/CMake/cdat_modules_extra/reset_runtime.sh.in
+++ /dev/null
@@ -1,16 +0,0 @@
-# First of all reset variables
-for v in PATH LD_LIBRARY_PATH DYLD_LIBRARY_PATH PYTHONPATH PS1 OPAL_PREFIX LIBOVERLAY_SCROLLBAR ; do
-   tmp="UVCDAT_ORIGINAL_"${v}
-   if [ -n "${!tmp}" ] ; then
-        echo ${v}" env variable reset"
-        if [ "${!tmp}" != " " ] ; then
-            export ${v}=${!tmp}
-        else
-            unset ${v}
-        fi
-        unset ${tmp}
-    fi
-done
-unset UVCDAT_PROMPT_STRING
-unset UVCDAT_SETUP_PATH
-return 0
diff --git a/CMake/cdat_modules_extra/runpytest.in b/CMake/cdat_modules_extra/runpytest.in
deleted file mode 100755
index 42fe55e68..000000000
--- a/CMake/cdat_modules_extra/runpytest.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# glue script to playback a recorded uvcdat vistrail and compare the result
-# with a known good baseline image.
-# takes three arguments: the name of the vistrail.vt:tagname to playback
-# a set of aliases for that trail (to replace filenames for example)
-# the filename of the image to compare against
-
-# setup uvcdat run time environment
-. @CMAKE_INSTALL_PREFIX@/bin/setup_runtime.sh
-
-# play back the requested vistrail and make an image
-"@PYTHON_EXECUTABLE@" \
-  @CMAKE_INSTALL_PREFIX@/vistrails/vistrails/uvcdat.py \
- -R \
- -S $1\
- -b $2\
- -a $3\
- -e @CMAKE_BINARY_DIR@/Testing/Temporary
-
-# compare that image with the baseline(s) for it
-"@PYTHON_EXECUTABLE@" \
- @cdat_SOURCE_DIR@/testing/checkimage.py \
- @CMAKE_BINARY_DIR@/Testing/Temporary/$4 \
- $5/$4 \
- $6
diff --git a/CMake/cdat_modules_extra/seawater_build_step.cmake.in b/CMake/cdat_modules_extra/seawater_build_step.cmake.in
deleted file mode 100644
index 7118a8eb2..000000000
--- a/CMake/cdat_modules_extra/seawater_build_step.cmake.in
+++ /dev/null
@@ -1,6 +0,0 @@
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-execute_process(
-  COMMAND "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
-  WORKING_DIRECTORY "@seawater_source_dir@"
-)
diff --git a/CMake/cdat_modules_extra/setup_runtime.csh.in b/CMake/cdat_modules_extra/setup_runtime.csh.in
deleted file mode 100755
index 8a7f1c83b..000000000
--- a/CMake/cdat_modules_extra/setup_runtime.csh.in
+++ /dev/null
@@ -1,117 +0,0 @@
-# Main install prefix set by user or post install script:
-# UVCDAT_INSTALL_PREFIX
-
-# First reset any existing UVCDAT env
-. @CMAKE_INSTALL_PREFIX@/bin/reset_runtime.csh
-
-# Now store existing env var that we will be tweaking
-foreach v ( PATH LD_LIBRARY_PATH DYLD_LIBRARY_PATH PYTHONPATH OPAL_PREFIX LIBOVERLAY_SCROLLBAR )
-    if ( `eval echo \$\?$v` ) then
-        set vv=`eval echo \$$v`
-        setenv UVCDAT_ORIGINAL_${v} ${vv}
-    else
-        setenv UVCDAT_ORIGINAL_${v} " "
-    endif
-end
-
-setenv UVCDAT_PROMPT_STRING @UVCDAT_PROMPT_STRING@
-if ( $?UVCDAT_PROMPT_BEGINNING ) then
-  setenv UVCDAT_ORIGINAL_prompt ${prompt}
-  set prompt = "[@UVCDAT_PROMPT_STRING@]${prompt}"
-else if ( $?UVCDAT_PROMPT_END ) then
-  setenv UVCDAT_ORIGINAL_prompt ${prompt}
-  set prompt = "${prompt}[@UVCDAT_PROMPT_STRING@]"
-endif
-
-# If unset, use the value configured by cmake by default.
-
-# Everything beyond this point will be determined relatively
-# from this path.
-if ( $?UVCDAT_INSTALL_PREFIX ) then
-  set install_prefix=${UVCDAT_INSTALL_PREFIX}
-else
-  set install_prefix=@CMAKE_INSTALL_PREFIX@
-endif
-
-# Try to prevent the user from sourcing twice,
-# which can lead to errors.
-if ( $?UVCDAT_SETUP_PATH ) then
-  if ( ${UVCDAT_SETUP_PATH} == ${install_prefix} ) then
-    echo 'Nothing to do since UVCDAT is already setup at '${UVCDAT_SETUP_PATH}
-    exit 0
-  else
-    echo 'ERROR: UVCDAT setup was previously sourced at '${UVCDAT_SETUP_PATH}
-    echo 'ERROR: There is no need to run setup_runtime manually anymore.'
-    echo 'ERROR: Open a new shell in order to use a different install location.'
-    echo 'ERROR: Or execute source @CMAKE_INSTALL_PREFIX@/bin/reset_runtime.sh.'
-    exit 1
-  endif
-endif
-
-# Check that the install prefix exists, otherwise stop.
-if ( ! -d ${install_prefix} ) then
-  echo 'ERROR: '${install_prefix}' is not a directory.'
-  exit 1
-endif
-
-if ( ! $?LD_LIBRARY_PATH ) then
-  setenv LD_LIBRARY_PATH ''
-endif
-
-if ( ! $?PYTHONPATH ) then
-  setenv PYTHONPATH ''
-endif
-
-if ( ! $?PATH ) then
-  setenv PATH ''
-endif
-
-if ( '@QT_LIB_DIR@' != '' ) then
-  if ( -d @QT_LIB_DIR@ ) then
-    setenv LD_LIBRARY_PATH @QT_LIB_DIR@:${LD_LIBRARY_PATH}
-  endif
-endif
-
-foreach d ( @SETUP_LIBRARY_PATHS@ )
-  set f=${install_prefix}/${d}
-  if ( -d ${f} ) then
-    setenv LD_LIBRARY_PATH ${f}:${LD_LIBRARY_PATH}
-  endif
-end
-
-if ( `uname` == 'Darwin' ) then
-  setenv LD_LIBRARY_PATH /usr/X11R6/lib:/usr/lib:${LD_LIBRARY_PATH}
-  setenv DYLD_FALLBACK_LIBRARY_PATH ${LD_LIBRARY_PATH}
-endif
-
-foreach d ( @SETUP_PYTHON_PATHS@ )
-  set f=${install_prefix}/${d}
-  if ( -d ${f} ) then
-    setenv PYTHONPATH ${f}:${PYTHONPATH}
-  endif
-end
-
-foreach d ( @SETUP_EXECUTABLE_PATHS@ )
-  set f=${install_prefix}/${d}
-  if ( -d ${f} ) then
-    setenv PATH ${f}:${PATH}
-  endif
-end
-
-if ( -d ${install_prefix}/Externals/lib/R ) then
-  setenv R_HOME ${install_prefix}/Externals/lib/R
-endif
-
-setenv GDAL_DATA ${install_prefix}/Externals/share/gdal
-setenv OPAL_PREFIX ${install_prefix}/Externals
-setenv LIBOVERLAY_SCROLLBAR 0
-
-setenv UVCDAT_SETUP_PATH ${install_prefix}
-
-unset install_prefix
-
-echo 'Successfully updated your environment to use UVCDAT'
-echo '(changes are valid for this session/terminal only)'
-echo 'Version: '${UVCDAT_PROMPT_STRING}
-echo 'Location: '${UVCDAT_SETUP_PATH}
-echo 'Reset these changes by running: source @CMAKE_INSTALL_PREFIX@/bin/reset_runtime.csh'
diff --git a/CMake/cdat_modules_extra/setup_runtime.sh.in b/CMake/cdat_modules_extra/setup_runtime.sh.in
deleted file mode 100755
index 0476b092b..000000000
--- a/CMake/cdat_modules_extra/setup_runtime.sh.in
+++ /dev/null
@@ -1,111 +0,0 @@
-# Everything beyond this point will be determined relatively
-# from this path.
-install_prefix="@CMAKE_INSTALL_PREFIX@"
-# Reset previous uvcdat env messing up
-. @CMAKE_INSTALL_PREFIX@/bin/reset_runtime.sh
-
-# Saves what we will mess with
-for v in PATH LD_LIBRARY_PATH DYLD_LIBRARY_PATH PYTHONPATH OPAL_PREFIX LIBOVERLAY_SCROLLBAR ; do
-   tmp="${v}"
-    if [ -n "${!tmp}" ] ; then
-        export UVCDAT_ORIGINAL_${v}=${!v}
-    else
-        export UVCDAT_ORIGINAL_${v}=" "
-    fi
-done
-
-function cleanup {
-  unset cleanup install_prefix library_paths python_paths executable_paths
-}
-
-# Try to prevent the user from sourcing twice,
-# which can lead to errors.
-if [ -n "${UVCDAT_SETUP_PATH}" ] ; then
-  if [ "${UVCDAT_SETUP_PATH}" = "${install_prefix}" ] ; then
-    echo "Nothing to do since UVCDAT is already setup at: ${UVCDAT_SETUP_PATH}" 1>&2
-    cleanup
-    return 0
-  else
-    echo "ERROR: UVCDAT setup was previously sourced at: ${UVCDAT_SETUP_PATH}" 1>&2
-    echo "ERROR: There is no need to run setup_runtime manually anymore." 1>&2
-    echo "ERROR: Open a new shell in order to use a different install location." 1>&2
-    echo "ERROR: Or execute source @CMAKE_INSTALL_PREFIX@/bin/reset_runtime.sh." 1>&2
-    cleanup
-    return 1
-  fi
-fi
-
-# Check that the install prefix exists, otherwise stop.
-if [ ! -d "${install_prefix}" ] ; then
-  echo "ERROR: ${install_prefix} is not a directory." 1>&2
-  cleanup
-  return 1
-fi
-
-# cmake set variables
-library_paths=( @SETUP_LIBRARY_PATHS@ )
-python_paths=( @SETUP_PYTHON_PATHS@ )
-executable_paths=( @SETUP_EXECUTABLE_PATHS@ )
-
-export UVCDAT_PROMPT_STRING=@UVCDAT_PROMPT_STRING@
-if [ "$UVCDAT_ENABLE_PROMPT_BEGINNING" ] ; then
-    export UVCDAT_ORIGINAL_PS1=${PS1}" "
-    export PS1="[@UVCDAT_PROMPT_STRING@]$PS1"
-
-elif [ "$UVCDAT_ENABLE_PROMPT_END" ] ; then
-    export UVCDAT_ORIGINAL_PS1=${PS1}" "
-    export PS1="$PS1[@UVCDAT_PROMPT_STRING@]"
-fi
-
-if [ -d '@QT_LIB_DIR@' ] ; then
-  LD_LIBRARY_PATH='@QT_LIB_DIR@:'"${LD_LIBRARY_PATH}"
-fi
-
-for d in "${library_paths[@]}" ; do
-  f="${install_prefix}/${d}"
-  if [ -d "${f}" ] ; then
-    LD_LIBRARY_PATH="${f}:${LD_LIBRARY_PATH}"
-  fi
-done
-
-if [ `uname` = 'Darwin' ] ; then
-  LD_LIBRARY_PATH="/usr/X11R6/lib:/usr/lib:${LD_LIBRARY_PATH}"
-  export DYLD_FALLBACK_LIBRARY_PATH="${LD_LIBRARY_PATH}"
-fi
-
-for d in "${python_paths[@]}" ; do
-  f="${install_prefix}/${d}"
-  if [ -d "${f}" ] ; then
-    PYTHONPATH="${f}:${PYTHONPATH}"
-  fi
-  unset f
-done
-
-for d in "${executable_paths[@]}" ; do
-  f="${install_prefix}/${d}"
-  if [ -d "${f}" ] ; then
-    PATH="${f}:${PATH}"
-  fi
-  unset f
-done
-
-if [ -d "${install_prefix}/Externals/lib/R" ] ; then
-  export R_HOME="${install_prefix}/Externals/lib/R"
-fi
-
-export GDAL_DATA="${install_prefix}/Externals/share/gdal"
-export OPAL_PREFIX="${install_prefix}/Externals"
-export LIBOVERLAY_SCROLLBAR=0
-
-export PATH
-export LD_LIBRARY_PATH
-export PYTHONPATH
-
-export UVCDAT_SETUP_PATH="${install_prefix}"
-cleanup
-echo "Successfully updated your environment to use UVCDAT" 1>&2
-echo "(changes are valid for this session/terminal only)" 1>&2
-echo "Version: ${UVCDAT_PROMPT_STRING}" 1>&2
-echo "Location: ${UVCDAT_SETUP_PATH}" 1>&2
-echo "Reset these changes by running: source @CMAKE_INSTALL_PREFIX@/bin/reset_runtime.sh" 1>&2
-return 0
diff --git a/CMake/cdat_modules_extra/setuptools_install_step.cmake.in b/CMake/cdat_modules_extra/setuptools_install_step.cmake.in
deleted file mode 100644
index 0e5f477c5..000000000
--- a/CMake/cdat_modules_extra/setuptools_install_step.cmake.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-execute_process(
-  COMMAND env PYTHONPATH=@PYTHONPATH@ LD_LIBRARY_PATH=@LD_LIBRARY_PATH@ "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
-  WORKING_DIRECTORY @setuptools_source@
-  RESULT_VARIABLE res)
-
-if(NOT ${res} EQUAL 0)
-  message("Config Errors detected: \n${CDAT_OUT}\n${CDAT_ERR}")
-  message(FATAL_ERROR "Error in config")
-endif()
-message("Config succeeded.")
diff --git a/CMake/cdat_modules_extra/setuptools_make_step.cmake.in b/CMake/cdat_modules_extra/setuptools_make_step.cmake.in
deleted file mode 100644
index 7ddaec6a0..000000000
--- a/CMake/cdat_modules_extra/setuptools_make_step.cmake.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-execute_process(
-  COMMAND env PYTHONPATH=@PYTHONPATH@ LD_LIBRARY_PATH=@LD_LIBRARY_PATH@ "@PYTHON_EXECUTABLE@" setup.py build
-  WORKING_DIRECTORY @setuptools_source@
-  RESULT_VARIABLE res)
-
-if(NOT ${res} EQUAL 0)
-  message("Config Errors detected: \n${CDAT_OUT}\n${CDAT_ERR}")
-  message(FATAL_ERROR "Error in config")
-endif()
-message("Config succeeded.")
diff --git a/CMake/cdat_modules_extra/site.cfg.in b/CMake/cdat_modules_extra/site.cfg.in
deleted file mode 100644
index 1a250deb7..000000000
--- a/CMake/cdat_modules_extra/site.cfg.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[DEFAULT]
-library_dirs = @EXTERNALS@/lib
-include_dirs = @EXTERNALS@/include
-
diff --git a/CMake/cdat_modules_extra/udunits2_apple_configure.in b/CMake/cdat_modules_extra/udunits2_apple_configure.in
deleted file mode 100755
index 5bb7d2828..000000000
--- a/CMake/cdat_modules_extra/udunits2_apple_configure.in
+++ /dev/null
@@ -1,18006 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for UDUNITS 2.2.17.
-#
-# Report bugs to <support-udunits@unidata.ucar.edu>.
-#
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
-#
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1
-
-  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
-      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-	   done;;
-       esac
-  as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
-      if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: support-udunits@unidata.ucar.edu about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
-  fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME='UDUNITS'
-PACKAGE_TARNAME='udunits'
-PACKAGE_VERSION='2.2.17'
-PACKAGE_STRING='UDUNITS 2.2.17'
-PACKAGE_BUGREPORT='support-udunits@unidata.ucar.edu'
-PACKAGE_URL=''
-
-ac_unique_file="lib/converter.c"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='am__EXEEXT_FALSE
-am__EXEEXT_TRUE
-LTLIBOBJS
-LIBOBJS
-OTOOL64
-OTOOL
-LIPO
-NMEDIT
-DSYMUTIL
-MANIFEST_TOOL
-RANLIB
-ac_ct_AR
-AR
-DLLTOOL
-OBJDUMP
-NM
-ac_ct_DUMPBIN
-DUMPBIN
-LD
-FGREP
-SED
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-LIBTOOL
-HAVE_CUNIT_FALSE
-HAVE_CUNIT_TRUE
-LD_CUNIT
-EGREP
-GREP
-ac_ct_FC
-FCFLAGS
-FC
-LEXLIB
-LEX_OUTPUT_ROOT
-LEX
-YFLAGS
-YACC
-LN_S
-CPP
-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-AMDEPBACKSLASH
-AMDEP_FALSE
-AMDEP_TRUE
-am__quote
-am__include
-DEPDIR
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-ENABLE_UDUNITS_1_FALSE
-ENABLE_UDUNITS_1_TRUE
-DEBUG_FALSE
-DEBUG_TRUE
-LIBS_COVERAGE
-CFLAGS_COVERAGE
-am__untar
-am__tar
-AMTAR
-am__leading_dot
-SET_MAKE
-AWK
-mkdir_p
-MKDIR_P
-INSTALL_STRIP_PROGRAM
-STRIP
-install_sh
-MAKEINFO
-AUTOHEADER
-AUTOMAKE
-AUTOCONF
-ACLOCAL
-VERSION
-PACKAGE
-CYGPATH_W
-am__isrc
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_coverage
-enable_debug
-enable_udunits_1
-enable_dependency_tracking
-enable_shared
-enable_static
-with_pic
-enable_fast_install
-with_gnu_ld
-with_sysroot
-enable_libtool_lock
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-YACC
-YFLAGS
-FC
-FCFLAGS'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
-    esac
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X\(//\)[^/]' \| \
-	 X"$as_myself" : 'X\(//\)$' \| \
-	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures UDUNITS 2.2.17 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/udunits]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of UDUNITS 2.2.17:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-coverage       Turn on code-coverage support
-  --enable-debug          Turn on debugging support
-  --disable-udunits-1     Turn off support for the UDUNITS-1 API
-                          [default=enabled]
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-  --enable-shared[=PKGS]  build shared libraries [default=yes]
-  --enable-static[=PKGS]  build static libraries [default=yes]
-  --enable-fast-install[=PKGS]
-                          optimize for fast installation [default=yes]
-  --disable-libtool-lock  avoid locking (might break parallel builds)
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
-                          both]
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-sysroot=DIR Search for dependent libraries within DIR
-                        (or the compiler's sysroot if not specified).
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-  YACC        The `Yet Another Compiler Compiler' implementation to use.
-              Defaults to the first program found out of: `bison -y', `byacc',
-              `yacc'.
-  YFLAGS      The list of arguments that will be passed by default to $YACC.
-              This script will default YFLAGS to the empty string to avoid a
-              default value of `-d' given by some make applications.
-  FC          Fortran compiler command
-  FCFLAGS     Fortran compiler flags
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to <support-udunits@unidata.ucar.edu>.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-UDUNITS configure 2.2.17
-generated by GNU Autoconf 2.68
-
-Copyright (C) 2010 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_fc_try_compile LINENO
-# ---------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_fc_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_fc_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_fc_try_compile
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ----------------------------------------------- ##
-## Report this to support-udunits@unidata.ucar.edu ##
-## ----------------------------------------------- ##"
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_mongrel
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_compile
-
-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
-# -------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-ac_fn_c_check_type ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=no"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof ($2))
-	 return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof (($2)))
-	    return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  eval "$3=yes"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_type
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_func
-
-# ac_fn_fc_try_link LINENO
-# ------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_fc_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_fc_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_fc_try_link
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by UDUNITS $as_me 2.2.17, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-    2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      as_fn_append ac_configure_args " '$ac_arg'"
-      ;;
-    esac
-  done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    $as_echo "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    $as_echo "## ----------------- ##
-## Output variables. ##
-## ----------------- ##"
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      $as_echo "## ----------- ##
-## confdefs.h. ##
-## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
-else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special files
-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-ac_aux_dir=
-for ac_dir in build-aux "$srcdir"/build-aux; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-
-am__api_version='1.11'
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /[cC]/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-
-  done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
-esac
-case $srcdir in
-  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-esac
-
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   as_fn_error $? "newly created file is older than distributed files!
-Check your system clock" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
-  if ${ac_cv_path_mkdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-  done
-IFS=$as_save_IFS
-
-fi
-
-  test -d ./--version && rmdir ./--version
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
-
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='udunits'
- VERSION='2.2.17'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-
-
-ac_config_headers="$ac_config_headers config.h"
-
-
-CFLAGS_COVERAGE=''
-LIBS_COVERAGE=''
-
-# Check whether --enable-coverage was given.
-if test "${enable_coverage+set}" = set; then :
-  enableval=$enable_coverage; case "${enableval}" in
-  yes) CFLAGS_COVERAGE='--coverage'
-       LIBS_COVERAGE=-lgcov
-       coverage_enabled=true;;
-  no) ;;
-  *) as_fn_error $? "bad value ${enableval} for --enable-coverage" "$LINENO" 5 ;;
-esac
-fi
-
-
-
-
-# Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then :
-  enableval=$enable_debug; case "${enableval}" in
-  yes)
-    CFLAGS="-g${CFLAGS:+ $CFLAGS}"
-    debug=true ;;
-  no)
-    CFLAGS="-O${CFLAGS:+ $CFLAGS}"
-    debug=false ;;
-  *) as_fn_error $? "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;;
-esac
-else
-  if test "$coverage_enabled" = true; then
-    CFLAGS="-g${CFLAGS:+ $CFLAGS}"
-    debug=true
-else
-    debug=false
-fi
-
-fi
-
- if test x$debug = xtrue; then
-  DEBUG_TRUE=
-  DEBUG_FALSE='#'
-else
-  DEBUG_TRUE='#'
-  DEBUG_FALSE=
-fi
-
-
- if true; then
-  ENABLE_UDUNITS_1_TRUE=
-  ENABLE_UDUNITS_1_FALSE='#'
-else
-  ENABLE_UDUNITS_1_TRUE='#'
-  ENABLE_UDUNITS_1_FALSE=
-fi
-
-# Check whether --enable-udunits-1 was given.
-if test "${enable_udunits_1+set}" = set; then :
-  enableval=$enable_udunits_1; case "${enableval}" in
-      no)    if false; then
-  ENABLE_UDUNITS_1_TRUE=
-  ENABLE_UDUNITS_1_FALSE='#'
-else
-  ENABLE_UDUNITS_1_TRUE='#'
-  ENABLE_UDUNITS_1_FALSE=
-fi
- ;;
-      yes)  ;;
-      *)    as_fn_error $? "bad value ${enableval} for --enable-udunits-1" "$LINENO" 5 ;;
-    esac
-fi
-
-
-# Ensure that compilation is optimized and with assertions disabled by default.
-CFLAGS=${CFLAGS:--O}
-CPPFLAGS=${CPPFLAGS:--DNDEBUG}
-
-# The default absolute pathname of the installed units database. "pkgdatadir"
-# isn't a configure-variable in the normal sense: it doesn't appear in
-# "config.status" yet appears in "Makefile"; consequently, the following
-# nonsense just to avoid defining the pathname in the makefile so that Eclipse
-# is happy.
-pkgdatadir=$(eval echo $(eval echo `echo ${datadir}`/${PACKAGE}))
-
-cat >>confdefs.h <<_ACEOF
-#define DEFAULT_UDUNITS2_XML_PATH "${pkgdatadir}/udunits2.xml"
-_ACEOF
-
-
-# Checks for programs.
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if { ac_try='./conftest$ac_cv_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-if test "x$CC" != xcc; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
-fi
-set dummy $CC; ac_cc=`$as_echo "$2" |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-   test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-
-
-#if test "$ac_cv_prog_cc_${ac_cc}_c_o" = yes; then
-#    case "$AM_CFLAGS" in
-#	"-g") ;;
-#	*) AM_CFLAGS="${AM_CFLAGS:+$AM_CFLAGS }-g";;
-#    esac
-#fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-for ac_prog in 'bison -y' byacc
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_YACC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$YACC"; then
-  ac_cv_prog_YACC="$YACC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_YACC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-YACC=$ac_cv_prog_YACC
-if test -n "$YACC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
-$as_echo "$YACC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$YACC" && break
-done
-test -n "$YACC" || YACC="yacc"
-
-
-for ac_prog in flex lex
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_LEX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$LEX"; then
-  ac_cv_prog_LEX="$LEX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_LEX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-LEX=$ac_cv_prog_LEX
-if test -n "$LEX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
-$as_echo "$LEX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$LEX" && break
-done
-test -n "$LEX" || LEX=":"
-
-if test "x$LEX" != "x:"; then
-  cat >conftest.l <<_ACEOF
-%%
-a { ECHO; }
-b { REJECT; }
-c { yymore (); }
-d { yyless (1); }
-e { yyless (input () != 0); }
-f { unput (yytext[0]); }
-. { BEGIN INITIAL; }
-%%
-#ifdef YYTEXT_POINTER
-extern char *yytext;
-#endif
-int
-main (void)
-{
-  return ! yylex () + ! yywrap ();
-}
-_ACEOF
-{ { ac_try="$LEX conftest.l"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$LEX conftest.l") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
-$as_echo_n "checking lex output file root... " >&6; }
-if ${ac_cv_prog_lex_root+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-# UVCDAT patch (DL) This fails on some apple Travis CI builds, and isn't used by this package.
-# Just disable the file test.
-# This:
-  $as_echo_n "(skipped) " >&6
-# Replaces this:
-#if test -f lex.yy.c; then
-#  ac_cv_prog_lex_root=lex.yy
-#elif test -f lexyy.c; then
-#  ac_cv_prog_lex_root=lexyy
-#else
-#  as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5
-#fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
-$as_echo "$ac_cv_prog_lex_root" >&6; }
-LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
-
-if test -z "${LEXLIB+set}"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
-$as_echo_n "checking lex library... " >&6; }
-if ${ac_cv_lib_lex+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    ac_save_LIBS=$LIBS
-    ac_cv_lib_lex='none needed'
-    for ac_lib in '' -lfl -ll; do
-      LIBS="$ac_lib $ac_save_LIBS"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-`cat $LEX_OUTPUT_ROOT.c`
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_lex=$ac_lib
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-      test "$ac_cv_lib_lex" != 'none needed' && break
-    done
-    LIBS=$ac_save_LIBS
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
-$as_echo "$ac_cv_lib_lex" >&6; }
-  test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
-$as_echo_n "checking whether yytext is a pointer... " >&6; }
-if ${ac_cv_prog_lex_yytext_pointer+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  # POSIX says lex can declare yytext either as a pointer or an array; the
-# default is implementation-dependent.  Figure out which it is, since
-# not all implementations provide the %pointer and %array declarations.
-ac_cv_prog_lex_yytext_pointer=no
-ac_save_LIBS=$LIBS
-LIBS="$LEXLIB $ac_save_LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-  #define YYTEXT_POINTER 1
-`cat $LEX_OUTPUT_ROOT.c`
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_prog_lex_yytext_pointer=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_save_LIBS
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
-$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
-if test $ac_cv_prog_lex_yytext_pointer = yes; then
-
-$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
-
-fi
-rm -f conftest.l $LEX_OUTPUT_ROOT.c
-
-fi
-if test "$LEX" = :; then
-  LEX=${am_missing_run}flex
-fi
-ac_ext=${ac_fc_srcext-f}
-ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$FC"; then
-  ac_cv_prog_FC="$FC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_FC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-FC=$ac_cv_prog_FC
-if test -n "$FC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FC" >&5
-$as_echo "$FC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$FC" && break
-  done
-fi
-if test -z "$FC"; then
-  ac_ct_FC=$FC
-  for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_FC"; then
-  ac_cv_prog_ac_ct_FC="$ac_ct_FC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_FC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_FC=$ac_cv_prog_ac_ct_FC
-if test -n "$ac_ct_FC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FC" >&5
-$as_echo "$ac_ct_FC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_FC" && break
-done
-
-  if test "x$ac_ct_FC" = x; then
-    FC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    FC=$ac_ct_FC
-  fi
-fi
-
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-rm -f a.out
-
-# If we don't use `.F' as extension, the preprocessor is not run on the
-# input file.  (Note that this only needs to work for GNU compilers.)
-ac_save_ext=$ac_ext
-ac_ext=F
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran compiler" >&5
-$as_echo_n "checking whether we are using the GNU Fortran compiler... " >&6; }
-if ${ac_cv_fc_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat > conftest.$ac_ext <<_ACEOF
-      program main
-#ifndef __GNUC__
-       choke me
-#endif
-
-      end
-_ACEOF
-if ac_fn_fc_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_fc_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_compiler_gnu" >&5
-$as_echo "$ac_cv_fc_compiler_gnu" >&6; }
-ac_ext=$ac_save_ext
-ac_test_FCFLAGS=${FCFLAGS+set}
-ac_save_FCFLAGS=$FCFLAGS
-FCFLAGS=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $FC accepts -g" >&5
-$as_echo_n "checking whether $FC accepts -g... " >&6; }
-if ${ac_cv_prog_fc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  FCFLAGS=-g
-cat > conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-if ac_fn_fc_try_compile "$LINENO"; then :
-  ac_cv_prog_fc_g=yes
-else
-  ac_cv_prog_fc_g=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_fc_g" >&5
-$as_echo "$ac_cv_prog_fc_g" >&6; }
-if test "$ac_test_FCFLAGS" = set; then
-  FCFLAGS=$ac_save_FCFLAGS
-elif test $ac_cv_prog_fc_g = yes; then
-  if test "x$ac_cv_fc_compiler_gnu" = xyes; then
-    FCFLAGS="-g -O2"
-  else
-    FCFLAGS="-g"
-  fi
-else
-  if test "x$ac_cv_fc_compiler_gnu" = xyes; then
-    FCFLAGS="-O2"
-  else
-    FCFLAGS=
-  fi
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-# Checks for libraries.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dirname" >&5
-$as_echo_n "checking for library containing dirname... " >&6; }
-if ${ac_cv_search_dirname+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dirname ();
-int
-main ()
-{
-return dirname ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' gen; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_dirname=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_dirname+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_dirname+:} false; then :
-
-else
-  ac_cv_search_dirname=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dirname" >&5
-$as_echo "$ac_cv_search_dirname" >&6; }
-ac_res=$ac_cv_search_dirname
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-else
-  as_fn_error $? "cannot find function dirname" "$LINENO" 5
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing log10" >&5
-$as_echo_n "checking for library containing log10... " >&6; }
-if ${ac_cv_search_log10+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char log10 ();
-int
-main ()
-{
-return log10 ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' m; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_log10=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_log10+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_log10+:} false; then :
-
-else
-  ac_cv_search_log10=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_log10" >&5
-$as_echo "$ac_cv_search_log10" >&6; }
-ac_res=$ac_cv_search_log10
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-else
-  as_fn_error $? "cannot find function log10" "$LINENO" 5
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing XML_StopParser" >&5
-$as_echo_n "checking for library containing XML_StopParser... " >&6; }
-if ${ac_cv_search_XML_StopParser+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char XML_StopParser ();
-int
-main ()
-{
-return XML_StopParser ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' expat; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_XML_StopParser=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_XML_StopParser+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_XML_StopParser+:} false; then :
-
-else
-  ac_cv_search_XML_StopParser=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_XML_StopParser" >&5
-$as_echo "$ac_cv_search_XML_StopParser" >&6; }
-ac_res=$ac_cv_search_XML_StopParser
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-else
-  as_fn_error $? "cannot find EXPAT function XML_StopParser" "$LINENO" 5
-fi
-
-
-# Checks for header files.
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_header in float.h inttypes.h stddef.h stdlib.h string.h strings.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-# Checks for the CUNIT unit-testing package
-LD_CUNIT=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Checking for the CUNIT unit-testing package." >&5
-$as_echo "$as_me: Checking for the CUNIT unit-testing package." >&6;}
-ac_fn_c_check_header_mongrel "$LINENO" "CUnit/CUnit.h" "ac_cv_header_CUnit_CUnit_h" "$ac_includes_default"
-if test "x$ac_cv_header_CUnit_CUnit_h" = xyes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CU_initialize_registry in -lcunit" >&5
-$as_echo_n "checking for CU_initialize_registry in -lcunit... " >&6; }
-if ${ac_cv_lib_cunit_CU_initialize_registry+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcunit  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char CU_initialize_registry ();
-int
-main ()
-{
-return CU_initialize_registry ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_cunit_CU_initialize_registry=yes
-else
-  ac_cv_lib_cunit_CU_initialize_registry=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cunit_CU_initialize_registry" >&5
-$as_echo "$ac_cv_lib_cunit_CU_initialize_registry" >&6; }
-if test "x$ac_cv_lib_cunit_CU_initialize_registry" = xyes; then :
-  LD_CUNIT=-lcunit
-fi
-
-fi
-
-
-
-if test "$LD_CUNIT"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: CUNIT found.  Enabling unit-tests." >&5
-$as_echo "$as_me: CUNIT found.  Enabling unit-tests." >&6;}
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: CUNIT not found.  Disabling unit-tests." >&5
-$as_echo "$as_me: CUNIT not found.  Disabling unit-tests." >&6;}
-fi
- if test "$LD_CUNIT"; then
-  HAVE_CUNIT_TRUE=
-  HAVE_CUNIT_FALSE='#'
-else
-  HAVE_CUNIT_TRUE='#'
-  HAVE_CUNIT_FALSE=
-fi
-
-
-# Checks for typedefs, structures, and compiler characteristics.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if ${ac_cv_c_const+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-/* FIXME: Include the comments suggested by Paul. */
-#ifndef __cplusplus
-  /* Ultrix mips cc rejects this.  */
-  typedef int charset[2];
-  const charset cs;
-  /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *pcpcc;
-  char **ppc;
-  /* NEC SVR4.0.2 mips cc rejects this.  */
-  struct point {int x, y;};
-  static struct point const zero = {0,0};
-  /* AIX XL C 1.02.0.0 rejects this.
-     It does not let you subtract one const X* pointer from another in
-     an arm of an if-expression whose if-part is not a constant
-     expression */
-  const char *g = "string";
-  pcpcc = &g + (g ? g-g : 0);
-  /* HPUX 7.0 cc rejects these. */
-  ++pcpcc;
-  ppc = (char**) pcpcc;
-  pcpcc = (char const *const *) ppc;
-  { /* SCO 3.2v4 cc rejects this.  */
-    char *t;
-    char const *s = 0 ? (char *) 0 : (char const *) 0;
-
-    *t++ = 0;
-    if (s) return 0;
-  }
-  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-    int x[] = {25, 17};
-    const int *foo = &x[0];
-    ++foo;
-  }
-  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-    typedef const int *iptr;
-    iptr p = 0;
-    ++p;
-  }
-  { /* AIX XL C 1.02.0.0 rejects this saying
-       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; };
-    struct s *b; b->j = 5;
-  }
-  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-    const int foo = 10;
-    if (!foo) return 0;
-  }
-  return !cs[0] && !zero.x;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_const=yes
-else
-  ac_cv_c_const=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-$as_echo "$ac_cv_c_const" >&6; }
-if test $ac_cv_c_const = no; then
-
-$as_echo "#define const /**/" >>confdefs.h
-
-fi
-
-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-
-fi
-
-
-# Checks for library functions.
-for ac_func in floor memmove memset modf pow strcasecmp strdup strpbrk
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-case `pwd` in
-  *\ * | *\	*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-esac
-
-
-
-macro_version='2.4.2'
-macro_revision='1.3337'
-
-
-
-
-
-
-
-
-
-
-
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-$as_echo_n "checking how to print strings... " >&6; }
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO ""
-}
-
-case "$ECHO" in
-  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-$as_echo "printf" >&6; } ;;
-  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-$as_echo "print -r" >&6; } ;;
-  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-$as_echo "cat" >&6; } ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_SED_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
-else
-  ac_cv_path_SED=$SED
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
-
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-$as_echo_n "checking for fgrep... " >&6; }
-if ${ac_cv_path_FGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-   then ac_cv_path_FGREP="$GREP -F"
-   else
-     if test -z "$FGREP"; then
-  ac_path_FGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in fgrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-# Check for GNU ac_path_FGREP and select it if it is found.
-  # Check for GNU $ac_path_FGREP
-case `"$ac_path_FGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'FGREP' >> "conftest.nl"
-    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_FGREP="$ac_path_FGREP"
-      ac_path_FGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_FGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_FGREP=$FGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-$as_echo "$ac_cv_path_FGREP" >&6; }
- FGREP="$ac_cv_path_FGREP"
-
-
-test -z "$GREP" && GREP=grep
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if ${lt_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
-$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if ${lt_cv_path_NM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  : ${lt_cv_path_NM=no}
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-$as_echo "$lt_cv_path_NM" >&6; }
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in dumpbin "link -dump"
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DUMPBIN"; then
-  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DUMPBIN=$ac_cv_prog_DUMPBIN
-if test -n "$DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-$as_echo "$DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$DUMPBIN" && break
-  done
-fi
-if test -z "$DUMPBIN"; then
-  ac_ct_DUMPBIN=$DUMPBIN
-  for ac_prog in dumpbin "link -dump"
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DUMPBIN"; then
-  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
-if test -n "$ac_ct_DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-$as_echo "$ac_ct_DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_DUMPBIN" && break
-done
-
-  if test "x$ac_ct_DUMPBIN" = x; then
-    DUMPBIN=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DUMPBIN=$ac_ct_DUMPBIN
-  fi
-fi
-
-    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if ${lt_cv_nm_interface+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
-  cat conftest.out >&5
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-$as_echo "$lt_cv_nm_interface" >&6; }
-
-# find the maximum length of command line arguments
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if ${lt_cv_sys_max_cmd_len+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-    i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-
-fi
-
-if test -n $lt_cv_sys_max_cmd_len ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-
-
-
-
-
-: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,b/c, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-
-
-
-
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
-$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
-if ${lt_cv_to_host_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-        ;;
-    esac
-    ;;
-  *-*-cygwin* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_noop
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-        ;;
-    esac
-    ;;
-  * ) # unhandled hosts (and "normal" native builds)
-    lt_cv_to_host_file_cmd=func_convert_file_noop
-    ;;
-esac
-
-fi
-
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-$as_echo "$lt_cv_to_host_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
-$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
-if ${lt_cv_to_tool_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  #assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-        ;;
-    esac
-    ;;
-esac
-
-fi
-
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if ${lt_cv_ld_reload_flag+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    if test "$GCC" != yes; then
-      reload_cmds=false
-    fi
-    ;;
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
-else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if ${lt_cv_deplibs_check_method+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[4-9]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[45]*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc*)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[3-9]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-$as_echo "$lt_cv_deplibs_check_method" >&6; }
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
-  case $host_os in
-  mingw* | pw32*)
-    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-      want_nocaseglob=yes
-    else
-      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
-    fi
-    ;;
-  esac
-fi
-
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-$as_echo "$DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
-  ac_ct_DLLTOOL=$DLLTOOL
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DLLTOOL"; then
-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-$as_echo "$ac_ct_DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DLLTOOL" = x; then
-    DLLTOOL="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DLLTOOL=$ac_ct_DLLTOOL
-  fi
-else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
-$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
-if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh
-  # decide which to use based on capabilities of $DLLTOOL
-  case `$DLLTOOL --help 2>&1` in
-  *--identify-strict*)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-    ;;
-  *)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-    ;;
-  esac
-  ;;
-*)
-  # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
-  ;;
-esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in ar
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$AR" && break
-  done
-fi
-if test -z "$AR"; then
-  ac_ct_AR=$AR
-  for ac_prog in ar
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_AR="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_AR" && break
-done
-
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
-fi
-
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
-$as_echo_n "checking for archiver @FILE support... " >&6; }
-if ${lt_cv_ar_at_file+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ar_at_file=no
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
-      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      if test "$ac_status" -eq 0; then
-	# Ensure the archiver fails upon bogus file names.
-	rm -f conftest.$ac_objext libconftest.a
-	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	if test "$ac_status" -ne 0; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-$as_echo "$lt_cv_ar_at_file" >&6; }
-
-if test "x$lt_cv_ar_at_file" = xno; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-test -z "$STRIP" && STRIP=:
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-test -z "$RANLIB" && RANLIB=:
-
-
-
-
-
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
-fi
-
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if ${lt_cv_sys_global_symbol_pipe+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[BCDT]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[ABCDGISTW]'
-  ;;
-hpux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[ABCDEGRST]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[BCDEGRST]'
-  ;;
-osf*)
-  symcode='[BCDEGQRST]'
-  ;;
-solaris*)
-  symcode='[BDRT]'
-  ;;
-sco3.2v5*)
-  symcode='[DT]'
-  ;;
-sysv4.2uw2*)
-  symcode='[DT]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[ABDT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[ABCDGIRSTW]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK '"\
-"     {last_section=section; section=\$ 3};"\
-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data.  */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-LT_DLSYM_CONST struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_globsym_save_LIBS=$LIBS
-	  lt_globsym_save_CFLAGS=$CFLAGS
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS=$lt_globsym_save_LIBS
-	  CFLAGS=$lt_globsym_save_CFLAGS
-	else
-	  echo "cannot find nm_test_func in $nlist" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-
-fi
-
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-$as_echo "failed" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-fi
-
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
-  nm_file_list_spec='@'
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
-$as_echo_n "checking for sysroot... " >&6; }
-
-# Check whether --with-sysroot was given.
-if test "${with_sysroot+set}" = set; then :
-  withval=$with_sysroot;
-else
-  with_sysroot=no
-fi
-
-
-lt_sysroot=
-case ${with_sysroot} in #(
- yes)
-   if test "$GCC" = yes; then
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
-$as_echo "${with_sysroot}" >&6; }
-   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
-   ;;
-esac
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-$as_echo "${lt_sysroot:-no}" >&6; }
-
-
-
-
-
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then :
-  enableval=$enable_libtool_lock;
-fi
-
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE="32"
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE="64"
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
-	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if ${lt_cv_cc_needs_belf+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_cc_needs_belf=yes
-else
-  lt_cv_cc_needs_belf=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*)
-        case $host in
-        i?86-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        sparc*-*-solaris*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-        esac
-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD="${LD-ld}_sol2"
-        fi
-        ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks="$enable_libtool_lock"
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
-set dummy ${ac_tool_prefix}mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$MANIFEST_TOOL"; then
-  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
-if test -n "$MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-$as_echo "$MANIFEST_TOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
-  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
-  # Extract the first word of "mt", so it can be a program name with args.
-set dummy mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_MANIFEST_TOOL"; then
-  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
-if test -n "$ac_ct_MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_MANIFEST_TOOL" = x; then
-    MANIFEST_TOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
-  fi
-else
-  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
-fi
-
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
-$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
-if ${lt_cv_path_mainfest_tool+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&5
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
-$as_echo "$lt_cv_path_mainfest_tool" >&6; }
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
-  MANIFEST_TOOL=:
-fi
-
-
-
-
-
-
-  case $host_os in
-    rhapsody* | darwin*)
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DSYMUTIL"; then
-  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DSYMUTIL=$ac_cv_prog_DSYMUTIL
-if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-$as_echo "$DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DSYMUTIL"; then
-  ac_ct_DSYMUTIL=$DSYMUTIL
-  # Extract the first word of "dsymutil", so it can be a program name with args.
-set dummy dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DSYMUTIL"; then
-  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-$as_echo "$ac_ct_DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DSYMUTIL" = x; then
-    DSYMUTIL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DSYMUTIL=$ac_ct_DSYMUTIL
-  fi
-else
-  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_NMEDIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NMEDIT"; then
-  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-NMEDIT=$ac_cv_prog_NMEDIT
-if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-$as_echo "$NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_NMEDIT"; then
-  ac_ct_NMEDIT=$NMEDIT
-  # Extract the first word of "nmedit", so it can be a program name with args.
-set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_NMEDIT"; then
-  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-$as_echo "$ac_ct_NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_NMEDIT" = x; then
-    NMEDIT=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    NMEDIT=$ac_ct_NMEDIT
-  fi
-else
-  NMEDIT="$ac_cv_prog_NMEDIT"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
-set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_LIPO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$LIPO"; then
-  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-LIPO=$ac_cv_prog_LIPO
-if test -n "$LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-$as_echo "$LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_LIPO"; then
-  ac_ct_LIPO=$LIPO
-  # Extract the first word of "lipo", so it can be a program name with args.
-set dummy lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_LIPO"; then
-  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_LIPO="lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
-if test -n "$ac_ct_LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-$as_echo "$ac_ct_LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_LIPO" = x; then
-    LIPO=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    LIPO=$ac_ct_LIPO
-  fi
-else
-  LIPO="$ac_cv_prog_LIPO"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL"; then
-  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL=$ac_cv_prog_OTOOL
-if test -n "$OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL"; then
-  ac_ct_OTOOL=$OTOOL
-  # Extract the first word of "otool", so it can be a program name with args.
-set dummy otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL"; then
-  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OTOOL="otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
-if test -n "$ac_ct_OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-$as_echo "$ac_ct_OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL" = x; then
-    OTOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL=$ac_ct_OTOOL
-  fi
-else
-  OTOOL="$ac_cv_prog_OTOOL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL64+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL64"; then
-  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL64=$ac_cv_prog_OTOOL64
-if test -n "$OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-$as_echo "$OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL64"; then
-  ac_ct_OTOOL64=$OTOOL64
-  # Extract the first word of "otool64", so it can be a program name with args.
-set dummy otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL64"; then
-  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OTOOL64="otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
-if test -n "$ac_ct_OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-$as_echo "$ac_ct_OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL64" = x; then
-    OTOOL64=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL64=$ac_ct_OTOOL64
-  fi
-else
-  OTOOL64="$ac_cv_prog_OTOOL64"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-$as_echo_n "checking for -single_module linker flag... " >&6; }
-if ${lt_cv_apple_cc_single_mod+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&5
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	# If there is a non-empty error log, and "single_module"
-	# appears in it, assume the flag caused a linker warning
-        if test -s conftest.err && $GREP single_module conftest.err; then
-	  cat conftest.err >&5
-	# Otherwise, if the output was created with a 0 exit code from
-	# the compiler, it worked.
-	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&5
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if ${lt_cv_ld_exported_symbols_list+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_ld_exported_symbols_list=yes
-else
-  lt_cv_ld_exported_symbols_list=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-	LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
-$as_echo_n "checking for -force_load linker flag... " >&6; }
-if ${lt_cv_ld_force_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
-      echo "$AR cru libconftest.a conftest.o" >&5
-      $AR cru libconftest.a conftest.o 2>&5
-      echo "$RANLIB libconftest.a" >&5
-      $RANLIB libconftest.a 2>&5
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -s conftest.err && $GREP force_load conftest.err; then
-	cat conftest.err >&5
-      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&5
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-$as_echo "$lt_cv_ld_force_load" >&6; }
-    case $host_os in
-    rhapsody* | darwin1.[012])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[012]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-
-for ac_header in dlfcn.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLFCN_H 1
-_ACEOF
-
-fi
-
-done
-
-
-
-func_stripname_cnf ()
-{
-  case ${2} in
-  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-  esac
-} # func_stripname_cnf
-
-
-
-
-
-
-# Set options
-
-
-
-        enable_dlopen=no
-
-
-  enable_win32_dll=no
-
-
-            # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
-  enableval=$enable_shared; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_shared=yes
-fi
-
-
-
-
-
-
-
-
-
-  # Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
-  enableval=$enable_static; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_static=yes
-fi
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then :
-  withval=$with_pic; lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
-    *)
-      pic_mode=default
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for lt_pkg in $withval; do
-	IFS="$lt_save_ifs"
-	if test "X$lt_pkg" = "X$lt_p"; then
-	  pic_mode=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  pic_mode=default
-fi
-
-
-test -z "$pic_mode" && pic_mode=default
-
-
-
-
-
-
-
-  # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then :
-  enableval=$enable_fast_install; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_fast_install=yes
-fi
-
-
-
-
-
-
-
-
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-test -z "$LN_S" && LN_S="ln -s"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
-if ${lt_cv_objdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-$as_echo "$lt_cv_objdir" >&6; }
-objdir=$lt_cv_objdir
-
-
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define LT_OBJDIR "$lt_cv_objdir/"
-_ACEOF
-
-
-
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-$as_echo_n "checking for file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-
-lt_save_CC="$CC"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-objext=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-
-lt_prog_compiler_no_builtin_flag=
-
-if test "$GCC" = yes; then
-  case $cc_basename in
-  nvcc*)
-    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
-  *)
-    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
-  esac
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-
-
-
-
-
-  lt_prog_compiler_wl=
-lt_prog_compiler_pic=
-lt_prog_compiler_static=
-
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl='-Wl,'
-    lt_prog_compiler_static='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            lt_prog_compiler_pic='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      ;;
-
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static=
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-    esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      lt_prog_compiler_wl='-Xlinker '
-      if test -n "$lt_prog_compiler_pic"; then
-        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
-      fi
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-      case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-KPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='--shared'
-	lt_prog_compiler_static='--static'
-	;;
-      nagfor*)
-	# NAG Fortran compiler
-	lt_prog_compiler_wl='-Wl,-Wl,,'
-	lt_prog_compiler_pic='-PIC'
-	lt_prog_compiler_static='-Bstatic'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fpic'
-	lt_prog_compiler_static='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static='-non_shared'
-        ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-qpic'
-	lt_prog_compiler_static='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl=''
-	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Qoption ld '
-	  ;;
-	*Sun\ C*)
-	  # Sun C 5.9
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Wl,'
-	  ;;
-        *Intel*\ [CF]*Compiler*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fPIC'
-	  lt_prog_compiler_static='-static'
-	  ;;
-	*Portland\ Group*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fpic'
-	  lt_prog_compiler_static='-Bstatic'
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    rdos*)
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-	lt_prog_compiler_wl='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl='-Qoption ld '
-      lt_prog_compiler_pic='-PIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic='-Kconform_pic'
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_can_build_shared=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic='-pic'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared=no
-      ;;
-    esac
-  fi
-
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic=
-    ;;
-  *)
-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-    ;;
-esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-$as_echo "$lt_cv_prog_compiler_pic" >&6; }
-lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-    case $lt_prog_compiler_pic in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-     esac
-else
-    lt_prog_compiler_pic=
-     lt_prog_compiler_can_build_shared=no
-fi
-
-fi
-
-
-
-
-
-
-
-
-
-
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-    :
-else
-    lt_prog_compiler_static=
-fi
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
-  runpath_var=
-  allow_undefined_flag=
-  always_export_symbols=no
-  archive_cmds=
-  archive_expsym_cmds=
-  compiler_needs_object=no
-  enable_shared_with_static_runtimes=no
-  export_dynamic_flag_spec=
-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  hardcode_automatic=no
-  hardcode_direct=no
-  hardcode_direct_absolute=no
-  hardcode_libdir_flag_spec=
-  hardcode_libdir_separator=
-  hardcode_minus_L=no
-  hardcode_shlibpath_var=unsupported
-  inherit_rpath=no
-  link_all_deplibs=unknown
-  module_cmds=
-  module_expsym_cmds=
-  old_archive_from_new_cmds=
-  old_archive_from_expsyms_cmds=
-  thread_safe_flag_spec=
-  whole_archive_flag_spec=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
-  if test "$with_gnu_ld" = yes; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
-	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test "$lt_use_gnu_ld_interface" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      whole_archive_flag_spec=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[3-9]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      export_dynamic_flag_spec='${wl}--export-all-symbols'
-      allow_undefined_flag=unsupported
-      always_export_symbols=no
-      enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    haiku*)
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      link_all_deplibs=yes
-      ;;
-
-    interix[3-9]*)
-      hardcode_direct=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
-      then
-	tmp_addflag=' $pic_flag'
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  whole_archive_flag_spec=
-	  tmp_sharedflag='--shared' ;;
-	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  compiler_needs_object=yes
-	  ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  compiler_needs_object=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
-          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	xlf* | bgf* | bgxlf* | mpixlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
-	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        ld_shlibs=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    ld_shlibs=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec=
-      export_dynamic_flag_spec=
-      whole_archive_flag_spec=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag=unsupported
-      always_export_symbols=yes
-      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct=unsupported
-      fi
-      ;;
-
-    aix[4-9]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds=''
-      hardcode_direct=yes
-      hardcode_direct_absolute=yes
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      file_list_spec='${wl}-f,'
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  hardcode_direct=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  hardcode_minus_L=yes
-	  hardcode_libdir_flag_spec='-L$libdir'
-	  hardcode_libdir_separator=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      export_dynamic_flag_spec='${wl}-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath_
-fi
-
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath_
-fi
-
-	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag=' ${wl}-bernotok'
-	  allow_undefined_flag=' ${wl}-berok'
-	  if test "$with_gnu_ld" = yes; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    whole_archive_flag_spec='$convenience'
-	  fi
-	  archive_cmds_need_lc=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      case $cc_basename in
-      cl*)
-	# Native MSVC
-	hardcode_libdir_flag_spec=' '
-	allow_undefined_flag=unsupported
-	always_export_symbols=yes
-	file_list_spec='@'
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	  else
-	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	  fi~
-	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	  linknames='
-	# The linker will not automatically build a static lib if we build a DLL.
-	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
-	enable_shared_with_static_runtimes=yes
-	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	old_postinstall_cmds='chmod 644 $oldlib'
-	postlink_cmds='lt_outputfile="@OUTPUT@"~
-	  lt_tool_outputfile="@TOOL_OUTPUT@"~
-	  case $lt_outputfile in
-	    *.exe|*.EXE) ;;
-	    *)
-	      lt_outputfile="$lt_outputfile.exe"
-	      lt_tool_outputfile="$lt_tool_outputfile.exe"
-	      ;;
-	  esac~
-	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	    $RM "$lt_outputfile.manifest";
-	  fi'
-	;;
-      *)
-	# Assume MSVC wrapper
-	hardcode_libdir_flag_spec=' '
-	allow_undefined_flag=unsupported
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-	# The linker will automatically build a .lib file if we build a DLL.
-	old_archive_from_new_cmds='true'
-	# FIXME: Should let the user specify the lib program.
-	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	enable_shared_with_static_runtimes=yes
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-
-
-  archive_cmds_need_lc=no
-  hardcode_direct=no
-  hardcode_automatic=yes
-  hardcode_shlibpath_var=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-
-  else
-    whole_archive_flag_spec=''
-  fi
-  link_all_deplibs=yes
-  allow_undefined_flag="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=func_echo_all
-    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-
-  else
-  ld_shlibs=no
-  fi
-
-      ;;
-
-    dgux*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-
-	  # Older versions of the 11.00 compiler do not understand -b yet
-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
-$as_echo_n "checking if $CC understands -b... " >&6; }
-if ${lt_cv_prog_compiler__b+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler__b=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS -b"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler__b=yes
-       fi
-     else
-       lt_cv_prog_compiler__b=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-$as_echo "$lt_cv_prog_compiler__b" >&6; }
-
-if test x"$lt_cv_prog_compiler__b" = xyes; then
-    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-else
-    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-fi
-
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-	  ;;
-	*)
-	  hardcode_direct=yes
-	  hardcode_direct_absolute=yes
-	  export_dynamic_flag_spec='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-	# This should be the same for all languages, so no per-tag cache variable.
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
-$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
-if ${lt_cv_irix_exported_symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  save_LDFLAGS="$LDFLAGS"
-	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int foo (void) { return 0; }
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_irix_exported_symbol=yes
-else
-  lt_cv_irix_exported_symbol=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-           LDFLAGS="$save_LDFLAGS"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-$as_echo "$lt_cv_irix_exported_symbol" >&6; }
-	if test "$lt_cv_irix_exported_symbol" = yes; then
-          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-	fi
-      else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      inherit_rpath=yes
-      link_all_deplibs=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    newsos6)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_shlibpath_var=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	hardcode_direct=yes
-	hardcode_shlibpath_var=no
-	hardcode_direct_absolute=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	  export_dynamic_flag_spec='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     hardcode_libdir_flag_spec='-R$libdir'
-	     ;;
-	   *)
-	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-	fi
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_separator=:
-      ;;
-
-    solaris*)
-      no_undefined_flag=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='${wl}'
-	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_shlibpath_var=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      link_all_deplibs=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds='$CC -r -o $output$reload_objs'
-	  hardcode_direct=no
-        ;;
-	motorola)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag='${wl}-z,text'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag='${wl}-z,text'
-      allow_undefined_flag='${wl}-z,nodefs'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-R,$libdir'
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      export_dynamic_flag_spec='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      ld_shlibs=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec='${wl}-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-$as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
-
-with_gnu_ld=$with_gnu_ld
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  $RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$lt_prog_compiler_wl
-	  pic_flag=$lt_prog_compiler_pic
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$allow_undefined_flag
-	  allow_undefined_flag=
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	  then
-	    lt_cv_archive_cmds_need_lc=no
-	  else
-	    lt_cv_archive_cmds_need_lc=yes
-	  fi
-	  allow_undefined_flag=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
-      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
-    *) lt_sed_strip_eq="s,=/,/,g" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[lt_foo]++; }
-  if (lt_freq[lt_foo] == 1) { print lt_foo; }
-}'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[4-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec="$LIB"
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
-    ;;
-
-  *)
-    # Assume MSVC wrapper
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    dynamic_linker='Win32 ld.exe'
-    ;;
-  esac
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[23].*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix[3-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  lt_cv_shlibpath_overrides_runpath=yes
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-
-fi
-
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" ||
-   test -n "$runpath_var" ||
-   test "X$hardcode_automatic" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$hardcode_direct" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
-     test "$hardcode_minus_L" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-$as_echo "$hardcode_action" >&6; }
-
-if test "$hardcode_action" = relink ||
-   test "$inherit_rpath" = yes; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-
-
-
-
-  if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-    ;;
-
-  *)
-    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = xyes; then :
-  lt_cv_dlopen="shl_load"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_shl_load=yes
-else
-  ac_cv_lib_dld_shl_load=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-else
-  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if ${ac_cv_lib_svld_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_svld_dlopen=yes
-else
-  ac_cv_lib_svld_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if ${ac_cv_lib_dld_dld_link+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link ();
-int
-main ()
-{
-return dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_dld_link=yes
-else
-  ac_cv_lib_dld_dld_link=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-     if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self_static+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-     if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-striplib=
-old_striplib=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP" ; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-    ;;
-  *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-  # Report which library types will actually be built
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
-  test "$can_build_shared" = "no" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test "$enable_shared" = yes && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[4-9]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
-
-
-
-
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-
-
-
-
-      ac_ext=${ac_fc_srcext-f}
-ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-
-
-if test -z "$FC" || test "X$FC" = "Xno"; then
-  _lt_disable_FC=yes
-fi
-
-archive_cmds_need_lc_FC=no
-allow_undefined_flag_FC=
-always_export_symbols_FC=no
-archive_expsym_cmds_FC=
-export_dynamic_flag_spec_FC=
-hardcode_direct_FC=no
-hardcode_direct_absolute_FC=no
-hardcode_libdir_flag_spec_FC=
-hardcode_libdir_separator_FC=
-hardcode_minus_L_FC=no
-hardcode_automatic_FC=no
-inherit_rpath_FC=no
-module_cmds_FC=
-module_expsym_cmds_FC=
-link_all_deplibs_FC=unknown
-old_archive_cmds_FC=$old_archive_cmds
-reload_flag_FC=$reload_flag
-reload_cmds_FC=$reload_cmds
-no_undefined_flag_FC=
-whole_archive_flag_spec_FC=
-enable_shared_with_static_runtimes_FC=no
-
-# Source file extension for fc test sources.
-ac_ext=${ac_fc_srcext-f}
-
-# Object file extension for compiled fc test sources.
-objext=o
-objext_FC=$objext
-
-# No sense in running all these tests if we already determined that
-# the FC compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-  # save warnings/boilerplate of simple test code
-  ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-
-  ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
-  CC=${FC-"f95"}
-  CFLAGS=$FCFLAGS
-  compiler=$CC
-  GCC=$ac_cv_fc_compiler_gnu
-
-  compiler_FC=$CC
-  for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-
-
-  if test -n "$compiler"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[4-9]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
-
-    GCC_FC="$ac_cv_fc_compiler_gnu"
-    LD_FC="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    # Dependencies to place before and after the object being linked:
-predep_objects_FC=
-postdep_objects_FC=
-predeps_FC=
-postdeps_FC=
-compiler_lib_search_path_FC=
-
-cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer a
-      a=0
-      return
-      end
-_LT_EOF
-
-
-_lt_libdeps_save_CFLAGS=$CFLAGS
-case "$CC $CFLAGS " in #(
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
-esac
-
-if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  for p in `eval "$output_verbose_link_cmd"`; do
-    case ${prev}${p} in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" ||
-          test $p = "-R"; then
-	 prev=$p
-	 continue
-       fi
-
-       # Expand the sysroot to ease extracting the directories later.
-       if test -z "$prev"; then
-         case $p in
-         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
-         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
-         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
-         esac
-       fi
-       case $p in
-       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
-       esac
-       if test "$pre_test_object_deps_done" = no; then
-	 case ${prev} in
-	 -L | -R)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$compiler_lib_search_path_FC"; then
-	     compiler_lib_search_path_FC="${prev}${p}"
-	   else
-	     compiler_lib_search_path_FC="${compiler_lib_search_path_FC} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$postdeps_FC"; then
-	   postdeps_FC="${prev}${p}"
-	 else
-	   postdeps_FC="${postdeps_FC} ${prev}${p}"
-	 fi
-       fi
-       prev=
-       ;;
-
-    *.lto.$objext) ;; # Ignore GCC LTO objects
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$predep_objects_FC"; then
-	   predep_objects_FC="$p"
-	 else
-	   predep_objects_FC="$predep_objects_FC $p"
-	 fi
-       else
-	 if test -z "$postdep_objects_FC"; then
-	   postdep_objects_FC="$p"
-	 else
-	   postdep_objects_FC="$postdep_objects_FC $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling FC test program"
-fi
-
-$RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
-
-# PORTME: override above test on systems where it is broken
-
-
-case " $postdeps_FC " in
-*" -lc "*) archive_cmds_need_lc_FC=no ;;
-esac
- compiler_lib_search_dirs_FC=
-if test -n "${compiler_lib_search_path_FC}"; then
- compiler_lib_search_dirs_FC=`echo " ${compiler_lib_search_path_FC}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    lt_prog_compiler_wl_FC=
-lt_prog_compiler_pic_FC=
-lt_prog_compiler_static_FC=
-
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl_FC='-Wl,'
-    lt_prog_compiler_static_FC='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_FC='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            lt_prog_compiler_pic_FC='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            lt_prog_compiler_pic_FC='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic_FC='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_FC='-fno-common'
-      ;;
-
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static_FC=
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_FC='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared_FC=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic_FC='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_FC=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      lt_prog_compiler_pic_FC='-fPIC'
-      ;;
-    esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      lt_prog_compiler_wl_FC='-Xlinker '
-      if test -n "$lt_prog_compiler_pic_FC"; then
-        lt_prog_compiler_pic_FC="-Xcompiler $lt_prog_compiler_pic_FC"
-      fi
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl_FC='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_FC='-Bstatic'
-      else
-	lt_prog_compiler_static_FC='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_FC='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl_FC='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_FC='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static_FC='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl_FC='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static_FC='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-      case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
-	lt_prog_compiler_wl_FC='-Wl,'
-	lt_prog_compiler_pic_FC='-KPIC'
-	lt_prog_compiler_static_FC='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	lt_prog_compiler_wl_FC='-Wl,'
-	lt_prog_compiler_pic_FC='-fPIC'
-	lt_prog_compiler_static_FC='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	lt_prog_compiler_wl_FC='-Wl,'
-	lt_prog_compiler_pic_FC='--shared'
-	lt_prog_compiler_static_FC='--static'
-	;;
-      nagfor*)
-	# NAG Fortran compiler
-	lt_prog_compiler_wl_FC='-Wl,-Wl,,'
-	lt_prog_compiler_pic_FC='-PIC'
-	lt_prog_compiler_static_FC='-Bstatic'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl_FC='-Wl,'
-	lt_prog_compiler_pic_FC='-fpic'
-	lt_prog_compiler_static_FC='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl_FC='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static_FC='-non_shared'
-        ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-	lt_prog_compiler_wl_FC='-Wl,'
-	lt_prog_compiler_pic_FC='-qpic'
-	lt_prog_compiler_static_FC='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic_FC='-KPIC'
-	  lt_prog_compiler_static_FC='-Bstatic'
-	  lt_prog_compiler_wl_FC=''
-	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  lt_prog_compiler_pic_FC='-KPIC'
-	  lt_prog_compiler_static_FC='-Bstatic'
-	  lt_prog_compiler_wl_FC='-Qoption ld '
-	  ;;
-	*Sun\ C*)
-	  # Sun C 5.9
-	  lt_prog_compiler_pic_FC='-KPIC'
-	  lt_prog_compiler_static_FC='-Bstatic'
-	  lt_prog_compiler_wl_FC='-Wl,'
-	  ;;
-        *Intel*\ [CF]*Compiler*)
-	  lt_prog_compiler_wl_FC='-Wl,'
-	  lt_prog_compiler_pic_FC='-fPIC'
-	  lt_prog_compiler_static_FC='-static'
-	  ;;
-	*Portland\ Group*)
-	  lt_prog_compiler_wl_FC='-Wl,'
-	  lt_prog_compiler_pic_FC='-fpic'
-	  lt_prog_compiler_static_FC='-Bstatic'
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic_FC='-KPIC'
-      lt_prog_compiler_static_FC='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic_FC='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl_FC='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static_FC='-non_shared'
-      ;;
-
-    rdos*)
-      lt_prog_compiler_static_FC='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic_FC='-KPIC'
-      lt_prog_compiler_static_FC='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-	lt_prog_compiler_wl_FC='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl_FC='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl_FC='-Qoption ld '
-      lt_prog_compiler_pic_FC='-PIC'
-      lt_prog_compiler_static_FC='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl_FC='-Wl,'
-      lt_prog_compiler_pic_FC='-KPIC'
-      lt_prog_compiler_static_FC='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic_FC='-Kconform_pic'
-	lt_prog_compiler_static_FC='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl_FC='-Wl,'
-      lt_prog_compiler_pic_FC='-KPIC'
-      lt_prog_compiler_static_FC='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl_FC='-Wl,'
-      lt_prog_compiler_can_build_shared_FC=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic_FC='-pic'
-      lt_prog_compiler_static_FC='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared_FC=no
-      ;;
-    esac
-  fi
-
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_FC=
-    ;;
-  *)
-    lt_prog_compiler_pic_FC="$lt_prog_compiler_pic_FC"
-    ;;
-esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_FC=$lt_prog_compiler_pic_FC
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_FC" >&5
-$as_echo "$lt_cv_prog_compiler_pic_FC" >&6; }
-lt_prog_compiler_pic_FC=$lt_cv_prog_compiler_pic_FC
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_FC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_FC works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_FC works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works_FC=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_FC"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works_FC=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_FC" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works_FC" >&6; }
-
-if test x"$lt_cv_prog_compiler_pic_works_FC" = xyes; then
-    case $lt_prog_compiler_pic_FC in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_FC=" $lt_prog_compiler_pic_FC" ;;
-     esac
-else
-    lt_prog_compiler_pic_FC=
-     lt_prog_compiler_can_build_shared_FC=no
-fi
-
-fi
-
-
-
-
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl_FC eval lt_tmp_static_flag=\"$lt_prog_compiler_static_FC\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works_FC=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works_FC=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works_FC=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_FC" >&5
-$as_echo "$lt_cv_prog_compiler_static_works_FC" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works_FC" = xyes; then
-    :
-else
-    lt_prog_compiler_static_FC=
-fi
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o_FC=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o_FC=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_FC" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_FC" >&6; }
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o_FC=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o_FC=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_FC" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_FC" >&6; }
-
-
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_FC" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
-  runpath_var=
-  allow_undefined_flag_FC=
-  always_export_symbols_FC=no
-  archive_cmds_FC=
-  archive_expsym_cmds_FC=
-  compiler_needs_object_FC=no
-  enable_shared_with_static_runtimes_FC=no
-  export_dynamic_flag_spec_FC=
-  export_symbols_cmds_FC='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  hardcode_automatic_FC=no
-  hardcode_direct_FC=no
-  hardcode_direct_absolute_FC=no
-  hardcode_libdir_flag_spec_FC=
-  hardcode_libdir_separator_FC=
-  hardcode_minus_L_FC=no
-  hardcode_shlibpath_var_FC=unsupported
-  inherit_rpath_FC=no
-  link_all_deplibs_FC=unknown
-  module_cmds_FC=
-  module_expsym_cmds_FC=
-  old_archive_from_new_cmds_FC=
-  old_archive_from_expsyms_cmds_FC=
-  thread_safe_flag_spec_FC=
-  whole_archive_flag_spec_FC=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms_FC=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms_FC='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs_FC=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
-  if test "$with_gnu_ld" = yes; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
-	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test "$lt_use_gnu_ld_interface" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
-    export_dynamic_flag_spec_FC='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec_FC="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      whole_archive_flag_spec_FC=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[3-9]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs_FC=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds_FC=''
-        ;;
-      m68k)
-            archive_cmds_FC='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec_FC='-L$libdir'
-            hardcode_minus_L_FC=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag_FC=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds_FC='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs_FC=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, FC) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec_FC='-L$libdir'
-      export_dynamic_flag_spec_FC='${wl}--export-all-symbols'
-      allow_undefined_flag_FC=unsupported
-      always_export_symbols_FC=no
-      enable_shared_with_static_runtimes_FC=yes
-      export_symbols_cmds_FC='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-      exclude_expsyms_FC='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds_FC='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	ld_shlibs_FC=no
-      fi
-      ;;
-
-    haiku*)
-      archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      link_all_deplibs_FC=yes
-      ;;
-
-    interix[3-9]*)
-      hardcode_direct_FC=no
-      hardcode_shlibpath_var_FC=no
-      hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec_FC='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds_FC='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
-      then
-	tmp_addflag=' $pic_flag'
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec_FC='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec_FC='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  whole_archive_flag_spec_FC=
-	  tmp_sharedflag='--shared' ;;
-	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  whole_archive_flag_spec_FC='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  compiler_needs_object_FC=yes
-	  ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec_FC='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  compiler_needs_object_FC=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	archive_cmds_FC='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
-          archive_expsym_cmds_FC='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	xlf* | bgf* | bgxlf* | mpixlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  whole_archive_flag_spec_FC='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
-	  archive_cmds_FC='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
-	    archive_expsym_cmds_FC='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        ld_shlibs_FC=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds_FC='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	ld_shlibs_FC=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_FC=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs_FC=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
-	    archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    ld_shlibs_FC=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds_FC='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct_FC=yes
-      hardcode_shlibpath_var_FC=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_FC=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs_FC" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec_FC=
-      export_dynamic_flag_spec_FC=
-      whole_archive_flag_spec_FC=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag_FC=unsupported
-      always_export_symbols_FC=yes
-      archive_expsym_cmds_FC='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L_FC=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct_FC=unsupported
-      fi
-      ;;
-
-    aix[4-9]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds_FC='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds_FC='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds_FC=''
-      hardcode_direct_FC=yes
-      hardcode_direct_absolute_FC=yes
-      hardcode_libdir_separator_FC=':'
-      link_all_deplibs_FC=yes
-      file_list_spec_FC='${wl}-f,'
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  hardcode_direct_FC=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  hardcode_minus_L_FC=yes
-	  hardcode_libdir_flag_spec_FC='-L$libdir'
-	  hardcode_libdir_separator_FC=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      export_dynamic_flag_spec_FC='${wl}-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols_FC=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag_FC='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath__FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat > conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-if ac_fn_fc_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath__FC=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath__FC"; then
-    lt_cv_aix_libpath__FC=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath__FC"; then
-    lt_cv_aix_libpath__FC="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath__FC
-fi
-
-        hardcode_libdir_flag_spec_FC='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds_FC='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec_FC='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag_FC="-z nodefs"
-	  archive_expsym_cmds_FC="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath__FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat > conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-if ac_fn_fc_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath__FC=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath__FC"; then
-    lt_cv_aix_libpath__FC=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath__FC"; then
-    lt_cv_aix_libpath__FC="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath__FC
-fi
-
-	 hardcode_libdir_flag_spec_FC='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag_FC=' ${wl}-bernotok'
-	  allow_undefined_flag_FC=' ${wl}-berok'
-	  if test "$with_gnu_ld" = yes; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    whole_archive_flag_spec_FC='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    whole_archive_flag_spec_FC='$convenience'
-	  fi
-	  archive_cmds_need_lc_FC=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds_FC="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds_FC=''
-        ;;
-      m68k)
-            archive_cmds_FC='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec_FC='-L$libdir'
-            hardcode_minus_L_FC=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec_FC=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      case $cc_basename in
-      cl*)
-	# Native MSVC
-	hardcode_libdir_flag_spec_FC=' '
-	allow_undefined_flag_FC=unsupported
-	always_export_symbols_FC=yes
-	file_list_spec_FC='@'
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds_FC='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	archive_expsym_cmds_FC='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	  else
-	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	  fi~
-	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	  linknames='
-	# The linker will not automatically build a static lib if we build a DLL.
-	# _LT_TAGVAR(old_archive_from_new_cmds, FC)='true'
-	enable_shared_with_static_runtimes_FC=yes
-	exclude_expsyms_FC='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-	export_symbols_cmds_FC='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	old_postinstall_cmds_FC='chmod 644 $oldlib'
-	postlink_cmds_FC='lt_outputfile="@OUTPUT@"~
-	  lt_tool_outputfile="@TOOL_OUTPUT@"~
-	  case $lt_outputfile in
-	    *.exe|*.EXE) ;;
-	    *)
-	      lt_outputfile="$lt_outputfile.exe"
-	      lt_tool_outputfile="$lt_tool_outputfile.exe"
-	      ;;
-	  esac~
-	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	    $RM "$lt_outputfile.manifest";
-	  fi'
-	;;
-      *)
-	# Assume MSVC wrapper
-	hardcode_libdir_flag_spec_FC=' '
-	allow_undefined_flag_FC=unsupported
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds_FC='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-	# The linker will automatically build a .lib file if we build a DLL.
-	old_archive_from_new_cmds_FC='true'
-	# FIXME: Should let the user specify the lib program.
-	old_archive_cmds_FC='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	enable_shared_with_static_runtimes_FC=yes
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-
-
-  archive_cmds_need_lc_FC=no
-  hardcode_direct_FC=no
-  hardcode_automatic_FC=yes
-  hardcode_shlibpath_var_FC=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    whole_archive_flag_spec_FC='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-    compiler_needs_object_FC=yes
-  else
-    whole_archive_flag_spec_FC=''
-  fi
-  link_all_deplibs_FC=yes
-  allow_undefined_flag_FC="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=func_echo_all
-    archive_cmds_FC="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    module_cmds_FC="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    archive_expsym_cmds_FC="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    module_expsym_cmds_FC="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-
-  else
-  ld_shlibs_FC=no
-  fi
-
-      ;;
-
-    dgux*)
-      archive_cmds_FC='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_FC='-L$libdir'
-      hardcode_shlibpath_var_FC=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec_FC='-R$libdir'
-      hardcode_direct_FC=yes
-      hardcode_shlibpath_var_FC=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
-      archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_FC=yes
-      hardcode_minus_L_FC=yes
-      hardcode_shlibpath_var_FC=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec_FC='-R$libdir'
-      hardcode_direct_FC=yes
-      hardcode_shlibpath_var_FC=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds_FC='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds_FC='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec_FC='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_FC=:
-      hardcode_direct_FC=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L_FC=yes
-      export_dynamic_flag_spec_FC='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds_FC='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_FC='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_FC='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_FC=:
-	hardcode_direct_FC=yes
-	hardcode_direct_absolute_FC=yes
-	export_dynamic_flag_spec_FC='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L_FC=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds_FC='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_FC='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_FC='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds_FC='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_FC='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	archive_cmds_FC='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_FC='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_FC=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_direct_FC=no
-	  hardcode_shlibpath_var_FC=no
-	  ;;
-	*)
-	  hardcode_direct_FC=yes
-	  hardcode_direct_absolute_FC=yes
-	  export_dynamic_flag_spec_FC='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_FC=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-	# This should be the same for all languages, so no per-tag cache variable.
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
-$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
-if ${lt_cv_irix_exported_symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  save_LDFLAGS="$LDFLAGS"
-	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-	   cat > conftest.$ac_ext <<_ACEOF
-
-      subroutine foo
-      end
-_ACEOF
-if ac_fn_fc_try_link "$LINENO"; then :
-  lt_cv_irix_exported_symbol=yes
-else
-  lt_cv_irix_exported_symbol=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-           LDFLAGS="$save_LDFLAGS"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-$as_echo "$lt_cv_irix_exported_symbol" >&6; }
-	if test "$lt_cv_irix_exported_symbol" = yes; then
-          archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-	fi
-      else
-	archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      archive_cmds_need_lc_FC='no'
-      hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_FC=:
-      inherit_rpath_FC=yes
-      link_all_deplibs_FC=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds_FC='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec_FC='-R$libdir'
-      hardcode_direct_FC=yes
-      hardcode_shlibpath_var_FC=no
-      ;;
-
-    newsos6)
-      archive_cmds_FC='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_FC=yes
-      hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_FC=:
-      hardcode_shlibpath_var_FC=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	hardcode_direct_FC=yes
-	hardcode_shlibpath_var_FC=no
-	hardcode_direct_absolute_FC=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
-	  export_dynamic_flag_spec_FC='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	     archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     hardcode_libdir_flag_spec_FC='-R$libdir'
-	     ;;
-	   *)
-	     archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-	fi
-      else
-	ld_shlibs_FC=no
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec_FC='-L$libdir'
-      hardcode_minus_L_FC=yes
-      allow_undefined_flag_FC=unsupported
-      archive_cmds_FC='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_from_new_cmds_FC='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag_FC=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_FC='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag_FC=' -expect_unresolved \*'
-	archive_cmds_FC='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      archive_cmds_need_lc_FC='no'
-      hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_FC=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag_FC=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_FC='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag_FC=' -expect_unresolved \*'
-	archive_cmds_FC='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds_FC='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec_FC='-rpath $libdir'
-      fi
-      archive_cmds_need_lc_FC='no'
-      hardcode_libdir_separator_FC=:
-      ;;
-
-    solaris*)
-      no_undefined_flag_FC=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds_FC='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_FC='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  archive_cmds_FC='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  archive_expsym_cmds_FC='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='${wl}'
-	  archive_cmds_FC='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds_FC='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      hardcode_libdir_flag_spec_FC='-R$libdir'
-      hardcode_shlibpath_var_FC=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  whole_archive_flag_spec_FC='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  whole_archive_flag_spec_FC='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      link_all_deplibs_FC=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds_FC='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_FC='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec_FC='-L$libdir'
-      hardcode_direct_FC=yes
-      hardcode_minus_L_FC=yes
-      hardcode_shlibpath_var_FC=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds_FC='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_FC=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds_FC='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds_FC='$CC -r -o $output$reload_objs'
-	  hardcode_direct_FC=no
-        ;;
-	motorola)
-	  archive_cmds_FC='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_FC=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_FC=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds_FC='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_FC=no
-      export_dynamic_flag_spec_FC='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds_FC='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var_FC=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs_FC=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag_FC='${wl}-z,text'
-      archive_cmds_need_lc_FC=no
-      hardcode_shlibpath_var_FC=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds_FC='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_FC='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_FC='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_FC='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag_FC='${wl}-z,text'
-      allow_undefined_flag_FC='${wl}-z,nodefs'
-      archive_cmds_need_lc_FC=no
-      hardcode_shlibpath_var_FC=no
-      hardcode_libdir_flag_spec_FC='${wl}-R,$libdir'
-      hardcode_libdir_separator_FC=':'
-      link_all_deplibs_FC=yes
-      export_dynamic_flag_spec_FC='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds_FC='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_FC='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_FC='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_FC='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds_FC='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_FC='-L$libdir'
-      hardcode_shlibpath_var_FC=no
-      ;;
-
-    *)
-      ld_shlibs_FC=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec_FC='${wl}-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_FC" >&5
-$as_echo "$ld_shlibs_FC" >&6; }
-test "$ld_shlibs_FC" = no && can_build_shared=no
-
-with_gnu_ld_FC=$with_gnu_ld
-
-
-
-
-
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_FC" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_FC=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_FC in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc_FC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  $RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$lt_prog_compiler_wl_FC
-	  pic_flag=$lt_prog_compiler_pic_FC
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$allow_undefined_flag_FC
-	  allow_undefined_flag_FC=
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_FC 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds_FC 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	  then
-	    lt_cv_archive_cmds_need_lc_FC=no
-	  else
-	    lt_cv_archive_cmds_need_lc_FC=yes
-	  fi
-	  allow_undefined_flag_FC=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_FC" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc_FC" >&6; }
-      archive_cmds_need_lc_FC=$lt_cv_archive_cmds_need_lc_FC
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[4-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec="$LIB"
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
-    ;;
-
-  *)
-    # Assume MSVC wrapper
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    dynamic_linker='Win32 ld.exe'
-    ;;
-  esac
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[23].*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix[3-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_FC\"; \
-	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_FC\""
-    cat > conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-if ac_fn_fc_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  lt_cv_shlibpath_overrides_runpath=yes
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-
-fi
-
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action_FC=
-if test -n "$hardcode_libdir_flag_spec_FC" ||
-   test -n "$runpath_var_FC" ||
-   test "X$hardcode_automatic_FC" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$hardcode_direct_FC" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, FC)" != no &&
-     test "$hardcode_minus_L_FC" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_FC=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_FC=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_FC=unsupported
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_FC" >&5
-$as_echo "$hardcode_action_FC" >&6; }
-
-if test "$hardcode_action_FC" = relink ||
-   test "$inherit_rpath_FC" = yes; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-
-
-
-
-
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-fi # test "$_lt_disable_FC" != yes
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-        ac_config_commands="$ac_config_commands libtool"
-
-
-
-
-# Only expand once:
-
-
-
-ac_config_files="$ac_config_files Makefile lib/Makefile lib/xmlFailures/Makefile lib/xmlSuccesses/Makefile prog/Makefile"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-	  mv -f confcache "$cache_file"$$ &&
-	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-	  mv -f confcache "$cache_file" ;;
-	esac
-      fi
-    fi
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-U=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
- if test -n "$EXEEXT"; then
-  am__EXEEXT_TRUE=
-  am__EXEEXT_FALSE='#'
-else
-  am__EXEEXT_TRUE='#'
-  am__EXEEXT_FALSE=
-fi
-
-if test -z "${DEBUG_TRUE}" && test -z "${DEBUG_FALSE}"; then
-  as_fn_error $? "conditional \"DEBUG\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_UDUNITS_1_TRUE}" && test -z "${ENABLE_UDUNITS_1_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_UDUNITS_1\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_UDUNITS_1_TRUE}" && test -z "${ENABLE_UDUNITS_1_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_UDUNITS_1\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error $? "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_CUNIT_TRUE}" && test -z "${HAVE_CUNIT_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_CUNIT\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-
-: "${CONFIG_STATUS=./config.status}"
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by UDUNITS $as_me 2.2.17, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 [OPTION]... [TAG]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <support-udunits@unidata.ucar.edu>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
-ac_cs_version="\\
-UDUNITS config.status 2.2.17
-configured by $0, generated by GNU Autoconf 2.68,
-  with options \\"\$ac_cs_config\\"
-
-Copyright (C) 2010 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=?*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
-    esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
-  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
-  *) as_fn_append ac_config_targets " $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
-PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
-file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
-want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
-sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
-archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
-nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
-lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
-MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
-postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
-predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
-postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
-predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
-postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
-LD_FC='`$ECHO "$LD_FC" | $SED "$delay_single_quote_subst"`'
-reload_flag_FC='`$ECHO "$reload_flag_FC" | $SED "$delay_single_quote_subst"`'
-reload_cmds_FC='`$ECHO "$reload_cmds_FC" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds_FC='`$ECHO "$old_archive_cmds_FC" | $SED "$delay_single_quote_subst"`'
-compiler_FC='`$ECHO "$compiler_FC" | $SED "$delay_single_quote_subst"`'
-GCC_FC='`$ECHO "$GCC_FC" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag_FC='`$ECHO "$lt_prog_compiler_no_builtin_flag_FC" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic_FC='`$ECHO "$lt_prog_compiler_pic_FC" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl_FC='`$ECHO "$lt_prog_compiler_wl_FC" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static_FC='`$ECHO "$lt_prog_compiler_static_FC" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o_FC='`$ECHO "$lt_cv_prog_compiler_c_o_FC" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc_FC='`$ECHO "$archive_cmds_need_lc_FC" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes_FC='`$ECHO "$enable_shared_with_static_runtimes_FC" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec_FC='`$ECHO "$export_dynamic_flag_spec_FC" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec_FC='`$ECHO "$whole_archive_flag_spec_FC" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object_FC='`$ECHO "$compiler_needs_object_FC" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds_FC='`$ECHO "$old_archive_from_new_cmds_FC" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds_FC='`$ECHO "$old_archive_from_expsyms_cmds_FC" | $SED "$delay_single_quote_subst"`'
-archive_cmds_FC='`$ECHO "$archive_cmds_FC" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds_FC='`$ECHO "$archive_expsym_cmds_FC" | $SED "$delay_single_quote_subst"`'
-module_cmds_FC='`$ECHO "$module_cmds_FC" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds_FC='`$ECHO "$module_expsym_cmds_FC" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld_FC='`$ECHO "$with_gnu_ld_FC" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag_FC='`$ECHO "$allow_undefined_flag_FC" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag_FC='`$ECHO "$no_undefined_flag_FC" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_FC='`$ECHO "$hardcode_libdir_flag_spec_FC" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator_FC='`$ECHO "$hardcode_libdir_separator_FC" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_FC='`$ECHO "$hardcode_direct_FC" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute_FC='`$ECHO "$hardcode_direct_absolute_FC" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L_FC='`$ECHO "$hardcode_minus_L_FC" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var_FC='`$ECHO "$hardcode_shlibpath_var_FC" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic_FC='`$ECHO "$hardcode_automatic_FC" | $SED "$delay_single_quote_subst"`'
-inherit_rpath_FC='`$ECHO "$inherit_rpath_FC" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs_FC='`$ECHO "$link_all_deplibs_FC" | $SED "$delay_single_quote_subst"`'
-always_export_symbols_FC='`$ECHO "$always_export_symbols_FC" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds_FC='`$ECHO "$export_symbols_cmds_FC" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms_FC='`$ECHO "$exclude_expsyms_FC" | $SED "$delay_single_quote_subst"`'
-include_expsyms_FC='`$ECHO "$include_expsyms_FC" | $SED "$delay_single_quote_subst"`'
-prelink_cmds_FC='`$ECHO "$prelink_cmds_FC" | $SED "$delay_single_quote_subst"`'
-postlink_cmds_FC='`$ECHO "$postlink_cmds_FC" | $SED "$delay_single_quote_subst"`'
-file_list_spec_FC='`$ECHO "$file_list_spec_FC" | $SED "$delay_single_quote_subst"`'
-hardcode_action_FC='`$ECHO "$hardcode_action_FC" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_dirs_FC='`$ECHO "$compiler_lib_search_dirs_FC" | $SED "$delay_single_quote_subst"`'
-predep_objects_FC='`$ECHO "$predep_objects_FC" | $SED "$delay_single_quote_subst"`'
-postdep_objects_FC='`$ECHO "$postdep_objects_FC" | $SED "$delay_single_quote_subst"`'
-predeps_FC='`$ECHO "$predeps_FC" | $SED "$delay_single_quote_subst"`'
-postdeps_FC='`$ECHO "$postdeps_FC" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_path_FC='`$ECHO "$compiler_lib_search_path_FC" | $SED "$delay_single_quote_subst"`'
-
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in SHELL \
-ECHO \
-PATH_SEPARATOR \
-SED \
-GREP \
-EGREP \
-FGREP \
-LD \
-NM \
-LN_S \
-lt_SP2NL \
-lt_NL2SP \
-reload_flag \
-OBJDUMP \
-deplibs_check_method \
-file_magic_cmd \
-file_magic_glob \
-want_nocaseglob \
-DLLTOOL \
-sharedlib_from_linklib_cmd \
-AR \
-AR_FLAGS \
-archiver_list_spec \
-STRIP \
-RANLIB \
-CC \
-CFLAGS \
-compiler \
-lt_cv_sys_global_symbol_pipe \
-lt_cv_sys_global_symbol_to_cdecl \
-lt_cv_sys_global_symbol_to_c_name_address \
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-nm_file_list_spec \
-lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_pic \
-lt_prog_compiler_wl \
-lt_prog_compiler_static \
-lt_cv_prog_compiler_c_o \
-need_locks \
-MANIFEST_TOOL \
-DSYMUTIL \
-NMEDIT \
-LIPO \
-OTOOL \
-OTOOL64 \
-shrext_cmds \
-export_dynamic_flag_spec \
-whole_archive_flag_spec \
-compiler_needs_object \
-with_gnu_ld \
-allow_undefined_flag \
-no_undefined_flag \
-hardcode_libdir_flag_spec \
-hardcode_libdir_separator \
-exclude_expsyms \
-include_expsyms \
-file_list_spec \
-variables_saved_for_relink \
-libname_spec \
-library_names_spec \
-soname_spec \
-install_override_mode \
-finish_eval \
-old_striplib \
-striplib \
-compiler_lib_search_dirs \
-predep_objects \
-postdep_objects \
-predeps \
-postdeps \
-compiler_lib_search_path \
-LD_FC \
-reload_flag_FC \
-compiler_FC \
-lt_prog_compiler_no_builtin_flag_FC \
-lt_prog_compiler_pic_FC \
-lt_prog_compiler_wl_FC \
-lt_prog_compiler_static_FC \
-lt_cv_prog_compiler_c_o_FC \
-export_dynamic_flag_spec_FC \
-whole_archive_flag_spec_FC \
-compiler_needs_object_FC \
-with_gnu_ld_FC \
-allow_undefined_flag_FC \
-no_undefined_flag_FC \
-hardcode_libdir_flag_spec_FC \
-hardcode_libdir_separator_FC \
-exclude_expsyms_FC \
-include_expsyms_FC \
-file_list_spec_FC \
-compiler_lib_search_dirs_FC \
-predep_objects_FC \
-postdep_objects_FC \
-predeps_FC \
-postdeps_FC \
-compiler_lib_search_path_FC; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in reload_cmds \
-old_postinstall_cmds \
-old_postuninstall_cmds \
-old_archive_cmds \
-extract_expsyms_cmds \
-old_archive_from_new_cmds \
-old_archive_from_expsyms_cmds \
-archive_cmds \
-archive_expsym_cmds \
-module_cmds \
-module_expsym_cmds \
-export_symbols_cmds \
-prelink_cmds \
-postlink_cmds \
-postinstall_cmds \
-postuninstall_cmds \
-finish_cmds \
-sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec \
-reload_cmds_FC \
-old_archive_cmds_FC \
-old_archive_from_new_cmds_FC \
-old_archive_from_expsyms_cmds_FC \
-archive_cmds_FC \
-archive_expsym_cmds_FC \
-module_cmds_FC \
-module_expsym_cmds_FC \
-export_symbols_cmds_FC \
-prelink_cmds_FC \
-postlink_cmds_FC; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-ac_aux_dir='$ac_aux_dir'
-xsi_shell='$xsi_shell'
-lt_shell_append='$lt_shell_append'
-
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'
-
-
-
-
-
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
-    "lib/xmlFailures/Makefile") CONFIG_FILES="$CONFIG_FILES lib/xmlFailures/Makefile" ;;
-    "lib/xmlSuccesses/Makefile") CONFIG_FILES="$CONFIG_FILES lib/xmlSuccesses/Makefile" ;;
-    "prog/Makefile") CONFIG_FILES="$CONFIG_FILES prog/Makefile" ;;
-
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp= ac_tmp=
-  trap 'exit_status=$?
-  : "${ac_tmp:=$tmp}"
-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
-' 0
-  trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\)..*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\)..*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
-s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_tt"; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$ac_tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
-      "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
-
-  rm -f "$ac_tmp/stdin"
-  case $ac_file in
-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
-    } >"$ac_tmp/config.h" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$ac_tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error $? "could not create -" "$LINENO" 5
-  fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$_am_arg" : 'X\(//\)[^/]' \| \
-	 X"$_am_arg" : 'X\(//\)$' \| \
-	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
- ;;
-    "libtool":C)
-
-    # See if we are running on zsh, and set the options which allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-# The names of the tagged configurations supported by this script.
-available_tags="FC "
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Which release of libtool.m4 was used?
-macro_version=$macro_version
-macro_revision=$macro_revision
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# What type of objects to build.
-pic_mode=$pic_mode
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that protects backslashes.
-ECHO=$lt_ECHO
-
-# The PATH separator for the build system.
-PATH_SEPARATOR=$lt_PATH_SEPARATOR
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="\$SED -e 1s/^X//"
-
-# A grep program that handles long lines.
-GREP=$lt_GREP
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# A literal string matcher.
-FGREP=$lt_FGREP
-
-# A BSD- or MS-compatible name lister.
-NM=$lt_NM
-
-# Whether we need soft or hard links.
-LN_S=$lt_LN_S
-
-# What is the maximum length of a command?
-max_cmd_len=$max_cmd_len
-
-# Object file suffix (normally "o").
-objext=$ac_objext
-
-# Executable file suffix (normally "").
-exeext=$exeext
-
-# whether the shell understands "unset".
-lt_unset=$lt_unset
-
-# turn spaces into newlines.
-SP2NL=$lt_lt_SP2NL
-
-# turn newlines into spaces.
-NL2SP=$lt_lt_NL2SP
-
-# convert \$build file names to \$host format.
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-
-# convert \$build files to toolchain format.
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-
-# An object symbol dumper.
-OBJDUMP=$lt_OBJDUMP
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method = "file_magic".
-file_magic_cmd=$lt_file_magic_cmd
-
-# How to find potential files when deplibs_check_method = "file_magic".
-file_magic_glob=$lt_file_magic_glob
-
-# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
-want_nocaseglob=$lt_want_nocaseglob
-
-# DLL creation program.
-DLLTOOL=$lt_DLLTOOL
-
-# Command to associate shared and link libraries.
-sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
-
-# The archiver.
-AR=$lt_AR
-
-# Flags to create an archive.
-AR_FLAGS=$lt_AR_FLAGS
-
-# How to feed a file listing to the archiver.
-archiver_list_spec=$lt_archiver_list_spec
-
-# A symbol stripping program.
-STRIP=$lt_STRIP
-
-# Commands used to install an old-style archive.
-RANLIB=$lt_RANLIB
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Whether to use a lock for old archive extraction.
-lock_old_archive_extraction=$lock_old_archive_extraction
-
-# A C compiler.
-LTCC=$lt_CC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_CFLAGS
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration.
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair.
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# Transform the output of nm in a C name address pair when lib prefix is needed.
-global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-
-# Specify filename containing input files for \$NM.
-nm_file_list_spec=$lt_nm_file_list_spec
-
-# The root where to search for dependent libraries,and in which our libraries should be installed.
-lt_sysroot=$lt_sysroot
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# Used to examine libraries when file_magic_cmd begins with "file".
-MAGIC_CMD=$MAGIC_CMD
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Manifest tool.
-MANIFEST_TOOL=$lt_MANIFEST_TOOL
-
-# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-DSYMUTIL=$lt_DSYMUTIL
-
-# Tool to change global to local symbols on Mac OS X.
-NMEDIT=$lt_NMEDIT
-
-# Tool to manipulate fat objects and archives on Mac OS X.
-LIPO=$lt_LIPO
-
-# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-OTOOL=$lt_OTOOL
-
-# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-OTOOL64=$lt_OTOOL64
-
-# Old archive suffix (normally "a").
-libext=$libext
-
-# Shared library suffix (normally ".so").
-shrext_cmds=$lt_shrext_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at link time.
-variables_saved_for_relink=$lt_variables_saved_for_relink
-
-# Do we need the "lib" prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Library versioning type.
-version_type=$version_type
-
-# Shared library runtime path variable.
-runpath_var=$runpath_var
-
-# Shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Permission mode override for installation of shared libraries.
-install_override_mode=$lt_install_override_mode
-
-# Command to use after installation of a shared archive.
-postinstall_cmds=$lt_postinstall_cmds
-
-# Command to use after uninstallation of a shared archive.
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# As "finish_cmds", except a single script fragment to be evaled but
-# not shown.
-finish_eval=$lt_finish_eval
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Compile-time system search path for libraries.
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds
-
-# A language specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
-# library is relocated.
-hardcode_direct_absolute=$hardcode_direct_absolute
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds
-
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
-
-# Dependencies to place before and after the objects being linked to
-# create a shared library.
-predep_objects=$lt_predep_objects
-postdep_objects=$lt_postdep_objects
-predeps=$lt_predeps
-postdeps=$lt_postdeps
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path
-
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
-
-  if test x"$xsi_shell" = xyes; then
-  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
-func_dirname ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_basename ()$/,/^} # func_basename /c\
-func_basename ()\
-{\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
-func_dirname_and_basename ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
-func_stripname ()\
-{\
-\    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
-\    # positional parameters, so assign one to ordinary parameter first.\
-\    func_stripname_result=${3}\
-\    func_stripname_result=${func_stripname_result#"${1}"}\
-\    func_stripname_result=${func_stripname_result%"${2}"}\
-} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
-func_split_long_opt ()\
-{\
-\    func_split_long_opt_name=${1%%=*}\
-\    func_split_long_opt_arg=${1#*=}\
-} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
-func_split_short_opt ()\
-{\
-\    func_split_short_opt_arg=${1#??}\
-\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
-} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
-func_lo2o ()\
-{\
-\    case ${1} in\
-\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
-\      *)    func_lo2o_result=${1} ;;\
-\    esac\
-} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_xform ()$/,/^} # func_xform /c\
-func_xform ()\
-{\
-    func_xform_result=${1%.*}.lo\
-} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_arith ()$/,/^} # func_arith /c\
-func_arith ()\
-{\
-    func_arith_result=$(( $* ))\
-} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_len ()$/,/^} # func_len /c\
-func_len ()\
-{\
-    func_len_result=${#1}\
-} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-fi
-
-if test x"$lt_shell_append" = xyes; then
-  sed -e '/^func_append ()$/,/^} # func_append /c\
-func_append ()\
-{\
-    eval "${1}+=\\${2}"\
-} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
-func_append_quoted ()\
-{\
-\    func_quote_for_eval "${2}"\
-\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
-} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  # Save a `func_append' function call where possible by direct use of '+='
-  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-else
-  # Save a `func_append' function call even when '+=' is not available
-  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
-$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
-fi
-
-
-   mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-
-
-    cat <<_LT_EOF >> "$ofile"
-
-# ### BEGIN LIBTOOL TAG CONFIG: FC
-
-# The linker used to build libraries.
-LD=$lt_LD_FC
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag_FC
-reload_cmds=$lt_reload_cmds_FC
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds_FC
-
-# A language specific compiler.
-CC=$lt_compiler_FC
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC_FC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_FC
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_FC
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_FC
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_FC
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_FC
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_FC
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_FC
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_FC
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_FC
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object_FC
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_FC
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_FC
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds_FC
-archive_expsym_cmds=$lt_archive_expsym_cmds_FC
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds_FC
-module_expsym_cmds=$lt_module_expsym_cmds_FC
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld_FC
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_FC
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_FC
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_FC
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_FC
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct_FC
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
-# library is relocated.
-hardcode_direct_absolute=$hardcode_direct_absolute_FC
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L_FC
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_FC
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic_FC
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath_FC
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_FC
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols_FC
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_FC
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_FC
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_FC
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds_FC
-
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds_FC
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec_FC
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_FC
-
-# The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_FC
-
-# Dependencies to place before and after the objects being linked to
-# create a shared library.
-predep_objects=$lt_predep_objects_FC
-postdep_objects=$lt_postdep_objects_FC
-predeps=$lt_predeps_FC
-postdeps=$lt_postdeps_FC
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_FC
-
-# ### END LIBTOOL TAG CONFIG: FC
-_LT_EOF
-
- ;;
-
-  esac
-done # for ac_tag
-
-
-as_fn_exit 0
-_ACEOF
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
diff --git a/CMake/cdat_modules_extra/uvcdat.in b/CMake/cdat_modules_extra/uvcdat.in
deleted file mode 100755
index 8b1a3f238..000000000
--- a/CMake/cdat_modules_extra/uvcdat.in
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-# source is not portable whereas . is
-. "@CMAKE_INSTALL_PREFIX@/bin/setup_runtime.sh"
-
-# Used in event of -o "log_location"; grabs the next arg and puts it in target
-capture=false
-# The location we'll be logging to
-target="$HOME/.uvcdat/uvcdatsession.log"
-# Whether or not we're redirecting the stdout/stderr
-redirect=true
-
-for var in "$@"
-do
-    if [ $capture = true ]; then
-        # -o was found, grabbing the next value
-        target=$var
-        if [ "$target" = "" ]; then
-            # This is the way we can redirect output to stdout
-            # Do not redirect output
-            redirect=false
-        fi
-        # Don't need to capture anything else
-        capture=false
-        continue
-    fi
-
-    case $var in
-        # Trigger above block on the next arg
-    -o) capture=true;
-            ;;
-                # Parse the target out of the = section
-    --output=*) target=`sed "s/--output=\(.*\)/\1/" <<< $var`
-        if [ "$target" = "" ]; then
-            # Do not redirect output
-            redirect=false
-        fi
-            ;;
-                  # Do not redirect output
-    --output-std) redirect=false
-            ;;
-            # Shouldn't redirect for help
-    --help) redirect=false
-            ;;
-    *)      ;;
-    esac
-done
-
-if [ $redirect = false ]  ;then
-    python@PYVER@ "@CMAKE_INSTALL_PREFIX@/vistrails/vistrails/uvcdat.py" "$@"
-else
-    # Replace all uses of ~ with $HOME
-    target="${target/#\~/$HOME}"
-
-    # Check if path exists
-    target_dir="$(dirname $target)"
-    if [ ! -d "$target_dir" ] ;then
-        mkdir -p $target_dir
-    fi
-
-    # Make sure the file exists and that we have write privileges
-    touch $target
-    # Launch with redirection
-    python@PYVER@ "@CMAKE_INSTALL_PREFIX@/vistrails/vistrails/uvcdat.py" "$@" >>$target 2>&1
-fi
diff --git a/CMake/cdat_modules_extra/uvcdat.mac.in b/CMake/cdat_modules_extra/uvcdat.mac.in
deleted file mode 100755
index 14a394f37..000000000
--- a/CMake/cdat_modules_extra/uvcdat.mac.in
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# source is not portable where as . is
-BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-. $BASEDIR/setup_runtime.sh
-python@PYVER@ $BASEDIR/../vistrails/vistrails/uvcdat.py
-
diff --git a/CMake/cdat_modules_extra/uvcmetrics_test_data_md5s.txt b/CMake/cdat_modules_extra/uvcmetrics_test_data_md5s.txt
deleted file mode 100644
index e61b4896d..000000000
--- a/CMake/cdat_modules_extra/uvcmetrics_test_data_md5s.txt
+++ /dev/null
@@ -1,232 +0,0 @@
-82848263d3f9032b41bc02f758cb0bed  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1850-01.nc
-09c2f48312305fef59ee571fe1c3a84a  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1850-02.nc
-3274cb2d7cccffac20059f564a97998e  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1850-03.nc
-5e677beb0eccfe8c94ec9e18460c2581  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1850-04.nc
-cd565477d7d8555566e16bf5ff4bfe44  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1850-05.nc
-d6038ef39f33b6a6d06a3554531a1ed2  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1850-06.nc
-97bf73768c9f50068ffa7399fc0a1e0a  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1850-07.nc
-705147cb320524d8257dcee8b450aec3  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1850-08.nc
-164861198d2cb1897713afbeebf9eb62  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1850-09.nc
-0b342120b940679cab8a2204e6b9f0d0  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1850-10.nc
-6a12f3a02fc2607afe871f1d4aff7ea2  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1850-11.nc
-0d642c1b3697ff3c45d07b7a90a07fab  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1850-12.nc
-8b3e27df842aba7dc88b4c13266cc4ed  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1851-01.nc
-38a7850265356a9b49ab78172b121927  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1851-02.nc
-30ab14ec20e9ee54ff9ba3bd0332c490  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1851-03.nc
-2d4c0cf37429c5a1d97be1acc5b907b1  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1851-04.nc
-72ed71d9937b77e9c01f35ec3924e478  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1851-05.nc
-62c85090e8b93a0caedebae52a6feddf  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1851-06.nc
-7c9a70dfc28d7a9eb052f281738adb55  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1851-07.nc
-d505af09b431fcfb2255fbabcae16ce0  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1851-08.nc
-2875586ec0f21efd94a4fca640ef7f59  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1851-09.nc
-6bc3b40018820413633a07c4d8278e50  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1851-10.nc
-6a56554e98908dbcb1ad04f8129b7e8d  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1851-11.nc
-610ad7ff458a87c863fc2d792e69dc2f  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1851-12.nc
-e17b3f827c0162c246df0a3aabe4ce9d  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1852-01.nc
-79a551fdfb44b88c64fb6552048f4dc5  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1852-02.nc
-e8c38da3ad16c7866b3b3b540647a5da  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1852-03.nc
-59de1e4fedabf0976590af6e470ceec1  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1852-04.nc
-147389dbf5bfb479d09a8982d6690e8b  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1852-05.nc
-c6f3843a3f716de98693c11bc807c206  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1852-06.nc
-be02c6100e317dd037ad0cccf9d8a8cf  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1852-07.nc
-109b769371207a503ac9039b37fd4dad  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1852-08.nc
-629f86af7dbe6f3b379450f951e3e1b2  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1852-09.nc
-02c3a536f6025ebde38bee00bc69aa09  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1852-10.nc
-a661f1ce9b87e46865b489fde9752edf  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1852-11.nc
-7de08765c4e2f9a34e21ba8024453adc  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1852-12.nc
-28441278df2af93f9ebfa1b51ef21007  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1853-01.nc
-1576faec4df27627c3eb975e7c6f5fef  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1853-02.nc
-abccaf09316d0f1705557dd752d359af  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1853-03.nc
-cde766ef10310253fc3baaa4d5ca8761  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1853-04.nc
-fd58a1f7d6d2a6037df183e0fca9ff5f  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1853-05.nc
-73a0b57991b798ca2b52e56afcf4f630  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1853-06.nc
-f45485c533798bb53b4452469a5bc678  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1853-07.nc
-149bfade64fe7b0b984059954e88ce97  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1853-08.nc
-ada05ce9162160c9a6c02d9d335c9349  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1853-09.nc
-aca027b6b88bfa17059ff22945cd393f  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1853-10.nc
-54e738cdb234fcec78d86a49790fafdc  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1853-11.nc
-151f3e6f7c5a8cbfd31abada8df36dd2  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1853-12.nc
-91b73bdb596231c604d4c76db55bce5e  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1854-01.nc
-5446fed21e3700d9d90f212ddbdbedc4  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1854-02.nc
-8f69e20b5993613eb473a904cb3c5cfd  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1854-03.nc
-6d984999d23f93c2434960f43381556d  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1854-04.nc
-8be183c391e859bc36a8215f276bdd1b  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1854-05.nc
-6e610ae6499ec706940ce81b3ee5df85  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1854-06.nc
-2be1078885df583b0a1ee929ef663846  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1854-07.nc
-493969c7aef835400219722322276ec5  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1854-08.nc
-055d76ef47600f3b0e0142d6cb4db758  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1854-09.nc
-12ec6242e2e3269b180c4a2367963327  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1854-10.nc
-a857e9ae0696c33c38171c7d92791181  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1854-11.nc
-42097c573ac657ec44bde9aabfa98afd  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1854-12.nc
-b7198ad93b6eae51fcfd49fb3f9877a9  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1855-01.nc
-09d6b9c23bf272f7ad8e6eba37e45edb  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1855-02.nc
-b3ab42c5083df9f901dde9c7fe90bf26  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1855-03.nc
-4a63c5b704fa1e8fefab025c4e8c46aa  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1855-04.nc
-4608c9358aa5754352eb9b87d85e7a1c  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1855-05.nc
-4eff1ec373b9beb820e5e1e4113498aa  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1855-06.nc
-cffdc3aab308d233c956720d80671b95  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1855-07.nc
-8dfcd2ecac7d37c12ac0adef4825c67f  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1855-08.nc
-0a196de01ca67ce291a026e755b9921d  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1855-09.nc
-e6931415ab36579fff13f4933a6bf1f5  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1855-10.nc
-526fbd9987a6d5faf927106bf048aa2b  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1855-11.nc
-839301c709e5a7b3eb271e75782979af  acme_hires_land/c_t_t341f02.F1850p.clm2.h0.1855-12.nc
-6d86e5edd0a92931226ac99d13167980  acme_lores_atm_climo/F1850.g37_bench_ANN_climo.nc
-f3c5c5a4d91d6e3e0cc4d2df362b0503  acme_lores_atm_climo/F1850.g37_bench_DJF_climo.nc
-06e0cc5f50cd7f2c1e2f30c4c4278b47  acme_lores_cam_climo/F1850.g37_bench_ANN_climo.nc
-712d887975121e81168ab03a535cadba  acme_lores_cam_climo/F1850.g37_bench_APR_climo.nc
-e2e5505205c326eea69574226d881359  acme_lores_cam_climo/F1850.g37_bench_DJF_climo.nc
-d36b0d4f7fb27c3897668131bdec05aa  acme_lores_cam_climo/F1850.g37_bench_JAN_climo.nc
-39342297493a616eb8988ef0a3a9c988  acme_lores_cam_climo/F1850.g37_bench_JJA_climo.nc
-0a8cbf9b41f2cc752800a584f6356cbd  acme_lores_cam_climo/F1850.g37_bench_JUL_climo.nc
-7b2da1926acf2c0f9ffad80497775bb6  acme_lores_cam_climo/F1850.g37_bench_MAM_climo.nc
-7df286b070640d0074c556560edc6a73  acme_lores_cam_climo/F1850.g37_bench_SON_climo.nc
-77d7b6de33467bdebe1a05700f03cae7  acme_lores_clm_climo/ANN_climo.nc
-a075f9d88b0b29b9f6a706f56bc628fa  acme_lores_clm_climo/APR_climo.nc
-f0694a365f88bef9f2ae34169afcd99b  acme_lores_clm_climo/AUG_climo.nc
-3928a8108bed42d5035bb9e9ef06a227  acme_lores_clm_climo/DEC_climo.nc
-5cd00312d791f34b1d33ca336d874473  acme_lores_clm_climo/DJF_climo.nc
-5e2849739943108c549c6724c6927ccd  acme_lores_clm_climo/FEB_climo.nc
-4badd8e20c7e45d8156f0677416d4f85  acme_lores_clm_climo/JAN_climo.nc
-bcc44d7f27938f1f21cf3c34d29dfe0d  acme_lores_clm_climo/JJA_climo.nc
-c11b441acebdf5e7dac696485abd31b8  acme_lores_clm_climo/JUL_climo.nc
-1740586484d8e59b18bf97d89658cd97  acme_lores_clm_climo/JUN_climo.nc
-6aca924e7541a42f37c189934912d4bb  acme_lores_clm_climo/MAM_climo.nc
-16c8c8d84c30d2f72b1bafd7929841a5  acme_lores_clm_climo/MAR_climo.nc
-eb483652fc0b0b069761659262d1d111  acme_lores_clm_climo/MAY_climo.nc
-e3e52b82e64357c50fe42aed7e0ba56c  acme_lores_clm_climo/NOV_climo.nc
-8969b2045cd430d03cebaccb91995f3d  acme_lores_clm_climo/OCT_climo.nc
-4a1d44b3ab16645aef032006be8b4af3  acme_lores_clm_climo/SEP_climo.nc
-f57a1c82229d2985894ef643e0392135  acme_lores_clm_climo/SON_climo.nc
-2a40dbd588429cbefb6317fc48076bb9  acme_lores_land/c_t_F1850.g37_bench.clm2.h0.0001-01.nc
-176fbe665aa0ea9ee3ba63d2df780537  acme_lores_land/c_t_F1850.g37_bench.clm2.h0.0001-02.nc
-cc857575c3b7e81520be03a20fd5fc4c  acme_lores_land/c_t_F1850.g37_bench.clm2.h0.0001-03.nc
-1a01b328a240435c32ea7f4dcc880db6  acme_lores_land/c_t_F1850.g37_bench.clm2.h0.0001-04.nc
-14b1ed3abf5c37c7d3611b57111123a8  acme_lores_land/c_t_F1850.g37_bench.clm2.h0.0001-05.nc
-a2cf201b629578dc40a1a6c8c2ebfdd4  acme_lores_land/c_t_F1850.g37_bench.clm2.h0.0001-06.nc
-3ba6118cecded5739d20ef78d2e75458  acme_lores_land/c_t_F1850.g37_bench.clm2.h0.0001-07.nc
-a42132db7da5c17b9a69aee42951ae3d  acme_lores_land/c_t_F1850.g37_bench.clm2.h0.0001-08.nc
-ee65c00602bc7e0de884e09be4b2bb1d  acme_lores_land/c_t_F1850.g37_bench.clm2.h0.0001-09.nc
-1909f013d84b298eeff19b5250f61daa  acme_lores_land/c_t_F1850.g37_bench.clm2.h0.0001-10.nc
-4b96d62be06f31b8be94388ce59dbeb7  acme_lores_land/c_t_F1850.g37_bench.clm2.h0.0001-11.nc
-486218898744c21420a24ab36121520d  acme_lores_land/c_t_F1850.g37_bench.clm2.h0.0001-12.nc
-950360fe5f5334d3026ba44850c539a6  cam35_data/cam3_5_01_climo.nc
-fc869f4e9c79960f2f0766905379c4c3  cam35_data/cam3_5_02_climo.nc
-c11b0b3283b726318d84edc8ad042714  cam35_data/cam3_5_03_climo.nc
-4d1bfc12f358026addd34d47eca1b52c  cam35_data/cam3_5_04_climo.nc
-da9d0149d3e81d7bdae96076e07daf39  cam35_data/cam3_5_05_climo.nc
-a5526dbaac0a0da52ca04bc5b9c71c56  cam35_data/cam3_5_06_climo.nc
-00662c2eafcb297cf8aabf8c51456d0b  cam35_data/cam3_5_07_climo.nc
-ba72017189a80edd5181d639ae6204e9  cam35_data/cam3_5_08_climo.nc
-b23c87bbf00d39b0966e3a6d072c0abc  cam35_data/cam3_5_09_climo.nc
-4f5d4e732e97c163f63ed1430858c5e3  cam35_data/cam3_5_10_climo.nc
-6abc0b942e43cf5fbadbead8ea2aac26  cam35_data/cam3_5_11_climo.nc
-c9ecb1cbabcc60196263f0a8b488d1e1  cam35_data/cam3_5_12_climo.nc
-84204a1bc34f41f71ed613278b29a57f  cam35_data_smaller/cam3_5_01_climo.nc
-9fcd1364523a26f4fa833a89fc14bae9  cam35_data_smaller/cam3_5_02_climo.nc
-d53f58834cf9053f3255818e441c735a  cam35_data_smaller/cam3_5_03_climo.nc
-7c848ac7acf21552d93273b0ba4817e5  cam35_data_smaller/cam3_5_04_climo.nc
-96248cd867434a51d160ada6af4d0f4f  cam35_data_smaller/cam3_5_05_climo.nc
-155a163a204538164980a1425f4aa301  cam35_data_smaller/cam3_5_06_climo.nc
-b33bf096521235e9fec1a64479438568  cam35_data_smaller/cam3_5_07_climo.nc
-6fe5fcd5a4221dc4ae711ab6631b9cea  cam35_data_smaller/cam3_5_08_climo.nc
-7f2b52b2807e52ab0cdb94e892cec986  cam35_data_smaller/cam3_5_09_climo.nc
-a5121dec5eb93415d8988fb3ae1f279e  cam35_data_smaller/cam3_5_10_climo.nc
-36183ada10292e09053a6573f0d493b6  cam35_data_smaller/cam3_5_11_climo.nc
-018e37b4e760d92edfafcb035173db3d  cam35_data_smaller/cam3_5_12_climo.nc
-8cd47baae6710a9373ebaba96a6e262b  cam_output/c_t_b30.009.cam2.h0.0600-01.nc
-82731ab10329e5cdacfa78ea3da520f2  cam_output/c_t_b30.009.cam2.h0.0600-02.nc
-146a578b04623773ad0e98e930d1a5e5  cam_output/c_t_b30.009.cam2.h0.0600-03.nc
-e6ce8ea3580b3266bd93fc73dcad9adc  cam_output/c_t_b30.009.cam2.h0.0600-04.nc
-a5698548a26c40c514adcadd9623eb27  cam_output/c_t_b30.009.cam2.h0.0600-05.nc
-848918d62382e94bad56a2cc2cd07fd8  cam_output/c_t_b30.009.cam2.h0.0600-06.nc
-bf447ef80bef314a5e2b2003d741a529  cam_output/c_t_b30.009.cam2.h0.0600-07.nc
-be548db39e7607d4153f73e4b5657aa1  cam_output/c_t_b30.009.cam2.h0.0600-08.nc
-0f7764b3aaf5412bdcd70943129026d6  cam_output/c_t_b30.009.cam2.h0.0600-09.nc
-f0ac64dfbf1e5ccb97a167d0f6c75672  cam_output/c_t_b30.009.cam2.h0.0600-10.nc
-7bf5f3401a0fbe8263bac61ca113e7d8  cam_output/c_t_b30.009.cam2.h0.0600-11.nc
-cf83e939285b29ff808ed41544d7df92  cam_output/c_t_b30.009.cam2.h0.0600-12.nc
-6e8cdaf575f9101921d11c571334842f  cam_output/c_t_b30.009.cam2.h0.0601-01.nc
-999693e6583eb4ed322151b68dda4e72  cam_output/c_t_b30.009.cam2.h0.0601-02.nc
-e6d09f6db4fcf81ce68c935277fb110f  cam_output/c_t_b30.009.cam2.h0.0601-03.nc
-635be9948c7e7cecf82c76f953ed0624  cam_output/c_t_b30.009.cam2.h0.0601-04.nc
-a2c14b3f0602aa9ad3b43316f11ae5ff  cam_output/c_t_b30.009.cam2.h0.0601-05.nc
-fbbb8c51f858fe89f4880a41b5f17d04  cam_output/c_t_b30.009.cam2.h0.0601-06.nc
-1e5b7508a062d6aeb16afbf98045a5de  cam_output/c_t_b30.009.cam2.h0.0601-07.nc
-fc30abee308e251bde7be642fa0c3f7a  cam_output/c_t_b30.009.cam2.h0.0601-08.nc
-beafa07dc0c98b09984fd7830eb99f52  cam_output/c_t_b30.009.cam2.h0.0601-09.nc
-4f36607badf32ee9d2c5234a58e779ad  cam_output/c_t_b30.009.cam2.h0.0601-10.nc
-039b724f844a15b936bfe7ee00e79a6e  cam_output/c_t_b30.009.cam2.h0.0601-11.nc
-da7fb4fcc052983bd7e5ac8a63a6a451  cam_output/c_t_b30.009.cam2.h0.0601-12.nc
-f7a5944e246ca97ec722ed72d2e53315  model_data_12/f.e11.F2000C5.f09_f09.control.001.cam.h0.0001_T_only-01.nc
-c4ad68141d351aea55ce1e9bf0859798  model_data_12/f.e11.F2000C5.f09_f09.control.001.cam.h0.0001_T_only-04.nc
-bf0b2ef03cd280f5e635870b2ccda8d9  model_data_12/f.e11.F2000C5.f09_f09.control.001.cam.h0.0001_T_only-07.nc
-6893d78c8c5541999043f19d2dcee035  model_data_12/f.e11.F2000C5.f09_f09.control.001.cam.h0.0001_T_only-10.nc
-e241fc465279e7126e0e59789d9baedf  obs/NCEP_01_climo.nc
-cd1f8016b4f575c4b2a08a69c78b041a  obs/NCEP_02_climo.nc
-fae4c3bfa51707a9329b274e8de3633e  obs/NCEP_03_climo.nc
-49d418806a382eb17ae1c7cfa5295355  obs/NCEP_04_climo.nc
-97fa9532455053987f1a92645c42ef71  obs/NCEP_05_climo.nc
-078fece9cf0a1730ee13a18211cefa05  obs/NCEP_06_climo.nc
-039a8dd4c98b2e2332699e750f72e2b2  obs/NCEP_07_climo.nc
-4bc14d3447ff3af8c0fec1a19c7cd7b3  obs/NCEP_08_climo.nc
-ef45a99e527f5a36b4a145d9919ac628  obs/NCEP_09_climo.nc
-6673a7bcbf1476015dad7b5106a4213f  obs/NCEP_10_climo.nc
-9e86a777517ad6f4b392f7d63d8e98f7  obs/NCEP_11_climo.nc
-5f4ec5821d1ebb9e5a73c9a46666291a  obs/NCEP_12_climo.nc
-578dcbfb4979cd3cbee2bde42a52d5c7  obs/NCEP_ANN_climo.nc
-78c01194a72dc3da7b25c1ce402dfe7b  obs/NCEP_DJF_climo.nc
-dcd392831c5c0628fde4f92e2f704c18  obs/NCEP_JJA_climo.nc
-185a376e3e6403191d42dbef55b72928  obs_atmos/c_CRU_ANN_climo.nc
-9c754380f93e4305c5ed40b67d7282e5  obs_atmos/c_CRU_DJF_climo.nc
-a8b02bd2ea54d089db13005e7a9b4999  obs_atmos/c_CRU_JJA_climo.nc
-ef18dbf141367c0d7cf3990d7e10d64c  obs_atmos/c_t_NCEP_01_climo.nc
-10c09087712b3b283765381c78002154  obs_atmos/c_t_NCEP_02_climo.nc
-3bcec656166614c11ad1f436129b4922  obs_atmos/c_t_NCEP_03_climo.nc
-bf326d77aceedcdf7197b6ca4d7624df  obs_atmos/c_t_NCEP_04_climo.nc
-631dadd9a88b46a47506fa2b2cc0cc1e  obs_atmos/c_t_NCEP_05_climo.nc
-3b65eb064433b28d9e23aaf260994768  obs_atmos/c_t_NCEP_06_climo.nc
-dd2962224eb21be51dd2e1d38d4d7bfc  obs_atmos/c_t_NCEP_07_climo.nc
-a7f0f0a58959c30f4342a643537d5791  obs_atmos/c_t_NCEP_08_climo.nc
-16f1fb6a6fd60428a24821dfdbf9ba3f  obs_atmos/c_t_NCEP_09_climo.nc
-c1c5580c10e6017d7a1b4c844f4bee95  obs_atmos/c_t_NCEP_10_climo.nc
-58ca74759be8e809e6113309163eb87e  obs_atmos/c_t_NCEP_11_climo.nc
-0a34a591d117471b83ec15d41ca4de5e  obs_atmos/c_t_NCEP_12_climo.nc
-53a07928fd5bb8282e3b00707c30d352  obs_atmos/c_t_NCEP_ANN_climo.nc
-07fbdfe7c5ac96dca4d5b30cf0ffca4d  obs_atmos/c_t_NCEP_DJF_climo.nc
-bba7b95da836594ba56eccc5cc735953  obs_atmos/c_t_NCEP_JJA_climo.nc
-ded2539f0946958f20946211ec6de7c6  obs_data_12/._RAOBS.nc
-2df5c553f24cf4e51a826a34075a6122  obs_data_12/RAOBS.nc
-3057f458f2eea7e29b5df6622b71c5c6  obs_data_13/ISCCPCOSP_01_climo.nc
-863fdc036ca6c8bc181b68934fb5f334  obs_data_13/ISCCPCOSP_02_climo.nc
-44d91325876baa34dd53a3d5fdebc8a5  obs_data_13/ISCCPCOSP_03_climo.nc
-2821ea5e0d7d1ab2e32486e6336c07b5  obs_data_13/ISCCPCOSP_04_climo.nc
-dc5823c8971136e536c1f7c7d8f8452f  obs_data_13/ISCCPCOSP_05_climo.nc
-b0fb19767ddf330a4dd37a429810b9d9  obs_data_13/ISCCPCOSP_06_climo.nc
-a07c2a2e6adfed391c53a0aff0c436ab  obs_data_13/ISCCPCOSP_07_climo.nc
-ca089074a4f3d1fe7f6897c0c88b1b6b  obs_data_13/ISCCPCOSP_08_climo.nc
-9f9c9897dc8e09e18f155fe5355d1ed8  obs_data_13/ISCCPCOSP_09_climo.nc
-d74abae2b663ea67cf95de9b5f4e8485  obs_data_13/ISCCPCOSP_10_climo.nc
-ba01b312ad7fc2f936299798c963114c  obs_data_13/ISCCPCOSP_11_climo.nc
-0a20a6f6220e941ad84e75347d044ff0  obs_data_13/ISCCPCOSP_12_climo.nc
-f422c02f76cfd8ffdc3d664f7df29fa5  obs_data_13/ISCCPCOSP_ANN_climo.nc
-c0c6e18ef0202b8da755210ff5bab6d0  obs_data_13/ISCCPCOSP_DJF_climo.nc
-a52e9a734e34d3b6198f836c407a834b  obs_data_13/ISCCPCOSP_JJA_climo.nc
-0692a353d71f86e3b008f5b7136fead4  obs_data_13/ISCCPCOSP_MAM_climo.nc
-65790f602a139f5e7ac561c0f50073a6  obs_data_13/ISCCPCOSP_SON_climo.nc
-25da719f4a94f073b344d463ef46dd5c  obs_data_5.6/ERS_01_climo.nc
-82938151479416212514ea92f5c8944d  obs_data_5.6/ERS_02_climo.nc
-4474e171bc3ed010bc4cf85f2156331c  obs_data_5.6/ERS_03_climo.nc
-5928149aaa7e20e8e021051e4c1cf8af  obs_data_5.6/ERS_04_climo.nc
-8ba71cabf16409ec359250137313e1fc  obs_data_5.6/ERS_05_climo.nc
-7173b6c6ad21ebba3faae364bb0e2abd  obs_data_5.6/ERS_06_climo.nc
-4a4dce6ec29ff746e6ca438a1144e2f9  obs_data_5.6/ERS_07_climo.nc
-89b82d69760e786d4c5cd6007e67ad8e  obs_data_5.6/ERS_08_climo.nc
-703d8a3c2bca30d721db74e4a9607991  obs_data_5.6/ERS_09_climo.nc
-6be5b6eaacbd4bfee413b0432a3822bd  obs_data_5.6/ERS_10_climo.nc
-3aab5e306b45952d4bc538cf09733d36  obs_data_5.6/ERS_11_climo.nc
-b7d52d062f54e6c28b73c1630866eb8f  obs_data_5.6/ERS_12_climo.nc
-257874570e3aeeda6cbd55accf60f6c9  obs_data_5.6/ERS_ANN_climo.nc
-d7fc6bbb9a2dfdb0fa44d7835f94a3d4  obs_data_5.6/ERS_DJF_climo.nc
-3cce9af23687f27d3b134f60039ebdce  obs_data_5.6/ERS_JJA_climo.nc
-aaedba911f145e711d05b6430e13ce4e  obs_data_5.6/ERS_MAM_climo.nc
-e40f05dfec15f145e9623290d5142705  obs_data_5.6/ERS_SON_climo.nc
diff --git a/CMake/cdat_modules_extra/vacumm_build_step.cmake.in b/CMake/cdat_modules_extra/vacumm_build_step.cmake.in
deleted file mode 100644
index 8ef121b84..000000000
--- a/CMake/cdat_modules_extra/vacumm_build_step.cmake.in
+++ /dev/null
@@ -1,6 +0,0 @@
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-execute_process(
-  COMMAND "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
-  WORKING_DIRECTORY "@vacumm_source_dir@"
-  )
diff --git a/CMake/cdat_modules_extra/vtk_install_python_module.cmake.in b/CMake/cdat_modules_extra/vtk_install_python_module.cmake.in
deleted file mode 100644
index 9d7ba552b..000000000
--- a/CMake/cdat_modules_extra/vtk_install_python_module.cmake.in
+++ /dev/null
@@ -1,36 +0,0 @@
-
-set(ENV${CC} "@CMAKE_C_COMPILER@")
-set(ENV${CXX} "@CMAKE_CXX_COMPILER@")
-set(ENV${CPP} "@CMAKE_CXX_COMPILER@")
-
-set(ENV{@LIBRARY_PATH@} "@cdat_EXTERNALS@/lib:$ENV{@LIBRARY_PATH@}")
-set(ENV{LDFLAGS} "-L@cdat_EXTERNALS@/lib")
-set(ENV{CFLAGS} "@cdat_osx_flags@ -I@cdat_EXTERNALS@/include -I@cdat_EXTERNALS@/include/freetype2 @ADDITIONAL_CFLAGS@")
-set(ENV{CPPFLAGS} "@cdat_osx_cppflags@ -I@cdat_EXTERNALS@/include -I@cdat_EXTERNALS@/include/freetype2 @ADDITIONAL_CPPFLAGS@")
-set(ENV{CXXFLAGS} "@cdat_osx_cxxflags@ -I@cdat_EXTERNALS@/include -I@cdat_EXTERNALS@/include/freetype2 @ADDITIONAL_CXXFLAGS@")
-
-set(ENV{EXTERNALS} "@cdat_EXTERNALS@")
-
-execute_process(
-  COMMAND env PYTHONPATH=@PYTHONPATH@ "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
-  WORKING_DIRECTORY @cdat_BINARY_DIR@/build/ParaView-build/VTK/Wrapping/Python
-  RESULT_VARIABLE res)
-
-if(NOT ${res} EQUAL 0)
-  message("Make Errors detected: \n${CDAT_OUT}\n${CDAT_ERR}")
-  message(FATAL_ERROR "Error in VTK Python Install")
-endif()
-
-if (APPLE)
- message("We are on a Mac, need to relink all libraries")
- execute_process(
-  COMMAND env PYTHONPATH=@PYTHONPATH@ "@PYTHON_EXECUTABLE@" @cdat_CMAKE_SOURCE_DIR@/fixlink.py
-  WORKING_DIRECTORY @cdat_BINARY_DIR@
-  OUTPUT_VARIABLE out
-  ERROR_VARIABLE err
-  RESULT_VARIABLE res)
- message("got: "${res})
-endif ()
-
-message("Install succeeded.")
-
diff --git a/CMake/cdat_modules_extra/xgks_configure_step.cmake.in b/CMake/cdat_modules_extra/xgks_configure_step.cmake.in
deleted file mode 100644
index 0abcb5c96..000000000
--- a/CMake/cdat_modules_extra/xgks_configure_step.cmake.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
-
-execute_process(
-  COMMAND env FC="" sh configure --prefix=${INSTALL_DIR} ${CONFIGURE_ARGS}
-  WORKING_DIRECTORY "${WORKING_DIR}"
-  RESULT_VARIABLE res)
-
-if(NOT ${res} EQUAL 0)
-  message("Config Errors detected: \n${CDAT_OUT}\n${CDAT_ERR}")
-  message(FATAL_ERROR "Error in config")
-endif()
-message("Config succeeded.")
diff --git a/CMake/curses_gcc5.patch b/CMake/curses_gcc5.patch
deleted file mode 100644
index a1ee0240b..000000000
--- a/CMake/curses_gcc5.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-index d8cc3c9..b91398c 100755
---- a/ncurses/base/MKlib_gen.sh
-+++ b/ncurses/base/MKlib_gen.sh
-@@ -491,11 +492,22 @@ sed -n -f $ED1 \
-	-e 's/gen_$//' \
-	-e 's/  / /g' >>$TMP
-
-+cat >$ED1 <<EOF
-+s/  / /g
-+s/^ //
-+s/ $//
-+s/P_NCURSES_BOOL/NCURSES_BOOL/g
-+EOF
-+
-+# A patch discussed here:
-+#	https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
-+# introduces spurious #line markers.  Work around that by ignoring the system's
-+# attempt to define "bool" and using our own symbol here.
-+sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2
-+cat $ED2 >$TMP
-+
- $preprocessor $TMP 2>/dev/null \
--| sed \
--	-e 's/  / /g' \
--	-e 's/^ //' \
--	-e 's/_Bool/NCURSES_BOOL/g' \
-+| sed -f $ED1 \
- | $AWK -f $AW2 \
- | sed -f $ED3 \
- | sed \
diff --git a/CMake/dummy.f90 b/CMake/dummy.f90
deleted file mode 100644
index 4bbd9fbdc..000000000
--- a/CMake/dummy.f90
+++ /dev/null
@@ -1,4 +0,0 @@
-        PROGRAM dummy
-
-        print*, "Hi"
-        END
diff --git a/CMake/fixName.py b/CMake/fixName.py
deleted file mode 100644
index 17f2a0606..000000000
--- a/CMake/fixName.py
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env python
-
-
-import sys
-
-fnm = sys.prefix+"/Resources/Python.app/Contents/Info.plist"
-
-f=open(fnm)
-s=f.read()
-pat="<key>CFBundleName</key>"
-i=s.find(pat)#<string>Python</string>")
-s2=s[:i+len(pat)]+s[i+len(pat):].replace("Python","UV-CDAT",1)
-f=open(fnm,'w')
-f.write(s2)
-f.close()
diff --git a/CMake/fix_install_name.py.in b/CMake/fix_install_name.py.in
deleted file mode 100644
index 787490a48..000000000
--- a/CMake/fix_install_name.py.in
+++ /dev/null
@@ -1,33 +0,0 @@
-import os
-import sys
-import fnmatch
-
-def find_files(directory, pattern):
-    for root, dirs, files in os.walk(directory):
-        for basename in files:
-            if fnmatch.fnmatch(basename, pattern):
-                filename = os.path.join(root, basename)
-                yield filename
-
-exts = ['*.dylib', '*.so']
-
-# Find all the modules and shared libraries and replace the path contained 
-# if referencing the built ones
-for pattern in exts:
-  for library in find_files("./", pattern):
-    print library
-    cmd = 'otool -L %s' % library
-    print "library is", library
-    deps = os.popen(cmd).readlines()
-    for dep in deps[1:]:
-      dep_name = os.path.split(dep)[1]
-      dep_name = dep_name.split()[0]
-      dep = dep.split()[0]
-      # Replace the ones that are built by us
-      if fnmatch.fnmatch(dep_name, pattern) and fnmatch.fnmatch(dep, "@CMAKE_INSTALL_PREFIX@*"):
-        print 'dep fullpath ', dep
-        print 'dep name', dep_name
-        cmd = "install_name_tool -change %s %s %s" % (dep, "@rpath/"+"".join(dep_name), library)
-        print 'change cmd is ', cmd
-        lns = os.popen(cmd)
-        print "\t"+"".join(lns)
diff --git a/CMake/fixlink.py b/CMake/fixlink.py
deleted file mode 100644
index 808baa7f2..000000000
--- a/CMake/fixlink.py
+++ /dev/null
@@ -1,49 +0,0 @@
-import os,sys,numpy
-lib = '/usr/local/uvcdat/1.0.alpha/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/paraview/vtk/vtkCommonPython.so'
-bad = 'ParaView-build'
-#bad="System"
-#bad="paraview3.11"
-def change(lib,bad,paraviewPath,sameDir=False):
-    cmd = 'otool -L %s' % lib
-    print "LIB:",lib
-    ln=os.popen(cmd).readlines()
-    for l in ln[1:]:
-        link = l.strip().split()[0]
-        if link.find(bad)>-1:
-            print link,"\t",
-            nm=os.path.split(link)[1]
-            print nm
-            cmd = "install_name_tool -change %s %s/%s %s" % (link,paraviewPath,nm,lib)
-            print "\t",cmd
-            lns = os.popen(cmd)
-            print "\t"+"".join(lns)
-        if sameDir:
-            if link[:6] in ["libvtk","libXdm","libKWC","libQVT","libVPI","libCos","libpro"]:
-                cmd = "install_name_tool -change %s %s/%s %s" % (link,paraviewPath,link,lib)
-                print "\t",cmd
-                lns = os.popen(cmd)
-                print "\t"+"".join(lns)
-            
-
-inpath =  "/".join(numpy.__path__[0].split("/")[:-1]+["paraview",])
-inpath2 =  "/".join(numpy.__path__[0].split("/")[:-1]+["paraview","vtk"])
-inpath3 =  "/".join(numpy.__path__[0].split("/")[:-1]+["vtk"])
-inpath4 =  "/".join(numpy.__path__[0].split("/")[:-1]+["ParaView-3.11.1-py2.7.egg","paraview",])
-inpath5 =  "/".join(numpy.__path__[0].split("/")[:-1]+["ParaView-3.11.1-py2.7.egg","paraview","vtk"])
-inpath6 =  "/".join(numpy.__path__[0].split("/")[:-1]+["VTK-5.9.0-py2.7.egg","vtk"])
-paraviewPath = "/".join(sys.prefix.split("/")[:-5]+["Externals","lib","paraview-3.11"]) #= '/usr/local/uvcdat/1.0.alpha/Externals/lib/paraview-3.11/'
-def doPath(inpath,paraviewPath,sameDir=False):
-    files = os.popen("ls %s" % inpath).readlines()
-    for f in files:
-        lib = inpath+"/"+f.strip()
-        print lib
-        change(lib,bad,paraviewPath,sameDir)
-doPath(inpath,paraviewPath)
-doPath(inpath2,paraviewPath)
-doPath(inpath3,paraviewPath)
-doPath(inpath4,paraviewPath)
-doPath(inpath5,paraviewPath)
-doPath(inpath6,paraviewPath)
-doPath(paraviewPath,paraviewPath,True)
-
-
diff --git a/CMake/install.py b/CMake/install.py
deleted file mode 100644
index 2e37d9791..000000000
--- a/CMake/install.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import os
-
-# The main installation script is installation/install.py
-# However, we need to first check for problems using 1.5.2 syntax only.
-current_dir = os.path.dirname(__file__)
-
-execfile(os.path.join(current_dir, 'test_python_ok.py'))
-
-install_script_path = os.path.join(current_dir, '..', 'installation', 'install.py')
-execfile(install_script_path)
diff --git a/CMake/netcdf_clang.patch b/CMake/netcdf_clang.patch
deleted file mode 100644
index 44729cf6e..000000000
--- a/CMake/netcdf_clang.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/ncgen3/load.c b/git/uvcdat/exsrc/ncgen3_load.c
-index 3da4712..147f4e7 100644
---- a/ncgen3/load.c
-+++ b/git/uvcdat/exsrc/ncgen3_load.c
-@@ -5,6 +5,7 @@
-  *********************************************************************/
- 
- #include <stdio.h>
-+#include <config.h>
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
diff --git a/CMake/pyspharm_setup.patch b/CMake/pyspharm_setup.patch
deleted file mode 100644
index da6437198..000000000
--- a/CMake/pyspharm_setup.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- setup.py.ok	2015-07-28 15:37:07.000000000 -0700
-+++ setup.py	2015-07-28 15:53:10.000000000 -0700
-@@ -27,12 +27,12 @@
-  the terms of the SPHEREPACK license at
-  http://www2.cisl.ucar.edu/resources/legacy/spherepack/license\n
-  """)
--    download = raw_input('Do you want to download SPHEREPACK now? (yes or no)')
--    if download not in ['Y','y','yes','Yes','YES']:
--        sys.exit(0)
-+    # download = raw_input('Do you want to download SPHEREPACK now? (yes or no)')
-+    # if download not in ['Y','y','yes','Yes','YES']:
-+    #     sys.exit(0)
-     import urllib, tarfile
-     tarfname = 'spherepack3.2.tar'
--    URL="https://www2.cisl.ucar.edu/sites/default/files/"+tarfname
-+    URL="http://uvcdat.llnl.gov/cdat/resources/"+tarfname
-     urllib.urlretrieve(URL,tarfname)
-     if not os.path.isfile(tarfname):
-         raise IOError('Sorry, download failed')
diff --git a/CMake/python_patch_step.cmake.in b/CMake/python_patch_step.cmake.in
deleted file mode 100644
index c1cb47384..000000000
--- a/CMake/python_patch_step.cmake.in
+++ /dev/null
@@ -1,15 +0,0 @@
-execute_process(
-  COMMAND
-  "@CMAKE_COMMAND@" -E copy_if_different @cdat_SOURCE_DIR@/pysrc/src/setup-@PYTHON_VERSION@.py @python_SOURCE_DIR@/setup.py
-)
-
-# Refer: http://bugs.python.org/issue14572
-if(NOT WIN32)
-  execute_process(
-    WORKING_DIRECTORY @python_SOURCE_DIR@
-    COMMAND patch -p1
-    INPUT_FILE @cdat_CMAKE_SOURCE_DIR@/sqlite3_int64_v2.patch
-  )
-endif()
-
-
diff --git a/CMake/sqlite3_int64_v2.patch b/CMake/sqlite3_int64_v2.patch
deleted file mode 100644
index 3a3ab31d6..000000000
--- a/CMake/sqlite3_int64_v2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-# HG changeset patch
-# Parent 4641d8d99a7dd56c76aa7f769d6d91499113a3b8
-
-diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
---- a/Modules/_sqlite/connection.c
-+++ b/Modules/_sqlite/connection.c
-@@ -549,7 +549,7 @@
-     } else if (py_val == Py_None) {
-         sqlite3_result_null(context);
-     } else if (PyInt_Check(py_val)) {
--        sqlite3_result_int64(context, (sqlite3_int64)PyInt_AsLong(py_val));
-+        sqlite3_result_int64(context, (sqlite_int64)PyInt_AsLong(py_val));
-     } else if (PyLong_Check(py_val)) {
-         sqlite3_result_int64(context, PyLong_AsLongLong(py_val));
-     } else if (PyFloat_Check(py_val)) {
-@@ -580,7 +580,7 @@
-     sqlite3_value* cur_value;
-     PyObject* cur_py_value;
-     const char* val_str;
--    sqlite3_int64 val_int;
-+    sqlite_int64 val_int;
-     Py_ssize_t buflen;
-     void* raw_buffer;
- 
diff --git a/CMake/test_python_ok.py b/CMake/test_python_ok.py
deleted file mode 100644
index 274e15ac9..000000000
--- a/CMake/test_python_ok.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import sys, os
-# The main installation script is installation/install.py
-# However, we need to first check for problems using 1.5.2 syntax only.
-trouble = 0
-minimum_python_version = (2,5,0,'final',0)
-if not hasattr(sys, 'version_info') or sys.version_info < minimum_python_version:
-    sys.stderr.write("Your Python is too old; please see README.txt.\n")
-    trouble = 1
-for x in ["PYTHONHOME"]:
-    if os.environ.has_key(x):
-        sys.stderr.write('Please undefine ' + x + ' before installation.\n')
-        trouble = 1
-if not os.environ.has_key('HOME'):
-    sys.stderr.write(\
-"Caution: You'll need to set environment variable HOME before using CDAT.\n")
-
-if trouble:
-    raise SystemExit, 1
-print 'Your Python checked OK!'
diff --git a/CMake/travis_build.cmake b/CMake/travis_build.cmake
deleted file mode 100644
index 83c821435..000000000
--- a/CMake/travis_build.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-set(CTEST_SOURCE_DIRECTORY "$ENV{TRAVIS_BUILD_DIR}")
-set(CTEST_BINARY_DIRECTORY "$ENV{TRAVIS_BUILD_DIR}/../_build")
-
-include(${CTEST_SOURCE_DIRECTORY}/CTestConfig.cmake)
-set(CTEST_SITE "Travis")
-set(CTEST_BUILD_NAME "Linux-$ENV{TRAVIS_BRANCH}")
-set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
-
-ctest_start("Continuous")
-ctest_configure()
-ctest_build()
-#ctest_test(INCLUDE vcs PARALLEL_LEVEL 1 RETURN_VALUE res)
-#ctest_coverage()
-#file(REMOVE ${CTEST_BINARY_DIRECTORY}/coverage.xml)
-
-#if(NOT res EQUAL 0)
-#  message(FATAL_ERROR "Test failures occurred.")
-#endif()
diff --git a/CMake/travis_submit.cmake b/CMake/travis_submit.cmake
deleted file mode 100644
index 285e876e5..000000000
--- a/CMake/travis_submit.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(CTEST_SOURCE_DIRECTORY "$ENV{TRAVIS_BUILD_DIR}")
-set(CTEST_BINARY_DIRECTORY "$ENV{TRAVIS_BUILD_DIR}/../_build")
-
-include(${CTEST_SOURCE_DIRECTORY}/CTestConfig.cmake)
-set(CTEST_SITE "Travis")
-set(CTEST_BUILD_NAME "Linux-$ENV{TRAVIS_BRANCH}")
-set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
-
-ctest_start("Continuous")
-ctest_submit()
diff --git a/CMake/uvcdat.plist b/CMake/uvcdat.plist
deleted file mode 100644
index 496982c35..000000000
--- a/CMake/uvcdat.plist
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>uvcdat</string>
-	<key>CFBundleGetInfoString</key>
-	<string></string>
-	<key>CFBundleIconFile</key>
-	<string>uvcdat.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string></string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleLongVersionString</key>
-	<string></string>
-	<key>CFBundleName</key>
-	<string>UVCDAT</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string></string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string></string>
-	<key>CSResourcesFileMapped</key>
-	<true/>
-	<key>LSRequiresCarbon</key>
-	<true/>
-  <key>LSUIElement</key>
-  <string>1</string>
-	<key>NSHumanReadableCopyright</key>
-	<string></string>
-</dict>
-</plist>
-- 
GitLab


From bd749c47392ab0f409a124bf5805cb274588e40f Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 7 Jun 2016 16:13:30 -0700
Subject: [PATCH 148/191] file needed

---
 .../checkout_testdata.cmake                   | 256 ++++++++++++++++++
 1 file changed, 256 insertions(+)
 create mode 100644 CMake/cdat_modules_extra/checkout_testdata.cmake

diff --git a/CMake/cdat_modules_extra/checkout_testdata.cmake b/CMake/cdat_modules_extra/checkout_testdata.cmake
new file mode 100644
index 000000000..d914fa3ca
--- /dev/null
+++ b/CMake/cdat_modules_extra/checkout_testdata.cmake
@@ -0,0 +1,256 @@
+# Usage:
+# cmake -DGIT_EXECUTABLE=[git executable]
+#       -DTESTDATA_URL=[uvcdat-testdata url]
+#       -DTESTDATA_DIR=[local testdata directory]
+#       -DSOURCE_DIR=[uvcdat source root]
+#       -P checkout_testdata.cmake
+#
+# This script creates and syncs a clone of the uvcdat-testdata directory.
+#
+# In detail:
+#
+# 1) Check if the TESTDATA_DIR exists.
+#    If not, clone the repo and exit.
+# 2) Check if the TESTDATA_DIR is a git repo with TESTDATA_URL as its origin.
+#    If not, abort with a warning message.
+# 3) Check if the TESTDATA_DIR repo is clean.
+#    If not, abort with an warning message.
+# 4) Fetch the current git branch name for the SOURCE_DIR repo.
+#    If the current HEAD is not a named branch, use master.
+# 5) Update the remote branches in the TESTDATA_DIR repo.
+# 6) Check if the desired branch exists in TESTDATA_DIR's origin remote.
+# 7) Check if the desired branch exists in TESTDATA_DIR as a local branch.
+# 8) If the neither the local or remote branch exist, use master.
+# 9) Check out the local <branch> in TESTDATA_DIR repo.
+# 10) If the remote branch exists, or we are using master, run
+#     'git pull origin <branch>:<branch>' to fetch/update the local branch from
+#     the remote.
+#
+# Any failures are handled via non-fatal warnings. This is to allow the project
+# to build when access to the repo is not available.
+
+# 1) Clone and exit if the target directory doesn't exist.
+if(NOT EXISTS "${TESTDATA_DIR}")
+  message("Cloning \"${TESTDATA_URL}\" into \"${TESTDATA_DIR}\"...")
+
+  # Use depth=1 to avoid fetching the full history. Use "git pull --unshallow"
+  # to backfill the history if needed.
+  # --no-single-branch fetches the tip of all remote branches -- this is needed
+  # for auto-updating the testdata when the source branch changes.
+  execute_process(COMMAND
+    "${GIT_EXECUTABLE}"
+      clone --depth=1 --no-single-branch "${TESTDATA_URL}" "${TESTDATA_DIR}"
+    RESULT_VARIABLE RESULT
+    ERROR_VARIABLE OUTPUT
+    OUTPUT_VARIABLE OUTPUT)
+
+  string(STRIP "${OUTPUT}" OUTPUT)
+
+  message("${OUTPUT}")
+
+  if(NOT RESULT EQUAL 0)
+    message("Could not clone test data repo! "
+            "Baseline images will not be available.")
+    return()
+  endif()
+endif()
+
+# bots merge master in and mess the following, always rechecking master
+# bots check out the correct branches
+# following keyword skips the branch checking
+if (CDAT_CHECKOUT_BASELINE_MATCHING_BRANCH)
+    message("[INFO] Trying to find matching branch on baseline repo")
+    # 2) Is TESTDATA_DIR a clone of TESTDATA_URL?
+    execute_process(COMMAND
+      "${GIT_EXECUTABLE}" config --get remote.origin.url
+      WORKING_DIRECTORY "${TESTDATA_DIR}"
+      RESULT_VARIABLE RESULT
+      ERROR_VARIABLE OUTPUT
+      OUTPUT_VARIABLE OUTPUT)
+
+    if(NOT RESULT EQUAL 0)
+      message("Cannot update uvcdat-testdata checkout at \"${TESTDATA_DIR}\". "
+              "Directory exists and is not a git repository. "
+              "Baseline images may be out of date.")
+      return()
+    endif()
+
+    string(STRIP "${OUTPUT}" OUTPUT)
+
+    if(NOT "${TESTDATA_URL}" STREQUAL "${OUTPUT}")
+      message("Cannot update uvcdat-testdata checkout at \"${TESTDATA_DIR}\". "
+              "Directory is a git clone of \"${OUTPUT}\", not \"${TESTDATA_URL}\". "
+              "Baseline images may be out of date.")
+      return()
+    endif()
+
+    # 3) Is the current testdata repo clean? Don't want to clobber any local mods.
+    # Update the index first:
+    execute_process(COMMAND
+      "${GIT_EXECUTABLE}" update-index -q --refresh
+      WORKING_DIRECTORY "${TESTDATA_DIR}"
+      RESULT_VARIABLE RESULT
+      ERROR_VARIABLE OUTPUT
+      OUTPUT_VARIABLE OUTPUT)
+
+    if(NOT RESULT EQUAL 0)
+      message("Cannot update uvcdat-testdata checkout at \"${TESTDATA_DIR}\". "
+              "Error updating current index with 'git update-index -q --refresh':\n."
+              "${OUTPUT}\n"
+              "Baseline images may be out of date.")
+      return()
+    endif()
+
+    # Now check if the index is dirty:
+    execute_process(COMMAND
+      "${GIT_EXECUTABLE}" diff-index --name-only HEAD "--"
+      WORKING_DIRECTORY "${TESTDATA_DIR}"
+      RESULT_VARIABLE RESULT
+      ERROR_VARIABLE OUTPUT
+      OUTPUT_VARIABLE OUTPUT)
+
+    if(NOT RESULT EQUAL 0)
+      message("Cannot update uvcdat-testdata checkout at \"${TESTDATA_DIR}\". "
+              "Error checking current index with 'git diff-index --name-only HEAD --':\n."
+              "${OUTPUT}\n"
+              "Baseline images may be out of date.")
+      return()
+    endif()
+
+    string(STRIP "${OUTPUT}" OUTPUT)
+
+    if(NOT "${OUTPUT}" STREQUAL "")
+      message("Cannot update uvcdat-testdata checkout at \"${TESTDATA_DIR}\". "
+              "Current checkout is not clean. The following files have modifications:\n"
+              "${OUTPUT}\n"
+              "Baseline images may be out of date.")
+      return()
+    endif()
+
+    # 4) Get the current branch name of the source repo.
+    execute_process(COMMAND
+      "${GIT_EXECUTABLE}" rev-parse --abbrev-ref HEAD
+      WORKING_DIRECTORY "${SOURCE_DIR}"
+      RESULT_VARIABLE RESULT
+      ERROR_VARIABLE OUTPUT
+      OUTPUT_VARIABLE OUTPUT)
+
+    if(NOT RESULT EQUAL 0)
+      message("Cannot update uvcdat-testdata checkout at \"${TESTDATA_DIR}\". "
+              "Cannot determine current branch name of source directory. "
+              "Baseline images may be out of date.")
+      return()
+    endif()
+
+    string(STRIP "${OUTPUT}" BRANCH)
+
+    # If BRANCH is "HEAD", we're not on a named branch. Just use master in that
+    # case.
+    if("${BRANCH}" STREQUAL "HEAD")
+      message("The current source directory at '${SOURCE_DIR}' is not on a named "
+              "branch. Using the 'master' branch of the testdata repo.")
+      set(BRANCH "master")
+    endif()
+
+    # 5) Update the remote branches available on the testdata repo.
+    execute_process(COMMAND
+      "${GIT_EXECUTABLE}" fetch --depth=1
+      WORKING_DIRECTORY "${TESTDATA_DIR}"
+      RESULT_VARIABLE RESULT
+      ERROR_VARIABLE OUTPUT
+      OUTPUT_VARIABLE OUTPUT)
+
+    if(NOT RESULT EQUAL 0)
+      message("Cannot update uvcdat-testdata checkout at \"${TESTDATA_DIR}\". "
+              "Error updating remote branches with "
+              "'git fetch --depth=1':\n."
+              "${OUTPUT}\n"
+              "Baseline images may be out of date.")
+      return()
+    endif()
+
+    # 6) Check if the desired branch exists in TESTDATA_DIR's origin remote.
+    execute_process(COMMAND
+      "${GIT_EXECUTABLE}" branch -a --list "*${BRANCH}"
+      WORKING_DIRECTORY "${TESTDATA_DIR}"
+      RESULT_VARIABLE RESULT
+      ERROR_VARIABLE OUTPUT
+      OUTPUT_VARIABLE OUTPUT)
+
+    if(NOT RESULT EQUAL 0)
+      message("Cannot update uvcdat-testdata checkout at \"${TESTDATA_DIR}\". "
+              "Error obtaining full branch list:\n${OUTPUT}"
+              "Baseline images may be out of date.")
+      return()
+    endif()
+
+    message("Testing if remote branch 'origin/${BRANCH}' exists...")
+    string(FIND "${OUTPUT}" " remotes/origin/${BRANCH}\n" POS)
+    if(NOT POS EQUAL -1)
+      message("Remote branch exists.")
+      set(REMOTE_EXISTS "YES")
+    else()
+      message("Remote branch does not exist.")
+      set(REMOTE_EXISTS "NO")
+    endif()
+
+    # 7) Check if the desired branch exists locally:
+    message("Testing if local branch '${BRANCH}' exists...")
+    string(FIND "${OUTPUT}" " ${BRANCH}\n" POS) # Leading space in regex intended
+    if(NOT POS EQUAL -1)
+      message("Local branch exists.")
+      set(LOCAL_EXISTS "YES")
+    else()
+      message("Local branch does not exist.")
+      set(LOCAL_EXISTS "NO")
+    endif()
+
+    # 8) If the neither the local or remote branch exist, use master.
+    if(NOT REMOTE_EXISTS AND NOT LOCAL_EXISTS)
+      set(BRANCH "master")
+      set(REMOTE_EXISTS "YES")
+      set(LOCAL_EXISTS "YES")
+    endif()
+
+    # 9) Check out the desired branch in TESTDATA_DIR repo.
+    message("Checking out branch '${BRANCH}' in repo '${TESTDATA_DIR}'.")
+    execute_process(COMMAND
+      "${GIT_EXECUTABLE}" checkout "${BRANCH}"
+      WORKING_DIRECTORY "${TESTDATA_DIR}"
+      RESULT_VARIABLE RESULT
+      ERROR_VARIABLE OUTPUT
+      OUTPUT_VARIABLE OUTPUT)
+
+    if(NOT RESULT EQUAL 0)
+      message("Cannot update uvcdat-testdata checkout at \"${TESTDATA_DIR}\". "
+              "Error executing 'git checkout ${BRANCH}':\n."
+              "${OUTPUT}\n"
+              "Baseline images may be out of date.")
+      return()
+    endif()
+
+    # 10) If the remote branch exists, or we are using master, run
+    #     'git pull origin <branch>:<branch>' to fetch/update the local branch from
+    #     the remote.
+    if(REMOTE_EXISTS)
+      message("Updating \"${TESTDATA_DIR}:${BRANCH}\" from "
+              "\"${TESTDATA_URL}:${BRANCH}\"...")
+      execute_process(COMMAND
+        "${GIT_EXECUTABLE}" pull origin "${BRANCH}:${BRANCH}"
+        WORKING_DIRECTORY "${TESTDATA_DIR}"
+        RESULT_VARIABLE RESULT
+        ERROR_VARIABLE OUTPUT
+        OUTPUT_VARIABLE OUTPUT)
+
+      string(STRIP "${OUTPUT}" OUTPUT)
+
+      message("${OUTPUT}")
+
+      if(NOT RESULT EQUAL 0)
+        message("Error updating testdata repo! "
+                "Baseline images may be out of date.")
+      endif()
+    endif()
+else()
+    message("[INFO] NOT trying to switch branch on baseline (only bots should turn this on)")
+endif()
-- 
GitLab


From 5a811816540985b9d3558ff51030b6b97c40d082 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 7 Jun 2016 16:15:22 -0700
Subject: [PATCH 149/191] pcmdi won't work unitl rebuild or checkout from
 nightly

---
 testing/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
index 909790f68..f890a8e22 100644
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -43,4 +43,4 @@ add_subdirectory(Thermo)
 add_subdirectory(unidata)
 add_subdirectory(cdms2)
 add_subdirectory(xmgrace)
-add_subdirectory(pcmdi)
+#add_subdirectory(pcmdi)
-- 
GitLab


From c22af32985fbc256bca628448ba4f4a13529a8bf Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Wed, 8 Jun 2016 00:06:50 -0400
Subject: [PATCH 150/191] Updated text on conda

---
 Packages/vcs/docs/user-guide.rst | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/Packages/vcs/docs/user-guide.rst b/Packages/vcs/docs/user-guide.rst
index 97a55b7d4..2f87fa221 100644
--- a/Packages/vcs/docs/user-guide.rst
+++ b/Packages/vcs/docs/user-guide.rst
@@ -16,13 +16,25 @@ vcs specific entities will be ``formatted like this``.
 Installation
 ------------
 While there are many ways a user can install vcs, installation using conda is
-preferred for the end user. Currently, to install vcs, you need to install the entire uvcdat
-pacakge. ::
+preferred for the end user. To install just vcs or uvcdat, make sure that anaconda
+or miniconda is installed and in path of your shell. Information on how to install conda
+can be found `here <https://www.continuum.io>`_. Very conda is available on the shell using
+the following command ::
 
-    conda install -c uvcdat
+    conda --help
 
-It is assumed that conda is installed on user's system and is available on the shell.
+To enable conda installation in a tight ssl certificate/security environment try ::
 
+    conda config --set ssl_verify False
+    binstar config --set verify_ssl False
+
+Install uvcdat which will install vcs as well using the following command ::
+
+    conda install uvcdat -c uvcdat
+
+To install only vcs, use the following command ::
+
+    conda install vcs -c uvcdat
 
 Concepts
 --------
-- 
GitLab


From 904bacdac9ab695326bf9e1fd5efb20e56d368b2 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Wed, 8 Jun 2016 00:17:02 -0400
Subject: [PATCH 151/191] Fixed note on colormap object

---
 Packages/vcs/docs/user-guide.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Packages/vcs/docs/user-guide.rst b/Packages/vcs/docs/user-guide.rst
index 2f87fa221..6e03c0ee3 100644
--- a/Packages/vcs/docs/user-guide.rst
+++ b/Packages/vcs/docs/user-guide.rst
@@ -6,8 +6,7 @@ Document Conventions
 
 This User Guide is written for end-users of vcs, rather than developers. If you
 have suggestions or questions about this documentation, feel free to contact us
-on `UV-CDAT <https://github.com/UV-CDAT/uvcdat>`_,
-`mailing list <uvcdat-users@lists.llnl.gov>`_.
+on `UV-CDAT <https://github.com/UV-CDAT/uvcdat>`_ `mailing list <uvcdat-users@lists.llnl.gov>`_.
 
 vcs specific entities will be ``formatted like this``.
 
@@ -95,7 +94,8 @@ A description of each secondary object is warranted before showing their use and
 The colormap object is used to specify, create, and modify colormaps. There are 256 colors and color indices, but only the first 240 color indices can be modified (indices 240 through 255 are reserved for VCS internal use). The description of the colormap object is as follows:
 
 * ``colormap`` - A colormap contains 240 user-definable colors that are used for graphical displays. The color mixtures are defined in terms of percentages of red, green, and blue colors (0 to 100% for each). The resulting color depends on the specified mixtures of red, green, and blue. Its class symbol or alias is “Cp”.
-Note: VCS colormaps are objects, but they are not referenced like other secondary objects.
+
+.. note:: VCS colormaps are objects, but they are not referenced like other secondary objects.
 
 
 **Fillarea Object**
-- 
GitLab


From fe75ca438dfc532167923b637580e476deb3f758 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Wed, 8 Jun 2016 10:40:22 -0400
Subject: [PATCH 152/191] Updated cmake to use new location for legal and
 readme

---
 CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32b16d453..a3a96dc7b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -831,8 +831,8 @@ set(CPACK_PACKAGE_VERSION_MAJOR "2")
 set(CPACK_PACKAGE_VERSION_MINOR "3")
 set(CPACK_PACKAGE_VERSION_PATCH "0")
 set(CPACK_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/docs/README.txt")
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/docs/Legal.txt")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LEGAL.txt")
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Aashish Chaudhary") #required
 set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
 set(CPACK_RPM_PACKAGE_PROVIDES /usr/local/uvcdat/bin/python /usr/local/uvcdat/bin/python2.7)
@@ -883,7 +883,7 @@ install(CODE "
       endif ()
     endif ()
   endforeach()
-  
+
 
   file(INSTALL FILES \${resolved_programs} DESTINATION
     \"\${CMAKE_INSTALL_PREFIX}/${CPACK_DESTINATION_BIN_PREFIX}\"
@@ -971,7 +971,7 @@ install(CODE "
          PERMISSIONS USE_SOURCE_PERMISSIONS
     )
   endif()
-  
+
   file(INSTALL FILES ${cdat_BINARY_DIR}/build_info.txt DESTINATION ${CMAKE_INSTALL_PREFIX}/info)
 
   # Unset QT_LIB_DIR as we need to use the one in user's environment
-- 
GitLab


From 018a30849668b3897d00cb7c05f7d2f33fe4cc7d Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 8 Jun 2016 07:47:56 -0700
Subject: [PATCH 153/191] flake8 for dv3d

---
 Packages/testing/regression.py | 2 +-
 Packages/vcs/vcs/dv3d.py       | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Packages/testing/regression.py b/Packages/testing/regression.py
index 72047380e..aa8efa96b 100644
--- a/Packages/testing/regression.py
+++ b/Packages/testing/regression.py
@@ -83,7 +83,7 @@ def find_alternates(fname):
     return results
 
 def check_result_image(fname, baselinefname=sys.argv[1], threshold=defaultThreshold,
-                       baseline=True, cleanup=True, update_baselines = False):
+                       baseline=True, cleanup=True, update_baselines = True):
     testImage = image_from_file(fname)
     if testImage is None:
         print "Testing image missing, test failed."
diff --git a/Packages/vcs/vcs/dv3d.py b/Packages/vcs/vcs/dv3d.py
index 2afae29f2..4a30aed8e 100644
--- a/Packages/vcs/vcs/dv3d.py
+++ b/Packages/vcs/vcs/dv3d.py
@@ -158,7 +158,6 @@ class Gfdv3d(object):
         self.plot_attributes['name'] = self.g_name
         self.plot_attributes['template'] = Gfdv3d_name
 
-
     def setProvenanceHandler(self, provenanceHandler):
         self.provenanceHandler = provenanceHandler
 
-- 
GitLab


From 514af9db51d5d446aa112836655be0305642bd68 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 8 Jun 2016 08:24:12 -0700
Subject: [PATCH 154/191] test tweaks

---
 CMake/cdat_modules_extra/install_cdat_from_conda.bash.in   | 2 +-
 testing/regrid/testDistSrc.py                              | 7 ++++---
 testing/vcs/test_vcs_line_patterns.py                      | 2 --
 testing/vcsaddons/test_12_plot_one_leg_per_row.py          | 3 ++-
 testing/vcsaddons/test_EzTemplate_12_plots_clean_func.py   | 2 +-
 .../vcsaddons/test_EzTemplate_12_plots_legd_direction.py   | 3 ++-
 .../test_EzTemplate_12_plots_margins_thickness.py          | 3 ++-
 .../vcsaddons/test_EzTemplate_12_plots_mix_glb_local.py    | 3 ++-
 testing/vcsaddons/test_EzTemplate_12_plots_spacing.py      | 3 ++-
 9 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
index 78e72d78e..1c9ce4163 100755
--- a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
+++ b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
@@ -3,7 +3,7 @@
 conda create -y -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@  hdf5 libnetcdf lapack clapack ossuuid libcf esmf jasper g2clib yasm x264 ffmpeg cmor vtk==uvcdat libcdms cdat_info flake8 requests numpy==1.9.2 matplotlib --show-channel-urls
 
 source activate @CONDA_ENVIRONMENT_NAME@
-for pkg in testing cdtime regrid2 cdms2 esg DV3D vcs vcsaddons EzTemplate cdutil unidata xmgrace genutil Thermo WK distarray; do
+for pkg in testing cdtime regrid2 cdms2 esg DV3D vcs vcsaddons cdutil unidata xmgrace genutil Thermo WK distarray; do
     cd @cdat_SOURCE_DIR@/Packages/${pkg}
     rm -rf build
     if [ ${pkg} == "vcs" ]; then
diff --git a/testing/regrid/testDistSrc.py b/testing/regrid/testDistSrc.py
index 183efd498..9da231af5 100644
--- a/testing/regrid/testDistSrc.py
+++ b/testing/regrid/testDistSrc.py
@@ -14,7 +14,7 @@ import regrid2
 import unittest
 import ESMP
 from regrid2 import esmf
-import scipy.io.netcdf
+#import scipy.io.netcdf
 from regrid2 import ESMFRegrid
 import sys
 HAS_MPI = False
@@ -75,7 +75,7 @@ class Test(unittest.TestCase):
 
     def Xtest0_ESMP(self):
 
-        import scipy.io.netcdf
+        #import scipy.io.netcdf
 
         #
         # 1. input
@@ -85,7 +85,8 @@ class Test(unittest.TestCase):
 
         inFile = cdat_info.get_sampledata_path() + \
             '/so_Omon_ACCESS1-0_historical_r1i1p1_185001-185412_2timesteps.nc'
-        srcF = scipy.io.netcdf.netcdf_file(inFile)
+        #srcF = scipy.io.netcdf.netcdf_file(inFile)
+        srcF = cdms2.open(inFile)
         #so = srcF.variables['so'][0, 0,...]
         missing_value = 1.e20
         srcGrd = [srcF.variables['lat'][:], srcF.variables['lon'][:]]
diff --git a/testing/vcs/test_vcs_line_patterns.py b/testing/vcs/test_vcs_line_patterns.py
index 7597403fc..848ebb110 100755
--- a/testing/vcs/test_vcs_line_patterns.py
+++ b/testing/vcs/test_vcs_line_patterns.py
@@ -8,8 +8,6 @@ import testing.regression as regression
 pth = os.path.join(os.path.dirname(__file__), "..")
 sys.path.append(pth)
 
-import checkimage
-
 x = regression.init(bg=1, geometry=(1620, 1080))
 
 f = cdms2.open(vcs.sample_data + "/clt.nc")
diff --git a/testing/vcsaddons/test_12_plot_one_leg_per_row.py b/testing/vcsaddons/test_12_plot_one_leg_per_row.py
index 0c0298527..4f836c1d4 100644
--- a/testing/vcsaddons/test_12_plot_one_leg_per_row.py
+++ b/testing/vcsaddons/test_12_plot_one_leg_per_row.py
@@ -1,4 +1,5 @@
-import os, sys, EzTemplate, vcs, testing.regression as regression
+import os, sys, vcs, testing.regression as regression
+from vcsaddons import EzTemplates
 
 ## Initialize VCS
 x = vcs.init()
diff --git a/testing/vcsaddons/test_EzTemplate_12_plots_clean_func.py b/testing/vcsaddons/test_EzTemplate_12_plots_clean_func.py
index 6a9d50284..141d94e09 100644
--- a/testing/vcsaddons/test_EzTemplate_12_plots_clean_func.py
+++ b/testing/vcsaddons/test_EzTemplate_12_plots_clean_func.py
@@ -1,5 +1,5 @@
 import vcs
-import EzTemplate
+form vcsaddons import EzTemplate
 
 M=EzTemplate.Multi(rows=2,columns=2)
 
diff --git a/testing/vcsaddons/test_EzTemplate_12_plots_legd_direction.py b/testing/vcsaddons/test_EzTemplate_12_plots_legd_direction.py
index d46e7b9ac..e941fba16 100644
--- a/testing/vcsaddons/test_EzTemplate_12_plots_legd_direction.py
+++ b/testing/vcsaddons/test_EzTemplate_12_plots_legd_direction.py
@@ -1,4 +1,5 @@
-import os, sys, EzTemplate, vcs, testing.regression as regression
+import os, sys, vcs, testing.regression as regression
+from vcsaddons import EzTemplate
 
 ## Initialize VCS
 x = vcs.init()
diff --git a/testing/vcsaddons/test_EzTemplate_12_plots_margins_thickness.py b/testing/vcsaddons/test_EzTemplate_12_plots_margins_thickness.py
index 73b7c8dbf..60d354127 100644
--- a/testing/vcsaddons/test_EzTemplate_12_plots_margins_thickness.py
+++ b/testing/vcsaddons/test_EzTemplate_12_plots_margins_thickness.py
@@ -1,4 +1,5 @@
-import os, sys, EzTemplate, vcs, testing.regression as regression
+import os, sys, vcs, testing.regression as regression
+from vcsaddons import EzTemplate
 
 ## Initialize VCS
 x = vcs.init()
diff --git a/testing/vcsaddons/test_EzTemplate_12_plots_mix_glb_local.py b/testing/vcsaddons/test_EzTemplate_12_plots_mix_glb_local.py
index 6e9398fe8..2e9be2521 100644
--- a/testing/vcsaddons/test_EzTemplate_12_plots_mix_glb_local.py
+++ b/testing/vcsaddons/test_EzTemplate_12_plots_mix_glb_local.py
@@ -1,4 +1,5 @@
-import os, sys, EzTemplate, vcs, testing.regression as regression
+import os, sys, vcs, testing.regression as regression
+from vcsaddons import EzTemplate
 ## Initialize VCS
 x=vcs.init()
 x.drawlogooff()
diff --git a/testing/vcsaddons/test_EzTemplate_12_plots_spacing.py b/testing/vcsaddons/test_EzTemplate_12_plots_spacing.py
index 5d4cd293b..3b60a8d07 100644
--- a/testing/vcsaddons/test_EzTemplate_12_plots_spacing.py
+++ b/testing/vcsaddons/test_EzTemplate_12_plots_spacing.py
@@ -1,4 +1,5 @@
-import os, sys, EzTemplate, vcs, testing.regression as regression
+import os, sys, vcs, testing.regression as regression
+from vcsaddons import EzTemplate
 ## Initialize VCS
 x = vcs.init()
 x.drawlogooff()
-- 
GitLab


From 3df8fa1fed90337e69a8510dc8cc9bff5218299c Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 8 Jun 2016 08:59:22 -0700
Subject: [PATCH 155/191] mac passes now

---
 testing/vcsaddons/test_12_plot_one_leg_per_row.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/vcsaddons/test_12_plot_one_leg_per_row.py b/testing/vcsaddons/test_12_plot_one_leg_per_row.py
index 4f836c1d4..9e8f25ab9 100644
--- a/testing/vcsaddons/test_12_plot_one_leg_per_row.py
+++ b/testing/vcsaddons/test_12_plot_one_leg_per_row.py
@@ -1,5 +1,5 @@
 import os, sys, vcs, testing.regression as regression
-from vcsaddons import EzTemplates
+from vcsaddons import EzTemplate
 
 ## Initialize VCS
 x = vcs.init()
-- 
GitLab


From 541a590922b6332eb50d9f10a55ddfd19ba6e563 Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Wed, 8 Jun 2016 13:43:07 -0400
Subject: [PATCH 156/191] falke8

---
 Packages/vcsaddons/Lib/polar.py | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/Packages/vcsaddons/Lib/polar.py b/Packages/vcsaddons/Lib/polar.py
index 622b0d3a0..900b34916 100644
--- a/Packages/vcsaddons/Lib/polar.py
+++ b/Packages/vcsaddons/Lib/polar.py
@@ -49,7 +49,8 @@ def convert_arrays(var, theta):
                         except AttributeError:
                             names.append(None)
                     else:
-                        raise ValueError("Array is wrong shape; expected 2d array of 2-long elements, got %dd array of %d-long elements." % (len(arr.shape), arr.shape[-1]))
+                        raise ValueError("Array is wrong shape; expected 2d array of 2-long elements,"
+                                         " got %dd array of %d-long elements." % (len(arr.shape), arr.shape[-1]))
                 else:
                     if len(arr) == 2:
                         # Might be just a pair
@@ -62,7 +63,8 @@ def convert_arrays(var, theta):
                     theta_group = []
                     for val in arr:
                         if len(val) != 2:
-                            raise ValueError("List is wrong shape; expected list/tuple of 2 element list/tuples, got %s of %d elements." % (type(val).__name__, len(val)))
+                            raise ValueError("List is wrong shape; expected list/tuple of 2 element list/tuples,"
+                                             " got %s of %d elements." % (type(val).__name__, len(val)))
                         mag_group.append(val[0])
                         theta_group.append(val[1])
                         names.append(None)
@@ -112,7 +114,8 @@ def convert_arrays(var, theta):
                     except AttributeError:
                         names.append(None)
             else:
-                raise ValueError("Array is wrong shape; expected 1d array or 2d array, got %dd array." % len(var.shape))
+                raise ValueError("Array is wrong shape; expected 1d array or 2d array,"
+                                 " got %dd array." % len(var.shape))
 
         thetas = []
         if isinstance(theta, (list, tuple)):
@@ -126,7 +129,8 @@ def convert_arrays(var, theta):
             elif len(theta.shape) == 2:
                 thetas = [list(theta[i]) for i in range(theta.shape[0])]
             else:
-                raise ValueError("Array is wrong shape; expected 1d array or 2d array, got %dd array." % len(var.shape))
+                raise ValueError("Array is wrong shape; expected 1d array or 2d array,"
+                                 " got %dd array." % len(var.shape))
         if not names:
             names = [None] * len(var)
     return magnitudes, thetas, names
@@ -335,7 +339,8 @@ class Gpo(vcsaddons.core.VCSaddon):
             m_ticks.y = []
 
             if template.ylabel1.priority > 0:
-                to = self.text_orientation_for_angle(self.magnitude_tick_angle, source=template.ylabel1.textorientation)
+                to = self.text_orientation_for_angle(self.magnitude_tick_angle,
+                                                     source=template.ylabel1.textorientation)
                 m_labels = self.create_text(template.ylabel1.texttable, to)
                 m_labels.x = []
                 m_labels.y = []
@@ -410,7 +415,9 @@ class Gpo(vcsaddons.core.VCSaddon):
                 y0 = center[1] + (ymul * radius * numpy.sin(angle))
                 y1 = center[1]
                 if t_labels is not None:
-                    label = self.create_text(template.xlabel1.texttable, self.text_orientation_for_angle(angle, source=template.xlabel1.textorientation))
+                    label = self.create_text(template.xlabel1.texttable,
+                                             self.text_orientation_for_angle(angle,
+                                                                             source=template.xlabel1.textorientation))
                     label.string = [theta_labels[t]]
                     label.x = [x0]
                     label.y = [y0]
@@ -481,7 +488,8 @@ class Gpo(vcsaddons.core.VCSaddon):
                 scale = theta_ticks
                 vals = theta_flat
 
-            indices = [numpy.where(numpy.logical_and(vals >= scale[i], vals <= scale[i + 1])) for i in range(len(scale) - 1)]
+            indices = [numpy.where(numpy.logical_and(vals >= scale[i], vals <= scale[i + 1]))
+                       for i in range(len(scale) - 1)]
             magnitudes = [mag_flat[inds] for inds in indices]
             thetas = [theta_flat[inds] for inds in indices]
             names = vcs.mklabels(scale, output="list")
@@ -498,7 +506,8 @@ class Gpo(vcsaddons.core.VCSaddon):
                 y.append(ymul * numpy.sin(t) * r + center[1])
 
             if template.legend.priority > 0 and name is not None:
-                lx, ly = template.legend.x1, template.legend.y1 + len(labels.x) / float(label_count) * (template.legend.y2 - template.legend.y1)
+                y_offset = len(labels.x) / float(label_count) * (template.legend.y2 - template.legend.y1)
+                lx, ly = template.legend.x1, template.legend.y1 + y_offset
                 x.append(lx)
                 y.append(ly)
                 labels.x.append(lx + .01)
-- 
GitLab


From b88ea73a81a0536f6219412a953ca775a2a89716 Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Wed, 8 Jun 2016 13:44:49 -0400
Subject: [PATCH 157/191] flake8 tests

---
 .../vcsaddons/test_vcs_addons_convert_arrays.py   | 15 ++++++++-------
 .../test_vcs_addons_histogram_defaults.py         |  2 +-
 .../test_vcs_addons_histogram_inherit.py          |  2 +-
 testing/vcsaddons/test_vcs_addons_polar.py        |  2 +-
 .../vcsaddons/test_vcs_addons_polar_degrees.py    |  2 +-
 .../vcsaddons/test_vcs_addons_polar_diurnal.py    |  2 +-
 .../vcsaddons/test_vcs_addons_polar_inherit.py    |  2 +-
 .../vcsaddons/test_vcs_addons_polar_seasonal.py   |  2 +-
 .../test_vcs_addons_polar_semidiurnal.py          |  2 +-
 9 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/testing/vcsaddons/test_vcs_addons_convert_arrays.py b/testing/vcsaddons/test_vcs_addons_convert_arrays.py
index c39bea513..6e784e10b 100644
--- a/testing/vcsaddons/test_vcs_addons_convert_arrays.py
+++ b/testing/vcsaddons/test_vcs_addons_convert_arrays.py
@@ -18,23 +18,24 @@ one_list_tuples = zip(magnitudes, thetas)
 one_list_grouped_tuples = [zip(magnitudes[:2], thetas[:2]), zip(magnitudes[2:], thetas[2:])]
 one_list_of_arrays = [numpy.array(zip(magnitudes[:2], thetas[:2])), numpy.array(zip(magnitudes[2:], thetas[2:]))]
 
+
 def compare(input, expected):
     result = vcsaddons.polar.convert_arrays(*input)
     print "Checking", result[0:2], "vs", expected
     assert result[0] == expected[0]
     assert result[1] == expected[1]
 
-grouped = ([magnitudes[:2], magnitudes[2:]],[thetas[:2], thetas[2:]])
+grouped = ([magnitudes[:2], magnitudes[2:]], [thetas[:2], thetas[2:]])
 
-compare((one_array, None), ([magnitudes],[thetas]))
-compare(two_arrays, ([magnitudes],[thetas]))
+compare((one_array, None), ([magnitudes], [thetas]))
+compare(two_arrays, ([magnitudes], [thetas]))
 compare(two_array_groups, grouped)
 three_d_expected = ([[1, 2], [3, 4]], [[5, 6], [7, 8]])
 compare((three_d_array, None), three_d_expected)
-compare(list_and_array, ([magnitudes],[thetas]))
-compare(two_lists, ([magnitudes],[thetas]))
-compare(lists_of_arrays, ([magnitudes],[thetas]))
-compare(array_and_list, ([magnitudes],[thetas]))
+compare(list_and_array, ([magnitudes], [thetas]))
+compare(two_lists, ([magnitudes], [thetas]))
+compare(lists_of_arrays, ([magnitudes], [thetas]))
+compare(array_and_list, ([magnitudes], [thetas]))
 compare((one_list_tuples, None), ([[i] for i in magnitudes], [[i] for i in thetas]))
 compare((one_list_grouped_tuples, None), grouped)
 compare((one_list_of_arrays, None), grouped)
diff --git a/testing/vcsaddons/test_vcs_addons_histogram_defaults.py b/testing/vcsaddons/test_vcs_addons_histogram_defaults.py
index 24af6757b..090aaf33d 100644
--- a/testing/vcsaddons/test_vcs_addons_histogram_defaults.py
+++ b/testing/vcsaddons/test_vcs_addons_histogram_defaults.py
@@ -4,7 +4,7 @@ import testing.regression as regression
 import vcs
 import vcsaddons, numpy
 
-x=regression.init()
+x = regression.init()
 
 numpy.random.seed(seed=12345)
 vals = numpy.random.random_sample(2000) * 100
diff --git a/testing/vcsaddons/test_vcs_addons_histogram_inherit.py b/testing/vcsaddons/test_vcs_addons_histogram_inherit.py
index c761c4e05..a977a68bb 100644
--- a/testing/vcsaddons/test_vcs_addons_histogram_inherit.py
+++ b/testing/vcsaddons/test_vcs_addons_histogram_inherit.py
@@ -4,7 +4,7 @@ import testing.regression as regression
 import vcs, cdms2
 import vcsaddons, numpy
 
-x=regression.init()
+x = regression.init()
 
 cdmsfile = cdms2.open(vcs.sample_data + "/clt.nc")
 clt = cdmsfile("clt")
diff --git a/testing/vcsaddons/test_vcs_addons_polar.py b/testing/vcsaddons/test_vcs_addons_polar.py
index 5512d9d52..5fcdc6c95 100644
--- a/testing/vcsaddons/test_vcs_addons_polar.py
+++ b/testing/vcsaddons/test_vcs_addons_polar.py
@@ -4,7 +4,7 @@ import testing.regression as regression
 import vcs
 import vcsaddons, numpy
 
-x=regression.init()
+x = regression.init()
 
 polar = vcsaddons.polar.Gpo()
 polar.markers = ["dot", "circle"]
diff --git a/testing/vcsaddons/test_vcs_addons_polar_degrees.py b/testing/vcsaddons/test_vcs_addons_polar_degrees.py
index 3727dad14..1a44b6b0e 100644
--- a/testing/vcsaddons/test_vcs_addons_polar_degrees.py
+++ b/testing/vcsaddons/test_vcs_addons_polar_degrees.py
@@ -4,7 +4,7 @@ import testing.regression as regression
 import vcs
 import vcsaddons, numpy
 
-x=regression.init()
+x = regression.init()
 
 polar = vcsaddons.getpolar("degrees")
 polar.markers = ["dot", "circle"]
diff --git a/testing/vcsaddons/test_vcs_addons_polar_diurnal.py b/testing/vcsaddons/test_vcs_addons_polar_diurnal.py
index 927180e38..24a6f832b 100644
--- a/testing/vcsaddons/test_vcs_addons_polar_diurnal.py
+++ b/testing/vcsaddons/test_vcs_addons_polar_diurnal.py
@@ -5,7 +5,7 @@ import vcsaddons, numpy
 import cdms2, cdutil, cdtime
 import testing.regression as regression
 
-x=regression.init()
+x = regression.init()
 
 f = cdms2.open(os.path.join(vcs.sample_data, "thermo.nc"))
 temp = f('t')
diff --git a/testing/vcsaddons/test_vcs_addons_polar_inherit.py b/testing/vcsaddons/test_vcs_addons_polar_inherit.py
index 4fc56138d..2eb10b7d8 100644
--- a/testing/vcsaddons/test_vcs_addons_polar_inherit.py
+++ b/testing/vcsaddons/test_vcs_addons_polar_inherit.py
@@ -4,7 +4,7 @@ import testing.regression as regression
 import vcs
 import vcsaddons, numpy
 
-x=regression.init()
+x = regression.init()
 
 gm = vcsaddons.polar.Gpo()
 gm.markers = ["dot", "circle"]
diff --git a/testing/vcsaddons/test_vcs_addons_polar_seasonal.py b/testing/vcsaddons/test_vcs_addons_polar_seasonal.py
index 6a6eafd9b..0f5693a35 100644
--- a/testing/vcsaddons/test_vcs_addons_polar_seasonal.py
+++ b/testing/vcsaddons/test_vcs_addons_polar_seasonal.py
@@ -5,7 +5,7 @@ import vcs
 import vcsaddons, numpy, MV2
 import cdms2, cdutil, cdtime
 
-x=regression.init()
+x = regression.init()
 
 f = cdms2.open(os.path.join(vcs.sample_data, "clt.nc"))
 # Trim first few months and last month so we have even number of seasons
diff --git a/testing/vcsaddons/test_vcs_addons_polar_semidiurnal.py b/testing/vcsaddons/test_vcs_addons_polar_semidiurnal.py
index 3061e8a0d..1ce3f21ef 100644
--- a/testing/vcsaddons/test_vcs_addons_polar_semidiurnal.py
+++ b/testing/vcsaddons/test_vcs_addons_polar_semidiurnal.py
@@ -5,7 +5,7 @@ import vcs
 import vcsaddons, numpy
 import cdms2, cdutil, cdtime
 
-x=regression.init()
+x = regression.init()
 
 f = cdms2.open(os.path.join(vcs.sample_data, "thermo.nc"))
 temp = f('t')
-- 
GitLab


From 1fce425ab5014bf661aedfc23d45b646098e9089 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 8 Jun 2016 12:02:23 -0700
Subject: [PATCH 158/191] option to add suffix to baselines

---
 Packages/testing/regression.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Packages/testing/regression.py b/Packages/testing/regression.py
index aa8efa96b..eeaf3bdf5 100644
--- a/Packages/testing/regression.py
+++ b/Packages/testing/regression.py
@@ -83,7 +83,7 @@ def find_alternates(fname):
     return results
 
 def check_result_image(fname, baselinefname=sys.argv[1], threshold=defaultThreshold,
-                       baseline=True, cleanup=True, update_baselines = True):
+                       baseline=True, cleanup=True, update_baselines = True, suffix="_linux"):
     testImage = image_from_file(fname)
     if testImage is None:
         print "Testing image missing, test failed."
@@ -134,10 +134,11 @@ def check_result_image(fname, baselinefname=sys.argv[1], threshold=defaultThresh
     print "All baselines failed! Lowest error (%f) exceeds threshold (%f)."%(bestDiff, threshold)
 
     if update_baselines:
+        bestFilename2=bestFilename[:-4]+suffix+".png"
         print "Update baselines is ON so we are assuming you know what you're doing"
-        print "Replacing baseline %s with new baseline from %s" % (bestFilename, fname)
+        print "Replacing baseline %s with new baseline from %s" % (bestFilename2, fname)
         import shutil
-        shutil.copy2(fname, bestFilename)
+        shutil.copy2(fname, bestFilename2)
 
     sp = fname.split(".")
     diffFilename = ".".join(sp[:-1])+"_diff."+sp[-1]
-- 
GitLab


From e272435ea165167787e635acee68ef16df323502 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 8 Jun 2016 14:07:41 -0700
Subject: [PATCH 159/191] made suffix one otherwise find_alternate won't find
 them

---
 Packages/testing/regression.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Packages/testing/regression.py b/Packages/testing/regression.py
index eeaf3bdf5..961d1f75a 100644
--- a/Packages/testing/regression.py
+++ b/Packages/testing/regression.py
@@ -83,7 +83,7 @@ def find_alternates(fname):
     return results
 
 def check_result_image(fname, baselinefname=sys.argv[1], threshold=defaultThreshold,
-                       baseline=True, cleanup=True, update_baselines = True, suffix="_linux"):
+                       baseline=True, cleanup=True, update_baselines = True, suffix="_1"):
     testImage = image_from_file(fname)
     if testImage is None:
         print "Testing image missing, test failed."
-- 
GitLab


From 42462a26051832015f5f46b1c4bb9e75e4cccbfc Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 8 Jun 2016 16:18:04 -0700
Subject: [PATCH 160/191] slowly fixing test suite

---
 Packages/testing/regression.py                          | 2 +-
 testing/vcs/test_vcs_matplotlib_colormap.py             | 7 ++++++-
 testing/vcsaddons/test_12_plot_one_leg_per_row_right.py | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Packages/testing/regression.py b/Packages/testing/regression.py
index 961d1f75a..8880c402f 100644
--- a/Packages/testing/regression.py
+++ b/Packages/testing/regression.py
@@ -83,7 +83,7 @@ def find_alternates(fname):
     return results
 
 def check_result_image(fname, baselinefname=sys.argv[1], threshold=defaultThreshold,
-                       baseline=True, cleanup=True, update_baselines = True, suffix="_1"):
+                       baseline=True, cleanup=True, update_baselines = True, suffix="_2"):
     testImage = image_from_file(fname)
     if testImage is None:
         print "Testing image missing, test failed."
diff --git a/testing/vcs/test_vcs_matplotlib_colormap.py b/testing/vcs/test_vcs_matplotlib_colormap.py
index baf0e1bb0..03ec5e8dc 100644
--- a/testing/vcs/test_vcs_matplotlib_colormap.py
+++ b/testing/vcs/test_vcs_matplotlib_colormap.py
@@ -1,4 +1,9 @@
 import os, sys, cdms2, vcs, testing.regression as regression
+import matplotlib
+sp = matplotlib.__version__.split()
+if int(sp[0])*10+int(sp[1])<15:
+    # This only works with matplotlib 1.5 and greater
+    sys.exit()
 
 # Load the clt data:
 dataFile = cdms2.open(os.path.join(vcs.sample_data, "clt.nc"))
@@ -10,4 +15,4 @@ clt = clt(latitude=(-90.0, 90.0), longitude=(-180., 175.), squeeze=1,
 canvas = regression.init()
 canvas.setcolormap(vcs.matplotlib2vcs("viridis"))
 canvas.plot(clt, bg=1)
-regression.run(canvas, "test_matplotlib_colormap.png")
\ No newline at end of file
+regression.run(canvas, "test_matplotlib_colormap.png")
diff --git a/testing/vcsaddons/test_12_plot_one_leg_per_row_right.py b/testing/vcsaddons/test_12_plot_one_leg_per_row_right.py
index b57b76724..6e0e647bc 100644
--- a/testing/vcsaddons/test_12_plot_one_leg_per_row_right.py
+++ b/testing/vcsaddons/test_12_plot_one_leg_per_row_right.py
@@ -1,6 +1,7 @@
 import os, sys, testing.regression as regression
 
-import EzTemplate,vcs
+import vcs
+from vcsaddons import EzTemplate
 import cdms,EzTemplate,vcs,sys
 ## 12 plots 1 legend per row on the right
 ## Initialize VCS
-- 
GitLab


From 39da09b1d92984294b3676a6352d921afb6daf5b Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Thu, 9 Jun 2016 10:03:49 -0700
Subject: [PATCH 161/191] turning off baselines update

---
 Packages/testing/regression.py                          | 2 +-
 testing/vcs/test_vcs_matplotlib_colormap.py             | 2 +-
 testing/vcsaddons/test_12_plot_one_leg_per_row_right.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Packages/testing/regression.py b/Packages/testing/regression.py
index 8880c402f..b0b862993 100644
--- a/Packages/testing/regression.py
+++ b/Packages/testing/regression.py
@@ -83,7 +83,7 @@ def find_alternates(fname):
     return results
 
 def check_result_image(fname, baselinefname=sys.argv[1], threshold=defaultThreshold,
-                       baseline=True, cleanup=True, update_baselines = True, suffix="_2"):
+                       baseline=True, cleanup=True, update_baselines = False, suffix="_2"):
     testImage = image_from_file(fname)
     if testImage is None:
         print "Testing image missing, test failed."
diff --git a/testing/vcs/test_vcs_matplotlib_colormap.py b/testing/vcs/test_vcs_matplotlib_colormap.py
index 03ec5e8dc..b7ba251f5 100644
--- a/testing/vcs/test_vcs_matplotlib_colormap.py
+++ b/testing/vcs/test_vcs_matplotlib_colormap.py
@@ -1,6 +1,6 @@
 import os, sys, cdms2, vcs, testing.regression as regression
 import matplotlib
-sp = matplotlib.__version__.split()
+sp = matplotlib.__version__.split(".")
 if int(sp[0])*10+int(sp[1])<15:
     # This only works with matplotlib 1.5 and greater
     sys.exit()
diff --git a/testing/vcsaddons/test_12_plot_one_leg_per_row_right.py b/testing/vcsaddons/test_12_plot_one_leg_per_row_right.py
index 6e0e647bc..8daf50456 100644
--- a/testing/vcsaddons/test_12_plot_one_leg_per_row_right.py
+++ b/testing/vcsaddons/test_12_plot_one_leg_per_row_right.py
@@ -2,7 +2,7 @@ import os, sys, testing.regression as regression
 
 import vcs
 from vcsaddons import EzTemplate
-import cdms,EzTemplate,vcs,sys
+import cdms,vcs,sys
 ## 12 plots 1 legend per row on the right
 ## Initialize VCS
 x = vcs.init()
-- 
GitLab


From ce4c96affea8e7da1f02baa3b5625ecaec87fa65 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Thu, 9 Jun 2016 10:36:31 -0700
Subject: [PATCH 162/191] added code to make sure we have conda in path

---
 CMake/cdat_modules_extra/install_cdat_from_conda.bash.in | 2 +-
 CMakeLists.txt                                           | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
index 1c9ce4163..c587fed2d 100755
--- a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
+++ b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-conda create -y -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@  hdf5 libnetcdf lapack clapack ossuuid libcf esmf jasper g2clib yasm x264 ffmpeg cmor vtk==uvcdat libcdms cdat_info flake8 requests numpy==1.9.2 matplotlib --show-channel-urls
+@CONDA@ create -y -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@  hdf5 libnetcdf lapack clapack ossuuid libcf esmf jasper g2clib yasm x264 ffmpeg cmor vtk==uvcdat libcdms cdat_info flake8 requests numpy==1.9.2 matplotlib --show-channel-urls
 
 source activate @CONDA_ENVIRONMENT_NAME@
 for pkg in testing cdtime regrid2 cdms2 esg DV3D vcs vcsaddons cdutil unidata xmgrace genutil Thermo WK distarray; do
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9e2fb3f6..64c6b6e33 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,14 @@ set(CMAKE_MODULE_PATH
   ${CMAKE_MODULE_PATH}
 )
 
+find_program(CONDA NAMES conda)
+
+if ( ${CONDA} STREQUAL "CONDA-NOTFOUND" ) 
+    message(FATAL_ERROR "Could not locate conda, please make sure conda is installed and in your PATH")
+endif()
+
+message("[INFO] Found conda at: ${CONDA}")
+
 if (DEFINED ENV{UVCDAT_ANONYMOUS_LOG})
   if (($ENV{UVCDAT_ANONYMOUS_LOG} STREQUAL "yes") OR
       ($ENV{UVCDAT_ANONYMOUS_LOG} STREQUAL "no"))
-- 
GitLab


From 4383c8be5a52028fdceaa77937c492b77f19c43e Mon Sep 17 00:00:00 2001
From: Bryce Sampson <sampson.bryce@yahoo.com>
Date: Thu, 9 Jun 2016 10:54:32 -0700
Subject: [PATCH 163/191] fixed bug with extend right not working of levels is
 a list

---
 Packages/vcs/vcs/VCS_validation_functions.py | 21 ++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/Packages/vcs/vcs/VCS_validation_functions.py b/Packages/vcs/vcs/VCS_validation_functions.py
index 7595d900e..11b76ee5d 100644
--- a/Packages/vcs/vcs/VCS_validation_functions.py
+++ b/Packages/vcs/vcs/VCS_validation_functions.py
@@ -1995,7 +1995,7 @@ def add_level_ext_2(self, ext_value):
         if isinstance(self.levels[0], list):  # remove from tuple of lists
             if self.levels[-1][1] > 9.e19:
                 self.levels.pop(-1)
-        if isinstance(self.levels, tuple):       # remove from list
+        if isinstance(self.levels, (tuple, list)):       # remove from list
             ret_tup = []
             for i in range(len(self.levels) - 1):
                 ret_tup.insert(i + 1, self.levels[i])
@@ -2009,15 +2009,16 @@ def add_level_ext_2(self, ext_value):
         return self.levels
 
     # We may need to add extnsion
-    if isinstance(self.levels, tuple):
-        self.levels = list(self.levels)
-    if isinstance(self.levels[-1], list):  # add to tuple of lists
-        if self.levels[-1][1] < 9.e19:
-            self.levels.append([self.levels[-1][1], 1e20])
-    else:
-        if self.levels[-1] < 9.e19:
-            self.levels.append(1.e20)
-    return self.levels
+    if isinstance(self.levels, (list, tuple)):
+        if isinstance(self.levels, tuple):
+            self.levels = list(self.levels)
+        if isinstance(self.levels[-1], list):  # add to tuple of lists
+            if self.levels[-1][1] < 9.e19:
+                self.levels.append([self.levels[-1][1], 1e20])
+        else:
+            if self.levels[-1] < 9.e19:
+                self.levels.append(1.e20)
+        return self.levels
 
 
 def _getext_1(self):
-- 
GitLab


From d0418738bba6412560d37f01c26c869ab04dc39c Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Fri, 10 Jun 2016 08:43:08 -0700
Subject: [PATCH 164/191] fix #1776

let user pass an axis argument, rather than always picking z level, that allows for non cf use
also pep8ed the file
---
 Packages/cdutil/Lib/vertical.py | 292 ++++++++++++++++++--------------
 testing/cdutil/test_vert.py     |  28 +--
 2 files changed, 179 insertions(+), 141 deletions(-)

diff --git a/Packages/cdutil/Lib/vertical.py b/Packages/cdutil/Lib/vertical.py
index 9d6df0ae8..167b7d4cd 100644
--- a/Packages/cdutil/Lib/vertical.py
+++ b/Packages/cdutil/Lib/vertical.py
@@ -4,17 +4,19 @@ import genutil
 import cdms2
 import numpy
 import cdat_info
-def reconstructPressureFromHybrid(ps,A,B,Po):
+
+
+def reconstructPressureFromHybrid(ps, A, B, Po):
     """
     Reconstruct the Pressure field on sigma levels, from the surface pressure
-    
+
     Input
     Ps   : Surface pressure
     A,B,Po: Hybrid Convertion Coefficients, such as: p=B.ps+A.Po
     Ps: surface pressure
     B,A are 1D : sigma levels
     Po and Ps must have same units
-    
+
     Output
     Pressure field
     Such as P=B*Ps+A*Po
@@ -23,200 +25,234 @@ def reconstructPressureFromHybrid(ps,A,B,Po):
     P=reconstructPressureFromHybrid(ps,A,B,Po)
     """
     # Compute the pressure for the sigma levels
-    cdat_info.pingPCMDIdb("cdat","cdutil.vertical.reconstructPressureFromHybrid")
-    ps,B=genutil.grower(ps,B)
-    ps,A=genutil.grower(ps,A)
-    p=ps*B
-    p=p+A*Po
+    cdat_info.pingPCMDIdb(
+        "cdat",
+        "cdutil.vertical.reconstructPressureFromHybrid")
+    ps, B = genutil.grower(ps, B)
+    ps, A = genutil.grower(ps, A)
+    p = ps * B
+    p = p + A * Po
     p.setAxisList(ps.getAxisList())
-    p.id='P'
+    p.id = 'P'
     try:
-      p.units=ps.units
+        p.units = ps.units
     except:
-      pass
-    t=p.getTime()
+        pass
+    t = p.getTime()
     if not t is None:
-      p=p(order='tz...')
+        p = p(order='tz...')
     else:
-     p=p(order='z...')
+        p = p(order='z...')
     return p
-    
-def linearInterpolation(A,I,levels=[100000, 92500, 85000, 70000, 60000, 50000, 40000, 30000, 25000, 20000, 15000, 10000, 7000, 5000, 3000, 2000, 1000], status=None):
+
+
+def linearInterpolation(
+    A, I, levels=[100000, 92500, 85000, 70000, 60000, 50000, 40000,
+                  30000, 25000, 20000, 15000, 10000, 7000, 5000, 3000, 2000, 1000], status=None, axis='z'):
     """
     Linear interpolation
     to interpolate a field from some levels to another set of levels
     Value below "surface" are masked
-    
+
     Input
     A :      array to interpolate
     I :      interpolation field (usually Pressure or depth) from TOP (level 0) to BOTTOM (last level), i.e P value going up with each level
     levels : levels to interplate to (same units as I), default levels are:[100000, 92500, 85000, 70000, 60000, 50000, 40000, 30000, 25000, 20000, 15000, 10000, 7000, 5000, 3000, 2000, 1000]
+    axis:    axis over which to do the linear interpolation, default is 'z', accepted: '1' '(myaxis)'
 
     I and levels must have same units
 
     Output
     array on new levels (levels)
-    
+
     Examples:
     A=interpolate(A,I,levels=[100000, 92500, 85000, 70000, 60000, 50000, 40000, 30000, 25000, 20000, 15000, 10000, 7000, 5000, 3000, 2000, 1000])
     """
-    
-    cdat_info.pingPCMDIdb("cdat","cdutil.vertical.linearInterpolation")
+
+    cdat_info.pingPCMDIdb("cdat", "cdutil.vertical.linearInterpolation")
     try:
-        nlev=len(levels)  # Number of pressure levels
+        nlev = len(levels)  # Number of pressure levels
     except:
-        nlev=1  # if only one level len(levels) would breaks
-        levels=[levels,]
-    order=A.getOrder()
-    A=A(order='z...')
-    I=I(order='z...')
-    sh=list(I.shape)
-    nsigma=sh[0] #number of sigma levels
-    sh[0]=nlev
-    t=MV2.zeros(sh,typecode=MV2.float32)
-    sh2=I[0].shape
-    prev=-1
-    for ilev in range(nlev): # loop through pressure levels
+        nlev = 1  # if only one level len(levels) would breaks
+        levels = [levels, ]
+    order = A.getOrder()
+    A = A(order='%s...' % axis)
+    I = I(order='%s...' % axis)
+    sh = list(I.shape)
+    nsigma = sh[0]  # number of sigma levels
+    sh[0] = nlev
+    t = MV2.zeros(sh, typecode=MV2.float32)
+    sh2 = I[0].shape
+    prev = -1
+    for ilev in range(nlev):  # loop through pressure levels
         if status is not None:
-            prev=genutil.statusbar(ilev,nlev-1.,prev)
-        lev=levels[ilev] # get value for the level
-        Iabv=MV2.ones(sh2,MV2.float)
-        Aabv=-1*Iabv # Array on sigma level Above
-        Abel=-1*Iabv # Array on sigma level Below
-        Ibel=-1*Iabv # Pressure on sigma level Below
-        Iabv=-1*Iabv # Pressure on sigma level Above
-        Ieq=MV2.masked_equal(Iabv,-1) # Area where Pressure == levels
-        for i in range(1,nsigma): # loop from second sigma level to last one
-            a = MV2.greater_equal(I[i],  lev) # Where is the pressure greater than lev
-            b =    MV2.less_equal(I[i-1],lev) # Where is the pressure less than lev
+            prev = genutil.statusbar(ilev, nlev - 1., prev)
+        lev = levels[ilev]  # get value for the level
+        Iabv = MV2.ones(sh2, MV2.float)
+        Aabv = -1 * Iabv  # Array on sigma level Above
+        Abel = -1 * Iabv  # Array on sigma level Below
+        Ibel = -1 * Iabv  # Pressure on sigma level Below
+        Iabv = -1 * Iabv  # Pressure on sigma level Above
+        Ieq = MV2.masked_equal(Iabv, -1)  # Area where Pressure == levels
+        for i in range(1, nsigma):  # loop from second sigma level to last one
+            a = MV2.greater_equal(
+                I[i],
+                lev)  # Where is the pressure greater than lev
+            b = MV2.less_equal(
+                I[i - 1],
+                lev)  # Where is the pressure less than lev
             # Now looks if the pressure level is in between the 2 sigma levels
             # If yes, sets Iabv, Ibel and Aabv, Abel
-            a=MV2.logical_and(a,b)
-            Iabv=MV2.where(a,I[i],Iabv) # Pressure on sigma level Above
-            Aabv=MV2.where(a,A[i],Aabv) # Array on sigma level Above
-            Ibel=MV2.where(a,I[i-1],Ibel) # Pressure on sigma level Below
-            Abel=MV2.where(a,A[i-1],Abel) # Array on sigma level Below
-            Ieq= MV2.where(MV2.equal(I[i],lev),A[i],Ieq)
-
-        val=MV2.masked_where(MV2.equal(Ibel,-1.),numpy.ones(Ibel.shape)*lev) # set to missing value if no data below lev if there is
-        
-        tl=(val-Ibel)/(Iabv-Ibel)*(Aabv-Abel)+Abel # Interpolation
+            a = MV2.logical_and(a, b)
+            Iabv = MV2.where(a, I[i], Iabv)  # Pressure on sigma level Above
+            Aabv = MV2.where(a, A[i], Aabv)  # Array on sigma level Above
+            Ibel = MV2.where(
+                a,
+                I[i - 1],
+                Ibel)  # Pressure on sigma level Below
+            Abel = MV2.where(a, A[i - 1], Abel)  # Array on sigma level Below
+            Ieq = MV2.where(MV2.equal(I[i], lev), A[i], Ieq)
+
+        val = MV2.masked_where(
+            MV2.equal(Ibel, -1.), numpy.ones(Ibel.shape) * lev)
+                               # set to missing value if no data below lev if
+                               # there is
+
+        tl = (val - Ibel) / (Iabv - Ibel) * \
+            (Aabv - Abel) + Abel  # Interpolation
         if ((Ieq.mask is None) or (Ieq.mask is MV2.nomask)):
-            tl=Ieq
+            tl = Ieq
         else:
-            tl=MV2.where(1-Ieq.mask,Ieq,tl)
-        t[ilev]=tl.astype(MV2.float32)
+            tl = MV2.where(1 - Ieq.mask, Ieq, tl)
+        t[ilev] = tl.astype(MV2.float32)
 
-    ax=A.getAxisList()
-    autobnds=cdms2.getAutoBounds()
+    ax = A.getAxisList()
+    autobnds = cdms2.getAutoBounds()
     cdms2.setAutoBounds('off')
-    lvl=cdms2.createAxis(MV2.array(levels).filled())
+    lvl = cdms2.createAxis(MV2.array(levels).filled())
     cdms2.setAutoBounds(autobnds)
     try:
-        lvl.units=I.units
+        lvl.units = I.units
     except:
         pass
-    lvl.id='plev'
-    
+    lvl.id = 'plev'
+
     try:
-      t.units=I.units
+        t.units = I.units
     except:
-      pass
-  
-    ax[0]=lvl
+        pass
+
+    ax[0] = lvl
     t.setAxisList(ax)
-    t.id=A.id
+    t.id = A.id
     for att in A.listattributes():
-        setattr(t,att,getattr(A,att))
+        setattr(t, att, getattr(A, att))
     return t(order=order)
 
-def logLinearInterpolation(A,P,levels=[100000, 92500, 85000, 70000, 60000, 50000, 40000, 30000, 25000, 20000, 15000, 10000, 7000, 5000, 3000, 2000, 1000],status=None):
+
+def logLinearInterpolation(
+    A, P, levels=[100000, 92500, 85000, 70000, 60000, 50000, 40000,
+                  30000, 25000, 20000, 15000, 10000, 7000, 5000, 3000, 2000, 1000], status=None, axis='z'):
     """
     Log-linear interpolation
     to convert a field from sigma levels to pressure levels
     Value below surface are masked
-    
+
     Input
-    A :    array on sigma levels
-    P :    pressure field from TOP (level 0) to BOTTOM (last level)
+    A :      array on sigma levels
+    P :      pressure field from TOP (level 0) to BOTTOM (last level)
     levels : pressure levels to interplate to (same units as P), default levels are:[100000, 92500, 85000, 70000, 60000, 50000, 40000, 30000, 25000, 20000, 15000, 10000, 7000, 5000, 3000, 2000, 1000]
+    axis:    axis over which to do the linear interpolation, default is 'z', accepted: '1' '(myaxis)'
 
     P and levels must have same units
 
     Output
     array on pressure levels (levels)
-    
+
     Examples:
     A=logLinearInterpolation(A,P),levels=[100000, 92500, 85000, 70000, 60000, 50000, 40000, 30000, 25000, 20000, 15000, 10000, 7000, 5000, 3000, 2000, 1000])
     """
-    
-    cdat_info.pingPCMDIdb("cdat","cdutil.vertical.logLinearInterpolation")
+
+    cdat_info.pingPCMDIdb("cdat", "cdutil.vertical.logLinearInterpolation")
     try:
-        nlev=len(levels)  # Number of pressure levels
+        nlev = len(levels)  # Number of pressure levels
     except:
-        nlev=1  # if only one level len(levels) would breaks
-        levels=[levels,]
-    order=A.getOrder()
-    A=A(order='z...')
-    P=P(order='z...')
-    sh=list(P.shape)
-    nsigma=sh[0] #number of sigma levels
-    sh[0]=nlev
-    t=MV2.zeros(sh,typecode=MV2.float32)
-    sh2=P[0].shape
-    prev=-1
-    for ilev in range(nlev): # loop through pressure levels
+        nlev = 1  # if only one level len(levels) would breaks
+        levels = [levels, ]
+    order = A.getOrder()
+    A = A(order='%s...' % axis)
+    P = P(order='%s...' % axis)
+    sh = list(P.shape)
+    nsigma = sh[0]  # number of sigma levels
+    sh[0] = nlev
+    t = MV2.zeros(sh, typecode=MV2.float32)
+    sh2 = P[0].shape
+    prev = -1
+    for ilev in range(nlev):  # loop through pressure levels
         if status is not None:
-            prev=genutil.statusbar(ilev,nlev-1.,prev)
-        lev=levels[ilev] # get value for the level
-        Pabv=MV2.ones(sh2,MV2.float)
-        Aabv=-1*Pabv # Array on sigma level Above
-        Abel=-1*Pabv # Array on sigma level Below
-        Pbel=-1*Pabv # Pressure on sigma level Below
-        Pabv=-1*Pabv # Pressure on sigma level Above
-        Peq=MV2.masked_equal(Pabv,-1) # Area where Pressure == levels
-        for i in range(1,nsigma): # loop from second sigma level to last one
-            a=MV2.greater_equal(P[i],  lev) # Where is the pressure greater than lev
-            b=   MV2.less_equal(P[i-1],lev) # Where is the pressure less than lev
+            prev = genutil.statusbar(ilev, nlev - 1., prev)
+        lev = levels[ilev]  # get value for the level
+        Pabv = MV2.ones(sh2, MV2.float)
+        Aabv = -1 * Pabv  # Array on sigma level Above
+        Abel = -1 * Pabv  # Array on sigma level Below
+        Pbel = -1 * Pabv  # Pressure on sigma level Below
+        Pabv = -1 * Pabv  # Pressure on sigma level Above
+        Peq = MV2.masked_equal(Pabv, -1)  # Area where Pressure == levels
+        for i in range(1, nsigma):  # loop from second sigma level to last one
+            a = MV2.greater_equal(
+                P[i],
+                lev)  # Where is the pressure greater than lev
+            b = MV2.less_equal(
+                P[i - 1],
+                lev)  # Where is the pressure less than lev
             # Now looks if the pressure level is in between the 2 sigma levels
             # If yes, sets Pabv, Pbel and Aabv, Abel
-            a=MV2.logical_and(a,b)
-            Pabv=MV2.where(a,P[i],Pabv) # Pressure on sigma level Above
-            Aabv=MV2.where(a,A[i],Aabv) # Array on sigma level Above
-            Pbel=MV2.where(a,P[i-1],Pbel) # Pressure on sigma level Below
-            Abel=MV2.where(a,A[i-1],Abel) # Array on sigma level Below
-            Peq= MV2.where(MV2.equal(P[i],lev),A[i],Peq)
-
-        val=MV2.masked_where(MV2.equal(Pbel,-1),numpy.ones(Pbel.shape)*lev) # set to missing value if no data below lev if there is
-        
-        tl=MV2.log(val/Pbel)/MV2.log(Pabv/Pbel)*(Aabv-Abel)+Abel # Interpolation
+            a = MV2.logical_and(a, b)
+            Pabv = MV2.where(a, P[i], Pabv)  # Pressure on sigma level Above
+            Aabv = MV2.where(a, A[i], Aabv)  # Array on sigma level Above
+            Pbel = MV2.where(
+                a,
+                P[i - 1],
+                Pbel)  # Pressure on sigma level Below
+            Abel = MV2.where(a, A[i - 1], Abel)  # Array on sigma level Below
+            Peq = MV2.where(MV2.equal(P[i], lev), A[i], Peq)
+
+        val = MV2.masked_where(
+            MV2.equal(Pbel, -1), numpy.ones(Pbel.shape) * lev)
+                               # set to missing value if no data below lev if
+                               # there is
+
+        tl = MV2.log(
+            val / Pbel) / MV2.log(
+                Pabv / Pbel) * (
+            Aabv - Abel) + Abel  # Interpolation
         if ((Peq.mask is None) or (Peq.mask is MV2.nomask)):
-            tl=Peq
+            tl = Peq
         else:
-            tl=MV2.where(1-Peq.mask,Peq,tl)
-        t[ilev]=tl.astype(MV2.float32)
-        
-    ax=A.getAxisList()
-    autobnds=cdms2.getAutoBounds()
+            tl = MV2.where(1 - Peq.mask, Peq, tl)
+        t[ilev] = tl.astype(MV2.float32)
+
+    ax = A.getAxisList()
+    autobnds = cdms2.getAutoBounds()
     cdms2.setAutoBounds('off')
-    lvl=cdms2.createAxis(MV2.array(levels).filled())
+    lvl = cdms2.createAxis(MV2.array(levels).filled())
     cdms2.setAutoBounds(autobnds)
     try:
-        lvl.units=P.units
+        lvl.units = P.units
     except:
         pass
-    lvl.id='plev'
-    
+    lvl.id = 'plev'
+
     try:
-      t.units=P.units
+        t.units = P.units
     except:
-      pass
-  
-    ax[0]=lvl
+        pass
+
+    ax[0] = lvl
     t.setAxisList(ax)
-    t.id=A.id
+    t.id = A.id
     for att in A.listattributes():
-        setattr(t,att,getattr(A,att))
+        setattr(t, att, getattr(A, att))
     return t(order=order)
-    
-sigma2Pressure=logLinearInterpolation
+
+sigma2Pressure = logLinearInterpolation
diff --git a/testing/cdutil/test_vert.py b/testing/cdutil/test_vert.py
index 591ac6130..54f9c625a 100644
--- a/testing/cdutil/test_vert.py
+++ b/testing/cdutil/test_vert.py
@@ -2,22 +2,24 @@
 # Adapted for numpy/ma/cdms2 by convertcdms.py
 
 
-import cdutil,cdat_info
+import cdutil
+import cdat_info
+import numpy
 
 import cdms2
 import os
 bg = 0
 
-f = cdms2.open(os.path.join(cdat_info.get_sampledata_path(),'vertical.nc'))
-Ps=f('PS')
-U=f('U')
-B=f('hybm')
-A=f('hyam')
-Po=f('variable_2')
-P=cdutil.reconstructPressureFromHybrid(Ps,A,B,Po)
+f = cdms2.open(os.path.join(cdat_info.get_sampledata_path(), 'vertical.nc'))
+Ps = f('PS')
+U = f('U')
+B = f('hybm')
+A = f('hyam')
+Po = f('variable_2')
+P = cdutil.reconstructPressureFromHybrid(Ps, A, B, Po)
 
-U2=cdutil.logLinearInterpolation(U,P)
-
-#x=vcs.init()
-#x.plot(U2,bg=bg)
-#raw_input()
+U2 = cdutil.logLinearInterpolation(U, P)
+U2b = cdutil.logLinearInterpolation(U, P, axis='0')
+assert(numpy.ma.allclose(U2, U2b))
+U2b = cdutil.logLinearInterpolation(U, P, axis='(lev)')
+assert(numpy.ma.allclose(U2, U2b))
-- 
GitLab


From e80d6866dad16a338e547e29382249f79f53efee Mon Sep 17 00:00:00 2001
From: Bryce Sampson <sampson.bryce@yahoo.com>
Date: Fri, 10 Jun 2016 11:50:42 -0700
Subject: [PATCH 165/191] added test for extends and attributes attribute for
 projection

---
 Packages/vcs/vcs/projection.py  | 9 +++++++--
 testing/vcs/CMakeLists.txt      | 6 ++++--
 testing/vcs/test_vcs_extends.py | 0
 3 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 testing/vcs/test_vcs_extends.py

diff --git a/Packages/vcs/vcs/projection.py b/Packages/vcs/vcs/projection.py
index 6b19c5e62..cabf461eb 100644
--- a/Packages/vcs/vcs/projection.py
+++ b/Packages/vcs/vcs/projection.py
@@ -327,6 +327,12 @@ class Proj(object):
         print 'name =', self.name
         print 'type =', self.type
         # print 'parameters =',self.parameters
+
+        for att in self.attributes:
+            print att, '=', getattr(self, att)
+
+    @property
+    def attributes(self):
         p = []
         if self._type in [3, 4]:
             p.append('smajor')
@@ -455,8 +461,7 @@ class Proj(object):
             p.append('centerlatitude')
             p.append('falseeasting')
             p.append('falsenorthing')
-        for att in p:
-            print att, '=', getattr(self, att)
+        return p
 
     ##########################################################################
     #                                                                           #
diff --git a/testing/vcs/CMakeLists.txt b/testing/vcs/CMakeLists.txt
index 99244cd55..86e8cc3ae 100644
--- a/testing/vcs/CMakeLists.txt
+++ b/testing/vcs/CMakeLists.txt
@@ -29,8 +29,10 @@ foreach(lat_0 45 90)
     ${lat_0}
     )
 endforeach()
-
-
+cdat_add_test(test_vcs_extends
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_extends.py
+)
 cdat_add_test(test_vcs_create_get
   "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_create_get.py
diff --git a/testing/vcs/test_vcs_extends.py b/testing/vcs/test_vcs_extends.py
new file mode 100644
index 000000000..e69de29bb
-- 
GitLab


From 85b48f851b5c75d13df26f49c2caed6028925d7d Mon Sep 17 00:00:00 2001
From: Bryce Sampson <sampson.bryce@yahoo.com>
Date: Fri, 10 Jun 2016 11:55:31 -0700
Subject: [PATCH 166/191] found file since all code disappeared

---
 testing/vcs/test_vcs_extends.py | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/testing/vcs/test_vcs_extends.py b/testing/vcs/test_vcs_extends.py
index e69de29bb..4106cecd6 100644
--- a/testing/vcs/test_vcs_extends.py
+++ b/testing/vcs/test_vcs_extends.py
@@ -0,0 +1,29 @@
+import vcs
+import numpy
+
+box = vcs.createboxfill()
+
+box.ext_1 = True
+assert numpy.allclose(box.levels, [1e20] * 2)
+
+box.ext_2 = True
+assert numpy.allclose(box.levels, [1e20] * 2)
+
+box.levels = [1, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100]
+assert box.ext_1 == False
+assert box.ext_1 == False
+
+box.ext_1 = True
+assert box.levels[0] < -9e19
+
+box.ext_2 = True
+assert box.levels[-1] > 9e19
+
+box.ext_1 = False
+assert box.levels[0] > -9e19
+
+box.ext_2 = False
+assert box.levels[-1] < 9e19
+
+
+
-- 
GitLab


From 64f378e20839dde709c8668d09acae7a415cc857 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Fri, 10 Jun 2016 21:44:01 -0400
Subject: [PATCH 167/191] Fixed style issues

---
 Packages/vcs/vcs/Canvas.py | 1 -
 Packages/vcs/vcs/dv3d.py   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/Packages/vcs/vcs/Canvas.py b/Packages/vcs/vcs/Canvas.py
index eb774505b..8ef04cd8e 100644
--- a/Packages/vcs/vcs/Canvas.py
+++ b/Packages/vcs/vcs/Canvas.py
@@ -4920,7 +4920,6 @@ Options:::
             H = tmp
         return W, H
 
-
     def postscript(self, file, mode='r', orientation=None, width=None, height=None,
                    units='inches', textAsPaths=True):
         """
diff --git a/Packages/vcs/vcs/dv3d.py b/Packages/vcs/vcs/dv3d.py
index 2afae29f2..4a30aed8e 100644
--- a/Packages/vcs/vcs/dv3d.py
+++ b/Packages/vcs/vcs/dv3d.py
@@ -158,7 +158,6 @@ class Gfdv3d(object):
         self.plot_attributes['name'] = self.g_name
         self.plot_attributes['template'] = Gfdv3d_name
 
-
     def setProvenanceHandler(self, provenanceHandler):
         self.provenanceHandler = provenanceHandler
 
-- 
GitLab


From fb306a36006b7406460649306d2edb339939a7da Mon Sep 17 00:00:00 2001
From: Sam Fries <fries2@llnl.gov>
Date: Fri, 10 Jun 2016 11:05:39 -0400
Subject: [PATCH 168/191] Fixed failing tests

---
 Packages/vcs/vcs/Canvas.py         | 12 ++++++------
 Packages/vcsaddons/Lib/__init__.py | 19 +++++++++++--------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Packages/vcs/vcs/Canvas.py b/Packages/vcs/vcs/Canvas.py
index 8ef04cd8e..903e22a7a 100644
--- a/Packages/vcs/vcs/Canvas.py
+++ b/Packages/vcs/vcs/Canvas.py
@@ -2450,13 +2450,13 @@ Options:::
     def __plot(self, arglist, keyargs):
         import vcsaddons
 
-            # This routine has five arguments in arglist from _determine_arg_list
-            # It adds one for bg and passes those on to Canvas.plot as its sixth
-            # arguments.
+        # This routine has five arguments in arglist from _determine_arg_list
+        # It adds one for bg and passes those on to Canvas.plot as its sixth
+        # arguments.
 
-            # First of all let's remember which elets we have before comin in here
-            # so that anything added (temp objects) can be removed at clear
-            # time
+        # First of all let's remember which elets we have before comin in here
+        # so that anything added (temp objects) can be removed at clear
+        # time
         original_elts = {}
         new_elts = {}
         for k in vcs.elements.keys():
diff --git a/Packages/vcsaddons/Lib/__init__.py b/Packages/vcsaddons/Lib/__init__.py
index c38e5b29e..7136d36aa 100644
--- a/Packages/vcsaddons/Lib/__init__.py
+++ b/Packages/vcsaddons/Lib/__init__.py
@@ -20,16 +20,20 @@ def createusercontinents(name=None,source="default",x=None,template=None):
 
 
 def createpolar(name=None, source="default", x=None, template=None):
+    if "polar_oned" not in gms:
+        init_polar()
     return polar.Gpo(name, source=source, x=x, template=template)
 
 
 def getpolar(name=None):
+    if "polar_oned" not in gms:
+        init_polar()
     if name in gms["polar_oned"]:
         return gms["polar_oned"][name]
     raise KeyError("No Polar GM exists with name '%s'" % name)
 
 
-if "polar_oned" not in gms:
+def init_polar():
     # Create nice polar template
     try:
         t = vcs.createtemplate("polar_oned")
@@ -58,14 +62,14 @@ if "polar_oned" not in gms:
         # Template already exists
         pass
     # Create some nice default polar GMs
-    degree_polar = createpolar("degrees", template="polar_oned")
+    degree_polar = polar.Gpo("degrees", template="polar_oned")
     degree_polar.datawc_x1 = 0
     degree_polar.datawc_x2 = 360
     degree_polar.xticlabels1 = {
         i: str(i) for i in range(0, 360, 45)
     }
 
-    clock_24 = createpolar("diurnal", template="polar_oned")
+    clock_24 = polar.Gpo("diurnal", template="polar_oned")
     clock_24.datawc_x1 = 0
     clock_24.datawc_x2 = 24
     clock_24.clockwise = True
@@ -75,8 +79,7 @@ if "polar_oned" not in gms:
         i: str(i) for i in range(0, 24, 3)
     }
 
-
-    clock_24_meridiem = createpolar("diurnal_12_hour", source="diurnal", template="polar_oned")
+    clock_24_meridiem = polar.Gpo("diurnal_12_hour", source="diurnal", template="polar_oned")
     clock_24_meridiem.xticlabels1 = {
         0: "12 AM",
         3: "3 AM",
@@ -88,7 +91,7 @@ if "polar_oned" not in gms:
         21: "9 PM"
     }
 
-    clock_12 = createpolar("semidiurnal", source="diurnal", template="polar_oned")
+    clock_12 = polar.Gpo("semidiurnal", source="diurnal", template="polar_oned")
     clock_12.datawc_x2 = 12
     clock_12.xticlabels1 = {
         i: str(i) for i in range(3, 13, 3)
@@ -96,7 +99,7 @@ if "polar_oned" not in gms:
     # 3 on the right
     clock_12.theta_offset = -3
 
-    annual_cycle = createpolar("annual_cycle", template="polar_oned")
+    annual_cycle = polar.Gpo("annual_cycle", template="polar_oned")
     annual_cycle.datawc_x1 = 1
     annual_cycle.datawc_x2 = 13
     annual_cycle.clockwise = True
@@ -117,7 +120,7 @@ if "polar_oned" not in gms:
     # Put December on the top
     annual_cycle.theta_offset = -2
 
-    seasonal = createpolar("seasonal", template="polar_oned")
+    seasonal = polar.Gpo("seasonal", template="polar_oned")
     seasonal.datawc_x1 = 0
     seasonal.datawc_x2 = 4
     seasonal.xticlabels1 = {0: "DJF", 1: "MAM", 2: "JJA", 3: "SON"}
-- 
GitLab


From c0ddfc13049d04ea48e81e49b753b3df28be1e28 Mon Sep 17 00:00:00 2001
From: Aashish Chaudhary <aashish.chaudhary@kitware.com>
Date: Sat, 11 Jun 2016 12:47:23 -0400
Subject: [PATCH 169/191] Fixed another failing test

---
 testing/vcs/test_vcs_read_old_scr.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testing/vcs/test_vcs_read_old_scr.py b/testing/vcs/test_vcs_read_old_scr.py
index 0a61df61e..4ae04d849 100644
--- a/testing/vcs/test_vcs_read_old_scr.py
+++ b/testing/vcs/test_vcs_read_old_scr.py
@@ -71,3 +71,4 @@ else:
     assert(gm.ymtics1=="lat5")
     assert(gm.fillareastyle == "solid")
     assert(gm.fillareacolors == [30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 35, 36])
+sys.exit(0)
-- 
GitLab


From 97724ba1f34b740532d65d38eeac3be94def7336 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Mon, 13 Jun 2016 12:29:35 -0700
Subject: [PATCH 170/191] added command to clean conda env when we are done
 with it

---
 CMakeLists.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64c6b6e33..fb0d3b667 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -284,4 +284,13 @@ configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/install_cdat_from_con
     @ONLY
     )
 
+configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/clean_cdat_from_conda.bash.in
+    ${cdat_CMAKE_BINARY_DIR}/clean_cdat_from_conda.bash
+    @ONLY
+    )
 add_subdirectory(testing)
+
+# Clean conda env
+add_custom_target(clean-conda
+    COMMAND ${cdat_CMAKE_BINARY_DIR}/clean_cdat_from_conda.bash
+    )
-- 
GitLab


From 6811f8b9042d945a72e4d0dc87b19ff4796b414b Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Mon, 13 Jun 2016 12:35:36 -0700
Subject: [PATCH 171/191] added missing clean file

---
 CMake/cdat_modules_extra/clean_cdat_from_conda.bash.in | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 CMake/cdat_modules_extra/clean_cdat_from_conda.bash.in

diff --git a/CMake/cdat_modules_extra/clean_cdat_from_conda.bash.in b/CMake/cdat_modules_extra/clean_cdat_from_conda.bash.in
new file mode 100644
index 000000000..dc5730546
--- /dev/null
+++ b/CMake/cdat_modules_extra/clean_cdat_from_conda.bash.in
@@ -0,0 +1,5 @@
+
+#!/usr/bin/env bash
+
+source activate root
+@CONDA@ remove --all -y -n @CONDA_ENVIRONMENT_NAME@
-- 
GitLab


From 562b8b969814c23e90087c146a2aa6f4c8dc4349 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Mon, 13 Jun 2016 14:41:22 -0700
Subject: [PATCH 172/191] chmod clean script

---
 CMake/cdat_modules_extra/clean_cdat_from_conda.bash.in | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 CMake/cdat_modules_extra/clean_cdat_from_conda.bash.in

diff --git a/CMake/cdat_modules_extra/clean_cdat_from_conda.bash.in b/CMake/cdat_modules_extra/clean_cdat_from_conda.bash.in
old mode 100644
new mode 100755
-- 
GitLab


From 567bffd80547eabffb94a7ecc070d04575c86521 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 14 Jun 2016 07:26:25 -0700
Subject: [PATCH 173/191] we used to have two path for rendering a frame

the one saving pngs was broken and not preserving pngs
two paths are now unified
this also fixes zoom on animations.
fix #1845
---
 Packages/vcs/vcs/VTKAnimate.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Packages/vcs/vcs/VTKAnimate.py b/Packages/vcs/vcs/VTKAnimate.py
index fe83c6b2b..610c96760 100644
--- a/Packages/vcs/vcs/VTKAnimate.py
+++ b/Packages/vcs/vcs/VTKAnimate.py
@@ -134,7 +134,7 @@ class VTKAnimationPlayback(animate_helper.AnimationPlayback):
             self.controller.draw_frame(
                 allow_static=False,
                 render_offscreen=False,
-                main_window_png=False)
+                main_window_png=True)
 
             self.controller.frame_num += 1
             if self.controller.frame_num >= self.controller.number_of_frames():
@@ -280,8 +280,8 @@ class VTKAnimate(animate_helper.AnimationController):
         be.showGUI()
         be.renWin.Render()
 
-    def draw_frame(self, frame_num=None, render_offscreen=True,
-                   allow_static=True, main_window_png=False):
+    def draw_frame(self, frame_num=None, render_offscreen=False,
+                   allow_static=False, main_window_png=True):
         """
         Draws a frame on the canvas
           frame_num: Which frame to draw- defaults to self.frame_num
@@ -295,8 +295,7 @@ class VTKAnimate(animate_helper.AnimationController):
         else:
             self.frame_num = frame_num
 
-        if render_offscreen or (
-                allow_static and len(self.animation_files) == self.number_of_frames()):
+        if len(self.animation_files) == self.number_of_frames():
             # Attempt to extract the renderers and place them onto the create
             # thread
             self.extract_renderers()
@@ -346,4 +345,5 @@ class VTKAnimate(animate_helper.AnimationController):
         self.draw_frame(
             frame_num=frame,
             allow_static=False,
-            render_offscreen=False)
+            render_offscreen=False,
+            main_window_png=True)
-- 
GitLab


From 24922f7fbdf64c33bb1debe271ae920e69bb4f4a Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 15 Jun 2016 07:10:05 -0700
Subject: [PATCH 174/191] making @chaoshpere2112 happy, generating pngs only
 for save or zoomed pots

---
 Packages/vcs/vcs/VTKAnimate.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Packages/vcs/vcs/VTKAnimate.py b/Packages/vcs/vcs/VTKAnimate.py
index 610c96760..76079826f 100644
--- a/Packages/vcs/vcs/VTKAnimate.py
+++ b/Packages/vcs/vcs/VTKAnimate.py
@@ -134,7 +134,7 @@ class VTKAnimationPlayback(animate_helper.AnimationPlayback):
             self.controller.draw_frame(
                 allow_static=False,
                 render_offscreen=False,
-                main_window_png=True)
+                main_window_png=False)
 
             self.controller.frame_num += 1
             if self.controller.frame_num >= self.controller.number_of_frames():
@@ -317,7 +317,7 @@ class VTKAnimate(animate_helper.AnimationController):
 
             self.vcs_self.backend.renWin.Render()
 
-            if main_window_png:
+            if main_window_png or self.playback_params.zoom_factor != 1:
                 png_name = self.create_thread.get_frame_name(self.frame_num)
                 self.vcs_self.png(png_name)
                 self.animation_files = sorted(
@@ -346,4 +346,4 @@ class VTKAnimate(animate_helper.AnimationController):
             frame_num=frame,
             allow_static=False,
             render_offscreen=False,
-            main_window_png=True)
+            main_window_png=False)
-- 
GitLab


From 721147778d60e463609053613e9f04553b06b8db Mon Sep 17 00:00:00 2001
From: Dan Lipsa <dan.lipsa@kitware.com>
Date: Fri, 10 Jun 2016 14:21:31 -0400
Subject: [PATCH 175/191] BUG #1947: isofill does not handle out of bounds
 levels correctly.

When smallest level is bigger than min scalar value or biggest level
is smaller than max scalar value isofill creates the wrong image.

Also, out of range (white color) was shown black.
---
 Packages/vcs/vcs/vcs2vtk.py                | 25 +++++++++++++---------
 Packages/vcs/vcs/vcsvtk/isofillpipeline.py |  8 ++++++-
 testing/vcs/CMakeLists.txt                 | 11 ++++++++++
 testing/vcs/test_vcs_isofill_levels.py     | 19 ++++++++++++++++
 4 files changed, 52 insertions(+), 11 deletions(-)
 create mode 100644 testing/vcs/test_vcs_isofill_levels.py

diff --git a/Packages/vcs/vcs/vcs2vtk.py b/Packages/vcs/vcs/vcs2vtk.py
index d07ca44cc..1334e361d 100644
--- a/Packages/vcs/vcs/vcs2vtk.py
+++ b/Packages/vcs/vcs/vcs2vtk.py
@@ -94,15 +94,14 @@ def setArray(grid, array, arrayName, isCellData, isScalars):
 
 
 def putMaskOnVTKGrid(data, grid, actorColor=None, cellData=True, deep=True):
-    # Ok now looking
     msk = data.mask
     mapper = None
     if msk is not numpy.ma.nomask and not numpy.allclose(msk, False):
         if actorColor is not None:
-            flatIMask = msk.astype(numpy.int).flat
+            flatIMask = msk.astype(numpy.double).flat
             if grid.IsA("vtkStructuredGrid"):
                 grid2 = vtk.vtkStructuredGrid()
-                vtkmask = numpy_to_vtk_wrapper(flatIMask, deep=deep)
+                vtkmask = numpy_to_vtk_wrapper(flatIMask, deep=deep, array_type=vtk.VTK_DOUBLE)
                 attributes2 = grid2.GetCellData() if cellData else grid2.GetPointData()
             else:
                 grid2 = vtk.vtkUnstructuredGrid()
@@ -114,26 +113,32 @@ def putMaskOnVTKGrid(data, grid, actorColor=None, cellData=True, deep=True):
                     attributes = grid.GetPointData()
                 if (attributes.GetPedigreeIds()):
                     attributes2.SetPedigreeIds(attributes.GetPedigreeIds())
-                    vtkmask = vtk.vtkIntArray()
+                    pedigreeId = attributes2.GetPedigreeIds()
+                    vtkmask = vtk.vtkDoubleArray()
                     vtkmask.SetNumberOfTuples(attributes2.GetPedigreeIds().GetNumberOfTuples())
+                    for i in range(0, vtkmask.GetNumberOfTuples()):
+                        vtkmask.SetValue(i, flatIMask[pedigreeId.GetValue(i)])
                 else:
                     # the unstructured grid is not wrapped
-                    vtkmask = numpy_to_vtk_wrapper(flatIMask, deep=deep)
+                    vtkmask = numpy_to_vtk_wrapper(flatIMask, deep=deep, array_type=vtk.VTK_DOUBLE)
             vtkmask.SetName("scalar")
             attributes2.RemoveArray(vtk.vtkDataSetAttributes.GhostArrayName())
             attributes2.SetScalars(vtkmask)
             grid2.CopyStructure(grid)
-            setArray(grid2, flatIMask, "scalar", isCellData=cellData,
-                     isScalars=True)
             geoFilter = vtk.vtkDataSetSurfaceFilter()
             lut = vtk.vtkLookupTable()
             r, g, b, a = actorColor
-            lut.SetNumberOfTableValues(2)
             geoFilter.SetInputData(grid2)
             if not cellData:
-                lut.SetTableValue(0, r / 100., g / 100., b / 100., a / 100.)
-                lut.SetTableValue(1, r / 100., g / 100., b / 100., a / 100.)
+                pointToCell = vtk.vtkPointDataToCellData()
+                pointToCell.SetInputConnection(geoFilter.GetOutputPort())
+                geoFilter = pointToCell
+                lut.SetNumberOfTableValues(256)
+                lut.SetTableValue(0, 1., 1., 1., 1.)
+                for i in range(1, 256):
+                    lut.SetTableValue(i, r / 100., g / 100., b / 100., a / 100.)
             else:
+                lut.SetNumberOfTableValues(2)
                 lut.SetTableValue(0, r / 100., g / 100., b / 100., 0.)
                 lut.SetTableValue(1, r / 100., g / 100., b / 100., 1.)
             geoFilter.Update()
diff --git a/Packages/vcs/vcs/vcsvtk/isofillpipeline.py b/Packages/vcs/vcs/vcsvtk/isofillpipeline.py
index 887c6158c..273376c09 100644
--- a/Packages/vcs/vcs/vcsvtk/isofillpipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/isofillpipeline.py
@@ -67,7 +67,13 @@ class IsofillPipeline(Pipeline2D):
                     lut.SetTableValue(j, 1., 1., 1., 0.)
             luts.append([lut, [0, len(l) - 1, True]])
             mapper.SetLookupTable(lut)
-            mapper.SetScalarRange(0, len(l) - 1)
+            minRange = 0
+            maxRange = len(l) - 1
+            if (i == 0 and self._scalarRange[0] < l[0]):
+                # band 0 is from self._scalarRange[0] to l[0]
+                # we don't show band 0
+                minRange += 1
+            mapper.SetScalarRange(minRange, maxRange)
             mapper.SetScalarModeToUseCellData()
             mappers.append(mapper)
 
diff --git a/testing/vcs/CMakeLists.txt b/testing/vcs/CMakeLists.txt
index 99244cd55..cc82bf047 100644
--- a/testing/vcs/CMakeLists.txt
+++ b/testing/vcs/CMakeLists.txt
@@ -876,6 +876,17 @@ cdat_add_test(test_vcs_settings_color_name_rgba
     --bigvalues
     "--source=${BASELINE_DIR}/test_vcs_basic_isofill_bigvalues.png"
     )
+
+   foreach(level 0 1 2)
+     cdat_add_test(test_vcs_isofill_level${level}
+       "${PYTHON_EXECUTABLE}"
+       ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isofill_levels.py
+       "${BASELINE_DIR}/test_vcs_isofill_level${level}.png"
+       "${UVCDAT_GIT_TESTDATA_DIR}/data/HadSST1870to99.nc"
+       ${level}
+       )
+   endforeach()
+
   cdat_add_test(test_vcs_issue_960_labels
     "${PYTHON_EXECUTABLE}"
     ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_issue_960_labels.py
diff --git a/testing/vcs/test_vcs_isofill_levels.py b/testing/vcs/test_vcs_isofill_levels.py
new file mode 100644
index 000000000..912178148
--- /dev/null
+++ b/testing/vcs/test_vcs_isofill_levels.py
@@ -0,0 +1,19 @@
+import cdms2
+import os
+import sys
+import testing.regression as regression
+import vcs
+
+data = sys.argv[2]
+level = sys.argv[3]
+levels = {'0': range(-5,36,5),
+          '1': [-1000, -15, 35],
+          '2': [-300, -15, 0, 15, 25]}
+
+x=regression.init(bg=1)
+f=cdms2.open(data)
+s=f("sst")
+iso=x.createisofill()
+iso.levels=levels[level]
+x.plot(s,iso)
+regression.run(x, "test_vcs_isofill_level%s.png"%level)
-- 
GitLab


From a2b2ddc881d9971ed41aaf35fe5d0bddfb085459 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 15 Jun 2016 16:21:21 -0700
Subject: [PATCH 176/191] also look for activate in case it is not in PATH but
 is in some default CMake path

---
 CMake/cdat_modules_extra/install_cdat_from_conda.bash.in | 2 +-
 CMakeLists.txt                                           | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
index c587fed2d..ff3ccdc6e 100755
--- a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
+++ b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
@@ -2,7 +2,7 @@
 
 @CONDA@ create -y -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@  hdf5 libnetcdf lapack clapack ossuuid libcf esmf jasper g2clib yasm x264 ffmpeg cmor vtk==uvcdat libcdms cdat_info flake8 requests numpy==1.9.2 matplotlib --show-channel-urls
 
-source activate @CONDA_ENVIRONMENT_NAME@
+source @ACTIVATE@ @CONDA_ENVIRONMENT_NAME@
 for pkg in testing cdtime regrid2 cdms2 esg DV3D vcs vcsaddons cdutil unidata xmgrace genutil Thermo WK distarray; do
     cd @cdat_SOURCE_DIR@/Packages/${pkg}
     rm -rf build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb0d3b667..bd7d1fa59 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,10 @@ if ( ${CONDA} STREQUAL "CONDA-NOTFOUND" )
     message(FATAL_ERROR "Could not locate conda, please make sure conda is installed and in your PATH")
 endif()
 
+find_program(ACTIVATE NAMES activate)
+if ( ${ACTIVATE} STREQUAL "ACTIVATE-NOTFOUND" ) 
+    message(FATAL_ERROR "Could not locate activate, please make sure conda is installed and in your PATH")
+endif()
 message("[INFO] Found conda at: ${CONDA}")
 
 if (DEFINED ENV{UVCDAT_ANONYMOUS_LOG})
-- 
GitLab


From d9b8f6883ff2dcd9c78619463609e7926491b754 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Thu, 16 Jun 2016 15:47:24 -0700
Subject: [PATCH 177/191] also do a copy into new env

---
 CMake/cdat_modules_extra/install_cdat_from_conda.bash.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
index ff3ccdc6e..29d18d4d5 100755
--- a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
+++ b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-@CONDA@ create -y -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@  hdf5 libnetcdf lapack clapack ossuuid libcf esmf jasper g2clib yasm x264 ffmpeg cmor vtk==uvcdat libcdms cdat_info flake8 requests numpy==1.9.2 matplotlib --show-channel-urls
+@CONDA@ create -y -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@  hdf5 libnetcdf lapack clapack ossuuid libcf esmf jasper g2clib yasm x264 ffmpeg cmor vtk==uvcdat libcdms cdat_info flake8 requests numpy==1.9.2 matplotlib --show-channel-urls --copy
 
 source @ACTIVATE@ @CONDA_ENVIRONMENT_NAME@
 for pkg in testing cdtime regrid2 cdms2 esg DV3D vcs vcsaddons cdutil unidata xmgrace genutil Thermo WK distarray; do
-- 
GitLab


From 4f07961bfc2879861ed6b667f45ec9cbd420a10e Mon Sep 17 00:00:00 2001
From: Dan Lipsa <dan.lipsa@kitware.com>
Date: Fri, 17 Jun 2016 16:53:44 -0400
Subject: [PATCH 178/191] Update API for VTK update.

---
 Packages/vcs/vcs/vcs2vtk.py               | 10 +++++-----
 Packages/vcs/vcs/vcsvtk/vectorpipeline.py |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Packages/vcs/vcs/vcs2vtk.py b/Packages/vcs/vcs/vcs2vtk.py
index 1334e361d..90a764d0b 100644
--- a/Packages/vcs/vcs/vcs2vtk.py
+++ b/Packages/vcs/vcs/vcs2vtk.py
@@ -647,9 +647,9 @@ def projectArray(w, projection, wc, geo=None):
 
     for i in range(0, w.GetNumberOfTuples()):
         tuple = [0, 0, 0]
-        w.GetTupleValue(i, tuple)
+        w.GetTypedTuple(i, tuple)
         geo.TransformPoint(tuple, tuple)
-        w.SetTupleValue(i, tuple)
+        w.SetTypedTuple(i, tuple)
 
 
 # Geo projection
@@ -1296,9 +1296,9 @@ def prepFillarea(renWin, farea, cmap=None):
             if opacity is not None:
                 color[-1] = opacity
             color = [int(C / 100. * 255) for C in color]
-            colors.SetTupleValue(cellId, color)
+            colors.SetTypedTuple(cellId, color)
         else:
-            color_arr.SetTupleValue(cellId, [255, 255, 255, 0])
+            color_arr.SetTypedTuple(cellId, [255, 255, 255, 0])
 
         if st != "solid":
             # Patterns/hatches support
@@ -1706,7 +1706,7 @@ def prepLine(renWin, line, cmap=None):
                     pts.InsertNextPoint(tmpx, tmpy, 0.)
                     n2 += 1
         for j in range(n2):
-            colors.InsertNextTupleValue(vtk_color)
+            colors.InsertNextTypedTuple(vtk_color)
             l = vtk.vtkLine()
             l.GetPointIds().SetId(0, j + point_offset)
             l.GetPointIds().SetId(1, j + point_offset + 1)
diff --git a/Packages/vcs/vcs/vcsvtk/vectorpipeline.py b/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
index c471a6fa9..8c09596ed 100644
--- a/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
+++ b/Packages/vcs/vcs/vcsvtk/vectorpipeline.py
@@ -40,15 +40,15 @@ class VectorPipeline(Pipeline2D):
         if self._vtkGeoTransform is not None:
             newv = vtk.vtkDoubleArray()
             newv.SetNumberOfComponents(3)
-            newv.InsertTupleValue(0, [lon.min(), lat.min(), 0])
-            newv.InsertTupleValue(1, [lon.max(), lat.max(), 0])
+            newv.InsertTypedTuple(0, [lon.min(), lat.min(), 0])
+            newv.InsertTypedTuple(1, [lon.max(), lat.max(), 0])
 
             vcs2vtk.projectArray(newv, projection, self._vtkDataSetBounds)
             dimMin = [0, 0, 0]
             dimMax = [0, 0, 0]
 
-            newv.GetTupleValue(0, dimMin)
-            newv.GetTupleValue(1, dimMax)
+            newv.GetTypedTuple(0, dimMin)
+            newv.GetTypedTuple(1, dimMax)
 
             maxDimX = max(dimMin[0], dimMax[0])
             maxDimY = max(dimMin[1], dimMax[1])
-- 
GitLab


From 29356770801c635ea370edf69ecdee898fb2f620 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Mon, 20 Jun 2016 12:00:36 -0700
Subject: [PATCH 179/191] forcing proj4 4.9.2

---
 CMake/cdat_modules_extra/install_cdat_from_conda.bash.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
index 29d18d4d5..a00fce884 100755
--- a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
+++ b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-@CONDA@ create -y -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@  hdf5 libnetcdf lapack clapack ossuuid libcf esmf jasper g2clib yasm x264 ffmpeg cmor vtk==uvcdat libcdms cdat_info flake8 requests numpy==1.9.2 matplotlib --show-channel-urls --copy
+@CONDA@ create -y -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@  hdf5 libnetcdf lapack clapack ossuuid libcf esmf jasper g2clib yasm x264 ffmpeg cmor proj4>=4.9.2 vtk==uvcdat libcdms cdat_info flake8 requests numpy==1.9.2 matplotlib --show-channel-urls --copy
 
 source @ACTIVATE@ @CONDA_ENVIRONMENT_NAME@
 for pkg in testing cdtime regrid2 cdms2 esg DV3D vcs vcsaddons cdutil unidata xmgrace genutil Thermo WK distarray; do
-- 
GitLab


From 8e7d4fbc6593ed745b2a6e7733ea0b2183ff71a2 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Mon, 20 Jun 2016 15:18:41 -0700
Subject: [PATCH 180/191] needed to duplicate yr fully in case the year starts
 in October for example

---
 Packages/cdutil/Lib/times.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Packages/cdutil/Lib/times.py b/Packages/cdutil/Lib/times.py
index 4b4c9de7c..fdbc9ba8e 100644
--- a/Packages/cdutil/Lib/times.py
+++ b/Packages/cdutil/Lib/times.py
@@ -118,7 +118,7 @@ def getMonthIndex(my_str):
        # end of for mon in mon_list:
            
    yr = 'JFMAMJJASOND'
-   yrs = yr+yr[:6]
+   yrs = yr+yr
    #
    result = string.find(yrs, my_str)
    if result == -1: return []
-- 
GitLab


From b6308ccebc8896c63c950628fff7a12138f966da Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 22 Jun 2016 08:05:09 -0700
Subject: [PATCH 181/191] changed versioning on vtk no need for forcing version
 any longer

---
 CMake/cdat_modules_extra/install_cdat_from_conda.bash.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
index a00fce884..eec135fcb 100755
--- a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
+++ b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-@CONDA@ create -y -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@  hdf5 libnetcdf lapack clapack ossuuid libcf esmf jasper g2clib yasm x264 ffmpeg cmor proj4>=4.9.2 vtk==uvcdat libcdms cdat_info flake8 requests numpy==1.9.2 matplotlib --show-channel-urls --copy
+@CONDA@ create -y -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@  hdf5 libnetcdf lapack clapack ossuuid libcf esmf jasper g2clib yasm x264 ffmpeg cmor proj4>=4.9.2 vtk libcdms cdat_info flake8 requests numpy==1.9.2 matplotlib --show-channel-urls --copy
 
 source @ACTIVATE@ @CONDA_ENVIRONMENT_NAME@
 for pkg in testing cdtime regrid2 cdms2 esg DV3D vcs vcsaddons cdutil unidata xmgrace genutil Thermo WK distarray; do
-- 
GitLab


From ab9e22a45e3746b54a573ee76a27608d004376ca Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Thu, 23 Jun 2016 09:54:21 -0700
Subject: [PATCH 182/191] missing parenthesis

---
 Packages/cdms2/Lib/axis.py     | 2 +-
 Packages/cdms2/Lib/cdmsNode.py | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Packages/cdms2/Lib/axis.py b/Packages/cdms2/Lib/axis.py
index f6f255f25..c0a55b664 100644
--- a/Packages/cdms2/Lib/axis.py
+++ b/Packages/cdms2/Lib/axis.py
@@ -648,7 +648,7 @@ class AbstractAxis(CdmsObj):
         self._doubledata_ = None
 
     def __str__(self):
-        return "\n".join(self.listall() + "\n"
+        return "\n".join(self.listall()) + "\n"
 
     __repr__=__str__
 
diff --git a/Packages/cdms2/Lib/cdmsNode.py b/Packages/cdms2/Lib/cdmsNode.py
index 3e34f34f7..bec8f6c01 100644
--- a/Packages/cdms2/Lib/cdmsNode.py
+++ b/Packages/cdms2/Lib/cdmsNode.py
@@ -1041,9 +1041,8 @@ class AttrNode(CdmsNode):
 
     def __init__(self, name, value=None):
         CdmsNode.__init__(self, "attr")
-        if not (isinstance(value, (int, numpy.integer, float, numpy.floating, basestring))
-                or value is None:
-            raise CDMSError, 'Invalid attribute type: ' + `value`
+        if not (isinstance(value, (int, numpy.integer, float, numpy.floating, basestring))) or (value is None):
+            raise CDMSError, 'Invalid attribute type: ' + value
         self.name=name
         self.value=value
         self.datatype=None            # CDMS datatype, use getDatatype to retrieve
-- 
GitLab


From 9b72434367caa937acf88b4991b57257ef2cf04a Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Thu, 23 Jun 2016 09:55:42 -0700
Subject: [PATCH 183/191] more missing paren

---
 Packages/cdms2/Lib/axis.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Packages/cdms2/Lib/axis.py b/Packages/cdms2/Lib/axis.py
index c0a55b664..b44c8002c 100644
--- a/Packages/cdms2/Lib/axis.py
+++ b/Packages/cdms2/Lib/axis.py
@@ -2004,7 +2004,7 @@ class FileAxis(AbstractAxis):
         if (self._obj_ is not None) and (self.parent._mode_ != 'r') and not (hasattr(self.parent, 'format') and self.parent.format == "DRS"):
             # For negative strides, get the equivalent slice with positive stride,
             # then reverse the result.
-            if (isinstance(key, slice) and (key.step is not None) and key.step < 0:
+            if (isinstance(key, slice)) and (key.step is not None) and key.step < 0:
                 posslice=reverseSlice(key, len(self))
                 result=apply(self._obj_.getitem, (posslice,))
                 return result[::-1]
-- 
GitLab


From d1eacf4bb9f2bf28ddf7e51c2f3de5a8cb1e76b3 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Thu, 23 Jun 2016 09:56:26 -0700
Subject: [PATCH 184/191] indent error

---
 Packages/cdms2/Lib/axis.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Packages/cdms2/Lib/axis.py b/Packages/cdms2/Lib/axis.py
index b44c8002c..3490d09a6 100644
--- a/Packages/cdms2/Lib/axis.py
+++ b/Packages/cdms2/Lib/axis.py
@@ -2012,7 +2012,7 @@ class FileAxis(AbstractAxis):
                 if isinstance(key, int) and key >= len(self):
                     raise IndexError, 'Index out of bounds: %d' % key
                     if isinstance(key, tuple):
-                    key=(key,)
+                        key=(key,)
                 return apply(self._obj_.getitem, key)
         if self._data_ is None:
             self._data_=self.getData()
-- 
GitLab


From e31e2fd861ba1de60e36f692affb3847deb54359 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Mon, 27 Jun 2016 14:54:48 -0700
Subject: [PATCH 185/191] string.maketran still needed

---
 Packages/cdms2/Lib/cdxmllib.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Packages/cdms2/Lib/cdxmllib.py b/Packages/cdms2/Lib/cdxmllib.py
index 70b91d9ba..bd7e2e45e 100644
--- a/Packages/cdms2/Lib/cdxmllib.py
+++ b/Packages/cdms2/Lib/cdxmllib.py
@@ -3,6 +3,7 @@
 # Author: Sjoerd Mullender.
 
 import re
+import string
 
 # import warnings
 # warnings.warn("The xmllib module is obsolete.  Use xml.sax instead.",
-- 
GitLab


From 1bd9a62aae3727a0a40b48f4081607941ed3a1e5 Mon Sep 17 00:00:00 2001
From: Dan Lipsa <dan.lipsa@kitware.com>
Date: Mon, 27 Jun 2016 23:20:26 -0400
Subject: [PATCH 186/191] Generated png should have same name with baseline

---
 testing/vcs/test_vcs_boxfill_robinson_wrap.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/vcs/test_vcs_boxfill_robinson_wrap.py b/testing/vcs/test_vcs_boxfill_robinson_wrap.py
index de66e516c..da6cbb54a 100644
--- a/testing/vcs/test_vcs_boxfill_robinson_wrap.py
+++ b/testing/vcs/test_vcs_boxfill_robinson_wrap.py
@@ -11,4 +11,4 @@ kwargs = {}
 kwargs[ 'cdmsfile' ] = cdmsfile.id
 kwargs['bg'] = 1
 canvas.plot(clt3, gmBoxfill, **kwargs)
-regression.run(canvas, "test_robinson_wrap.png")
\ No newline at end of file
+regression.run(canvas, "test_vcs_robinson_wrap.png")
-- 
GitLab


From 43aa32a09b7a8406c3f9c7e822db7f149104eb8b Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 28 Jun 2016 11:13:34 -0700
Subject: [PATCH 187/191] isinstance was not spelt correctly

---
 Packages/cdms2/Lib/axis.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Packages/cdms2/Lib/axis.py b/Packages/cdms2/Lib/axis.py
index 3490d09a6..074655488 100644
--- a/Packages/cdms2/Lib/axis.py
+++ b/Packages/cdms2/Lib/axis.py
@@ -1097,7 +1097,7 @@ class AbstractAxis(CdmsObj):
             #
             # mf 20010419 test if attribute is a string (non CF), set to 360.0
             #
-            if isnstance(cycle, basestring):
+            if isinstance(cycle, basestring):
                 cycle=360.0
         else:
             cycle=360.0
-- 
GitLab


From 880e2f2f2d83e6bbb6ee814259d3c34c14db2ac1 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 28 Jun 2016 11:58:37 -0700
Subject: [PATCH 188/191] isinstance was not spelt correctly

---
 Packages/cdms2/Lib/avariable.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Packages/cdms2/Lib/avariable.py b/Packages/cdms2/Lib/avariable.py
index f4c80aada..1a6b0d2f3 100644
--- a/Packages/cdms2/Lib/avariable.py
+++ b/Packages/cdms2/Lib/avariable.py
@@ -446,7 +446,7 @@ class AbstractVariable(CdmsObj, Slab):
             return
 
         selftype = self.typecode()
-        if isnstance(value, numpy.ndarray):
+        if isinstance(value, numpy.ndarray):
             value = value.astype(selftype).item()
         elif isinstance(value, (numpy.floating, numpy.integer)):
             value = numpy.array([value], selftype)
-- 
GitLab


From 2d5f700eff2bb89c2b8ae091fcf273156d74a054 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 28 Jun 2016 13:49:21 -0700
Subject: [PATCH 189/191] bad parenthesis

---
 Packages/cdms2/Lib/cdmsNode.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Packages/cdms2/Lib/cdmsNode.py b/Packages/cdms2/Lib/cdmsNode.py
index bec8f6c01..ff5bba3f2 100644
--- a/Packages/cdms2/Lib/cdmsNode.py
+++ b/Packages/cdms2/Lib/cdmsNode.py
@@ -1041,7 +1041,7 @@ class AttrNode(CdmsNode):
 
     def __init__(self, name, value=None):
         CdmsNode.__init__(self, "attr")
-        if not (isinstance(value, (int, numpy.integer, float, numpy.floating, basestring))) or (value is None):
+        if not (isinstance(value, (int, numpy.integer, float, numpy.floating, basestring)) or (value is None)):
             raise CDMSError, 'Invalid attribute type: ' + value
         self.name=name
         self.value=value
-- 
GitLab


From 97c33e115849b6f994b898aa1490900ca768bbe9 Mon Sep 17 00:00:00 2001
From: Denis Nadeau <dnadeau4@users.noreply.github.com>
Date: Wed, 29 Jun 2016 14:58:51 -0700
Subject: [PATCH 190/191] Fix not tuple instance condition for axis getitem
 call

---
 Packages/cdms2/Lib/axis.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Packages/cdms2/Lib/axis.py b/Packages/cdms2/Lib/axis.py
index 074655488..9313441a4 100644
--- a/Packages/cdms2/Lib/axis.py
+++ b/Packages/cdms2/Lib/axis.py
@@ -2011,8 +2011,8 @@ class FileAxis(AbstractAxis):
             else:
                 if isinstance(key, int) and key >= len(self):
                     raise IndexError, 'Index out of bounds: %d' % key
-                    if isinstance(key, tuple):
-                        key=(key,)
+                if not isinstance(key, tuple):
+                    key=(key,)
                 return apply(self._obj_.getitem, key)
         if self._data_ is None:
             self._data_=self.getData()
-- 
GitLab


From 91141a6bc512e6b0baff37f980f99b7f43dfeef8 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Thu, 30 Jun 2016 16:38:49 -0700
Subject: [PATCH 191/191] revert to last known working version

---
 Packages/cdms2/Lib/CDML.py             |  425 +++---
 Packages/cdms2/Lib/CDMLParser.py       |  189 ++-
 Packages/cdms2/Lib/MV2.py              |  524 +++----
 Packages/cdms2/Lib/__init__.py         |   62 +-
 Packages/cdms2/Lib/auxcoord.py         |   80 +-
 Packages/cdms2/Lib/avariable.py        | 1002 ++++++-------
 Packages/cdms2/Lib/axis.py             | 1821 ++++++++++++------------
 Packages/cdms2/Lib/bindex.py           |   41 +-
 Packages/cdms2/Lib/cache.py            |  167 +--
 Packages/cdms2/Lib/cdmsNode.py         |  794 +++++------
 Packages/cdms2/Lib/cdmsURLopener.py    |   17 +-
 Packages/cdms2/Lib/cdmsobj.py          |  481 +++----
 Packages/cdms2/Lib/cdurllib.py         |   72 +-
 Packages/cdms2/Lib/cdurlparse.py       |  339 +++--
 Packages/cdms2/Lib/cdxmllib.py         |  249 ++--
 Packages/cdms2/Lib/convention.py       |   85 +-
 Packages/cdms2/Lib/coord.py            |  211 ++-
 Packages/cdms2/Lib/cudsinterface.py    |  186 ++-
 Packages/cdms2/Lib/database.py         |  226 ++-
 Packages/cdms2/Lib/dataset.py          | 1264 +++++++---------
 Packages/cdms2/Lib/error.py            |    4 +-
 Packages/cdms2/Lib/forecast.py         |  226 ++-
 Packages/cdms2/Lib/fvariable.py        |  138 +-
 Packages/cdms2/Lib/gengrid.py          |  107 +-
 Packages/cdms2/Lib/grid.py             |  382 +++--
 Packages/cdms2/Lib/gsHost.py           |  212 ++-
 Packages/cdms2/Lib/gsMosaic.py         |  251 ++--
 Packages/cdms2/Lib/gsStaticVariable.py |  108 +-
 Packages/cdms2/Lib/gsTimeVariable.py   |  160 +--
 Packages/cdms2/Lib/gui.py              |   31 +-
 Packages/cdms2/Lib/hgrid.py            |  248 ++--
 Packages/cdms2/Lib/internattr.py       |  157 ++
 Packages/cdms2/Lib/mvBaseWriter.py     |   19 +-
 Packages/cdms2/Lib/mvCdmsRegrid.py     |   29 +-
 Packages/cdms2/Lib/mvSphereMesh.py     |  181 ++-
 Packages/cdms2/Lib/mvVTKSGWriter.py    |   29 +-
 Packages/cdms2/Lib/mvVTKUGWriter.py    |   47 +-
 Packages/cdms2/Lib/mvVsWriter.py       |   36 +-
 Packages/cdms2/Lib/restApi.py          |  899 ++++++------
 Packages/cdms2/Lib/selectors.py        |  292 ++--
 Packages/cdms2/Lib/slabinterface.py    |  137 +-
 Packages/cdms2/Lib/sliceut.py          |  214 ++-
 Packages/cdms2/Lib/tvariable.py        |  622 ++++----
 Packages/cdms2/Lib/typeconv.py         |   32 +-
 Packages/cdms2/Lib/variable.py         |  354 +++--
 Packages/cdms2/Lib/xlink.py            |    9 +
 46 files changed, 6109 insertions(+), 7050 deletions(-)
 create mode 100644 Packages/cdms2/Lib/internattr.py
 create mode 100644 Packages/cdms2/Lib/xlink.py

diff --git a/Packages/cdms2/Lib/CDML.py b/Packages/cdms2/Lib/CDML.py
index 963f70ac6..7a6c013f3 100644
--- a/Packages/cdms2/Lib/CDML.py
+++ b/Packages/cdms2/Lib/CDML.py
@@ -37,7 +37,6 @@ CdArray = "Array"
 # Note: at some point, this should be created dynamically
 # from the XML DTD file. For now, it is built statically.
 
-
 class CDML:
 
     cache = {}
@@ -48,254 +47,246 @@ class CDML:
         self.extra = self.extraCache.get(uri)
         if not self.dtd:
             self.dtd = self.buildDTD(uri)
-            self.cache[uri] = self.dtd
+            self.cache[uri]=self.dtd
             self.extra = self.buildExtra(uri)
-            self.extraCache[uri] = self.extra
+            self.extraCache[uri]=self.extra
 
-    def buildDTD(self, uri):
+    def buildDTD(self,uri):
         dtd = {}
         dtd['attr'] = {
-            'name': (Cdata, Required),
-            'datatype':
-                (("Char", "Byte", "Short", "Int", "Long",
-                 "Int64", "Float", "Double", "String"), Required),
-        }
+            'name': (Cdata,Required),
+            'datatype': (("Char","Byte","Short","Int","Long","Int64","Float","Double","String"),Required),
+            }
         dtd['axis'] = {
-            'id': (Id, Required),
-            'associate': (Idref, Implied),
-            'axis': (("X", "Y", "Z", "T"), Implied),
-            'bounds': (Idref, Implied),
-            'calendar': (Cdata, Implied),
-            'comment': (Cdata, Implied),
-            'component': (Cdata, Implied),
-            'compress': (Cdata, Implied),
-            'datatype':
-                (("Char", "Byte", "Short", "Int", "Long",
-                 "Int64", "Float", "Double", "String"), Required),
-            'expand': (Idref, Implied),
-            'interval': (Cdata, Implied),
-            'isvar': (("true", "false"), "true"),
-            'length': (Cdata, Required),
-            'long_name': (Cdata, Implied),
-            'modulo': (Cdata, Implied),
-            'name_in_file': (Cdata, Implied),
-            'partition': (Cdata, Implied),
-            'partition_length': (Cdata, Implied),
-            'positive': (("up", "down"), Implied),
-            'spacing': (("uniform", "variable", "disjoint"), Implied),
-            'topology': (("linear", "circular"), Implied),
-            'weights': (Idref, Implied),
-            'units': (Cdata, Required),
-        }
+            'id': (Id,Required),
+            'associate': (Idref,Implied),
+            'axis': (("X","Y","Z","T"),Implied),
+            'bounds': (Idref,Implied),
+            'calendar': (Cdata,Implied),
+            'comment': (Cdata,Implied),
+            'component': (Cdata,Implied),
+            'compress': (Cdata,Implied),
+            'datatype': (("Char","Byte","Short","Int","Long","Int64","Float","Double","String"),Required),
+            'expand': (Idref,Implied),
+            'interval': (Cdata,Implied),
+            'isvar': ( ("true","false"),"true"),
+            'length': (Cdata,Required),
+            'long_name': (Cdata,Implied),
+            'modulo': (Cdata,Implied),
+            'name_in_file': (Cdata,Implied),
+            'partition': (Cdata,Implied),
+            'partition_length': (Cdata,Implied),
+            'positive': (("up","down"),Implied),
+            'spacing': (("uniform","variable","disjoint"),Implied),
+            'topology': (("linear","circular"),Implied),
+            'weights': (Idref,Implied),
+            'units': (Cdata,Required),
+            }
         dtd['component'] = {
-            'name': (Idref, Required),
-        }
+            'name':(Idref,Required),
+            }
         dtd['dataset'] = {
-            'id': (Id, Required),
-            'Conventions': (Cdata, Required),
-            'appendices': (Cdata, Implied),
-            'calendar': (Cdata, Implied),
-            'cdms_filemap': (Cdata, Implied),
-            'comment': (Cdata, Implied),
-            'directory': (Cdata, Implied),
-            'frequency': (Cdata, Implied),
-            'history': (Cdata, Implied),
-            'institution': (Cdata, Implied),
-            'production': (Cdata, Implied),
-            'project': (Cdata, Implied),
-            'template': (Cdata, Implied),
-        }
+            'id': (Id,Required),
+            'Conventions': (Cdata,Required),
+            'appendices': (Cdata,Implied),
+            'calendar': (Cdata,Implied),
+            'cdms_filemap': (Cdata,Implied),
+            'comment': (Cdata,Implied),
+            'directory': (Cdata,Implied),
+            'frequency': (Cdata,Implied),
+            'history': (Cdata,Implied),
+            'institution': (Cdata,Implied),
+            'production': (Cdata,Implied),
+            'project': (Cdata,Implied),
+            'template': (Cdata,Implied),
+            }
         dtd['doclink'] = {
-            'id': (Id, Implied),
-            'xml:link': (Cdata, (Fixed, "simple")),
-            'href': (Cdata, Required),
-            'role': (Cdata, Implied),
-            'title': (Cdata, Implied),
-            'show': (("embed", "replace", "new"), "replace"),
-            'actuate': (("auto", "user"), Implied),
-            'behavior': (Cdata, Implied),
-            'content-role': (Cdata, Implied),
-            'content-title': (Cdata, Implied),
-            'inline': (("true", "false"), "true"),
-        }
+            'id': (Id,Implied),
+            'xml:link': (Cdata,(Fixed,"simple")),
+            'href': (Cdata,Required),
+            'role':	(Cdata,Implied),
+            'title': (Cdata,Implied),
+            'show': (("embed","replace","new"),"replace"),
+            'actuate': (("auto","user"),Implied),
+            'behavior':(Cdata,Implied),
+            'content-role': (Cdata,Implied),
+            'content-title': (Cdata,Implied),
+            'inline':(("true","false"),"true"),
+            }
         dtd['domain'] = {}
         dtd['domElem'] = {
-            'name': (Idref, Required),
-            'length': (Cdata, Implied),
-            'partition_length': (Cdata, Implied),
-            'start': (Cdata, Implied),
-        }
+            'name':(Idref,Required),
+            'length':(Cdata,Implied),
+            'partition_length':(Cdata,Implied),
+            'start':(Cdata,Implied),
+            }
         dtd['rectGrid'] = {
-            'id': (Id, Required),
-            'type':
-                (("gaussian", "uniform", "equalarea", "unknown"), "unknown"),
-            'latitude': (Idref, Required),
-            'longitude': (Idref, Required),
-            'mask': (Idref, Implied),
-            'order': (("xy", "yx"), "yx"),
-        }
+            'id': (Id,Required),
+            'type':(("gaussian","uniform","equalarea","unknown"),"unknown"),
+            'latitude':(Idref,Required),
+            'longitude':(Idref,Required),
+            'mask':(Idref,Implied),
+            'order':(("xy","yx"),"yx"),
+            }
         dtd['linear'] = {
-            'delta': (Cdata, Required),
-            'length': (Cdata, Required),
-            'start': (Cdata, Required),
-        }
+            'delta': (Cdata,Required),
+            'length': (Cdata,Required),
+            'start': (Cdata,Required),
+            }
         dtd['variable'] = {
-            'id': (Id, Required),
-            'add_offset': (Cdata, Implied),
-            'associate': (Cdata, Implied),
-            'axis': (Cdata, Implied),
-            'comments': (Cdata, Implied),
-            'datatype':
-                (("Char", "Byte", "Short", "Int", "Long",
-                 "Int64", "Float", "Double", "String"), Required),
-            'grid_name': (Cdata, Implied),
-            'grid_type': (Cdata, Implied),
-            'long_name': (Cdata, Implied),
+            'id': (Id,Required),
+            'add_offset': (Cdata,Implied),
+            'associate': (Cdata,Implied),
+            'axis': (Cdata,Implied),
+            'comments': (Cdata,Implied),
+            'datatype': (("Char","Byte","Short","Int","Long","Int64","Float","Double","String"),Required),
+            'grid_name': (Cdata,Implied),
+            'grid_type': (Cdata,Implied),
+            'long_name': (Cdata,Implied),
             'missing_value': (Cdata, Implied),
-            'name_in_file': (Cdata, Implied),
-            'scale_factor': (Cdata, Implied),
-            'subgrid': (Cdata, Implied),
-            'template': (Cdata, Implied),
-            'units': (Cdata, Implied),
-            'valid_max': (Cdata, Implied),
-            'valid_min': (Cdata, Implied),
-            'valid_range': (Cdata, Implied),
-        }
+            'name_in_file': (Cdata,Implied),
+            'scale_factor': (Cdata,Implied),
+            'subgrid': (Cdata,Implied),
+            'template': (Cdata,Implied),
+            'units': (Cdata,Implied),
+            'valid_max': (Cdata,Implied),
+            'valid_min': (Cdata,Implied),
+            'valid_range': (Cdata,Implied),
+            }
         dtd['xlink'] = {
-            'id': (Id, Implied),
-            'xml:link': (Cdata, (Fixed, "simple")),
-            'href': (Cdata, Required),
-            'role': (Cdata, Implied),
-            'title': (Cdata, Implied),
-            'show': (("embed", "replace", "new"), "embed"),
-            'actuate': (("auto", "user"), Implied),
-            'behavior': (Cdata, Implied),
-            'content-role':
-                (("dataset", "axis", "grid", "variable", "object"), "object"),
-            'content-title': (Cdata, Implied),
-            'inline': (("true", "false"), "true"),
-        }
+            'id': (Id,Implied),
+            'xml:link': (Cdata,(Fixed,"simple")),
+            'href': (Cdata,Required),
+            'role':	(Cdata,Implied),
+            'title': (Cdata,Implied),
+            'show': (("embed","replace","new"),"embed"),
+            'actuate': (("auto","user"),Implied),
+            'behavior':(Cdata,Implied),
+            'content-role': (("dataset","axis","grid","variable","object"),"object"),
+            'content-title': (Cdata,Implied),
+            'inline':(("true","false"),"true"),
+            }
         return dtd
 
     # Extra datatype information not included in the formal DTD.
-    def buildExtra(self, uri):
+    def buildExtra(self,uri):
         extra = {}
         extra['attr'] = {
-            'name': (CdScalar, CdString),
-            'datatype': (CdScalar, CdString),
-        }
+            'name': (CdScalar,CdString),
+            'datatype': (CdScalar,CdString),
+            }
         extra['axis'] = {
-            'id': (CdScalar, CdString),
-            'associate': (CdScalar, CdString),
-            'axis': (CdScalar, CdString),
-            'bounds': (CdArray, CdFromObject),
-            'calendar': (CdScalar, CdString),
-            'comment': (CdScalar, CdString),
-            'component': (CdScalar, CdString),
-            'compress': (CdScalar, CdString),
-            'datatype': (CdScalar, CdString),
-            'expand': (CdScalar, CdString),
-            'interval': (CdScalar, CdFromObject),
-            'isvar': (CdScalar, CdString),
-            'length': (CdScalar, CdInt),
-            'long_name': (CdScalar, CdString),
-            'modulo': (CdScalar, CdAny),
-            'name_in_file': (CdScalar, CdString),
-            'partition': (CdArray, CdInt),
-            'partition_length': (CdScalar, CdInt),
-            'positive': (CdScalar, CdString),
-            'spacing': (CdScalar, CdFromObject),
-            'topology': (CdScalar, CdString),
-            'weights': (CdArray, CdDouble),
-            'units': (CdScalar, CdString),
-        }
+            'id': (CdScalar,CdString),
+            'associate': (CdScalar,CdString),
+            'axis': (CdScalar,CdString),
+            'bounds': (CdArray,CdFromObject),
+            'calendar': (CdScalar,CdString),
+            'comment': (CdScalar,CdString),
+            'component': (CdScalar,CdString),
+            'compress': (CdScalar,CdString),
+            'datatype': (CdScalar,CdString),
+            'expand': (CdScalar,CdString),
+            'interval': (CdScalar,CdFromObject),
+            'isvar': (CdScalar,CdString),
+            'length': (CdScalar,CdInt),
+            'long_name': (CdScalar,CdString),
+            'modulo': (CdScalar,CdAny),
+            'name_in_file': (CdScalar,CdString),
+            'partition': (CdArray,CdInt),
+            'partition_length': (CdScalar,CdInt),
+            'positive': (CdScalar,CdString),
+            'spacing': (CdScalar,CdFromObject),
+            'topology': (CdScalar,CdString),
+            'weights': (CdArray,CdDouble),
+            'units': (CdScalar,CdString),
+            }
         extra['component'] = {
-            'name': (CdScalar, CdString),
-        }
+            'name': (CdScalar,CdString),
+            }
         extra['dataset'] = {
-            'id': (CdScalar, CdString),
-            'Conventions': (CdScalar, CdString),
-            'appendices': (CdScalar, CdString),
-            'calendar': (CdScalar, CdString),
-            'cdms_filemap': (CdScalar, CdString),
-            'comment': (CdScalar, CdString),
-            'directory': (CdScalar, CdString),
-            'frequency': (CdScalar, CdString),
-            'history': (CdScalar, CdString),
-            'institution': (CdScalar, CdString),
-            'production': (CdScalar, CdString),
-            'project': (CdScalar, CdString),
-            'template': (CdScalar, CdString),
-        }
+            'id': (CdScalar,CdString),
+            'Conventions': (CdScalar,CdString),
+            'appendices': (CdScalar,CdString),
+            'calendar': (CdScalar,CdString),
+            'cdms_filemap': (CdScalar,CdString),
+            'comment': (CdScalar,CdString),
+            'directory': (CdScalar,CdString),
+            'frequency': (CdScalar,CdString),
+            'history': (CdScalar,CdString),
+            'institution': (CdScalar,CdString),
+            'production': (CdScalar,CdString),
+            'project': (CdScalar,CdString),
+            'template': (CdScalar,CdString),
+            }
         extra['doclink'] = {
-            'id': (CdScalar, CdString),
-            'xml:link': (CdScalar, CdString),
-            'href': (CdScalar, CdString),
-            'role': (CdScalar, CdString),
-            'title': (CdScalar, CdString),
-            'show': (CdScalar, CdString),
-            'actuate': (CdScalar, CdString),
-            'behavior': (CdScalar, CdString),
-            'content-role': (CdScalar, CdString),
-            'content-title': (CdScalar, CdString),
-            'inline': (CdScalar, CdString),
-        }
+            'id': (CdScalar,CdString),
+            'xml:link': (CdScalar,CdString),
+            'href': (CdScalar,CdString),
+            'role': (CdScalar,CdString),
+            'title': (CdScalar,CdString),
+            'show': (CdScalar,CdString),
+            'actuate': (CdScalar,CdString),
+            'behavior': (CdScalar,CdString),
+            'content-role': (CdScalar,CdString),
+            'content-title': (CdScalar,CdString),
+            'inline': (CdScalar,CdString),
+            }
         extra['domain'] = {}
         extra['domElem'] = {
-            'name': (CdScalar, CdString),
-            'length': (CdScalar, CdInt),
-            'partition_length': (CdScalar, CdInt),
-            'start': (CdScalar, CdInt),
-        }
+            'name': (CdScalar,CdString),
+            'length': (CdScalar,CdInt),
+            'partition_length': (CdScalar,CdInt),
+            'start': (CdScalar,CdInt),
+            }
         extra['rectGrid'] = {
-            'id': (CdScalar, CdString),
-            'type': (CdScalar, CdString),
-            'latitude': (CdScalar, CdString),
-            'longitude': (CdScalar, CdString),
-            'mask': (CdScalar, CdString),
-            'order': (CdScalar, CdString),
-        }
+            'id': (CdScalar,CdString),
+            'type': (CdScalar,CdString),
+            'latitude': (CdScalar,CdString),
+            'longitude': (CdScalar,CdString),
+            'mask': (CdScalar,CdString),
+            'order': (CdScalar,CdString),
+            }
         extra['linear'] = {
-            'delta': (CdScalar, CdFromObject),
-            'length': (CdScalar, CdInt),
-            'start': (CdScalar, CdInt),
-        }
+            'delta': (CdScalar,CdFromObject),
+            'length': (CdScalar,CdInt),
+            'start': (CdScalar,CdInt),
+            }
         extra['variable'] = {
-            'id': (CdScalar, CdString),
-            'add_offset': (CdScalar, CdDouble),
-            'associate': (CdScalar, CdString),
-            'axis': (CdScalar, CdString),
-            'comments': (CdScalar, CdString),
-            'datatype': (CdScalar, CdString),
-            'grid_name': (CdScalar, CdString),
-            'grid_type': (CdScalar, CdString),
-            'long_name': (CdScalar, CdString),
-            'missing_value': (CdScalar, CdFromObject),
-            'name_in_file': (CdScalar, CdString),
-            'scale_factor': (CdScalar, CdDouble),
-            'subgrid': (CdScalar, CdString),
-            'template': (CdScalar, CdString),
-            'units': (CdScalar, CdString),
-            'valid_max': (CdScalar, CdFromObject),
-            'valid_min': (CdScalar, CdFromObject),
-            'valid_range': (CdArray, CdFromObject),
-        }
+            'id': (CdScalar,CdString),
+            'add_offset': (CdScalar,CdDouble),
+            'associate': (CdScalar,CdString),
+            'axis': (CdScalar,CdString),
+            'comments': (CdScalar,CdString),
+            'datatype': (CdScalar,CdString),
+            'grid_name': (CdScalar,CdString),
+            'grid_type': (CdScalar,CdString),
+            'long_name': (CdScalar,CdString),
+            'missing_value': (CdScalar,CdFromObject),
+            'name_in_file': (CdScalar,CdString),
+            'scale_factor': (CdScalar,CdDouble),
+            'subgrid': (CdScalar,CdString),
+            'template': (CdScalar,CdString),
+            'units': (CdScalar,CdString),
+            'valid_max': (CdScalar,CdFromObject),
+            'valid_min': (CdScalar,CdFromObject),
+            'valid_range': (CdArray,CdFromObject),
+            }
         extra['xlink'] = {
-            'id': (CdScalar, CdString),
-            'xml:link': (CdScalar, CdString),
-            'href': (CdScalar, CdString),
-            'role': (CdScalar, CdString),
-            'title': (CdScalar, CdString),
-            'show': (CdScalar, CdString),
-            'actuate': (CdScalar, CdString),
-            'behavior': (CdScalar, CdString),
-            'content-role': (CdScalar, CdString),
-            'content-title': (CdScalar, CdString),
-            'inline': (CdScalar, CdString),
-        }
+            'id': (CdScalar,CdString),
+            'xml:link': (CdScalar,CdString),
+            'href': (CdScalar,CdString),
+            'role': (CdScalar,CdString),
+            'title': (CdScalar,CdString),
+            'show': (CdScalar,CdString),
+            'actuate': (CdScalar,CdString),
+            'behavior': (CdScalar,CdString),
+            'content-role': (CdScalar,CdString),
+            'content-title': (CdScalar,CdString),
+            'inline': (CdScalar,CdString),
+            }
         return extra
 
-if __name__ == '__main__':
+if __name__=='__main__':
     cdml = CDML()
     print cdml.extra
     cdml2 = CDML()
diff --git a/Packages/cdms2/Lib/CDMLParser.py b/Packages/cdms2/Lib/CDMLParser.py
index 6a88eda9c..1ff9abc56 100644
--- a/Packages/cdms2/Lib/CDMLParser.py
+++ b/Packages/cdms2/Lib/CDMLParser.py
@@ -2,10 +2,11 @@
 Parse a CDML/XML file
 """
 
-from .cdxmllib import XMLParser
-from . import CDML
+from cdxmllib import XMLParser
+import CDML
 import re
-from . import cdmsNode
+import cdmsNode
+import string
 
 # Error constants
 InvalidAttribute = "Invalid attribute"
@@ -13,23 +14,21 @@ InvalidAttribute = "Invalid attribute"
 # Regular expressions
 _S = re.compile('[ \t\r\n]+$')
 _opS = '[ \t\r\n]*'
-_Integer = re.compile(_opS + '[0-9]+$' + _opS)
-
+_Integer = re.compile(_opS+'[0-9]+$'+_opS)
 
 class CDMLParser(XMLParser):
 
     def __init__(self, verbose=0):
-        XMLParser.__init__(self)
+	XMLParser.__init__(self)
         self.root = None
         self.currentPath = []         # Current path, a stack
         self.dtd = CDML.CDML().dtd
         self.verbose = verbose
 
     # Push current node on the stack
-    def pushCurrentNode(self, node):
+    def pushCurrentNode(self,node):
         self.currentPath.append(node)
-        if not self.root:
-            self.root = node
+        if not self.root: self.root = node
 
     # Pop the current node off the stack
     def popCurrentNode(self):
@@ -51,67 +50,62 @@ class CDMLParser(XMLParser):
     def handle_data(self, data):
         matchObj = _S.match(data)
         if not matchObj:
-            if self.verbose:
-                print 'data:', data
+            if self.verbose: print 'data:',data
             if self.root:
-                self.getCurrentNode().setContentFromString(data.strip())
+                self.getCurrentNode().setContentFromString(string.strip(data))
 
     def handle_cdata(self, data):
-        if self.verbose:
-            print 'cdata:', repr(data)
+        if self.verbose: print 'cdata:', `data`
 
     def handle_proc(self, name, data):
-        if self.verbose:
-            print 'processing:', name, repr(data)
+        if self.verbose: print 'processing:',name,`data`
 
     def handle_special(self, data):
-        if self.verbose:
-            print 'special:', repr(data)
+        if self.verbose: print 'special:',`data`
 
     def handle_starttag(self, tag, method, attrs):
 
-        if tag in self.dtd:
+        if self.dtd.has_key(tag):
 
             # Check that attributes are valid
-            validDict = self.dtd[tag]
+	    validDict = self.dtd[tag]
             validAttrs = validDict.keys()
             attrnames = attrs.keys()
             for attrname in attrnames:
                 if attrname not in validAttrs:
                     self.cdml_syntax_error(self.lineno,
-                                           'unknown attribute %s of element %s' %
-                                           (attrname, tag))
+                                      'unknown attribute %s of element %s' %
+                                      (attrname, tag))
                 else:
-                    (atttype, attdefault) = validDict[attrname]
-                    if isinstance(atttype, tuple):
+                    (atttype,attdefault)=validDict[attrname]
+                    if type(atttype)==type((0,)):
                         attrval = attrs[attrname]
                         if attrval not in atttype:
                             self.cdml_syntax_error(self.lineno,
-                                                   'invalid attribute value %s=%s of element %s, must be one of %s' %
-                                                   (attrname, attrval, tag, atttype))
+                                              'invalid attribute value %s=%s of element %s, must be one of %s' %
+                                              (attrname,attrval,tag,atttype))
 
             # Check that required attributes are present,
             # and add default values
             for attrname in validAttrs:
-                (atttype, attdefault) = validDict[attrname]
-                if attdefault == CDML.Required and attrname not in attrnames:
+                (atttype,attdefault)=validDict[attrname]
+                if attdefault==CDML.Required and attrname not in attrnames:
                     self.cdml_syntax_error(self.lineno,
-                                           'element %s requires an attribute %s' %
-                                           (tag, attrname))
-                if isinstance(attdefault, basestring) and attrname not in attrnames:
-                    attrs[attrname] = attdefault
-
-        method(attrs)
+                                      'element %s requires an attribute %s' %
+                                      (tag,attrname))
+                if type(attdefault)==type("") and attrname not in attrnames:
+                    attrs[attrname]=attdefault
+            
+	method(attrs)
 
     #------------------------------------------------------------------------
     # CDML tags
 
-    def start_attr(self, attrs):
-        if self.verbose:
-            print 'attr:', attrs
+    def start_attr(self,attrs):
+        if self.verbose: print 'attr:',attrs
         name = attrs['name']
         datatype = attrs['datatype']
-        attr = cdmsNode.AttrNode(name, None)
+        attr = cdmsNode.AttrNode(name,None)
         attr.datatype = datatype
         self.pushCurrentNode(attr)
 
@@ -119,35 +113,33 @@ class CDMLParser(XMLParser):
     def end_attr(self):
         attr = self.popCurrentNode()
         var = self.getCurrentNode()
-        attr.setValueFromString(attr.getContent(), attr.datatype)
+        attr.setValueFromString(attr.getContent(),attr.datatype)
         var.setExternalAttrFromAttr(attr)
 
     #------------------------------------------------------------------------
 
-    def start_axis(self, attrs):
-        if self.verbose:
-            print 'axis:', attrs
+    def start_axis(self,attrs):
+        if self.verbose: print 'axis:',attrs
         id = attrs['id']
         length_s = attrs['length']
         datatype = attrs.get('datatype')
         if _Integer.match(length_s) is None:
-            raise InvalidAttribute('length=' + length_s)
-        length = int(length_s)
-        axis = cdmsNode.AxisNode(id, length, datatype)
+            raise InvalidAttribute, 'length='+length_s
+        length = string.atoi(length_s)
+        axis = cdmsNode.AxisNode(id,length,datatype)
         partstring = attrs.get('partition')
         if partstring is not None:
             axis.setPartitionFromString(partstring)
         axis.setExternalDict(attrs)
-        self.getCurrentNode().addId(id, axis)
+        self.getCurrentNode().addId(id,axis)
         self.pushCurrentNode(axis)
-
+                
     def end_axis(self):
         self.popCurrentNode()
 
     #------------------------------------------------------------------------
     def start_cdml(self, attrs):
-        if self.verbose:
-            print 'cdml:', attrs
+        if self.verbose: print 'cdml:',attrs
 
     def end_cdml(self):
         pass
@@ -155,40 +147,36 @@ class CDMLParser(XMLParser):
     #------------------------------------------------------------------------
 
     def start_component(self, attrs):
-        if self.verbose:
-            print 'component:', attrs
+        if self.verbose: print 'component:',attrs
 
     def end_component(self):
         pass
 
     #------------------------------------------------------------------------
     def start_compoundAxis(self, attrs):
-        if self.verbose:
-            print 'compoundAxis:', attrs
+        if self.verbose: print 'compoundAxis:',attrs
 
     def end_compoundAxis(self):
         pass
 
     #------------------------------------------------------------------------
     def start_data(self, attrs):
-        if self.verbose:
-            print 'data:', attrs
+        if self.verbose: print 'data:',attrs
 
     def end_data(self):
         pass
 
     #------------------------------------------------------------------------
 
-    def start_dataset(self, attrs):
-        if self.verbose:
-            print 'dataset:', attrs
+    def start_dataset(self,attrs):
+        if self.verbose: print 'dataset:',attrs
         id = attrs['id']
         dataset = cdmsNode.DatasetNode(id)
         dataset.setExternalDict(attrs)
         if self.root:
-            self.getCurrentNode().addId(id, dataset)
+            self.getCurrentNode().addId(id,dataset)
         self.pushCurrentNode(dataset)
-
+                
     def end_dataset(self):
         dataset = self.popCurrentNode()
         dataset.validate()
@@ -196,8 +184,7 @@ class CDMLParser(XMLParser):
     #------------------------------------------------------------------------
 
     def start_doclink(self, attrs):
-        if self.verbose:
-            print 'docLink:', attrs
+        if self.verbose: print 'docLink:',attrs
         uri = attrs['href']
         doclink = cdmsNode.DocLinkNode(uri)
         doclink.setExternalDict(attrs)
@@ -210,20 +197,19 @@ class CDMLParser(XMLParser):
     #------------------------------------------------------------------------
 
     def start_domElem(self, attrs):
-        if self.verbose:
-            print 'domElem:', attrs
+        if self.verbose: print 'domElem:',attrs
         name = attrs['name']
         start_s = attrs.get('start')
         length_s = attrs.get('length')
         if start_s is not None:
-            start = int(start_s)
+            start = string.atoi(start_s)
         else:
             start = None
         if length_s is not None:
-            length = int(length_s)
+            length = string.atoi(length_s)
         else:
             length = None
-        domElem = cdmsNode.DomElemNode(name, start, length)
+        domElem = cdmsNode.DomElemNode(name,start,length)
         domElem.setExternalDict(attrs)
         self.getCurrentNode().add(domElem)
 
@@ -232,8 +218,7 @@ class CDMLParser(XMLParser):
 
     #------------------------------------------------------------------------
     def start_domain(self, attrs):
-        if self.verbose:
-            print 'domain:', attrs
+        if self.verbose: print 'domain:',attrs
         domain = cdmsNode.DomainNode()
         self.getCurrentNode().setDomain(domain)
         self.pushCurrentNode(domain)
@@ -243,42 +228,40 @@ class CDMLParser(XMLParser):
 
     #------------------------------------------------------------------------
 
-    def start_rectGrid(self, attrs):
-        if self.verbose:
-            print 'rectGrid:', attrs
+    def start_rectGrid(self,attrs):
+        if self.verbose: print 'rectGrid:',attrs
         id = attrs['id']
         gridtype = attrs['type']
         latitude = attrs['latitude']
         longitude = attrs['longitude']
-        grid = cdmsNode.RectGridNode(id, latitude, longitude, gridtype)
+        grid = cdmsNode.RectGridNode(id,latitude,longitude,gridtype)
         grid.setExternalDict(attrs)
-        self.getCurrentNode().addId(id, grid)
+        self.getCurrentNode().addId(id,grid)
         self.pushCurrentNode(grid)
-
+                
     def end_rectGrid(self):
         self.popCurrentNode()
 
     #------------------------------------------------------------------------
 
     def start_linear(self, attrs):
-        if self.verbose:
-            print 'linear:', attrs
+        if self.verbose: print 'linear:',attrs
         start_s = attrs['start']
         delta_s = attrs['delta']
         length_s = attrs['length']
         try:
-            start = float(start_s)
+            start=string.atof(start_s)
         except ValueError:
-            raise InvalidAttribute('start=' + start_s)
+            raise InvalidAttribute, 'start='+start_s
         try:
-            delta = float(delta_s)
+            delta=string.atof(delta_s)
         except ValueError:
-            raise InvalidAttribute('delta=' + delta_s)
+            raise InvalidAttribute, 'delta='+delta_s
         try:
-            length = int(length_s)
+            length=string.atoi(length_s)
         except ValueError:
-            raise InvalidAttribute('length=' + length_s)
-        linear = cdmsNode.LinearDataNode(start, delta, length)
+            raise InvalidAttribute, 'length='+length_s
+        linear = cdmsNode.LinearDataNode(start,delta,length)
         self.getCurrentNode().setLinearData(linear)
 
     def end_linear(self):
@@ -286,30 +269,28 @@ class CDMLParser(XMLParser):
 
     #------------------------------------------------------------------------
 
-    def start_variable(self, attrs):
-        if self.verbose:
-            print 'variable:', attrs
+    def start_variable(self,attrs):
+        if self.verbose: print 'variable:',attrs
         id = attrs['id']
         datatype = attrs['datatype']
-        variable = cdmsNode.VariableNode(id, datatype, None)
+        variable = cdmsNode.VariableNode(id,datatype,None)
         variable.setExternalDict(attrs)
-        self.getCurrentNode().addId(id, variable)
+        self.getCurrentNode().addId(id,variable)
         self.pushCurrentNode(variable)
-
+                
     def end_variable(self):
         self.popCurrentNode()
 
     #------------------------------------------------------------------------
 
     def start_xlink(self, attrs):
-        if self.verbose:
-            print 'xlink:', attrs
+        if self.verbose: print 'xlink:',attrs
         id = attrs['id']
         uri = attrs['href']
         contentRole = attrs['content-role']
-        xlink = cdmsNode.XLinkNode(id, uri, contentRole)
+        xlink = cdmsNode.XLinkNode(id,uri,contentRole)
         xlink.setExternalDict(attrs)
-        self.getCurrentNode().addId(id, xlink)
+        self.getCurrentNode().addId(id,xlink)
         self.pushCurrentNode(xlink)
 
     def end_xlink(self):
@@ -321,33 +302,30 @@ class CDMLParser(XMLParser):
         print 'error near line %d:' % lineno, message
 
     def unknown_starttag(self, tag, attrs):
-        if self.verbose:
-            print '**' + tag + '**:', attrs
+        if self.verbose: print '**'+tag+'**:',attrs
 
     def unknown_endtag(self, tag):
         pass
 
     def unknown_entityref(self, ref):
-        self.flush()
-        if self.verbose:
-            print '*** unknown entity ref: &' + ref + ';'
+	self.flush()
+        if self.verbose: print '*** unknown entity ref: &' + ref + ';'
 
     def unknown_charref(self, ref):
-        self.flush()
-        if self.verbose:
-            print '*** unknown char ref: &#' + ref + ';'
+	self.flush()
+        if self.verbose: print '*** unknown char ref: &#' + ref + ';'
 
     def close(self):
-        XMLParser.close(self)
+	XMLParser.close(self)
 
 if __name__ == '__main__':
     import sys
-
+    
     sampfile = open(sys.argv[1])
     text = sampfile.read()
     sampfile.close()
 
-    if len(sys.argv) == 2:
+    if len(sys.argv)==2:
         verbose = 0
     else:
         verbose = 1
@@ -355,3 +333,4 @@ if __name__ == '__main__':
     p.feed(text)
     p.close()
     p.root.dump()
+    
diff --git a/Packages/cdms2/Lib/MV2.py b/Packages/cdms2/Lib/MV2.py
index 297cd7362..b203bc6af 100644
--- a/Packages/cdms2/Lib/MV2.py
+++ b/Packages/cdms2/Lib/MV2.py
@@ -1,31 +1,31 @@
-# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
-# Further modified to be pure new numpy June 24th 2008
+## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by 
+## Further modified to be pure new numpy June 24th 2008
 
 "CDMS Variable objects, MaskedArray interface"
 import numpy
-from . import typeconv
+import typeconv
 from numpy import character, float, float32, float64, int, int8, int16, int32
 from numpy.ma import allclose, allequal, common_fill_value, compress, make_mask_none, dot, filled, \
-    getmask, getmaskarray, identity, indices, innerproduct, masked, put, putmask, rank, ravel, \
+     getmask, getmaskarray, identity, indices, innerproduct, masked, put, putmask, rank, ravel, \
      set_fill_value, shape, size, isMA, isMaskedArray, is_mask, isarray, \
      make_mask, make_mask_none, mask_or, nomask
 from numpy import sctype2char, get_printoptions, set_printoptions
-from .avariable import AbstractVariable, getNumericCompatibility
-from .tvariable import TransientVariable, asVariable
-from .grid import AbstractRectGrid
-from .error import CDMSError
-# from numpy.ma import *
-from .axis import allclose as axisAllclose, TransientAxis, concatenate as axisConcatenate, take as axisTake
+from avariable import AbstractVariable, getNumericCompatibility
+from tvariable import TransientVariable, asVariable
+from grid import AbstractRectGrid
+from error import CDMSError
+#from numpy.ma import *
+from axis import allclose as axisAllclose, TransientAxis, concatenate as axisConcatenate, take as axisTake
+
 
 
 create_mask = make_mask_none
 e = numpy.e
 pi = numpy.pi
-# NewAxis = numpy.oldnumeric.NewAxis
+#NewAxis = numpy.oldnumeric.NewAxis
 newaxis = numpy.newaxis
 counter = 0
 
-
 def fill_value(ar):
     return ar.fill_value
 
@@ -34,14 +34,13 @@ def _makeMaskedArg(x):
     """If x is a variable, turn it into a TransientVariable."""
     if isinstance(x, AbstractVariable) and not isinstance(x, TransientVariable):
         return x.subSlice()
-    elif isinstance(x, TransientVariable):
+    elif isinstance(x,TransientVariable):
         return x
     else:
         return array(x)
 
 
-def _extractMetadata(
-        a, axes=None, attributes=None, id=None, omit=None, omitall=False):
+def _extractMetadata(a, axes=None, attributes=None, id=None, omit=None, omitall=False):
     """Extract axes, attributes, id from 'a', if arg is None."""
     resultgrid = None
     if isinstance(a, AbstractVariable):
@@ -53,7 +52,7 @@ def _extractMetadata(
             attributes = a.attributes
         if id is None:
             id = "variable_%i" % TransientVariable.variable_count
-            TransientVariable.variable_count += 1
+            TransientVariable.variable_count+=1
 
         # If the grid is rectilinear, don't return an explicit grid: it's implicitly defined
         # by the axes.
@@ -61,16 +60,13 @@ def _extractMetadata(
         if (resultgrid is None) or (isinstance(resultgrid, AbstractRectGrid)) or (axes is None):
             resultgrid = None
 
-        # If the omitted axis was associated with the grid, the result will not
-        # be gridded.
+        # If the omitted axis was associated with the grid, the result will not be gridded.
         elif (omit is not None) and (resultgrid is not None) and (a.getAxis(omit) in resultgrid.getAxisList()):
             resultgrid = None
 
     return axes, attributes, id, resultgrid
 
-
 class var_unary_operation:
-
     def __init__(self, mafunc):
         """ var_unary_operation(mafunc)
         mafunc is an numpy.ma masked_unary_function.
@@ -78,31 +74,26 @@ class var_unary_operation:
         self.mafunc = mafunc
         self.__doc__ = mafunc.__doc__
 
-    def __call__(self, a):
+    def __call__ (self, a):
         axes, attributes, id, grid = _extractMetadata(a)
         maresult = self.mafunc(_makeMaskedArg(a))
         return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid)
 
-
 class var_unary_operation_with_axis:
-
     def __init__(self, mafunc):
         """ var_unary_operation(mafunc)
         mafunc is an numpy.ma masked_unary_function.
         """
         self.mafunc = mafunc
         self.__doc__ = mafunc.__doc__
-
-    def __call__(self, a, axis=0):
+    def __call__ (self, a, axis=0):
         axis = _conv_axis_arg(axis)
         ta = _makeMaskedArg(a)
         maresult = self.mafunc(ta, axis=axis)
-        axes, attributes, id, grid = _extractMetadata(
-            a, omit=axis, omitall=(axis is None))
+        axes, attributes, id, grid = _extractMetadata(a, omit=axis, omitall=(axis is None))
         return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid)
 
-
-def commonDomain(a, b, omit=None):
+def commonDomain(a,b,omit=None):
     """commonDomain(a,b) tests that the domains of variables/arrays a and b are equal,
     and returns the common domain if equal, or None if not equal. The domains may
     differ in that one domain may have leading axes not common
@@ -110,15 +101,14 @@ def commonDomain(a, b, omit=None):
     If <omit> is specified, as an integer i, skip comparison of the ith dimension
     and return None for the ith (common) dimension.
     """
-
+    
     if isinstance(b, AbstractVariable):
         bdom = b.getAxisList()
     else:
         bdom = None
-    return commonAxes(a, bdom, omit=omit)
+    return commonAxes(a,bdom,omit=omit)
 
-
-def commonAxes(a, bdom, omit=None):
+def commonAxes(a,bdom,omit=None):
     """Helper function for commonDomain. 'a' is a variable or array,
     'b' is an axislist or None.
     """
@@ -126,40 +116,40 @@ def commonAxes(a, bdom, omit=None):
         adom = a.getAxisList()
         arank = len(adom)
         brank = len(bdom)
-        if arank > brank:
+        if arank>brank:
             maxrank = arank
             minrank = brank
         else:
             maxrank = brank
             minrank = arank
-        diffrank = maxrank - minrank
-        if maxrank == arank:
+        diffrank = maxrank-minrank
+        if maxrank==arank:
             maxdom = adom
         else:
             maxdom = bdom
-        common = [None] * maxrank
+        common = [None]*maxrank
         if omit is None:
             iomit = None
         else:
-            iomit = omit - minrank
+            iomit = omit-minrank
 
         # Check shared dimensions, last to first
         for i in range(minrank):
-            j = -i - 1
-            if j == iomit:
+            j = -i-1
+            if j==iomit:
                 continue
             aj = adom[j]
             bj = bdom[j]
-            if len(aj) != len(bj):
+            if len(aj)!=len(bj):
                 return None
-            elif axisAllclose(aj, bj):
+            elif axisAllclose(aj,bj):
                 common[j] = aj
             else:
                 common[j] = TransientAxis(numpy.arange(len(aj)))
 
         # Copy leading (non-shared) axes
         for i in range(diffrank):
-            common[i] = maxdom[i]
+            common[i]=maxdom[i]
 
         return common
     elif isinstance(a, AbstractVariable):
@@ -172,7 +162,6 @@ def commonAxes(a, bdom, omit=None):
             bdom[omit] = None
         return bdom
 
-
 def commonGrid(a, b, axes):
     """commonGrid(a,b,axes) tests if the grids associated with variables a, b are equal,
     and consistent with the list of axes. If so, the common grid is returned, else None
@@ -193,7 +182,6 @@ def commonGrid(a, b, axes):
 
     return commonGrid1(a, gb, axes)
 
-
 def commonGrid1(a, gb, axes):
     """Helper function for commonGrid."""
     if isinstance(a, AbstractVariable):
@@ -222,9 +210,7 @@ def commonGrid1(a, gb, axes):
 
     return result
 
-
 class var_binary_operation:
-
     def __init__(self, mafunc):
         """ var_binary_operation(mafunc)
         mafunc is an numpy.ma masked_binary_function.
@@ -232,29 +218,29 @@ class var_binary_operation:
         self.mafunc = mafunc
         self.__doc__ = mafunc.__doc__
 
-    def __call__(self, a, b):
+    def __call__ (self, a, b):
         id = "variable_%i" % TransientVariable.variable_count
-        TransientVariable.variable_count += 1
-        axes = commonDomain(a, b)
-        grid = commonGrid(a, b, axes)
+        TransientVariable.variable_count+=1
+        axes = commonDomain(a,b)
+        grid = commonGrid(a,b,axes)
         ta = _makeMaskedArg(a)
         tb = _makeMaskedArg(b)
-        maresult = self.mafunc(ta, tb)
-        return TransientVariable(maresult, axes=axes, grid=grid, no_update_from=True, id=id)
+        maresult = self.mafunc(ta,tb)
+        return TransientVariable(maresult, axes=axes, grid=grid,no_update_from=True,id=id)
 
-    def reduce(self, target, axis=0):
+    def reduce (self, target, axis=0):
         ttarget = _makeMaskedArg(target)
         maresult = self.mafunc.reduce(ttarget, axis=axis)
         axes, attributes, id, grid = _extractMetadata(target, omit=axis)
         return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid)
 
-    def accumulate(self, target, axis=0):
+    def accumulate (self, target, axis=0):
         ttarget = _makeMaskedArg(target)
         maresult = self.mafunc.accumulate(ttarget, axis=axis)
         axes, attributes, id, grid = _extractMetadata(target, omit=axis)
         return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid)
-
-    def outer(self, a, b):
+        
+    def outer (self, a, b):
         """Return the function applied to the outer product of a and b"""
         a1 = _makeMaskedArg(a)
         b1 = _makeMaskedArg(b)
@@ -262,13 +248,11 @@ class var_binary_operation:
         return TransientVariable(maresult)
 
 
-def compress(a, b):
-    __doc__ = numpy.ma.__doc__
-    import warnings
-    warnings.warn(
-        "arguments order for compress function has changed\nit is now: MV2.copmress(array,condition), if your code seems to not react or act wrong to a call to compress, please check this",
-        Warning)
-    return TransientVariable(numpy.ma.compress(a, b), copy=1)
+def compress(a,b):
+   __doc__=numpy.ma.__doc__
+   import warnings
+   warnings.warn("arguments order for compress function has changed\nit is now: MV2.copmress(array,condition), if your code seems to not react or act wrong to a call to compress, please check this", Warning)
+   return TransientVariable(numpy.ma.compress(a,b),copy=1)
 
 
 sqrt = var_unary_operation(numpy.ma.sqrt)
@@ -285,31 +269,27 @@ less_equal = var_binary_operation(numpy.ma.less_equal)
 greater_equal = var_binary_operation(numpy.ma.greater_equal)
 less = var_binary_operation(numpy.ma.less)
 greater = var_binary_operation(numpy.ma.greater)
-
-
-def power(a, b, third=None):
+def power (a, b, third=None):
     "a**b"
     ta = _makeMaskedArg(a)
     tb = _makeMaskedArg(b)
-    maresult = numpy.ma.power(ta, tb, third)
+    maresult = numpy.ma.power(ta,tb,third)
     axes, attributes, id, grid = _extractMetadata(a)
     return TransientVariable(maresult, axes=axes, attributes=attributes, grid=grid, id=id)
 
-
-def left_shift(a, n):
+def left_shift (a, n):
     "Left shift n bits"
     ta = _makeMaskedArg(a)
     tb = _makeMaskedArg(n)
-    maresult = numpy.ma.left_shift(ta, numpy.ma.filled(tb))
+    maresult = numpy.ma.left_shift(ta,numpy.ma.filled(tb))
     axes, attributes, id, grid = _extractMetadata(a)
     return TransientVariable(maresult, axes=axes, attributes=attributes, grid=grid, id=id)
 
-
-def right_shift(a, n):
+def right_shift (a, n):
     "Right shift n bits"
     ta = _makeMaskedArg(a)
     tb = _makeMaskedArg(n)
-    maresult = numpy.ma.right_shift(ta, numpy.ma.filled(tb))
+    maresult = numpy.ma.right_shift(ta,numpy.ma.filled(tb))
     axes, attributes, id, grid = _extractMetadata(a)
     return TransientVariable(maresult, axes=axes, attributes=attributes, grid=grid, id=id)
 
@@ -320,33 +300,27 @@ def _convdtype(dtype, typecode):
         dtype = typeconv.convtypecode2(typecode)
     return dtype
 
-
 def _conv_axis_arg(axis):
     "Handle backward compatibility with numpy for axis arg"
     if getNumericCompatibility() and axis is None:
-        axis = 0
+        axis=0
     return axis
 
-
 def is_masked(x):
     "Is x a 0-D masked value?"
-    return isMaskedArray(x) and x.size == 1 and x.ndim == 0 and x.mask.item()
-
+    return isMaskedArray(x) and x.size==1 and x.ndim==0 and x.mask.item()
 
 def is_floating(x):
     "Is x a scalar float, either python or numpy?"
     return (isinstance(x, numpy.floating) or isinstance(x, float))
 
-
 def is_integer(x):
     "Is x a scalar integer, either python or numpy?"
     return (isinstance(x, numpy.integer) or isinstance(x, int) or isinstance(x, long))
 
-
 def get_print_limit():
     return get_printoptions()['threshold']
 
-
 def set_print_limit(limit=numpy.inf):
     set_printoptions(threshold=limit)
 
@@ -395,113 +369,75 @@ bitwise_or = var_binary_operation(numpy.ma.bitwise_or)
 bitwise_xor = var_binary_operation(numpy.ma.bitwise_xor)
 
 
-def count(a, axis=None):
-    "Count of the non-masked elements in a, or along a certain axis."
+def count (a, axis = None):
+    "Count of the non-masked elements in a, or along a certain axis."   
     if axis is None:
-        return numpy.ma.count(a, axis)
+        return numpy.ma.count(a,axis)
     else:
         ta = _makeMaskedArg(a)
-        maresult = numpy.ma.count(ta, axis)
-        axes, attributes, id, grid = _extractMetadata(a, omit=axis)
-        F = getattr(a, "fill_value", 1.e20)
+        maresult = numpy.ma.count(ta,axis)
+        axes, attributes, id, grid = _extractMetadata(a,omit=axis)
+        F=getattr(a,"fill_value",1.e20)
         return TransientVariable(maresult, axes=axes, attributes=attributes, grid=grid, id=id, fill_value=F)
 
-
-def sum(a, axis=None, fill_value=0, dtype=None):
+def sum (a, axis = None, fill_value=0, dtype=None):
     "Sum of elements along a certain axis."
     axis = _conv_axis_arg(axis)
     ta = _makeMaskedArg(a)
     maresult = numpy.ma.sum(ta, axis, dtype=dtype)
-    axes, attributes, id, grid = _extractMetadata(
-        a, omit=axis, omitall=(axis is None))
-    F = getattr(a, "fill_value", 1.e20)
+    axes, attributes, id, grid = _extractMetadata(a, omit=axis, omitall=(axis is None))
+    F=getattr(a,"fill_value",1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, grid=grid, id=id, fill_value=F)
 
-
-def product(a, axis=0, dtype=None):
+def product (a, axis = 0, dtype=None):
     "Product of elements along axis."
     ta = _makeMaskedArg(a)
     maresult = numpy.ma.product(ta, axis, dtype=dtype)
     axes, attributes, id, grid = _extractMetadata(a, omit=axis)
-    F = getattr(a, "fill_value", 1.e20)
+    F=getattr(a,"fill_value",1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, grid=grid, id=id, fill_value=F)
 
-
-def average(a, axis=None, weights=None, returned=False):
+def average (a, axis=None, weights=None, returned=False):
     axis = _conv_axis_arg(axis)
     ta = _makeMaskedArg(a)
     maresult = numpy.ma.average(ta, axis, weights, returned)
-    axes, attributes, id, grid = _extractMetadata(
-        a, omit=axis, omitall=(axis is None))
+    axes, attributes, id, grid = _extractMetadata(a, omit=axis, omitall=(axis is None))
     if returned:
-        if isinstance(maresult, tuple):
-            maresult, wresult = maresult
-        else:
-            # ok it's masked constant need to return both things by hand
-            wresult = numpy.ma.masked
-    F = getattr(a, "fill_value", 1.e20)
-    r1 = TransientVariable(
-        maresult,
-        axes=axes,
-     attributes=attributes,
-     grid=grid,
-     id=id,
-     no_update_from=True,
-     fill_value=F)
+      if isinstance(maresult,tuple):
+        maresult, wresult = maresult
+      else:
+        #ok it's masked constant need to return both things by hand
+        wresult = numpy.ma.masked
+    F=getattr(a,"fill_value",1.e20)
+    r1 = TransientVariable(maresult, axes=axes, attributes=attributes, grid=grid, id=id,no_update_from=True, fill_value=F)
     if returned:
-        F = getattr(a, "fill_value", 1.e20)
-        w1 = TransientVariable(
-            wresult,
-            axes=axes,
-            grid=grid,
-            id=id,
-            no_update_from=True,
-            fill_value=F)
+        F=getattr(a,"fill_value",1.e20)
+        w1 = TransientVariable(wresult, axes=axes, grid=grid, id=id,no_update_from=True, fill_value=F)
         return r1, w1
     else:
         return r1
 average.__doc__ = numpy.ma.average.__doc__
 
-
-def max(a, axis=None):
+def max (a, axis=None):
     axis = _conv_axis_arg(axis)
     ta = _makeMaskedArg(a)
     maresult = numpy.ma.max(ta, axis)
-    axes, attributes, id, grid = _extractMetadata(
-        a, omit=axis, omitall=(axis is None))
-    F = getattr(a, "fill_value", 1.e20)
-    r1 = TransientVariable(
-        maresult,
-        axes=axes,
-     attributes=attributes,
-     grid=grid,
-     id=id,
-     no_update_from=True,
-     fill_value=F)
+    axes, attributes, id, grid = _extractMetadata(a, omit=axis, omitall=(axis is None))
+    F=getattr(a,"fill_value",1.e20)
+    r1 = TransientVariable(maresult, axes=axes, attributes=attributes, grid=grid, id=id,no_update_from=True, fill_value=F)
     return r1
 max.__doc__ = numpy.ma.max.__doc__
-
-
-def min(a, axis=None):
+def min (a, axis=None):
     axis = _conv_axis_arg(axis)
     ta = _makeMaskedArg(a)
     maresult = numpy.ma.min(ta, axis)
-    axes, attributes, id, grid = _extractMetadata(
-        a, omit=axis, omitall=(axis is None))
-    F = getattr(a, "fill_value", 1.e20)
-    r1 = TransientVariable(
-        maresult,
-        axes=axes,
-     attributes=attributes,
-     grid=grid,
-     id=id,
-     no_update_from=True,
-     fill_value=F)
+    axes, attributes, id, grid = _extractMetadata(a, omit=axis, omitall=(axis is None))
+    F=getattr(a,"fill_value",1.e20)
+    r1 = TransientVariable(maresult, axes=axes, attributes=attributes, grid=grid, id=id,no_update_from=True, fill_value=F)
     return r1
 min.__doc__ = numpy.ma.min.__doc__
 
-
-def sort(a, axis=-1):
+def sort (a, axis=-1):
     ta = _makeMaskedArg(a)
     maresult = numpy.ma.sort(a.asma(), axis)
     axes, attributes, id, grid = _extractMetadata(a)
@@ -509,13 +445,11 @@ def sort(a, axis=-1):
     if (grid is not None) and (sortaxis in grid.getAxisList()):
         grid = None
     axes[axis] = TransientAxis(numpy.arange(len(sortaxis)))
-    F = getattr(a, "fill_value", 1.e20)
+    F=getattr(a,"fill_value",1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, grid=grid, id=id, fill_value=F)
-sort.__doc__ = numpy.ma.sort.__doc__ + \
-    "The sort axis is replaced with a dummy axis."
+sort.__doc__ = numpy.ma.sort.__doc__ + "The sort axis is replaced with a dummy axis."
 
-
-def choose(indices, t):
+def choose (indices, t):
     """Returns an array shaped like indices containing elements chosen
       from t.
       If an element of t is the special element masked, any element
@@ -524,38 +458,35 @@ def choose(indices, t):
       The result has only the default axes.
     """
     maresult = numpy.ma.choose(indices, map(_makeMaskedArg, t))
-    F = getattr(t, "fill_value", 1.e20)
+    F=getattr(t,"fill_value",1.e20)
     return TransientVariable(maresult, fill_value=F)
 
-
-def where(condition, x, y):
-    "where(condition, x, y) is x where condition is true, y otherwise"
-# axes = commonDomain(x,y)
-# grid = commonGrid(x,y,axes)
+def where (condition, x, y):
+    "where(condition, x, y) is x where condition is true, y otherwise" 
+##    axes = commonDomain(x,y)
+##    grid = commonGrid(x,y,axes)
     maresult = numpy.ma.where(condition, _makeMaskedArg(x), _makeMaskedArg(y))
     axes, attributes, id, grid = _extractMetadata(condition)
-    F = getattr(x, "fill_value", 1.e20)
+    F=getattr(x,"fill_value",1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, grid=grid, id=id, fill_value=F)
 
-
 def masked_where(condition, x, copy=1):
-    """Return x as an array masked where condition is true.
+    """Return x as an array masked where condition is true. 
        Also masked where x or condition masked.
     """
     tx = _makeMaskedArg(x)
     tcondition = _makeMaskedArg(condition)
     maresult = numpy.ma.masked_where(tcondition, tx, copy)
     axes, attributes, id, grid = _extractMetadata(x)
-    F = getattr(x, "fill_value", 1.e20)
+    F=getattr(x,"fill_value",1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
-
 def masked_greater(x, value):
     "masked_greater(x, value) = x masked where x > value"
     tx = _makeMaskedArg(x)
     maresult = numpy.ma.masked_greater(tx, value)
     axes, attributes, id, grid = _extractMetadata(x)
-    F = getattr(x, "fill_value", 1.e20)
+    F=getattr(x,"fill_value",1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
 
@@ -564,37 +495,33 @@ def masked_greater_equal(x, value):
     tx = _makeMaskedArg(x)
     maresult = numpy.ma.masked_greater_equal(tx, value)
     axes, attributes, id, grid = _extractMetadata(x)
-    F = getattr(x, "fill_value", 1.e20)
+    F=getattr(x,"fill_value",1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
-
 def masked_less(x, value):
     "masked_less(x, value) = x masked where x < value"
     tx = _makeMaskedArg(x)
     maresult = numpy.ma.masked_less(tx, value)
     axes, attributes, id, grid = _extractMetadata(x)
-    F = getattr(x, "fill_value", 1.e20)
+    F=getattr(x,"fill_value",1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
-
 def masked_less_equal(x, value):
     "masked_less_equal(x, value) = x masked where x <= value"
     tx = _makeMaskedArg(x)
     maresult = numpy.ma.masked_less_equal(tx, value)
     axes, attributes, id, grid = _extractMetadata(x)
-    F = getattr(x, "fill_value", 1.e20)
+    F=getattr(x,"fill_value",1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
-
 def masked_not_equal(x, value):
     "masked_not_equal(x, value) = x masked where x != value"
     tx = _makeMaskedArg(x)
     maresult = numpy.ma.masked_not_equal(tx, value)
     axes, attributes, id, grid = _extractMetadata(x)
-    F = getattr(x, "fill_value", 1.e20)
+    F=getattr(x,"fill_value",1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
-
 def masked_equal(x, value):
     """masked_equal(x, value) = x masked where x == value
        For floating point consider masked_values(x, value) instead.
@@ -602,43 +529,40 @@ def masked_equal(x, value):
     tx = _makeMaskedArg(x)
     maresult = numpy.ma.masked_equal(tx, value)
     axes, attributes, id, grid = _extractMetadata(x)
-    F = getattr(x, "fill_value", 1.e20)
+    F=getattr(x,"fill_value",1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
-
 def masked_outside(x, v1, v2):
     "x with mask of all values of x that are outside [v1,v2]"
     tx = _makeMaskedArg(x)
     maresult = numpy.ma.masked_outside(tx, v1, v2)
     axes, attributes, id, grid = _extractMetadata(x)
-    F = getattr(x, "fill_value", 1.e20)
+    F=getattr(x,"fill_value",1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
-
 def masked_inside(x, v1, v2):
     "x with mask of all values of x that are inside [v1,v2]"
     tx = _makeMaskedArg(x)
     maresult = numpy.ma.masked_inside(tx, v1, v2)
     axes, attributes, id, grid = _extractMetadata(x)
-    F = getattr(x, "fill_value", 1.e20)
+    F=getattr(x,"fill_value",1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
-
-def concatenate(arrays, axis=0, axisid=None, axisattributes=None):
+def concatenate (arrays, axis=0, axisid=None, axisattributes=None):
     """Concatenate the arrays along the given axis. Give the extended axis the id and
     attributes provided - by default, those of the first array."""
 
     tarrays = [_makeMaskedArg(a) for a in arrays]
     maresult = numpy.ma.concatenate(arrays, axis=axis)
-    if len(arrays) > 1:
+    if len(arrays)>1:
         varattributes = None
         varid = None
-        axes = commonDomain(tarrays[0], tarrays[1], omit=axis)
+        axes = commonDomain(tarrays[0],tarrays[1],omit=axis)
         grid = commonGrid(tarrays[0], tarrays[1], axes)
-        for i in range(len(arrays) - 2):
+        for i in range(len(arrays)-2):
             if axes is None:
                 break
-            axes = commonAxes(tarrays[i + 2], axes, omit=axis)
+            axes = commonAxes(tarrays[i+2],axes,omit=axis)
             grid = commonGrid1(a, grid, axes)
     else:
         axes = tarrays[0].getAxisList()
@@ -651,37 +575,32 @@ def concatenate(arrays, axis=0, axisid=None, axisattributes=None):
     if axes is not None:
         if axisid is None:
             axisid = tarrays[0].getAxis(axis).id
-        allunitsequal = True
+        allunitsequal=True
         try:
-            allunits = tarrays[0].getAxis(axis).units
+            allunits=tarrays[0].getAxis(axis).units
         except:
-            allunits = None
+            allunits=None
         for t in tarrays[1:]:
             try:
-                tunits = t.getAxis(axis).units
+                tunits=t.getAxis(axis).units
             except:
-                tunits = None
-            if tunits != allunits:
-                allunitsequal = False
+                tunits=None
+            if tunits!=allunits:
+                allunitsequal=False
         if allunitsequal:
             if axisattributes is None:
                 axisattributes = tarrays[0].getAxis(axis).attributes
-            axes[axis] = axisConcatenate(
-                [t.getAxis(axis) for t in tarrays],
-                axisid,
-                axisattributes)
+            axes[axis] = axisConcatenate([t.getAxis(axis) for t in tarrays], axisid, axisattributes)
 
-    # If the grid doesn't match the axislist (e.g., catenation was on
-    # latitude) then omit it.
+    # If the grid doesn't match the axislist (e.g., catenation was on latitude) then omit it.
     if grid is not None:
         for item in grid.getAxisList():
             if item not in axes:
                 grid = None
-    F = getattr(arrays[0], "fill_value", 1.e20)
-    return TransientVariable(maresult, axes=axes, attributes=varattributes, id=varid, grid=grid, fill_value=F)
-
+    F=getattr(arrays[0],"fill_value",1.e20)
+    return TransientVariable(maresult, axes=axes, attributes=varattributes,id=varid,grid=grid, fill_value=F)
 
-def take(a, indices, axis=None):
+def take (a, indices, axis=None):
     "take(a, indices, axis=None) returns selection of items from a."
     axis = _conv_axis_arg(axis)
     ta = _makeMaskedArg(a)
@@ -689,16 +608,15 @@ def take(a, indices, axis=None):
     # ma compatibility interface has a bug
     maresult = numpy.ma.take(ta, indices, axis=axis)
     axes, attributes, id, grid = _extractMetadata(a, omitall=(axis is None))
-
+    
     # If the take is on a grid axis, omit the grid.
     if (grid is not None) and (axes[axis] in grid.getAxisList()):
         grid = None
     if axes is not None:
         axes[axis] = axisTake(axes[axis], indices)
-    F = getattr(a, "fill_value", 1.e20)
+    F=getattr(a,"fill_value",1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
-
 def transpose(a, axes=None):
     "transpose(a, axes=None) reorder dimensions per tuple axes"
     ta = _makeMaskedArg(a)
@@ -710,53 +628,49 @@ def transpose(a, axes=None):
     newaxes = None
     if oldaxes is not None:
         newaxes = [oldaxes[i] for i in axes]
-    F = getattr(a, "fill_value", 1.e20)
+    F=getattr(a,"fill_value",1.e20)
     return TransientVariable(maresult, axes=newaxes, attributes=attributes, id=id, grid=grid, copy=1, fill_value=F)
 
-
 class _minimum_operation:
-
     "Object to calculate minima"
-
-    def __init__(self):
+    def __init__ (self):
         """minimum(a, b) or minimum(a)
            In one argument case returns the scalar minimum.
         """
         pass
 
-    def __call__(self, a, b=None):
+    def __call__ (self, a, b=None):
         "Execute the call behavior."
         a = _makeMaskedArg(a)
         if b is None:
             m = getmask(a)
-            if m is nomask:
+            if m is nomask: 
                 d = numpy.min(filled(a).ravel())
                 return d
-# ac = a.compressed()
-# if len(ac) == 0:
-# return masked
+##             ac = a.compressed()
+##             if len(ac) == 0:
+##                 return masked
             else:
                 return numpy.ma.min(a)
         else:
             return where(less(a, b), a, b)[...]
-
-    def reduce(self, target, axis=0):
+       
+    def reduce (self, target, axis=0):
         """Reduce target along the given axis."""
         a = _makeMaskedArg(target)
         axes, attributes, id, grid = _extractMetadata(a, omit=axis)
         m = getmask(a)
         if m is nomask:
             t = filled(a)
-            result = masked_array(numpy.minimum.reduce(t, axis))
+            result = masked_array (numpy.minimum.reduce (t, axis))
         else:
-            t = numpy.minimum.reduce(
-                filled(a, numpy.ma.minimum_fill_value(a)), axis)
+            t = numpy.minimum.reduce(filled(a, numpy.ma.minimum_fill_value(a)), axis)
             m = numpy.logical_and.reduce(m, axis)
             result = masked_array(t, m, fill_value(a))
         return TransientVariable(result, axes=axes, copy=0,
-                                 fill_value=fill_value(a), grid=grid, id=id)
+                     fill_value=fill_value(a), grid=grid, id=id)
 
-    def outer(self, a, b):
+    def outer (self, a, b):
         "Return the function applied to the outer product of a and b."
         a = _makeMaskedArg(a)
         b = _makeMaskedArg(b)
@@ -771,51 +685,47 @@ class _minimum_operation:
         d = numpy.minimum.outer(filled(a), filled(b))
         return TransientVariable(d, mask=m, copy=0)
 
-minimum = _minimum_operation()
-
-
+minimum = _minimum_operation () 
+    
 class _maximum_operation:
-
     "Object to calculate maxima"
-
-    def __init__(self):
+    def __init__ (self):
         """maximum(a, b) or maximum(a)
            In one argument case returns the scalar maximum.
         """
         pass
 
-    def __call__(self, a, b=None):
+    def __call__ (self, a, b=None):
         "Execute the call behavior."
         a = _makeMaskedArg(a)
         if b is None:
             m = getmask(a)
-            if m is nomask:
+            if m is nomask: 
                 d = numpy.max(filled(a).ravel())
                 return d
-# ac = a.compressed()
-# if len(ac) == 0:
-# return masked
+##             ac = a.compressed()
+##             if len(ac) == 0:
+##                 return masked
             else:
                 return numpy.ma.max(a)
         else:
             return where(greater(a, b), a, b)[...]
-
-    def reduce(self, target, axis=0):
+       
+    def reduce (self, target, axis=0):
         """Reduce target along the given axis."""
         axes, attributes, id, grid = _extractMetadata(target, omit=axis)
         a = _makeMaskedArg(target)
         m = getmask(a)
         if m is nomask:
             t = filled(a)
-            return masked_array(numpy.maximum.reduce(t, axis))
+            return masked_array (numpy.maximum.reduce (t, axis))
         else:
-            t = numpy.maximum.reduce(
-                filled(a, numpy.ma.maximum_fill_value(a)), axis)
+            t = numpy.maximum.reduce(filled(a, numpy.ma.maximum_fill_value(a)), axis)
             m = numpy.logical_and.reduce(m, axis)
             return TransientVariable(t, mask=m, fill_value=fill_value(a),
-                                     axes=axes, grid=grid, id=id)
+                        axes = axes, grid=grid, id=id)
 
-    def outer(self, a, b):
+    def outer (self, a, b):
         "Return the function applied to the outer product of a and b."
         a = _makeMaskedArg(a)
         b = _makeMaskedArg(b)
@@ -830,9 +740,8 @@ class _maximum_operation:
         d = numpy.maximum.outer(filled(a), filled(b))
         return TransientVariable(d, mask=m)
 
-maximum = _maximum_operation()
-
-
+maximum = _maximum_operation () 
+    
 def asarray(data, typecode=None, dtype=None):
     """asarray(data, typecode=None, dtype=None) is equivalent to array(data, dtype=None, copy=0)
        Returns data if dtype is None or data is a MaskedArray of the same dtype.
@@ -842,12 +751,10 @@ def asarray(data, typecode=None, dtype=None):
     if isinstance(data, AbstractVariable) and (dtype is None or sctype2char(dtype) == data.dtype.char):
         return data
     else:
-        F = getattr(data, "fill_value", 1.e20)
+        F=getattr(data,"fill_value",1.e20)
         return TransientVariable(data, dtype=dtype, copy=0, fill_value=F)
 
-
-def arrayrange(start, stop=None, step=1, typecode=None,
-               axis=None, attributes=None, id=None, dtype=None):
+def arrayrange(start, stop=None, step=1, typecode=None, axis=None, attributes=None, id=None, dtype=None):
     """Just like range() except it returns a variable whose type can be specfied
     by the keyword argument typecode. The axis of the result variable may be specified.
     """
@@ -860,19 +767,15 @@ def arrayrange(start, stop=None, step=1, typecode=None,
 
 arange = arrayrange
 
-
-def zeros(shape, typecode=float, savespace=0, axes=None,
-          attributes=None, id=None, grid=None, dtype=None):
-    """zeros(n, typecode=float, savespace=0, axes=None, attributes=None, id=None) =
+def zeros (shape, typecode=float, savespace=0, axes=None, attributes=None, id=None, grid=None, dtype=None):
+    """zeros(n, typecode=float, savespace=0, axes=None, attributes=None, id=None) = 
      an array of all zeros of the given length or shape."""
     dtype = _convdtype(dtype, typecode)
     maresult = numpy.ma.zeros(shape, dtype=dtype)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid)
-
-
-def ones(shape, typecode=float, savespace=0, axes=None,
-         attributes=None, id=None, grid=None, dtype=None):
-    """ones(n, typecode=float, savespace=0, axes=None, attributes=None, id=None) =
+    
+def ones (shape, typecode=float, savespace=0, axes=None, attributes=None, id=None, grid=None, dtype=None):
+    """ones(n, typecode=float, savespace=0, axes=None, attributes=None, id=None) = 
      an array of all ones of the given length or shape."""
     dtype = _convdtype(dtype, typecode)
     maresult = numpy.ma.ones(shape, dtype=dtype)
@@ -880,31 +783,28 @@ def ones(shape, typecode=float, savespace=0, axes=None,
 
 as_masked = numpy.ma.array
 
-
 def outerproduct(a, b):
     """outerproduct(a,b) = {a[i]*b[j]}, has shape (len(a),len(b))"""
-    ta = asVariable(a, writeable=1)
-    tb = asVariable(b, writeable=1)
-    maresult = numpy.ma.outerproduct(ta, tb)
-    axes = (ta.getAxis(0), tb.getAxis(0))
-    F = getattr(a, "fill_value", 1.e20)
+    ta = asVariable(a,writeable=1)
+    tb = asVariable(b,writeable=1)
+    maresult = numpy.ma.outerproduct(ta,tb)
+    axes = (ta.getAxis(0),tb.getAxis(0))
+    F=getattr(a,"fill_value",1.e20)
     return TransientVariable(maresult, axes=axes, fill_value=F)
 
-
-def argsort(x, axis=-1, fill_value=None):
+def argsort (x, axis = -1, fill_value=None):
     """Treating masked values as if they have the value fill_value,
        return sort indices for sorting along given axis.
        if fill_value is None, use fill_value(x)
-    """
+    """        
     tx = _makeMaskedArg(x)
-    maresult = numpy.ma.argsort(tx, axis=axis, fill_value=fill_value)
+    maresult = numpy.ma.argsort(tx,axis=axis,fill_value=fill_value)
     axes, attributes, id, grid = _extractMetadata(x)
-    F = getattr(x, "fill_value", 1.e20)
+    F=getattr(x,"fill_value",1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
 array = TransientVariable
 
-
 def repeat(a, repeats, axis=None):
     """repeat elements of a repeats times along axis
        repeats is a sequence of length a.shape[axis]
@@ -918,85 +818,68 @@ def repeat(a, repeats, axis=None):
         grid = None
     if axes is not None:
         axes[axis] = None
-    F = getattr(a, "fill_value", 1.e20)
+    F=getattr(a,"fill_value",1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, no_update_from=True, fill_value=F)
 
-
-def reshape(a, newshape, axes=None, attributes=None, id=None, grid=None):
+def reshape (a, newshape, axes=None, attributes=None, id=None, grid=None):
     ignore, attributes, id, ignore = _extractMetadata(a, axes, attributes, id)
     if axes is not None:
         axesshape = [len(item) for item in axes]
-        if axesshape != list(newshape):
-            raise CDMSError('axes must be shaped %s' % repr(newshape))
+        if axesshape!=list(newshape):
+            raise CDMSError, 'axes must be shaped %s'%`newshape`
     ta = _makeMaskedArg(a)
     maresult = numpy.ma.reshape(ta, newshape)
-    F = getattr(a, "fill_value", 1.e20)
+    F=getattr(a,"fill_value",1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, no_update_from=True, fill_value=F)
-reshape.__doc__ = "numpy doc: %s\naxes/attributes/grid are applied onto the new variable" % numpy.reshape.__doc__
-
+reshape.__doc__="numpy doc: %s\naxes/attributes/grid are applied onto the new variable" % numpy.reshape.__doc__
 
-def resize(a, new_shape, axes=None, attributes=None, id=None, grid=None):
+def resize (a, new_shape, axes=None, attributes=None, id=None, grid=None):
     """resize(a, new_shape) returns a new array with the specified shape.
     The original array's total size can be any size."""
     ignore, attributes, id, ignore = _extractMetadata(a, axes, attributes, id)
     if axes is not None:
         axesshape = [len(item) for item in axes]
-        if axesshape != list(new_shape):
-            raise CDMSError('axes must be shaped %s' % repr(newshape))
+        if axesshape!=list(new_shape):
+            raise CDMSError, 'axes must be shaped %s'%`newshape`
     ta = _makeMaskedArg(a)
     maresult = numpy.ma.resize(ta, new_shape)
-    F = getattr(a, "fill_value", 1.e20)
+    F=getattr(a,"fill_value",1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
-
-def masked_array(a, mask=None, fill_value=None,
-                 axes=None, attributes=None, id=None):
-    """masked_array(a, mask=None) =
+def masked_array (a, mask=None, fill_value=None, axes=None, attributes=None, id=None):
+    """masked_array(a, mask=None) = 
        array(a, mask=mask, copy=0, fill_value=fill_value)
        Use fill_value(a) if None.
     """
-    maresult = numpy.ma.masked_array(
-        _makeMaskedArg(a),
-        mask=mask,
-     fill_value=fill_value)
+    maresult = numpy.ma.masked_array(_makeMaskedArg(a), mask=mask, fill_value=fill_value)
     axes, attributes, id, grid = _extractMetadata(a, axes, attributes, id)
-    F = getattr(a, "fill_value", 1.e20)
+    F=getattr(a,"fill_value",1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
-
-def masked_values(data, value, rtol=1.e-5, atol=1.e-8, copy=1,
-                  savespace=0, axes=None, attributes=None, id=None):
+def masked_values (data, value, rtol=1.e-5, atol=1.e-8, copy=1,
+    savespace=0, axes=None, attributes=None, id=None): 
     """
        masked_values(data, value, rtol=1.e-5, atol=1.e-8)
        Create a masked array; mask is None if possible.
        May share data values with original array, but not recommended.
        Masked where abs(data-value)<= atol + rtol * abs(value)
     """
-    maresult = numpy.ma.masked_values(
-        _makeMaskedArg(data),
-        value,
-     rtol=rtol,
-     atol=atol,
-     copy=copy)
+    maresult = numpy.ma.masked_values(_makeMaskedArg(data), value, rtol=rtol, atol=atol, copy=copy)
     axes, attributes, id, grid = _extractMetadata(data, axes, attributes, id)
-    F = getattr(data, "fill_value", 1.e20)
+    F=getattr(data,"fill_value",1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
 
-
-def masked_object(data, value, copy=1,
-                  savespace=0, axes=None, attributes=None, id=None):
+def masked_object (data, value, copy=1, savespace=0, axes=None, attributes=None, id=None):
     "Create array masked where exactly data equal to value"
     maresult = numpy.ma.masked_object(_makeMaskedArg(data), value, copy=copy)
     axes, attributes, id, grid = _extractMetadata(data, axes, attributes, id)
-    F = getattr(data, "fill_value", 1.e20)
+    F=getattr(data,"fill_value",1.e20)
     return TransientVariable(maresult, axes=axes, attributes=attributes, id=id, grid=grid, fill_value=F)
-
-
-def isMaskedVariable(x):
+    
+def isMaskedVariable (x):
     "Is x a masked variable, that is, an instance of AbstractVariable?"
     return isinstance(x, AbstractVariable)
 
-
 def set_default_fill_value(value_type, value):
     """Set the default fill value for value_type to value.
     value_type is a string: 'real','complex','character','integer',or 'object'.
@@ -1013,23 +896,24 @@ def set_default_fill_value(value_type, value):
     elif value_type == 'object':
         numpy.ma.default_object_fill_value = value
 
-
-def fromfunction(f, dimensions):
+def fromfunction (f, dimensions):
     """Apply f to s to create an array as in numpy."""
     return TransientVariable(numpy.ma.fromfunction(f, dimensions))
 
-
-def diagonal(a, offset=0, axis1=0, axis2=1):
-    """diagonal(a, offset=0, axis1=0, axis2 = 1) returns the given
+def diagonal (a, offset = 0, axis1=0, axis2 = 1):
+    """diagonal(a, offset=0, axis1=0, axis2 = 1) returns the given 
        diagonals defined by the two dimensions of the array.
     """
-    F = getattr(a, "fill_value", 1.e20)
-    return TransientVariable(numpy.ma.diagonal(_makeMaskedArg(a),
-                                               offset, axis1, axis2), fill_value=F)
+    F=getattr(a,"fill_value",1.e20)
+    return TransientVariable(numpy.ma.diagonal(_makeMaskedArg(a), 
+            offset, axis1, axis2), fill_value=F)
 
-
-def fromstring(s, t):
+def fromstring (s, t):
     """Construct a masked array from a string. Result will have no mask.
        t is a typecode.
     """
-    return TransientArray(numpy.ma.fromstring(s, t))
+    return TransientArray(numpy.ma.fromstring(s,t))
+
+
+
+
diff --git a/Packages/cdms2/Lib/__init__.py b/Packages/cdms2/Lib/__init__.py
index e3e53ff09..874601632 100644
--- a/Packages/cdms2/Lib/__init__.py
+++ b/Packages/cdms2/Lib/__init__.py
@@ -2,35 +2,35 @@
 CDMS module-level API
 """
 import cdat_info
-cdat_info.pingPCMDIdb("cdat", "cdms2")
+cdat_info.pingPCMDIdb("cdat","cdms2")
 
-__all__ = ["cdmsobj", "axis", "coord", "grid", "hgrid", "avariable",
-           "sliceut", "error", "variable", "fvariable", "tvariable", "dataset",
-           "database", "cache", "selectors", "MV2", "convention", "bindex",
-           "auxcoord", "gengrid", "gsHost", "gsStaticVariable", "gsTimeVariable",
-           "mvBaseWriter", "mvSphereMesh", "mvVsWriter", "mvCdmsRegrid"]
+__all__ = ["cdmsobj", "axis", "coord", "grid", "hgrid", "avariable", \
+"sliceut", "error", "variable", "fvariable", "tvariable", "dataset", \
+"database", "cache", "selectors", "MV2", "convention", "bindex", \
+"auxcoord", "gengrid", "gsHost", "gsStaticVariable", "gsTimeVariable", \
+"mvBaseWriter", "mvSphereMesh", "mvVsWriter", "mvCdmsRegrid"]
 
 # Errors
-from .error import CDMSError
+from error import CDMSError
 
 # CDMS datatypes
-from .cdmsobj import CdArray, CdChar, CdByte, CdDouble, CdFloat, CdFromObject, CdInt, CdLong, CdScalar, CdShort, CdString
+from cdmsobj import CdArray, CdChar, CdByte, CdDouble, CdFloat, CdFromObject, CdInt, CdLong, CdScalar, CdShort, CdString
 
 # Functions which operate on all objects or groups of objects
-from .cdmsobj import Unlimited, getPathFromTemplate, matchPattern, matchingFiles, searchPattern, searchPredicate, setDebugMode
+from cdmsobj import Unlimited, getPathFromTemplate, matchPattern, matchingFiles, searchPattern, searchPredicate, setDebugMode
 
 # Axis functions and classes
-from .axis import AbstractAxis, axisMatches, axisMatchAxis, axisMatchIndex
-from .axis import createAxis, createEqualAreaAxis, createGaussianAxis, createUniformLatitudeAxis, createUniformLongitudeAxis, setAutoBounds, getAutoBounds
+from axis import AbstractAxis, axisMatches, axisMatchAxis, axisMatchIndex
+from axis import createAxis, createEqualAreaAxis, createGaussianAxis, createUniformLatitudeAxis, createUniformLongitudeAxis, setAutoBounds, getAutoBounds
 
 # Grid functions
-from .grid import createGenericGrid, createGlobalMeanGrid, createRectGrid, createUniformGrid, createZonalGrid, setClassifyGrids, createGaussianGrid, writeScripGrid, isGrid
+from grid import createGenericGrid, createGlobalMeanGrid, createRectGrid, createUniformGrid, createZonalGrid, setClassifyGrids, createGaussianGrid, writeScripGrid, isGrid
 
 # Dataset functions
-from .dataset import createDataset, openDataset, useNetcdf3, \
-    getNetcdfClassicFlag, getNetcdfShuffleFlag, getNetcdfDeflateFlag, getNetcdfDeflateLevelFlag,\
+from dataset import createDataset, openDataset, useNetcdf3, \
+        getNetcdfClassicFlag, getNetcdfShuffleFlag, getNetcdfDeflateFlag, getNetcdfDeflateLevelFlag,\
         setNetcdfClassicFlag, setNetcdfShuffleFlag, setNetcdfDeflateFlag, setNetcdfDeflateLevelFlag,\
-        setNetcdfUseNCSwitchModeFlag, getNetcdfUseNCSwitchModeFlag,\
+        setNetcdfUseNCSwitchModeFlag,getNetcdfUseNCSwitchModeFlag,\
         setCompressionWarnings,\
         setNetcdf4Flag, getNetcdf4Flag,\
         setNetcdfUseParallelFlag, getNetcdfUseParallelFlag, \
@@ -39,31 +39,31 @@ from .dataset import createDataset, openDataset, useNetcdf3, \
 open = openDataset
 
 # Database functions
-from .database import connect, Base, Onelevel, Subtree
+from database import connect, Base, Onelevel, Subtree
 
-# Selectors
-from . import selectors
-from .selectors import longitude, latitude, time, level, required, \
-    longitudeslice, latitudeslice, levelslice, timeslice
+#Selectors
+import selectors
+from selectors import longitude, latitude, time, level, required, \
+                      longitudeslice, latitudeslice, levelslice, timeslice
 
-from .avariable import order2index, orderparse, setNumericCompatibility, getNumericCompatibility
+from avariable import order2index, orderparse, setNumericCompatibility, getNumericCompatibility
 # TV
-from .tvariable import asVariable, createVariable, isVariable
+from tvariable import asVariable, createVariable, isVariable
 
-from .mvSphereMesh import SphereMesh
-from .mvBaseWriter import BaseWriter
-from .mvVsWriter import VsWriter
-from .mvVTKSGWriter import VTKSGWriter
-from .mvVTKUGWriter import VTKUGWriter
-from .mvCdmsRegrid import CdmsRegrid
+from mvSphereMesh import SphereMesh
+from mvBaseWriter import BaseWriter
+from mvVsWriter import VsWriter
+from mvVTKSGWriter import VTKSGWriter
+from mvVTKUGWriter import VTKUGWriter
+from mvCdmsRegrid import CdmsRegrid
 
 # Gridspec is not installed by default so just pass on if it isn't installed
 try:
-    from .gsStaticVariable import StaticFileVariable
-    from .gsTimeVariable import TimeFileVariable
+    from gsStaticVariable import StaticFileVariable
+    from gsTimeVariable import TimeFileVariable
 except:
     pass
 
-from .restApi import esgfConnection, esgfDataset, FacetConnection
+from restApi import esgfConnection,esgfDataset,FacetConnection
 
 MV = MV2
diff --git a/Packages/cdms2/Lib/auxcoord.py b/Packages/cdms2/Lib/auxcoord.py
index 334831dce..24a97e8c3 100644
--- a/Packages/cdms2/Lib/auxcoord.py
+++ b/Packages/cdms2/Lib/auxcoord.py
@@ -4,66 +4,50 @@ CDMS 1-D auxiliary coordinates.
 Note: In contrast to Axis objects (concrete classes subclassed from AbstractAxis), auxiliary coordinate variables are not monotonic in value, and do not share a name with the dimension.
 """
 
-# import internattr
-from .error import CDMSError
-from .coord import AbstractCoordinateAxis
-from .fvariable import FileVariable
-from .variable import DatasetVariable
-from .tvariable import TransientVariable
-from .avariable import AbstractVariable
-
+## import internattr
+from error import CDMSError
+from coord import AbstractCoordinateAxis
+from fvariable import FileVariable
+from variable import DatasetVariable
+from tvariable import TransientVariable
+from avariable import AbstractVariable
 
 class AbstractAuxAxis1D(AbstractCoordinateAxis):
 
-    def __init__(self, parent=None, variableNode=None, bounds=None):
-        AbstractCoordinateAxis.__init__(
-            self,
-            parent,
-            variableNode,
-            bounds=bounds)
+    def __init__ (self, parent=None, variableNode=None, bounds=None):
+        AbstractCoordinateAxis.__init__(self, parent, variableNode, bounds=bounds)
 
-    def clone(self, copyData=1):
+    def clone (self, copyData=1):
         """clone (self, copyData=1)
         Return a copy of self as a transient axis.
         If copyData is 1, make a separate copy of the data."""
-        result = TransientAuxAxis1D(
-            self[:],
-            copy=copyData,
-            axes=self.getAxisList(),
-            attributes=self.attributes,
-            bounds=self.getBounds())
+        result = TransientAuxAxis1D(self[:], copy=copyData, axes=self.getAxisList(), attributes=self.attributes, bounds=self.getBounds())
         return result
 
     def setBounds(self, bounds):
         if bounds is not None:
-            if len(bounds.shape) != 2:
-                raise CDMSError('Bounds must have rank=2')
-            if bounds.shape[0:1] != self.shape:
-                raise CDMSError(
-                    'Bounds shape %s is inconsistent with axis shape %s' %
-                    (repr(bounds.shape), repr(self.shape)))
+            if len(bounds.shape)!=2:
+                raise CDMSError, 'Bounds must have rank=2'
+            if bounds.shape[0:1]!=self.shape:
+                raise CDMSError, 'Bounds shape %s is inconsistent with axis shape %s'%(`bounds.shape`,`self.shape`)
         AbstractCoordinateAxis.setBounds(self, bounds)
 
-    def subSlice(self, *specs, **keys):
+    def subSlice (self, *specs, **keys):
         # Take a subslice, returning a TransientAuxAxis1D
         avar = AbstractVariable.subSlice(self, *specs, **keys)
         bounds = self.getBounds()
         if bounds is None:
             newbounds = None
         else:
-            newbounds = bounds[
-                specs]   # bounds can be a numarray or DatasetVariable
+            newbounds = bounds[specs]   # bounds can be a numarray or DatasetVariable
 
-        # Note: disable axis copy to preserve identity of grid and variable
-        # domains
-        result = TransientAuxAxis1D(avar, bounds=newbounds, copyaxes=0)
+        # Note: disable axis copy to preserve identity of grid and variable domains
+        result = TransientAuxAxis1D(avar, bounds=newbounds, copyaxes=0)    
         return result
 
-
 class DatasetAuxAxis1D(AbstractAuxAxis1D, DatasetVariable):
 
     # Note: node is a VariableNode
-
     def __init__(self, parent, id=None, variableNode=None, bounds=None):
         AbstractAuxAxis1D.__init__(self, parent, variableNode, bounds=bounds)
         DatasetVariable.__init__(self, parent, id, variableNode)
@@ -71,13 +55,11 @@ class DatasetAuxAxis1D(AbstractAuxAxis1D, DatasetVariable):
 
     def __repr__(self):
         if self.parent is not None:
-            return "<DatasetAuxAxis1D: %s, file: %s, shape: %s>" % (self.id, self.parent.id, repr(self.shape))
+            return "<DatasetAuxAxis1D: %s, file: %s, shape: %s>"%(self.id, self.parent.id, `self.shape`)
         else:
-            return "<DatasetAuxAxis1D: %s, file: **CLOSED**>" % self.id
-
-# internattr.initialize_internal_attributes(DatasetAuxAxis1D) # Copy
-# internal attrs from parents
+            return "<DatasetAuxAxis1D: %s, file: **CLOSED**>"%self.id
 
+## internattr.initialize_internal_attributes(DatasetAuxAxis1D) # Copy internal attrs from parents
 
 class FileAuxAxis1D(AbstractAuxAxis1D, FileVariable):
 
@@ -88,18 +70,15 @@ class FileAuxAxis1D(AbstractAuxAxis1D, FileVariable):
 
     def __repr__(self):
         if self.parent is not None:
-            return "<FileAuxAxis1D: %s, file: %s, shape: %s>" % (self.id, self.parent.id, repr(self.shape))
+            return "<FileAuxAxis1D: %s, file: %s, shape: %s>"%(self.id, self.parent.id, `self.shape`)
         else:
-            return "<FileAuxAxis1D: %s, file: **CLOSED**>" % self.id
-
-# internattr.initialize_internal_attributes(FileAuxAxis1D) # Copy internal
-# attrs from parents
+            return "<FileAuxAxis1D: %s, file: **CLOSED**>"%self.id
 
+## internattr.initialize_internal_attributes(FileAuxAxis1D) # Copy internal attrs from parents
 
 class TransientAuxAxis1D(AbstractAuxAxis1D, TransientVariable):
 
-    def __init__(
-        self, data, typecode=None, copy=0, savespace=0, mask=None, fill_value=None,
+    def __init__(self, data, typecode=None, copy=0, savespace=0, mask=None, fill_value=None,
                  axes=None, attributes=None, id=None, copyaxes=1, bounds=None):
         """Create a transient, auxiliary 1-D axis.
         All arguments are as for TransientVariable.
@@ -107,12 +86,11 @@ class TransientAuxAxis1D(AbstractAuxAxis1D, TransientVariable):
           nvert is the max number of vertices per cell.
         """
         AbstractAuxAxis1D.__init__(self, None, None, bounds=bounds)
-        TransientVariable.__init__(
-            self, data, typecode=typecode, copy=copy, savespace=savespace,
+        TransientVariable.__init__(self, data, typecode=typecode, copy=copy, savespace=savespace,
                                    mask=mask, fill_value=fill_value, axes=axes, attributes=attributes,
                                    id=id, copyaxes=copyaxes)
         if axes is not None:
             self.setBounds(bounds)
 
-# internattr.initialize_internal_attributes(TransientAuxAxis1D) # Copy
-# internal attrs from parents
+## internattr.initialize_internal_attributes(TransientAuxAxis1D) # Copy internal attrs from parents
+
diff --git a/Packages/cdms2/Lib/avariable.py b/Packages/cdms2/Lib/avariable.py
index 1a6b0d2f3..f15d7a069 100644
--- a/Packages/cdms2/Lib/avariable.py
+++ b/Packages/cdms2/Lib/avariable.py
@@ -1,26 +1,28 @@
-# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
-# Further modified to be pure new numpy June 24th 2008
+## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
+## Further modified to be pure new numpy June 24th 2008
 
 "CDMS Variable objects, abstract interface"
 import numpy
+import types
+import string
 import re
 import warnings
-from . import cdmsNode
-from .cdmsobj import CdmsObj
+import cdmsNode
+from cdmsobj import CdmsObj
 import cdms2
-from .slabinterface import Slab
-from .sliceut import *
-from .error import CDMSError
-from .axis import axisMatchIndex, axisMatchAxis, axisMatches, unspecified, CdtimeTypes, AbstractAxis
-from . import selectors
+from slabinterface import Slab
+from sliceut import *
+from error import CDMSError
+from axis import axisMatchIndex, axisMatchAxis, axisMatches, unspecified, CdtimeTypes, AbstractAxis
+import selectors
 import copy
 # from regrid2 import Regridder, PressureRegridder, CrossSectionRegridder
-from .mvCdmsRegrid import CdmsRegrid
+from mvCdmsRegrid import CdmsRegrid
 from regrid2.mvGenericRegrid import guessPeriodicity
-# import PropertiedClasses
-from .convention import CF1
-from .grid import AbstractRectGrid
-# import internattr
+#import PropertiedClasses
+from convention import CF1
+from grid import AbstractRectGrid
+#import internattr
 
 InvalidRegion = "Invalid region: "
 OutOfRange = "Coordinate interval is out of range or intersection has no data: "
@@ -32,10 +34,9 @@ _numeric_compatibility = False          # Backward compatibility with numpy beha
                                         # True:  return 0-D arrays
                                         #        MV axis=1 by default
 
-
 def getMinHorizontalMask(var):
     """
-    Get the minimum mask associated with 'x' and 'y' (i.e. with the
+    Get the minimum mask associated with 'x' and 'y' (i.e. with the 
     min number of ones) across all axes
     @param var CDMS variable with a mask
     @return mask array or None if order 'x' and 'y' were not found
@@ -47,7 +48,7 @@ def getMinHorizontalMask(var):
 
     shp = var.shape
     ndims = len(shp)
-    order = var.getOrder()  # e.g. 'zxty-', ndims = 5
+    order = var.getOrder() # e.g. 'zxty-', ndims = 5
 
     # run a few checks
     numX = order.count('x')
@@ -58,43 +59,43 @@ def getMinHorizontalMask(var):
         msg = """
 Not able to locate the horizontal (y, x) axes for order = %s in getMinHorizontalMask
         """ % str(order)
-        raise CDMSError(msg)
-
-    ps = []  # index position of x/y, e.g. [1,3]
-    es = []  # end indices, sizes of x/y axes
+        raise CDMSError, msg
+        
+    
+    ps = [] # index position of x/y, e.g. [1,3]
+    es = [] # end indices, sizes of x/y axes
     nonHorizShape = []
     found = False
-    for i in range(ndims - 1, -1, -1):
-        # iterate backwards because the horizontal
+    for i in range(ndims-1, -1, -1):
+        # iterate backwards because the horizontal 
         # axes are more likely to be last
         o = order[i]
         # curvilinear coordinates have '-' in place of
-        # x or y, also check for '-' but exit if we think
+        # x or y, also check for '-' but exit if we think 
         # we found the x and y coords
         if not found and (o in 'xy') or (not hasXY and o == '-'):
-            ps = [i, ] + ps
-            es = [shp[i], ] + es
+            ps = [i,] + ps
+            es = [shp[i],] + es
             if len(ps) == 2:
                 found = True
         else:
-            nonHorizShape = [shp[i], ] + nonHorizShape
+            nonHorizShape = [shp[i],] + nonHorizShape
 
     if len(ps) == 2:
-        # found all the horizontal axes, start with mask
+        # found all the horizontal axes, start with mask 
         # set to invalid everywhere
         mask = numpy.ones(es, numpy.bool8)
         # iterate over all non-horizontal axes, there can be as
         # many as you want...
         for it in MultiArrayIter(nonHorizShape):
-            inds = it.getIndices()  # (i0, i1, i2)
+            inds = it.getIndices() # (i0, i1, i2)
             # build the slice operator, there are three parts
-            # (head, middle, and tail), some parts may be
+            # (head, middle, and tail), some parts may be 
             # missing
             # slce = 'i0,' + ':,'   +   'i1,'  +   ':,' + 'i2,'
-            slce = ('%d,' * ps[0]) % tuple(inds[:ps[0]]) + ':,'            \
-                + ('%d,' * (ps[1] - ps[0] - 1)) % tuple(inds[ps[0]:ps[1] - 1])   \
-                + ':,' + \
-                ('%d,' * (ndims - ps[1] - 1)) % tuple(inds[ps[1] - 1:])
+            slce = ('%d,'*ps[0]) % tuple(inds[:ps[0]]) + ':,'            \
+                + ('%d,'*(ps[1]-ps[0]-1)) % tuple(inds[ps[0]:ps[1]-1])   \
+                + ':,' + ('%d,'*(ndims-ps[1]-1)) % tuple(inds[ps[1]-1:])
             # evaluate the slice for this time, level....
             mask &= eval('var.mask[' + slce + ']')
         return mask
@@ -102,49 +103,45 @@ Not able to locate the horizontal (y, x) axes for order = %s in getMinHorizontal
         msg = """
 Could not find all the horizontal axes for order = %s in getMinHorizontalMask
         """ % str(order)
-        raise CDMSError(msg)
-    return None
-
+        raise CDMSError, msg
+    return None  
 
 def setNumericCompatibility(mode):
     global _numeric_compatibility
-    if mode or mode == 'on':
+    if mode==True or mode=='on':
         _numeric_compatibility = True
-    elif mode == False or mode == 'off':
+    elif mode==False or mode=='off':
         _numeric_compatibility = False
 
-
 def getNumericCompatibility():
     return _numeric_compatibility
 
-
 class AbstractVariable(CdmsObj, Slab):
-
-    def __init__(self, parent=None, variableNode=None):
+    def __init__ (self, parent=None, variableNode=None):
         """Not to be called by users.
            variableNode is the variable tree node, if any.
            parent is the containing dataset instance.
         """
-        if variableNode is not None and variableNode.tag != 'variable':
-            raise CDMSError('Node is not a variable node')
+        if variableNode is not None and variableNode.tag !='variable':
+            raise CDMSError, 'Node is not a variable node'
         CdmsObj.__init__(self, variableNode)
-        val = self.__cdms_internals__ + ['id', 'domain']
-        self.___cdms_internals__ = val
+        val = self.__cdms_internals__ + ['id','domain']
+        self.___cdms_internals__ = val 
         Slab.__init__(self)
         self.id = None                  # Transient variables key on this to create a default ID
         self.parent = parent
         self._grid_ = None      # Variable grid, if any
-        if not hasattr(self, 'missing_value'):
+        if not hasattr(self,'missing_value'):
             self.missing_value = None
         elif numpy.isnan(self.missing_value):
-            self.missing_value = None
+          self.missing_value = None
 
         # Reminder: children to define self.shape and set self.id
 
-    def __array__(self, t=None, context=None):  # Numeric, ufuncs call this
+    def __array__ (self, t=None, context=None):  #Numeric, ufuncs call this
         return numpy.ma.filled(self.getValue(squeeze=0))
 
-    def __call__(self, *args, **kwargs):
+    def __call__ (self, *args,  **kwargs):
         "Selection of a subregion using selectors"
         # separate options from selector specs
         d = kwargs.copy()
@@ -157,13 +154,13 @@ class AbstractVariable(CdmsObj, Slab):
         s = selectors.Selector(*args, **d)
         # get the selection
         return s.unmodified_select(self, raw=raw,
-                                   squeeze=squeeze,
-                                   order=order,
-                                   grid=grid)
+                                         squeeze=squeeze, 
+                                         order=order, 
+                                         grid=grid)
 
     select = __call__
 
-    def rank(self):
+    def rank (self):
         return len(self.shape)
 
     def _returnArray(self, ar, squeeze, singles=None):
@@ -171,90 +168,85 @@ class AbstractVariable(CdmsObj, Slab):
         # job is to make sure we return an numpy.ma or a scalar.
         # If singles is not None, squeeze dimension indices in singles
         inf = 1.8e308
-        if isinstance(ar, cdms2.tvariable.TransientVariable):
-            result = numpy.ma.array(ar._data, mask=ar.mask)
-        elif numpy.ma.isMaskedArray(ar):  # already numpy.ma, only need squeeze.
+        if isinstance(ar,cdms2.tvariable.TransientVariable):
+            result = numpy.ma.array(ar._data,mask=ar.mask)
+        elif numpy.ma.isMaskedArray(ar):   #already numpy.ma, only need squeeze.
             result = ar
         elif isinstance(ar, numpy.ndarray):
             missing = self.getMissing()
             if missing is None:
                 result = numpy.ma.masked_array(ar)
-            elif missing == inf or missing != missing:  # (x!=x) ==> x is NaN
+            elif missing==inf or missing!=missing: # (x!=x) ==> x is NaN
                 result = numpy.ma.masked_object(ar, missing, copy=0)
-            elif ar.dtype.char == 'c':
+            elif ar.dtype.char=='c':
                 # umath.equal is not implemented
-                resultmask = (ar == missing)
+                resultmask = (ar==missing)
                 if not resultmask.any():
                     resultmask = numpy.ma.nomask
-                result = numpy.ma.masked_array(
-                    ar,
-                    mask=resultmask,
-                    fill_value=missing)
+                result = numpy.ma.masked_array(ar, mask=resultmask, fill_value=missing)
             else:
                 result = numpy.ma.masked_values(ar, missing, copy=0)
         elif ar is numpy.ma.masked:
-            return ar
-        else:  # scalar, but it might be the missing value
+            return ar  
+        else: # scalar, but it might be the missing value
             missing = self.getMissing()
             if missing is None:
-                return ar  # scalar
+                return ar #scalar
             else:
                 result = numpy.ma.masked_values(ar, missing, copy=0)
 
         squoze = 0
         if squeeze:
             n = 1
-            newshape = []
+            newshape=[]
             for s in result.shape:
-                if s == 1:
-                    squoze = 1
-                    continue
-                else:
-                    n = n * s
-                    newshape.append(s)
+               if s == 1: 
+                   squoze = 1
+                   continue
+               else:
+                   n = n * s
+                   newshape.append(s)
         elif singles is not None:
             n = 1
-            newshape = []
+            newshape=[]
             oldshape = result.shape
             for i in range(len(oldshape)):
-                if i in singles:
-                    squoze = 1
-                    continue
-                else:
-                    s = oldshape[i]
-                    n = n * s
-                    newshape.append(s)
-
+               if i in singles: 
+                   squoze = 1
+                   continue
+               else:
+                   s = oldshape[i]
+                   n = n * s
+                   newshape.append(s)
+            
         else:
             n = numpy.ma.size(result)
         if n == 1 and squeeze:
-            return numpy.ma.ravel(result)[0]  # scalar or masked
+            return numpy.ma.ravel(result)[0] # scalar or masked
         if squoze:
             result.shape = newshape
         return result
 
     def generateGridkey(self, convention, vardict):
-        """ generateGridkey(): Determine if the variable is gridded,
+        """ generateGridkey(): Determine if the variable is gridded, 
             and generate ((latname, lonname, order, maskname, class), lat, lon) if gridded,
             or (None, None, None) if not gridded. vardict is the variable dictionary of the parent"""
 
         lat, nlat = convention.getVarLatId(self, vardict)
         lon, nlon = convention.getVarLonId(self, vardict)
         if (lat is not None) and (lat is lon):
-            raise CDMSError(
-                "Axis %s is both a latitude and longitude axis! Check standard_name and/or axis attributes." %
-                lat.id)
+            raise CDMSError, "Axis %s is both a latitude and longitude axis! Check standard_name and/or axis attributes."%lat.id
 
         # Check for 2D grid
         if (lat is None) or (lon is None):
             return None, lat, lon
 
         # Check for a rectilinear grid
-        if isinstance(lat, AbstractAxis) and isinstance(lon, AbstractAxis) and (lat.rank() == lon.rank() == 1):
+        if isinstance(lat, AbstractAxis) and isinstance(lon, AbstractAxis) and (lat.rank()==lon.rank()==1):
             return self.generateRectGridkey(lat, lon), lat, lon
 
         # Check for a curvilinear grid:
-        if lat.rank() == lon.rank() == 2:
+        if lat.rank()==lon.rank()==2:
 
             # check that they are defined on the same indices as self
             vardomain = self.getAxisIds()
@@ -268,7 +260,7 @@ class AbstractVariable(CdmsObj, Slab):
                     if axisid not in vardomain:
                         allok = 0
                         break
-
+            
             # It's a curvilinear grid
             if allok:
                 if hasattr(lat, 'maskid'):
@@ -278,7 +270,7 @@ class AbstractVariable(CdmsObj, Slab):
                 return (lat.id, lon.id, 'yx', maskid, 'curveGrid'), lat, lon
 
         # Check for a generic grid:
-        if lat.rank() == lon.rank() == 1:
+        if lat.rank()==lon.rank()==1:
 
             # check that they are defined on the same indices as self
             vardomain = self.getAxisIds()
@@ -292,7 +284,7 @@ class AbstractVariable(CdmsObj, Slab):
                     if axisid not in vardomain:
                         allok = 0
                         break
-
+            
             # It's a generic grid
             if allok:
                 if hasattr(lat, 'maskid'):
@@ -317,14 +309,12 @@ class AbstractVariable(CdmsObj, Slab):
                 ilat = k
             k += 1
 
-        if ilat == -1:
-            raise CDMSError(
-                "Cannot find latitude axis; check standard_name and/or axis attributes")
-        if ilon == -1:
-            raise CDMSError(
-                "Cannot find longitude axis; check standard_name and/or axis attributes")
+        if ilat==-1:
+            raise CDMSError, "Cannot find latitude axis; check standard_name and/or axis attributes"
+        if ilon==-1:
+            raise CDMSError, "Cannot find longitude axis; check standard_name and/or axis attributes"
 
-        if ilat < ilon:
+        if ilat<ilon:
             order = "yx"
         else:
             order = "xy"
@@ -343,14 +333,12 @@ class AbstractVariable(CdmsObj, Slab):
             alist = [d[0] for d in self.getDomain()]
             gridok = grid.checkAxes(alist)
         if not gridok:
-            raise CDMSError(
-                "grid does not match axes for variable %s" %
-                self.id)
+            raise CDMSError, "grid does not match axes for variable %s"%self.id
         self._grid_ = grid
 
-    def getDomain(self):
+    def getDomain (self):
         "Get the list of axes"
-        raise CDMSError("getDomain not overriden in child")
+        raise CDMSError, "getDomain not overriden in child"
 
     def getConvention(self):
         "Get the metadata convention associated with this object."
@@ -359,15 +347,14 @@ class AbstractVariable(CdmsObj, Slab):
         else:
             result = CF1
         return result
-
+            
 # A child class may want to override this
     def getAxis(self, n):
         "Get the n-th axis"
-        if n < 0:
-            n = n + self.rank()
+        if n < 0: n = n + self.rank()
         return self.getDomain()[n][0]
 
-    def getAxisIndex(self, axis_spec):
+    def getAxisIndex (self, axis_spec):
         """Return the index of the axis specificed by axis_spec.
          Argument axis_spec and be as for axisMatches
          Return -1 if no match.
@@ -387,7 +374,7 @@ class AbstractVariable(CdmsObj, Slab):
                 return True
         return False
 
-    def getAxisListIndex(self, axes=None, omit=None, order=None):
+    def getAxisListIndex (self, axes=None, omit=None, order=None):
         """Return a list of indices of axis objects;
            If axes is not None, include only certain axes.
            less the ones specified in omit. If axes is None,
@@ -396,15 +383,15 @@ class AbstractVariable(CdmsObj, Slab):
         """
         return axisMatchIndex(self.getAxisList(), axes, omit, order)
 
-    def getAxisList(self, axes=None, omit=None, order=None):
-        """Get the list of axis objects;
+    def getAxisList(self, axes = None, omit=None, order=None):
+        """Get the list of axis objects; 
            If axes is not None, include only certain axes.
            If omit is not None, omit those specified by omit.
            Arguments omit or axes  may be as specified in axisMatchAxis
            order is an optional string determining the output order
         """
         alist = [d[0] for d in self.getDomain()]
-        return axisMatchAxis(alist, axes, omit, order)
+        return axisMatchAxis (alist, axes, omit, order)
 
     def getAxisIds(self):
         "Get a list of axis identifiers"
@@ -422,12 +409,12 @@ class AbstractVariable(CdmsObj, Slab):
         except:
             mv = self.missing_value
 
-        if mv is None and hasattr(self, '_FillValue'):
+        if mv is None and hasattr(self,'_FillValue'):
             mv = self._FillValue
-
-        if asarray == 0 and isinstance(mv, numpy.ndarray):
+            
+        if asarray==0 and isinstance(mv, numpy.ndarray):
             mv = mv[0]
-        if isinstance(mv, basestring) and self.dtype.char not in ['?', 'c', 'O', 'S']:
+        if type(mv) is types.StringType and self.dtype.char not in ['?','c','O','S']:
             mv = float(mv)
         return mv
 
@@ -444,26 +431,26 @@ class AbstractVariable(CdmsObj, Slab):
         if value is None:
             self._basic_set('missing_value', value)
             return
-
+            
         selftype = self.typecode()
-        if isinstance(value, numpy.ndarray):
+        valuetype = type(value)
+        if valuetype is numpy.ndarray:
             value = value.astype(selftype).item()
-        elif isinstance(value, (numpy.floating, numpy.integer)):
+        elif isinstance(value, numpy.floating) or isinstance(value, numpy.integer):
             value = numpy.array([value], selftype)
-        elif isinstance(value, (float, int, long, complex)):
+        elif valuetype in [types.FloatType, types.IntType, types.LongType, types.ComplexType]:
             try:
                 value = numpy.array([value], selftype)
             except:                     # Set fill value when ar[i:j] returns a masked value
-                value = numpy.array(
-                    [numpy.ma.default_fill_value(self)],
-                    selftype)
-        elif isinstance(value, (basestring, numpy.string_, numpy.str, numpy.string0, numpy.str_)) and selftype in ['?', 'c', 'O', 'S']:  # '?' for Boolean and object
+                value = numpy.array([numpy.ma.default_fill_value(self)], selftype)
+        elif isinstance(value,(str,numpy.string_,numpy.str,numpy.string0,numpy.str_)) and selftype in ['?','c','O','S']: # '?' for Boolean and object
             pass
         else:
-            raise CDMSError('Invalid missing value %s' % repr(value))
-
+            raise CDMSError, 'Invalid missing value %s'%`value`
+        
         self.missing_value = value
 
+
     def getTime(self):
         "Get the first time dimension, or None if not found"
         for k in range(self.rank()):
@@ -483,12 +470,11 @@ class AbstractVariable(CdmsObj, Slab):
                 break
         else:
             return None
-
     def getForecast(self):
         return self.getForecastTime()
 
     def getLevel(self):
-        """Get the first vertical level dimension in the domain,
+        """Get the first vertical level dimension in the domain, 
            or None if not found.
         """
         for k in range(self.rank()):
@@ -506,7 +492,7 @@ class AbstractVariable(CdmsObj, Slab):
             result = grid.getLatitude()
         else:
             result = None
-
+            
         if result is None:
             for k in range(self.rank()):
                 result = self.getAxis(k)
@@ -514,7 +500,7 @@ class AbstractVariable(CdmsObj, Slab):
                     break
             else:
                 result = None
-
+                
         return result
 
     def getLongitude(self):
@@ -524,7 +510,7 @@ class AbstractVariable(CdmsObj, Slab):
             result = grid.getLongitude()
         else:
             result = None
-
+            
         if result is None:
             for k in range(self.rank()):
                 result = self.getAxis(k)
@@ -532,20 +518,21 @@ class AbstractVariable(CdmsObj, Slab):
                     break
             else:
                 result = None
-
+                
         return result
+
     # Get an order string, such as "tzyx"
     def getOrder(self, ids=0):
         """getOrder(ids=0) returns the order string, such as tzyx.
 
          if ids == 0 (the default) for an axis that is not t,z,x,y
          the order string will contain a '-' in that location.
-         The result string will be of the same length as the number
+         The result string will be of the same length as the number 
          of axes. This makes it easy to loop over the dimensions.
 
          if ids == 1 those axes will be represented in the order
          string as (id) where id is that axis' id. The result will
-         be suitable for passing to order2index to get the
+         be suitable for passing to order2index to get the 
          corresponding axes, and to orderparse for dividing up into
          components.
         """
@@ -553,56 +540,50 @@ class AbstractVariable(CdmsObj, Slab):
         for k in range(self.rank()):
             axis = self.getAxis(k)
             if axis.isLatitude():
-                order = order + "y"
+                order = order+"y"
             elif axis.isLongitude():
-                order = order + "x"
+                order = order+"x"
             elif axis.isLevel():
-                order = order + "z"
+                order = order+"z"
             elif axis.isTime():
-                order = order + "t"
+                order = order+"t"
             elif ids:
                 order = order + '(' + axis.id + ')'
             else:
                 order = order + "-"
         return order
 
-    def subSlice(self, *specs, **keys):
-        speclist = self._process_specs(specs, keys)
-        numericSqueeze = keys.get('numericSqueeze', 0)
+    def subSlice (self, *specs, **keys):
+        speclist = self._process_specs (specs, keys)
+        numericSqueeze = keys.get('numericSqueeze',0)
 
         # Get a list of single-index specs
         if numericSqueeze:
             singles = self._single_specs(specs)
         else:
             singles = None
-        slicelist = self.specs2slices(speclist, force=1)
-        d = self.expertSlice(slicelist)
-        squeeze = keys.get('squeeze', 0)
-        raw = keys.get('raw', 0)
+        slicelist = self.specs2slices(speclist,force=1)
+        d = self.expertSlice (slicelist)
+        squeeze = keys.get ('squeeze', 0)
+        raw = keys.get('raw',0)
         order = keys.get('order', None)
         grid = keys.get('grid', None)
-        forceaxes = keys.get(
-            'forceaxes',
-            None)  # Force result to have these axes
-        raweasy = raw == 1 and order is None and grid is None
+        forceaxes = keys.get('forceaxes', None) # Force result to have these axes
+        raweasy = raw==1 and order is None and grid is None
         if not raweasy:
             if forceaxes is None:
                 axes = []
-                allaxes = [None] * self.rank()
+                allaxes = [None]*self.rank()
                 for i in range(self.rank()):
-                    slice = slicelist[i]
-                    if squeeze and numpy.ma.size(d, i) == 1:
-                        continue
-                    elif numericSqueeze and i in singles:
-                        continue
-                    # Don't wrap square-bracket slices
-                    axis = self.getAxis(
-                        i).subaxis(slice.start,
-                                   slice.stop,
-                                   slice.step,
-                                   wrap=(numericSqueeze == 0))
-                    axes.append(axis)
-                    allaxes[i] = axis
+                   slice = slicelist[i]
+                   if squeeze and numpy.ma.size(d, i) == 1:
+                       continue
+                   elif numericSqueeze and i in singles:
+                       continue
+                   # Don't wrap square-bracket slices
+                   axis = self.getAxis(i).subaxis(slice.start, slice.stop, slice.step, wrap=(numericSqueeze==0))
+                   axes.append(axis)
+                   allaxes[i] = axis
             else:
                 axes = forceaxes
 
@@ -613,46 +594,42 @@ class AbstractVariable(CdmsObj, Slab):
                 resultgrid = None
             else:
                 alist = [item[0] for item in self.getDomain()]
-                gridslices, newaxes = selfgrid.getGridSlices(
-                    alist, allaxes, slicelist)
+                gridslices, newaxes = selfgrid.getGridSlices(alist, allaxes, slicelist)
 
                 # If one of the grid axes was squeezed, the result grid is None
                 if None in newaxes:
                     resultgrid = None
                 else:
-                    resultgrid = selfgrid.subSlice(
-                        *gridslices,
-                        **{'forceaxes': newaxes})
+                    resultgrid = apply(selfgrid.subSlice, gridslices, {'forceaxes': newaxes})
 
         resultArray = self._returnArray(d, squeeze, singles=singles)
         if self.isEncoded():
-            resultArray = self.decode(resultArray)
+            resultArray  = self.decode(resultArray)
             newmissing = resultArray.fill_value
         else:
             newmissing = self.getMissing()
 
         if raweasy:
             return resultArray
-        elif len(axes) > 0:
+        elif len(axes)>0:
 
             # If forcing use of input axes, make sure they are not copied.
-            # Same if the grid is not rectilinear - this is when forceaxes is
-            # set.
+            # Same if the grid is not rectilinear - this is when forceaxes is set.
             copyaxes = (forceaxes is None) and (resultgrid is None)
-            result = TransientVariable(resultArray,
-                                       copy=0,
-                                       fill_value=newmissing,
-                                       axes=axes,
-                                       copyaxes=copyaxes,
-                                       grid=resultgrid,
-                                       attributes=self.attributes,
-                                       id=self.id)
+            result = TransientVariable(resultArray, 
+                                     copy=0,
+                                     fill_value = newmissing,
+                                     axes=axes,
+                                     copyaxes = copyaxes,
+                                     grid = resultgrid,
+                                     attributes=self.attributes,
+                                     id = self.id)
             if grid is not None:
                 order2 = grid.getOrder()
                 if order is None:
                     order = order2
                 elif order != order2:
-                    raise CDMSError('grid, order options not compatible.')
+                    raise CDMSError, 'grid, order options not compatible.'
             result = result.reorder(order).regrid(grid)
             if raw == 0:
                 return result
@@ -662,7 +639,7 @@ class AbstractVariable(CdmsObj, Slab):
         else:               # Return numpy.ma for zero rank, so that __cmp__ works.
             return resultArray
 
-    def getSlice(self, *specs, **keys):
+    def getSlice (self, *specs, **keys):
         """x.getSlice takes arguments of the following forms and produces
            a return array. The keyword argument squeeze determines whether
            or not the shape of the returned array contains dimensions whose
@@ -687,21 +664,21 @@ class AbstractVariable(CdmsObj, Slab):
            of that dimension, as in normal Python indexing.
         """
         # Turn on squeeze and raw options by default.
-        keys['numericSqueeze'] = keys.get('numericSqueeze', 0)
-        keys['squeeze'] = keys.get('squeeze', 1 - keys['numericSqueeze'])
-        keys['raw'] = keys.get('raw', 1)
+        keys['numericSqueeze'] = keys.get('numericSqueeze',0)
+        keys['squeeze'] = keys.get('squeeze',1-keys['numericSqueeze'])
+        keys['raw'] = keys.get('raw',1)
         keys['order'] = keys.get('order', None)
         keys['grid'] = keys.get('grid', None)
         isitem = keys.get('isitem', 0)
         result = self.subSlice(*specs, **keys)
 
         # return a scalar for 0-D slices
-        if isitem and result.size == 1 and (not _numeric_compatibility) and not result.mask.item():
+        if isitem and result.size==1 and (not _numeric_compatibility) and not result.mask.item():
             result = result.item()
         return result
 
     def expertSlice(self, slicelist):
-        raise CDMSError(NotImplemented + 'expertSlice')
+        raise CDMSError, NotImplemented + 'expertSlice'
 
     def getRegion(self, *specs, **keys):
         """getRegion
@@ -737,67 +714,65 @@ class AbstractVariable(CdmsObj, Slab):
         """
 
         # By default, squeeze and raw options are on
-        keys['squeeze'] = keys.get('squeeze', 1)
-        keys['raw'] = keys.get('raw', 1)
+        keys['squeeze'] = keys.get ('squeeze', 1)
+        keys['raw'] = keys.get('raw',1)
         keys['order'] = keys.get('order', None)
         keys['grid'] = keys.get('grid', None)
         return self.subRegion(*specs, **keys)
 
-    def subRegion(self, *specs, **keys):
+    def subRegion (self, *specs, **keys):
 
-        speclist = self._process_specs(specs, keys)
-        slicelist = self.reg_specs2slices(speclist)
+        speclist = self._process_specs (specs, keys)
+        slicelist = self.reg_specs2slices (speclist)
 
-        squeeze = keys.get('squeeze', 0)
-        raw = keys.get('raw', 0)
+        squeeze = keys.get ('squeeze', 0)
+        raw = keys.get('raw',0)
         order = keys.get('order', None)
         grid = keys.get('grid', None)
-        raweasy = raw == 1 and order is None and grid is None
+        raweasy = raw==1 and order is None and grid is None
         if grid is not None and order is None:
             order = grid.getOrder()
 
+
         # Check if any slice wraps around.
 
         wrapdim = -1
-
+        
         axes = []
 
         circulardim = None
-
+        
         for idim in range(len(slicelist)):
             item = slicelist[idim]
             axis = self.getAxis(idim)
             axislen = len(axis)
 
-            if(axis.isCircular()):
-                circulardim = idim
+            if(axis.isCircular()): circulardim=idim
 
-            wraptest1 = (axis.isCircular() and speclist[idim] != unspecified)
+            wraptest1 = ( axis.isCircular() and speclist[idim] != unspecified)
             start, stop = item.start, item.stop
-            wraptest2 = not ((start is None or (0 <= start < axislen)) and (
-                stop is None or (0 <= stop <= axislen)))
+            wraptest2 = not ((start is None or (0<=start<axislen)) and (stop is None or (0<=stop<=axislen)))
 
-            if (wraptest1 and wraptest2):
+            if ( wraptest1 and wraptest2):
                 if wrapdim >= 0:
-                    raise CDMSError("Too many dimensions wrap around.")
+                    raise CDMSError, "Too many dimensions wrap around."
                 wrapdim = idim
                 break
-
+                    
         else:
 
             # No wraparound, just read the data
 
-            # redo the speclist -> slice if passed circular test but not
-            # wrapped test
+            # redo the speclist -> slice if passed circular test but not wrapped test
 
             if(circulardim is not None):
-                slicelist = self.reg_specs2slices(speclist, force=circulardim)
-
-            d = {'raw': raw,
-                 'squeeze': squeeze,
-                 'order': order,
-                 'grid': grid,
-                 }
+                slicelist = self.reg_specs2slices (speclist,force=circulardim)
+                
+            d = {'raw':raw, 
+                 'squeeze':squeeze,
+                 'order':order,
+                 'grid':grid,
+                }
             return self.subSlice(*slicelist, **d)
 
         #
@@ -812,11 +787,11 @@ class AbstractVariable(CdmsObj, Slab):
         # shift the wrap slice to the positive side and calc number of cycles shifted
         #
 
-        wb = wrapslice.start
-        we = wrapslice.stop
-        ws = wrapslice.step
-        size = length
-        cycle = self.getAxis(wrapdim).getModulo()
+        wb=wrapslice.start
+        we=wrapslice.stop
+        ws=wrapslice.step
+        size=length
+        cycle=self.getAxis(wrapdim).getModulo()
 
         #
         # ncycle:
@@ -826,93 +801,92 @@ class AbstractVariable(CdmsObj, Slab):
         # ncyclesrev:
         #    resetting the world coordinate for reversed direction
         #
-
-        ncycles = 0
-        ncyclesrev = 0
-
-        if(ws > 0):
-
-            if(wb > 0):
-                ncycles = 1
-                while(wb >= 0):
-                    wb = wb - size
-                    we = we - size
-                    ncycles = ncycles - 1
+        
+        ncycles=0
+        ncyclesrev=0
+
+        if(ws>0):
+
+            if(wb>0):
+                ncycles=1
+                while(wb>=0):
+                    wb=wb-size
+                    we=we-size
+                    ncycles=ncycles-1
             else:
-                ncycles = 0
-                while(wb < 0):
-                    wb = wb + size
-                    we = we + size
-                    ncycles = ncycles + 1
-
+                ncycles=0
+                while(wb<0):
+                    wb=wb+size
+                    we=we+size
+                    ncycles=ncycles+1
+                    
             if(wb < 0):
-                wb = wb + size
-                we = we + size
-
+                wb=wb+size
+                we=we+size
+                
         #  reversed direction
-
+        
         else:
 
             # do the ncycles for resetting world coordinate
-            wbrev = wb
-            werev = we
-            werevNoneTest = 0
+            wbrev=wb
+            werev=we
+            werevNoneTest=0
             if(werev is None):
-                werev = 0
-                werevNoneTest = 1
+                werev=0
+                werevNoneTest=1
 
-            ncycleRevStart = 1
+            ncycleRevStart=1
             if(wbrev > 0):
-                ncyclesrev = ncycleRevStart
-                while(wbrev >= 0):
-                    wbrev = wbrev - size
-                    werev = werev - size
-                    ncyclesrev = ncyclesrev - 1
+                ncyclesrev=ncycleRevStart
+                while(wbrev>=0):
+                    wbrev=wbrev-size
+                    werev=werev-size
+                    ncyclesrev=ncyclesrev-1
             else:
-                ncyclesrev = 0
-                while(wbrev < 0):
-                    wbrev = wbrev + size
-                    werev = werev + size
-                    ncyclesrev = ncyclesrev + 1
+                ncyclesrev=0
+                while(wbrev<0):
+                    wbrev=wbrev+size
+                    werev=werev+size
+                    ncyclesrev=ncyclesrev+1
 
             while(werev < 0):
-                wbrev = wbrev + size
-                werev = werev + size
+                wbrev=wbrev+size
+                werev=werev+size
 
             # number of cycles to make the slice positive
-            while(we < 0 and we is not None):
-                wb = wb + size
-                we = we + size
-                ncycles = ncycles + 1
-
-            wb = wbrev
-            we = werev
-            if(werevNoneTest):
-                we = None
-
-        wrapslice = slice(wb, we, ws)
-
+            while( we<0 and we != None ):
+                wb=wb+size
+                we=we+size
+                ncycles=ncycles+1
+
+            wb=wbrev
+            we=werev
+            if(werevNoneTest): we=None
+            
+        wrapslice=slice(wb,we,ws)
+        
         #
         #  calc the actual positive slices and create data array
         #
 
-        donew = 1
+        donew=1
 
         if(donew):
 
             wraps = splitSliceExt(wrapslice, length)
 
-            for kk in range(0, len(wraps)):
-                sl = wraps[kk]
-
+            for kk in range(0,len(wraps)):
+                sl=wraps[kk]
+                
                 slicelist[wrapdim] = sl
 
                 if(kk == 0):
                     ar1 = self.getSlice(squeeze=0, *slicelist)
-                    result = ar1
+                    result=ar1
                 else:
                     ar2 = self.getSlice(squeeze=0, *slicelist)
-                    result = numpy.ma.concatenate((result, ar2), axis=wrapdim)
+                    result = numpy.ma.concatenate((result,ar2),axis=wrapdim)
 
         else:
 
@@ -921,7 +895,8 @@ class AbstractVariable(CdmsObj, Slab):
             ar1 = self.getSlice(squeeze=0, *slicelist)
             slicelist[wrapdim] = wrap2
             ar2 = self.getSlice(squeeze=0, *slicelist)
-            result = numpy.ma.concatenate((ar1, ar2), axis=wrapdim)
+            result = numpy.ma.concatenate((ar1,ar2),axis=wrapdim)
+
 
         if raweasy:
             return self._returnArray(result, squeeze)
@@ -932,23 +907,22 @@ class AbstractVariable(CdmsObj, Slab):
         #
         #----------------------------------------------------------------------
 
-        wrapspec = speclist[wrapdim]
-
+        wrapspec=speclist[wrapdim]
+        
         axes = []
         for i in range(self.rank()):
-            if squeeze and numpy.ma.size(result, i) == 1:
-                continue
+            if squeeze and numpy.ma.size(result, i) == 1: continue
 
             sl = slicelist[i]
 
             if i == wrapdim:
 
                 axis = self.getAxis(i).subAxis(wb, we, ws)
-
+                
                 if(ws > 0):
-                    delta_beg_wrap_dimvalue = ncycles * cycle
+                    delta_beg_wrap_dimvalue = ncycles*cycle
                 else:
-                    delta_beg_wrap_dimvalue = ncyclesrev * cycle
+                    delta_beg_wrap_dimvalue = ncyclesrev*cycle
 
                 isGeneric = [False]
                 b = axis.getBounds(isGeneric) - delta_beg_wrap_dimvalue
@@ -962,18 +936,18 @@ class AbstractVariable(CdmsObj, Slab):
 
         result = self._returnArray(result, squeeze)
         result = TransientVariable(result,
-                                   copy=0,
-                                   fill_value=self.missing_value,
-                                   axes=axes,
-                                   attributes=self.attributes,
-                                   id=self.id)
+                                 copy=0, 
+                                 fill_value = self.missing_value,
+                                 axes=axes,
+                                 attributes=self.attributes,
+                                 id = self.id)
         if grid is not None:
             order2 = grid.getOrder()
             if order is None:
                 order = order2
             elif order != order2:
-                raise CDMSError('grid, order options not compatible.')
-
+                raise CDMSError, 'grid, order options not compatible.'
+            
         result = result.reorder(order).regrid(grid)
         if raw == 0:
             return result
@@ -983,22 +957,22 @@ class AbstractVariable(CdmsObj, Slab):
     def getValue(self, squeeze=1):
         """Return the entire set of values."""
         return self.getSlice(Ellipsis, squeeze=squeeze)
+    
+    def assignValue(self,data):
+        raise CDMSError, NotImplemented + 'assignValue'
 
-    def assignValue(self, data):
-        raise CDMSError(NotImplemented + 'assignValue')
-
-    def reorder(self, order):
+    def reorder (self, order):
         """return self reordered per the specification order"""
-        if order is None:
+        if order is None: 
             return self
         axes = self.getAxisList()
         permutation = order2index(axes, order)
         if permutation == range(len(axes)):
             return self
-        return MV.transpose(self, permutation)
+        return MV.transpose (self, permutation)
 
-    def regrid(self, togrid, missing=None, order=None, mask=None, **keywords):
-        """return self regridded to the new grid.
+    def regrid (self, togrid, missing=None, order=None, mask=None, **keywords):
+        """return self regridded to the new grid.  
         One can use the regrid2.Regridder optional arguments as well.
 
         Example:
@@ -1013,49 +987,48 @@ class AbstractVariable(CdmsObj, Slab):
         @param keywords optional keyword arguments dependent on regridTool
         @return regridded variable
         """
-        # there is a circular dependency between cdms2 and regrid2. In
+        # there is a circular dependency between cdms2 and regrid2. In 
         # principle, cdms2 files should not import regrid2, we're bending
         # rules here...
         import regrid2
         from regrid2 import Horizontal
 
-        if togrid is None:
+        if togrid is None: 
             return self
         else:
 
-            fromgrid = self.getGrid()  # this returns the horizontal grid only
+            fromgrid = self.getGrid() # this returns the horizontal grid only
 
             # default w/o bounds
-            regridTool = 'libcf'
+            regridTool = 'libcf'   
             regridMethod = 'linear'
 
-            if 'topology' in self.getAxis(-1).attributes:
+            if self.getAxis(-1).attributes.has_key('topology'):
                 if self.getAxis(-1).attributes['topology'] == 'circular':
                     # for the ESMF regridders
-                    keywords['periodicity'] = guessPeriodicity(
-                        self.getAxis(-1).getBounds())
+                    keywords['periodicity'] = guessPeriodicity(self.getAxis(-1).getBounds())
                     keywords['mkCyclic'] = 1    # for LibCF regridder
 
             # check if there are bounds and we have esmf
-            if fromgrid.getBounds() is not None and hasattr(regrid2, "ESMFRegrid"):
+            if fromgrid.getBounds() is not None and hasattr(regrid2,"ESMFRegrid"):
                 regridTool = 'esmf'
                 regridMethod = 'linear'
                 # Hum ok if only 1 longitude regrid fails, let's check
-                if len(togrid.getLongitude()) == 1:
-                    # esmf can't deal with this
-                    regridTool = "regrid2"
+                if len(togrid.getLongitude())==1:
+                  # esmf can't deal with this
+                  regridTool   = "regrid2"
 
             # let user override
             userSpecifiesMethod = False
             for rm in 'rm', 'method', 'regridmethod', 'regrid_method', 'regridMethod':
-                if rm in keywords:
+                if keywords.has_key(rm):
                     regridMethod = keywords[rm]
                     del keywords[rm]
                     userSpecifiesMethod = True
 
             userSpecifiesTool = False
             for rt in 'rt', 'tool', 'regridtool', 'regrid_tool', 'regridTool':
-                if rt in keywords:
+                if keywords.has_key(rt):
                     regridTool = keywords[rt]
                     del keywords[rt]
                     userSpecifiesTool = True
@@ -1068,8 +1041,8 @@ class AbstractVariable(CdmsObj, Slab):
 
             # make sure the tool can do it
             if re.search('^regrid', regridTool, re.I) is not None and \
-                    (len(fromgrid.getLatitude().shape) > 1 or
-                     len(togrid.getLatitude().shape) > 1):
+                    (  len(fromgrid.getLatitude().shape) > 1 or \
+                         len(togrid.getLatitude().shape) > 1  ):
                 message = """
 avariable.regrid: regrid2 cannot do curvilinear, will switch to esmf..."
                 """
@@ -1079,7 +1052,7 @@ avariable.regrid: regrid2 cannot do curvilinear, will switch to esmf..."
             if re.search('esmf', regridTool, re.I):
                 # make sure source grids have bounds
                 haveBounds = True
-                for g in fromgrid, :
+                for g in fromgrid,:
                     for c in g.getLatitude(), g.getLongitude():
                         haveBounds &= (c.getBounds() is not None)
                 if not haveBounds:
@@ -1089,18 +1062,19 @@ avariable.regrid: regridTool = 'esmf' requires bounds for source grid, will swit
                     warnings.warn(message, Warning)
                     regridTool = 'libcf'
                     regridMethod = 'linear'
-                if not hasattr(regrid2, "ESMFRegrid"):
-                    message = """
+                if not hasattr(regrid2,"ESMFRegrid"):
+                  message = """
 avariable.regrid: regridTool = 'esmf' but your version does not seems to be built with esmf, will switch to regridTool = 'libcf'
                   """
-                    warnings.warn(message, Warning)
-                    regridTool = 'libcf'
-                    regridMethod = 'linear'
+                  warnings.warn(message, Warning)
+                  regridTool = 'libcf'
+                  regridMethod = 'linear'
+
 
             if re.search('conserv', regridMethod, re.I):
                 # make sure destination grid has bounds
                 haveBounds = True
-                for g in togrid, :
+                for g in togrid,:
                     for c in g.getLatitude(), g.getLongitude():
                         haveBounds &= (c.getBounds() is not None)
                 if not haveBounds:
@@ -1114,48 +1088,47 @@ avariable.regrid: regridMethod = 'conserve' requires bounds for destination grid
                 message = """
 avariable.regrid: We chose regridTool = %s for you among the following choices:
    Tools ->    'regrid2' (old behavior)
-               'esmf' (conserve, patch, linear) or
+               'esmf' (conserve, patch, linear) or 
                'libcf' (linear)""" % regridTool
                 warnings.warn(message, Warning)
 
             if not userSpecifiesMethod and re.search('^regrid', regridTool, re.I) is None:
                 message = """
-avariable.regrid: We chose regridMethod = %s for you among the following choices:
+avariable.regrid: We chose regridMethod = %s for you among the following choices: 
     'conserve' or 'linear' or 'patch'""" % regridMethod
                 warnings.warn(message, Warning)
 
             if re.search('^regrid', regridTool, re.I):
-                if 'diag' in keywords and \
-                        isinstance(keywords['diag'], dict):
+                if keywords.has_key('diag') and \
+                        type(keywords['diag']) == types.DictType:
                     keywords['diag']['regridTool'] = 'regrid'
 
                 # the original cdms2 regridder
                 regridf = Horizontal(fromgrid, togrid)
-                return regridf(self, missing=missing, order=order,
+                return regridf(self, missing=missing, order=order, 
                                mask=mask, **keywords)
 
             # emsf or libcf...
 
             srcGridMask = None
             # set the source mask if a mask is defined with the source data
-            if numpy.any(self.mask):
+            if numpy.any(self.mask == True):
                 srcGridMask = getMinHorizontalMask(self)
 
             # compute the interpolation weights
-            ro = CdmsRegrid(fromgrid, togrid,
-                            dtype=self.dtype,
-                            regridMethod=regridMethod,
-                            regridTool=regridTool,
-                            srcGridMask=srcGridMask,
-                            srcGridAreas=None,
-                            dstGridMask=None,
-                            dstGridAreas=None,
+            ro = CdmsRegrid(fromgrid, togrid, 
+                            dtype = self.dtype,
+                            regridMethod = regridMethod,
+                            regridTool = regridTool,
+                            srcGridMask = srcGridMask, 
+                            srcGridAreas = None,
+                            dstGridMask = None,
+                            dstGridAreas = None,
                             **keywords)
             # now interpolate
             return ro(self, **keywords)
 
-    def pressureRegrid(
-            self, newLevel, missing=None, order=None, method="log"):
+    def pressureRegrid (self, newLevel, missing=None, order=None, method="log"):
         """Return the variable regridded to new pressure levels.
         The variable should be a function of lat, lon, pressure, and (optionally) time.
         <newLevel> is an axis of the result pressure levels.
@@ -1167,13 +1140,12 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
 
         fromlevel = self.getLevel()
         if fromlevel is None:
-            raise CDMSError('No pressure level')
+            raise CDMSError, 'No pressure level'
         pregridf = PressureRegridder(fromlevel, newLevel)
         result = pregridf(self, missing=missing, order=order, method=method)
         return result
 
-    def crossSectionRegrid(
-            self, newLevel, newLatitude, missing=None, order=None, method="log"):
+    def crossSectionRegrid(self, newLevel, newLatitude, missing=None, order=None, method="log"):
         """Return the variable regridded to new pressure levels and latitudes.
         The variable should be a function of lat, level, and (optionally) time.
         <newLevel> is an axis of the result pressure levels.
@@ -1187,18 +1159,14 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
         fromlevel = self.getLevel()
         fromlat = self.getLatitude()
         if fromlevel is None:
-            raise CDMSError('No pressure level')
+            raise CDMSError, 'No pressure level'
         if fromlat is None:
-            raise CDMSError('No latitude level')
-        xregridf = CrossSectionRegridder(
-            fromlat,
-            newLatitude,
-            fromlevel,
-            newLevel)
+            raise CDMSError, 'No latitude level'
+        xregridf = CrossSectionRegridder(fromlat, newLatitude, fromlevel, newLevel)
         result = xregridf(self, missing=missing, order=order, method=method)
         return result
 
-    def _process_specs(self, specs, keys):
+    def _process_specs (self, specs, keys):
         """Process the arguments for a getSlice, getRegion, etc.
            Returns an array of specifications for all dimensions.
            Any Ellipsis has been eliminated.
@@ -1209,39 +1177,36 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
         if Ellipsis in specs:
             nellipses = 1
         elif numpy.newaxis in specs:
-            raise CDMSError(
-                'Sorry, you cannot use NewAxis in this context ' + str(specs))
+            raise CDMSError, 'Sorry, you cannot use NewAxis in this context ' + str(specs)
         else:
             nellipses = 0
-        if nsupplied - nellipses > myrank:
-            raise CDMSError(InvalidRegion +
-                            "too many dimensions: %d, for variable %s" % (len(specs), self.id))
+        if nsupplied-nellipses > myrank:
+            raise CDMSError, InvalidRegion + \
+              "too many dimensions: %d, for variable %s"%(len(specs),self.id)
 
-        speclist = [unspecified] * myrank
+        speclist = [unspecified]*myrank
         i = 0
         j = 0
         while i < nsupplied:
             if specs[i] is Ellipsis:
-                j = myrank - (nsupplied - (i + 1))
+               j = myrank  - (nsupplied - (i+1)) 
             else:
-                speclist[j] = specs[i]
-                j = j + 1
+               speclist[j] = specs[i]
+               j = j + 1
             i = i + 1
 
         for k, v in keys.items():
-            if k in ['squeeze', 'raw', 'grid', 'order']:
+            if k in ['squeeze','raw','grid','order']: 
                 continue
             i = self.getAxisIndex(k)
             if i >= 0:
                 if speclist[i] is not unspecified:
-                    raise CDMSError(
-                        'Conflict between specifier %s and %s' %
-                        (repr(speclist[i]), repr(keys)))
+                    raise CDMSError, 'Conflict between specifier %s and %s'%(`speclist[i]`,`keys`)
                 speclist[i] = v
 
         return speclist
 
-    def _single_specs(self, specs):
+    def _single_specs (self, specs):
         """Return a list of dimension indices where the spec is an index."""
         myrank = self.rank()
         nsupplied = len(specs)
@@ -1250,15 +1215,15 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
         singles = []
         while i < nsupplied:
             if specs[i] is Ellipsis:
-                j = myrank - (nsupplied - (i + 1))
+                j = myrank  - (nsupplied - (i+1)) 
             else:
-                if isinstance(specs[i], int):
+                if isinstance(specs[i], types.IntType):
                     singles.append(j)
                 j = j + 1
             i = i + 1
         return singles
 
-    def specs2slices(self, speclist, force=None):
+    def specs2slices (self, speclist, force=None):
         """Create an equivalent list of slices from an index specification
            An index specification is a list of acceptable items, which are
            -- an integer
@@ -1269,22 +1234,22 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
            The size of the speclist must be self.rank()
         """
         if len(speclist) != self.rank():
-            raise CDMSError("Incorrect length of speclist in specs2slices.")
+            raise CDMSError, "Incorrect length of speclist in specs2slices."
         slicelist = []
         for i in range(self.rank()):
             key = speclist[i]
-            if isinstance(key, int):  # x[i]
-                slicelist.append(slice(key, key + 1))
-            elif isinstance(key, slice):  # x[i:j:k]
+            if isinstance(key, types.IntType):  # x[i]
+                slicelist.append (slice(key,key+1))
+            elif type(key) is types.SliceType: # x[i:j:k]
                 slicelist.append(key)
             elif key is unspecified or key is None or key == ':':
-                slicelist.append(slice(0, len(self.getAxis(i))))
+                slicelist.append (slice(0, len(self.getAxis(i))))
             elif key is Ellipsis:
-                raise CDMSError("Misuse of ellipsis in specification.")
-            elif isinstance(key, tuple):
+                raise CDMSError, "Misuse of ellipsis in specification."
+            elif type(key) is types.TupleType:
                 slicelist.append(slice(*key))
             else:
-                raise CDMSError('invalid index: %s' % str(key))
+                raise CDMSError, 'invalid index: %s'% str(key)
         # Change default or negative start, stop to positive
         for i in range(self.rank()):
             axis = self.getAxis(i)
@@ -1295,106 +1260,92 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
             #
             # allow negative indices in a wrapped (isCircular() = 1) axis
             #
-            circular = (axis.isCircular() and force is None)
+            circular=(axis.isCircular() and force is None)
 
             altered = 0
-            if step is None:
+            if step is None: 
                 altered = 1
-                step = 1
+                step=1
 
-            if ((start is None or stop is None or start < 0 or stop < 0) and (circular == 0)):
+            if ( ( start is None or stop is None or start<0 or stop<0 ) and ( circular == 0 ) ):
                 altered = 1
                 adjustit = 1
-                if step > 0:
-                    if start is None:
-                        start = 0
-                    if stop is None:
-                        stop = length
-                    if start == -1 and stop == 0:
-                        stop = length
+                if step>0:
+                    if start is None: 
+                        start=0
+                    if stop is None: 
+                        stop=length
+                    if start==-1 and stop==0:
+                        stop=length
                 else:
-                    if start is None:
-                        start = length - 1
+                    if start is None: 
+                        start=length-1
                     if stop is None:
                         # stop=-1
                         adjustit = 0
-                if start < 0:
-                    start = start % length
-                if stop < 0 and adjustit:
-                    stop = stop % length
-            if altered:
+                if start<0: 
+                    start=start%length
+                if stop<0 and adjustit: 
+                    stop=stop%length
+            if altered: 
                 slicelist[i] = slice(start, stop, step)
         return slicelist
 
-    def reg_specs2slices(self, initspeclist, force=None):
+    def reg_specs2slices(self, initspeclist,force=None):
 
         # Don't use input to store return value
-        speclist = copy.copy(initspeclist)
+        speclist=copy.copy(initspeclist)
 
         for i in range(self.rank()):
             item = speclist[i]
-            if isinstance(item, slice):
+            if isinstance(item, types.SliceType):
                 newitem = item
-            elif item == ':' or item is None or item is unspecified:
+            elif item==':' or item is None or item is unspecified:
                 axis = self.getAxis(i)
-                newitem = slice(0, len(axis))
-            elif isinstance(item, list) or \
-                    isinstance(item, tuple):
+                newitem = slice(0,len(axis))
+            elif isinstance(item, types.ListType) or \
+                 isinstance(item, types.TupleType):
                 axis = self.getAxis(i)
-                if len(item) == 2:        # (start,end)
+                if len(item)==2:        # (start,end)
                     indexInterval = axis.mapIntervalExt(item)
-                elif len(item) == 3:      # (start,end,'xxx')
-                    coordInterval = (item[0], item[1])
-                    indexInterval = axis.mapIntervalExt(coordInterval, item[2])
-                elif len(item) == 4:
-                    coordInterval = (item[0], item[1])
-                    indexInterval = axis.mapIntervalExt(
-                        coordInterval, item[2], item[3])
-                elif len(item) == 5:
-                    coordInterval = (item[0], item[1])
-                    indexInterval = axis.mapIntervalExt(
-                        coordInterval,
-                        item[2],
-                        item[3],
-                        item[4])
-                elif len(item) == 6:
-                    coordInterval = (item[0], item[1])
-                    indexInterval = axis.mapIntervalExt(
-                        coordInterval,
-                        item[2],
-                        item[3],
-                        item[4],
-                        item[5])
+                elif len(item)==3:      # (start,end,'xxx')
+                    coordInterval = (item[0],item[1])
+                    indexInterval = axis.mapIntervalExt(coordInterval,item[2])
+                elif len(item)==4:
+                    coordInterval = (item[0],item[1])
+                    indexInterval = axis.mapIntervalExt(coordInterval,item[2],item[3])
+                elif len(item)==5:
+                    coordInterval = (item[0],item[1])
+                    indexInterval = axis.mapIntervalExt(coordInterval,item[2],item[3],item[4])
+                elif len(item)==6:
+                    coordInterval = (item[0],item[1])
+                    indexInterval = axis.mapIntervalExt(coordInterval,item[2],item[3],item[4],item[5])
                 else:
-                    raise CDMSError(
-                        InvalidRegion + "invalid format for coordinate interval: %s" %
-                        str(item))
+                    raise CDMSError, InvalidRegion + "invalid format for coordinate interval: %s"%str(item)
                 if indexInterval is None:
-                    raise CDMSError(OutOfRange + str(item))
-                newitem = slice(
-                    indexInterval[0],
-                    indexInterval[1],
-                    indexInterval[2])
-            elif isinstance(item, (numpy.floating, float, numpy.integer, int, long, basestring)) or type(item) in CdtimeTypes:
+                    raise CDMSError, OutOfRange + str(item)
+                newitem = slice(indexInterval[0],indexInterval[1],indexInterval[2])
+            elif isinstance(item, numpy.floating) or \
+                 isinstance(item, types.FloatType) or \
+                 isinstance(item, numpy.integer) or \
+                 isinstance(item, types.IntType) or \
+                 isinstance(item, types.LongType) or \
+                 isinstance(item, types.StringType) or \
+                 type(item) in CdtimeTypes:
                 axis = self.getAxis(i)
                 #
                 # default is 'ccn' in axis.mapIntervalExt
                 #
-                indexInterval = axis.mapIntervalExt((item, item))
+                indexInterval = axis.mapIntervalExt((item,item))
                 if indexInterval is None:
-                    raise CDMSError(OutOfRange + str(item))
-                newitem = slice(
-                    indexInterval[0],
-                    indexInterval[1],
-                    indexInterval[2])
+                    raise CDMSError, OutOfRange + str(item)
+                newitem = slice(indexInterval[0],indexInterval[1],indexInterval[2])
             else:
-                raise CDMSError(
-                    InvalidRegion + "invalid format for coordinate interval: %s" %
-                    str(item))
+                raise CDMSError, InvalidRegion + "invalid format for coordinate interval: %s"%str(item)
 
             speclist[i] = newitem
 
-        slicelist = self.specs2slices(speclist, force)
+        slicelist = self.specs2slices(speclist,force)
         return slicelist
 
     def _decodedType(self):
@@ -1409,7 +1360,7 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
 
     def isEncoded(self):
         "True iff self is represented as packed data."
-        return (hasattr(self, "scale_factor") or hasattr(self, "add_offset"))
+        return (hasattr(self,"scale_factor") or hasattr(self,"add_offset"))
 
     def decode(self, ar):
         "Decode compressed data. ar is a masked array, scalar, or numpy.ma.masked"
@@ -1417,20 +1368,18 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
         if hasattr(self, 'scale_factor'):
             scale_factor = self.scale_factor
         else:
-            scale_factor = numpy.array([1.0], resulttype)
-
+            scale_factor = numpy.array([1.0],resulttype)
+            
         if hasattr(self, 'add_offset'):
             add_offset = self.add_offset
         else:
-            add_offset = numpy.array([0.0], resulttype)
-
+            add_offset = numpy.array([0.0],resulttype)
+            
         if ar is not numpy.ma.masked:
-            result = scale_factor * ar + add_offset
-            if isinstance(result, numpy.ma.MaskedArray):
+            result = scale_factor*ar + add_offset
+            if isinstance(result,numpy.ma.MaskedArray):
                 result = result.astype(resulttype)
-                numpy.ma.set_fill_value(
-                    result,
-                    numpy.ma.default_fill_value(0.))
+                numpy.ma.set_fill_value(result, numpy.ma.default_fill_value(0.))
             else:
                 tmp = numpy.array(result)
                 result = tmp.astype(resulttype)[0]
@@ -1452,121 +1401,116 @@ avariable.regrid: We chose regridMethod = %s for you among the following choices
                         result.append(j)
                         break
                 else:
-                    raise CDMSError(
-                        'Variable and grid do not share common dimensions: %s' %
-                        self.id)
+                    raise CDMSError, 'Variable and grid do not share common dimensions: %s'%self.id
 
         return tuple(result)
 
     # numpy.ma overrides
 
     def __getitem__(self, key):
-        if isinstance(key, tuple):
+        if type(key) is types.TupleType:
             speclist = self._process_specs(key, {})
         else:
-            if isinstance(key, int) and key >= len(self):
-                raise IndexError("Index too large: %d" % key)
+            if isinstance(key, types.IntType) and key>=len(self):
+                raise IndexError, "Index too large: %d"%key
             speclist = self._process_specs([key], {})
 
         # Note: raw=0 ensures that a TransientVariable is returned
         return self.getSlice(numericSqueeze=1, raw=0, isitem=1, *speclist)
-
+        
     def __getslice__(self, low, high):
 
         # Note: raw=0 ensures that a TransientVariable is returned
-        return self.getSlice(slice(low, high), numericSqueeze=1, raw=0)
+        return self.getSlice (slice(low, high), numericSqueeze = 1, raw=0)
 
     def typecode(self):
-        raise CDMSError(NotImplemented + 'typecode')
+        raise CDMSError, NotImplemented + 'typecode'
 
-    def __abs__(self):
+    def __abs__(self): 
         return MV.absolute(self)
 
-    def __neg__(self):
+    def __neg__(self): 
         return MV.negative(self)
 
     def __add__(self, other):
         return MV.add(self, other)
-
+                        
     __radd__ = __add__
 
-    def __lshift__(self, n):
+    def __lshift__ (self, n):
         return MV.left_shift(self, n)
 
-    def __rshift__(self, n):
+    def __rshift__ (self, n):
         return MV.right_shift(self, n)
-
-    def __sub__(self, other):
+                        
+    def __sub__(self, other): 
         return MV.subtract(self, other)
 
-    def __rsub__(self, other):
+    def __rsub__(self, other): 
         return MV.subtract(other, self)
 
     def __mul__(self, other):
         return MV.multiply(self, other)
-
+    
     __rmul__ = __mul__
 
-    def __div__(self, other):
+    def __div__(self, other): 
         return MV.divide(self, other)
 
-    def __rdiv__(self, other):
+    def __rdiv__(self, other): 
         return MV.divide(other, self)
 
-    def __pow__(self, other, third=None):
+    def __pow__(self,other, third=None): 
         return MV.power(self, other, third)
 
-    def __iadd__(self, other):
+    def __iadd__(self, other): 
         "Add other to self in place."
         return MV.add(self, other)   # See if we can improve these later.
 
-    def __isub__(self, other):
+    def __isub__(self, other): 
         "Subtract other from self in place."
         return MV.subtract(self, other)   # See if we can improve these later.
 
-    def __imul__(self, other):
+    def __imul__(self, other): 
         "Multiply self by other in place."
         return MV.multiply(self, other)   # See if we can improve these later.
 
-    def __idiv__(self, other):
+    def __idiv__(self, other): 
         "Divide self by other in place."
         return MV.divide(self, other)   # See if we can improve these later.
 
-    def __eq__(self, other):
-        return MV.equal(self, other)
+    def __eq__(self,other): 
+        return MV.equal(self,other)
 
-    def __ne__(self, other):
-        return MV.not_equal(self, other)
+    def __ne__(self,other): 
+        return MV.not_equal(self,other)
 
-    def __lt__(self, other):
-        return MV.less(self, other)
+    def __lt__(self,other): 
+        return MV.less(self,other)
 
-    def __le__(self, other):
-        return MV.less_equal(self, other)
+    def __le__(self,other): 
+        return MV.less_equal(self,other)
 
-    def __gt__(self, other):
-        return MV.greater(self, other)
+    def __gt__(self,other): 
+        return MV.greater(self,other)
 
-    def __ge__(self, other):
-        return MV.greater_equal(self, other)
+    def __ge__(self,other): 
+        return MV.greater_equal(self,other)
 
-    def __sqrt__(self):
+    def __sqrt__(self): 
         return MV.sqrt(self)
 
-    def astype(self, tc):
+    def astype (self, tc):
         "return self as array of given type."
         return self.subSlice().astype(tc)
+    
 
-
-# internattr.add_internal_attribute(AbstractVariable, 'id', 'parent')
-# PropertiedClasses.set_property(AbstractVariable, 'missing_value',
-# acts=AbstractVariable._setmissing, nodelete=1)
+## internattr.add_internal_attribute(AbstractVariable, 'id', 'parent')   
+#PropertiedClasses.set_property(AbstractVariable, 'missing_value', acts=AbstractVariable._setmissing, nodelete=1)
 
 __rp = r'\s*([-txyz0-9]{1,1}|\(\s*\w+\s*\)|[.]{3,3})\s*'
 __crp = re.compile(__rp)
-
-
-def orderparse(order):
+def orderparse (order):
     """Parse an order string. Returns a list of axes specifiers.
        Order elements can be:
           Letters t, x, y, z meaning time, longitude, latitude, level
@@ -1576,33 +1520,31 @@ def orderparse(order):
             remaining axes.
           (name) meaning an axis whose id is name
     """
-    if not isinstance(order, basestring):
-        raise CDMSError('order arguments must be strings.')
+    if not isinstance(order, types.StringType):
+        raise CDMSError, 'order arguments must be strings.'
     pos = 0
-    result = []
+    result=[]
     order = order.strip()
     while pos < len(order):
         m = __crp.match(order, pos)
-        if m is None:
-            break
+        if m is None: break
         r = m.group(1)
         if r[0] == '(':
             pass
         elif r == '...':
             r = Ellipsis
         elif len(r) == 1:
-            if r.isdigit():
-                r = int(r)
+            if r in string.digits:
+                r = string.atoi(r)
         result.append(r)
         pos = m.end(0)
 
     if pos != len(order):
-        raise CDMSError('Order string "' + order +
-                        '" malformed, index ' + str(pos))
+        raise CDMSError, 'Order string "' + order + \
+                          '" malformed, index '+str(pos)
     return result
 
-
-def order2index(axes, order):
+def order2index (axes, order):
     """Find the index permutation of axes to match order.
        The argument order is a string.
        Order elements can be:
@@ -1613,28 +1555,27 @@ def order2index(axes, order):
             remaining axes.
           (name) meaning an axis whose id is name
     """
-    if isinstance(order, basestring):
+    if isinstance(order, types.StringType):
         result = orderparse(order)
-    elif isinstance(order, list):
+    elif isinstance(order, types.ListType):
         result = order
     else:
-        raise CDMSError(
-            'order2index, order specified of bad type:' + str(type(order)))
+        raise CDMSError, 'order2index, order specified of bad type:' + str(type(order))
     n = len(axes)
     ie = n
-    permutation = [None] * n
+    permutation = [None]*n
     j = 0
     pos = 0
     while j < len(result):
         item = result[j]
-        if isinstance(item, basestring):
-            if item == 't':
+        if isinstance(item, types.StringType):
+            if item == 't': 
                 spec = 'time'
-            elif item == 'x':
+            elif item == 'x': 
                 spec = 'longitude'
-            elif item == 'y':
+            elif item == 'y': 
                 spec = 'latitude'
-            elif item == 'z':
+            elif item == 'z': 
                 spec = 'level'
             elif item == '-':
                 pos += 1
@@ -1645,26 +1586,25 @@ def order2index(axes, order):
             for k in range(n):
                 if axisMatches(axes[k], spec):
                     if k in permutation:
-                        raise CDMSError('Duplicate item in order %s' % order)
+                        raise CDMSError, 'Duplicate item in order %s' % order
                     permutation[pos] = k
                     pos += 1
                     break
             else:
-                raise CDMSError('No axis matching order spec %s' % str(item))
-        elif isinstance(item, int):
+                raise CDMSError, 'No axis matching order spec %s' %str(item)
+        elif isinstance(item, types.IntType):
             if item in permutation:
-                raise CDMSError('Duplicate item in order %s' % order)
+                raise CDMSError, 'Duplicate item in order %s' % order
             if item >= n:
-                raise CDMSError('Index %d out of range in order %s' %
-                                (item, order))
+                raise CDMSError, 'Index %d out of range in order %s' %\
+                                 (item,order)
             permutation[pos] = item
             pos += 1
         elif item is Ellipsis:
             nleft = len(result) - j - 1
             pos = n - nleft
         else:
-            raise CDMSError(
-                'List specified for order contains bad item: ' + repr(item))
+            raise CDMSError, 'List specified for order contains bad item: ' + repr(item)
         j += 1
 
     for i in range(n):
@@ -1673,7 +1613,7 @@ def order2index(axes, order):
                 if permutation[j] is None:
                     permutation[j] = i
                     break
-    return permutation
+    return permutation    
 
-from .tvariable import TransientVariable
-from . import MV2 as MV
+from tvariable import TransientVariable
+import MV2 as MV
diff --git a/Packages/cdms2/Lib/axis.py b/Packages/cdms2/Lib/axis.py
index 9313441a4..209fbda42 100644
--- a/Packages/cdms2/Lib/axis.py
+++ b/Packages/cdms2/Lib/axis.py
@@ -1,13 +1,12 @@
-# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
-# Further modified to be pure new numpy June 24th 2008
+## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by 
+## Further modified to be pure new numpy June 24th 2008
 
 """
 CDMS Axis objects
 """
 _debug = 0
 std_axis_attributes = ['name', 'units', 'length', 'values', 'bounds']
-import sys
-import copy
+import string, sys, types, copy
 import numpy
 # import regrid2._regrid
 import cdmsNode
@@ -17,26 +16,19 @@ from cdmsobj import CdmsObj, Max32int
 from sliceut import reverseSlice, splitSlice, splitSliceExt
 from error import CDMSError
 import forecast
-# import internattr
+#import internattr
 from UserList import UserList
-
-
 class AliasList (UserList):
-
     def __init__(self, alist):
-        UserList.__init__(self, alist)
-
-    def __setitem__(self, i, value):
-        self.data[i] = value.lower()
-
+        UserList.__init__(self,alist)
+    def __setitem__ (self, i, value):
+        self.data[i] = string.lower(value)
     def __setslice(self, i, j, values):
-        self.data[i:j] = map(lambda x: x.lower(), values)
-
+        self.data[i:j] = map(lambda x: string.lower(x), values)
     def append(self, value):
-        self.data.append(value.lower())
-
+        self.data.append(string.lower(value))
     def extend(self, values):
-        self.data.extend(map("".lower, values))
+        self.data.extend(map(string.lower, values))
 
 level_aliases = AliasList(['plev'])
 longitude_aliases = AliasList([])
@@ -54,35 +46,35 @@ ReadOnlyAxis = "Axis is read-only: "
 InvalidNCycles = "Invalid number of cycles requested for wrapped dimension: "
 
 ComptimeType = type(cdtime.comptime(0))
-ReltimeType = type(cdtime.reltime(0, "days"))
+ReltimeType = type(cdtime.reltime(0,"days"))
 CdtimeTypes = (ComptimeType, ReltimeType)
 
 # Map between cdtime calendar and CF tags
 calendarToTag = {
-    cdtime.MixedCalendar: 'gregorian',
-    cdtime.NoLeapCalendar: 'noleap',
-    cdtime.GregorianCalendar: 'proleptic_gregorian',
-    cdtime.JulianCalendar: 'julian',
-    cdtime.Calendar360: '360_day',
-    cdtime.ClimCalendar: 'clim_noncf',
-    cdtime.ClimLeapCalendar: 'climleap_noncf',
-    cdtime.DefaultCalendar: 'gregorian',
-    cdtime.StandardCalendar: 'proleptic_gregorian',
+    cdtime.MixedCalendar : 'gregorian',
+    cdtime.NoLeapCalendar : 'noleap',
+    cdtime.GregorianCalendar : 'proleptic_gregorian',
+    cdtime.JulianCalendar : 'julian',
+    cdtime.Calendar360 : '360_day',
+    cdtime.ClimCalendar : 'clim_noncf',
+    cdtime.ClimLeapCalendar : 'climleap_noncf',
+    cdtime.DefaultCalendar : 'gregorian',
+    cdtime.StandardCalendar : 'proleptic_gregorian',
     }
 
 tagToCalendar = {
-    'gregorian': cdtime.MixedCalendar,
-    'standard': cdtime.GregorianCalendar,
-    'noleap': cdtime.NoLeapCalendar,
-    'julian': cdtime.JulianCalendar,
-    'proleptic_gregorian': cdtime.GregorianCalendar,
-    '360_day': cdtime.Calendar360,
-    '360': cdtime.Calendar360,
-    '365_day': cdtime.NoLeapCalendar,
-    'clim': cdtime.ClimCalendar,
-    'clim_noncf': cdtime.ClimCalendar,
-    'climleap_noncf': cdtime.ClimLeapCalendar,
-    'climleap': cdtime.ClimLeapCalendar,
+    'gregorian' : cdtime.MixedCalendar,
+    'standard' : cdtime.GregorianCalendar,
+    'noleap' : cdtime.NoLeapCalendar,
+    'julian' : cdtime.JulianCalendar,
+    'proleptic_gregorian' : cdtime.GregorianCalendar,
+    '360_day' : cdtime.Calendar360,
+    '360' : cdtime.Calendar360,
+    '365_day' : cdtime.NoLeapCalendar,
+    'clim' : cdtime.ClimCalendar,
+    'clim_noncf' : cdtime.ClimCalendar,
+    'climleap_noncf' : cdtime.ClimLeapCalendar,
+    'climleap' : cdtime.ClimLeapCalendar,
     }
 
 # This is not an error message, it is used to detect which things have
@@ -94,24 +86,20 @@ _autobounds = 2                         # Automatically generate axis and grid b
                                         # Modes:
                                         # 0 : off (not bounds generation)
                                         # 1 : on  (generate bounds)
-                                        # 2 : grid (generate bounds for lat/lon
-                                        # grids only)
+                                        # 2 : grid (generate bounds for lat/lon grids only)
 
 # Set autobounds mode to 'on' or 'off'. If on, getBounds will automatically
 # generate boundary information for an axis or grid, if not explicitly defined.
 # If 'off', and no boundary data is explicitly defined, the bounds will NOT
 # be generated; getBounds will return None for the boundaries.
-
-
 def setAutoBounds(mode):
     global _autobounds
-    if mode == 'on' or mode == 1:
-        _autobounds = 1
-    elif mode == 'off' or mode == 0:
-        _autobounds = 0
-    elif mode == 'grid' or mode == 2:
-        _autobounds = 2
-
+    if mode=='on' or mode==1:
+        _autobounds=1
+    elif mode=='off' or mode==0:
+        _autobounds=0
+    elif mode=='grid' or mode==2:
+        _autobounds=2
 
 def getAutoBounds():
     return _autobounds
@@ -121,48 +109,41 @@ def createAxis(data, bounds=None, id=None, copy=0, genericBounds=False):
     return TransientAxis(data, bounds=bounds, id=id, copy=copy, genericBounds=genericBounds)
 
 # Generate a Gaussian latitude axis, north-to-south
-
-
 def createGaussianAxis(nlat):
     import regrid2._regrid
 
-    lats, wts, bnds = regrid2._regrid.gridattr(nlat, 'gaussian')
-
-    # For odd number of latitudes, gridattr returns 0 in the second half of
-    # lats
-    if nlat % 2:
-        mid = nlat / 2
-        lats[mid + 1:] = -lats[:mid][::-1]
+    lats,wts,bnds = regrid2._regrid.gridattr(nlat,'gaussian')
 
-    latBounds = numpy.zeros((nlat, 2), numpy.float)
-    latBounds[:, 0] = bnds[:-1]
-    latBounds[:, 1] = bnds[1:]
-    lat = createAxis(lats, latBounds, id="latitude")
+    # For odd number of latitudes, gridattr returns 0 in the second half of lats
+    if nlat%2:
+        mid = nlat/2
+        lats[mid+1:] = -lats[:mid][::-1]
+        
+    latBounds = numpy.zeros((nlat,2),numpy.float)
+    latBounds[:,0] = bnds[:-1]
+    latBounds[:,1] = bnds[1:]
+    lat = createAxis(lats,latBounds,id="latitude")
     lat.designateLatitude()
     lat.units = "degrees_north"
     return lat
 
 # Generate an equal-area latitude axis, north-to-south
-
-
 def createEqualAreaAxis(nlat):
     import regrid2._regrid
 
-    lats, wts, bnds = regrid2._regrid.gridattr(nlat, 'equalarea')
-    latBounds = numpy.zeros((nlat, 2), numpy.float)
-    latBounds[:, 0] = bnds[:-1]
-    latBounds[:, 1] = bnds[1:]
-    lat = createAxis(lats, latBounds, id="latitude")
+    lats,wts,bnds = regrid2._regrid.gridattr(nlat,'equalarea')
+    latBounds = numpy.zeros((nlat,2),numpy.float)
+    latBounds[:,0] = bnds[:-1]
+    latBounds[:,1] = bnds[1:]
+    lat = createAxis(lats,latBounds,id="latitude")
     lat.designateLatitude()
     lat.units = "degrees_north"
     return lat
 
 # Generate a uniform latitude axis
-
-
 def createUniformLatitudeAxis(startLat, nlat, deltaLat):
-    latArray = startLat + deltaLat * numpy.arange(nlat)
-    lat = createAxis(latArray, id="latitude")
+    latArray = startLat + deltaLat*numpy.arange(nlat)
+    lat = createAxis(latArray,id="latitude")
     lat.designateLatitude()
     lat.units = "degrees_north"
     latBounds = lat.genGenericBounds(width=deltaLat)
@@ -170,21 +151,18 @@ def createUniformLatitudeAxis(startLat, nlat, deltaLat):
     return lat
 
 # Generate a uniform longitude axis
-
-
 def createUniformLongitudeAxis(startLon, nlon, deltaLon):
-    lonArray = startLon + deltaLon * numpy.arange(nlon)
-    lon = createAxis(lonArray, id="longitude")
+    lonArray = startLon + deltaLon*numpy.arange(nlon)
+    lon = createAxis(lonArray,id="longitude")
     lon.designateLongitude()
     lon.units = "degrees_east"
     lonBounds = lon.genGenericBounds(width=deltaLon)
     lon.setBounds(lonBounds)
     return lon
 
-
-def mapLinearIntersection(xind, yind, iind,
-                          aMinusEps, aPlusEps, bPlusEps, bMinusEps,
-                          boundLeft, nodeSubI, boundRight):
+def mapLinearIntersection(xind,yind,iind,
+                          aMinusEps,aPlusEps,bPlusEps,bMinusEps,
+                          boundLeft,nodeSubI,boundRight):
     """
 
     Return true iff the coordinate interval (a,b) intersects the node
@@ -204,35 +182,34 @@ def mapLinearIntersection(xind, yind, iind,
     """
 
     if(iind == 'n' or iind == 'e'):
-        testC_ = (aMinusEps <= nodeSubI)
-        test_C = (nodeSubI <= bPlusEps)
-        testO_ = (aPlusEps < nodeSubI)
-        test_O = (nodeSubI < bMinusEps)
+        testC_ = ( aMinusEps  <= nodeSubI   )
+        test_C = (  nodeSubI  <= bPlusEps   )
+        testO_ = (  aPlusEps  <  nodeSubI   )
+        test_O = (  nodeSubI  <  bMinusEps  )
     elif(iind == 'b'):
-        testC_ = (aMinusEps <= boundRight)
-        test_C = (boundLeft <= bPlusEps)
-        testO_ = (aPlusEps < boundRight)
-        test_O = (boundLeft < bMinusEps)
+        testC_ = ( aMinusEps  <= boundRight )
+        test_C = ( boundLeft  <= bPlusEps   )
+        testO_ = ( aPlusEps   <  boundRight )
+        test_O = ( boundLeft  <  bMinusEps  )
     elif(iind == 's'):
-        testC_ = (aMinusEps <= boundLeft)
-        test_C = (boundRight <= bPlusEps)
-        testO_ = (aPlusEps < boundLeft)
-        test_O = (boundRight < bMinusEps)
+        testC_ = ( aMinusEps  <= boundLeft  )
+        test_C = ( boundRight <= bPlusEps   )
+        testO_ = ( aPlusEps   <  boundLeft  )
+        test_O = ( boundRight <  bMinusEps  )
 
     if(xind == 'c' and yind == 'c'):
-        test = (testC_ and test_C)
+        test=(testC_ and test_C)
     elif(xind == 'c' and yind == 'o'):
-        test = (testC_ and test_O)
+        test=(testC_ and test_O)
     elif(xind == 'o' and yind == 'c'):
-        test = (testO_ and test_C)
+        test=(testO_ and test_C)
     elif(xind == 'o' and yind == 'o'):
-        test = (testO_ and test_O)
+        test=(testO_ and test_O)
 
     return(test)
 
+def mapLinearExt(axis, bounds, interval, indicator ='ccn', epsilon=None, stride=1, wrapped=0):
 
-def mapLinearExt(axis, bounds, interval,
-                 indicator='ccn', epsilon=None, stride=1, wrapped=0):
     """Map coordinate interval to index interval, without
     wraparound. interval has the form (x,y) where x and y are the
     endpoints in coordinate space. indicator is a three-character
@@ -245,139 +222,137 @@ def mapLinearExt(axis, bounds, interval,
     'b' - the interval intersects the cell bounds
     's' - the cell bounds are a subset of the interval
     'e' - same as 'n', plus an extra node on either side.
-
+    
     Returns the corresponding index interval (i,j), where i<j,
     indicating the half-open index interval [i,j), or None if the
     intersection is empty.
     """
-
-    indicator = indicator.lower()
+    
+    indicator = string.lower(indicator)
     length = len(axis)
 
     # Make the interval and search array non-decreasing
-    x, y = interval
-
-    iind = indicator[2]
-
-    if x > y:
-        x, y = y, x
-        xind = indicator[1]
-        yind = indicator[0]
-
+    x,y = interval
+
+    iind  = indicator[2]
+    
+    if x>y:
+        x,y = y,x
+        xind  = indicator[1]
+        yind  = indicator[0]
+        
     else:
         xind = indicator[0]
         yind = indicator[1]
 
-    if axis[0] > axis[-1]:
+    if axis[0]>axis[-1]:
         ar = axis[::-1]
-        if bounds[0, 0] < bounds[0, 1]:
+        if bounds[0,0]<bounds[0,1]:
             bd = bounds[::-1]
         else:
-            bd = bounds[::-1, ::-1]
+            bd = bounds[::-1,::-1]
         direc = 'dec'
     else:
         ar = axis
-        if bounds[0, 0] < bounds[0, 1]:
+        if bounds[0,0]<bounds[0,1]:
             bd = bounds
         else:
-            bd = bounds[:, ::-1]
+            bd = bounds[:,::-1]
         direc = 'inc'
 
     if(epsilon is None):
-        eps = 1.0e-5
-        if len(ar) > 1:
-            epsilon = eps * min(abs(ar[1] - ar[0]), abs(ar[-1] - ar[-2]))
+        eps=1.0e-5
+        if len(ar)>1:
+            epsilon = eps * min(abs(ar[1]-ar[0]), abs(ar[-1]-ar[-2]))
         else:
-            epsilon = eps
+            epsilon=eps
 
     #
     #  interval bound +/- epsilon
     #
 
-    aMinusEps = (x - epsilon)
-    aPlusEps = (x + epsilon)
-    bMinusEps = (y - epsilon)
-    bPlusEps = (y + epsilon)
+    aMinusEps=(x-epsilon)
+    aPlusEps=(x+epsilon)
+    bMinusEps=(y-epsilon)
+    bPlusEps=(y+epsilon)
+
 
-    # oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+    #oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
     #
     # out-of-bounds requests
     #
-    # oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+    #oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
 
-    if iind in ['n', 'e']:
+    if iind in ['n','e']:
         mina = ar[0]
         maxa = ar[-1]
     else:
-        mina = bd[0, 0]
-        maxa = bd[-1, 1]
-
+        mina = bd[0,0]
+        maxa = bd[-1,1]
+        
     if(bPlusEps < mina or aMinusEps > maxa):
         return None
 
-    # nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
+    #nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
     #
     # empty node check
     #
-    # nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
+    #nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
 
     # Handle empty intersections
     if (
-        (((aPlusEps) > ar[-1]) and (iind == 'n') and (xind == 'o')) or
-        (((aMinusEps) >= ar[-1]) and (iind == 'n') and (xind == 'c')) or
-        (((bMinusEps) < ar[0]) and (iind == 'n') and (yind == 'o')) or
-        (((bPlusEps) <= ar[0]) and (iind == 'n') and (yind == 'c'))
+        ( ((aPlusEps)  >  ar[-1]) and (iind == 'n') and (xind == 'o') ) or
+        ( ((aMinusEps) >= ar[-1]) and (iind == 'n') and (xind == 'c') ) or
+        ( ((bMinusEps) <  ar[0] ) and (iind == 'n') and (yind == 'o') ) or
+        ( ((bPlusEps)  <= ar[0] ) and (iind == 'n') and (yind == 'c') ) 
         ):
         return None
 
-    bdMaxRight = max(bd[-1][0], bd[-1][1])
-    bdMinLeft = min(bd[0][0], bd[0][1])
+
+    bdMaxRight=max(bd[-1][0],bd[-1][1])
+    bdMinLeft=min(bd[0][0],bd[0][1])
     if (
-        (((aMinusEps) > bdMaxRight) and (iind != 'n') and (xind == 'o')) or
-        (((aMinusEps) >= bdMaxRight) and (iind != 'n') and (xind == 'c')) or
-        (((bPlusEps) < bdMinLeft) and (iind != 'n') and (yind == 'o')) or
-        (((bPlusEps) <= bdMinLeft) and (iind != 'n') and (yind == 'c'))
-        ):
+        ( ( (aMinusEps) >  bdMaxRight ) and (iind != 'n') and (xind == 'o') ) or
+        ( ( (aMinusEps) >= bdMaxRight ) and (iind != 'n') and (xind == 'c') ) or
+        ( ( (bPlusEps)  <  bdMinLeft  ) and (iind != 'n') and (yind == 'o') ) or
+        ( ( (bPlusEps)  <= bdMinLeft  ) and (iind != 'n') and (yind == 'c') ) 
+        ): 
         return None
+    
+    # The intersection is nonempty; use searchsorted to get left/right limits for testing
 
-    # The intersection is nonempty; use searchsorted to get left/right limits
-    # for testing
-
-    ii, jj = numpy.searchsorted(ar, (x, y))
+    ii,jj = numpy.searchsorted(ar,(x,y))
 
     #
     #  find index range for left (iStart,iEnd) and right (jStart,jEnd)
     #
-
+    
     # iEnd + 2 because last point in loop not done
-    iStart = ii - 1
-    iEnd = ii + 2
-    if(iStart < 0):
-        iStart = 0
-    if(iEnd >= length):
-        iEnd = length - 1
-
-    jStart = jj - 1
-    jEnd = jj + 2
-    if(jStart < 0):
-        jStart = 0
-    if(jEnd >= length):
-        jEnd = length - 1
+    iStart=ii-1
+    iEnd=ii+2
+    if(iStart < 0): iStart=0
+    if( iEnd >= length ): iEnd = length - 1
+
+    jStart=jj-1
+    jEnd=jj+2
+    if( jStart < 0 ): jStart=0
+    if( jEnd >= length ): jEnd = length - 1
 
     #
     #  initialise the index to -1 (does not exist)
     #
 
-    iInterval = -1
-    jInterval = -1
-    iIntervalB = -1
-    jIntervalB = -1
+    iInterval=-1
+    jInterval=-1
+    iIntervalB=-1
+    jIntervalB=-1
 
-    # pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp
+    #pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp
     #
     #  preliminary checks
     #
-    # pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp
+    #pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp
+
 
     if(iStart == jStart == iEnd == jEnd):
         iInterval = jInterval = iStart
@@ -387,173 +362,172 @@ def mapLinearExt(axis, bounds, interval,
 
     else:
 
-        # llllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
+        #llllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
         #
         #  left interval check
         #
-        # llllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
+        #llllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
 
         # - user check
+        
+        for i in range(iStart,iEnd+1):
 
-        for i in range(iStart, iEnd + 1):
-
-            nodeSubI = ar[i]
-            boundLeft = bd[i][0]
-            boundRight = bd[i][1]
+            nodeSubI=ar[i]
+            boundLeft=bd[i][0]
+            boundRight=bd[i][1]
 
-            test = mapLinearIntersection(xind, yind, iind,
-                                       aMinusEps, aPlusEps, bPlusEps, bMinusEps,
-                                       boundLeft, nodeSubI, boundRight)
+            test=mapLinearIntersection(xind,yind,iind,
+                                       aMinusEps,aPlusEps,bPlusEps,bMinusEps,
+                                       boundLeft,nodeSubI,boundRight)
 
-            if(iInterval == -1 and test):
+            if( iInterval == -1 and test ):
                 iInterval = i
                 break
 
         # - "B" check for extension
+        
+        for i in range(iStart,iEnd+1):
 
-        for i in range(iStart, iEnd + 1):
-
-            nodeSubI = ar[i]
-            boundLeft = bd[i][0]
-            boundRight = bd[i][1]
+            nodeSubI=ar[i]
+            boundLeft=bd[i][0]
+            boundRight=bd[i][1]
 
-            testB = mapLinearIntersection(xind, yind, 'b',
-                                       aMinusEps, aPlusEps, bPlusEps, bMinusEps,
-                                       boundLeft, nodeSubI, boundRight)
+            testB=mapLinearIntersection(xind,yind,'b',
+                                       aMinusEps,aPlusEps,bPlusEps,bMinusEps,
+                                       boundLeft,nodeSubI,boundRight)
 
-            if(iIntervalB == -1 and testB):
+            if( iIntervalB == -1 and testB ):
                 iIntervalB = i
                 break
 
-        # rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr
+        #rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr
         #
         #  right interval check
         #
-        # rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr
+        #rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr
 
-        for j in range(jStart, jEnd + 1):
+        for j in range(jStart,jEnd+1):
 
-            nodeSubI = ar[j]
-            boundLeft = bd[j][0]
-            boundRight = bd[j][1]
+            nodeSubI=ar[j]
+            boundLeft=bd[j][0]
+            boundRight=bd[j][1]
 
             #
             #  user test
             #
 
-            test = mapLinearIntersection(xind, yind, iind,
-                                       aMinusEps, aPlusEps, bPlusEps, bMinusEps,
-                                       boundLeft, nodeSubI, boundRight)
+            test=mapLinearIntersection(xind,yind,iind,
+                                       aMinusEps,aPlusEps,bPlusEps,bMinusEps,
+                                       boundLeft,nodeSubI,boundRight)
 
-            if((jInterval == -1 and iInterval != -1 and test == 0 and j <= jEnd)):
-                jInterval = j - 1
+            if( ( jInterval == -1 and iInterval != -1 and test == 0  and j <= jEnd ) ):
+                jInterval = j-1
 
-            if((j == length - 1 and test == 1)):
+            if( (j == length-1 and test == 1) ):
                 jInterval = j
-
+                
                 # no break here...
 
         #
-        #  B test on right
+        #  B test on right 
         #
 
-        for j in range(jStart, jEnd + 1):
+        for j in range(jStart,jEnd+1):
 
-            nodeSubI = ar[j]
-            boundLeft = bd[j][0]
-            boundRight = bd[j][1]
+            nodeSubI=ar[j]
+            boundLeft=bd[j][0]
+            boundRight=bd[j][1]
 
-            testB = mapLinearIntersection(xind, yind, 'b',
-                                       aMinusEps, aPlusEps, bPlusEps, bMinusEps,
-                                       boundLeft, nodeSubI, boundRight)
+            testB=mapLinearIntersection(xind,yind,'b',
+                                       aMinusEps,aPlusEps,bPlusEps,bMinusEps,
+                                       boundLeft,nodeSubI,boundRight)
 
-            if((jIntervalB == -1 and iIntervalB != -1 and testB == 0 and j <= jEnd)):
-                jIntervalB = j - 1
+            if( ( jIntervalB == -1 and iIntervalB != -1 and testB == 0  and j <= jEnd ) ):
+                jIntervalB = j-1
 
-            if((j == length - 1 and testB == 1)):
+            if( ( j == length-1 and testB == 1) ):
                 jIntervalB = j
 
-    # eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+
+    #eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
     #
     #  extension check
     #
-    # eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+    #eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
 
     if(iind == 'e'):
 
         # if B index does not exist return
-        if(iIntervalB < 0 or jIntervalB < 0):
+        if(iIntervalB < 0 or jIntervalB <0):
             return None
 
         # if user index exists:
-        elif ((iInterval > -1 and jInterval > -1)):
+        elif ( ( iInterval > -1 and jInterval > -1 ) ):
 
             if(jInterval < iInterval):
-
-                npoints = iInterval - jInterval
+                
+                npoints=iInterval-jInterval
                 if(npoints > 0):
-                    (iInterval, jInterval) = (jInterval + 1, iInterval + 1)
-
+                    (iInterval,jInterval)=(jInterval+1,iInterval+1)
+                    
                 else:
-                    jInterval = iInterval
-                    iInterval = jInterval + 1
-
+                    jInterval=iInterval
+                    iInterval=jInterval+1
+                    
             else:
 
-                iInterval = iInterval - 1
-                jInterval = jInterval + 1
-
+                iInterval = iInterval-1
+                jInterval = jInterval+1
+                
         # else set index interval to B index interval
         else:
-
-            iInterval = iIntervalB
-            jInterval = jIntervalB
+            
+            iInterval=iIntervalB
+            jInterval=jIntervalB
 
         if(iInterval == jInterval):
-            if(x < ar[iInterval] and iInterval > 0):
-                iInterval = jInterval - 1
-            elif(jIntervalB < length - 1):
-                jInterval = iInterval + 1
+            if( x < ar[iInterval] and iInterval > 0 ):
+                iInterval=jInterval-1
+            elif( jIntervalB < length-1 ): 
+                jInterval=iInterval+1
 
         if(jInterval < iInterval):
-            npoints = jInterval - iInterval
+            npoints=jInterval-iInterval
             if(npoints > 2):
-                jInterval = iIntervalB
-                iInterval = jIntervalB
+                jInterval=iIntervalB
+                iInterval=jIntervalB
             else:
-                jInterval = iIntervalB
-                iInterval = jIntervalB + 1
-
-        # Since the lookup is linear, ensure that the result is in range
-        # [0..length)
-        iInterval = max(iInterval, 0)
-        jInterval = min(jInterval, length - 1)
+                jInterval=iIntervalB
+                iInterval=jIntervalB+1
 
-    # ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+        # Since the lookup is linear, ensure that the result is in range [0..length)
+        iInterval = max(iInterval,0)
+        jInterval = min(jInterval,length-1)
+            
+    #ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
     #
     # final checks
     #
-    # ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+    #ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
 
     # if jInteval < iInterval have a single point; set to iInterval
 
     if(jInterval < iInterval):
-        jInterval = iInterval
-
+        jInterval=iInterval
+        
     elif(jInterval < 0 and iInterval < 0):
         return None
-
+    
     # Reverse back if necessary
-    if direc == 'dec':
-        iInterval, jInterval = length - jInterval - 1, length - iInterval - 1
-
-    iReturn = iInterval
-    jReturn = jInterval + 1
+    if direc=='dec':
+        iInterval,jInterval = length-jInterval-1,length-iInterval-1
+    
+    iReturn=iInterval
+    jReturn=jInterval+1
 
-    return (iReturn, jReturn)
+    return (iReturn,jReturn)
 
-
-def lookupArray(ar, value):
+def lookupArray(ar,value):
     """Lookup value in array ar. Return index such that:
     (a) ar is monotonically increasing:
     value <= ar[index], index==0..len(ar)-1
@@ -563,46 +537,42 @@ def lookupArray(ar, value):
     value < ar[index], index==len(ar)
     """
     ar = numpy.ma.filled(ar)
-    ascending = (ar[0] < ar[-1]) or len(ar) == 1
+    ascending = (ar[0]<ar[-1]) or len(ar)==1
     if ascending:
-        index = numpy.searchsorted(ar, value)
+        index = numpy.searchsorted(ar,value)
     else:
         revar = ar[::-1]
-        index = numpy.searchsorted(revar, value)
-        if index < len(revar) and value == revar[index]:
-            index = len(ar) - index - 1
+        index = numpy.searchsorted(revar,value)
+        if index<len(revar) and value==revar[index]:
+            index = len(ar)-index-1
         else:
-            index = len(ar) - index
+            index = len(ar)-index
     return index
 
-# Lookup a value in a monotonic 1-D array. value is a scalar
-# Always returns a valid index for ar
-# def lookupArray(ar,value):
-# ascending = (ar[0]<ar[-1])
-# if ascending:
-# index = numpy.searchsorted(ar,value)
-# else:
-# index = numpy.searchsorted(ar[::-1],value)
-# index = len(ar)-index-1
-# index = max(index,0)
-# index = min(index,len(ar))
-# return index
+## # Lookup a value in a monotonic 1-D array. value is a scalar
+## # Always returns a valid index for ar
+## def lookupArray(ar,value):
+##     ascending = (ar[0]<ar[-1])
+##     if ascending:
+##         index = numpy.searchsorted(ar,value)
+##     else:
+##         index = numpy.searchsorted(ar[::-1],value)
+##         index = len(ar)-index-1
+##     index = max(index,0)
+##     index = min(index,len(ar))
+##     return index
 
 # Return true if vector vec1 is a subset of vec2, within tolerance tol.
 # Return second arg of index, if it is a subset
-
-
 def isSubsetVector(vec1, vec2, tol):
-    index = lookupArray(vec2, vec1[0])
-    if index > (len(vec2) - len(vec1)):
-        return (0, -1)                   # vec1 is too large, cannot be a subset
-    issubset = numpy.alltrue(
-    numpy.less(numpy.absolute(vec1 - vec2[index:index + len(vec1)]), tol))
+    index = lookupArray(vec2,vec1[0])
+    if index>(len(vec2)-len(vec1)):
+        return (0,-1)                   # vec1 is too large, cannot be a subset
+    issubset = numpy.alltrue(numpy.less(numpy.absolute(vec1-vec2[index:index+len(vec1)]),tol))
     if issubset:
-        return (issubset, index)
+        return (issubset,index)
     else:
-        return (0, -1)
-
+        return (0,-1)
 
 def isOverlapVector(vec1, vec2, atol=1.e-8):
     """Returns (isoverlap, index) where:
@@ -610,35 +580,32 @@ def isOverlapVector(vec1, vec2, atol=1.e-8):
     index is the index such that vec1[0]<=vec2[index]. If index==len(vec2),
     then vec1[0]>vec2[len(vec2)-1]
     """
-    index = lookupArray(vec2, vec1[0])
-    if index == 0 and abs(vec1[0] - vec2[0]):
-        return (0, index)
-    elif index == len(vec2):
-        return (1, index)
+    index = lookupArray(vec2,vec1[0])
+    if index==0 and abs(vec1[0]-vec2[0]):
+        return (0,index)
+    elif index==len(vec2):
+        return (1,index)
     else:
-        ar2 = vec2[index:index + len(vec1)]
+        ar2 = vec2[index:index+len(vec1)]
         ar1 = vec1[:len(ar2)]
         isoverlap = numpy.ma.allclose(ar1, ar2, atol=atol)
     if isoverlap:
-        return (isoverlap, index)
+        return (isoverlap,index)
     else:
-        return (0, index)
-
+        return (0,index)
 
 def allclose(ax1, ax2, rtol=1.e-5, atol=1.e-8):
     """True if all elements of axes ax1 and ax2 are close,
     in the sense of numpy.ma.allclose."""
-    return ((ax1 is ax2) or numpy.ma.allclose(ax1[:], ax2[:], rtol=rtol, atol=atol))
+    return ((ax1 is ax2) or numpy.ma.allclose(ax1[:],ax2[:],rtol=rtol,atol=atol))
 
-# AbstractAxis defines the common axis interface.
+# AbstractAxis defines the common axis interface. 
 # Concrete axis classes are derived from this class.
 
-
 class AbstractAxis(CdmsObj):
-
-    def __init__(self, parent, node):
-        CdmsObj.__init__(self, node)
-        val = self.__cdms_internals__ + ['id', ]
+    def __init__ (self, parent, node):
+        CdmsObj.__init__ (self, node)
+        val = self.__cdms_internals__ + ['id',]
         self.___cdms_internals__ = val
         self.parent = parent
         self.id = id
@@ -646,11 +613,11 @@ class AbstractAxis(CdmsObj):
         self._data_ = None
         # Cached wraparound values for circular axes
         self._doubledata_ = None
+        
+    def __str__ (self):
+        return string.join(self.listall(), "\n") + "\n"
 
-    def __str__(self):
-        return "\n".join(self.listall()) + "\n"
-
-    __repr__=__str__
+    __repr__ = __str__
 
     def __len__(self):
         raise CDMSError, MethodNotImplemented
@@ -659,7 +626,7 @@ class AbstractAxis(CdmsObj):
         return (len(self),)
 
     def _getdtype(self, name):
-        tc=self.typecode()
+        tc = self.typecode()
         return numpy.dtype(tc)
 
     def __getitem__(self, key):
@@ -681,17 +648,17 @@ class AbstractAxis(CdmsObj):
     # If persistent is true, write metadata to the container.
     def designateLatitude(self, persistent=0):
         if persistent:
-            self.axis="Y"
+            self.axis = "Y"
         else:
-            self.__dict__['axis']="Y"
+            self.__dict__['axis'] = "Y"
             self.attributes['axis']="Y"
 
     # Return true iff the axis is a latitude axis
     def isLatitude(self):
-        id=self.id.strip().lower()
-        if (hasattr(self, 'axis') and self.axis == 'Y'): return 1
-        units=getattr(self, "units", "").strip().lower()
-        if units in ["degrees_north", "degree_north", "degree_n", "degrees_n", "degreen", "degreesn"]:
+        id = self.id.strip().lower()
+        if (hasattr(self,'axis') and self.axis=='Y'): return 1
+        units = getattr(self,"units","").strip().lower()
+        if units in ["degrees_north","degree_north","degree_n","degrees_n","degreen","degreesn"]:
           return 1
         return (id[0:3] == 'lat') or (id in latitude_aliases)
 
@@ -699,25 +666,25 @@ class AbstractAxis(CdmsObj):
     # If persistent is true, write metadata to the container.
     def designateLevel(self, persistent=0):
         if persistent:
-            self.axis="Z"
+            self.axis = "Z"
         else:
-            self.__dict__['axis']="Z"
+            self.__dict__['axis'] = "Z"
             self.attributes['axis']="Z"
 
     # Return true iff the axis is a level axis
     def isLevel(self):
-        id=self.id.strip().lower()
-        if (hasattr(self, 'axis') and self.axis == 'Z'): return 1
-        if getattr(self, "positive", "").strip().lower() in ["up", "down"]:
+        id = self.id.strip().lower()
+        if (hasattr(self,'axis') and self.axis=='Z'): return 1
+        if getattr(self,"positive","").strip().lower() in ["up","down"]:
           return 1
         try:
-          # Ok let's see if this thing as pressure units
+          #Ok let's see if this thing as pressure units
           import genutil
-          p=genutil.udunits(1, "Pa")
-          units=getattr(self, 'units', "").strip()
+          p=genutil.udunits(1,"Pa")
+          units=getattr(self,'units',"").strip()
           p2=p.to(units)
           return 1
-        except Exception, err:
+        except Exception,err:
           pass
         return ((id[0:3] == 'lev') or (id[0:5] == 'depth') or (id in level_aliases))
 
@@ -726,30 +693,30 @@ class AbstractAxis(CdmsObj):
     # If modulo is defined, set as circular
     def designateLongitude(self, persistent=0, modulo=360.0):
         if persistent:
-            self.axis="X"
+            self.axis = "X"
             if modulo is None:
-                self.topology='linear'
+                self.topology = 'linear'
             else:
-                self.modulo=modulo
-                self.topology='circular'
+                self.modulo = modulo
+                self.topology = 'circular'
         else:
-            self.__dict__['axis']="X"
+            self.__dict__['axis'] = "X"
             self.attributes['axis']="X"
             if modulo is None:
-                self.__dict__['topology']='linear'
-                self.attributes['topology']='linear'
+                self.__dict__['topology'] = 'linear'
+                self.attributes['topology'] = 'linear'
             else:
-                self.__dict__['modulo']=modulo
-                self.__dict__['topology']='circular'
-                self.attributes['modulo']=modulo
-                self.attributes['topology']='circular'
+                self.__dict__['modulo'] = modulo
+                self.__dict__['topology'] = 'circular'
+                self.attributes['modulo'] = modulo
+                self.attributes['topology'] = 'circular'
 
     # Return true iff the axis is a longitude axis
     def isLongitude(self):
-        id=self.id.strip().lower()
-        if (hasattr(self, 'axis') and self.axis == 'X'): return 1
-        units=getattr(self, "units", "").strip().lower()
-        if units in ["degrees_east", "degree_east", "degree_e", "degrees_e", "degreee", "degreese"]:
+        id = self.id.strip().lower()
+        if (hasattr(self,'axis') and self.axis=='X'): return 1
+        units = getattr(self,"units","").strip().lower()
+        if units in ["degrees_east","degree_east","degree_e","degrees_e","degreee","degreese"]:
           return 1
         return (id[0:3] == 'lon') or (id in longitude_aliases)
 
@@ -757,65 +724,63 @@ class AbstractAxis(CdmsObj):
     # If persistent is true, write metadata to the container.
     def designateTime(self, persistent=0, calendar=None):
         if calendar is None:
-            calendar=cdtime.DefaultCalendar
+            calendar = cdtime.DefaultCalendar
         if persistent:
-            self.axis="T"
+            self.axis = "T"
             if calendar is not None:
                 self.setCalendar(calendar, persistent)
         else:
-            self.__dict__['axis']="T"
-            self.attributes['axis']="T"
+            self.__dict__['axis'] = "T"
+            self.attributes['axis'] = "T"
             if calendar is not None:
                 self.setCalendar(calendar, persistent)
 
     # For isTime(), keep track of whether each id is for a time axis or not, for better performance.
-    # This dictionary is a class variable (not a member of any particular
-    # instance).
-    idtaxis={}  # id:type where type is 'T' for time, 'O' for other
+    # This dictionary is a class variable (not a member of any particular instance).
+    idtaxis = {}  # id:type where type is 'T' for time, 'O' for other
 
     # Return true iff the axis is a time axis
     def isTime(self):
-        id=self.id.strip().lower()
-        if hasattr(self, 'axis'):
-            if self.axis == 'T': return 1
+        id = self.id.strip().lower()
+        if hasattr(self,'axis'):
+            if self.axis=='T': return 1
             elif self.axis is not None: return 0
         # Have we saved the id-to-axis type information already?
         if id in self.idtaxis:
-            if self.idtaxis[id] == 'T':
+            if self.idtaxis[id]=='T':
                 return 1
             else:
                 return 0
-        # Try to figure it out from units
+        ## Try to figure it out from units
         try:
           import genutil
-          units=getattr(self, "units", "").lower()
-          sp=units.split("since")
-          if len(sp) > 1:
-            t=genutil.udunits(1, "day")
-            s=sp[0].strip()
-            if s in t.available_units() and t.known_units()[s] == "TIME":
-              self.idtaxis[id]='T'
+          units=getattr(self,"units","").lower()
+          sp = units.split("since")
+          if len(sp)>1:
+            t=genutil.udunits(1,"day")
+            s = sp[0].strip()
+            if s in t.available_units() and t.known_units()[s]=="TIME":
+              self.idtaxis[id] = 'T'
               return 1
-            # try the plural version since udunits only as singular (day noy
-            # days)
-            s=s + "s"
-            if s in t.available_units() and t.known_units()[s] == "TIME":
-              self.idtaxis[id]='T'
+            #try the plural version since udunits only as singular (day noy days)
+            s=s+"s"
+            if s in t.available_units() and t.known_units()[s]=="TIME":
+              self.idtaxis[id] = 'T'
               return 1
         except:
           pass
-        # return (id[0:4] == 'time') or (id in time_aliases)
+        #return (id[0:4] == 'time') or (id in time_aliases)
         if (id[0:4] == 'time') or (id in time_aliases):
             self.idtaxis[id]='T'
             return 1
         else:
-            self.idtaxis[id]='O'
+            self.idtaxis[id] = 'O'
             return 0
 
     # Return true iff the axis is a forecast axis
     def isForecast(self):
-        id=self.id.strip().lower()
-        if (hasattr(self, 'axis') and self.axis == 'F'): return 1
+        id = self.id.strip().lower()
+        if (hasattr(self,'axis') and self.axis=='F'): return 1
         return (id[0:6] == 'fctau0') or (id in forecast_aliases)
     def isForecastTime(self):
         return self.isForecast()
@@ -825,15 +790,15 @@ class AbstractAxis(CdmsObj):
         if not hasattr(self, 'units'):
             raise CDMSError, "No time units defined"
         if calendar is None:
-            calendar=self.getCalendar()
+            calendar = self.getCalendar()
         if self.isForecast():
-            result=[forecast.comptime(t) for t in self[:]]
+            result = [ forecast.comptime(t) for t in self[:] ]
         else:
-            result=[]
+            result = []
             for val in self[:]:
                 result.append(cdtime.reltime(val, self.units).tocomp(calendar))
         return result
-
+    
     #
     #  mf 20010418 -- output DTGs (YYYYMMDDHH)
     #
@@ -841,22 +806,22 @@ class AbstractAxis(CdmsObj):
         "Array version of cdtime tocomp. Returns a list of component times in DTG format."
         if not hasattr(self, 'units'):
             raise CDMSError, "No time units defined"
-        result=[]
+        result = []
         if calendar is None:
-            calendar=self.getCalendar()
+            calendar = self.getCalendar()
         for val in self[:]:
             comptime=cdtime.reltime(val, self.units).tocomp(calendar)
             s=repr(comptime)
-            tt=s.split(' ')
-
-            ttt=tt[0].split('-')
+            tt=string.split(s,' ')
+        
+            ttt=string.split(tt[0],'-')
             yr=int(ttt[0])
             mo=int(ttt[1])
             da=int(ttt[2])
-
-            ttt=tt[1].split(':')
+        
+            ttt=string.split(tt[1],':')
             hr=int(ttt[0])
-            dtg="%04d%02d%02d%02d" % (yr, mo, da, hr)
+            dtg="%04d%02d%02d%02d"%(yr,mo,da,hr)
             result.append(dtg)
 
         return result
@@ -866,35 +831,27 @@ class AbstractAxis(CdmsObj):
         import datetime
         if not hasattr(self, 'units'):
             raise CDMSError, "No time units defined"
-        result=[]
+        result = []
         if calendar is None:
-            calendar=self.getCalendar()
+            calendar = self.getCalendar()
         for val in self[:]:
             c=cdtime.reltime(val, self.units).tocomp(calendar)
-            dtg=datetime.datetime(
-    c.year,
-     c.month,
-     c.day,
-     c.hour,
-     c.minute,
-     int(c.second),
-     int((c.second - int(c.second)) * 1000))
+            dtg = datetime.datetime(c.year,c.month,c.day,c.hour,c.minute,int(c.second),int((c.second-int(c.second))*1000))
             result.append(dtg)
         return result
 
-    def asRelativeTime(self, units=None):
+    def asRelativeTime( self, units=None ):
         "Array version of cdtime torel. Returns a list of relative times."
-        sunits=getattr(self, 'units', None)
-        if sunits is None or sunits == 'None':
+        sunits = getattr(self,'units',None)
+        if sunits==None or sunits=='None':
             raise CDMSError, "No time units defined"
-        if units is None or units == 'None':
+        if units==None or units=='None':
             units=sunits
         if self.isForecast():
-            result=[forecast.comptime(t).torel(units) for t in self[:]]
+            result = [ forecast.comptime(t).torel(units) for t in self[:] ]
         else:
-            cal=self.getCalendar()
-            result=[cdtime.reltime(t, sunits).torel(units, cal)
-                                     for t in self[:]]
+            cal = self.getCalendar()
+            result = [ cdtime.reltime(t,sunits).torel(units,cal) for t in self[:] ]
         return result
 
     def toRelativeTime(self, units, calendar=None):
@@ -903,35 +860,31 @@ class AbstractAxis(CdmsObj):
             raise CDMSError, "No time units defined"
         n=len(self[:])
         b=self.getBounds()
-        scal=self.getCalendar()
+        scal = self.getCalendar()
         if calendar is None:
-            calendar=scal
+            calendar = scal
         else:
             self.setCalendar(calendar)
         for i in range(n):
             tmp=cdtime.reltime(self[i], self.units).tocomp(scal)
-            tmp2=numpy.array(float(tmp.torel(units, calendar).value)).astype(
-                self[:].dtype.char)
-            # if i==1 : print
-            # self[:].dtype.char,'tmp2:',tmp2,tmp2.astype('f'),self[i],self[i].astype('f')
+            tmp2 = numpy.array(float(tmp.torel(units, calendar).value)).astype(self[:].dtype.char)
+            ## if i==1 : print self[:].dtype.char,'tmp2:',tmp2,tmp2.astype('f'),self[i],self[i].astype('f')
             self[i]=tmp2
             if b is not None:
-                tmp=cdtime.reltime(b[i, 0], self.units).tocomp(scal)
-                b[i, 0]=numpy.array(
-                    float(tmp.torel(units, calendar).value)).astype(b.dtype.char)
-                tmp=cdtime.reltime(b[i, 1], self.units).tocomp(scal)
-                b[i, 1]=numpy.array(
-                    float(tmp.torel(units, calendar).value)).astype(b.dtype.char)
+                tmp=cdtime.reltime(b[i,0], self.units).tocomp(scal)
+                b[i,0]=numpy.array(float(tmp.torel(units, calendar).value)).astype(b.dtype.char)
+                tmp=cdtime.reltime(b[i,1], self.units).tocomp(scal)
+                b[i,1]=numpy.array(float(tmp.torel(units, calendar).value)).astype(b.dtype.char)
         if b is not None:
             self.setBounds(b)
         self.units=units
         return
 
-# mfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmf
+#mfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmf
 #
 # mf 20010412 -- test if an Axis is intrinsically circular
 #
-# mfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmf
+#mfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmf
 
 
     # Return true iff the axis wraps around
@@ -939,22 +892,22 @@ class AbstractAxis(CdmsObj):
     # (1) self.topology=='circular', or
     # (2) self.topology is undefined, and the axis is a longitude
     def isCircularAxis(self):
-
-        if hasattr(self, 'topology'):
-            iscircle=(self.topology == 'circular')
+        
+        if hasattr(self,'topology'):
+            iscircle = (self.topology=='circular')
         elif self.isLongitude():
-            iscircle=1
+            iscircle = 1
         else:
-            iscircle=0
+            iscircle = 0
 
         return iscircle
 
 
-# mfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmf
+#mfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmf
 #
 # mf 20010405 -- test if an transient Axis is REALLY circular
 #
-# mfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmf
+#mfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmf
 
 
     # Return true iff the axis wraps around
@@ -963,45 +916,45 @@ class AbstractAxis(CdmsObj):
     # (2) self.topology is undefined, and the axis is a longitude
     def isCircular(self):
 
-        if hasattr(self, 'realtopology'):
-            if self.realtopology == 'circular': return 1
-            elif self.realtopology == 'linear': return 0
+        if hasattr(self,'realtopology'):
+            if self.realtopology=='circular': return 1
+            elif self.realtopology=='linear': return 0
         if(len(self) < 2):
             return 0
-
-        baxis=self[0]
-        eaxis=self[-1]
-        deltaend=self[-1] - self[-2]
-        eaxistest=eaxis + deltaend - baxis
+        
+        baxis = self[0]
+        eaxis = self[-1]
+        deltaend = self[-1] - self[-2]
+        eaxistest = eaxis + deltaend - baxis
 
         cycle=self.getModuloCycle()
 
-        tol=0.01 * deltaend
+        tol=0.01*deltaend
 
         test=0
         if(abs(eaxistest - cycle) < tol): test=1
-
-        if hasattr(self, 'topology') and test == 1:
-            iscircle=(self.topology == 'circular')
+        
+        if hasattr(self,'topology') and test == 1:
+            iscircle = (self.topology=='circular')
         elif (self.isLongitude() and test == 1):
-            iscircle=1
+            iscircle = 1
         else:
-            iscircle=0
+            iscircle = 0
 
         # save realtopology attribute in __dict__, don't write it to the file
-        if iscircle == 1: self.__dict__['realtopology']='circular'
-        elif iscircle == 0: self.__dict__['realtopology']='linear'
+        if iscircle==1:  self.__dict__['realtopology'] = 'circular'
+        elif iscircle==0: self.__dict__['realtopology'] = 'linear'
         return iscircle
 
     def designateCircular(self, modulo, persistent=0):
         if persistent:
-            self.topology='circular'
-            self.modulo=modulo
+            self.topology = 'circular'
+            self.modulo = modulo
         else:
-            self.__dict__['topology']='circular'
-            self.__dict__['modulo']=modulo
-            self.attributes['modulo']=modulo
-            self.attributes['topology']='linear'
+            self.__dict__['topology'] = 'circular'
+            self.__dict__['modulo'] = modulo
+            self.attributes['modulo'] = modulo
+            self.attributes['topology'] = 'linear'
 
     def isLinear(self):
         raise CDMSError, MethodNotImplemented
@@ -1048,62 +1001,62 @@ class AbstractAxis(CdmsObj):
     # or None. If the axis does not have a calendar attribute, return the global
     # calendar.
     def getCalendar(self):
-        if hasattr(self, 'calendar'):
-            calendar=self.calendar.lower()
+        if hasattr(self,'calendar'):
+            calendar = string.lower(self.calendar)
         else:
-            calendar=None
+            calendar = None
 
-        cdcal=tagToCalendar.get(calendar, cdtime.DefaultCalendar)
+        cdcal = tagToCalendar.get(calendar, cdtime.DefaultCalendar)
         return cdcal
 
     # Set the calendar
     def setCalendar(self, calendar, persistent=1):
         if persistent:
-            self.calendar=calendarToTag.get(calendar, None)
+            self.calendar = calendarToTag.get(calendar, None)
             self.attributes['calendar']=self.calendar
             if self.calendar is None:
                 raise CDMSError, InvalidCalendar % calendar
         else:
-            self.__dict__['calendar']=calendarToTag.get(calendar, None)
+            self.__dict__['calendar'] = calendarToTag.get(calendar, None)
             self.attributes['calendar']=self.calendar
             if self.__dict__['calendar'] is None:
                 raise CDMSError, InvalidCalendar % calendar
 
     def getData(self):
         raise CDMSError, MethodNotImplemented
-
+ 
     # Return the entire array
     def getValue(self):
         return self.__getitem__(slice(None))
 
-    def assignValue(self, data):
-        self.__setitem__(slice(None), data)
+    def assignValue(self,data):
+        self.__setitem__(slice(None),data)
 
     def _time2value(self, value):
         """ Map value of type comptime, reltime, or string of form "yyyy-mm-dd hh:mi:ss" to value"""
         if self.isTime():
             if type(value) in CdtimeTypes:
-                value=value.torel(self.units, self.getCalendar()).value
-            elif isinstance(value, basestring) and value not in [':', unspecified]:
-                cal=self.getCalendar()
-                value=cdtime.s2c(value, cal).torel(self.units, cal).value
+                value = value.torel(self.units, self.getCalendar()).value
+            elif type(value) is types.StringType and value not in [':',unspecified]:
+                cal = self.getCalendar()
+                value = cdtime.s2c(value, cal).torel(self.units, cal).value
         return value
 
 
     def getModuloCycle(self):
 
-        if hasattr(self, 'modulo'):
-            cycle=self.modulo
+        if hasattr(self,'modulo'):
+            cycle = self.modulo
             #
             # mf 20010419 test if attribute is a string (non CF), set to 360.0
             #
-            if isinstance(cycle, basestring):
-                cycle=360.0
+            if(type(cycle) == types.StringType):
+                cycle = 360.0
         else:
-            cycle=360.0
+            cycle = 360.0
 
         if isinstance(cycle, numpy.ndarray):
-            cycle=cycle[0]
+            cycle = cycle[0]
 
         return(cycle)
 
@@ -1115,7 +1068,7 @@ class AbstractAxis(CdmsObj):
 
         return(self.getModuloCycle())
 
-    def mapInterval(self, interval, indicator='ccn', cycle=None):
+    def mapInterval(self,interval,indicator='ccn',cycle=None):
         """
         Map coordinate interval to index interval. interval has one of the forms:
 
@@ -1146,216 +1099,210 @@ class AbstractAxis(CdmsObj):
         Note: if the interval is interior to the axis, but does not span any
         axis element, a singleton (i,i+1) indicating an adjacent index is returned.
         """
-        i, j, k=self.mapIntervalExt(interval, indicator, cycle)
-        j=min(j, i + len(self))
-        # i=i-1
-        return (i, j)
+        i,j,k = self.mapIntervalExt(interval,indicator,cycle)
+        j = min(j, i+len(self))
+        #i=i-1
+        return (i,j)
 
 
-# mfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmf
+#mfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmf
 #
 # mf 20010308 - 20010412 -- general handing of wrapping
 #
-# mfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmf
+#mfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmfmf
 
-    def mapIntervalExt(
-        self, interval, indicator='ccn', cycle=None, epsilon=None):
+    def mapIntervalExt(self,interval,indicator='ccn',cycle=None,epsilon=None):
         """Like mapInterval, but returns (i,j,k) where k is stride,
         and (i,j) is not restricted to one cycle."""
 
         # nCycleMax : max number of cycles a user a specify in wrapping
 
         nCycleMax=6
-
+        
         # interval is None returns the full interval
-        if interval is None or interval == ':':
+        if interval is None or interval==':':
             return (0, len(self), 1)
 
         # Allow intervals of the same form as getRegion.
-        if len(interval) == 3:
-            x, y, indicator=interval
-            interval=(x, y)
-        elif len(interval) == 4:
-            x, y, indicator, cycle=interval
-            interval=(x, y)
+        if len(interval)==3:
+            x,y,indicator = interval
+            interval = (x,y)
+        elif len(interval)==4:
+            x,y,indicator,cycle = interval
+            interval = (x,y)
 
         # check length of indicator if overridden by user
         #
 
-        indicator=indicator.lower()
-        if len(indicator) == 2: indicator += 'n'
+        indicator = string.lower(indicator)
+        if len(indicator)==2: indicator += 'n'
 
-        if((len(indicator) != 3) or
-               ((indicator[0] != 'c' and indicator[0] != 'o') or
+        if( ( len(indicator) != 3 ) or
+               ( (indicator[0] != 'c' and indicator[0] != 'o') or
                  (indicator[1] != 'c' and indicator[1] != 'o') or
                  (indicator[2] != 'n' and indicator[2] != 'b' and indicator[2] != 's' and
                   indicator[2] != 'e')
                  )
             ):
             raise CDMSError, "EEE: 3-character interval/intersection indicator incomplete or incorrect = "\
-                 + indicator
-
+                 +indicator
+       
         if self._data_ is None:
-            self._data_=self.getData()
+            self._data_ = self.getData()
 
-        # ttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt
+        #ttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt
         # Handle time types
-        interval=(
-    self._time2value(interval[0]),
-     self._time2value(interval[1]))
+        interval = (self._time2value(interval[0]), self._time2value(interval[1]))
 
         # If the interval is reversed wrt self, reverse the interval and
         # set the stride to -1
-        if (interval[0] <= interval[1]) == (self[0] <= self[-1]):
+        if (interval[0]<=interval[1])==(self[0]<=self[-1]):
             stride=1
         else:
             stride=-1
-            interval=(interval[1], interval[0])
-            indicator=indicator[1] + indicator[0] + indicator[2]
+            interval = (interval[1],interval[0])
+            indicator = indicator[1]+indicator[0]+indicator[2]
 
-        # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
+        #mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
         #
         # basic test for wrapping - is axis REALLY circular?
         #
-        # ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+        #ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
 
-        xind=indicator[0]
-        yind=indicator[1]
-        iind=indicator[2]
+        xind = indicator[0]
+        yind = indicator[1]
+        iind = indicator[2]
 
-        xi, yi=interval
+        xi,yi = interval
 
-        length=len(self)
-        ar=self[:]
-        ar0=ar[0]
-        arn=ar[-1]
-        armin=min(ar0, arn)
-        armax=max(ar0, arn)
+        length = len(self)
+        ar = self[:]
+        ar0 = ar[0]
+        arn = ar[-1]
+        armin = min(ar0,arn)
+        armax = max(ar0,arn)
 
         # Wrapped if circular and at least one value is outside the axis range.
-        wraptest1=self.isCircular()
-        wraptest2=not ((armin <= xi <= armax) and (armin <= yi <= armax))
-
+        wraptest1 = self.isCircular()
+        wraptest2 = not ((armin <= xi <= armax) and (armin <= yi <= armax))
+        
         if (wraptest1 and wraptest2):
 
             #
-            # find cycle and calc # of cycles in the interval
+            #  find cycle and calc # of cycles in the interval
             #
-
+            
             cycle=self.getModulo()
+            
+            intervalLength=yi-xi
+            intervalCycles=intervalLength/cycle
+            
+            bd = self.getBounds()
+            
+            nPointsCycle = len(ar)
 
-            intervalLength=yi - xi
-            intervalCycles=intervalLength / cycle
-
-            bd=self.getBounds()
-
-            nPointsCycle=len(ar)
-
-            ar0=ar[0]
-            ar1=ar[-1]
+            ar0 = ar[0]
+            ar1 = ar[-1]
 
             #
             # test for reversed coordinates
             #
+            
+            if ar0>ar1:
+                cycle = -1 * abs(cycle)
 
-            if ar0 > ar1:
-                cycle=-1 * abs(cycle)
-
-            # eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+            #eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
             #
             #  make sure xi<yi and shift to positive axis indices
             #
-            # eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-
+            #eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+            
             # Ensure that xi<yi
-
-            if cycle > 0 and yi < xi: xi, yi=yi, xi
-            if cycle < 0 and yi > xi: xi, yi=yi, xi
+            
+            if cycle>0 and yi<xi: xi,yi = yi,xi
+            if cycle<0 and yi>xi: xi,yi = yi,xi
 
             # calculate the number of cycles to shift to positive side
+            
+            nCycleShift=numpy.floor((xi-ar0)/cycle)
+            xp = xi - cycle * nCycleShift
+            yp = xp + intervalLength
 
-            nCycleShift=numpy.floor((xi - ar0) / cycle)
-            xp=xi - cycle * nCycleShift
-            yp=xp + intervalLength
-
-            # Extend the data vector with wraparound number of cycles in
-            # interval and shifts
-
-            nCycle=int(intervalCycles + 1.0 + 0.5) + abs(nCycleShift)
-
+            # Extend the data vector with wraparound number of cycles in interval and shifts
 
+            nCycle = int(intervalCycles + 1.0 + 0.5) + abs(nCycleShift)
+            
+                
             #
             # check if nCycle is > nCycleMax
             #
             if(nCycle >= nCycleMax):
                 raise CDMSError, InvalidNCycles + repr(nCycle)
 
-            self._doubledata_=numpy.concatenate((ar, ar + cycle))
+            self._doubledata_ = numpy.concatenate(( ar, ar + cycle ))
             k=2
-            while(k < nCycle):
-                self._doubledata_=numpy.concatenate(
-                    (self._doubledata_, ar + k * cycle))
-                k=k + 1
+            while(k<nCycle):
+                self._doubledata_ = numpy.concatenate(( self._doubledata_, ar + k*cycle ) )
+                k=k+1
 
             # Map the canonical coordinate interval (xp,yp) in the 'extended' data array
             # create axis to get the bounds array
 
-            bigar=self._doubledata_
+            bigar = self._doubledata_
             bigarAxis=createAxis(bigar)
-            bd=bigarAxis.getBounds()
+            bd = bigarAxis.getBounds()
             if bd is None:              # In case autobounds is off
-                bd=bigarAxis.genGenericBounds()
+                bd = bigarAxis.genGenericBounds()
 
             # run the more general mapLinearExt to get the indices
-
-            indexInterval=mapLinearExt(
-                bigar, bd, (xp, yp), indicator, wrapped=1)
+            
+            indexInterval= mapLinearExt(bigar,bd,(xp,yp),indicator,wrapped=1)
 
             #
             # check to make sure we got an interval
             #
-
+            
             if(indexInterval is None):
                 return None
 
-            i, j=indexInterval
+            i,j=indexInterval
 
             #
             #  now shift i back
             #
 
-            i=i + int(nCycleShift * float(nPointsCycle))
+            i = i + int(nCycleShift*float(nPointsCycle))
 
-            #
+            #   
             #  adjust the length of the output interval by the indicator
             #  mapLinear does the calc correctly, we have to modify because we
             #  are overriding with the (float)(number of cycles) in the interval
             #
-
-            j=j + int(nCycleShift * float(nPointsCycle))
-            retval=(i, j)
-
+            
+            j = j + int(nCycleShift*float(nPointsCycle))
+            retval = (i,j)
+            
         else:
-            bd=self.getBounds()
+            bd = self.getBounds()
             if bd is None:              # In case autobounds is off
-                bd=self.genGenericBounds()
-            retval=mapLinearExt(ar, bd, interval, indicator)
+                bd = self.genGenericBounds()
+            retval = mapLinearExt(ar, bd, interval, indicator)
 
         if retval is not None:
-            i, j=retval
-            if stride == -1:
+            i,j = retval
+            if stride==-1:
                 if(j == length):
-                    i, j=j - 1, i - 1
+                    i,j=j-1,i-1
                 else:
-                    i, j=j - 1, i - 1
-                if j == -1:
+                    i,j=j-1,i-1
+                if j==-1:
                     j=None
 
-            retval=(i, j, stride)
+            retval = (i,j,stride)
 
         return retval
 
-    def subaxis(self, i, j, k=1, wrap=True):
+    def subaxis(self,i,j,k=1, wrap=True):
         """Create a transient axis for the index slice [i:j:k]
         The stride k can be positive or negative. Wraparound is
         supported for longitude dimensions or those with a modulus attribute.
@@ -1364,80 +1311,80 @@ class AbstractAxis(CdmsObj):
         fullBounds = self.getBounds(isGeneric)
         _debug=0
         _debugprefix="SS__XX subaxis "
-
+        
 
         # Handle wraparound
-        modulo=None
-        size=len(self)
-
+        modulo = None
+        size = len(self)
+        
         #----------------------------------------------------------------------
-        # mf 20010328 negative stride i >= vice i >
+        # mf 20010328 negative stride i >= vice i > 
         #----------------------------------------------------------------------
-
-        if wrap and ((k > 0 and j > size) or (k < 0 and i >= size)) and self.isCircular():
-            modulo=self.getModuloCycle()
+        
+        if wrap and ((k>0 and j>size) or (k<0 and i >= size)) and self.isCircular():
+            modulo = self.getModuloCycle()
 
         if modulo is not None:
             # If self is decreasing and stride is positive,
             # or self is increasing and stride is negative, subtract the modulus,
             # otherwise add it.
-            if (self[0] > self[-1]) == (k > 0):
-                modulo=-modulo
+            if (self[0]>self[-1])==(k>0):
+                modulo = -modulo
 
             #----------------------------------------------------------------------
             #
             #  mf 20010329 -- N vice two slice scheme (more general)
             #
-            #------------------------------------------------------------------
+            #----------------------------------------------------------------------
 
             donew=1
 
             if(donew):
 
-                sn=splitSliceExt(slice(i, j, k), size)
-                if(_debug): print "SSSS1-------------------- ", sn, len(sn)
+                sn = splitSliceExt(slice(i,j,k),size)
+                if(_debug): print "SSSS1-------------------- ",sn,len(sn)
 
-                for kk in range(0, len(sn)):
+                for kk in range(0,len(sn)):
                     sl=sn[kk]
-                    if(_debug): print "SSSSSSSS kk = ", kk, sl
-                    part=self[sl] + kk * modulo
-                    if(_debug): print "SSSSSSSSSSSSSSS modulo", part[0], part[-1], modulo
+                    if(_debug): print "SSSSSSSS kk = ",kk,sl
+                    part = self[sl] + kk*modulo
+                    if(_debug): print "SSSSSSSSSSSSSSS modulo",part[0],part[-1],modulo
                     if(kk == 0):
-                        data=part
+                        data = part
                     else:
-                        data=numpy.concatenate((data, part))
+                        data = numpy.concatenate((data,part))
 
                     if fullBounds is not None:
-                        bound=fullBounds[sl] + kk * modulo
+                        bound = fullBounds[sl] + kk*modulo
                         if (kk == 0):
-                            bounds=bound
+                            bounds = bound
                         else:
-                            bounds=numpy.concatenate((bounds, bound))
+                            bounds = numpy.concatenate((bounds,bound))
                     else:
-                        bounds=None
-
-
+                        bounds = None
+                        
+            
             else:
-
-                s1, s2=splitSlice(slice(i, j, k), size)
-                if(_debug): print "SSSS0: original ", s1, s2
-
-                part1=self[s1]
-                part2=self[s2] + modulo
-                if(_debug): print "SSSSSSSSSSSSSSS modulo", self[0], self[-1], modulo
-                data=numpy.concatenate((part1, part2))
+                
+                s1, s2 = splitSlice(slice(i,j,k),size)
+                if(_debug): print "SSSS0: original ",s1,s2
+                
+                part1 = self[s1]
+                part2 = self[s2]+modulo
+                if(_debug): print "SSSSSSSSSSSSSSS modulo",self[0],self[-1],modulo
+                data = numpy.concatenate((part1,part2))
                 if fullBounds is not None:
-                    bounds1=fullBounds[s1]
-                    bounds2=fullBounds[s2] + modulo
-                    bounds=numpy.concatenate((bounds1, bounds2))
+                    bounds1 = fullBounds[s1]
+                    bounds2 = fullBounds[s2]+modulo
+                    bounds = numpy.concatenate((bounds1,bounds2))
                 else:
-                    bounds=None
-
+                    bounds = None
+            
 
         else:                           # no wraparound
-            data=self[i:j:k]
+            data = self[i:j:k]
             if fullBounds is not None:
-                bounds=fullBounds[i:j:k]
+                bounds = fullBounds[i:j:k]
             else:
                 bounds = None
         
@@ -1449,85 +1396,76 @@ class AbstractAxis(CdmsObj):
         if self.isTime(): newaxis.designateTime()
 
         for attname in self.attributes.keys():
-            if attname not in ["datatype", "length", "isvar", "name_in_file", "partition", "partition_length"]:
+            if attname not in ["datatype", "length","isvar","name_in_file","partition","partition_length"]:
                 setattr(newaxis, attname, getattr(self, attname))
-                newaxis.attributes[attname]=getattr(self, attname)
+                newaxis.attributes[attname]=getattr(self,attname)
 
         # Change circular topology to linear if a strict subset was copied
-        if hasattr(self, "topology") and self.topology == "circular" and len(newaxis) < len(self):
+        if hasattr(self,"topology") and self.topology=="circular" and len(newaxis)<len(self):
             newaxis.topology="linear"
 
         return newaxis
-
+    
 #----------------------------------------------------------------------
 # mf 2001 set calls to subAxis as subaxis
 #----------------------------------------------------------------------
 
-    subAxis=subaxis
+    subAxis = subaxis
 
     def typecode(self):
         raise CDMSError, MethodNotImplemented
 
-    # Check that a boundary array is valid, raise exception if not. bounds is
-    # an array of shape (n,2)
-    def validateBounds(self, bounds):
-        requiredShape=(len(self), 2)
-        requiredShape2=(len(self) + 1,)
-        if bounds.shape != requiredShape and bounds.shape != requiredShape2:
+    # Check that a boundary array is valid, raise exception if not. bounds is an array of shape (n,2)
+    def validateBounds(self,bounds):
+        requiredShape = (len(self),2)
+        requiredShape2 = (len(self)+1,)
+        if bounds.shape!=requiredShape and bounds.shape!=requiredShape2:
             raise CDMSError, InvalidBoundsArray + \
-                 'shape is %s, should be %s or %s' % (
-    `bounds.shape`,
-     `requiredShape`,
-     `requiredShape2`)
-        if bounds.shape == requiredShape2:  # case of "n+1" bounds
+                 'shape is %s, should be %s or %s'%(`bounds.shape`,`requiredShape`,`requiredShape2`)
+        if bounds.shape==requiredShape2: # case of "n+1" bounds
             bounds2=numpy.zeros(requiredShape)
-            bounds2[:, 0]=bounds[:-1]
-            bounds2[:, 1]=bounds[1::]
+            bounds2[:,0]=bounds[:-1]
+            bounds2[:,1]=bounds[1::]
             bounds=bounds2
-        mono=(bounds[0, 0] <= bounds[0, 1])
+        mono = (bounds[0,0]<=bounds[0,1])
         if mono:
             for i in range(bounds.shape[0]):
-                if not bounds[i, 0] <= self[i] <= bounds[i, 1]:
+                if not bounds[i,0]<=self[i]<=bounds[i,1]:
                     raise CDMSError, InvalidBoundsArray + \
-'bounds[%i]=%f is not in the range [%f,%f]' % (
-    i, self[i], bounds[i, 0], bounds[i, 1])
+'bounds[%i]=%f is not in the range [%f,%f]'%(i,self[i],bounds[i,0],bounds[i,1])
         else:
             for i in range(bounds.shape[0]):
-                if not bounds[i, 0] >= self[i] >= bounds[i, 1]:
+                if not bounds[i,0]>=self[i]>=bounds[i,1]:
                     raise CDMSError, InvalidBoundsArray + \
-'bounds[%i]=%f is not in the range [%f,%f]' % (
-    i, self[i], bounds[i, 1], bounds[i, 0])
+'bounds[%i]=%f is not in the range [%f,%f]'%(i,self[i],bounds[i,1],bounds[i,0])
         return bounds
 
-    # Generate bounds from midpoints. width is the width of the zone if the
-    # axis has one value.
+    # Generate bounds from midpoints. width is the width of the zone if the axis has one value.
     def genGenericBounds(self, width=1.0):
         if self._data_ is None:
-            self._data_=self.getData()
-        ar=self._data_
-        if len(self) > 1:
-            leftPoint=numpy.array([1.5 * ar[0] - 0.5 * ar[1]])
-            midArray=(ar[0:-1] + ar[1:]) / 2.0
-            rightPoint=numpy.array([1.5 * ar[-1] - 0.5 * ar[-2]])
-            bnds=numpy.concatenate((leftPoint, midArray, rightPoint))
+            self._data_ = self.getData()
+        ar = self._data_
+        if len(self)>1:
+            leftPoint = numpy.array([1.5*ar[0]-0.5*ar[1]])
+            midArray = (ar[0:-1]+ar[1:])/2.0
+            rightPoint = numpy.array([1.5*ar[-1]-0.5*ar[-2]])
+            bnds = numpy.concatenate((leftPoint,midArray,rightPoint))
         else:
-            delta=width / 2.0
-            bnds=numpy.array([self[0] - delta, self[0] + delta])
+            delta = width/2.0
+            bnds = numpy.array([self[0]-delta,self[0]+delta])
 
         # Transform to (n,2) array
-        retbnds=numpy.zeros((len(ar), 2), numpy.float)
-        retbnds[:, 0]=bnds[:-1]
-        retbnds[:, 1]=bnds[1:]
+        retbnds = numpy.zeros((len(ar),2),numpy.float)
+        retbnds[:,0] = bnds[:-1]
+        retbnds[:,1] = bnds[1:]
 
         if self.isLatitude():
-            retbnds[0, :]=numpy.maximum(
-    -90.0, numpy.minimum(90.0, retbnds[0, :]))
-            retbnds[-1, :]=numpy.maximum(
-    -90.0, numpy.minimum(90.0, retbnds[-1, :]))
+            retbnds[0,:] = numpy.maximum(-90.0, numpy.minimum(90.0,retbnds[0,:]))
+            retbnds[-1,:] = numpy.maximum(-90.0, numpy.minimum(90.0,retbnds[-1,:]))
 
         return retbnds
 
-    def clone(self, copyData=1):
+    def clone (self, copyData=1):
         """clone (self, copyData=1)
         Return a copy of self as a transient axis.
         If copyData is 1, make a separate copy of the data."""
@@ -1536,8 +1474,8 @@ class AbstractAxis(CdmsObj):
         if copyData==1:
             mycopy = createAxis(copy.copy(self[:]))
         else:
-            mycopy=createAxis(self[:])
-        mycopy.id=self.id
+            mycopy = createAxis(self[:])
+        mycopy.id = self.id
         try:
             mycopy.setBounds(b, isGeneric=isGeneric[0])
         except CDMSError:
@@ -1547,104 +1485,102 @@ class AbstractAxis(CdmsObj):
            setattr(mycopy, k, v)
         return mycopy
 
-    def listall(self, all=None):
+    def listall (self, all=None):
         "Get list of info about this axis."
-        aname=self.id
-        result=[]
+        aname = self.id
+        result = []
         result.append('   id: ' + aname)
         if self.isLatitude(): result.append('   Designated a latitude axis.')
         if self.isLongitude(): result.append('   Designated a longitude axis.')
         if self.isTime(): result.append('   Designated a time axis.')
         if self.isLevel(): result.append('   Designated a level axis.')
         try:
-            units=self.units
+            units = self.units
             result.append('   units:  ' + units)
         except:
             pass
-        d=self.getValue()
+        d = self.getValue()
         result.append('   Length: ' + str(len(d)))
         result.append('   First:  ' + str(d[0]))
         result.append('   Last:   ' + str(d[-1]))
-        flag=1
+        flag = 1
         for k in self.attributes.keys():
             if k in std_axis_attributes: continue
             if flag:
                 result.append('   Other axis attributes:')
-                flag=0
-            result.append('      ' + k + ': ' + str(self.attributes[k]))
+                flag = 0
+            result.append('      '+k+': '+str(self.attributes[k]))
         result.append('   Python id:  %s' % hex(id(self)))
 
         if all:
             result.append("   Values:")
             result.append(str(d))
-            b=self.getBounds()
+            b = self.getBounds()
             result.append("   Bounds:")
             result.append(str(b))
         return result
 
     def info(self, flag=None, device=None):
         "Write info about axis; include dimension values and weights if flag"
-        if device is None: device=sys.stdout
+        if device is None: device = sys.stdout
         device.write(str(self))
 
     def isVirtual(self):
         "Return true iff coordinate values are implicitly defined."
         return 0
 
-    shape=property(_getshape, None)
-    dtype=_getdtype
+    shape = property(_getshape,None)
+    dtype = _getdtype
 
-# PropertiedClasses.set_property(AbstractAxis, 'shape',
-# AbstractAxis._getshape, nowrite=1, nodelete=1)
-# PropertiedClasses.set_property(AbstractAxis, 'dtype',
-# AbstractAxis._getdtype, nowrite=1, nodelete=1)
-# internattr.add_internal_attribute (AbstractAxis, 'id', 'parent')
+## PropertiedClasses.set_property(AbstractAxis, 'shape', 
+##                         AbstractAxis._getshape, nowrite=1, nodelete=1)
+## PropertiedClasses.set_property(AbstractAxis, 'dtype', 
+##                         AbstractAxis._getdtype, nowrite=1, nodelete=1)
+## internattr.add_internal_attribute (AbstractAxis, 'id', 'parent')
 
 # One-dimensional coordinate axis in a dataset
 class Axis(AbstractAxis):
-    def __init__(self, parent, axisNode=None):
+    def __init__(self,parent,axisNode=None):
         if axisNode is not None and axisNode.tag != 'axis':
                raise CDMSError, 'Creating axis, node is not an axis node.'
         AbstractAxis.__init__(self, parent, axisNode)
         if axisNode is not None:
             if axisNode.partition is not None:
-                flatpart=axisNode.partition
-                self.__dict__['partition']=numpy.reshape(
-    flatpart, (len(flatpart) / 2, 2))
+                flatpart = axisNode.partition
+                self.__dict__['partition']=numpy.reshape(flatpart,(len(flatpart)/2,2))
                 self.attributes['partition']=self.partition
-        self.id=axisNode.id
-
+        self.id = axisNode.id
+    
     def typecode(self):
         return cdmsNode.CdToNumericType.get(self._node_.datatype)
 
     # Handle slices of the form x[i], x[i:j:k], x[(slice(i,j,k),)], and x[...]
     def __getitem__(self, key):
-        node=self._node_
-        length=len(node)
+        node = self._node_
+        length = len(node)
 
         # Allow key of form (slice(i,j),) etc.
-        if isinstance(key, tuple) and len(key) == 1:
-            key=key[0]
+        if type(key) is types.TupleType and len(key)==1:
+            key = key[0]
 
-        if isinstance(key, (int, numpy.int, numpy.int32)):  # x[i]
-            if key >= length:
+        if isinstance(key, (types.IntType, numpy.int,numpy.int32)):  # x[i]
+            if key>=length:
                 raise IndexError, 'index out of bounds'
             else:
-                # Don't generate the entire array (if linear) just for one
-                # value
-                return node.data[key % length]
-        elif isinstance(key, slice):  # x[i:j:k]
+                # Don't generate the entire array (if linear) just for one value
+                return node.data[key%length]
+        elif type(key) is types.SliceType: # x[i:j:k]
             if self._data_ is None:
-                self._data_=node.getData()
+                self._data_ = node.getData()
             return self._data_[key.start:key.stop:key.step]
-        elif isinstance(key, Ellipsis.__class__):  # x[...]
+        elif type(key) is types.EllipsisType: # x[...]
             if self._data_ is None:
-                self._data_=node.getData()
+                self._data_ = node.getData()
             return self._data_
-        elif isinstance(key, tuple):
-            raise IndexError, 'axis is one-dimensional'
+        elif type(key) is types.TupleType:
+            raise IndexError,'axis is one-dimensional'
         else:
-            raise IndexError, 'index must be an integer: %s' % `key`
+            raise IndexError,'index must be an integer: %s'%`key`
 
     # Get axis data
     def getData(self):
@@ -1653,7 +1589,7 @@ class Axis(AbstractAxis):
     # Handle slices of the form x[i:j]
     def __getslice__(self, low, high):
         if self._data_ is None:
-            self._data_=self.getData()
+            self._data_ = self.getData()
         return self._data_[low:high]
 
     def __len__(self):
@@ -1661,7 +1597,7 @@ class Axis(AbstractAxis):
 
     # Return true iff the axis representation is linear
     def isLinear(self):
-        return self._node_.dataRepresent == cdmsNode.CdLinear
+        return self._node_.dataRepresent==cdmsNode.CdLinear
 
     # Return the bounds array, or generate a default if autoBounds mode is on
     def getBounds(self, isGeneric=None):
@@ -1686,26 +1622,26 @@ class Axis(AbstractAxis):
 
     # Return the bounds array, or None
     def getExplicitBounds(self):
-        boundsArray=None
-        if hasattr(self, 'bounds'):
-            boundsName=self.bounds
+        boundsArray = None
+        if hasattr(self,'bounds'):
+            boundsName = self.bounds
             try:
-                boundsVar=self.parent.variables[boundsName]
-                boundsArray=numpy.ma.filled(boundsVar.getSlice())
+                boundsVar = self.parent.variables[boundsName]
+                boundsArray = numpy.ma.filled(boundsVar.getSlice())
             except KeyError:
-                boundsArray=None
+                boundsArray = None
 
         return boundsArray
 
     def getCalendar(self):
-        if hasattr(self, 'calendar'):
-            calendar=self.calendar.lower()
+        if hasattr(self,'calendar'):
+            calendar = string.lower(self.calendar)
         elif self.parent is not None and hasattr(self.parent, 'calendar'):
-            calendar=self.parent.calendar.lower()
+            calendar = string.lower(self.parent.calendar)
         else:
-            calendar=None
+            calendar = None
 
-        cdcal=tagToCalendar.get(calendar, cdtime.DefaultCalendar)
+        cdcal = tagToCalendar.get(calendar, cdtime.DefaultCalendar)
         return cdcal
 
 # In-memory coordinate axis
@@ -1717,38 +1653,38 @@ class TransientAxis(AbstractAxis):
         '''
         AbstractAxis.__init__(self, None, None)
         if id is None:
-            TransientAxis.axis_count=TransientAxis.axis_count + 1
-            id='axis_' + str(TransientAxis.axis_count)
+            TransientAxis.axis_count = TransientAxis.axis_count + 1
+            id = 'axis_' + str(TransientAxis.axis_count)
         if attributes is None:
-            if hasattr(data, 'attributes'): attributes=data.attributes
+            if hasattr(data, 'attributes'): attributes = data.attributes
         if attributes is not None:
             for name, value in attributes.items():
                 if name not in ['missing_value', 'name']:
                     setattr(self, name, value)
-        self.id=id
+        self.id = id
         if isinstance(data, AbstractAxis):
             if copy == 0:
-                self._data_=data[:]
+                self._data_ = data[:]
             else:
-                self._data_=numpy.array(data[:])
+                self._data_ = numpy.array(data[:])
         elif isinstance(data, numpy.ndarray):
             if copy == 0:
-                self._data_=data
+                self._data_ = data
             else:
-                self._data_=numpy.array(data)
+                self._data_ = numpy.array(data)
         elif isinstance(data, numpy.ma.MaskedArray):
             if numpy.ma.getmask(data) is not numpy.ma.nomask:
                 raise CDMSError, \
                       'Cannot construct an axis with a missing value.'
-            data=data.data
+            data = data.data
             if copy == 0:
-                self._data_=data
+                self._data_ = data
             else:
-                self._data_=numpy.array(data)
+                self._data_ = numpy.array(data)
         elif data is None:
-            self._data_=None
+            self._data_ = None
         else:
-            self._data_=numpy.array(data)
+            self._data_ = numpy.array(data)
 
         self._doubledata_ = None
         self._genericBounds_ = genericBounds
@@ -1761,10 +1697,10 @@ class TransientAxis(AbstractAxis):
         return self._data_[low:high]
 
     def __setitem__(self, index, value):
-        self._data_[index]=numpy.ma.filled(value)
+        self._data_[index] = numpy.ma.filled(value)
 
     def __setslice__(self, low, high, value):
-        self._data_[low:high]=numpy.ma.filled(value)
+        self._data_[low:high] = numpy.ma.filled(value)
 
     def __len__(self):
         return len(self._data_)
@@ -1799,22 +1735,19 @@ class TransientAxis(AbstractAxis):
     def setBounds(self, bounds, persistent=0, validate=0, index=None, boundsid=None, isGeneric=False):
         if bounds is not None:
             if isinstance(bounds, numpy.ma.MaskedArray):
-                bounds=numpy.ma.filled(bounds)
+                bounds = numpy.ma.filled(bounds)
             if validate:
-                bounds=self.validateBounds(bounds)
+                bounds = self.validateBounds(bounds)
             else:                       # Just do the absolute minimum validation
-                requiredShape=(len(self), 2)
-                requiredShape2=(len(self) + 1,)
-                if bounds.shape != requiredShape and bounds.shape != requiredShape2:
+                requiredShape = (len(self),2)
+                requiredShape2 = (len(self)+1,)
+                if bounds.shape!=requiredShape and bounds.shape!=requiredShape2:
                     raise CDMSError, InvalidBoundsArray + \
-                          'shape is %s, should be %s or %s' % (
-    `bounds.shape`,
-     `requiredShape`,
-     `requiredShape2`)
-                if bounds.shape == requiredShape2:  # case of "n+1" bounds
+                          'shape is %s, should be %s or %s'%(`bounds.shape`,`requiredShape`,`requiredShape2`)
+                if bounds.shape==requiredShape2: # case of "n+1" bounds
                     bounds2=numpy.zeros(requiredShape)
-                    bounds2[:, 0]=bounds[:-1]
-                    bounds2[:, 1]=bounds[1::]
+                    bounds2[:,0]=bounds[:-1]
+                    bounds2[:,1]=bounds[1::]
                     bounds=bounds2
             self._bounds_ = copy.copy(bounds)
             self._genericBounds_ = isGeneric
@@ -1823,7 +1756,7 @@ class TransientAxis(AbstractAxis):
                 self._bounds_ = self.genGenericBounds()
                 self._genericBounds_ = True
             else:
-                self._bounds_=None
+                self._bounds_ = None
 
     def isLinear(self):
         return 0
@@ -1838,17 +1771,17 @@ class TransientVirtualAxis(TransientAxis):
 
     def __init__(self, axisname, axislen):
         TransientAxis.__init__(self, None, id=axisname)
-        self._virtualLength=axislen  # length of the axis
+        self._virtualLength = axislen # length of the axis
 
     def __len__(self):
         return self._virtualLength
 
-    def __str__(self):
-        return "<TransientVirtualAxis %s(%d)>" % (self.id, self._virtualLength)
+    def __str__ (self):
+        return "<TransientVirtualAxis %s(%d)>"%(self.id, self._virtualLength)
 
-    __repr__=__str__
+    __repr__ = __str__
 
-    def clone(self, copyData=1):
+    def clone (self, copyData=1):
         """clone (self, copyData=1)
         Return a copy of self as a transient virtual axis.
         If copyData is 1, make a separate copy of the data."""
@@ -1866,7 +1799,7 @@ class TransientVirtualAxis(TransientAxis):
 
     def setBounds(self, bounds, isGeneric=False):
         "No boundaries on virtual axes"
-        self._bounds_=None
+        self._bounds_ = None
 
     def __getitem__(self, key):
         return self.getData()[key]
@@ -1874,84 +1807,79 @@ class TransientVirtualAxis(TransientAxis):
     def __getslice__(self, low, high):
         return self.getData()[low:high]
 
-# PropertiedClasses.initialize_property_class (TransientVirtualAxis)
+## PropertiedClasses.initialize_property_class (TransientVirtualAxis)
 
 # One-dimensional coordinate axis in a CdmsFile.
 class FileAxis(AbstractAxis):
-
+    
     def __init__(self, parent, axisname, obj=None):
-        AbstractAxis.__init__(self, parent, None)
-        val=self.__cdms_internals__ + ['name_in_file', ]
-        self.___cdms_internals__=val
-        self.id=axisname
-        self._obj_=obj
+        AbstractAxis.__init__ (self, parent, None)
+        val = self.__cdms_internals__ +['name_in_file',]
+        self.___cdms_internals__ = val
+        self.id = axisname
+        self._obj_ = obj
         # Overshadows file boundary data, if not None
-        self._boundsArray_=None
-        (units, typecode, name_in_file, parent_varname,
-         dimtype, ncid)=parent._file_.dimensioninfo[axisname]
-        self.__dict__['_units']=units
-        att=self.attributes
+        self._boundsArray_ = None
+        (units,typecode,name_in_file,parent_varname,dimtype,ncid) = \
+                   parent._file_.dimensioninfo[axisname]
+        self.__dict__['_units'] = units
+        att = self.attributes
         att['units']=units
-        self.attributes=att
-        self.name_in_file=self.id
+        self.attributes = att
+        self.name_in_file = self.id
         if name_in_file:
-            self.name_in_file=name_in_file
+            self.name_in_file = name_in_file
         # Combine the attributes of the variable object, if any
         if obj is not None:
             for attname in self._obj_.__dict__.keys():
-                attval=getattr(self._obj_, attname)
-                if not callable(attval):
-                    self.__dict__[attname]=attval
-                    att=self.attributes
+                attval = getattr(self._obj_,attname)
+                if type(attval)!=types.BuiltinFunctionType:
+                    self.__dict__[attname]  = attval
+                    att = self.attributes
                     att[attname]=attval
-                    self.attributes=att
-
+                    self.attributes= att
+        
     def getData(self):
-        if cdmsobj._debug == 1:
-            print 'Getting array for axis', self.id
+        if cdmsobj._debug==1:
+            print 'Getting array for axis',self.id
         if self.parent is None:
             raise CDMSError, FileWasClosed + self.id
         try:
-            result=self.parent._file_.readDimension(self.id)
+            result = self.parent._file_.readDimension(self.id)
         except:
             try:
-                result=apply(self._obj_.getitem, (slice(None, None),))
+                result = apply(self._obj_.getitem, (slice(None,None),))
             except:
-                raise CDMSError, 'Data for dimension %s not found' % self.id
+                raise CDMSError,'Data for dimension %s not found'%self.id
         return result
 
     def typecode(self):
         if self.parent is None:
             raise CDMSError, FileWasClosed + self.id
-        (units, typecode, name_in_file, parent_varname,
-         dimtype, ncid)=self.parent._file_.dimensioninfo[self.id]
+        (units,typecode,name_in_file,parent_varname,dimtype,ncid) = \
+                             self.parent._file_.dimensioninfo[self.id]
         return typecode
-
+    
     def _setunits(self, value):
-        self._units=value
+        self._units = value
         self.attributes['units']=value
         if self.parent is None:
             raise CDMSError, FileWasClosed + self.id
         setattr(self._obj_, 'units', value)
-        (units, typecode, name_in_file, parent_varname,
-         dimtype, ncid)=self.parent._file_.dimensioninfo[self.id]
-        self.parent._file_.dimensioninfo[self.id]=(
-    value,
-     typecode,
-     name_in_file,
-     parent_varname,
-     dimtype,
-     ncid)
+        (units,typecode,name_in_file,parent_varname,dimtype,ncid) = \
+            self.parent._file_.dimensioninfo[self.id]
+        self.parent._file_.dimensioninfo[self.id] = \
+                  (value,typecode,name_in_file,parent_varname,dimtype,ncid)
     def _getunits(self):
         return self._units
 
     def _delunits(self):
         del(self._units)
         del(self.attributes['units'])
-        delattr(self._obj_, 'units')
+        delattr(self._obj_,'units')
 
 
-    def __getattr__(self, name):
+    def __getattr__(self,name):
         if name == 'units':
             return self._units
         try:
@@ -1959,27 +1887,27 @@ class FileAxis(AbstractAxis):
         except:
             raise AttributeError
     # setattr writes external attributes to the file
-    def __setattr__(self, name, value):
+    def __setattr__ (self, name, value):
         if name == 'units':
             self._setunits(value)
             return
         if hasattr(self, 'parent') and self.parent is None:
             raise CDMSError, FileWasClosed + self.id
-# s = self.get_property_s (name)
-# if s is not None:
-# s(self, name, value)
-# return
-        if not name in self.__cdms_internals__ and name[0] != '_':
+##         s = self.get_property_s (name)
+##         if s is not None:
+##             s(self, name, value)
+##             return
+        if not name in self.__cdms_internals__ and name[0]!='_':
             setattr(self._obj_, name, value)
             self.attributes[name]=value
-        self.__dict__[name]=value
+        self.__dict__[name]  = value
 
     # delattr deletes external global attributes in the file
     def __delattr__(self, name):
-# d = self.get_property_d(name)
-# if d is not None:
-# d(self, name)
-# return
+##         d = self.get_property_d(name)
+##         if d is not None:
+##             d(self, name)
+##             return
         if name == "units":
             self._delunits()
             return
@@ -1994,84 +1922,83 @@ class FileAxis(AbstractAxis):
 
     # Read data
     # If the axis has a related Cdunif variable object, just read that variable
-    # otherwise, cache the Cdunif (read-only) data values in self._data_. in this case,
-    # the axis is not extensible, so it is not necessary to reread it each
-    # time.
+    # otherwise, cache the Cdunif (read-only) data values in self._data_. in this case, 
+    # the axis is not extensible, so it is not necessary to reread it each time.
     def __getitem__(self, key):
         if self.parent is None:
             raise CDMSError, FileWasClosed + self.id
         # See __getslice__ comment below.
-        if (self._obj_ is not None) and (self.parent._mode_ != 'r') and not (hasattr(self.parent, 'format') and self.parent.format == "DRS"):
+        if (self._obj_ is not None) and (self.parent._mode_!='r') and not (hasattr(self.parent,'format') and self.parent.format=="DRS"):
             # For negative strides, get the equivalent slice with positive stride,
             # then reverse the result.
-            if (isinstance(key, slice)) and (key.step is not None) and key.step < 0:
-                posslice=reverseSlice(key, len(self))
-                result=apply(self._obj_.getitem, (posslice,))
+            if (type(key) is types.SliceType) and (key.step is not None) and key.step<0:
+                posslice = reverseSlice(key,len(self))
+                result = apply(self._obj_.getitem, (posslice,))
                 return result[::-1]
             else:
-                if isinstance(key, int) and key >= len(self):
-                    raise IndexError, 'Index out of bounds: %d' % key
-                if not isinstance(key, tuple):
-                    key=(key,)
+                if isinstance(key, types.IntType) and key>=len(self):
+                    raise IndexError, 'Index out of bounds: %d'%key
+                if type(key) is not types.TupleType:
+                    key = (key,)
                 return apply(self._obj_.getitem, key)
         if self._data_ is None:
-            self._data_=self.getData()
-        length=len(self._data_)
-        if isinstance(key, int):  # x[i]
-            if key >= length:
+            self._data_ = self.getData()
+        length = len(self._data_)
+        if isinstance(key, types.IntType):  # x[i]
+            if key>=length:
                 raise IndexError, 'index out of bounds'
             else:
-                return self._data_[key % length]
-        elif isinstance(key, slice):  # x[i:j:k]
+                return self._data_[key%length]
+        elif type(key) is types.SliceType: # x[i:j:k]
             return self._data_[key.start:key.stop:key.step]
-        elif isinstance(key, Ellipsis.__class__):  # x[...]
+        elif type(key) is types.EllipsisType: # x[...]
             return self._data_
-        elif isinstance(key, tuple):
-            raise IndexError, 'axis is one-dimensional'
+        elif type(key) is types.TupleType:
+            raise IndexError,'axis is one-dimensional'
         else:
-            raise IndexError, 'index must be an integer or slice: %s' % `key`
+            raise IndexError,'index must be an integer or slice: %s'%`key`
 
     def __getslice__(self, low, high):
         # Hack to prevent netCDF overflow error on 64-bit architectures
-        high=min(Max32int, high)
-
+        high = min(Max32int, high)
+        
         # Hack to fix a DRS bug: force use of readDimension for DRS axes.
         # Since DRS is read-only here, it is OK just to cache all dimensions.
         if self.parent is None:
             raise CDMSError, FileWasClosed + self.id
-        if (self._obj_ is not None) and (self.parent._mode_ != 'r') and not (hasattr(self.parent, 'format') and self.parent.format == "DRS"):
-            return apply(self._obj_.getslice, (low, high))
+        if (self._obj_ is not None) and (self.parent._mode_!='r') and not (hasattr(self.parent,'format') and self.parent.format=="DRS"):
+            return apply(self._obj_.getslice,(low,high))
         else:
             if self._data_ is None:
-                self._data_=self.getData()
+                self._data_ = self.getData()
             return self._data_[low:high]
 
     def __setitem__(self, index, value):
         if self._obj_ is None:
             raise CDMSError, ReadOnlyAxis + self.id
         if self.parent is None:
-            raise CDMSError, FileWasClosed + self.id
-        return apply(self._obj_.setitem, (index, numpy.ma.filled(value)))
+            raise CDMSError, FileWasClosed+self.id
+        return apply(self._obj_.setitem,(index,numpy.ma.filled(value)))
 
     def __setslice__(self, low, high, value):
         # Hack to prevent netCDF overflow error on 64-bit architectures
-        high=min(Max32int, high)
+        high = min(Max32int, high)
         if self._obj_ is None:
             raise CDMSError, ReadOnlyAxis + self.id
         if self.parent is None:
-            raise CDMSError, FileWasClosed + self.id
-        return apply(self._obj_.setslice, (low, high, numpy.ma.filled(value)))
+            raise CDMSError, FileWasClosed+self.id
+        return apply(self._obj_.setslice,(low,high,numpy.ma.filled(value)))
 
     def __len__(self):
         if self.parent is None:
             raise CDMSError, FileWasClosed + self.id
         if self._obj_ is not None:
-            length=len(self._obj_)
+            length = len(self._obj_)
         elif self._data_ is None:
-            self._data_=self.getData()
-            length=len(self._data_)
+            self._data_ = self.getData()
+            length = len(self._data_)
         else:
-            length=len(self._data_)
+            length = len(self._data_)
         return length
 
     def isLinear(self):
@@ -2098,18 +2025,18 @@ class FileAxis(AbstractAxis):
     # Return the bounds array, or None
     def getExplicitBounds(self):
         if self._boundsArray_ is None:
-            boundsArray=None
-            if hasattr(self, 'bounds'):
-                boundsName=self.bounds
+            boundsArray = None
+            if hasattr(self,'bounds'):
+                boundsName = self.bounds
                 try:
-                    boundsVar=self.parent[boundsName]
-                    boundsArray=numpy.ma.filled(boundsVar)
-                    self._boundsArray_=boundsArray  # for climatology performance
-                except KeyError, err:
+                    boundsVar = self.parent[boundsName]
+                    boundsArray = numpy.ma.filled(boundsVar)
+                    self._boundsArray_ = boundsArray  # for climatology performance
+                except KeyError,err:
                     print err
-                    boundsArray=None
+                    boundsArray = None
         else:
-            boundsArray=self._boundsArray_
+            boundsArray = self._boundsArray_
 
         return boundsArray
 
@@ -2125,58 +2052,54 @@ class FileAxis(AbstractAxis):
         if persistent:
             if index is None:
                 if validate:
-                    bounds=self.validateBounds(bounds)
-                index=0
+                    bounds = self.validateBounds(bounds)
+                index = 0
 
             # Create the bound axis, if necessary
-            file=self.parent
+            file = self.parent
             if file._boundAxis_ is None:
 
                 # First look for 'bound' of length two
-                if file.axes.has_key("bound") and len(file.axes["bound"]) == 2:
-                    file._boundAxis_=file.axes["bound"]
+                if file.axes.has_key("bound") and len(file.axes["bound"])==2:
+                    file._boundAxis_ = file.axes["bound"]
                 else:
-                    file._boundAxis_=file.createVirtualAxis("bound", 2)
+                    file._boundAxis_ = file.createVirtualAxis("bound",2)
 
             # Create the boundary variable if necessary
-            if hasattr(self, 'bounds'):
-                boundName=self.bounds
-                boundVar=file.variables[boundName]
+            if hasattr(self,'bounds'):
+                boundName = self.bounds
+                boundVar = file.variables[boundName]
             else:
                 if boundsid is None:
-                    boundName="bounds_" + self.id
+                    boundName = "bounds_"+self.id
                 else:
-                    boundName=boundsid
-                boundVar=file.createVariable(
-    boundName,
-     cdmsNode.NumericToCdType.get(bounds.dtype.char),
-     (self,
-     file._boundAxis_))
+                    boundName = boundsid
+                boundVar = file.createVariable(boundName, cdmsNode.NumericToCdType.get(bounds.dtype.char), (self,file._boundAxis_))
                 # And link to self
-                self.bounds=boundName
-                self._boundsArray_=None
+                self.bounds = boundName
+                self._boundsArray_ = None
 
-            boundVar[index:index + len(bounds)]=bounds
+            boundVar[index:index+len(bounds)] = bounds
 
         else:
-            self._boundsArray_=copy.copy(bounds)
+            self._boundsArray_ = copy.copy(bounds)
 
     def getCalendar(self):
-        if hasattr(self, 'calendar'):
-            calendar=self.calendar.lower()
+        if hasattr(self,'calendar'):
+            calendar = string.lower(self.calendar)
         elif self.parent is not None and hasattr(self.parent, 'calendar'):
-            calendar=self.parent.calendar.lower()
+            calendar = string.lower(self.parent.calendar)
         else:
-            calendar=None
+            calendar = None
 
-        cdcal=tagToCalendar.get(calendar, cdtime.DefaultCalendar)
+        cdcal = tagToCalendar.get(calendar, cdtime.DefaultCalendar)
         return cdcal
 
     def isVirtual(self):
         "Return true iff coordinate values are implicitly defined."
 
         # No virtual axes in GrADS files
-        if self.parent is not None and hasattr(self.parent, 'format') and self.parent.format == 'GRADS':
+        if self.parent is not None and hasattr(self.parent, 'format') and self.parent.format=='GRADS':
             return 0
         return (self._obj_ is None)
 
@@ -2186,11 +2109,11 @@ class FileAxis(AbstractAxis):
             return (self.parent._file_.dimensions[self.id] is None)
         else:
             return False
-# PropertiedClasses.set_property (FileAxis, 'units',
-# acts=FileAxis._setunits,
-# nodelete=1
-# )
-# internattr.add_internal_attribute(FileAxis, 'name_in_file')
+## PropertiedClasses.set_property (FileAxis, 'units', 
+##                                 acts=FileAxis._setunits,
+##                                 nodelete=1
+##                                )
+## internattr.add_internal_attribute(FileAxis, 'name_in_file')
 
 class FileVirtualAxis(FileAxis):
     """An axis with no explicit representation of data values in the file.
@@ -2202,8 +2125,8 @@ class FileVirtualAxis(FileAxis):
 
     def __init__(self, parent, axisname, axislen):
         FileAxis.__init__(self, parent, axisname)
-        self._virtualLength=axislen  # length of the axis
-
+        self._virtualLength = axislen # length of the axis
+        
     def __len__(self):
         return self._virtualLength
 
@@ -2214,100 +2137,100 @@ class FileVirtualAxis(FileAxis):
         "Return true iff coordinate values are implicitly defined."
         return 1
 
-# PropertiedClasses.initialize_property_class (FileVirtualAxis)
+## PropertiedClasses.initialize_property_class (FileVirtualAxis)
 
-# Functions for selecting axes
-def axisMatchAxis(axes, specifications=None, omit=None, order=None):
-    """Given a list of axes and a specification or list of
+######## Functions for selecting axes
+def axisMatchAxis (axes, specifications=None, omit=None, order=None):
+    """Given a list of axes and a specification or list of 
      specificatons, and a specification or list of specifications
-     of those axes to omit, return a list of
-     those axes in the list that match the specification but
-     do not include in the list any axes that matches an omit
+     of those axes to omit, return a list of 
+     those axes in the list that match the specification but 
+     do not include in the list any axes that matches an omit 
      specification.
 
      If specifications is None, include all axes less the omitted ones.
 
-     Individual specifications must be integer indices into axes or
+     Individual specifications must be integer indices into axes or 
      matching criteria as detailed in axisMatches.
 
      Axes are returned in the order they occur in the axes argument unless
-     order is given.
+     order is given. 
 
-     order can be a string containing the symbols t,x,y,z, or -.
-     If a - is given, any elements of the result not chosen otherwise are
+     order can be a string containing the symbols t,x,y,z, or -. 
+     If a - is given, any elements of the result not chosen otherwise are 
      filled in from left to right with remaining candidates.
     """
     return [axes[i] for i in \
             axisMatchIndex(axes, specifications, omit, order)]
 
-def axisMatchIndex(axes, specifications=None, omit=None, order=None):
-    """Given a list of axes and a specification or list of
+def axisMatchIndex (axes, specifications=None, omit=None, order=None):
+    """Given a list of axes and a specification or list of 
      specificatons, and a specification or list of specifications
-     of those axes to omit, return a list of the indices of
-     those axes in the list that match the specification but
-     do not include in the list any axes that matches an omit
+     of those axes to omit, return a list of the indices of 
+     those axes in the list that match the specification but 
+     do not include in the list any axes that matches an omit 
      specification.
 
      If specifications is None, include all axes less the omitted ones.
 
-     Individual specifications must be integer indices into axes or
+     Individual specifications must be integer indices into axes or 
      matching criteria as detailed in axisMatches.
 
      The indices of axes are returned in the order the axes
      occur in the axes argument, unless order is given.
 
-     order can be a string containing the symbols t,x,y,z, or -.
-     If a - is given, any elements of the result not chosen otherwise are
+     order can be a string containing the symbols t,x,y,z, or -. 
+     If a - is given, any elements of the result not chosen otherwise are 
      filled in from left to right with remaining candidates.
     """
     if specifications is None:
-        speclist=axes
-    elif isinstance(specifications, basestring):
-        speclist=[specifications]
-    elif isinstance(specifications, list):
-        speclist=specifications
-    elif isinstance(specifications, tuple):
+        speclist = axes
+    elif isinstance(specifications, types.StringType):
+        speclist = [specifications]
+    elif isinstance(specifications, types.ListType):
+        speclist = specifications
+    elif isinstance(specifications, types.TupleType):
         speclist=list(specifications)
-    elif isinstance(specifications, int):
-        speclist=[specifications]
-    elif callable(specifications):
-        speclist=[specifications]
-    else:  # to allow arange, etc.
-        speclist=list(numpy.ma.filled(specifications))
-
-    candidates=[]
+    elif isinstance(specifications, types.IntType):
+        speclist = [specifications]
+    elif isinstance(specifications, types.FunctionType):
+        speclist = [specifications]
+    else: # to allow arange, etc.
+        speclist = list(numpy.ma.filled(specifications))
+
+    candidates = []
     for i in range(len(axes)):
         for s in speclist:
-            if isinstance(s, int):
-                r=(s == i)
+            if isinstance(s, types.IntType):
+                r = (s == i)
             else:
-                r=axisMatches(axes[i], s)
+                r = axisMatches(axes[i], s)
             if r:
                 candidates.append(i)
                 break
 
     if not candidates:
-        return candidates  # list empty
+        return candidates   #list empty
 
     if omit is None:
-        omitlist=[]
-    elif isinstance(omit, basestring):
-        omitlist=[omit]
-    elif isinstance(omit, list):
-        omitlist=omit
-    elif isinstance(omit, tuple):
+        omitlist = []
+    elif isinstance(omit, types.StringType):
+        omitlist = [omit]
+    elif isinstance(omit, types.ListType):
+        omitlist = omit
+    elif isinstance(omit, types.TupleType):
         omitlist=list(omit)
-    elif isinstance(omit, int):
-        omitlist=[omit]
-    elif callable(omit):
-        omitlist=[omit]
+    elif isinstance(omit, types.IntType):
+        omitlist = [omit]
+    elif isinstance(omit, types.FunctionType):
+        omitlist = [omit]
     elif isinstance(omit, AbstractAxis):
-        omitlist=[omit]
+        omitlist = [omit]
     else:
         raise CDMSError, 'Unknown type of omit specifier.'
 
     for s in omitlist:
-        if isinstance(s, int):
+        if isinstance(s, types.IntType):
             for i in range(len(candidates)):
                 if axes[candidates[i]] is axes[s]:
                     del candidates[i]
@@ -2315,11 +2238,11 @@ def axisMatchIndex(axes, specifications=None, omit=None, order=None):
         elif isinstance(s, AbstractAxis):
             for i in range(len(candidates)):
                 if s is axes[candidates[i]]:
-                    del candidates[i]
+                    del candidates[i] 
                     break
         else:
             for i in range(len(candidates)):
-                r=axisMatches(axes[candidates[i]], s)
+                r = axisMatches(axes[candidates[i]], s)
                 if r:
                     del candidates[i]
                     break
@@ -2327,31 +2250,31 @@ def axisMatchIndex(axes, specifications=None, omit=None, order=None):
     if order is None:
         return candidates
 
-    n=len(candidates)
-    m=len(order)
-    result=[None] * n
+    n = len(candidates)
+    m = len(order)
+    result = [None]*n
 # this loop is done this way for future escapes where elements of order
 # are not single chars.
-    j=0
-    io=0
+    j = 0
+    io = 0
     while j < n:
         if j >= m or order[io] == '-':
-            result[j]=candidates[0]
+            result[j] = candidates[0]
             del candidates[0]
             j += 1
             io += 1
             continue
         elif order[j] == 't':
-            oj='time'
+            oj = 'time'
             io += 1
         elif order[j] == 'x':
-            oj='longitude'
+            oj = 'longitude'
             io += 1
         elif order[j] == 'y':
-            oj='latitude'
+            oj = 'latitude'
             io += 1
         elif order[j] == 'z':
-            oj='level'
+            oj = 'level'
             io += 1
         else:
             # later could put in escaped ids or indices
@@ -2359,21 +2282,21 @@ def axisMatchIndex(axes, specifications=None, omit=None, order=None):
 
         for i in range(n):
             if axisMatches(axes[candidates[i]], oj):
-                result[j]=candidates[i]
+                result[j] = candidates[i]
                 del candidates[i]
                 break
         else:
             raise CDMSError, "Axis requested in order specification not there"
-        j += 1
+        j += 1    
     return result
-
+            
 
 def axisMatches(axis, specification):
     """Return 1 or 0 depending on whether axis matches the specification.
        Specification must be one of:
-       1. a string representing an axis id or one of
-          the keywords time, fctau0, latitude or lat, longitude or lon, or
-          lev or level.
+       1. a string representing an axis id or one of 
+          the keywords time, fctau0, latitude or lat, longitude or lon, or 
+          lev or level. 
 
           axis may be surrounded with parentheses or spaces.
 
@@ -2385,20 +2308,20 @@ def axisMatches(axis, specification):
           if the value returned is true, the axis matches.
 
        3. an axis object; will match if it is the same object as axis.
-    """
+    """   
     if isinstance(specification, basestring):
-        s=specification.lower()
-        s=s.strip()
+        s = string.lower(specification)
+        s = s.strip()
         while s[0] == '(':
             if s[-1] != ')':
                 raise CDMSError, 'Malformed axis spec, ' + specification
-            s=s[1:-1].strip()
-        if axis.id.lower() == s:
+            s = s[1:-1].strip()
+        if string.lower(axis.id) == s:
             return 1
         elif (s == 'time') or (s in time_aliases):
-            return axis.isTime()
+            return axis.isTime() 
         elif (s == 'fctau0') or (s in forecast_aliases):
-            return axis.isForecast()
+            return axis.isForecast() 
         elif (s[0:3] == 'lat') or (s in latitude_aliases):
             return axis.isLatitude()
         elif (s[0:3] == 'lon') or (s in longitude_aliases):
@@ -2408,11 +2331,11 @@ def axisMatches(axis, specification):
         else:
             return 0
 
-    elif callable(specification):
-        r=specification(axis)
-        if r:
+    elif isinstance(specification, types.FunctionType):
+        r = specification(axis)
+        if r: 
             return 1
-        else:
+        else: 
             return 0
 
     elif isinstance(specification, AbstractAxis):
@@ -2420,26 +2343,26 @@ def axisMatches(axis, specification):
 
     raise CDMSError, "Specification not acceptable: "\
           + str(type(specification)) + ', ' + str(specification)
-
+    
 def concatenate(axes, id=None, attributes=None):
     """Concatenate the axes, return a transient axis."""
-
-    data=numpy.ma.concatenate([ax[:] for ax in axes])
-    boundsArray=[ax.getBounds() for ax in axes]
+    
+    data = numpy.ma.concatenate([ax[:] for ax in axes])
+    boundsArray = [ax.getBounds() for ax in axes]
     if None in boundsArray:
-        bounds=None
+        bounds = None
     else:
-        bounds=numpy.ma.concatenate(boundsArray)
+        bounds = numpy.ma.concatenate(boundsArray)
     return TransientAxis(data, bounds=bounds, id=id, attributes=attributes)
 
 def take(ax, indices):
     """Take values indicated by indices list, return a transient axis."""
 
     # Bug in ma compatibility module
-    data=numpy.ma.take(ax[:], indices)
-    abounds=ax.getBounds()
+    data = numpy.ma.take(ax[:], indices)
+    abounds = ax.getBounds()
     if abounds is not None:
-        bounds=numpy.ma.take(abounds, indices, axis=0)
+        bounds = numpy.ma.take(abounds, indices, axis=0)
     else:
-        bounds=None
+        bounds = None
     return TransientAxis(data, bounds=bounds, id=ax.id, attributes=ax.attributes)
diff --git a/Packages/cdms2/Lib/bindex.py b/Packages/cdms2/Lib/bindex.py
index 913d6fdbd..9156c9709 100644
--- a/Packages/cdms2/Lib/bindex.py
+++ b/Packages/cdms2/Lib/bindex.py
@@ -1,11 +1,9 @@
-# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
-# Further modified to be pure new numpy June 24th 2008
+## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by 
+## Further modified to be pure new numpy June 24th 2008
 
 """Bin index for non-rectilinear grids"""
 
-import _bindex
-import numpy
-
+import _bindex, numpy 
 
 def bindexHorizontalGrid(latlin, lonlin):
     """Create a bin index for a horizontal grid.
@@ -14,16 +12,14 @@ def bindexHorizontalGrid(latlin, lonlin):
 
     Returns the index.
     """
-    lonlin = numpy.mod(lonlin, 360)
-    NI, NJ = _bindex.getLens()
-    head = numpy.zeros(NI * NJ, dtype='l')
-                       # This should match NBINI, NBINJ in bindex.c
-    next = numpy.zeros(len(latlin), dtype='l')
+    lonlin = numpy.mod(lonlin,360)
+    NI,NJ = _bindex.getLens()
+    head = numpy.zeros(NI*NJ,dtype='l')       # This should match NBINI, NBINJ in bindex.c
+    next = numpy.zeros(len(latlin),dtype='l')
     _bindex.bindex(latlin, lonlin, head, next)
-
+    
     return (head, next)
 
-
 def intersectHorizontalGrid(latspecs, lonspecs, latlin, lonlin, index):
     """Intersect a horizontal grid with a lat-lon region.
 
@@ -35,7 +31,7 @@ def intersectHorizontalGrid(latspecs, lonspecs, latlin, lonlin, index):
     Returns an array of indices, in latlin/lonlin, of the points in
     the intersection.
     """
-    points = numpy.zeros(len(latlin), dtype='l')
+    points = numpy.zeros(len(latlin),dtype='l')
     if latspecs is None:
         slat = -90.0
         elat = 90.0
@@ -45,14 +41,14 @@ def intersectHorizontalGrid(latspecs, lonspecs, latlin, lonlin, index):
         elat = latspecs[1]
         latopt = latspecs[2]
 
-    if slat > elat:
+    if slat>elat:
         tmp = slat
         slat = elat
         elat = tmp
 
     # If the longitude range is >=360.0, just intersect with the full range.
     # Otherwise, the points array could overflow and generate a seg fault.
-    if lonspecs is None or abs(lonspecs[1] - lonspecs[0]) >= 360.0:
+    if lonspecs is None or abs(lonspecs[1]-lonspecs[0])>=360.0:
         slon = 0.0
         elon = 360.0
         lonopt = 'co'
@@ -61,22 +57,11 @@ def intersectHorizontalGrid(latspecs, lonspecs, latlin, lonlin, index):
         elon = lonspecs[1]
         lonopt = lonspecs[2]
 
-    if slon > elon:
+    if slon>elon:
         tmp = slon
         slon = elon
         elon = tmp
 
-    npoints = _bindex.intersect(
-        slat,
-        slon,
-     elat,
-     elon,
-     latlin,
-     lonlin,
-     index[0],
-     index[1],
-     points,
-     latopt,
-     lonopt)
+    npoints = _bindex.intersect(slat, slon, elat, elon, latlin, lonlin, index[0], index[1], points, latopt, lonopt)
 
     return points[:npoints]
diff --git a/Packages/cdms2/Lib/cache.py b/Packages/cdms2/Lib/cache.py
index 12163fe94..c7456b503 100644
--- a/Packages/cdms2/Lib/cache.py
+++ b/Packages/cdms2/Lib/cache.py
@@ -1,16 +1,8 @@
 """
 CDMS cache management and file movement objects
 """
-import cdurllib
-import urlparse
-import tempfile
-import os
-import time
-import cdmsobj
-import sys
-import errno
-import shelve
-from .error import CDMSError
+import cdurllib, urlparse, tempfile, os, time, cdmsobj, sys, errno, shelve
+from error import CDMSError
 MethodNotImplemented = "Method not yet implemented"
 SchemeNotSupported = "Scheme not supported: "
 LockError = "Lock error:"
@@ -22,7 +14,6 @@ _lock_max_tries = 10                    # Number of tries for a lock
 _lock_naptime = 1                       # Seconds between lock tries
 _cache_tempdir = None                   # Default temporary directory
 
-
 def lock(filename):
     """
     Acquire a file-based lock with the given name.
@@ -41,50 +32,48 @@ def lock(filename):
     while (not success) and (tries < _lock_max_tries):
         try:
             if cdmsobj._debug:
-                print 'Process %d: Trying to acquire lock %s' % (os.getpid(), path)
-            fd = os.open(path, os.O_CREAT | os.O_WRONLY | os.O_EXCL, 0o666)
+                print 'Process %d: Trying to acquire lock %s'%(os.getpid(),path)
+            fd = os.open(path, os.O_CREAT | os.O_WRONLY | os.O_EXCL, 0666)
 
         # If the open failed because the file already exists, keep trying, otherwise
         # reraise the error
         except OSError:
-            if sys.exc_value.errno != errno.EEXIST:
+            if sys.exc_value.errno!=errno.EEXIST:
                 raise
             tries = tries + 1
         else:
             if cdmsobj._debug:
-                print 'Process %d: Acquired lock %s after %d tries' % (os.getpid(), path, tries)
+                print 'Process %d: Acquired lock %s after %d tries'%(os.getpid(),path,tries)
             success = 1
             break
 
         # Sleep until next retry
         if cdmsobj._debug:
-            print 'Process %d: Failed to acquire lock %s, sleeping' % (os.getpid(), path)
+            print 'Process %d: Failed to acquire lock %s, sleeping'%(os.getpid(),path)
         time.sleep(_lock_naptime)
 
     # Error if the lock could not be acquired
     if not success:
-        raise CDMSError(LockError + 'Could not acquire a lock on %s' % path)
+        raise CDMSError, LockError + 'Could not acquire a lock on %s'%path
 
     # The lock succeeded, so just close the file - we don't need to write
     # anything here
     else:
         os.close(fd)
 
-
 def unlock(filename):
     """
     Delete a file-based lock with the given name.
-    Usage:unlock(filename)
+    Usage:unlock(filename) 
     If the function returns, the lock was successfully deleted.
     Note: This function is UNIX-specific.
     """
 
     path = lockpath(filename)
     if cdmsobj._debug:
-        print 'Process %d: Unlocking %s' % (os.getpid(), path)
+        print 'Process %d: Unlocking %s'%(os.getpid(),path)
     os.unlink(path)
 
-
 def lockpath(filename):
     """
     Generate the pathname of a lock. Creates the directory containing the lock
@@ -95,12 +84,12 @@ def lockpath(filename):
 
     if not _cache_tempdir:
         tempfile.mktemp()
-        _cache_tempdir = os.path.join(tempfile.tempdir, 'cdms')
+        _cache_tempdir = os.path.join(tempfile.tempdir,'cdms')
         if not os.path.isdir(_cache_tempdir):
             if cdmsobj._debug:
-                print 'Process %d: Creating cache directory %s' % (os.getpid(), _cache_tempdir)
-            os.mkdir(_cache_tempdir, 0o777)
-    return os.path.join(_cache_tempdir, filename)
+                print 'Process %d: Creating cache directory %s'%(os.getpid(),_cache_tempdir)
+            os.mkdir(_cache_tempdir,0777)
+    return os.path.join(_cache_tempdir,filename)
 
 _useWindow = 0                          # If true, use a progress dialog
 _pythonTransfer = 0
@@ -108,7 +97,6 @@ _globusTransfer = 1
 _requestManagerTransfer = 2
 _transferMethod = _pythonTransfer       # Method of transferring files
 
-
 def useWindow():
     """
     Specify that dialog windows should be used if possible. Do not call this directly, use
@@ -117,7 +105,6 @@ def useWindow():
     global _useWindow
     _useWindow = 1
 
-
 def useTTY():
     """
     Informational messages such as FTP status should be sent to the terminal. See useWindow.
@@ -125,7 +112,6 @@ def useTTY():
     global _useWindow
     _useWindow = 0
 
-
 def useGlobusTransfer():
     """
     Specify that file transfers should use the Globus storage API (SC-API). See usePythonTransfer.
@@ -133,7 +119,6 @@ def useGlobusTransfer():
     global _transferMethod
     _transferMethod = _globusTransfer
 
-
 def usePythonTransfer():
     """
     Specify that file transfers should use the Python libraries urllib, ftplib. See useGlobusTransfer.
@@ -141,18 +126,15 @@ def usePythonTransfer():
     global _transferMethod
     _transferMethod = _pythonTransfer
 
-
 def useRequestManagerTransfer():
     try:
         import reqm
     except ImportError:
-        raise CDMSError(RequestManagerNotSupported)
+        raise CDMSError, RequestManagerNotSupported
     global _transferMethod
     _transferMethod = _requestManagerTransfer
 
-
-def copyFile(fromURL, toURL, callback=None,
-             lcpath=None, userid=None, useReplica=1):
+def copyFile(fromURL, toURL, callback=None, lcpath=None, userid=None, useReplica=1):
     """
     Copy file <fromURL> to local file <toURL>. For FTP transfers, if cache._useWindow is true,
     display a progress dialog, otherwise just print progress messages.
@@ -163,16 +145,15 @@ def copyFile(fromURL, toURL, callback=None,
     """
     if callback is None:
         if _useWindow:
-            from . import gui
+            import gui
             dialogParent = gui.getProgressParent()
             dialog = gui.CdProgressDialog(dialogParent, fromURL)
             callback = gui.updateProgressGui
         else:
             callback = cdurllib.sampleReportHook
-    (scheme, netloc, path, parameters, query,
-     fragment) = urlparse.urlparse(fromURL)
-    if scheme == 'ftp':
-        if _transferMethod == _pythonTransfer:
+    (scheme,netloc,path,parameters,query,fragment)=urlparse.urlparse(fromURL)
+    if scheme=='ftp':
+        if _transferMethod==_pythonTransfer:
             urlopener = cdurllib.CDURLopener()
 
             # In window environment, attach the dialog to the opener. This will
@@ -186,57 +167,51 @@ def copyFile(fromURL, toURL, callback=None,
             except:
                 if _useWindow:
                     dialog.Destroy()
-                raise
-        elif _transferMethod == _globusTransfer:  # Transfer via Globus SC-API
+                raise 
+        elif _transferMethod==_globusTransfer: # Transfer via Globus SC-API
             try:
                 import globus.storage
             except ImportError:
-                raise CDMSError(GlobusNotSupported)
+                raise CDMSError, GlobusNotSupported
 
-            globus.storage.transfer(fromURL, "file:" + toURL)
+            globus.storage.transfer(fromURL, "file:"+toURL)
         else:
-            raise CDMSError(SchemeNotSupported + scheme)
+            raise CDMSError, SchemeNotSupported + scheme
         return
-    elif _transferMethod == _requestManagerTransfer:  # Request manager gransfer
-        import reqm
-        import signal
+    elif _transferMethod==_requestManagerTransfer: # Request manager gransfer
+        import reqm, signal
 
         # Define an alarm handler, to poll the request manager
         def handler(signum, frame):
             pass
 
-        # Obtain server reference from environment variable ESG_REQM_REF if
-        # present
+        # Obtain server reference from environment variable ESG_REQM_REF if present
         serverRef = os.environ.get('ESG_REQM_REF', '/tmp/esg_rqm.ref')
         server = reqm.RequestManager(iorFile=serverRef)
-        result, token = server.requestFile(
-            userid, lcpath, path, toURL, useReplica)
+        result, token = server.requestFile(userid, lcpath, path, toURL, useReplica)
         server.execute(token)
 
         # Poll the request manager for completion, signalled by estim<=0.0
-        while True:
+        while 1:
             signal.signal(signal.SIGALRM, handler)
             estim = server.estimate(token)
-            print 'Estimate: ', estim
-            if estim <= 0.0:
-                break
+            print 'Estimate: ',estim
+            if estim<=0.0: break
             signal.alarm(3)             # Number of seconds between polls
             signal.pause()
 
         #!!!! Remove this when gsincftp uses the right target name !!!
-
-# oldpath = os.path.join(os.path.dirname(toURL),path)
-# os.rename(oldpath,toURL)
+            
+##         oldpath = os.path.join(os.path.dirname(toURL),path)
+##         os.rename(oldpath,toURL)
 
         #!!!!
-
+        
         return
     else:
-        raise CDMSError(SchemeNotSupported + scheme)
+        raise CDMSError, SchemeNotSupported + scheme
 
 # A simple data cache
-
-
 class Cache:
 
     indexpath = None                    # Path of data cache index
@@ -252,10 +227,9 @@ class Cache:
             except:
                 pass
             lock("index_lock")
-            self.index = shelve.open(self.indexpath)  # Persistent cache index
+            self.index = shelve.open(self.indexpath) # Persistent cache index
             try:
-                os.chmod(self.indexpath, 0o666)
-                         # Make index file world writeable
+                os.chmod(self.indexpath,0666) # Make index file world writeable
             except:
                 pass
             self.index.close()
@@ -263,7 +237,7 @@ class Cache:
             # Clean up pending read notifications in the cache. This will also
             # mess up tranfers in progress...
             self.clean()
-            self.direc = os.path.dirname(self.indexpath)  # Cache directory
+            self.direc = os.path.dirname(self.indexpath) # Cache directory
 
     def get(self, filekey):
         """
@@ -295,7 +269,7 @@ class Cache:
         lock("index_lock")
         try:
             if cdmsobj._debug:
-                print 'Process %d: Adding cache file %s,\n   key %s' % (os.getpid(), path, filekey)
+                print 'Process %d: Adding cache file %s,\n   key %s'%(os.getpid(),path,filekey)
             self.index = shelve.open(self.indexpath)
             self.index[filekey] = path
         except:
@@ -320,8 +294,7 @@ class Cache:
             pass
         unlock("index_lock")
 
-    def copyFile(self, fromURL, filekey,
-                 lcpath=None, userid=None, useReplica=None):
+    def copyFile(self, fromURL, filekey, lcpath=None, userid=None, useReplica=None):
         """
         Copy the file <fromURL> into the cache. Return the result path.
 
@@ -329,9 +302,9 @@ class Cache:
         <userid> is the string user ID, <useReplica> is true iff the request manager should
         search the replica catalog for the actual file to transfer.
         """
-
+        
         # Put a notification into the cache, that this file is being read.
-        self.put(filekey, "__READ_PENDING__")
+        self.put(filekey,"__READ_PENDING__")
 
         # Get a temporary file in the cache
         tempdir = tempfile.tempdir
@@ -341,29 +314,21 @@ class Cache:
 
         # Copy to the temporary file
         try:
-            copyFile(
-                fromURL,
-                toPath,
-                lcpath=lcpath,
-                userid=userid,
-                useReplica=useReplica)
-            os.chmod(toPath, 0o666)
-                     # Make cache files world writeable
+            copyFile(fromURL, toPath, lcpath=lcpath, userid=userid, useReplica=useReplica)
+            os.chmod(toPath,0666)           # Make cache files world writeable
         except:
-            # Remove the notification on error, and the temp file, then
-            # re-raise
+            # Remove the notification on error, and the temp file, then re-raise
             self.deleteEntry(filekey)
             if os.path.isfile(toPath):
                 os.unlink(toPath)
             raise
 
         # Add to the cache index
-        self.put(filekey, toPath)
+        self.put(filekey,toPath)
 
         return toPath
 
-    def getFile(self, fromURL, filekey, naptime=5,
-                maxtries=60, lcpath=None, userid=None, useReplica=None):
+    def getFile(self, fromURL, filekey, naptime=5, maxtries=60, lcpath=None, userid=None, useReplica=None):
         """
         Get the file with <fileURL>. If the file is in the cache, read it.
         If another process is transferring it into the cache, wait for the
@@ -386,34 +351,23 @@ class Cache:
         """
         # If the file is being read into the cache, just wait for it
         tempname = self.get(filekey)
-        # Note: This is not bulletproof: another process could set the cache at
-        # this point
+        # Note: This is not bulletproof: another process could set the cache at this point
         if tempname is None:
-            fpath = self.copyFile(
-                fromURL,
-                filekey,
-                lcpath=lcpath,
-                userid=userid,
-                useReplica=useReplica)
-        elif tempname == "__READ_PENDING__":
+            fpath = self.copyFile(fromURL,filekey,lcpath=lcpath,userid=userid,useReplica=useReplica)
+        elif tempname=="__READ_PENDING__":
             success = 0
             for i in range(maxtries):
                 if cdmsobj._debug:
-                    print 'Process %d: Waiting for read completion, %s' % (os.getpid(), repr(filekey))
+                    print 'Process %d: Waiting for read completion, %s'%(os.getpid(),`filekey`)
                 time.sleep(naptime)
                 tempname = self.get(filekey)
 
                 # The read failed, or the entry was deleted.
                 if tempname is None:
-                    fpath = self.copyFile(
-                        fromURL,
-                        filekey,
-                        lcpath=lcpath,
-                        userid=userid,
-                        useReplica=useReplica)
+                    fpath = self.copyFile(fromURL,filekey,lcpath=lcpath,userid=userid,useReplica=useReplica)
 
                 # The read is not yet complete
-                elif tempname == "__READ_PENDING__":
+                elif tempname=="__READ_PENDING__":
                     continue
 
                 # The read is finished.
@@ -422,13 +376,13 @@ class Cache:
                     success = 1
                     break
             if not success:
-                raise CDMSError(TimeOutError + repr(filekey))
+                raise CDMSError, TimeOutError +`filekey`
 
         else:
             fpath = tempname
 
         if cdmsobj._debug:
-            print 'Process %d: Got file %s from cache %s' % (os.getpid(), fromURL, fpath)
+            print 'Process %d: Got file %s from cache %s'%(os.getpid(),fromURL,fpath)
         return fpath
 
     def delete(self):
@@ -440,11 +394,10 @@ class Cache:
             self.index = shelve.open(self.indexpath)
             for key in self.index.keys():
                 path = self.index[key]
-                if path == "__READ_PENDING__":
-                    continue  # Don't remove read-pending notifications
+                if path=="__READ_PENDING__": continue # Don't remove read-pending notifications
                 try:
                     if cdmsobj._debug:
-                        print 'Process %d: Deleting cache file %s' % (os.getpid(), path)
+                        print 'Process %d: Deleting cache file %s'%(os.getpid(),path)
                     os.unlink(path)
                 except:
                     pass
@@ -462,7 +415,7 @@ class Cache:
         self.index = shelve.open(self.indexpath)
         for key in self.index.keys():
             path = self.index[key]
-            if path == "__READ_PENDING__":
+            if path=="__READ_PENDING__":
                 del self.index[key]
         self.index.close()
         unlock("index_lock")
diff --git a/Packages/cdms2/Lib/cdmsNode.py b/Packages/cdms2/Lib/cdmsNode.py
index ff5bba3f2..794e4ed3b 100644
--- a/Packages/cdms2/Lib/cdmsNode.py
+++ b/Packages/cdms2/Lib/cdmsNode.py
@@ -1,5 +1,5 @@
-# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
-# Further modified to be pure new numpy June 24th 2008
+## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by 
+## Further modified to be pure new numpy June 24th 2008
 
 """
 CDMS node classes
@@ -9,16 +9,16 @@ from numpy import get_printoptions, set_printoptions, inf
 import CDML
 import cdtime
 import re
+import string
 import sys
+from types import *
 from error import CDMSError
 
 # Regular expressions
-_Name = re.compile('[a-zA-Z0-9_:][-a-zA-Z0-9._:]*$')
-                   # Note: allows digit as first character
+_Name = re.compile('[a-zA-Z0-9_:][-a-zA-Z0-9._:]*$') # Note: allows digit as first character
 _Integer = re.compile('[0-9]+$')
 _ArraySep = re.compile('[\[\],\s]+')
-_Illegal = re.compile('([<>&\"\'])|([^\t\r\n -\176\240-\377])')
-                      #" illegal chars in content
+_Illegal = re.compile('([<>&\"\'])|([^\t\r\n -\176\240-\377])')   #" illegal chars in content
 
 # Data types
 
@@ -33,51 +33,42 @@ CdDouble = CDML.CdDouble
 CdString = CDML.CdString
 CdFromObject = CDML.CdFromObject
 CdAny = CDML.CdAny
-CdDatatypes = [
-    CdChar,
-     CdByte,
-     CdShort,
-     CdInt,
-     CdLong,
-     CdInt64,
-     CdFloat,
-     CdDouble,
-     CdString]
+CdDatatypes = [CdChar,CdByte,CdShort,CdInt,CdLong,CdInt64,CdFloat,CdDouble,CdString]
 
 CdScalar = CDML.CdScalar
 CdArray = CDML.CdArray
 
-NumericToCdType = {numpy.sctype2char(numpy.float32): CdFloat,
-                   numpy.sctype2char(numpy.float): CdDouble,
-                   numpy.sctype2char(numpy.int16): CdShort,
-                   numpy.sctype2char(numpy.int32): CdInt,
-                   numpy.sctype2char(numpy.int): CdLong,
-                   numpy.sctype2char(numpy.int64): CdInt64,
-                   numpy.sctype2char(numpy.intc): CdLong,
-                   numpy.sctype2char(numpy.int8): CdByte,
-                   'c': CdChar,
-                   'B': 'B',
-                   'H': 'H',
-                   'L': 'L',
-                   'q': CdInt64,
-                   'Q': 'Q',
-                   'S': 'S'
+NumericToCdType = {numpy.sctype2char(numpy.float32):CdFloat,
+                   numpy.sctype2char(numpy.float):CdDouble,
+                   numpy.sctype2char(numpy.int16):CdShort,
+                   numpy.sctype2char(numpy.int32):CdInt,
+                   numpy.sctype2char(numpy.int):CdLong,
+                   numpy.sctype2char(numpy.int64):CdInt64,
+                   numpy.sctype2char(numpy.intc):CdLong,
+                   numpy.sctype2char(numpy.int8):CdByte,
+                   'c':CdChar,
+                   'B':'B',
+                   'H':'H',
+                   'L':'L',
+                   'q':CdInt64,
+                   'Q':'Q',
+                   'S':'S'
                    }
 
-CdToNumericType = {CdChar: 'c',
-                   CdByte: numpy.int8,
-                   CdShort: numpy.int16,
-                   CdInt: numpy.int32,
-                   CdLong: numpy.int,
-                   CdInt64: numpy.int64,
-                   CdFloat: numpy.float32,
-                   CdDouble: numpy.float}
+CdToNumericType = {CdChar:'c',
+                   CdByte:numpy.int8,
+                   CdShort:numpy.int16,
+                   CdInt:numpy.int32,
+                   CdLong:numpy.int,
+                   CdInt64:numpy.int64,
+                   CdFloat:numpy.float32,
+                   CdDouble:numpy.float}
 
 # Grid types
 UnknownGridType = "unknown"
 GaussianGridType = "gaussian"
 UniformGridType = "uniform"
-CdGridtypes = [UnknownGridType, GaussianGridType, UniformGridType]
+CdGridtypes = [UnknownGridType,GaussianGridType,UniformGridType]
 
 DuplicateIdError = "Duplicate identifier: "
 InvalidArgumentError = "Invalid argument: "
@@ -85,8 +76,6 @@ InvalidDatatype = "Invalid datatype: "
 InvalidGridtype = "Invalid grid type: "
 InvalidIdError = "Invalid identifier: "
 NotMonotonic = "Result array is not monotonic "
-
-
 class NotMonotonicError(CDMSError):
     pass
 
@@ -107,8 +96,6 @@ CdSingleton = 2
 # '"' --> &quot;
 # "'" --> &apos;
 # all other illegal characters are removed #"
-
-
 def mapIllegalToEntity(matchobj):
     s = matchobj.group(0)
     if s == '<':
@@ -117,55 +104,49 @@ def mapIllegalToEntity(matchobj):
         return '&gt;'
     elif s == '&':
         return '&amp;'
-    elif s == '"':  # "
+    elif s == '"':   #"
         return '&quot;'
-    elif s == "'":
+    elif s=="'":
         return '&apos;'
     else:
         return ""
 
 # Named node
-
-
 class CdmsNode:
 
     def __init__(self, tag, id=None, parent=None):
         if id and _Name.match(id) is None:
             raise CDMSError, InvalidIdError + id
-        self.attribute = {}
-            # External attributes, attribute[name]=(value,cdDatatype)
+        self.attribute = {}             # External attributes, attribute[name]=(value,cdDatatype)
         self.child = []                 # Children
         self.id = id                    # Identifier string
         self.parent = parent            # Parent node in a tree, None for root
         self.tag = tag                  # XML tag string
         self.content = None             # XML content string
-        self.dtd = CDML.CDML().dtd.get(self.tag)
-                             # CDML Document Type Definition for this tag
-        self.extra = CDML.CDML().extra.get(
-            self.tag)  # Extra datatype constraints
+        self.dtd = CDML.CDML().dtd.get(self.tag)  # CDML Document Type Definition for this tag
+        self.extra = CDML.CDML().extra.get(self.tag) # Extra datatype constraints
         CdmsNode.mapToExternal(self)    # Don't call subclass mapToExternal!
 
     # Map to external attributes
     def mapToExternal(self):
         if self.id is not None and _Name.match(self.id) is None:
             raise CDMSError, InvalidIdError + self.id
-        if self.id is not None:
-            self.setExternalAttr('id', self.id)
+        if self.id is not None: self.setExternalAttr('id',self.id)
 
     # Set content from a string. The interpretation
     # of content is class-dependent
-    def setContentFromString(self, content):
-        self.content = content
+    def setContentFromString(self,content):
+        self.content=content
 
     # Get content
     def getContent(self):
         return self.content
 
     # Add a child node
-    def add(self, child):
+    def add(self,child):
         if child is not None:
             self.child.append(child)
-            child.parent = self
+            child.parent=self
         return child
 
     # Return a list of child nodes
@@ -173,13 +154,13 @@ class CdmsNode:
         return self.child
 
     # Get the child node at index k
-    def getChildAt(self, index):
+    def getChildAt(self,index):
         return self.child[index]
 
     # Remove and return the child at index k
-    def removeChildAt(self, index):
+    def removeChildAt(self,index):
         child = self.child[index]
-        self.child = self.child[:index] + self.child[index + 1:]
+        self.child = self.child[:index]+self.child[index+1:]
         return child
 
     # Get the number of children
@@ -187,7 +168,7 @@ class CdmsNode:
         return len(self.child)
 
     # Get the index of a node
-    def getIndex(self, node):
+    def getIndex(self,node):
         index = -1
         for i in range(len(self.child)):
             if node is self.child[i]:
@@ -201,21 +182,20 @@ class CdmsNode:
 
     # True iff node is a leaf node
     def isLeaf(self):
-        return self.child == []
+        return self.child==[]
 
     # Set an external attribute
     # 'attr' is an Attr object
     def setExternalAttrFromAttr(self, attr):
-        if attr.value is None:
-            return
-        self.attribute[attr.name] = (attr.value, attr.getDatatype())
+        if attr.value is None: return
+        self.attribute[attr.name]=(attr.value,attr.getDatatype())
 
     # Get an external attribute, as an Attr instance
     def getExternalAttrAsAttr(self, name):
         attrPair = self.attribute.get(name)
         if attrPair:
-            (value, datatype) = attrPair
-            attr = AttrNode(name, value)
+            (value,datatype) = attrPair
+            attr = AttrNode(name,value)
             attr.datatype = datatype
             return attr
         else:
@@ -223,7 +203,7 @@ class CdmsNode:
 
     # Set an external attribute
     def setExternalAttr(self, name, value, datatype=None):
-        attr = AttrNode(name, value)
+        attr = AttrNode(name,value)
         attr.datatype = datatype
         self.setExternalAttrFromAttr(attr)
 
@@ -231,7 +211,7 @@ class CdmsNode:
     def getExternalAttr(self, name):
         attrPair = self.attribute.get(name)
         if attrPair:
-            (value, datatype) = attrPair
+            (value,datatype) = attrPair
             return value
         else:
             return None
@@ -242,88 +222,71 @@ class CdmsNode:
 
     # Set the external attribute dictionary. The input dictionary
     # is of the form {name:value,...} where value is a string.
-    def setExternalDict(self, dict):
+    def setExternalDict(self,dict):
         for key in dict.keys():
-            self.attribute[key] = (dict[key], CdString)
+            self.attribute[key]=(dict[key],CdString)
 
     # Write to a file, with formatting.
     # tablevel is the start number of tabs
-    def write(self, fd=None, tablevel=0, format=1):
-        if fd is None:
-            fd = sys.stdout
+    def write(self,fd=None,tablevel=0,format=1):
+        if fd is None: fd = sys.stdout
         printLimit = get_printoptions()['threshold']
-        set_printoptions(threshold=inf)
-                         # Ensure that all Numeric array values will be printed
+        set_printoptions(threshold=inf)            # Ensure that all Numeric array values will be printed
         if self.dtd:
             validAttrs = self.dtd.keys()
         else:
             validAttrs = None
 
-        if format:
-            fd.write(tablevel * '\t')
-        fd.write('<' + self.tag)
-        if format:
-            fd.write('\n')
+        if format: fd.write(tablevel*'\t')
+        fd.write('<'+self.tag)
+        if format: fd.write('\n')
 
         # Write valid attributes
         for attname in self.attribute.keys():
             if (validAttrs and (attname in validAttrs)) or (not validAttrs):
-                if format:
-                    fd.write((tablevel + 1) * '\t')
-                (attval, datatype) = self.attribute[attname]
+                if format: fd.write((tablevel+1)*'\t')
+                (attval,datatype)=self.attribute[attname]
                 # attvalstr = string.replace(str(attval),'"',"'") # Map " to '
-                attvalstr = _Illegal.sub(
-    mapIllegalToEntity,
-     str(attval))  # Map illegal chars to entities
+                attvalstr = _Illegal.sub(mapIllegalToEntity,str(attval))  # Map illegal chars to entities
                 if format:
-                    fd.write(attname + '\t="' + attvalstr + '"')
+                    fd.write(attname+'\t="'+attvalstr+'"')
                 else:
-                    fd.write(' ' + attname + '="' + attvalstr + '"')
-                if format:
-                    fd.write('\n')
-        if format:
-            fd.write((tablevel + 1) * '\t')
+                    fd.write(' '+attname+'="'+attvalstr+'"')
+                if format: fd.write('\n')
+        if format: fd.write((tablevel+1)*'\t')
         fd.write('>')
-        if format:
-            fd.write('\n')
+        if format: fd.write('\n')
 
         # Write extra attributes
         for attname in self.attribute.keys():
             if validAttrs and (attname not in validAttrs):
-                (attval, datatype) = self.attribute[attname]
-                attr = AttrNode(attname, attval)
-                attr.datatype = datatype
+                (attval,datatype)=self.attribute[attname]
+                attr = AttrNode(attname,attval)
+                attr.datatype=datatype
                 attr.mapToExternal()
-                attr.write(fd, tablevel + 1, format)
+                attr.write(fd,tablevel+1,format)
 
         # Write content
         content = self.getContent()
         if content is not None:
-            content = _Illegal.sub(
-    mapIllegalToEntity,
-     content)  # Map illegal chars to entities
-            if format:
-                fd.write((tablevel + 1) * '\t')
+            content = _Illegal.sub(mapIllegalToEntity,content)  # Map illegal chars to entities
+            if format: fd.write((tablevel+1)*'\t')
             fd.write(content)
-            if format:
-                fd.write('\n')
+            if format: fd.write('\n')
 
         # Write children
         for node in self.child:
-            node.write(fd, tablevel + 1, format)
+            node.write(fd,tablevel+1,format)
 
-        if format:
-            fd.write((tablevel + 1) * '\t')
-        fd.write('</' + self.tag + '>')
-        if format:
-            fd.write('\n')
+        if format: fd.write((tablevel+1)*'\t')
+        fd.write('</'+self.tag+'>')
+        if format: fd.write('\n')
         set_printoptions(threshold=printLimit)  # Restore original
 
-    # Write to a file without formatting.
-    def write_raw(self, fd=None):
-        if fd is None:
-            fd = sys.stdout
-        self.write(fd, 0, 0)
+    # Write to a file without formatting. 
+    def write_raw(self,fd=None):
+        if fd is None: fd = sys.stdout
+        self.write(fd,0,0)
 
     # Write an LDIF (LDAP interchange format) entry
     # parentdn is the parent LDAP distinguished name
@@ -331,116 +294,104 @@ class CdmsNode:
     # A trailing newline is added iff format==1
     # Note: unlike write, this does not write children as well
     def write_ldif(self, parentdn, userAttrs=[], fd=None, format=1):
-        if fd is None:
-            fd = sys.stdout
+        if fd is None: fd = sys.stdout
         if self.dtd:
             validAttrs = self.dtd.keys()
         else:
             validAttrs = None
 
         # Write distinguished name
-        newdn = "%s=%s,%s" % (self.tag, self.id, parentdn)
-        fd.write("dn: %s\n" % newdn)
+        newdn = "%s=%s,%s"%(self.tag,self.id,parentdn)
+        fd.write("dn: %s\n"%newdn)
 
         # Write valid attributes
         for attname in self.attribute.keys():
             if (validAttrs and (attname in validAttrs)) or (not validAttrs):
-                (attval, datatype) = self.attribute[attname]
-                # attvalstr = _Illegal.sub(mapIllegalToEntity,str(attval))  #
-                # Map illegal chars to entities
-                if not isinstance(attval, basestring):
+                (attval,datatype)=self.attribute[attname]
+                # attvalstr = _Illegal.sub(mapIllegalToEntity,str(attval))  # Map illegal chars to entities
+                if type(attval)!=StringType:
                     attval = `attval`
-                attvalstr = attval.strip()
-                attvalstr = re.sub(
-    '\n',
-     '\n ',
-     attvalstr)  # Make sure continuation lines are preceded with a space
-                if attvalstr == '':
-                    attvalstr = "none"
-                fd.write("%s: %s\n" % (attname, attvalstr))
-
+                attvalstr = string.strip(attval)
+                attvalstr = re.sub('\n','\n ',attvalstr) # Make sure continuation lines are preceded with a space
+                if attvalstr=='': attvalstr = "none"
+                fd.write("%s: %s\n"%(attname,attvalstr))
+        
         # Write extra attributes
         for attname in self.attribute.keys():
             if validAttrs and (attname not in validAttrs):
-                (attval, datatype) = self.attribute[attname]
-                if not isinstance(attval, basestring):
+                (attval,datatype)=self.attribute[attname]
+                if type(attval)!=StringType:
                     attval = `attval`
-                attval = re.sub(
-    '\n',
-     '\n ',
-     attval)  # Make sure continuation lines are preceded with a space
-                fd.write("attr: %s=%s\n" % (attname, attval))
+                attval = re.sub('\n','\n ',attval) # Make sure continuation lines are preceded with a space
+                fd.write("attr: %s=%s\n"%(attname,attval))
 
         # Write content
         # content = self.getContent()
         # if content is not None:
-        # content = _Illegal.sub(mapIllegalToEntity,content)  # Map illegal chars to entities
+        #     content = _Illegal.sub(mapIllegalToEntity,content)  # Map illegal chars to entities
         #     fd.write("value: %s"%(content,))
 
         # Write user attributes
-        if isinstance(userAttrs, basestring):
+        if type(userAttrs)==StringType:
             newAttrs = [userAttrs]
         else:
             newAttrs = userAttrs
         for entry in list(newAttrs):
-            fd.write("%s\n" % entry)
+            fd.write("%s\n"%entry)
 
         # Write classes
         fd.write("objectclass: top\n")
-        fd.write("objectclass: %s\n" % (self.tag))
+        fd.write("objectclass: %s\n"%(self.tag))
 
-        if format == 1:
+        if format==1:
             fd.write('\n')
 
         return newdn
 
     # Validate attributes
-    def validate(self, idtable=None):
+    def validate(self,idtable=None):
 
         # Check validity of enumerated values and references
         validKeys = self.dtd.keys()
         for attname in self.attribute.keys():
             if attname in validKeys:
-                (atttype, default) = self.dtd[attname]
-                if isinstance(atttype, tuple):
-                    attval = self.getExternalAttr(attname)
-                    assert attval in atttype, 'Invalid attribute %s=%s must be in %s' % (
-                        attname, attval, `atttype`)
-                elif atttype == CDML.Idref:
-                    attval = self.getExternalAttr(attname)
+                (atttype,default)=self.dtd[attname]
+                if type(atttype) is TupleType:
+                    attval=self.getExternalAttr(attname)
+                    assert attval in atttype, 'Invalid attribute %s=%s must be in %s'%(attname,attval,`atttype`)
+                elif atttype==CDML.Idref:
+                    attval=self.getExternalAttr(attname)
                     if idtable:
                         if not idtable.has_key(attval):
-                            print 'Warning: ID reference not found: %s=%s' % (attname, attval)
-
+                            print 'Warning: ID reference not found: %s=%s'%(attname,attval)
+            
         # Validate children
         for node in self.children():
             node.validate(idtable)
-
+    
 # Container object for other CDMS objects
-
-
 class DatasetNode(CdmsNode):
 
     def __init__(self, id):
-        CdmsNode.__init__(self, "dataset", id)
+        CdmsNode.__init__(self,"dataset",id )
         self.idtable = {}
 
     # Validate the dataset and all child nodes
-    def validate(self, idtable=None):
+    def validate(self,idtable=None):
         if not idtable:
-            idtable = self.idtable
-        CdmsNode.validate(self, idtable)
+            idtable=self.idtable
+        CdmsNode.validate(self,idtable)
 
     # Add a child node with an ID
-    def addId(self, id, child):
-        if self.idtable.has_key(id):
-            raise CDMSError, DuplicateIdError + id
-        CdmsNode.add(self, child)
-        self.idtable[id] = child
+    def addId(self,id,child):
+        if self.idtable.has_key(id): 
+            raise CDMSError, DuplicateIdError +id
+        CdmsNode.add(self,child)
+        self.idtable[id]=child
         return child
 
     # Get a child node from its ID
-    def getChildNamed(self, id):
+    def getChildNamed(self,id):
         return self.idtable.get(id)
 
     # Get the ID table
@@ -450,80 +401,66 @@ class DatasetNode(CdmsNode):
     # Dump to a CDML file.
     # path is the file to dump to, or None for standard output.
     # if format is true, write with tab, newline formatting
-    def dump(self, path=None, format=1):
+    def dump(self,path=None,format=1):
         if path:
             try:
-                fd = open(path, 'w')
+                fd = open(path,'w')
             except IOError:
-                raise IOError, '%s: %s' % (sys.exc_value, path)
+                raise IOError,'%s: %s'%(sys.exc_value,path)
         else:
             fd = sys.stdout
         fd.write('<?xml version="1.0"?>')
-        if format:
-            fd.write('\n')
-        fd.write(
-            '<!DOCTYPE dataset SYSTEM "http://www-pcmdi.llnl.gov/software/cdms/cdml.dtd">')
-        if format:
-            fd.write('\n')
-        self.write(fd, 0, format)
-        if fd != sys.stdout:
-            fd.close()
+        if format: fd.write('\n')
+        fd.write('<!DOCTYPE dataset SYSTEM "http://www-pcmdi.llnl.gov/software/cdms/cdml.dtd">')
+        if format: fd.write('\n')
+        self.write(fd,0,format)
+        if fd!=sys.stdout: fd.close()
 
 # Spatio-temporal variable
 # Two ways to create a variable:
 # (1) var = VariableNode(id,datatype,domain)
 # (2) var = VariableNode(id,datatype)
 #     var.setDomain(domain)
-
-
 class VariableNode(CdmsNode):
 
     # Create a variable.
     # If validate is true, validate immediately
-
     def __init__(self, id, datatype, domain):
-        assert isinstance(
-    datatype, basestring), 'Invalid datatype: ' + `datatype`
-        assert datatype in CdDatatypes, 'Invalid datatype: ' + `datatype`
-        CdmsNode.__init__(self, "variable", id)
+        assert type(datatype) is StringType, 'Invalid datatype: '+`datatype`
+        assert datatype in CdDatatypes, 'Invalid datatype: '+`datatype`
+        CdmsNode.__init__(self,"variable",id)
         self.datatype = datatype
         self.setDomain(domain)
         VariableNode.mapToExternal(self)
 
     # Set the domain
-    def setDomain(self, domain):
+    def setDomain(self,domain):
         if not self.isLeaf():
             self.removeChildAt(0)
         self.add(domain)
 
     # Get the domain
     def getDomain(self):
-        if self.getChildCount() > 0:
+        if self.getChildCount()>0:
             return self.getChildAt(0)
         else:
             return None
 
     # Map to external attributes
     def mapToExternal(self):
-        self.setExternalAttr('datatype', self.datatype)
-
+        self.setExternalAttr('datatype',self.datatype)
+        
 # Coordinate axis
-
-
 class AxisNode(CdmsNode):
 
     # If datatype is None, assume values [0,1,..,length-1]
     # data is a numpy array, if specified
-
-    def __init__(self, id, length, datatype=CdLong, data=None):
-        assert isinstance(length, int), 'Invalid length: ' + `length`
-        assert isinstance(
-    datatype, basestring), 'Invalid datatype: ' + `datatype`
-        assert datatype in CdDatatypes, 'Invalid datatype: ' + `datatype`
-        if data is not None:
-            assert isinstance(
-    data, numpy.ndarray), 'data must be a 1-D Numeric array'
-        CdmsNode.__init__(self, "axis", id)
+    def __init__(self, id, length, datatype=CdLong,data=None):
+        assert isinstance(length, IntType), 'Invalid length: '+`length`
+        assert type(datatype) is StringType, 'Invalid datatype: '+`datatype`
+        assert datatype in CdDatatypes, 'Invalid datatype: '+`datatype`
+        if data is not None: assert isinstance(data, numpy.ndarray), 'data must be a 1-D Numeric array'
+        CdmsNode.__init__(self,"axis",id)
         self.datatype = datatype
         self.data = data
         # data representation is CdLinear or CdVector
@@ -542,51 +479,48 @@ class AxisNode(CdmsNode):
 
     # Map to external attributes
     def mapToExternal(self):
-        self.setExternalAttr('datatype', self.datatype)
-        self.setExternalAttr('length', self.length)
+        self.setExternalAttr('datatype',self.datatype)
+        self.setExternalAttr('length',self.length)
 
     # Set data from content string
     # The content of an axis is the data array.
-    def setContentFromString(self, datastring):
+    def setContentFromString(self,datastring):
         datatype = self.datatype
         numericType = CdToNumericType.get(datatype)
-        if numericType is None:
-            raise CDMSError, InvalidDatatype + datatype
+        if numericType is None: raise CDMSError, InvalidDatatype + datatype
         stringlist = _ArraySep.split(datastring)
         numlist = []
         for numstring in stringlist:
-            if numstring == '':
-                continue
-            numlist.append(float(numstring))
-        if len(numlist) > 0:
+            if numstring=='': continue
+            numlist.append(string.atof(numstring))
+        if len(numlist)>0:
             # NB! len(zero-length array) causes IndexError on Linux!
-            dataArray = numpy.array(numlist, numericType)
+            dataArray = numpy.array(numlist,numericType)
             self.data = dataArray
             self.length = len(self.data)
 
     # Set the partition from a string. This does not
     # set the external string representation
-    def setPartitionFromString(self, partstring):
+    def setPartitionFromString(self,partstring):
         stringlist = _ArraySep.split(partstring)
         numlist = []
         for numstring in stringlist:
-            if numstring == '':
-                continue
-            numlist.append(int(numstring))
-        dataArray = numpy.array(numlist, numpy.int)
-        if len(dataArray) > 0:
+            if numstring=='': continue
+            numlist.append(string.atoi(numstring))
+        dataArray = numpy.array(numlist,numpy.int)
+        if len(dataArray)>0:
             self.partition = dataArray
 
     # Get the content string: the data values if the representation
     # is as a vector, or ane empty string otherwise
     def getContent(self):
-        if self.data is None or self.dataRepresent == CdLinear:
+        if self.data is None or self.dataRepresent==CdLinear:
             return ''
         else:
             return str(self.data)
 
     # Set the data as an array, check for monotonicity
-    def setData(self, data):
+    def setData(self,data):
 
         # If this axis is currently linear, remove the linear node
         if self.dataRepresent == CdLinear:
@@ -595,8 +529,8 @@ class AxisNode(CdmsNode):
         self.data = data
         self.dataRepresent = CdVector
         self.length = len(data)
-        self.setExternalAttr('length', self.length)
-        if self.monotonicity() == CdNotMonotonic:
+        self.setExternalAttr('length',self.length)
+        if self.monotonicity()==CdNotMonotonic:
             raise NotMonotonicError, NotMonotonic
 
     # Get the data as an array
@@ -608,9 +542,9 @@ class AxisNode(CdmsNode):
 
     # Set the data as a linear vector
     # If the partition is set, derive the vector length from it
-    def setLinearData(self, linearNode, partition=None):
+    def setLinearData(self,linearNode, partition=None):
         self.data = linearNode
-        if self.getChildCount() > 0:
+        if self.getChildCount()>0:
             self.removeChildAt(0)           # Remove the previous linear node
         self.add(linearNode)
         self.dataRepresent = CdLinear
@@ -621,23 +555,23 @@ class AxisNode(CdmsNode):
             self.partition = partition
             self.length = partition[-1]
             linearNode.length = self.length
-            self.setExternalAttr('partition', str(self.partition))
-        self.setExternalAttr('length', self.length)
+            self.setExternalAttr('partition',str(self.partition))
+        self.setExternalAttr('length',self.length)
 
     # Test if axis data vectors are equal
-    def equal(self, axis):
+    def equal(self,axis):
         # Require that partitions (if any) are equal
         if self.partition is not None and axis.partition is not None:
-            if len(self.partition) != len(axis.partition):
+            if len(self.partition)!=len(axis.partition):
                 return 0
-            if not numpy.alltrue(numpy.equal(self.partition, axis.partition)):
+            if not numpy.alltrue(numpy.equal(self.partition,axis.partition)):
                 return 0
         elif self.partition is not None or axis.partition is not None:
             return 0
-
+        
         if self.dataRepresent == axis.dataRepresent == CdVector:
             try:
-                return numpy.alltrue(numpy.equal(self.data, axis.data))
+                return numpy.alltrue(numpy.equal(self.data,axis.data))
             except ValueError:
                 return 0
         elif self.dataRepresent == axis.dataRepresent == CdLinear:
@@ -649,34 +583,34 @@ class AxisNode(CdmsNode):
 
     # Test if axis data vectors are element-wise close
     # True iff for each respective element a and b, abs((b-a)/b)<=eps
-    def isClose(self, axis, eps):
-        if eps == 0:
+    def isClose(self,axis,eps):
+        if eps==0:
             return self.equal(axis)
         if self.dataRepresent == axis.dataRepresent == CdVector:
             try:
-                return numpy.alltrue(numpy.less_equal(numpy.absolute(self.data - axis.data), numpy.absolute(eps * self.data)))
+                return numpy.alltrue(numpy.less_equal(numpy.absolute(self.data-axis.data),numpy.absolute(eps*self.data)))
             except ValueError:
                 return 0
         elif self.dataRepresent == axis.dataRepresent == CdLinear:
-            return self.data.isClose(axis.data, eps)
+            return self.data.isClose(axis.data,eps)
         elif self.dataRepresent == CdVector:
-            return axis.data.isCloseVector(self.data, eps)
+            return axis.data.isCloseVector(self.data,eps)
         else:
-            return self.data.isCloseVector(axis.data, eps)
+            return self.data.isCloseVector(axis.data,eps)
 
     # Test for strict monotonicity.
     # Returns CdNotMonotonic, CdIncreasing, CdDecreasing, or CdSingleton
     def monotonicity(self):
         if self.dataRepresent == CdLinear:
             return self.data.monotonicity()
-        elif self.length == 1:
+        elif self.length==1:
             return CdSingleton
         else:
             first = self.data[:-1]
             second = self.data[1:]
-            if numpy.alltrue(numpy.less(first, second)):
+            if numpy.alltrue(numpy.less(first,second)):
                 return CdIncreasing
-            elif numpy.alltrue(numpy.greater(first, second)):
+            elif numpy.alltrue(numpy.greater(first,second)):
                 return CdDecreasing
             else:
                 return CdNotMonotonic
@@ -684,24 +618,24 @@ class AxisNode(CdmsNode):
     # Extend axes. 'isreltime' is true iff
     # the axes are relative time axes
     # If allowgaps is true, allow gaps when extending linear vectors
-    def extend(self, axis, isreltime=0, allowgaps=0):
+    def extend(self,axis,isreltime=0,allowgaps=0):
         # Set trylin true if should try to catenate linear vectors
-        if self.dataRepresent == CdLinear:
+        if self.dataRepresent==CdLinear:
             anode = self.data
-            if axis.dataRepresent == CdLinear:
+            if axis.dataRepresent==CdLinear:
                 bnode = axis.data
                 trylin = 1
-            elif axis.length == 1:
+            elif axis.length==1:
                 bnode = LinearDataNode(axis.data[0], 0.0, 1)
                 trylin = 1
             else:
                 trylin = 0
-        elif self.length == 1:
+        elif self.length==1: 
             anode = LinearDataNode(self.data[0], 0.0, 1)
-            if axis.dataRepresent == CdLinear:
+            if axis.dataRepresent==CdLinear:
                 bnode = axis.data
                 trylin = 1
-            elif axis.length == 1:
+            elif axis.length==1:
                 bnode = LinearDataNode(axis.data[0], 0.0, 1)
                 trylin = 1
             else:
@@ -709,25 +643,25 @@ class AxisNode(CdmsNode):
         else:
             trylin = 0
 
-        if isreltime == 1:
+        if isreltime==1:
             units1 = self.getExternalAttr('units')
             units2 = axis.getExternalAttr('units')
         else:
             units1 = units2 = None
 
-        if trylin == 1:
+        if trylin==1:
             try:
                 aindex = 0
                 alength = anode.length
                 bindex = alength
                 blength = bnode.length
-                if isreltime == 1 and units1 and units2 and units1 != units2:
-                    rtime = cdtime.reltime(bnode.start, units2)
+                if isreltime==1 and units1 and units2 and units1!=units2:
+                    rtime = cdtime.reltime(bnode.start,units2)
                     offset = rtime.torel(units1).value
-                    bnode.start = bnode.start + offset
+                    bnode.start = bnode.start+offset
                 else:
                     offset = None
-                linNode = anode.concatenate(bnode, allowgaps)
+                linNode = anode.concatenate(bnode,allowgaps)
             except NotMonotonicError:
                 # The dimensions cannot be extended as linear arrays,
                 # so try to extend them as vectors
@@ -735,20 +669,15 @@ class AxisNode(CdmsNode):
             else:
                 # Extend the partition attribute
                 if offset is not None:
-                    bindex = int(offset / linNode.delta + 0.5)
-                if self.partition is None:
-                    partition = numpy.array(
-    [aindex,
-     aindex + alength,
-     bindex,
-     bindex + blength])
-                    self.partition_length = alength + blength
+                    bindex = int(offset/linNode.delta+0.5)
+                if self.partition  is None:
+                    partition = numpy.array([aindex,aindex+alength,bindex,bindex+blength])
+                    self.partition_length = alength+blength
                 else:
-                    partition = numpy.concatenate(
-    (self.partition, [bindex, bindex + blength]))
-                    self.partition_length = self.partition_length + blength
-                self.setLinearData(linNode, partition)
-                self.setExternalAttr('partition_length', self.partition_length)
+                    partition = numpy.concatenate((self.partition,[bindex,bindex+blength]))
+                    self.partition_length = self.partition_length+blength
+                self.setLinearData(linNode,partition)
+                self.setExternalAttr('partition_length',self.partition_length)
                 return self
 
         # Else get both axis vectors, concatenate
@@ -761,31 +690,29 @@ class AxisNode(CdmsNode):
         blength = len(ar2)
 
         # Adjust array2 if relative time and units differ
-        if isreltime == 1:
+        if isreltime==1:
             if units1 and units2 and units1 != units2:
-                rtime = cdtime.reltime(0.0, units2)
+                rtime = cdtime.reltime(0.0,units2)
                 delta = rtime.torel(units1).value
-                ar2 = ar2 + delta
+                ar2 = ar2+delta
 
-        ar = numpy.concatenate((ar1, ar2))
+        ar = numpy.concatenate((ar1,ar2))
         try:
             self.setData(ar)
         except NotMonotonicError:
             # Restore original array and resignal
             self.setData(ar1)
-            raise NotMonotonicError, NotMonotonic + `ar`
+            raise NotMonotonicError, NotMonotonic+`ar`
 
         # Extend the partition attribute
-        if self.partition is None:
-            self.partition = numpy.array(
-    [aindex, aindex + alength, bindex, bindex + blength])
-            self.partition_length = alength + blength
+        if self.partition  is None:
+            self.partition = numpy.array([aindex,aindex+alength,bindex,bindex+blength])
+            self.partition_length = alength+blength
         else:
-            self.partition = numpy.concatenate(
-                (self.partition, [bindex, bindex + blength]))
-            self.partition_length = self.partition_length + blength
-        self.setExternalAttr('partition', str(self.partition))
-        self.setExternalAttr('partition_length', self.partition_length)
+            self.partition = numpy.concatenate((self.partition,[bindex,bindex+blength]))
+            self.partition_length = self.partition_length+blength
+        self.setExternalAttr('partition',str(self.partition))
+        self.setExternalAttr('partition_length',self.partition_length)
 
         return self
 
@@ -793,21 +720,16 @@ class AxisNode(CdmsNode):
         return len(self.data)
 
 # Linear data element
-
-
 class LinearDataNode(CdmsNode):
 
-    validStartTypes = [
-        int, float, type(cdtime.comptime(0)), type(cdtime.reltime(0, "hours"))]
-    validDeltaTypes = [int, float, list]
+    validStartTypes = [IntType,FloatType,type(cdtime.comptime(0)),type(cdtime.reltime(0,"hours"))]
+    validDeltaTypes = [IntType,FloatType,ListType]
 
     def __init__(self, start, delta, length):
-        assert isinstance(start, numpy.floating) or isinstance(start, numpy.integer) or (
-            type(start) in self.validStartTypes), 'Invalid start argument: ' + `start`
-        assert isinstance(start, numpy.floating) or isinstance(start, numpy.integer) or (
-            type(delta) in self.validDeltaTypes), 'Invalid delta argument: ' + `delta`
-        assert isinstance(length, int), 'Invalid length argument: ' + `length`
-        CdmsNode.__init__(self, "linear")
+        assert isinstance(start, numpy.floating) or isinstance(start, numpy.integer) or (type(start) in self.validStartTypes), 'Invalid start argument: '+`start`
+        assert isinstance(start, numpy.floating) or isinstance(start, numpy.integer) or (type(delta) in self.validDeltaTypes), 'Invalid delta argument: '+`delta`
+        assert isinstance(length, IntType), 'Invalid length argument: '+`length`
+        CdmsNode.__init__(self,"linear")
         self.delta = delta
         self.length = length
         self.start = start
@@ -815,57 +737,53 @@ class LinearDataNode(CdmsNode):
 
     # Get an indexed value
     def __getitem__(self, index):
-        return self.start + index * self.delta
+        return self.start + index*self.delta
 
     # Map to external attributes
     def mapToExternal(self):
-        self.setExternalAttr("start", self.start)
-        self.setExternalAttr("delta", self.delta)
-        self.setExternalAttr("length", self.length)
+        self.setExternalAttr("start",self.start)
+        self.setExternalAttr("delta",self.delta)
+        self.setExternalAttr("length",self.length)
 
     # Equality of linear vectors
-    def equal(self, axis):
-        return self.delta == axis.delta and self.length == axis.length and self.start == axis.start
+    def equal(self,axis):
+        return self.delta==axis.delta and self.length==axis.length and self.start==axis.start
 
     # Closeness of linear vectors
-    def isClose(self, axis, eps):
-        if eps == 0:
+    def isClose(self,axis,eps):
+        if eps==0:
             return self.equal(axis)
         else:
-            return self.delta == axis.delta and self.length == axis.length and abs(self.start - axis.start) <= abs(eps * self.start)
+            return self.delta==axis.delta and self.length==axis.length and abs(self.start-axis.start)<=abs(eps*self.start)
 
     # Equality of linear vector and array
-    def equalVector(self, ar):
-        diff = ar[1:] - ar[:-1]
+    def equalVector(self,ar):
+        diff = ar[1:]-ar[:-1]
         try:
-            comp = numpy.alltrue(
-    numpy.equal((self.delta) * numpy.ones(self.length - 1), diff))
+            comp = numpy.alltrue(numpy.equal((self.delta)*numpy.ones(self.length-1),diff))
         except ValueError:
             return 0
         return comp
 
     # Closeness of linear vector and array
-    def isCloseVector(self, ar, eps):
-        if eps == 0:
+    def isCloseVector(self,ar,eps):
+        if eps==0:
             return self.equalVector(ar)
-        diff = ar[1:] - ar[:-1]
-        diff2 = self.delta * numpy.ones(self.length - 1)
+        diff = ar[1:]-ar[:-1]
+        diff2 = self.delta*numpy.ones(self.length-1)
         try:
-            comp = numpy.alltrue(
-    numpy.less_equal(numpy.absolute(diff2 - diff),
-     numpy.absolute(eps * diff2)))
+            comp = numpy.alltrue(numpy.less_equal(numpy.absolute(diff2-diff),numpy.absolute(eps*diff2)))
         except ValueError:
             return 0
         return comp
 
-    # Return monotonicity: CdNotMonotonic, CdIncreasing, CdDecreasing, or
-    # CdSingleton
+    # Return monotonicity: CdNotMonotonic, CdIncreasing, CdDecreasing, or CdSingleton
     def monotonicity(self):
-        if self.length == 1:
+        if self.length==1:
             return CdSingleton
-        elif self.delta > 0.0:
+        elif self.delta>0.0:
             return CdIncreasing
-        elif self.delta < 0.0:
+        elif self.delta<0.0:
             return CdDecreasing
         else:
             return CdNotMonotonic
@@ -873,39 +791,34 @@ class LinearDataNode(CdmsNode):
     # Return a vector representation, given a CDMS datatype
     def toVector(self, datatype):
         numericType = CdToNumericType.get(datatype)
-        if numericType is None:
-            raise CDMSError, InvalidDatatype + datatype
+        if numericType is None: raise CDMSError, InvalidDatatype + datatype
         start = self.start
         delta = self.delta
         length = self.length
-        if length > 1:
-            stop = start + (length - 0.99) * delta
-            if delta == 0.0:
-                delta = 1.0
-            ar = numpy.arange(start, stop, delta, numericType)
+        if length>1:
+            stop = start + (length-0.99)*delta
+            if delta==0.0: delta=1.0
+            ar = numpy.arange(start,stop,delta,numericType)
         else:
-            ar = numpy.array([start], numericType)
+            ar = numpy.array([start],numericType)
         return ar
 
     # Concatenate linear arrays, preserving linearity
     # If allowgaps is set, don't require that the linear arrays be contiguous
     # Return a new linear node
-    def concatenate(self, linearNode, allowgaps=0):
-        if self.length > 1 and linearNode.length > 1 and self.delta != linearNode.delta:
-            raise NotMonotonicError, NotMonotonic + \
-                'linear vector deltas do not match: %s,%s' % (
-                    `self.delta`, `linearNode.delta`)
+    def concatenate(self,linearNode,allowgaps=0):
+        if self.length>1 and linearNode.length>1 and self.delta != linearNode.delta:
+            raise NotMonotonicError, NotMonotonic + 'linear vector deltas do not match: %s,%s'%(`self.delta`,`linearNode.delta`)
 
-        if self.length > 1:
+        if self.length>1:
             delta = self.delta
-        elif linearNode.length > 1:
+        elif linearNode.length>1:
             delta = linearNode.delta
         else:
             delta = linearNode.start - self.start
-        if allowgaps == 0:
-            if linearNode.start - self.start != self.length * delta:
-                raise NotMonotonicError, NotMonotonic + \
-                    'linear vectors are not contiguous'
+        if allowgaps==0:
+            if linearNode.start-self.start != self.length*delta:
+                raise NotMonotonicError, NotMonotonic + 'linear vectors are not contiguous'
         length = self.length + linearNode.length
         return LinearDataNode(self.start, delta, length)
 
@@ -913,16 +826,12 @@ class LinearDataNode(CdmsNode):
         return self.length
 
 # Rectilinear lat-lon grid
-
-
 class RectGridNode(CdmsNode):
 
     # Create a grid
     # All arguments are strings
-
-    def __init__(self, id, latitude, longitude,
-                 gridtype=UnknownGridType, order="yx", mask=None):
-        CdmsNode.__init__(self, "rectGrid", id)
+    def __init__(self, id, latitude, longitude, gridtype=UnknownGridType, order="yx", mask=None):
+        CdmsNode.__init__(self,"rectGrid",id)
         self.latitude = latitude
         self.longitude = longitude
         self.gridtype = gridtype
@@ -932,20 +841,17 @@ class RectGridNode(CdmsNode):
 
     # Map to external attributes
     def mapToExternal(self):
-        self.setExternalAttr('type', self.gridtype)
+        self.setExternalAttr('type',self.gridtype)
         self.setExternalAttr('latitude', self.latitude)
-        self.setExternalAttr('longitude', self.longitude)
-        self.setExternalAttr('order', self.order)
-        if self.mask is not None:
-            self.setExternalAttr('mask', self.mask)
+        self.setExternalAttr('longitude',self.longitude)
+        self.setExternalAttr('order',self.order)
+        if self.mask is not None: self.setExternalAttr('mask',self.mask)
 
 # Link to an external element
-
-
 class XLinkNode(CdmsNode):
 
     def __init__(self, id, uri, contentRole, content=''):
-        CdmsNode.__init__(self, "xlink", id)
+        CdmsNode.__init__(self,"xlink",id)
         self.uri = uri
         self.contentRole = contentRole
         self.content = content
@@ -953,39 +859,33 @@ class XLinkNode(CdmsNode):
 
     # Map to external attributes
     def mapToExternal(self):
-        self.setExternalAttr("href", self.uri, CdString)
-        self.setExternalAttr("content-role", self.contentRole, CdString)
+        self.setExternalAttr("href",self.uri,CdString)
+        self.setExternalAttr("content-role",self.contentRole,CdString)
 
 # Link to a document
-
-
 class DocLinkNode(CdmsNode):
 
     def __init__(self, uri, content=''):
-        CdmsNode.__init__(self, "doclink")
+        CdmsNode.__init__(self,"doclink")
         self.uri = uri
         self.content = content
         DocLinkNode.mapToExternal(self)
 
     # Map to external attributes
     def mapToExternal(self):
-        self.setExternalAttr("href", self.uri, CdString)
+        self.setExternalAttr("href",self.uri,CdString)
 
 # Domain
-
-
 class DomainNode(CdmsNode):
 
     def __init__(self):
-        CdmsNode.__init__(self, "domain")
+        CdmsNode.__init__(self,"domain")
 
 # Domain element
-
-
 class DomElemNode(CdmsNode):
 
     def __init__(self, name, start=None, length=None):
-        CdmsNode.__init__(self, "domElem")
+        CdmsNode.__init__(self,"domElem")
         self.name = name
         self.start = start
         self.length = length
@@ -993,16 +893,14 @@ class DomElemNode(CdmsNode):
 
     # Map to external attributes
     def mapToExternal(self):
-        self.setExternalAttr('name', self.name)
-        if self.start is not None:
-            self.setExternalAttr('start', self.start)
-        if self.length is not None:
-            self.setExternalAttr('length', self.length)
+        self.setExternalAttr('name',self.name)
+        if self.start is not None: self.setExternalAttr('start',self.start)
+        if self.length is not None: self.setExternalAttr('length',self.length)
 
     # Set the name
-    def setName(self, name):
+    def setName(self,name):
         self.name = name
-        self.setExternalAttr('name', self.name)
+        self.setExternalAttr('name',self.name)
 
     # Get the name
     def getName(self):
@@ -1010,84 +908,82 @@ class DomElemNode(CdmsNode):
 
     # Write to a file, with formatting.
     # tablevel is the start number of tabs
-    def write(self, fd=None, tablevel=0, format=1):
-        if fd is None:
-            fd = sys.stdout
-        if format:
-            fd.write(tablevel * '\t')
-        fd.write('<' + self.tag)
+    def write(self,fd=None,tablevel=0,format=1):
+        if fd is None: fd = sys.stdout
+        if format: fd.write(tablevel*'\t')
+        fd.write('<'+self.tag)
         for attname in self.attribute.keys():
-            (attval, datatype) = self.attribute[attname]
+            (attval,datatype)=self.attribute[attname]
             # attvalstr = string.replace(str(attval),'"',"'") # Map " to '
-            attvalstr = _Illegal.sub(
-    mapIllegalToEntity,
-     str(attval))  # Map illegal chars to entities
-            fd.write(' ' + attname + '="' + attvalstr + '"')
+            attvalstr = _Illegal.sub(mapIllegalToEntity,str(attval))  # Map illegal chars to entities
+            fd.write(' '+attname+'="'+attvalstr+'"')
         fd.write('/>')
-        if format:
-            fd.write('\n')
+        if format: fd.write('\n')
 
 # Attribute node - only used as a placeholder during parse and write
 #   Attr nodes are not placed on the tree
 #
 # Two ways to create an Attr object:
 # (1) attr = AttrNode(name,value)
-# datatype = sometype # optionally, to override intrinsic type
+#     datatype = sometype # optionally, to override intrinsic type
 # (2) attr = AttrNode(name,None)
 #     attr.setValueFromString(somestring,sometype)
-
-
 class AttrNode(CdmsNode):
 
     def __init__(self, name, value=None):
-        CdmsNode.__init__(self, "attr")
-        if not (isinstance(value, (int, numpy.integer, float, numpy.floating, basestring)) or (value is None)):
-            raise CDMSError, 'Invalid attribute type: ' + value
-        self.name=name
-        self.value=value
-        self.datatype=None            # CDMS datatype, use getDatatype to retrieve
-        self.content=''             # string content
+        CdmsNode.__init__(self,"attr")
+        if not (isinstance(value,IntType)
+                or isinstance(value,numpy.integer)
+                or isinstance(value,FloatType)
+                or isinstance(value,numpy.floating)
+                or isinstance(value,StringType)
+                or isinstance(value,NoneType)):
+            raise CDMSError, 'Invalid attribute type: '+`value`
+        self.name = name
+        self.value = value
+        self.datatype = None            # CDMS datatype, use getDatatype to retrieve
+        self.content = ''             # string content
 
     # Note: mapToExternal is not called at init time, must be called explicitly
     #   if needed
     def mapToExternal(self):
-        self.attribute['name']=(self.name, CdString)
-        self.attribute['datatype']=(self.getDatatype(), CdString)
-        self.content=self.getValueAsString()
+        self.attribute['name']=(self.name,CdString)
+        self.attribute['datatype']=(self.getDatatype(),CdString)
+        self.content = self.getValueAsString()
 
     def getDatatype(self):
         if self.datatype:
             return self.datatype
-        elif isinstance(self.value, basestring):
+        elif type(self.value) is StringType:
             return CdString
-        elif isinstance(self.value, (float, numpy.floating)):
+        elif isinstance(self.value, FloatType) or isinstance(self.value,numpy.floating):
             return CdDouble
-        elif isinstance(self.value, (int, numpy.integer)):
+        elif isinstance(self.value, IntType) or isinstance(self.value,numpy.integer):
             return CdLong
         else:
-            raise CDMSError, 'Invalid attribute type: ' + `self.value`
+            raise CDMSError, 'Invalid attribute type: '+`self.value`
 
     def getLength(self):
         return 1
 
     # Map a string of a given datatype to a value
     #   Returns ValueError if the conversion fails
-    def setValueFromString(self, valString, datatype):
-        val=None
-        if not isinstance(valString, basestring):
+    def setValueFromString(self,valString,datatype):
+        val = None
+        if type(valString) is not StringType:
             raise CDMSError, 'input value is not a string'
         if datatype == CdString:
             val=valString
-        elif datatype in (CdShort, CdInt, CdLong):
+        elif datatype in (CdShort,CdInt,CdLong):
             try:
-                val=int(valString)
+                val=string.atoi(valString)
             except ValueError:
-                raise CDMSError, 'value is not an integer: ' + valString
-        elif datatype in (CdFloat, CdDouble):
+                raise CDMSError, 'value is not an integer: '+valString
+        elif datatype in (CdFloat,CdDouble):
             try:
-                val=float(valString)
+                val=string.atof(valString)
             except ValueError:
-                raise CDMSError, 'value is not floating-point: ' + valString
+                raise CDMSError, 'value is not floating-point: '+valString
         self.value=val
         self.datatype=datatype
         return val
@@ -1097,40 +993,36 @@ class AttrNode(CdmsNode):
 
     # Set content
     # This may be called multiple times, so append
-    def setContentFromString(self, content):
-        self.content=self.content + content
+    def setContentFromString(self,content):
+        self.content = self.content+content
 
     # Write to a file, with formatting.
     # tablevel is the start number of tabs
-    def write(self, fd=None, tablevel=0, format=1):
-        if fd is None: fd=sys.stdout
+    def write(self,fd=None,tablevel=0,format=1):
+        if fd is None: fd = sys.stdout
         if self.dtd:
-            validAttrs=self.dtd.keys()
+            validAttrs = self.dtd.keys()
         else:
-            validAttrs=None
+            validAttrs = None
 
-        if format: fd.write(tablevel * '\t')
-        fd.write('<' + self.tag)
+        if format: fd.write(tablevel*'\t')
+        fd.write('<'+self.tag)
 
         # Write valid attributes
         for attname in self.attribute.keys():
             if (validAttrs and (attname in validAttrs)) or (not validAttrs):
-                (attval, datatype)=self.attribute[attname]
+                (attval,datatype)=self.attribute[attname]
                 # attvalstr = string.replace(str(attval),'"',"'") # Map " to '
-                attvalstr=_Illegal.sub(
-    mapIllegalToEntity,
-     str(attval))  # Map illegal chars to entities
-                fd.write(' ' + attname + '="' + attvalstr + '"')
+                attvalstr = _Illegal.sub(mapIllegalToEntity,str(attval))  # Map illegal chars to entities
+                fd.write(' '+attname+'="'+attvalstr+'"')
         fd.write('>')
 
         # Write content
         if self.content is not None:
-            content=_Illegal.sub(
-    mapIllegalToEntity,
-     self.content)  # Map illegal chars to entities
+            content = _Illegal.sub(mapIllegalToEntity,self.content)  # Map illegal chars to entities
             fd.write(content)
 
-        fd.write('</' + self.tag + '>')
+        fd.write('</'+self.tag+'>')
         if format: fd.write('\n')
 
 if __name__ == '__main__':
@@ -1163,7 +1055,7 @@ if __name__ == '__main__':
     # hAxis = AxisNode('h',len(h),CdDouble,h)
     # jAxis = AxisNode('j',len(j),CdDouble); jAxis.setLinearData(j)
     # kAxis = AxisNode('k',len(k),CdDouble,k)
-
+    
     # print aAxis.monotonicity()
     # print hAxis.monotonicity()
     # print kAxis.monotonicity()
@@ -1171,29 +1063,29 @@ if __name__ == '__main__':
     # print dAxis.monotonicity()
     # print jAxis.monotonicity()
 
-    m=LinearDataNode(1, 2, 3)
-    n=LinearDataNode(11, 2, 3)
-    p=LinearDataNode(15, -4, 3)
-    q=numpy.array([4., 2., 1.])
-    r=numpy.array([11., 9., 8.])
-    s=numpy.array([7.])
-    t=numpy.array([9.])
-    v=numpy.array([5.])
-
-    mAxis=AxisNode('m', len(m), CdLong); mAxis.setLinearData(m)
-    nAxis=AxisNode('n', len(n), CdLong); nAxis.setLinearData(n)
-    pAxis=AxisNode('p', len(p), CdLong); pAxis.setLinearData(p)
-    qAxis=AxisNode('q', len(q), CdDouble, q)
-    rAxis=AxisNode('r', len(r), CdDouble, r)
-    sAxis=AxisNode('s', len(s), CdDouble, s)
-    tAxis=AxisNode('t', len(t), CdDouble, t)
-    vAxis=AxisNode('v', len(v), CdDouble, v)
+    m = LinearDataNode(1,2,3)
+    n = LinearDataNode(11,2,3)
+    p = LinearDataNode(15,-4,3)
+    q = numpy.array([4.,2.,1.])
+    r = numpy.array([11.,9.,8.])
+    s = numpy.array([7.])
+    t = numpy.array([9.])
+    v = numpy.array([5.])
+
+    mAxis = AxisNode('m',len(m),CdLong); mAxis.setLinearData(m)
+    nAxis = AxisNode('n',len(n),CdLong); nAxis.setLinearData(n)
+    pAxis = AxisNode('p',len(p),CdLong); pAxis.setLinearData(p)
+    qAxis = AxisNode('q',len(q),CdDouble,q)
+    rAxis = AxisNode('r',len(r),CdDouble,r)
+    sAxis = AxisNode('s',len(s),CdDouble,s)
+    tAxis = AxisNode('t',len(t),CdDouble,t)
+    vAxis = AxisNode('v',len(v),CdDouble,v)
 
     def printType(axis):
-        if axis.dataRepresent == CdLinear: print 'linear'
+        if axis.dataRepresent==CdLinear: print 'linear'
         else: print 'vector'
-
-    def testit(a, b):
+        
+    def testit(a,b):
         import copy
         x=copy.copy(a)
         print x.extend(b).getData()
@@ -1209,6 +1101,6 @@ if __name__ == '__main__':
     # testit(mAxis,rAxis)
     # testit(vAxis,nAxis)
     # testit(sAxis,rAxis)
-
+    
     # Errors:
     # testit(mAxis,nAxis)
diff --git a/Packages/cdms2/Lib/cdmsURLopener.py b/Packages/cdms2/Lib/cdmsURLopener.py
index e0b710131..f401bf8d5 100644
--- a/Packages/cdms2/Lib/cdmsURLopener.py
+++ b/Packages/cdms2/Lib/cdmsURLopener.py
@@ -3,16 +3,15 @@
 
 import urllib
 
-
 class CDMSURLopener(urllib.FancyURLopener):
 
-    # Override FancyURLopener error handling - raise an exception
-    # Can also define function http_error_DDD where DDD is the 3-digit error code,
-    # to handle specific errors.
-
-    def http_error_default(self, url, fp, errcode, errmsg, headers):
-        void = fp.read()
-        fp.close()
-        raise IOError('http error', errcode, errmsg, headers)
+	# Override FancyURLopener error handling - raise an exception
+        # Can also define function http_error_DDD where DDD is the 3-digit error code,
+        # to handle specific errors.
+	def http_error_default(self, url, fp, errcode, errmsg, headers):
+		void = fp.read()
+		fp.close()
+		raise IOError, ('http error', errcode, errmsg, headers)
 
 urllib._urlopener = CDMSURLopener()
+
diff --git a/Packages/cdms2/Lib/cdmsobj.py b/Packages/cdms2/Lib/cdmsobj.py
index 30961e26b..14c2d9bf0 100644
--- a/Packages/cdms2/Lib/cdmsobj.py
+++ b/Packages/cdms2/Lib/cdmsobj.py
@@ -2,12 +2,15 @@
 CDMS module-level functions and definitions
 """
 
-from . import cdmsNode
+import cdmsNode
 import cdtime
 import glob
 import os
 import re
+import string
 import sys
+import types
+#import internattr
 
 # Data types
 
@@ -26,7 +29,7 @@ CdArray = cdmsNode.CdArray
 
 Unlimited = 1                           # Unlimited axis designator
 
-Max32int = 2**31 - 1                      # Maximum 32-bit integer
+Max32int = 2**31-1                      # Maximum 32-bit integer
 
 # Regular expressions for each template specifier
 _Daynum = '[0-3][0-9]'
@@ -41,7 +44,7 @@ _Percent = '%'
 _Second = '[0-5][0-9]'
 _Year2 = '[0-9][0-9]'
 _Year4 = '[0-9]{4,4}'
-_Zulu = _Hour + '[z|Z]' + _Year4 + _Monthnum + _Daynum
+_Zulu = _Hour+'[z|Z]'+_Year4+_Monthnum+_Daynum
 
 # Positions for time lists
 _yr = 0
@@ -93,67 +96,42 @@ _specifierMap = {
     '%v': (_Name, 'name', 'var', None),
     '%y': (_Year2, 'year2', 'time', _yr),
     '%z': (_Zulu, 'zulu', 'time', None),
-}
-
-_monthListUpper = [
-    'JAN',
-     'FEB',
-     'MAR',
-     'APR',
-     'MAY',
-     'JUN',
-     'JUL',
-     'AUG',
-     'SEP',
-     'OCT',
-     'NOV',
-     'DEC']
+    }
+
+_monthListUpper = ['JAN','FEB','MAR','APR','MAY','JUN','JUL','AUG','SEP','OCT','NOV','DEC']
 _monthMapUpper = {
-    'JAN': 1,
-    'FEB': 2,
-    'MAR': 3,
-    'APR': 4,
-    'MAY': 5,
-    'JUN': 6,
-    'JUL': 7,
-    'AUG': 8,
-    'SEP': 9,
-    'OCT': 10,
-    'NOV': 11,
-    'DEC': 12,
-}
-
-_monthListLower = [
-    'jan',
-     'feb',
-     'mar',
-     'apr',
-     'may',
-     'jun',
-     'jul',
-     'aug',
-     'sep',
-     'oct',
-     'nov',
-     'dec']
+    'JAN':1,
+    'FEB':2,
+    'MAR':3,
+    'APR':4,
+    'MAY':5,
+    'JUN':6,
+    'JUL':7,
+    'AUG':8,
+    'SEP':9,
+    'OCT':10,
+    'NOV':11,
+    'DEC':12,
+    }
+
+_monthListLower = ['jan','feb','mar','apr','may','jun','jul','aug','sep','oct','nov','dec']
 _monthMapLower = {
-    'jan': 1,
-    'feb': 2,
-    'mar': 3,
-    'apr': 4,
-    'may': 5,
-    'jun': 6,
-    'jul': 7,
-    'aug': 8,
-    'sep': 9,
-    'oct': 10,
-    'nov': 11,
-    'dec': 12,
-}
-
-_specre = re.compile(
-    '(%%|%G|%H|%L|%M|%S|%Y|%d|%eG|%eH|%eL|%eM|%eS|%eY|%ed|%ef|%eg|%eh|%em|%en|%ey|%ez|%f|%g|%h|%m|%n|%v|%y|%z)')
-_filere = re.compile('[^' + os.sep + ']+')
+    'jan':1,
+    'feb':2,
+    'mar':3,
+    'apr':4,
+    'may':5,
+    'jun':6,
+    'jul':7,
+    'aug':8,
+    'sep':9,
+    'oct':10,
+    'nov':11,
+    'dec':12,
+    }
+
+_specre = re.compile('(%%|%G|%H|%L|%M|%S|%Y|%d|%eG|%eH|%eL|%eM|%eS|%eY|%ed|%ef|%eg|%eh|%em|%en|%ey|%ez|%f|%g|%h|%m|%n|%v|%y|%z)')
+_filere = re.compile('[^'+os.sep+']+')
 
 _debug = 0                              # Print debug info
 
@@ -162,14 +140,12 @@ AbsoluteTemplate = "Template must be a relative path: "
 # Module-level functions
 
 # Set debug mode, to 'on' or 'off'
-
-
 def setDebugMode(mode):
     global _debug
-    if mode == 'on':
-        _debug = 1
-    elif mode == 'off':
-        _debug = 0
+    if mode=='on':
+        _debug=1
+    elif mode=='off':
+        _debug=0
 
 # Map a template to a regular expression
 # Returns (regex,dimtypes), where regex is the regular expression
@@ -178,226 +154,206 @@ def setDebugMode(mode):
 # where specStrings is the specifier associated with the dimension type,
 # or for time, the list of specifiers in the order (yr,mo,dy,hr,mi,se)
 # where each element is the specifier for that time element
-
-
 def templateToRegex(template):
 
     matchspec = {}
-    dimtypes = {'var': None,
-                'time': [None, None, None, None, None, None],
-                'etime': [None, None, None, None, None, None],
-                'level': None,
-                'elevel': None,
+    dimtypes = {'var':None,
+                'time':[None,None,None,None,None,None],
+                'etime':[None,None,None,None,None,None],
+                'level':None,
+                'elevel':None,
                 }
 
     # Map spec to regex
     # (The default arg bring matchspec and dimtypes into the local scope)
     def retspec(matchobj, matchspec=matchspec, dimtypes=dimtypes):
         spec = matchobj.group(0)
-        pat, name, dimtype, pos = _specifierMap[spec]
+        pat,name,dimtype,pos = _specifierMap[spec]
 
-        if dimtype == 'var':
-            dimtypes['var'] = spec
-        elif dimtype in ('time', 'etime'):
+        if dimtype=='var':
+            dimtypes['var']=spec
+        elif dimtype in ('time','etime'):
             if pos is not None:
-                dimtypes[dimtype][pos] = spec
-            elif name in ('zulu', 'ezulu'):
-                pass  # Crack Zulu time
-        elif dimtype in ('level', 'elevel'):
-            dimtypes[dimtype] = spec
-
-        if spec in matchspec:
-            return '(?P=' + name + ')'
+                dimtypes[dimtype][pos]=spec
+            elif name in ('zulu','ezulu'):
+                pass # Crack Zulu time
+        elif dimtype in ('level','elevel'):
+            dimtypes[dimtype]=spec
+
+        if matchspec.has_key(spec):
+            return '(?P='+name+')'
         else:
             matchspec[spec] = 1
-            return '(?P<' + name + '>' + pat + ')'
-
-    templatere = _specre.sub(retspec, template)
-    return (templatere, dimtypes)
-
+            return '(?P<'+name+'>'+pat+')'
+        
+    templatere = _specre.sub(retspec,template)
+    return (templatere,dimtypes)
 
 def retglob(matchobj):
     return '*'
 
 # Generate a component time from a matchobj and list of specs
-
-
-def generateTime(matchobj, timespecs):
+def generateTime(matchobj,timespecs):
     iyr = 0
     imo = 1
     idy = 1
     ihr = 0
     imi = 0
     ise = 0
-    yrspec, mospec, dyspec, hrspec, mispec, sespec = timespecs
+    yrspec,mospec,dyspec,hrspec,mispec,sespec = timespecs
     if yrspec:
-        pat, name, dimtype, pos = _specifierMap[yrspec]
+        pat,name,dimtype,pos = _specifierMap[yrspec]
         yrstr = matchobj.group(name)
-        iyr = int(yrstr)
+        iyr = string.atoi(yrstr)
 
         # Map 2-digit year to [1950,2049)
-        if yrspec in ('%y', '%ey'):
-            if iyr < 50:
-                iyr = iyr + 2000
+        if yrspec in ('%y','%ey'):
+            if iyr<50:
+                iyr = iyr+2000
             else:
-                iyr = iyr + 1900
+                iyr = iyr+1900
     if mospec:
-        pat, name, dimtype, pos = _specifierMap[mospec]
+        pat,name,dimtype,pos = _specifierMap[mospec]
         mostr = matchobj.group(name)
-        if mospec in ('%G', '%eG'):
+        if mospec in ('%G','%eG'):
             imo = _monthMapUpper[mostr]
-        elif mospec in ('%g', '%eg'):
+        elif mospec in ('%g','%eg'):
             imo = _monthMapLower[mostr]
-        elif mospec in ('%m', '%em', '%n', '%en'):
-            imo = int(mostr)
+        elif mospec in ('%m','%em','%n','%en'):
+            imo = string.atoi(mostr)
     if dyspec:
-        pat, name, dimtype, pos = _specifierMap[dyspec]
+        pat,name,dimtype,pos = _specifierMap[dyspec]
         dystr = matchobj.group(name)
-        idy = int(dystr)
+        idy = string.atoi(dystr)
     if hrspec:
-        pat, name, dimtype, pos = _specifierMap[hrspec]
+        pat,name,dimtype,pos = _specifierMap[hrspec]
         hrstr = matchobj.group(name)
-        ihr = int(hrstr)
+        ihr = string.atoi(hrstr)
     if mispec:
-        pat, name, dimtype, pos = _specifierMap[mispec]
+        pat,name,dimtype,pos = _specifierMap[mispec]
         mistr = matchobj.group(name)
-        imi = int(mistr)
+        imi = string.atoi(mistr)
     if sespec:
-        pat, name, dimtype, pos = _specifierMap[sespec]
+        pat,name,dimtype,pos = _specifierMap[sespec]
         sestr = matchobj.group(name)
-        ise = int(sestr)
-    return cdtime.comptime(iyr, imo, idy, ihr, imi, ise)
+        ise = string.atoi(sestr)
+    return cdtime.comptime(iyr,imo,idy,ihr,imi,ise)   
 
 # Find all files in 'direc' which match 'template'.
 # template is a relative path, and may contain specifiers
 # in directory names. Returns a list [(f,m),..,(f,m)] where
 # f is a matching file name, and m is a list [var,time,etime,level,elevel]
 # of matching values in f. Any or all elems of the list may be None.
-
-
-def matchingFiles(direc, template):
+def matchingFiles(direc,template):
 
     if os.path.isabs(template):
-        raise AbsoluteTemplate(template)
+        raise AbsoluteTemplate, template
 
     # Generate a glob pattern
     normTemplate = os.path.normpath(template)
-    globPattern = _filere.sub(retglob, normTemplate)
+    globPattern = _filere.sub(retglob,normTemplate)
 
     # Map the template to a regular expression
-    templatere, dimtypes = templateToRegex(template)
+    templatere,dimtypes = templateToRegex(template)
     ctre = re.compile(templatere)
 
     # Get a list of candidate files
     try:
         os.chdir(direc)
     except os.error:
-        raise IOError('%s: %s' % (sys.exc_info()[1], direc))
-
+        raise IOError,'%s: %s'%(sys.exc_value,direc)
+        
     candlist = glob.glob(globPattern)
 
-    # Look for matches
+    # Look for matches 
     matchfiles = []
     for candfile in candlist:
         matchobj = ctre.match(candfile)
 
         # Create matching values
-        if matchobj is None:
-            continue
-        matchnames = [None, None, None, None, None]
+        if matchobj is None: continue
+        matchnames = [None,None,None,None,None]
         if dimtypes['var'] is not None:
             matchnames[_var] = matchobj.group('name')
-        if dimtypes['time'] != [None, None, None, None, None, None]:
-            matchnames[_time] = generateTime(matchobj, dimtypes['time'])
-        if dimtypes['etime'] != [None, None, None, None, None, None]:
-            matchnames[_etime] = generateTime(matchobj, dimtypes['etime'])
+        if dimtypes['time'] != [None,None,None,None,None,None]:
+            matchnames[_time] = generateTime(matchobj,dimtypes['time'])
+        if dimtypes['etime'] != [None,None,None,None,None,None]:
+            matchnames[_etime] = generateTime(matchobj,dimtypes['etime'])
         if dimtypes['level'] is not None:
-            matchnames[_level] = int(matchobj.group('level'))
+            matchnames[_level] = string.atoi(matchobj.group('level'))
         if dimtypes['elevel'] is not None:
-            matchnames[_elevel] = int(matchobj.group('elevel'))
-        matchfiles.append((candfile, matchnames))
+            matchnames[_elevel] = string.atoi(matchobj.group('elevel'))
+        matchfiles.append((candfile,matchnames))
 
     return matchfiles
 
 # Get a string time component from a spec and a component time
+def getTimeAsString(spec,time):
 
-
-def getTimeAsString(spec, time):
-
-    if spec in ('%G', '%eG'):
+    if spec in ('%G','%eG'):
         imo = time.month
-        specstr = _monthListUpper[imo - 1]
-    elif spec in ('%H', '%eH'):
+        specstr = _monthListUpper[imo-1]
+    elif spec in ('%H','%eH'):
         specstr = str(time.hour)
-    elif spec in ('%M', '%eM'):
+    elif spec in ('%M','%eM'):
         specstr = str(time.minute)
-    elif spec in ('%S', '%eS'):
+    elif spec in ('%S','%eS'):
         specstr = str(int(time.second))
-    elif spec in ('%Y', '%eY'):
-        specstr = str(time.year).zfill(4)
-    elif spec in ('%d', '%ed'):
+    elif spec in ('%Y','%eY'):
+        specstr = string.zfill(str(time.year),4)
+    elif spec in ('%d','%ed'):
         specstr = str(time.day)
-    elif spec in ('%f', '%ef'):
-        specstr = str(time.day).zfill(2)
-    elif spec in ('%g', '%eg'):
+    elif spec in ('%f','%ef'):
+        specstr = string.zfill(str(time.day),2)
+    elif spec in ('%g','%eg'):
         imo = time.month
-        specstr = _monthListLower[imo - 1]
-    elif spec in ('%h', '%eh'):
-        specstr = str(time.hour).zfill(2)
-    elif spec in ('%m', '%em'):
+        specstr = _monthListLower[imo-1]
+    elif spec in ('%h','%eh'):
+        specstr = string.zfill(str(time.hour),2)
+    elif spec in ('%m','%em'):
         specstr = str(time.month)
-    elif spec in ('%n', '%en'):
-        specstr = str(time.month).zfill(2)
-    elif spec in ('%y', '%ey'):
-        specstr = str(time.year % 100).zfill(2)
-    elif spec in ('%z', '%ez'):
-        specstr = getTimeAsString(
-            '%H',
-            time) + 'Z' + getTimeAsString(
-                '%Y',
-                time) + getTimeAsString(
-            '%n',
-             time) + getTimeAsString(
-                '%d',
-                 time)
+    elif spec in ('%n','%en'):
+        specstr = string.zfill(str(time.month),2)
+    elif spec in ('%y','%ey'):
+        specstr = string.zfill(str(time.year%100),2)
+    elif spec in ('%z','%ez'):
+        specstr = getTimeAsString('%H',time)+'Z'+getTimeAsString('%Y',time)+getTimeAsString('%n',time)+getTimeAsString('%d',time)
     return specstr
 
 # Generate a file path, given a template and matchname list.
 # matchnames is a list [varname,time,etime,level,elevel], where
 # any or all elems may be None.  If matchnames be a longer list,
 # it is not an error but the additional elements are ignored.
-
-
-def getPathFromTemplate(template, matchnames):
+def getPathFromTemplate(template,matchnames):
 
     # Map spec to value string
     # (Default arg brings matchnames into the local scope)
     def retpath(matchobj, matchnames=matchnames):
         spec = matchobj.group(0)
-        pat, name, dimtype, pos = _specifierMap[spec]
-        var, time, etime, level, elevel = matchnames[0:5]
+        pat,name,dimtype,pos = _specifierMap[spec]
+        var,time,etime,level,elevel = matchnames[0:5]
 
-        if dimtype == 'var':
+        if dimtype=='var':
             if var is None:
                 specstr = spec
             else:
                 specstr = var
-        elif dimtype == 'time':
+        elif dimtype=='time':
             if time is None:
                 specstr = spec
             else:
-                specstr = getTimeAsString(spec, time)
-        elif dimtype == 'etime':
+                specstr = getTimeAsString(spec,time)
+        elif dimtype=='etime':
             if etime is None:
                 specstr = spec
             else:
-                specstr = getTimeAsString(spec, etime)
-        elif dimtype == 'level':
+                specstr = getTimeAsString(spec,etime)
+        elif dimtype=='level':
             if level is None:
                 specstr = spec
             else:
                 specstr = str(level)
-        elif dimtype == 'elevel':
+        elif dimtype=='elevel':
             if elevel is None:
                 specstr = spec
             else:
@@ -405,7 +361,7 @@ def getPathFromTemplate(template, matchnames):
 
         return specstr
 
-    path = _specre.sub(retpath, template)
+    path = _specre.sub(retpath,template)
     return path
 
 # Search an object or list of objects for a string attribute which
@@ -416,17 +372,16 @@ def getPathFromTemplate(template, matchnames):
 # 'rectGrid','xlink', or None.  If tag is None, all object classes are
 # searched.  If attribute is None, all attributes are searched.
 
-
 def searchPattern(objlist, pattern, attribute=None, tag=None):
     if tag is not None:
-        tag = tag.lower()
+        tag = string.lower(tag)
     regexp = re.compile(pattern)
-    if not isinstance(objlist, list):
+    if type(objlist) is not types.ListType:
         objlist = [objlist]
 
     returnlist = []
     for obj in objlist:
-        returnlist = returnlist + obj.searchPattern(regexp, attribute, tag)
+        returnlist = returnlist + obj.searchPattern(regexp,attribute,tag)
 
     return returnlist
 
@@ -438,17 +393,16 @@ def searchPattern(objlist, pattern, attribute=None, tag=None):
 # 'rectGrid','xlink', or None.  If tag is None, all object classes are
 # searched.  If attribute is None, all attributes are searched.
 
-
 def matchPattern(objlist, pattern, attribute=None, tag=None):
     if tag is not None:
-        tag = tag.lower()
+        tag = string.lower(tag)
     regexp = re.compile(pattern)
-    if not isinstance(objlist, list):
+    if type(objlist) is not types.ListType:
         objlist = [objlist]
 
     returnlist = []
     for obj in objlist:
-        returnlist = returnlist + obj.matchPattern(regexp, attribute, tag)
+        returnlist = returnlist + obj.matchPattern(regexp,attribute,tag)
 
     return returnlist
 
@@ -467,19 +421,17 @@ def matchPattern(objlist, pattern, attribute=None, tag=None):
 #
 #   lambda obj: obj.partition_length > 1000
 #
-# is sufficient, it is not necessary to test for the existence of the
-# attribute.
-
+# is sufficient, it is not necessary to test for the existence of the attribute.
 
 def searchPredicate(objlist, predicate, tag=None):
     if tag is not None:
-        tag = tag.lower()
-    if not isinstance(objlist, list):
+        tag = string.lower(tag)
+    if type(objlist) is not types.ListType:
         objlist = [objlist]
 
     returnlist = []
     for obj in objlist:
-        returnlist = returnlist + obj.searchPredicate(predicate, tag)
+        returnlist = returnlist + obj.searchPredicate(predicate,tag)
 
     return returnlist
 
@@ -487,80 +439,74 @@ def searchPredicate(objlist, predicate, tag=None):
 # Classes
 
 # Generic CDMS object has a tree node, attributes
-
-
 class CdmsObj (object):
-# def __setattr__(self,name,value):
-# object.__setattr__(self,name,value)
-# if not name in self.__cdms_internals__ and not name[0]=='_':
-# self.attributes[name]=value
-# if name == 'shape' :
-# print self.__class__,name,value
+##     def __setattr__(self,name,value):
+##         object.__setattr__(self,name,value)
+##         if not name in self.__cdms_internals__ and not name[0]=='_':
+##             self.attributes[name]=value
+## ##             if name == 'shape' :
+## ##                 print self.__class__,name,value
 
     def _listatts(self):
-        dic = {}
-        for nm, val in self.__dict__.items():
-            if (nm[0] != '_' and not nm in self.__cdms_internals__) or nm in ['_FillValue']:
-                dic[nm] = val
+        dic={}
+        for nm,val in self.__dict__.items():
+            if (nm[0]!='_' and not nm in self.__cdms_internals__) or nm in ['_FillValue']:
+                dic[nm]=val
             if nm == '_units':
-                dic['units'] = val
+                dic['units']=val
         return dic
-
-    def _setatts(self, value):
+    def _setatts(self,value):
         return
 
-    attributes = property(_listatts, _setatts)
-
-    def __init__(self, node=None):
-        if not hasattr(self, '___cdms_internals__'):
-            self.__dict__['___cdms_internals__'] = [
-                '__cdms_internals__', '___cdms_internals__',
-                '_node_', '_obj_',
-                '_numericType_', '_grid_', '_bounds_',
-                'parent', 'attributes', 'shape', 'autoApiInfo']
-        self.attributes = {}
+    attributes = property(_listatts,_setatts)
+    
+        
+    def __init__(self, node = None):
+        if not hasattr(self,'___cdms_internals__'):
+            self.__dict__['___cdms_internals__']=[
+                '__cdms_internals__','___cdms_internals__',
+                '_node_','_obj_',
+                '_numericType_','_grid_','_bounds_',
+                'parent','attributes','shape','autoApiInfo']
+        self.attributes={}
         self._node_ = node
         if node is not None:
-            # Build an attribute dictionary from the node,
+            # Build an attribute dictionary from the node, 
             # CDML datatype constraints
 
-            if hasattr(node, 'datatype'):
+            if hasattr(node,'datatype'):
                 parenttype = node.datatype
             else:
                 parenttype = None
             atts = node.getExternalDict()
             adict = self.__dict__
             for attname in atts.keys():
-                (attval, datatype) = atts[attname]  # (XML value, datatype)
+                (attval,datatype)=atts[attname] # (XML value, datatype)
                 constraint = node.extra.get(attname)
                 if constraint is not None:
-                    (scaletype,
-                     reqtype) = constraint  # (CdScalar|CdArray, required type)
-                    if reqtype == CdFromObject:
+                    (scaletype,reqtype)=constraint # (CdScalar|CdArray, required type)
+                    if reqtype==CdFromObject:
                         reqtype = parenttype
-                    if reqtype != datatype and datatype == CdString and scaletype == CdScalar:
-                        if reqtype in (CdFloat, CdDouble):
+                    if reqtype!=datatype and datatype==CdString and scaletype==CdScalar:
+                        if reqtype in (CdFloat,CdDouble):
                             try:
-                                attval = float(attval)
+                                attval = string.atof(attval)
                             except:
-                                raise RuntimeError(
-                                    "%s=%s must be a float" %
-                                    (attname, attval))
-                        elif reqtype in (CdShort, CdInt, CdLong, CdInt64):
+                                raise RuntimeError,"%s=%s must be a float"%(attname,attval)
+                        elif reqtype in (CdShort,CdInt,CdLong,CdInt64):
                             try:
-                                attval = int(attval)
+                                attval = string.atoi(attval)
                             except:
-                                raise RuntimeError(
-                                    "%s=%s must be an integer" %
-                                    (attname, attval))
+                                raise RuntimeError,"%s=%s must be an integer"%(attname,attval)
                 adict[attname] = attval
                 self.attributes[attname] = attval
 
+
     def searchone(self, pattern, attname):
         """Return true if the attribute with name attname is a string
         attribute which contains the compiled regular expression pattern, or
         if attname is None and pattern matches at least one string
-        attribute. Return false if the attribute is not found or is not
+        attribute. Return false if the attribute is not found or is not 
         a string.
         :::
         Input:::
@@ -573,12 +519,12 @@ class CdmsObj (object):
         """
         if attname is None:
             for attval in self.attributes.values():
-                if isinstance(attval, basestring) and pattern.search(attval) is not None:
+                if type(attval) is types.StringType and pattern.search(attval) is not None:
                     return 1
             return 0
-        elif attname in self.attributes:
+        elif self.attributes.has_key(attname):
             attval = self.attributes[attname]
-            return isinstance(attval, basestring) and pattern.search(attval) is not None
+            return (type(attval) is types.StringType and pattern.search(attval) is not None)
         else:
             return 0
 
@@ -603,19 +549,18 @@ class CdmsObj (object):
         """
         if attname is None:
             for attval in self.attributes.values():
-                if isinstance(attval, basestring) and pattern.match(attval) is not None:
+                if type(attval) is types.StringType and pattern.match(attval) is not None:
                     return 1
             return 0
-        elif attname in self.attributes:
+        elif self.attributes.has_key(attname):
             attval = self.attributes[attname]
-            return isinstance(attval, basestring) and pattern.match(attval) is not None
+            return (type(attval) is types.StringType and pattern.match(attval) is not None)
         else:
             return 0
 
     # Search for a pattern in a string-valued attribute. If attribute is None,
-    # search all string attributes. If tag is not None, it must match the
-    # internal node tag.
-    def searchPattern(self, pattern, attribute, tag):
+    # search all string attributes. If tag is not None, it must match the internal node tag.
+    def searchPattern(self,pattern,attribute,tag):
         """
         Search for a pattern in a string-valued attribute. If attribute is None, search all string attributes. If tag is not None, it must match the internal node tag.
         :::
@@ -625,11 +570,11 @@ class CdmsObj (object):
         tag :: (str/None) (2) node tag
         :::
         Output:::
-        result :: (list) (0)
+        result :: (list) (0) 
         :::
         """
-        if tag is None or tag.lower() == self._node_.tag:
-            if self.searchone(pattern, attribute):
+        if tag is None or string.lower(tag)==self._node_.tag:
+            if self.searchone(pattern,attribute):
                 return [self]
             else:
                 return []
@@ -637,9 +582,8 @@ class CdmsObj (object):
             return []
 
     # Match a pattern in a string-valued attribute. If attribute is None,
-    # search all string attributes. If tag is not None, it must match the
-    # internal node tag.
-    def matchPattern(self, pattern, attribute, tag):
+    # search all string attributes. If tag is not None, it must match the internal node tag.
+    def matchPattern(self,pattern,attribute,tag):
         """
         Match for a pattern in a string-valued attribute. If attribute is None, search all string attributes. If tag is not None, it must match the internal node tag.
         :::
@@ -649,11 +593,11 @@ class CdmsObj (object):
         tag :: (str/None) (2) node tag
         :::
         Output:::
-        result :: (list) (0)
+        result :: (list) (0) 
         :::
         """
-        if tag is None or tag.lower() == self._node_.tag:
-            if self.matchone(pattern, attribute):
+        if tag is None or string.lower(tag)==self._node_.tag:
+            if self.matchone(pattern,attribute):
                 return [self]
             else:
                 return []
@@ -663,7 +607,7 @@ class CdmsObj (object):
     # Apply a truth-valued predicate. Return a list containing a single instance: [self]
     # if the predicate is true and either tag is None or matches the object node tag.
     # If the predicate returns false, return an empty list
-    def searchPredicate(self, predicate, tag):
+    def searchPredicate(self,predicate,tag):
         """
         Apply a truth-valued predicate. Return a list containing a single instance: [self] if the predicate is true and either tag is None or matches the object node tag. If the predicate returns false, return an empty list
         :::
@@ -672,12 +616,12 @@ class CdmsObj (object):
         tag :: (str/None) (1) node tag
         :::
         Output:::
-        result :: (list) (0)
+        result :: (list) (0) 
         :::
         """
-        if tag is None or tag.lower() == self._node_.tag:
+        if tag is None or string.lower(tag)==self._node_.tag:
             try:
-                if predicate(*(self,)) == 1:
+                if apply(predicate,(self,))==1:
                     result = [self]
             except:
                 result = []
@@ -685,7 +629,7 @@ class CdmsObj (object):
             result = []
         return result
 
-    def dump(self, path=None, format=1):
+    def dump(self,path=None,format=1):
         """ dump(self,path=None,format=1)
         Dump an XML representation of this object to a file.
         'path' is the result file name, None for standard output.
@@ -700,21 +644,24 @@ class CdmsObj (object):
         :::
         """
         if self._node_ is None:
-            raise CDMSError("No tree node found")
-        self._node_.dump(path, format)
+            raise CDMSError, "No tree node found"
+        self._node_.dump(path,format)
 
     def _getinternals(self):
         return self.___cdms_internals__
-
-    def _setinternals(self, value):
+    def _setinternals(self,value):
         self.___cdms_internals__ = value
-    __cdms_internals__ = property(_getinternals, _setinternals)
-# internattr.add_internal_attribute(CdmsObj)
+    __cdms_internals__ = property(_getinternals,_setinternals)
+#internattr.add_internal_attribute(CdmsObj)
 
 if __name__ == '__main__':
     x = CdmsObj(None)
     x.someatt = 1
     assert x.attributes['someatt'] == x.someatt
-    assert '_node' not in x.attributes
+    assert not x.attributes.has_key('_node')
     # need tests for the search routines...
     print "Test passed."
+
+
+
+
diff --git a/Packages/cdms2/Lib/cdurllib.py b/Packages/cdms2/Lib/cdurllib.py
index eefccb114..6ae1848b3 100644
--- a/Packages/cdms2/Lib/cdurllib.py
+++ b/Packages/cdms2/Lib/cdurllib.py
@@ -1,18 +1,13 @@
 """Customized URLopener"""
 
-import urllib
-import getpass
-import socket
-import string
-import sys
+import urllib, getpass, socket, string, sys
 
 MAXFTPCACHE = 10        # Trim the ftp cache beyond this size
 
-
 class CDURLopener(urllib.URLopener):
 
     def __init__(self, proxies=None):
-        urllib.URLopener.__init__(self, proxies)
+        urllib.URLopener.__init__(self,proxies)
         self._userObject = None
 
     # Attach an object to be returned with callbacks
@@ -22,15 +17,12 @@ class CDURLopener(urllib.URLopener):
     # Use FTP protocol
     def open_ftp(self, url):
         host, path = urllib.splithost(url)
-        if not host:
-            raise IOError, ('ftp error', 'no host given')
+        if not host: raise IOError, ('ftp error', 'no host given')
         host, port = urllib.splitport(host)
         user, host = urllib.splituser(host)
         # if user: user, passwd = splitpasswd(user)
-        if user:
-            passwd = getpass.getpass()
-        else:
-            passwd = None
+        if user: passwd = getpass.getpass()
+        else: passwd = None
         host = urllib.unquote(host)
         user = urllib.unquote(user or '')
         passwd = urllib.unquote(passwd or '')
@@ -44,8 +36,7 @@ class CDURLopener(urllib.URLopener):
         path = urllib.unquote(path)
         dirs = string.splitfields(path, '/')
         dirs, file = dirs[:-1], dirs[-1]
-        if dirs and not dirs[0]:
-            dirs = dirs[1:]
+        if dirs and not dirs[0]: dirs = dirs[1:]
         key = (user, host, port, string.joinfields(dirs, '/'))
         # XXX thread unsafe!
         if len(self.ftpcache) > MAXFTPCACHE:
@@ -56,14 +47,12 @@ class CDURLopener(urllib.URLopener):
                     del self.ftpcache[k]
                     v.close()
         try:
-            if key not in self.ftpcache:
-                print 'Creating ftpwrapper: ', user, host, port, dirs
+            if not self.ftpcache.has_key(key):
+                print 'Creating ftpwrapper: ',user,host,port,dirs
                 self.ftpcache[key] = \
                     urllib.ftpwrapper(user, passwd, host, port, dirs)
-            if not file:
-                type = 'D'
-            else:
-                type = 'I'
+            if not file: type = 'D'
+            else: type = 'I'
             for attr in attrs:
                 attr, value = urllib.splitvalue(attr)
                 if string.lower(attr) == 'type' and \
@@ -71,19 +60,18 @@ class CDURLopener(urllib.URLopener):
                     type = string.upper(value)
             (fp, retrlen) = self.ftpcache[key].retrfile(file, type)
             if retrlen is not None and retrlen >= 0:
-                import mimetools
-                import StringIO
+                import mimetools, StringIO
                 headers = mimetools.Message(StringIO.StringIO(
                     'Content-Length: %d\n' % retrlen))
             else:
                 headers = noheaders()
             return urllib.addinfourl(fp, headers, "ftp:" + url)
-        except urllib.ftperrors() as msg:
+        except urllib.ftperrors(), msg:
             raise IOError, ('ftp error', msg), sys.exc_info()[2]
 
     def retrieve(self, url, filename=None, reporthook=None, blocksize=262144):
         url = urllib.unwrap(url)
-        if self.tempcache and url in self.tempcache:
+        if self.tempcache and self.tempcache.has_key(url):
             return self.tempcache[url]
         type, url1 = urllib.splittype(url)
         if not filename and (not type or type == 'file'):
@@ -92,7 +80,7 @@ class CDURLopener(urllib.URLopener):
                 hdrs = fp.info()
                 del fp
                 return url2pathname(urllib.splithost(url1)[1]), hdrs
-            except IOError as msg:
+            except IOError, msg:
                 pass
         fp = self.open(url)
         headers = fp.info()
@@ -113,28 +101,28 @@ class CDURLopener(urllib.URLopener):
         size = -1
         blocknum = 1
         if reporthook:
-            if "content-length" in headers:
+            if headers.has_key("content-length"):
                 size = int(headers["Content-Length"])
             stayopen = reporthook(0, bs, size, self._userObject)
-            if stayopen == 0:
+            if stayopen==0:
                 raise KeyboardInterrupt
         bytesread = 0
         block = fp.read(bs)
         if reporthook:
             stayopen = reporthook(1, bs, size, self._userObject)
-            if stayopen == 0:
+            if stayopen==0:
                 raise KeyboardInterrupt
         while block:
             tfp.write(block)
             bytesread = bytesread + len(block)
-# print blocknum, bytesread, size,
-# if blocknum*blocksize!=bytesread:
-# print ' (*)'
-# else:
-# print
+##             print blocknum, bytesread, size,
+##             if blocknum*blocksize!=bytesread:
+##                 print ' (*)'
+##             else:
+##                 print
             if block and reporthook:
                 stayopen = reporthook(blocknum, bs, size, self._userObject)
-                if stayopen == 0:
+                if stayopen==0:
                     raise KeyboardInterrupt
             blocknum = blocknum + 1
             block = fp.read(bs)
@@ -144,25 +132,23 @@ class CDURLopener(urllib.URLopener):
         del tfp
         return result
 
-
 def sampleReportHook(blocknum, blocksize, size, userObj):
-    sizekb = size / 1024
-    percent = min(100, int(100.0 * float(blocknum * blocksize) / float(size)))
-    print "Read: %3d%% of %dK" % (percent, sizekb)
+    sizekb = size/1024
+    percent = min(100,int(100.0*float(blocknum*blocksize)/float(size)))
+    print "Read: %3d%% of %dK"%(percent,sizekb)
     return 1
 
 if __name__ == '__main__':
 
     import sys
-    if len(sys.argv) != 4:
+    if len(sys.argv)!=4:
         print 'Usage: cdurllib.py URL filename blocksize'
         sys.exit(1)
 
     url = sys.argv[1]
     filename = sys.argv[2]
     blocksize = int(sys.argv[3])
-
+    
     urlopener = CDURLopener()
-    fname, headers = urlopener.retrieve(
-        url, filename, sampleReportHook, blocksize)
+    fname, headers = urlopener.retrieve(url, filename, sampleReportHook, blocksize)
     print fname, 'written'
diff --git a/Packages/cdms2/Lib/cdurlparse.py b/Packages/cdms2/Lib/cdurlparse.py
index d88dd4087..e743ebbc8 100644
--- a/Packages/cdms2/Lib/cdurlparse.py
+++ b/Packages/cdms2/Lib/cdurlparse.py
@@ -9,26 +9,25 @@ from string import joinfields, splitfields, find, rfind
 
 # A classification of schemes ('' means apply by default)
 uses_relative = ['ftp', 'http', 'ldap', 'gopher', 'nntp', 'wais', 'file',
-                 'https', 'shttp',
-                 'prospero', '']
+		 'https', 'shttp',
+		 'prospero', '']
 uses_netloc = ['ftp', 'http', 'ldap', 'gopher', 'nntp', 'telnet', 'wais',
-               'file',
-               'https', 'shttp', 'snews',
-               'prospero', '']
+	       'file',
+	       'https', 'shttp', 'snews',
+	       'prospero', '']
 non_hierarchical = ['gopher', 'hdl', 'mailto', 'news', 'telnet', 'wais',
-                    'snews',
-                    ]
+		    'snews',
+		    ]
 uses_params = ['ftp', 'hdl', 'prospero', 'http', 'ldap',
-               'https', 'shttp',
-               '']
+	       'https', 'shttp',
+	       '']
 uses_query = ['http', 'ldap', 'wais',
-              'https', 'shttp',
-              'gopher',
-              '']
-uses_fragment = [
-    'ftp', 'hdl', 'http', 'ldap', 'gopher', 'news', 'nntp', 'wais',
-                 'https', 'shttp', 'snews',
-                 'file', 'prospero', '']
+	      'https', 'shttp',
+	      'gopher',
+	      '']
+uses_fragment = ['ftp', 'hdl', 'http', 'ldap', 'gopher', 'news', 'nntp', 'wais',
+		 'https', 'shttp', 'snews',
+		 'file', 'prospero', '']
 
 # Characters valid in scheme names
 scheme_chars = string.letters + string.digits + '+-.'
@@ -36,7 +35,6 @@ scheme_chars = string.letters + string.digits + '+-.'
 MAX_CACHE_SIZE = 20
 _parse_cache = {}
 
-
 def clear_cache():
     """Clear the parse cache."""
     global _parse_cache
@@ -48,141 +46,134 @@ def clear_cache():
 # Return a 6-tuple: (scheme, netloc, path, params, query, fragment).
 # Note that we don't break the components up in smaller bits
 # (e.g. netloc is a single string) and we don't expand % escapes.
-def urlparse(url, scheme='', allow_fragments=1):
-    key = url, scheme, allow_fragments
-    cached = _parse_cache.get(key, None)
-    if cached:
-        return cached
-    if len(_parse_cache) >= MAX_CACHE_SIZE:  # avoid runaway growth
-        clear_cache()
-    find = string.find
-    netloc = path = params = query = fragment = ''
-    i = find(url, ':')
-    if i > 0:
-        if url[:i] in ['http', 'ldap']:  # optimize the common case
-            scheme = string.lower(url[:i])
-            url = url[i + 1:]
-            if url[:2] == '//':
-                i = find(url, '/', 2)
-                if i < 0:
-                    i = len(url)
-                netloc = url[2:i]
-                url = url[i:]
-            if allow_fragments:
-                i = string.rfind(url, '#')
-                if i >= 0:
-                    fragment = url[i + 1:]
-                    url = url[:i]
-            i = find(url, '?')
-            if i >= 0:
-                query = url[i + 1:]
-                url = url[:i]
-            i = find(url, ';')
-            if i >= 0:
-                params = url[i + 1:]
-                url = url[:i]
-            tuple = scheme, netloc, url, params, query, fragment
-            _parse_cache[key] = tuple
-            return tuple
-        for c in url[:i]:
-            if c not in scheme_chars:
-                break
-        else:
-            scheme, url = string.lower(url[:i]), url[i + 1:]
-    if scheme in uses_netloc:
-        if url[:2] == '//':
-            i = find(url, '/', 2)
-            if i < 0:
-                i = len(url)
-            netloc, url = url[2:i], url[i:]
-    if allow_fragments and scheme in uses_fragment:
-        i = string.rfind(url, '#')
-        if i >= 0:
-            url, fragment = url[:i], url[i + 1:]
-    if scheme in uses_query:
-        i = find(url, '?')
-        if i >= 0:
-            url, query = url[:i], url[i + 1:]
-    if scheme in uses_params:
-        i = find(url, ';')
-        if i >= 0:
-            url, params = url[:i], url[i + 1:]
-    tuple = scheme, netloc, url, params, query, fragment
-    _parse_cache[key] = tuple
-    return tuple
+def urlparse(url, scheme = '', allow_fragments = 1):
+	key = url, scheme, allow_fragments
+	cached = _parse_cache.get(key, None)
+	if cached:
+		return cached
+	if len(_parse_cache) >= MAX_CACHE_SIZE:	# avoid runaway growth
+	    clear_cache()
+	find = string.find
+	netloc = path = params = query = fragment = ''
+	i = find(url, ':')
+	if i > 0:
+		if url[:i] in ['http','ldap']: # optimize the common case
+			scheme = string.lower(url[:i])
+			url = url[i+1:]
+			if url[:2] == '//':
+				i = find(url, '/', 2)
+				if i < 0:
+					i = len(url)
+				netloc = url[2:i]
+				url = url[i:]
+			if allow_fragments:
+				i = string.rfind(url, '#')
+				if i >= 0:
+					fragment = url[i+1:]
+					url = url[:i]
+			i = find(url, '?')
+			if i >= 0:
+				query = url[i+1:]
+				url = url[:i]
+			i = find(url, ';')
+			if i >= 0:
+				params = url[i+1:]
+				url = url[:i]
+			tuple = scheme, netloc, url, params, query, fragment
+			_parse_cache[key] = tuple
+			return tuple
+		for c in url[:i]:
+			if c not in scheme_chars:
+				break
+		else:
+			scheme, url = string.lower(url[:i]), url[i+1:]
+	if scheme in uses_netloc:
+		if url[:2] == '//':
+			i = find(url, '/', 2)
+			if i < 0:
+				i = len(url)
+			netloc, url = url[2:i], url[i:]
+	if allow_fragments and scheme in uses_fragment:
+		i = string.rfind(url, '#')
+		if i >= 0:
+			url, fragment = url[:i], url[i+1:]
+	if scheme in uses_query:
+		i = find(url, '?')
+		if i >= 0:
+			url, query = url[:i], url[i+1:]
+	if scheme in uses_params:
+		i = find(url, ';')
+		if i >= 0:
+			url, params = url[:i], url[i+1:]
+	tuple = scheme, netloc, url, params, query, fragment
+	_parse_cache[key] = tuple
+	return tuple
 
 # Put a parsed URL back together again.  This may result in a slightly
 # different, but equivalent URL, if the URL that was parsed originally
 # had redundant delimiters, e.g. a ? with an empty query (the draft
 # states that these are equivalent).
-
-
-def urlunparse(xxx_todo_changeme):
-    (scheme, netloc, url, params, query, fragment) = xxx_todo_changeme
-    if netloc or (scheme in uses_netloc and url[:2] == '//'):
-        if url[:1] != '/':
-            url = '/' + url
-        url = '//' + (netloc or '') + url
-    if scheme:
-        url = scheme + ':' + url
-    if params:
-        url = url + ';' + params
-    if query:
-        url = url + '?' + query
-    if fragment:
-        url = url + '#' + fragment
-    return url
+def urlunparse((scheme, netloc, url, params, query, fragment)):
+	if netloc or (scheme in uses_netloc and url[:2] == '//'):
+		if url[:1] != '/': url = '/' + url
+		url = '//' + (netloc or '') + url
+	if scheme:
+		url = scheme + ':' + url
+	if params:
+		url = url + ';' + params
+	if query:
+		url = url + '?' + query
+	if fragment:
+		url = url + '#' + fragment
+	return url
 
 # Join a base URL and a possibly relative URL to form an absolute
 # interpretation of the latter.
-
-
-def urljoin(base, url, allow_fragments=1):
-    if not base:
-        return url
-    bscheme, bnetloc, bpath, bparams, bquery, bfragment = \
-        urlparse(base, '', allow_fragments)
-    scheme, netloc, path, params, query, fragment = \
-        urlparse(url, bscheme, allow_fragments)
-    if scheme != bscheme or scheme not in uses_relative:
-        return urlunparse((scheme, netloc, path,
-                           params, query, fragment))
-    if scheme in uses_netloc:
-        if netloc:
-            return urlunparse((scheme, netloc, path,
-                               params, query, fragment))
-        netloc = bnetloc
-    if path[:1] == '/':
-        return urlunparse((scheme, netloc, path,
-                           params, query, fragment))
-    if not path:
-        return urlunparse((scheme, netloc, bpath,
-                           params, query or bquery, fragment))
-    i = rfind(bpath, '/')
-    if i >= 0:
-        path = bpath[:i] + '/' + path
-    segments = splitfields(path, '/')
-    if segments[-1] == '.':
-        segments[-1] = ''
-    while '.' in segments:
-        segments.remove('.')
-    while True:
-        i = 1
-        n = len(segments) - 1
-        while i < n:
-            if segments[i] == '..' and segments[i - 1]:
-                del segments[i - 1:i + 1]
-                break
-            i = i + 1
-        else:
-            break
-    if len(segments) == 2 and segments[1] == '..' and segments[0] == '':
-        segments[-1] = ''
-    elif len(segments) >= 2 and segments[-1] == '..':
-        segments[-2:] = ['']
-    return urlunparse((scheme, netloc, joinfields(segments, '/'),
-                       params, query, fragment))
-
+def urljoin(base, url, allow_fragments = 1):
+	if not base:
+		return url
+	bscheme, bnetloc, bpath, bparams, bquery, bfragment = \
+		urlparse(base, '', allow_fragments)
+	scheme, netloc, path, params, query, fragment = \
+		urlparse(url, bscheme, allow_fragments)
+	if scheme != bscheme or scheme not in uses_relative:
+		return urlunparse((scheme, netloc, path,
+				   params, query, fragment))
+	if scheme in uses_netloc:
+		if netloc:
+			return urlunparse((scheme, netloc, path,
+					   params, query, fragment))
+		netloc = bnetloc
+	if path[:1] == '/':
+		return urlunparse((scheme, netloc, path,
+				   params, query, fragment))
+	if not path:
+		return urlunparse((scheme, netloc, bpath,
+				   params, query or bquery, fragment))
+	i = rfind(bpath, '/')
+	if i >= 0:
+		path = bpath[:i] + '/' + path
+	segments = splitfields(path, '/')
+	if segments[-1] == '.':
+		segments[-1] = ''
+	while '.' in segments:
+		segments.remove('.')
+	while 1:
+		i = 1
+		n = len(segments) - 1
+		while i < n:
+			if segments[i] == '..' and segments[i-1]:
+				del segments[i-1:i+1]
+				break
+			i = i+1
+		else:
+			break
+	if len(segments) == 2 and segments[1] == '..' and segments[0] == '':
+		segments[-1] = ''
+	elif len(segments) >= 2 and segments[-1] == '..':
+		segments[-2:] = ['']
+	return urlunparse((scheme, netloc, joinfields(segments, '/'),
+			   params, query, fragment))
 
 def urldefrag(url):
     """Removes any existing fragment from URL.
@@ -231,37 +222,35 @@ test_input = """
 """
 # XXX The result for //g is actually http://g/; is this a problem?
 
-
 def test():
-    import sys
-    base = ''
-    if sys.argv[1:]:
-        fn = sys.argv[1]
-        if fn == '-':
-            fp = sys.stdin
-        else:
-            fp = open(fn)
-    else:
-        import StringIO
-        fp = StringIO.StringIO(test_input)
-    while True:
-        line = fp.readline()
-        if not line:
-            break
-        words = string.split(line)
-        if not words:
-            continue
-        url = words[0]
-        parts = urlparse(url)
-        print '%-10s : %s' % (url, parts)
-        abs = urljoin(base, url)
-        if not base:
-            base = abs
-        wrapped = '<URL:%s>' % abs
-        print '%-10s = %s' % (url, wrapped)
-        if len(words) == 3 and words[1] == '=':
-            if wrapped != words[2]:
-                print 'EXPECTED', words[2], '!!!!!!!!!!'
+	import sys
+	base = ''
+	if sys.argv[1:]:
+		fn = sys.argv[1]
+		if fn == '-':
+			fp = sys.stdin
+		else:
+			fp = open(fn)
+	else:
+		import StringIO
+		fp = StringIO.StringIO(test_input)
+	while 1:
+		line = fp.readline()
+		if not line: break
+		words = string.split(line)
+		if not words:
+			continue
+		url = words[0]
+		parts = urlparse(url)
+		print '%-10s : %s' % (url, parts)
+		abs = urljoin(base, url)
+		if not base:
+			base = abs
+		wrapped = '<URL:%s>' % abs
+		print '%-10s = %s' % (url, wrapped)
+		if len(words) == 3 and words[1] == '=':
+			if wrapped != words[2]:
+				print 'EXPECTED', words[2], '!!!!!!!!!!'
 
 if __name__ == '__main__':
-    test()
+	test()
diff --git a/Packages/cdms2/Lib/cdxmllib.py b/Packages/cdms2/Lib/cdxmllib.py
index bd7e2e45e..baa0f6dfb 100644
--- a/Packages/cdms2/Lib/cdxmllib.py
+++ b/Packages/cdms2/Lib/cdxmllib.py
@@ -12,7 +12,6 @@ import string
 
 version = '0.3'
 
-
 class Error(RuntimeError):
     pass
 
@@ -22,7 +21,7 @@ _S = '[ \t\r\n]+'                       # white space
 _opS = '[ \t\r\n]*'                     # optional white space
 _Name = '[a-zA-Z_:][-a-zA-Z0-9._:]*'    # valid XML name
 _QStr = "(?:'[^']*'|\"[^\"]*\")"        # quoted XML string
-illegal = re.compile('[^\t\r\n -\176\240-\377]')  # illegal chars in content
+illegal = re.compile('[^\t\r\n -\176\240-\377]') # illegal chars in content
 interesting = re.compile('[]&<]')
 
 amp = re.compile('&')
@@ -35,37 +34,37 @@ newline = re.compile('\n')
 attrfind = re.compile(
     _S + '(?P<name>' + _Name + ')'
     '(' + _opS + '=' + _opS +
-    '(?P<value>' + _QStr + '|[-a-zA-Z0-9.:+*%?!\(\)_#=~]+))?')
+    '(?P<value>'+_QStr+'|[-a-zA-Z0-9.:+*%?!\(\)_#=~]+))?')
 starttagopen = re.compile('<' + _Name)
 starttagend = re.compile(_opS + '(?P<slash>/?)>')
-starttagmatch = re.compile('<(?P<tagname>' + _Name + ')'
-                           '(?P<attrs>(?:' + attrfind.pattern + ')*)' +
-                           starttagend.pattern)
+starttagmatch = re.compile('<(?P<tagname>'+_Name+')'
+                      '(?P<attrs>(?:'+attrfind.pattern+')*)'+
+                      starttagend.pattern)
 endtagopen = re.compile('</')
 endbracket = re.compile(_opS + '>')
-endbracketfind = re.compile('(?:[^>\'"]|' + _QStr + ')*>')
+endbracketfind = re.compile('(?:[^>\'"]|'+_QStr+')*>')
 tagfind = re.compile(_Name)
 cdataopen = re.compile(r'<!\[CDATA\[')
 cdataclose = re.compile(r'\]\]>')
 # this matches one of the following:
 # SYSTEM SystemLiteral
 # PUBLIC PubidLiteral SystemLiteral
-_SystemLiteral = '(?P<%s>' + _QStr + ')'
+_SystemLiteral = '(?P<%s>'+_QStr+')'
 _PublicLiteral = '(?P<%s>"[-\'\(\)+,./:=?;!*#@$_%% \n\ra-zA-Z0-9]*"|' \
-    "'[-\(\)+,./:=?;!*#@$_%% \n\ra-zA-Z0-9]*')"
+                        "'[-\(\)+,./:=?;!*#@$_%% \n\ra-zA-Z0-9]*')"
 _ExternalId = '(?:SYSTEM|' \
-    'PUBLIC' + _S + _PublicLiteral % 'pubid' + \
-              ')' + _S + _SystemLiteral % 'syslit'
-doctype = re.compile('<!DOCTYPE' + _S + '(?P<name>' + _Name + ')'
-                     '(?:' + _S + _ExternalId + ')?' + _opS)
-xmldecl = re.compile('<\?xml' + _S +
-                     'version' + _opS + '=' + _opS + '(?P<version>' + _QStr + ')' +
-                     '(?:' + _S + 'encoding' + _opS + '=' + _opS +
-                     "(?P<encoding>'[A-Za-z][-A-Za-z0-9._]*'|"
-                     '"[A-Za-z][-A-Za-z0-9._]*"))?'
-                     '(?:' + _S + 'standalone' + _opS + '=' + _opS +
-                     '(?P<standalone>\'(?:yes|no)\'|"(?:yes|no)"))?' +
-                     _opS + '\?>')
+                 'PUBLIC'+_S+_PublicLiteral%'pubid'+ \
+              ')'+_S+_SystemLiteral%'syslit'
+doctype = re.compile('<!DOCTYPE'+_S+'(?P<name>'+_Name+')'
+                     '(?:'+_S+_ExternalId+')?'+_opS)
+xmldecl = re.compile('<\?xml'+_S+
+                     'version'+_opS+'='+_opS+'(?P<version>'+_QStr+')'+
+                     '(?:'+_S+'encoding'+_opS+'='+_opS+
+                        "(?P<encoding>'[A-Za-z][-A-Za-z0-9._]*'|"
+                        '"[A-Za-z][-A-Za-z0-9._]*"))?'
+                     '(?:'+_S+'standalone'+_opS+'='+_opS+
+                        '(?P<standalone>\'(?:yes|no)\'|"(?:yes|no)"))?'+
+                     _opS+'\?>')
 procopen = re.compile(r'<\?(?P<proc>' + _Name + ')' + _opS)
 procclose = re.compile(_opS + r'\?>')
 commentopen = re.compile('<!--')
@@ -76,10 +75,10 @@ attrtrans = string.maketrans(' \r\n\t', '    ')
 # definitions for XML namespaces
 _NCName = '[a-zA-Z_][-a-zA-Z0-9._]*'    # XML Name, minus the ":"
 ncname = re.compile(_NCName + '$')
-qname = re.compile('(?:(?P<prefix>' + _NCName + '):)?'  # optional prefix
+qname = re.compile('(?:(?P<prefix>' + _NCName + '):)?' # optional prefix
                    '(?P<local>' + _NCName + ')$')
 
-xmlns = re.compile('xmlns(?::(?P<ncname>' + _NCName + '))?$')
+xmlns = re.compile('xmlns(?::(?P<ncname>'+_NCName+'))?$')
 
 # XML parser base class -- find tags and call handler functions.
 # Usage: p = XMLParser(); p.feed(data); ...; p.close().
@@ -89,7 +88,6 @@ xmlns = re.compile('xmlns(?::(?P<ncname>' + _NCName + '))?$')
 # parser by calling self.handle_data() with some data as argument (the
 # data may be split up in arbitrary chunks).
 
-
 class XMLParser:
     attributes = {}                     # default, to be overridden
     elements = {}                       # default, to be overridden
@@ -105,18 +103,15 @@ class XMLParser:
     def __init__(self, **kw):
         self.__fixed = 0
         if 'accept_unquoted_attributes' in kw:
-            self.__accept_unquoted_attributes = kw[
-                'accept_unquoted_attributes']
+            self.__accept_unquoted_attributes = kw['accept_unquoted_attributes']
         if 'accept_missing_endtag_name' in kw:
-            self.__accept_missing_endtag_name = kw[
-                'accept_missing_endtag_name']
+            self.__accept_missing_endtag_name = kw['accept_missing_endtag_name']
         if 'map_case' in kw:
             self.__map_case = kw['map_case']
         if 'accept_utf8' in kw:
             self.__accept_utf8 = kw['accept_utf8']
         if 'translate_attribute_references' in kw:
-            self.__translate_attribute_references = kw[
-                'translate_attribute_references']
+            self.__translate_attribute_references = kw['translate_attribute_references']
         self.reset()
 
     def __fixelements(self):
@@ -154,7 +149,7 @@ class XMLParser:
         self.__seen_doctype = None
         self.__seen_starttag = 0
         self.__use_namespaces = 0
-        self.__namespaces = {'xml': None}   # xml is implicitly declared
+        self.__namespaces = {'xml':None}   # xml is implicitly declared
         # backward compatibility hack: if elements not overridden,
         # fill it in ourselves
         if self.elements is XMLParser.elements:
@@ -185,11 +180,11 @@ class XMLParser:
             del self.elements
 
     # Interface -- translate references
-    def translate_references(self, data, all=1):
+    def translate_references(self, data, all = 1):
         if not self.__translate_attribute_references:
             return data
         i = 0
-        while True:
+        while 1:
             res = amp.search(data, i)
             if res is None:
                 return data
@@ -197,7 +192,7 @@ class XMLParser:
             res = ref.match(data, s)
             if res is None:
                 self.syntax_error("bogus `&'")
-                i = s + 1
+                i = s+1
                 continue
             i = res.end(0)
             str = res.group(1)
@@ -209,23 +204,21 @@ class XMLParser:
                     str = chr(int(str[1:]))
                 if data[i - 1] != ';':
                     self.syntax_error("`;' missing after char reference")
-                    i = i - 1
+                    i = i-1
             elif all:
                 if str in self.entitydefs:
                     str = self.entitydefs[str]
                     rescan = 1
                 elif data[i - 1] != ';':
                     self.syntax_error("bogus `&'")
-                    i = s + 1  # just past the &
+                    i = s + 1 # just past the &
                     continue
                 else:
-                    self.syntax_error(
-                        "reference to unknown entity `&%s;'" %
-                        str)
+                    self.syntax_error("reference to unknown entity `&%s;'" % str)
                     str = '&' + str + ';'
             elif data[i - 1] != ';':
                 self.syntax_error("bogus `&'")
-                i = s + 1  # just past the &
+                i = s + 1 # just past the &
                 continue
 
             # when we get here, str contains the translated text and i points
@@ -276,72 +269,63 @@ class XMLParser:
                 self.handle_data(data)
                 self.lineno = self.lineno + data.count('\n')
             i = j
-            if i == n:
-                break
+            if i == n: break
             if rawdata[i] == '<':
                 if starttagopen.match(rawdata, i):
                     if self.literal:
                         data = rawdata[i]
                         self.handle_data(data)
                         self.lineno = self.lineno + data.count('\n')
-                        i = i + 1
+                        i = i+1
                         continue
                     k = self.parse_starttag(i)
-                    if k < 0:
-                        break
+                    if k < 0: break
                     self.__seen_starttag = 1
                     self.lineno = self.lineno + rawdata[i:k].count('\n')
                     i = k
                     continue
                 if endtagopen.match(rawdata, i):
                     k = self.parse_endtag(i)
-                    if k < 0:
-                        break
+                    if k < 0: break
                     self.lineno = self.lineno + rawdata[i:k].count('\n')
-                    i = k
+                    i =  k
                     continue
                 if commentopen.match(rawdata, i):
                     if self.literal:
                         data = rawdata[i]
                         self.handle_data(data)
                         self.lineno = self.lineno + data.count('\n')
-                        i = i + 1
+                        i = i+1
                         continue
                     k = self.parse_comment(i)
-                    if k < 0:
-                        break
+                    if k < 0: break
                     self.lineno = self.lineno + rawdata[i:k].count('\n')
                     i = k
                     continue
                 if cdataopen.match(rawdata, i):
                     k = self.parse_cdata(i)
-                    if k < 0:
-                        break
+                    if k < 0: break
                     self.lineno = self.lineno + rawdata[i:k].count('\n')
                     i = k
                     continue
                 res = xmldecl.match(rawdata, i)
                 if res:
                     if not self.__at_start:
-                        self.syntax_error(
-                            "<?xml?> declaration not at start of document")
+                        self.syntax_error("<?xml?> declaration not at start of document")
                     version, encoding, standalone = res.group('version',
                                                               'encoding',
                                                               'standalone')
                     if version[1:-1] != '1.0':
                         raise Error('only XML version 1.0 supported')
-                    if encoding:
-                        encoding = encoding[1:-1]
-                    if standalone:
-                        standalone = standalone[1:-1]
+                    if encoding: encoding = encoding[1:-1]
+                    if standalone: standalone = standalone[1:-1]
                     self.handle_xml(encoding, standalone)
                     i = res.end(0)
                     continue
                 res = procopen.match(rawdata, i)
                 if res:
                     k = self.parse_proc(i)
-                    if k < 0:
-                        break
+                    if k < 0: break
                     self.lineno = self.lineno + rawdata[i:k].count('\n')
                     i = k
                     continue
@@ -351,16 +335,14 @@ class XMLParser:
                         data = rawdata[i]
                         self.handle_data(data)
                         self.lineno = self.lineno + data.count('\n')
-                        i = i + 1
+                        i = i+1
                         continue
                     if self.__seen_doctype:
                         self.syntax_error('multiple DOCTYPE elements')
                     if self.__seen_starttag:
-                        self.syntax_error(
-                            'DOCTYPE not at beginning of document')
+                        self.syntax_error('DOCTYPE not at beginning of document')
                     k = self.parse_doctype(res)
-                    if k < 0:
-                        break
+                    if k < 0: break
                     self.__seen_doctype = res.group('name')
                     if self.__map_case:
                         self.__seen_doctype = self.__seen_doctype.lower()
@@ -371,14 +353,14 @@ class XMLParser:
                 if self.literal:
                     data = rawdata[i]
                     self.handle_data(data)
-                    i = i + 1
+                    i = i+1
                     continue
                 res = charref.match(rawdata, i)
                 if res is not None:
                     i = res.end(0)
-                    if rawdata[i - 1] != ';':
+                    if rawdata[i-1] != ';':
                         self.syntax_error("`;' missing in charref")
-                        i = i - 1
+                        i = i-1
                     if not self.stack:
                         self.syntax_error('data not in content')
                     self.handle_charref(res.group('char')[:-1])
@@ -387,15 +369,14 @@ class XMLParser:
                 res = entityref.match(rawdata, i)
                 if res is not None:
                     i = res.end(0)
-                    if rawdata[i - 1] != ';':
+                    if rawdata[i-1] != ';':
                         self.syntax_error("`;' missing in entityref")
-                        i = i - 1
+                        i = i-1
                     name = res.group('name')
                     if self.__map_case:
                         name = name.lower()
                     if name in self.entitydefs:
-                        self.rawdata = rawdata = rawdata[
-                            :res.start(0)] + self.entitydefs[name] + rawdata[i:]
+                        self.rawdata = rawdata = rawdata[:res.start(0)] + self.entitydefs[name] + rawdata[i:]
                         n = len(rawdata)
                         i = res.start(0)
                     else:
@@ -406,14 +387,14 @@ class XMLParser:
                 if self.literal:
                     data = rawdata[i]
                     self.handle_data(data)
-                    i = i + 1
+                    i = i+1
                     continue
-                if n - i < 3:
+                if n-i < 3:
                     break
                 if cdataclose.match(rawdata, i):
                     self.syntax_error("bogus `]]>'")
                 self.handle_data(rawdata[i])
-                i = i + 1
+                i = i+1
                 continue
             else:
                 raise Error('neither < nor & ??')
@@ -430,7 +411,7 @@ class XMLParser:
                 self.syntax_error('illegal character in content')
             self.handle_data(data)
             self.lineno = self.lineno + data.count('\n')
-            self.rawdata = rawdata[i + 1:]
+            self.rawdata = rawdata[i+1:]
             return self.goahead(end)
         self.rawdata = rawdata[i:]
         if end:
@@ -444,19 +425,19 @@ class XMLParser:
     # Internal -- parse comment, return length or -1 if not terminated
     def parse_comment(self, i):
         rawdata = self.rawdata
-        if rawdata[i:i + 4] != '<!--':
+        if rawdata[i:i+4] != '<!--':
             raise Error('unexpected call to handle_comment')
-        res = commentclose.search(rawdata, i + 4)
+        res = commentclose.search(rawdata, i+4)
         if res is None:
             return -1
-        if doubledash.search(rawdata, i + 4, res.start(0)):
+        if doubledash.search(rawdata, i+4, res.start(0)):
             self.syntax_error("`--' inside comment")
-        if rawdata[res.start(0) - 1] == '-':
+        if rawdata[res.start(0)-1] == '-':
             self.syntax_error('comment cannot end in three dashes')
         if not self.__accept_utf8 and \
-           illegal.search(rawdata, i + 4, res.start(0)):
+           illegal.search(rawdata, i+4, res.start(0)):
             self.syntax_error('illegal character in comment')
-        self.handle_comment(rawdata[i + 4: res.start(0)])
+        self.handle_comment(rawdata[i+4: res.start(0)])
         return res.end(0)
 
     # Internal -- handle DOCTYPE tag, return length or -1 if not terminated
@@ -469,15 +450,14 @@ class XMLParser:
         pubid, syslit = res.group('pubid', 'syslit')
         if pubid is not None:
             pubid = pubid[1:-1]         # remove quotes
-            pubid = ' '.join(pubid.split())  # normalize
-        if syslit is not None:
-            syslit = syslit[1:-1]  # remove quotes
+            pubid = ' '.join(pubid.split()) # normalize
+        if syslit is not None: syslit = syslit[1:-1] # remove quotes
         j = k = res.end(0)
         if k >= n:
             return -1
         if rawdata[k] == '[':
             level = 0
-            k = k + 1
+            k = k+1
             dq = sq = 0
             while k < n:
                 c = rawdata[k]
@@ -488,10 +468,10 @@ class XMLParser:
                 elif sq or dq:
                     pass
                 elif level <= 0 and c == ']':
-                    res = endbracket.match(rawdata, k + 1)
+                    res = endbracket.match(rawdata, k+1)
                     if res is None:
                         return -1
-                    self.handle_doctype(name, pubid, syslit, rawdata[j + 1:k])
+                    self.handle_doctype(name, pubid, syslit, rawdata[j+1:k])
                     return res.end(0)
                 elif c == '<':
                     level = level + 1
@@ -499,7 +479,7 @@ class XMLParser:
                     level = level - 1
                     if level < 0:
                         self.syntax_error("bogus `>' in DOCTYPE")
-                k = k + 1
+                k = k+1
         res = endbracketfind.match(rawdata, k)
         if res is None:
             return -1
@@ -511,31 +491,30 @@ class XMLParser:
     # Internal -- handle CDATA tag, return length or -1 if not terminated
     def parse_cdata(self, i):
         rawdata = self.rawdata
-        if rawdata[i:i + 9] != '<![CDATA[':
+        if rawdata[i:i+9] != '<![CDATA[':
             raise Error('unexpected call to parse_cdata')
-        res = cdataclose.search(rawdata, i + 9)
+        res = cdataclose.search(rawdata, i+9)
         if res is None:
             return -1
         if not self.__accept_utf8 and \
-           illegal.search(rawdata, i + 9, res.start(0)):
+           illegal.search(rawdata, i+9, res.start(0)):
             self.syntax_error('illegal character in CDATA')
         if not self.stack:
             self.syntax_error('CDATA not in content')
-        self.handle_cdata(rawdata[i + 9:res.start(0)])
+        self.handle_cdata(rawdata[i+9:res.start(0)])
         return res.end(0)
 
-    __xml_namespace_attributes = {'ns': None, 'src': None, 'prefix': None}
+    __xml_namespace_attributes = {'ns':None, 'src':None, 'prefix':None}
     # Internal -- handle a processing instruction tag
-
     def parse_proc(self, i):
         rawdata = self.rawdata
         end = procclose.search(rawdata, i)
         if end is None:
             return -1
         j = end.start(0)
-        if not self.__accept_utf8 and illegal.search(rawdata, i + 2, j):
+        if not self.__accept_utf8 and illegal.search(rawdata, i+2, j):
             self.syntax_error('illegal character in processing instruction')
-        res = tagfind.match(rawdata, i + 2)
+        res = tagfind.match(rawdata, i+2)
         if res is None:
             raise Error('unexpected call to parse_proc')
         k = res.end(0)
@@ -549,17 +528,13 @@ class XMLParser:
             # this must come after the <?xml?> declaration (if any)
             # and before the <!DOCTYPE> (if any).
             if self.__seen_doctype or self.__seen_starttag:
-                self.syntax_error(
-                    'xml:namespace declaration too late in document')
+                self.syntax_error('xml:namespace declaration too late in document')
             attrdict, namespace, k = self.parse_attributes(name, k, j)
             if namespace:
-                self.syntax_error(
-                    'namespace declaration inside namespace declaration')
+                self.syntax_error('namespace declaration inside namespace declaration')
             for attrname in attrdict.keys():
                 if not attrname in self.__xml_namespace_attributes:
-                    self.syntax_error(
-                        "unknown attribute `%s' in xml:namespace tag" %
-                        attrname)
+                    self.syntax_error("unknown attribute `%s' in xml:namespace tag" % attrname)
             if not 'ns' in attrdict or not 'prefix' in attrdict:
                 self.syntax_error('xml:namespace without required attributes')
             prefix = attrdict.get('prefix')
@@ -589,12 +564,10 @@ class XMLParser:
                 attrname = attrname.lower()
             i = res.end(0)
             if attrvalue is None:
-                self.syntax_error(
-                    "no value specified for attribute `%s'" %
-                    attrname)
+                self.syntax_error("no value specified for attribute `%s'" % attrname)
                 attrvalue = attrname
             elif attrvalue[:1] == "'" == attrvalue[-1:] or \
-                    attrvalue[:1] == '"' == attrvalue[-1:]:
+                 attrvalue[:1] == '"' == attrvalue[-1:]:
                 attrvalue = attrvalue[1:-1]
             elif not self.__accept_unquoted_attributes:
                 self.syntax_error("attribute `%s' value not quoted" % attrname)
@@ -604,7 +577,7 @@ class XMLParser:
                 ncname = res.group('ncname')
                 namespace[ncname or ''] = attrvalue or None
                 if not self.__use_namespaces:
-                    self.__use_namespaces = len(self.stack) + 1
+                    self.__use_namespaces = len(self.stack)+1
                 continue
             if '<' in attrvalue:
                 self.syntax_error("`<' illegal in attribute value")
@@ -618,7 +591,7 @@ class XMLParser:
     def parse_starttag(self, i):
         rawdata = self.rawdata
         # i points to start of tag
-        end = endbracketfind.match(rawdata, i + 1)
+        end = endbracketfind.match(rawdata, i+1)
         if end is None:
             return -1
         tag = starttagmatch.match(rawdata, i)
@@ -653,11 +626,10 @@ class XMLParser:
             if ns is not None:
                 nstag = ns + ' ' + nstag
             elif prefix != '':
-                nstag = prefix + ':' + nstag  # undo split
+                nstag = prefix + ':' + nstag # undo split
             self.stack[-1] = tagname, nsdict, nstag
         # translate namespace of attributes
-        attrnamemap = {}
-            # map from new name to old name (used for error reporting)
+        attrnamemap = {} # map from new name to old name (used for error reporting)
         for key in attrdict.keys():
             attrnamemap[key] = key
         if self.__use_namespaces:
@@ -690,9 +662,7 @@ class XMLParser:
         if attributes is not None:
             for key in attrdict.keys():
                 if not key in attributes:
-                    self.syntax_error(
-                        "unknown attribute `%s' in tag `%s'" %
-                        (attrnamemap[key], tagname))
+                    self.syntax_error("unknown attribute `%s' in tag `%s'" % (attrnamemap[key], tagname))
             for key, val in attributes.items():
                 if val is not None and not key in attrdict:
                     attrdict[key] = val
@@ -705,18 +675,18 @@ class XMLParser:
     # Internal -- parse endtag
     def parse_endtag(self, i):
         rawdata = self.rawdata
-        end = endbracketfind.match(rawdata, i + 1)
+        end = endbracketfind.match(rawdata, i+1)
         if end is None:
             return -1
-        res = tagfind.match(rawdata, i + 2)
+        res = tagfind.match(rawdata, i+2)
         if res is None:
             if self.literal:
                 self.handle_data(rawdata[i])
-                return i + 1
+                return i+1
             if not self.__accept_missing_endtag_name:
                 self.syntax_error('no name specified in end tag')
             tag = self.stack[-1][0]
-            k = i + 2
+            k = i+2
         else:
             tag = res.group(0)
             if self.__map_case:
@@ -724,7 +694,7 @@ class XMLParser:
             if self.literal:
                 if not self.stack or tag != self.stack[-1][0]:
                     self.handle_data(rawdata[i])
-                    return i + 1
+                    return i+1
             k = res.end(0)
         if endbracket.match(rawdata, k) is None:
             self.syntax_error('garbage in end tag')
@@ -757,9 +727,7 @@ class XMLParser:
                 return
         while len(self.stack) > found:
             if found < len(self.stack) - 1:
-                self.syntax_error(
-                    'missing close tag for %s' %
-                    self.stack[-1][2])
+                self.syntax_error('missing close tag for %s' % self.stack[-1][2])
             nstag = self.stack[-1][2]
             method = self.elements.get(nstag, (None, None))[1]
             if method is not None:
@@ -831,11 +799,8 @@ class XMLParser:
 
     # To be overridden -- handlers for unknown objects
     def unknown_starttag(self, tag, attrs): pass
-
     def unknown_endtag(self, tag): pass
-
     def unknown_charref(self, ref): pass
-
     def unknown_entityref(self, name):
         self.syntax_error("reference to unknown entity `&%s;'" % name)
 
@@ -848,34 +813,34 @@ class TestXMLParser(XMLParser):
 
     def handle_xml(self, encoding, standalone):
         self.flush()
-        print 'xml: encoding =', encoding, 'standalone =', standalone
+        print 'xml: encoding =',encoding,'standalone =',standalone
 
     def handle_doctype(self, tag, pubid, syslit, data):
         self.flush()
-        print 'DOCTYPE:', tag, repr(data)
+        print 'DOCTYPE:',tag, `data`
 
     def handle_data(self, data):
         self.testdata = self.testdata + data
-        if len(repr(self.testdata)) >= 70:
+        if len(`self.testdata`) >= 70:
             self.flush()
 
     def flush(self):
         data = self.testdata
         if data:
             self.testdata = ""
-            print 'data:', repr(data)
+            print 'data:', `data`
 
     def handle_cdata(self, data):
         self.flush()
-        print 'cdata:', repr(data)
+        print 'cdata:', `data`
 
     def handle_proc(self, name, data):
         self.flush()
-        print 'processing:', name, repr(data)
+        print 'processing:',name,`data`
 
     def handle_comment(self, data):
         self.flush()
-        r = repr(data)
+        r = `data`
         if len(r) > 68:
             r = r[:32] + '...' + r[-32:]
         print 'comment:', r
@@ -909,10 +874,8 @@ class TestXMLParser(XMLParser):
         XMLParser.close(self)
         self.flush()
 
-
-def test(args=None):
-    import sys
-    import getopt
+def test(args = None):
+    import sys, getopt
     from time import time
 
     if not args:
@@ -937,7 +900,7 @@ def test(args=None):
     else:
         try:
             f = open(file, 'r')
-        except IOError as msg:
+        except IOError, msg:
             print file, ":", msg
             sys.exit(1)
 
@@ -955,15 +918,15 @@ def test(args=None):
             for c in data:
                 x.feed(c)
             x.close()
-    except Error as msg:
+    except Error, msg:
         t1 = time()
         print msg
         if do_time:
-            print 'total time: %g' % (t1 - t0)
+            print 'total time: %g' % (t1-t0)
         sys.exit(1)
     t1 = time()
     if do_time:
-        print 'total time: %g' % (t1 - t0)
+        print 'total time: %g' % (t1-t0)
 
 
 if __name__ == '__main__':
diff --git a/Packages/cdms2/Lib/convention.py b/Packages/cdms2/Lib/convention.py
index 43086d8e4..4e8c9053e 100644
--- a/Packages/cdms2/Lib/convention.py
+++ b/Packages/cdms2/Lib/convention.py
@@ -1,6 +1,7 @@
 """ metadata conventions """
 
-from .error import CDMSError
+import string
+from error import CDMSError
 from UserList import UserList
 
 # On in order to turn off some warnings
@@ -8,20 +9,15 @@ WITH_GRIDSPEC_SUPPORT = True
 
 MethodNotImplemented = "Method not yet implemented"
 
-
 class AliasList (UserList):
-
     def __init__(self, alist):
-        UserList.__init__(self, alist)
-
-    def __setitem__(self, i, value):
-        self.data[i] = value.lower()
-
+        UserList.__init__(self,alist)
+    def __setitem__ (self, i, value):
+        self.data[i] = string.lower(value)
     def __setslice(self, i, j, values):
-        self.data[i:j] = map(lambda x: x.lower(), values)
-
+        self.data[i:j] = map(lambda x: string.lower(x), values)
     def append(self, value):
-        self.data.append(value.lower())
+        self.data.append(string.lower(value))
 
 level_aliases = AliasList(['plev'])
 longitude_aliases = AliasList([])
@@ -29,24 +25,23 @@ latitude_aliases = AliasList([])
 time_aliases = AliasList([])
 forecast_aliases = AliasList([])
 
-
 class AbstractConvention:
 
     def getAxisIds(self, vardict):
-        raise CDMSError(MethodNotImplemented)
+        raise CDMSError, MethodNotImplemented
 
     def getAxisAuxIds(self, vardict, axiskeys):
-        raise CDMSError(MethodNotImplemented)
+        raise CDMSError, MethodNotImplemented
 
     def getDsetnodeAuxAxisIds(self, dsetnode):
-        raise CDMSError(MethodNotImplemented)
+        raise CDMSError, MethodNotImplemented
 
     def axisIsLatitude(self, axis):
-        id = axis.id.lower()
+        id = string.lower(axis.id)
         return (id[0:3] == 'lat') or (id in latitude_aliases)
 
     def axisIsLongitude(self, axis):
-        id = axis.id.lower()
+        id = string.lower(axis.id)
         return (id[0:3] == 'lon') or (id in longitude_aliases)
 
     def getVarLatId(self, var, vardict=None):
@@ -55,7 +50,7 @@ class AbstractConvention:
 
         for obj in [d[0] for d in var.getDomain()]:
             if self.axisIsLatitude(obj):
-                if nlat == 0:
+                if nlat==0:
                     lat = obj
                 nlat += 1
         return (lat, nlat)
@@ -65,12 +60,11 @@ class AbstractConvention:
         nlon = 0
         for obj in [d[0] for d in var.getDomain()]:
             if self.axisIsLongitude(obj):
-                if nlon == 0:
+                if nlon==0:
                     lon = obj
                 nlon += 1
         return (lon, nlon)
 
-
 class NUGConvention(AbstractConvention):
 
     def __init__(self, version=None):
@@ -81,20 +75,18 @@ class NUGConvention(AbstractConvention):
         result = []
         for name in vardict.keys():
             dimensions = vardict[name].dimensions
-            if len(dimensions) == 1 and (name in dimensions):
+            if len(dimensions)==1 and (name in dimensions):
                 result.append(name)
         return result
 
     def getAxisAuxIds(self, vardict, axiskeys):
         return []
 
-
 class COARDSConvention(NUGConvention):
 
     def __init__(self, version=None):
         NUGConvention.__init__(self, version)
 
-
 class CFConvention(COARDSConvention):
 
     current = 'CF-1.0'
@@ -107,7 +99,7 @@ class CFConvention(COARDSConvention):
         coorddict = {}
         for var in vardict.values():
             if hasattr(var, 'coordinates'):
-                coordnames = var.coordinates.lower()
+                coordnames = string.split(var.coordinates)
                 for item in coordnames:
                     # Don't include if already a 1D coordinate axis.
                     if item in axiskeys:
@@ -120,11 +112,11 @@ class CFConvention(COARDSConvention):
                 # Note: not everything referenced by .coordinates attribute is
                 # in fact a coordinate axis, e.g., scalar coordinates
                 if not WITH_GRIDSPEC_SUPPORT:
-                    print 'Warning: coordinate attribute points to non-existent variable: %s' % key
+                    print 'Warning: coordinate attribute points to non-existent variable: %s'%key
                 del coorddict[key]
                 continue
             # Omit scalar dimensions, and dimensions greater than 2-D
-            if len(coord.shape) not in [1, 2]:
+            if len(coord.shape) not in [1,2]:
                 del coorddict[key]
         return coorddict.keys()
 
@@ -135,16 +127,15 @@ class CFConvention(COARDSConvention):
         for node in dsetdict.values():
             coordnames = node.getExternalAttr('coordinates')
             if coordnames is not None:
-                coordnames = coordnames.split()
+                coordnames = string.split(coordnames)
                 for item in coordnames:
                     # Don't include if already a 1D coordinate axis.
-                    if item in dsetdict and dsetdict[item].tag == 'axis':
+                    if dsetdict.has_key(item) and dsetdict[item].tag=='axis':
                         continue
                     # It's not an axis node, so must be a variable, so getDomain is defined.
-                    # Check the rank, don't include if not 1D or 2D (e.g.,
-                    # scalar coordinate)
+                    # Check the rank, don't include if not 1D or 2D (e.g., scalar coordinate)
                     domnode = dsetdict[item].getDomain()
-                    if domnode.getChildCount() not in [1, 2]:
+                    if domnode.getChildCount() not in [1,2]:
                         continue
                     coorddict[item] = 1
         return coorddict.keys()
@@ -158,21 +149,21 @@ class CFConvention(COARDSConvention):
             return (lat, nlat)
 
         if hasattr(var, 'coordinates'):
-            coordnames = var.coordinates.split()
+            coordnames = string.split(var.coordinates)
             for name in coordnames:
                 coord = vardict.get(name)
 
                 # Note: not everything referenced by .coordinates attribute is
                 # in fact a coordinate axis, e.g., scalar coordinates
                 if coord is not None and hasattr(coord, 'isLatitude') and coord.isLatitude():
-                    if nlat == 0:
+                    if nlat==0:
                         lat = coord
                     nlat += 1
         if lat is None:
             lat, nlat = AbstractConvention.getVarLatId(self, var, vardict)
 
         return (lat, nlat)
-
+                
     def getVarLonId(self, var, vardict):
         lon = None
         nlon = 0
@@ -182,37 +173,37 @@ class CFConvention(COARDSConvention):
             return (lon, nlon)
 
         if hasattr(var, 'coordinates'):
-            coordnames = var.coordinates.split()
+            coordnames = string.split(var.coordinates)
             for name in coordnames:
                 coord = vardict.get(name)
 
                 # Note: not everything referenced by .coordinates attribute is
                 # in fact a coordinate axis, e.g., scalar coordinates
                 if coord is not None and hasattr(coord, 'isLongitude') and coord.isLongitude():
-                    if nlon == 0:
+                    if nlon==0:
                         lon = coord
                     nlon += 1
         if lon is None:
             lon, nlon = AbstractConvention.getVarLonId(self, var, vardict)
 
         return (lon, nlon)
-
+                
     def axisIsLatitude(self, axis):
-        if (hasattr(axis, 'axis') and axis.axis == 'Y'):
+        if (hasattr(axis,'axis') and axis.axis=='Y'):
             return 1
-        elif (hasattr(axis, 'units') and axis.units.lower() in ['degrees_north', 'degree_north', 'degree_n', 'degrees_n', 'degreen', 'degreesn']):
+        elif (hasattr(axis, 'units') and string.lower(axis.units) in ['degrees_north', 'degree_north', 'degree_n', 'degrees_n', 'degreen', 'degreesn']):
             return 1
-        elif (hasattr(axis, 'standard_name') and axis.standard_name.lower() == 'latitude'):
+        elif (hasattr(axis, 'standard_name') and string.lower(axis.standard_name)=='latitude'):
             return 1
         else:
             return AbstractConvention.axisIsLatitude(self, axis)
-
+        
     def axisIsLongitude(self, axis):
-        if (hasattr(axis, 'axis') and axis.axis == 'X'):
+        if (hasattr(axis,'axis') and axis.axis=='X'):
             return 1
-        elif (hasattr(axis, 'units') and axis.units.lower() in ['degrees_east', 'degree_east', 'degree_e', 'degrees_e', 'degreee', 'degreese']):
+        elif (hasattr(axis, 'units') and string.lower(axis.units) in ['degrees_east', 'degree_east', 'degree_e', 'degrees_e', 'degreee', 'degreese']):
             return 1
-        elif (hasattr(axis, 'standard_name') and axis.standard_name.lower() == 'longitude'):
+        elif (hasattr(axis, 'standard_name') and string.lower(axis.standard_name)=='longitude'):
             return 1
         else:
             return AbstractConvention.axisIsLongitude(self, axis)
@@ -221,10 +212,10 @@ class CFConvention(COARDSConvention):
         """Get the bounds variable for the variable, from a dataset or file."""
         if hasattr(var, 'bounds'):
             boundsid = var.bounds
-            if boundsid in dset.variables:
+            if dset.variables.has_key(boundsid):
                 result = dset[boundsid]
             else:
-                print 'Warning: bounds variable not found in %s: %s' % (dset.id, boundsid)
+                print 'Warning: bounds variable not found in %s: %s'%(dset.id, boundsid)
                 result = None
         else:
             result = None
@@ -235,7 +226,7 @@ NUG = NUGConvention()
 COARDS = COARDSConvention()
 CF1 = CFConvention('CF-1')
 
-
 def getDatasetConvention(dset):
     "Return an appropriate convention object. dset is a file or dataset object"
     return CF1
+
diff --git a/Packages/cdms2/Lib/coord.py b/Packages/cdms2/Lib/coord.py
index 8935220af..6f7773fd1 100644
--- a/Packages/cdms2/Lib/coord.py
+++ b/Packages/cdms2/Lib/coord.py
@@ -1,25 +1,26 @@
-# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
-# Further modified to be pure new numpy June 24th 2008
+## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by 
+## Further modified to be pure new numpy June 24th 2008
 
 """
 CDMS CoordinateAxis objects
 """
 import sys
-from . import cdmsNode
+import cdmsNode
 import cdtime
 import copy
 import numpy
-# import internattr
-from .cdmsobj import CdmsObj
-from .axis import createAxis, TransientVirtualAxis
-from .error import CDMSError
-from .convention import AliasList, level_aliases, longitude_aliases, latitude_aliases, time_aliases,\
-    forecast_aliases
-from .fvariable import FileVariable
-from .variable import DatasetVariable
-from .tvariable import TransientVariable
-from .avariable import AbstractVariable
-from functools import reduce
+#import internattr
+import types
+import string
+from cdmsobj import CdmsObj
+from axis import createAxis, TransientVirtualAxis
+from error import CDMSError
+from convention import AliasList, level_aliases, longitude_aliases, latitude_aliases, time_aliases,\
+     forecast_aliases
+from fvariable import FileVariable
+from variable import DatasetVariable
+from tvariable import TransientVariable
+from avariable import AbstractVariable
 
 MethodNotImplemented = "Method not yet implemented"
 NoSuchAxisOrGrid = "No such axis or grid: "
@@ -29,38 +30,34 @@ std_axis_attributes = ['name', 'units', 'length', 'values', 'bounds']
 
 # Map between cdtime calendar and CF tags
 calendarToTag = {
-    cdtime.MixedCalendar: 'gregorian',
-    cdtime.NoLeapCalendar: 'noleap',
-    cdtime.GregorianCalendar: 'proleptic_gregorian',
-    cdtime.JulianCalendar: 'julian',
-    cdtime.Calendar360: '360_day'
-}
+    cdtime.MixedCalendar : 'gregorian',
+    cdtime.NoLeapCalendar : 'noleap',
+    cdtime.GregorianCalendar : 'proleptic_gregorian',
+    cdtime.JulianCalendar : 'julian',
+    cdtime.Calendar360 : '360_day'
+    }
 
 tagToCalendar = {
-    'gregorian': cdtime.MixedCalendar,
-    'standard': cdtime.GregorianCalendar,
-    'noleap': cdtime.NoLeapCalendar,
-    'julian': cdtime.JulianCalendar,
-    'proleptic_gregorian': cdtime.GregorianCalendar,
-    '360_day': cdtime.Calendar360,
-    '360': cdtime.Calendar360,
-    '365_day': cdtime.NoLeapCalendar,
-}
+    'gregorian' : cdtime.MixedCalendar,
+    'standard' : cdtime.GregorianCalendar,
+    'noleap' : cdtime.NoLeapCalendar,
+    'julian' : cdtime.JulianCalendar,
+    'proleptic_gregorian' : cdtime.GregorianCalendar,
+    '360_day' : cdtime.Calendar360,
+    '360' : cdtime.Calendar360,
+    '365_day' : cdtime.NoLeapCalendar,
+    }
 
 # This is not an error message, it is used to detect which things have
 # been left as default indices or coordinates.
 unspecified = "No value specified."
 
 # Create a transient axis
-
-
 def createCoordinateAxis(data, bounds=None, id=None, copy=0):
     return TransientAxis(data, bounds, id, copy=copy)
 
 # AbstractCoordinateAxis defines the common interface
 # for coordinate variables/axes.
-
-
 class AbstractCoordinateAxis(CdmsObj):
 
     axis_count = 0                      # Transient axis count
@@ -68,15 +65,15 @@ class AbstractCoordinateAxis(CdmsObj):
     def __init__(self, parent=None, variableNode=None, bounds=None):
         CdmsObj.__init__(self, variableNode)
         self._bounds_ = bounds
-
+        
     def isAbstractCoordinate(self):
         return 1
 
-    def clone(self, copyData=1):
+    def clone (self, copyData=1):
         """clone (self, copyData=1)
         Return a copy of self as a transient axis.
         If copyData is 1, make a separate copy of the data."""
-        raise CDMSError(MethodNotImplemented)
+        raise CDMSError, MethodNotImplemented
 
     # Designate axis as a latitude axis.
     # If persistent is true, write metadata to the container.
@@ -120,17 +117,17 @@ class AbstractCoordinateAxis(CdmsObj):
     # or None. If the axis does not have a calendar attribute, return the global
     # calendar.
     def getCalendar(self):
-        if hasattr(self, 'calendar'):
-            calendar = self.calendar.lower()
+        if hasattr(self,'calendar'):
+            calendar = string.lower(self.calendar)
         else:
             calendar = None
 
-        cdcal = tagToCalendar.get(calendar, None)
+        cdcal = tagToCalendar.get(calendar,None)
         return cdcal
 
     def getData(self):
-        raise CDMSError(MethodNotImplemented)
-
+        raise CDMSError, MethodNotImplemented
+ 
     # Return None if not explicitly defined
     def getExplicitBounds(self):
         if self._bounds_ is not None:
@@ -140,8 +137,7 @@ class AbstractCoordinateAxis(CdmsObj):
 
     def info(self, flag=None, device=None):
         "Write info about axis; include dimension values and weights if flag"
-        if device is None:
-            device = sys.stdout
+        if device is None: device = sys.stdout
         device.write(str(self))
 
     # Return true iff the axis is a latitude axis
@@ -151,9 +147,8 @@ class AbstractCoordinateAxis(CdmsObj):
 
     # Return true iff the axis is a level axis
     def isLevel(self):
-        id = self.id.lower()
-        if (hasattr(self, 'axis') and self.axis == 'Z'):
-            return 1
+        id = string.lower(self.id)
+        if (hasattr(self,'axis') and self.axis=='Z'): return 1
         return ((id[0:3] == 'lev') or (id[0:5] == 'depth') or (id in level_aliases))
 
     # Return true iff the axis is a longitude axis
@@ -163,31 +158,25 @@ class AbstractCoordinateAxis(CdmsObj):
 
     # Return true iff the axis is a time axis
     def isTime(self):
-        id = self.id.lower()
-        if (hasattr(self, 'axis') and self.axis == 'T'):
-            return 1
+        id = string.lower(self.id)
+        if (hasattr(self,'axis') and self.axis=='T'): return 1
         return (id[0:4] == 'time') or (id in time_aliases)
 
     # Return true iff the axis is a forecast axis
     def isForecast(self):
-        id = self.id.lower()
-        if (hasattr(self, 'axis') and self.axis == 'F'):
-            return 1
+        id = string.lower(self.id)
+        if (hasattr(self,'axis') and self.axis=='F'): return 1
         return (id[0:6] == 'fctau0') or (id in forecast_aliases)
 
-    def listall(self, all=None):
+    def listall (self, all=None):
         "Get list of info about this axis."
         aname = self.id
         result = []
         result.append('   id: ' + aname)
-        if self.isLatitude():
-            result.append('   Designated a latitude axis.')
-        if self.isLongitude():
-            result.append('   Designated a longitude axis.')
-        if self.isTime():
-            result.append('   Designated a time axis.')
-        if self.isLevel():
-            result.append('   Designated a level axis.')
+        if self.isLatitude(): result.append('   Designated a latitude axis.')
+        if self.isLongitude(): result.append('   Designated a longitude axis.')
+        if self.isTime(): result.append('   Designated a time axis.')
+        if self.isLevel(): result.append('   Designated a level axis.')
         try:
             units = self.units
             result.append('   units:  ' + units)
@@ -197,12 +186,11 @@ class AbstractCoordinateAxis(CdmsObj):
         result.append('   Shape: ' + str(d.shape))
         flag = 1
         for k in self.attributes.keys():
-            if k in std_axis_attributes:
-                continue
+            if k in std_axis_attributes: continue
             if flag:
                 result.append('   Other axis attributes:')
                 flag = 0
-            result.append('      ' + k + ': ' + str(self.attributes[k]))
+            result.append('      '+k+': '+str(self.attributes[k]))
         result.append('   Python id:  %s' % hex(id(self)))
 
         if all:
@@ -227,106 +215,86 @@ class AbstractCoordinateAxis(CdmsObj):
         if persistent:
             self.calendar = calendarToTag.get(calendar, None)
             if self.calendar is None:
-                raise CDMSError(InvalidCalendar + calendar)
+                raise CDMSError, InvalidCalendar + calendar
         else:
             self.__dict__['calendar'] = calendarToTag.get(calendar, None)
             if self.__dict__['calendar'] is None:
-                raise CDMSError(InvalidCalendar + calendar)
+                raise CDMSError, InvalidCalendar + calendar
 
-    def size(self, axis=None):
+    def size (self, axis = None):
         "Number of elements in array, or in a particular axis."
         s = self.shape
         if axis is None:
             if len(s) == 0:
                 return 1
             else:
-                return reduce(lambda x, y: x * y, s)
+                return reduce(lambda x,y: x*y, s)
         else:
             return s[axis]
-
+        
     def writeToFile(self, file):
 
         if self._bounds_ is not None:
-            if hasattr(self, "bounds"):
+            if hasattr(self,"bounds"):
                 boundsid = self.bounds
             else:
-                boundsid = "bounds_" + self.id
+                boundsid = "bounds_"+self.id
             self.bounds = boundsid
 
         fvar = file.write(self)
 
-        # Create the bounds variable
-        if (self._bounds_ is not None) and boundsid not in file.variables:
+        # Create the bounds variable 
+        if (self._bounds_ is not None) and not file.variables.has_key(boundsid):
             boundslen = self._bounds_.shape[-1]
             try:
                 boundid = self._bounds_.getAxis(-1).id
-                boundsaxis = file.getBoundsAxis(boundslen, boundid=boundid)
+                boundsaxis = file.getBoundsAxis(boundslen,boundid=boundid)
             except:
                 boundsaxis = file.getBoundsAxis(boundslen)
-
+            
             axislist = fvar.getAxisList()
             axislist.append(boundsaxis)
-            boundsvar = file.createVariable(
-                boundsid,
-                cdmsNode.NumericToCdType.get(self.dtype.char),
-                axislist)
+            boundsvar = file.createVariable(boundsid, cdmsNode.NumericToCdType.get(self.dtype.char), axislist)
             boundsvar[:] = self._bounds_.astype(boundsvar.dtype)
         return fvar
 
-
 class AbstractAxis2D(AbstractCoordinateAxis):
 
-    def __init__(self, parent=None, variableNode=None, bounds=None):
-        AbstractCoordinateAxis.__init__(
-            self,
-            parent,
-            variableNode,
-            bounds=bounds)
+    def __init__ (self, parent=None, variableNode=None, bounds=None):
+        AbstractCoordinateAxis.__init__(self, parent, variableNode, bounds=bounds)
 
-    def clone(self, copyData=1):
+    def clone (self, copyData=1):
         """clone (self, copyData=1)
         Return a copy of self as a transient axis.
         If copyData is 1, make a separate copy of the data."""
-        result = TransientAxis2D(
-            self[:],
-            copy=copyData,
-            axes=self.getAxisList(),
-            attributes=self.attributes,
-            bounds=self.getBounds())
+        result = TransientAxis2D(self[:], copy=copyData, axes=self.getAxisList(), attributes=self.attributes, bounds=self.getBounds())
         return result
 
     def setBounds(self, bounds):
         if bounds is not None:
-            if len(bounds.shape) != 3:
-                raise CDMSError('Bounds must have rank=3')
-            if bounds.shape[0:2] != self.shape:
-                raise CDMSError(
-                    'Bounds shape %s is inconsistent with axis shape %s' %
-                    (repr(bounds.shape), repr(self.shape)))
+            if len(bounds.shape)!=3:
+                raise CDMSError, 'Bounds must have rank=3'
+            if bounds.shape[0:2]!=self.shape:
+                raise CDMSError, 'Bounds shape %s is inconsistent with axis shape %s'%(`bounds.shape`,`self.shape`)
         AbstractCoordinateAxis.setBounds(self, bounds)
 
-    def subSlice(self, *specs, **keys):
+    def subSlice (self, *specs, **keys):
         # Take a subslice, returning a TransientAxis2D
         avar = AbstractVariable.subSlice(self, *specs, **keys)
         bounds = self.getBounds()
         if bounds is None:
             newbounds = None
         else:
-            newbounds = bounds[
-                specs]   # bounds can be a numarray or DatasetVariable
+            newbounds = bounds[specs]   # bounds can be a numarray or DatasetVariable
 
-        # Note: disable axis copy to preserve identity of grid and variable
-        # domains
-        result = TransientAxis2D(avar, bounds=newbounds, copyaxes=0)
+        # Note: disable axis copy to preserve identity of grid and variable domains
+        result = TransientAxis2D(avar, bounds=newbounds, copyaxes=0)    
         return result
 
 # Two-dimensional coordinate axis in a dataset.
-
-
 class DatasetAxis2D(AbstractAxis2D, DatasetVariable):
 
     # Note: node is a VariableNode
-
     def __init__(self, parent, id=None, variableNode=None, bounds=None):
         AbstractAxis2D.__init__(self, parent, variableNode, bounds=bounds)
         DatasetVariable.__init__(self, parent, id, variableNode)
@@ -334,16 +302,13 @@ class DatasetAxis2D(AbstractAxis2D, DatasetVariable):
 
     def __repr__(self):
         if self.parent is not None:
-            return "<DatasetAxis2D: %s, file: %s, shape: %s>" % (self.id, self.parent.id, repr(self.shape))
+            return "<DatasetAxis2D: %s, file: %s, shape: %s>"%(self.id, self.parent.id, `self.shape`)
         else:
-            return "<DatasetAxis2D: %s, file: **CLOSED**>" % self.id
+            return "<DatasetAxis2D: %s, file: **CLOSED**>"%self.id
 
-# internattr.initialize_internal_attributes(DatasetAxis2D) Copy internal
-# attrs from parents
+## internattr.initialize_internal_attributes(DatasetAxis2D) Copy internal attrs from parents
 
 # Two-dimensional coordinate axis in a file.
-
-
 class FileAxis2D(AbstractAxis2D, FileVariable):
 
     def __init__(self, parent, id, obj=None, bounds=None):
@@ -353,18 +318,15 @@ class FileAxis2D(AbstractAxis2D, FileVariable):
 
     def __repr__(self):
         if self.parent is not None:
-            return "<FileAxis2D: %s, file: %s, shape: %s>" % (self.id, self.parent.id, repr(self.shape))
+            return "<FileAxis2D: %s, file: %s, shape: %s>"%(self.id, self.parent.id, `self.shape`)
         else:
-            return "<FileAxis2D: %s, file: **CLOSED**>" % self.id
-
-# internattr.initialize_internal_attributes(FileAxis2D) # Copy internal
-# attrs from parents
+            return "<FileAxis2D: %s, file: **CLOSED**>"%self.id
 
+## internattr.initialize_internal_attributes(FileAxis2D) # Copy internal attrs from parents
 
 class TransientAxis2D(AbstractAxis2D, TransientVariable):
 
-    def __init__(
-        self, data, typecode=None, copy=0, savespace=0, mask=None, fill_value=None,
+    def __init__(self, data, typecode=None, copy=0, savespace=0, mask=None, fill_value=None,
                  axes=None, attributes=None, id=None, copyaxes=1, bounds=None):
         """Create a transient 2D axis.
         All arguments are as for TransientVariable.
@@ -372,12 +334,11 @@ class TransientAxis2D(AbstractAxis2D, TransientVariable):
           nvert is the max number of vertices per cell.
         """
         AbstractAxis2D.__init__(self, None, None, bounds=bounds)
-        TransientVariable.__init__(
-            self, data, typecode=typecode, copy=copy, savespace=savespace,
+        TransientVariable.__init__(self, data, typecode=typecode, copy=copy, savespace=savespace,
                                    mask=mask, fill_value=fill_value, axes=axes, attributes=attributes,
                                    id=id, copyaxes=copyaxes)
         if axes is not None:
             self.setBounds(bounds)
 
-# internattr.initialize_internal_attributes(TransientAxis2D) # Copy
-# internal attrs from parents
+## internattr.initialize_internal_attributes(TransientAxis2D) # Copy internal attrs from parents
+
diff --git a/Packages/cdms2/Lib/cudsinterface.py b/Packages/cdms2/Lib/cudsinterface.py
index 04673c28e..c97f5fdef 100644
--- a/Packages/cdms2/Lib/cudsinterface.py
+++ b/Packages/cdms2/Lib/cudsinterface.py
@@ -1,46 +1,42 @@
-# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
-# Further modified to be pure new numpy June 24th 2008
+## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by 
+## Further modified to be pure new numpy June 24th 2008
 
 "Emulation of old cu package"
-import sys
-from .error import CDMSError
-from .dataset import openDataset, createDataset
-from .tvariable import createVariable
+import string, types, sys
+from error import CDMSError
+from dataset import openDataset, createDataset
+from tvariable import createVariable
 import numpy
 
-
 class cuDataset():
-
     "A mixin class to support the old cu interface"
-
-    def __init__(self):
+    def __init__ (self):
         self.cleardefault()
 
-    def __call__(self, id, *args, **kwargs):
+    def __call__ (self, id, *args, **kwargs):
         """Call a variable object with the given id. Exception if not found.
            Call the variable with the other arguments.
         """
-# note defined here because this is the class all the dataset-type classes
-# inherit
+# note defined here because this is the class all the dataset-type classes inherit
         v = self.variables.get(id)
         if v is None:
             try:
-                if (self.is_gridspec_grid_file() and
-                     (id == '' or id == 'grid' or id == 'gridspec') and
-                     len(args) == 0 and len(kwargs) == 0
-                    ):
+                if ( self.is_gridspec_grid_file() and
+                     ( id=='' or id=='grid' or id=='gridspec' ) and
+                     len(args)==0 and len(kwargs)==0
+                     ):
                     return self.readg()
                 else:
-                    raise CDMSError("No such variable or grid, " + id)
-            except (AttributeError, TypeError):
-                raise CDMSError("No such variable, " + id)
+                    raise CDMSError, "No such variable or grid, " + id
+            except ( AttributeError, TypeError ):
+                raise CDMSError, "No such variable, " + id
         return v(*args, **kwargs)
 
     def __getitem__(self, key):
         """Implement f['varname'] for file/dataset f.
         """
         for d in [self.variables, self.axes, self.grids]:
-            if key in d:
+            if d.has_key(key):
                 result = d[key]
                 break
         else:
@@ -52,19 +48,19 @@ class cuDataset():
         try:
             v = self.variables[vname]
         except KeyError:
-            raise CDMSError("No variable named " + vname + " in file " +
-                  self.id)
+            raise CDMSError, "No variable named " + vname + " in file " + \
+                  self.id
         return v
 
-    def default_variable(self, vname):
+    def default_variable (self, vname):
         "Set the default variable name."
         self.__dict__['default_variable_name'] = vname
 
-    def cleardefault(self):
+    def cleardefault (self):
         "Clear the default variable name."
         self.default_variable("no_default_variable_name_specified")
-
-    def listall(self, vname=None, all=None):
+    
+    def listall (self, vname=None, all=None):
         """Get info about data from the file.
         :::
         Options:::
@@ -72,12 +68,11 @@ class cuDataset():
         all :: (None/True/False/int) (None) include axes information
         :::
         """
-        if vname is None:
-            vname = self.default_variable_name
+        if vname is None: vname = self.default_variable_name
         try:
             m = numpy.get_printoptions()['threshold']
             result = []
-            result.append('*** Description of slab %s in file %s***' %
+            result.append('*** Description of slab %s in file %s***' % \
                           (vname, self.id))
             result.append('Name: ' + vname)
             v = self._v(vname)
@@ -99,24 +94,23 @@ class cuDataset():
                 result.append('Last: ' + str(axis[-1]))
                 if all:
                     result.append(str(self.dimensionarray(axis.id, vname)))
-            result.append('*** End of description of %s ***' % vname)
+            result.append ('*** End of description of %s ***' %vname)
             return result
         finally:
-            numpy.set_printoptions(threshold=m)
-
-    def listattribute(self, vname=None):
+            numpy.set_printoptions (threshold=m)
+        
+    def listattribute (self, vname=None):
         """Get attributes of data from the file.
         :::
         Options:::
         vname :: (str/None) (None) variable name
         :::
         """
-        if vname is None:
-            vname = self.default_variable_name
+        if vname is None: vname = self.default_variable_name
         v = self._v(vname)
         return v.attributes.keys()
 
-    def listdimension(self, vname=None):
+    def listdimension (self, vname=None):
         """Return a list of the dimension names associated with a variable.
            If no argument, return the file.axes.keys()
         :::
@@ -124,20 +118,20 @@ class cuDataset():
         vname :: (str/None) (None) variable name
         :::
         """
-        if vname is None:
+        if vname is None: 
             return self.axes.keys()
         v = self._v(vname)
         d = v.getDomain()
         x = map(lambda n: n[0], d)
-        return map(lambda n: getattr(n, 'id'), x)
+        return map (lambda n: getattr(n, 'id'), x)
 
-    def listglobal(self):
+    def listglobal (self):
         """Returns a list of the global attributes in the file.
         :::
         """
         return self.attributes.keys()
 
-    def listvariable(self):
+    def listvariable (self):
         """Return a list of the variables in the file.
         :::
         """
@@ -145,37 +139,35 @@ class cuDataset():
 
     listvariables = listvariable
 
-    def showglobal(self, device=None):
+    def showglobal (self, device=None):
         """Show the global attributes in the file.
         :::
         Options:::
         device :: (None/file) (None) output device
         :::
         """
-        if device is None:
-            device = sys.stdout
+        if device is None: device=sys.stdout
         device.write("Global attributes in file ")
         device.write(self.id)
         device.write(":\n")
         device.write(str(self.listglobal()))
         device.write("\n")
 
-    def showvariable(self, device=None):
+    def showvariable (self, device=None):
         """Show the variables in the file.
         :::
         Options:::
         device :: (None/file) (None) output device
         :::
         """
-        if device is None:
-            device = sys.stdout
+        if device is None: device=sys.stdout
         device.write("Variables in file ")
         device.write(self.id)
         device.write(":\n")
         device.write(str(self.listvariable()))
         device.write("\n")
 
-    def showattribute(self, vname=None, device=None):
+    def showattribute (self, vname=None, device=None):
         """Show the attributes of vname.
         :::
         Options:::
@@ -183,10 +175,8 @@ class cuDataset():
         device :: (None/file) (None) output device
         :::
         """
-        if device is None:
-            device = sys.stdout
-        if vname is None:
-            vname = self.default_variable_name
+        if device is None: device=sys.stdout
+        if vname is None: vname = self.default_variable_name
         device.write("Attributes of ")
         device.write(vname)
         device.write(" in file ")
@@ -194,8 +184,8 @@ class cuDataset():
         device.write(":\n")
         device.write(str(self.listattribute(vname)))
         device.write("\n")
-
-    def showdimension(self, vname=None, device=None):
+        
+    def showdimension (self, vname=None, device=None):
         """Show the dimension names associated with a variable.
         :::
         Options:::
@@ -203,10 +193,8 @@ class cuDataset():
         device :: (None/file) (None) output device
         :::
         """
-        if device is None:
-            device = sys.stdout
-        if vname is None:
-            vname = self.default_variable_name
+        if device is None: device=sys.stdout
+        if vname is None: vname = self.default_variable_name
         device.write("Dimension names of ")
         device.write(vname)
         device.write(" in file ")
@@ -214,8 +202,8 @@ class cuDataset():
         device.write(":\n")
         device.write(str(self.listdimension(vname)))
         device.write("\n")
-
-    def showall(self, vname=None, all=None, device=None):
+        
+    def showall (self, vname=None, all=None, device=None):
         """Show a full description of the variable.
         :::
         Options:::
@@ -224,15 +212,13 @@ class cuDataset():
         device :: (None/file) (None) output device
         :::
         """
-        if device is None:
-            device = sys.stdout
-        if vname is None:
-            vname = self.default_variable_name
+        if device is None: device=sys.stdout
+        if vname is None: vname = self.default_variable_name
         alist = self.listall(vname, all=all)
-        device.write("\n".join(alist))
+        device.write(string.join(alist, "\n"))
         device.write("\n")
 
-    def dimensionobject(self, dname, vname=None):
+    def dimensionobject (self, dname, vname=None):
         """CDMS axis object for the dimension named dname.
         :::
         Options:::
@@ -245,12 +231,12 @@ class cuDataset():
         axis :: (cdms2.axis.FileAxis) (0) file axis whose id is vname
         :::
         """
-        if vname is None:
+        if vname is None: 
             try:
                 return self.axes[dname]
             except KeyError:
-                raise CDMSError("No axis named " + dname + " in file " +
-                                self.id + ".")
+                raise CDMSError, "No axis named " + dname + " in file " +\
+                                self.id + "."
         else:
             v = self._v(vname)
             d = v.getDomain()
@@ -258,10 +244,10 @@ class cuDataset():
                 if x[0].id == dname:
                     return x[0]
             else:
-                raise CDMSError(vname + " has no axis named " + dname +
-                                " in file " + self.id + ".")
-
-    def dimensionarray(self, dname, vname=None):
+                raise CDMSError, vname + " has no axis named " + dname + \
+                                " in file " + self.id + "."
+        
+    def dimensionarray (self, dname, vname=None):
         """Values of the dimension named dname.
         :::
         Options:::
@@ -275,8 +261,8 @@ class cuDataset():
         :::
         """
         return self.dimensionobject(dname, vname).getValue()
-
-    def getdimensionunits(self, dname, vname=None):
+    
+    def getdimensionunits (self, dname, vname=None):
         """Get the units for the given dimension.
         :::
         Options:::
@@ -292,7 +278,7 @@ class cuDataset():
         x = self.dimensionobject(dname, vname)
         return x.units
 
-    def getglobal(self, attribute):
+    def getglobal (self, attribute):
         """Get the value of the global attribute.
         :::
         Input:::
@@ -306,8 +292,8 @@ class cuDataset():
             return self.attributes[attribute]
         except KeyError:
             return None
-
-    def getattribute(self, vname, attribute):
+    
+    def getattribute (self, vname, attribute):
         """Get the value of attribute for variable vname
         :::
         Input:::
@@ -320,8 +306,8 @@ class cuDataset():
         """
         v = self._v(vname)
         return getattr(v, attribute)
-
-    def getslab(self, vname, *args, **keys):
+            
+    def getslab (self, vname, *args,**keys):
         """getslab('name', arg1, arg2, ....) returns a cdms variable
            containing the data.
 
@@ -351,42 +337,40 @@ class cuDataset():
         nargs = len(args)
         v = self._v(vname)
         if nargs == 0:
-            return v.subRegion()
+           return v.subRegion()
 # note CDMS treats None as a colon in getRegion and mapInterval
         ndims = v.rank()
-        cdms_args = [':'] * ndims
+        cdms_args = [':'] * ndims 
         i = 0
         idim = 0
         ne = 0
         while i < nargs:
             if not (idim < ndims):
-                raise CDMSError("Too many arguments to getslab.")
+                raise CDMSError, "Too many arguments to getslab."
             x = args[i]
-            if x == ':' or x is None:
+            if x == ':' or x == None:
                 i = i + 1
                 idim = idim + 1
                 continue
             elif x == Ellipsis:
-                if ne:
-                    raise CDMSError("Only one ellipsis allowed.")
+                if ne: raise CDMSError, "Only one ellipsis allowed."
                 idim = ndims - (nargs - i - 1)
                 i = i + 1
                 ne = 1
-            elif isinstance(x, tuple):
+            elif type(x) == types.TupleType:
                 cdms_args[idim] = x
                 idim = idim + 1
                 i = i + 1
             else:
-                if not ((i + 1) < nargs):
-                    raise CDMSError(
-                        "Arguments to getslab not paired properly.")
+                if not ((i+1) < nargs):
+                    raise CDMSError, "Arguments to getslab not paired properly."
                 low = float(x)
-                high = float(args[i + 1])
+                high = float(args[i+1])
                 cdms_args[idim] = (low, high, 'cc')
                 idim = idim + 1
                 i = i + 2
         sq = keys.get('squeeze', 0)
-        result = v.subRegion(*tuple(cdms_args), **{'squeeze': sq})
+        result = apply(v.subRegion, tuple(cdms_args), {'squeeze':sq})
         result.parent = self
         result.id = vname
         return result
@@ -407,8 +391,8 @@ class cuDataset():
         grid :: (cdms2.hgrid.TransientCurveGrid/cdms2.gengrid.TransientGenericGrid) (0) variable requested
         :::
         """
-
-        from . import hgrid, gengrid
+        
+        import hgrid, gengrid
 
         # Grid file
         if 'grid_dims' in self.variables.keys():
@@ -416,7 +400,7 @@ class cuDataset():
             whichType = "grid"
 
         # Destination grid from mapping file
-        elif whichGrid == "destination":
+        elif whichGrid=="destination":
             dims = self('dst_grid_dims')
             whichType = "mapping"
 
@@ -425,16 +409,16 @@ class cuDataset():
             dims = self('src_grid_dims')
             whichType = "mapping"
 
-        if len(dims) == 2:
+        if len(dims)==2:
             result = hgrid.readScripCurveGrid(self, dims, whichType, whichGrid)
-        elif len(dims) == 1:
-            result = gengrid.readScripGenericGrid(
-                self, dims, whichType, whichGrid)
+        elif len(dims)==1:
+            result = gengrid.readScripGenericGrid(self, dims, whichType, whichGrid)
         else:
-            raise CDMSError("Grid rank must be 1 or 2, found: %d" % len(dims))
+            raise CDMSError, "Grid rank must be 1 or 2, found: %d"%len(dims)
 
-        if checkGrid == 1:
+        if checkGrid==1:
             nonConvexCells = result.checkConvex()
             result.fixCutCells(nonConvexCells)
 
         return result
+
diff --git a/Packages/cdms2/Lib/database.py b/Packages/cdms2/Lib/database.py
index 682f14628..80f749fb4 100644
--- a/Packages/cdms2/Lib/database.py
+++ b/Packages/cdms2/Lib/database.py
@@ -1,16 +1,18 @@
 """CDMS database objects"""
 
-from .error import CDMSError
-from . import cdmsobj
-from . import cdurlparse
-# import internattr
+from error import CDMSError
+import cdmsobj
+import cdurlparse
+## import internattr
 import copy
 import os
 import re
+import string
 import sys
-from .CDMLParser import CDMLParser
-from .cdmsobj import CdmsObj
-from .dataset import Dataset
+import types
+from CDMLParser import CDMLParser
+from cdmsobj import CdmsObj
+from dataset import Dataset
 
 try:
     import ldap
@@ -31,11 +33,9 @@ MethodNotImplemented = "Method not yet implemented"
 PermissionError = "No permission to access"
 SchemeNotSupported = "Scheme not supported"
 
-_Att = re.compile('([a-zA-Z_:][-a-zA-Z0-9._:]*)=(.*)', re.DOTALL)
+_Att = re.compile('([a-zA-Z_:][-a-zA-Z0-9._:]*)=(.*)',re.DOTALL)
 
 # Open a database connection
-
-
 def connect(uri=None, user="", password=""):
     """
     Method:
@@ -64,48 +64,36 @@ def connect(uri=None, user="", password=""):
         try:
             uri = os.environ['CDMSROOT']
         except KeyError:
-            raise CDMSError(
-                ConnectError +
-                '%s\nSet environment variable CDMSROOT to default database location' %
-                uri)
-    (scheme, netloc, path, parameters, query,
-     fragment) = cdurlparse.urlparse(uri)
-
-    if scheme in ['', 'ldap']:
+            raise CDMSError, ConnectError + '%s\nSet environment variable CDMSROOT to default database location'%uri
+    (scheme,netloc,path,parameters,query,fragment)=cdurlparse.urlparse(uri)
+
+    if scheme in ['','ldap']:
         try:
             ldapdb = ldap.open(netloc)
         except:
-            raise CDMSError(ConnectError + "%s\n%s" % (uri, sys.exc_info()[1]))
+            raise CDMSError, ConnectError +"%s\n%s"%(uri,sys.exc_value)
 
         try:
-            ldapdb.simple_bind_s(user, password)
+            ldapdb.simple_bind_s(user,password)
         except:
-            raise CDMSError(
-                AuthenticationError + "%s\n%s" %
-                (uri, sys.exc_info()[1]))
+            raise CDMSError, AuthenticationError + "%s\n%s"%(uri,sys.exc_value)
 
         try:
-            result = ldapdb.search_s(
-                path[1:],
-                ldap.SCOPE_SUBTREE,
-                "objectclass=database")
+            result = ldapdb.search_s(path[1:], ldap.SCOPE_SUBTREE, "objectclass=database")
         except:
-            raise CDMSError(
-                DatabaseNotFound + "%s\n%s" %
-                (uri, sys.exc_info()[1]))
+            raise CDMSError, DatabaseNotFound + "%s\n%s"%(uri,sys.exc_value)
 
         try:
             dn, attrs = result[0]
         except:
-            raise CDMSError(PermissionError + uri)
-        newuri = "ldap://%s/%s" % (netloc, dn)
+            raise CDMSError, PermissionError + uri
+        newuri = "ldap://%s/%s"%(netloc,dn)
         db = LDAPDatabase(newuri, ldapdb)
         db.setExternalDict(attrs)
         return db
 
     else:
-        raise CDMSError(SchemeNotSupported + scheme)
-
+        raise CDMSError, SchemeNotSupported +  scheme
 
 def loadString(text, uri, parent=None, datapath=None):
     """ Create a dataset from a text string. <text> is the string in CDML format.
@@ -113,61 +101,59 @@ def loadString(text, uri, parent=None, datapath=None):
         <parent> is the containing database object, if any.
         <datapath> is the location of data files relative to the parent database URL.
     """
-    p = CDMLParser()
+    p=CDMLParser()
     p.feed(text)
     p.close()
-    return Dataset(uri, 'r', p.getRoot(), parent, datapath)
-
+    return Dataset(uri,'r',p.getRoot(),parent,datapath)
+    
 
 class AbstractDatabase(CdmsObj):
-
-    """AbstractDatabase defines the common database interface. Concrete database classes are
+    """AbstractDatabase defines the common database interface. Concrete database classes are 
        derived from this class.
     """
 
     def __init__(self, uri, path):
-        CdmsObj.__init__(self, None)
+        CdmsObj.__init__(self,None)
         self.uri = uri
         self.path = path
         self._cache_ = {}
         self._cdmlcache_ = {}
-        self._datacache_ = None  # datasetdn: obj # Remote file data cache
+        self._datacache_ = None # datasetdn: obj # Remote file data cache
         self.lcBaseDN = None            # Logical Collection base distinguished name
         self.useReplica = None          # Use replica catalog if true (request manager transfers only)
         self.userid = None              # User ID for request manager transfers
 
     def close(self):
-        raise CDMSError(MethodNotImplemented)
+        raise CDMSError, MethodNotImplemented
 
     def cachecdml(self, name, cdml):
-        raise CDMSError(MethodNotImplemented)
+        raise CDMSError, MethodNotImplemented
 
     def getDataset(self, name):
-        raise CDMSError(MethodNotImplemented)
+        raise CDMSError, MethodNotImplemented
 
     def getObjFromDataset(self, name):
-        raise CDMSError(MethodNotImplemented)
+        raise CDMSError, MethodNotImplemented
 
     def openDataset(self, dsetid, mode='r'):
-        raise CDMSError(MethodNotImplemented)
+        raise CDMSError, MethodNotImplemented
 
-    def searchFilter(self, filter, classtag=None,
-                     relbase=None, scope=Subtree, attnames=[]):
-        raise CDMSError(MethodNotImplemented)
+    def searchFilter(self, filter, classtag=None, relbase=None, scope=Subtree, attnames=[]):
+        raise CDMSError, MethodNotImplemented
 
     def enableCache(self):
         if self._datacache_ is None:
-            from . import cache
+            import cache
             self._datacache_ = cache.Cache()
         return self._datacache_
 
     def disableCache(self):
-        if self._datacache_ is not None:
+        if self._datacache_ != None:
             self._datacache_.delete()
             self._datacache_ = None
 
-    def useRequestManager(self, lcBaseDN, useReplica=1, userid="anonymous"):
-        from . import cache
+    def useRequestManager(self, lcBaseDN, useReplica=1, userid = "anonymous"):
+        import cache
         self.enableCache()
         cache.useRequestManagerTransfer()
         self.lcBaseDN = lcBaseDN
@@ -175,23 +161,20 @@ class AbstractDatabase(CdmsObj):
         self.userid = userid
 
     def usingRequestManager(self):
-        from . import cache
-        return (cache._transferMethod == cache._requestManagerTransfer)
+        import cache
+        return (cache._transferMethod==cache._requestManagerTransfer)
 
     def __repr__(self):
-        return "<Database '%s'>" % (self.uri)
+        return "<Database '%s'>"%(self.uri)
 
-# internattr.add_internal_attribute(AbstractDatabase, 'uri', 'path')
+## internattr.add_internal_attribute(AbstractDatabase, 'uri', 'path')
 
 # Database implemented via LDAP (Lightweight Directory Access Protocol)
-
-
 class LDAPDatabase(AbstractDatabase):
 
     def __init__(self, uri, db):
-        (scheme, netloc, path, parameters, query,
-         fragment) = cdurlparse.urlparse(uri)
-        AbstractDatabase.__init__(self, uri, path[1:])
+        (scheme,netloc,path,parameters,query,fragment)=cdurlparse.urlparse(uri)
+        AbstractDatabase.__init__(self,uri,path[1:])
         self.netloc = netloc
         self.db = db
 
@@ -210,64 +193,58 @@ class LDAPDatabase(AbstractDatabase):
           None
 
         """
-        if self.db is not None:
+        if self.db != None:
             self.db.unbind()
         self.db = None
         self.disableCache()
-
+        
     def __del__(self):
         # if cdmsobj._debug==1:
         #    print 'Deleting object',self
         self.close()
-
+    
     def normalizedn(self, dn):
         explodeddn = ldap.explode_dn(dn)
-        return ','.join(explodeddn)
+        return string.join(explodeddn,',')
 
     def cachecdml(self, name, cdml, datapath):
         normaldn = self.normalizedn(name)
-        self._cdmlcache_[normaldn] = (cdml, datapath)
+        self._cdmlcache_[normaldn] = (cdml,datapath)
 
     def getDataset(self, dn):
         normaldn = self.normalizedn(dn)
-        if normaldn in self._cache_:
+        if self._cache_.has_key(normaldn):
             dataset = self._cache_[normaldn]
-        elif normaldn in self._cdmlcache_:
-            (text, datapath) = self._cdmlcache_[normaldn]
-            uri = "ldap://%s/%s" % (self.netloc, normaldn)
-            if cdmsobj._debug == 1:
-                print 'Loading %s from cached CDML' % uri
-            dataset = loadString(text, uri, self, datapath)
+        elif self._cdmlcache_.has_key(normaldn):
+            (text,datapath) = self._cdmlcache_[normaldn]
+            uri = "ldap://%s/%s"%(self.netloc,normaldn)
+            if cdmsobj._debug==1:
+                print 'Loading %s from cached CDML'%uri
+            dataset = loadString(text,uri,self,datapath)
             self._cache_[normaldn] = dataset
         else:
-            if cdmsobj._debug == 1:
-                print 'Search filter: (objectclass=dataset), scope: base, base: "%s", attributes=["cdml"]' % (dn,)
-            result = self.db.search_s(
-                dn,
-                ldap.SCOPE_BASE,
-                "objectclass=dataset",
-                ["cdml",
-                 "datapath"])
-            resultdn, attrs = result[0]
+            if cdmsobj._debug==1:
+                print 'Search filter: (objectclass=dataset), scope: base, base: "%s", attributes=["cdml"]'%(dn,)
+            result = self.db.search_s(dn, ldap.SCOPE_BASE, "objectclass=dataset",["cdml","datapath"])
+            resultdn,attrs = result[0]
             text = attrs["cdml"][0]
-            uri = "ldap://%s/%s" % (self.netloc, normaldn)
+            uri = "ldap://%s/%s"%(self.netloc,normaldn)
             datapath = attrs.get("datapath")
-            if datapath:
-                datapath = datapath[0]
-            dataset = loadString(text, uri, self, datapath)
+            if datapath: datapath = datapath[0]
+            dataset = loadString(text,uri,self,datapath)
             self._cache_[normaldn] = dataset
         return dataset
-
+ 
     def getObjFromDataset(self, dn):
 
         # Get the parent dataset
         explodeddn = ldap.explode_dn(dn)
-        dsetdn = ','.join(explodeddn[1:])  # Dataset node is parent of variable
+        dsetdn = string.join(explodeddn[1:],',') # Dataset node is parent of variable
         dset = self.getDataset(dsetdn)
         rdn = explodeddn[0]
         matchobj = _Att.match(rdn)
         if matchobj is None:
-            raise CDMSError(InvalidEntryName + dn)
+            raise CDMSError, InvalidEntryName +  dn
         tag, id = matchobj.groups()
 
         # Get the correct dictionary for this tag
@@ -298,7 +275,7 @@ class LDAPDatabase(AbstractDatabase):
 
           dset = db.openDataset('ncep_reanalysis_mo')
         """
-        dn = "dataset=%s,%s" % (dsetid, self.path)
+        dn = "dataset=%s,%s"%(dsetid,self.path)
         dset = self.getDataset(dn)
         return dset
 
@@ -310,24 +287,23 @@ class LDAPDatabase(AbstractDatabase):
     def setExternalDict(self, ldapattrs):
         for attname in ldapattrs.keys():
             attvals = ldapattrs[attname]
-            if attname == 'objectclass':
+            if attname=='objectclass':
                 continue
-            elif attname == 'attr':       # Handle attr: name=value
+            elif attname=='attr':       # Handle attr: name=value
                 for attval in attvals:
                     matchobj = _Att.match(attval)
                     if matchobj is not None:
-                        newname, newval = matchobj.groups()
+                        newname,newval = matchobj.groups()
                         self.attributes[newname] = newval
 
             # If the attribute value is a multi-valued list, keep it as a list
             # otherwise copy the single value from the list.
-            if len(attvals) == 1:
+            if len(attvals)==1:
                 self.attributes[attname] = attvals[0]
             else:
                 self.attributes[attname] = attvals
 
-    def searchFilter(self, filter=None, tag=None,
-                     relbase=None, scope=Subtree, attnames=None, timeout=None):
+    def searchFilter(self, filter=None, tag=None, relbase=None, scope=Subtree, attnames=None, timeout=None):
         """
         Method:
 
@@ -358,7 +334,7 @@ class LDAPDatabase(AbstractDatabase):
                              "<=" |     # lexicographically less than or equal to
                              ">="       # lexicographically greater than or equal to
               value      ::= string, may include '*' as a wild card
-
+                             
           tag: string class tag ("dataset" | "variable" | "database" | "axis" | "grid").
             Restricts the search to a class of objects
           relbase: string search base, relative to the database path
@@ -390,26 +366,25 @@ class LDAPDatabase(AbstractDatabase):
           result = db.searchFilter(relbase="dataset=ncep_reanalysis_mo"), scope=cdms.Onelevel)
 
         """
-        if tag is None:
-            tag = '*'
-        newfilter = "(objectclass=%s)" % tag
+        if tag is None: tag='*'
+        newfilter = "(objectclass=%s)"%tag
         if filter is not None:
-            if filter[0] != '(':
-                filter = "(%s)" % filter
-            newfilter = "(&%s%s)" % (newfilter, filter)
+            if filter[0]!='(':
+                filter = "(%s)"%filter
+            newfilter = "(&%s%s)"%(newfilter,filter)
 
         if relbase is None:
             base = self.path
         else:
-            base = "%s,%s" % (relbase, self.path)
+            base = "%s,%s"%(relbase,self.path)
 
         if attnames is None:
             atts = None
         else:
-            atts = ["objectclass", "cdml", "id"] + attnames
-
-        if cdmsobj._debug == 1:
-            print 'Search filter:%s, scope %s, base: "%s", attributes=%s' % (newfilter, repr(scope), base, repr(atts))
+            atts = ["objectclass","cdml","id"]+attnames
+            
+        if cdmsobj._debug==1:
+            print 'Search filter:%s, scope %s, base: "%s", attributes=%s'%(newfilter,`scope`,base,`atts`)
         if timeout is None:
             result = self.db.search_s(base, scope, newfilter, atts)
         else:
@@ -419,12 +394,11 @@ class LDAPDatabase(AbstractDatabase):
 
     def listDatasets(self):
         """ Return a list of the dataset IDs in this database."""
-        entries = self.searchFilter(tag='dataset', scope=Onelevel)
+        entries = self.searchFilter(tag='dataset', scope=Onelevel )
         result = map(lambda x: x.attributes['id'][0], entries)
         return result
 
-# internattr.add_internal_attribute(LDAPDatabase, 'netloc', 'db')
-
+## internattr.add_internal_attribute(LDAPDatabase, 'netloc', 'db')
 
 class AbstractSearchResult:
 
@@ -437,7 +411,6 @@ class AbstractSearchResult:
     def searchPredicate(self, predicate, tag=None):
         MethodNotImplemented = "Method not yet implemented"
 
-
 class LDAPSearchResult(AbstractSearchResult):
 
     def __init__(self, db, LDAPresult):
@@ -446,15 +419,15 @@ class LDAPSearchResult(AbstractSearchResult):
 
         # Scan the result for CDML attributes, cache them in the database
         for dn, attrs in self.result:
-            if 'cdml' in attrs and 'datapath' in attrs:
+            if attrs.has_key('cdml') and attrs.has_key('datapath'):
                 cdml = attrs['cdml'][0]
                 datapath = attrs['datapath'][0]
-                self.db.cachecdml(dn, cdml, datapath)
+                self.db.cachecdml(dn,cdml,datapath)
                 del attrs['cdml']
 
     def __getitem__(self, key):
-        if key >= len(self):
-            raise IndexError('index out of bounds')
+        if key>=len(self):
+            raise IndexError, 'index out of bounds'
 
         dn, attributes = self.result[key]
 
@@ -495,15 +468,15 @@ class LDAPSearchResult(AbstractSearchResult):
 
         """
         if tag is not None:
-            tag = tag.lower()
+            tag = string.lower(tag)
 
         resultlist = []
         for entry in self:
             obj = entry.getObject()
-            if tag is None or tag == entry.tag:
+            if tag is None or tag==entry.tag:
                 try:
-                    if predicate(*(obj,)) == 1:
-                        resultlist.append((entry.name, entry.attributes))
+                    if apply(predicate,(obj,))==1:
+                        resultlist.append((entry.name,entry.attributes))
                 except:
                     pass
 
@@ -512,7 +485,6 @@ class LDAPSearchResult(AbstractSearchResult):
     def __len__(self):
         return len(self.result)
 
-
 class AbstractResultEntry:
 
     def __init__(self, db):
@@ -534,16 +506,15 @@ class AbstractResultEntry:
 
         """
 
-        if self.tag == "database":
+        if self.tag=="database":
             obj = self.db
-        elif self.tag == "dataset":
+        elif self.tag=="dataset":
             obj = self.db.getDataset(self.name)
         else:
             obj = self.db.getObjFromDataset(self.name)
 
         return obj
 
-
 class LDAPResultEntry(AbstractResultEntry):
 
     def __init__(self, db, dn, attributes):
@@ -556,6 +527,9 @@ class LDAPResultEntry(AbstractResultEntry):
         rdn = explodeddn[0]
         matchobj = _Att.match(rdn)
         if matchobj is None:
-            raise IndexError(InvalidEntryName + dn)
+            raise IndexError, InvalidEntryName + dn
 
         self.tag = matchobj.group(1)
+
+
+
diff --git a/Packages/cdms2/Lib/dataset.py b/Packages/cdms2/Lib/dataset.py
index f9f9562ec..977b1d8bb 100644
--- a/Packages/cdms2/Lib/dataset.py
+++ b/Packages/cdms2/Lib/dataset.py
@@ -1,38 +1,38 @@
-# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by foo
-# Further modified to be pure new numpy June 24th 2008
+## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by foo
+## Further modified to be pure new numpy June 24th 2008
 
 """ CDMS dataset and file objects"""
-from .error import CDMSError
+from error import CDMSError
 import Cdunif
 import numpy
-from . import cdmsNode
-import os
-import sys
+import cdmsNode
+import os, sys
+import string
 import urllib
-from . import cdmsURLopener                    # Import after urllib, to handle errors
+import cdmsURLopener                    # Import after urllib, to handle errors
 import urlparse
-# import internattr
-from . import cdmsobj
+## import internattr
+import cdmsobj
 import re
-from .CDMLParser import CDMLParser
-from .cdmsobj import CdmsObj
-from .axis import Axis, FileAxis, FileVirtualAxis, isOverlapVector
-from .coord import FileAxis2D, DatasetAxis2D
-from .auxcoord import FileAuxAxis1D, DatasetAuxAxis1D
-from .grid import RectGrid, FileRectGrid
-from .hgrid import FileCurveGrid, DatasetCurveGrid
-from .gengrid import FileGenericGrid, DatasetGenericGrid
-from .variable import DatasetVariable
-from .fvariable import FileVariable
-from .tvariable import asVariable
-from .cdmsNode import CdDatatypes
-from . import convention
-from . import typeconv
+from CDMLParser import CDMLParser
+from cdmsobj import CdmsObj
+from axis import Axis, FileAxis, FileVirtualAxis, isOverlapVector
+from coord import FileAxis2D, DatasetAxis2D
+from auxcoord import FileAuxAxis1D, DatasetAuxAxis1D
+from grid import RectGrid, FileRectGrid
+from hgrid import FileCurveGrid, DatasetCurveGrid
+from gengrid import FileGenericGrid, DatasetGenericGrid
+from variable import DatasetVariable
+from fvariable import FileVariable
+from tvariable import asVariable
+from cdmsNode import CdDatatypes
+import convention
+import typeconv
 
 # Default is serial mode until setNetcdfUseParallelFlag(1) is called
 rk = 0
 sz = 1
-Cdunif.CdunifSetNCFLAGS("use_parallel", 0)
+Cdunif.CdunifSetNCFLAGS("use_parallel",0)
 CdMpi = False
 
 try:
@@ -43,19 +43,17 @@ except:
     rk = 0
 
 try:
-    from . import gsHost
+    import gsHost
     from pycf import libCFConfig as libcf
 except:
     libcf = None
 
 try:
-    from . import cache
+    import cache
 except ImportError:
     pass
 
 DuplicateAxis = "Axis already defined: "
-
-
 class DuplicateAxisError(CDMSError):
     pass
 DuplicateGrid = "Grid already defined: "
@@ -78,37 +76,12 @@ _IndexPat = r'(\d+|-)'
 _FilePath = r"([^\s\]\',]+)"
 # Two file map patterns, _IndexList4 is the original one, _IndexList5 supports
 # forecast data too...
-_IndexList4 = re.compile(
-    _ListStartPat +
-    _IndexPat +
-    _ListSepPat +
-    _IndexPat +
-    _ListSepPat +
-    _IndexPat +
-    _ListSepPat +
-    _IndexPat +
-    _ListSepPat +
-    _FilePath +
-    _ListEndPat)
-_IndexList5 = re.compile(
-    _ListStartPat +
-    _IndexPat +
-    _ListSepPat +
-    _IndexPat +
-    _ListSepPat +
-    _IndexPat +
-    _ListSepPat +
-    _IndexPat +
-    _ListSepPat +
-    _IndexPat +
-    _ListSepPat +
-    _FilePath +
-    _ListEndPat)
+_IndexList4 = re.compile(_ListStartPat+_IndexPat+_ListSepPat+_IndexPat+_ListSepPat+_IndexPat+_ListSepPat+_IndexPat+_ListSepPat+_FilePath+_ListEndPat)
+_IndexList5 = re.compile(_ListStartPat+_IndexPat+_ListSepPat+_IndexPat+_ListSepPat+_IndexPat+_ListSepPat+_IndexPat+_ListSepPat+_IndexPat+_ListSepPat+_FilePath+_ListEndPat)
 
 _NPRINT = 20
 _showCompressWarnings = True
 
-
 def setCompressionWarnings(value=None):
     """Turn on/off the warnings for compression
     Usage:
@@ -121,57 +94,49 @@ def setCompressionWarnings(value=None):
     global _showCompressWarnings
     if value is None:
         value = not _showCompressWarnings
-    if isinstance(value, str):
-        if not value.slower() in ['y', 'n', 'yes', 'no']:
-            raise CDMSError(
-                "setCompressionWarnings flags must be yes/no or 1/0, or None to invert it")
-        if value.lower()[0] == 'y':
+    if isinstance(value,str):
+        if not value.slower() in ['y','n','yes','no']:
+            raise CDMSError("setCompressionWarnings flags must be yes/no or 1/0, or None to invert it")
+        if value.lower()[0]=='y':
             value = 1
         else:
             value = 0
-    if not isinstance(value, (int, bool)):
-        raise CDMSError(
-            "setCompressionWarnings flags must be yes/no or 1/0, or None to invert it")
+    if not isinstance(value, (int,bool)):
+        raise CDMSError("setCompressionWarnings flags must be yes/no or 1/0, or None to invert it")
 
-    if value in [1, True]:
+    if value in [1,True]:
         _showCompressWarnings = True
-    elif value in [0, False]:
+    elif value in [0,False]:
         _showCompressWarnings = False
     else:
-        raise CDMSError(
-            "setCompressionWarnings flags must be yes\/no or 1\/0, or None to invert it")
+        raise CDMSError("setCompressionWarnings flags must be yes\/no or 1\/0, or None to invert it")
 
     return _showCompressWarnings
 
-
 def setNetcdfUseNCSwitchModeFlag(value):
     """ Tells cdms2 to switch constantly between netcdf define/write modes"""
 
-    if value not in [True, False, 0, 1]:
-        raise CDMSError(
-            "Error UseNCSwitchMode flag must be 1(can use)/0(do not use) or true/False")
-    if value in [0, False]:
-        Cdunif.CdunifSetNCFLAGS("use_define_mode", 0)
+    if value not in [True,False,0,1]:
+        raise CDMSError("Error UseNCSwitchMode flag must be 1(can use)/0(do not use) or true/False")
+    if value in [0,False]:
+        Cdunif.CdunifSetNCFLAGS("use_define_mode",0)
     else:
-        Cdunif.CdunifSetNCFLAGS("use_define_mode", 1)
-
+        Cdunif.CdunifSetNCFLAGS("use_define_mode",1)
 
 def setNetcdfUseParallelFlag(value):
     """ Sets NetCDF classic flag value"""
     global CdMpi
-    if value not in [True, False, 0, 1]:
-        raise CDMSError(
-            "Error UseParallel flag must be 1(can use)/0(do not use) or true/False")
-    if value in [0, False]:
-        Cdunif.CdunifSetNCFLAGS("use_parallel", 0)
+    if value not in [True,False,0,1]:
+        raise CDMSError("Error UseParallel flag must be 1(can use)/0(do not use) or true/False")
+    if value in [0,False]:
+        Cdunif.CdunifSetNCFLAGS("use_parallel",0)
     else:
-        Cdunif.CdunifSetNCFLAGS("use_parallel", 1)
+        Cdunif.CdunifSetNCFLAGS("use_parallel",1)
         CdMpi = True
         if not MPI.Is_initialized():
             MPI.Init()
         rk = MPI.COMM_WORLD.Get_rank()
 
-
 def getMpiRank():
     ''' Return number of processor available '''
     if CdMpi:
@@ -180,7 +145,6 @@ def getMpiRank():
     else:
         return 0
 
-
 def getMpiSize():
     if CdMpi:
         sz = MPI.COMM_WORLD.Get_size()
@@ -188,90 +152,75 @@ def getMpiSize():
     else:
         return 1
 
-
 def setNetcdf4Flag(value):
     """ Sets NetCDF classic flag value"""
-    if value not in [True, False, 0, 1]:
+    if value not in [True,False,0,1]:
         raise CDMSError("Error NetCDF4 flag must be 1/0 or true/False")
-    if value in [0, False]:
-        Cdunif.CdunifSetNCFLAGS("netcdf4", 0)
+    if value in [0,False]:
+        Cdunif.CdunifSetNCFLAGS("netcdf4",0)
     else:
-        Cdunif.CdunifSetNCFLAGS("netcdf4", 1)
+        Cdunif.CdunifSetNCFLAGS("netcdf4",1)
 
-
-def setNetcdfClassicFlag(value):
+def setNetcdfClassicFlag(value):        
     """ Sets NetCDF classic flag value"""
-    if value not in [True, False, 0, 1]:
+    if value not in [True,False,0,1]:
         raise CDMSError("Error NetCDF Classic flag must be 1/0 or true/False")
-    if value in [0, False]:
-        Cdunif.CdunifSetNCFLAGS("classic", 0)
+    if value in [0,False]:
+        Cdunif.CdunifSetNCFLAGS("classic",0)
     else:
-        Cdunif.CdunifSetNCFLAGS("classic", 1)
-
+        Cdunif.CdunifSetNCFLAGS("classic",1)
 
-def setNetcdfShuffleFlag(value):
+def setNetcdfShuffleFlag(value):        
     """ Sets NetCDF shuffle flag value"""
-    if value not in [True, False, 0, 1]:
+    if value not in [True,False,0,1]:
         raise CDMSError("Error NetCDF Shuffle flag must be 1/0 or true/False")
-    if value in [0, False]:
-        Cdunif.CdunifSetNCFLAGS("shuffle", 0)
+    if value in [0,False]:
+        Cdunif.CdunifSetNCFLAGS("shuffle",0)
     else:
-        Cdunif.CdunifSetNCFLAGS("shuffle", 1)
-
+        Cdunif.CdunifSetNCFLAGS("shuffle",1)
 
 def setNetcdfDeflateFlag(value):
     """ Sets NetCDF deflate flag value"""
-    if value not in [True, False, 0, 1]:
+    if value not in [True,False,0,1]:
         raise CDMSError("Error NetCDF deflate flag must be 1/0 or true/False")
-    if value in [0, False]:
-        Cdunif.CdunifSetNCFLAGS("deflate", 0)
+    if value in [0,False]:
+        Cdunif.CdunifSetNCFLAGS("deflate",0)
     else:
-        Cdunif.CdunifSetNCFLAGS("deflate", 1)
-
-
+        Cdunif.CdunifSetNCFLAGS("deflate",1)
+        
 def setNetcdfDeflateLevelFlag(value):
     """ Sets NetCDF deflate level flag value"""
-    if value not in [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]:
-        raise CDMSError(
-            "Error NetCDF deflate_level flag must be an integer < 10")
-    Cdunif.CdunifSetNCFLAGS("deflate_level", value)
-
+    if value not in [0,1,2,3,4,5,6,7,8,9]:
+        raise CDMSError("Error NetCDF deflate_level flag must be an integer < 10")
+    Cdunif.CdunifSetNCFLAGS("deflate_level",value)
 
 def getNetcdfUseNCSwitchModeFlag():
     """ Returns NetCDF UseParallel flag value"""
     return Cdunif.CdunifGetNCFLAGS("use_define_mode")
 
-
 def getNetcdfUseParallelFlag():
     """ Returns NetCDF UseParallel flag value"""
     return Cdunif.CdunifGetNCFLAGS("use_parallel")
 
-
 def getNetcdf4Flag():
     """ Returns NetCDF4 flag value"""
     return Cdunif.CdunifGetNCFLAGS("netcdf4")
 
-
 def getNetcdfClassicFlag():
     """ Returns NetCDF classic flag value"""
     return Cdunif.CdunifGetNCFLAGS("classic")
 
-
 def getNetcdfShuffleFlag():
     """ Returns NetCDF shuffle flag value"""
     return Cdunif.CdunifGetNCFLAGS("shuffle")
 
-
 def getNetcdfDeflateFlag():
     """ Returns NetCDF deflate flag value"""
     return Cdunif.CdunifGetNCFLAGS("deflate")
 
-
 def getNetcdfDeflateLevelFlag():
     """ Returns NetCDF deflate level flag value"""
     return Cdunif.CdunifGetNCFLAGS("deflate_level")
-
-
 def useNetcdf3():
     """ Turns off (0) NetCDF flags for shuffle/defalte/defaltelevel
     Output files are generated as NetCDF3 Classic after that
@@ -282,13 +231,11 @@ def useNetcdf3():
 
 # Create a tree from a file path.
 # Returns the parse tree root node.
-
-
 def load(path):
     fd = open(path)
     text = fd.read()
     fd.close()
-    p = CDMLParser()
+    p=CDMLParser()
     p.feed(text)
     p.close()
     return p.getRoot()
@@ -297,16 +244,13 @@ def load(path):
 # URI is of the form scheme://netloc/path;parameters?query#fragment
 # where fragment may be an XPointer.
 # Returns the parse tree root node.
-
-
 def loadURI(uri):
-    (scheme, netloc, path, parameters,
-     query, fragment) = urlparse.urlparse(uri)
-    uripath = urlparse.urlunparse((scheme, netloc, path, '', '', ''))
+    (scheme,netloc,path,parameters,query,fragment)=urlparse.urlparse(uri)
+    uripath = urlparse.urlunparse((scheme,netloc,path,'','',''))
     fd = urllib.urlopen(uripath)
     text = fd.read()
     fd.close()
-    p = CDMLParser()
+    p=CDMLParser()
     p.feed(text)
     p.close()
     return p.getRoot()
@@ -314,19 +258,14 @@ def loadURI(uri):
 # Create a dataset
 # 'path' is the XML file name, or netCDF filename for simple file create
 # 'template' is a string template for the datafile(s), for dataset creation
-
-
-def createDataset(path, template=None):
-    return openDataset(path, 'w', template)
+def createDataset(path,template=None):
+    return openDataset(path,'w',template)
 
 # Open an existing dataset
 # 'uri' is a Uniform Resource Identifier, referring to a cdunif file, XML file,
 #   or LDAP URL of a catalog dataset entry.
 # 'mode' is 'r', 'r+', 'a', or 'w'
-
-
-def openDataset(uri, mode='r', template=None,
-                dods=1, dpath=None, hostObj=None):
+def openDataset(uri,mode='r',template=None,dods=1,dpath=None, hostObj=None):
     """
     Options:::
 mode :: (str) ('r') mode to open the file in read/write/append
@@ -341,46 +280,42 @@ Output:::
 file :: (cdms2.dataset.CdmsFile) (0) file to read from
 :::
     """
-    uri = uri.strip()
-    (scheme, netloc, path, parameters,
-     query, fragment) = urlparse.urlparse(uri)
-    if scheme in ('', 'file'):
+    uri = string.strip(uri)
+    (scheme,netloc,path,parameters,query,fragment)=urlparse.urlparse(uri)
+    if scheme in ('','file'):
         if netloc:
             # In case of relative path...
             path = netloc + path
         path = os.path.expanduser(path)
         path = os.path.normpath(os.path.join(os.getcwd(), path))
 
-        root, ext = os.path.splitext(path)
-        if ext in ['.xml', '.cdml']:
-            if mode != 'r':
-                raise ModeNotSupported(mode)
+        root,ext = os.path.splitext(path)
+        if ext in ['.xml','.cdml']:
+            if mode!='r': raise ModeNotSupported(mode)
             datanode = load(path)
         else:
             # If the doesn't exist allow it to be created
-            # Ok mpi has issues with bellow we need to test this only with 1
-            # rank
+            ##Ok mpi has issues with bellow we need to test this only with 1 rank
             if not os.path.exists(path):
-                return CdmsFile(path, mode, mpiBarrier=CdMpi)
-            elif mode == "w":
+                return CdmsFile(path,mode,mpiBarrier=CdMpi)
+            elif mode=="w":
                 try:
                     os.remove(path)
                 except:
                     pass
-                return CdmsFile(path, mode, mpiBarrier=CdMpi)
-
+                return CdmsFile(path,mode,mpiBarrier=CdMpi)
+            
             # The file exists
-            file1 = CdmsFile(path, "r")
+            file1 = CdmsFile(path,"r")
             if libcf is not None:
                 if hasattr(file1, libcf.CF_FILETYPE):
                     if getattr(file1, libcf.CF_FILETYPE) == libcf.CF_GLATT_FILETYPE_HOST:
                         file = gsHost.open(path, mode)
-                    elif mode == 'r' and hostObj is None:
-                        # helps performance on machines where file open (in
-                        # CdmsFile) is costly
+                    elif mode=='r' and hostObj is None:
+                        # helps performance on machines where file open (in CdmsFile) is costly
                         file = file1
                     else:
-                        file = CdmsFile(path, mode, hostObj=hostObj)
+                        file = CdmsFile(path, mode, hostObj = hostObj)
                     file1.close()
                 else:
                     file1.close()
@@ -390,18 +325,17 @@ file :: (cdms2.dataset.CdmsFile) (0) file to read from
                 file1.close()
                 return CdmsFile(path, mode)
     elif scheme in ['http', 'gridftp']:
-
+        
         if (dods):
-            if mode != 'r':
-                raise ModeNotSupported(mode)
+            if mode!='r': raise ModeNotSupported(mode)
             # DODS file?
             try:
-                file = CdmsFile(uri, mode)
+                file = CdmsFile(uri,mode)
                 return file
-            except Exception as err:
-                msg = "Error in DODS open of: " + uri
-                if os.path.exists(os.path.join(os.path.expanduser("~"), ".dodsrc")):
-                    msg += "\nYou have a .dodsrc in your HOME directory, try to remove it"
+            except Exception,err:
+                msg = "Error in DODS open of: "+uri
+                if os.path.exists(os.path.join(os.path.expanduser("~"),".dodsrc")):
+                  msg+="\nYou have a .dodsrc in your HOME directory, try to remove it"
                 raise CDMSError(msg)
         else:
             try:
@@ -409,8 +343,8 @@ file :: (cdms2.dataset.CdmsFile) (0) file to read from
                 return datanode
             except:
                 datanode = loadURI(uri)
-                raise CDMSError("Error in loadURI of: " + uri)
-
+                raise CDMSError("Error in loadURI of: "+uri)
+            
     else:
         raise SchemeNotSupported(scheme)
 
@@ -424,13 +358,13 @@ file :: (cdms2.dataset.CdmsFile) (0) file to read from
     # Note: In general, dset.datapath is relative to the URL of the
     #   enclosing database, but here the database is null, so the
     #   datapath should be absolute.
-    if dpath is None:
+    if dpath==None:
         direc = datanode.getExternalAttr('directory')
         head = os.path.dirname(path)
         if direc and os.path.isabs(direc):
             dpath = direc
         elif direc:
-            dpath = os.path.join(head, direc)
+            dpath = os.path.join(head,direc)
         else:
             dpath = head
 
@@ -438,8 +372,6 @@ file :: (cdms2.dataset.CdmsFile) (0) file to read from
     return dataset
 
 # Functions for parsing the file map.
-
-
 def parselist(text, f):
     """Parse a string of the form [A, A, ...].
     f is a function which parses A and returns (A, nconsumed)
@@ -448,13 +380,13 @@ def parselist(text, f):
     n = 0
     m = _ListStart.match(text)
     if m is None:
-        raise CDMSError("Parsing cdms_filemap near " + text[0:_NPRINT])
+        raise CDMSError("Parsing cdms_filemap near "+text[0:_NPRINT])
     result = []
     n += m.end()
     s, nconsume = f(text[n:])
     result.append(s)
     n += nconsume
-    while True:
+    while 1:
         m = _ListSep.match(text[n:])
         if m is None:
             break
@@ -465,11 +397,10 @@ def parselist(text, f):
         n += nconsume
     m = _ListEnd.match(text[n:])
     if m is None:
-        raise CDMSError("Parsing cdms_filemap near " + text[n:n + _NPRINT])
+        raise CDMSError("Parsing cdms_filemap near "+text[n:n+_NPRINT])
     n += m.end()
     return result, n
 
-
 def parseIndexList(text):
     """Parse a string of the form [i,j,k,l,...,path] where
     i,j,k,l,... are indices or '-', and path is a filename.
@@ -481,48 +412,45 @@ def parseIndexList(text):
         m = _IndexList5.match(text)
         nindices = 5
     if m is None:
-        raise CDMSError("Parsing cdms_filemap near " + text[0:_NPRINT])
-    result = [None] * (nindices + 1)
+        raise CDMSError("Parsing cdms_filemap near "+text[0:_NPRINT])
+    result = [None]*(nindices+1)
     for i in range(nindices):
-        s = m.group(i + 1)
-        if s != '-':
-            result[i] = int(s)
-    result[nindices] = m.group(nindices + 1)
+        s = m.group(i+1)
+        if s!='-':
+            result[i] = string.atoi(s)
+    result[nindices] = m.group(nindices+1)
     return result, m.end()
 
-
 def parseName(text):
     m = _Name.match(text)
     if m is None:
-        raise CDMSError("Parsing cdms_filemap near " + text[0:_NPRINT])
+        raise CDMSError("Parsing cdms_filemap near "+text[0:_NPRINT])
     return m.group(), m.end()
 
-
 def parseVarMap(text):
     """Parse a string of the form [ namelist, slicelist ]"""
     n = 0
     m = _ListStart.match(text)
     if m is None:
-        raise CDMSError("Parsing cdms_filemap near " + text[0:_NPRINT])
+        raise CDMSError("Parsing cdms_filemap near "+text[0:_NPRINT])
     result = []
     n += m.end()
-    s, nconsume = parselist(text[n:], parseName)
+    s, nconsume = parselist(text[n:],parseName)
     result.append(s)
     n += nconsume
     m = _ListSep.match(text[n:])
     if m is None:
-        raise CDMSError("Parsing cdms_filemap near " + text[n:n + _NPRINT])
+        raise CDMSError("Parsing cdms_filemap near "+text[n:n+_NPRINT])
     n += m.end()
     s, nconsume = parselist(text[n:], parseIndexList)
     result.append(s)
     n += nconsume
     m = _ListEnd.match(text[n:])
     if m is None:
-        raise CDMSError("Parsing cdms_filemap near " + text[n:n + _NPRINT])
+        raise CDMSError("Parsing cdms_filemap near "+text[n:n+_NPRINT])
     n += m.end()
     return result, n
 
-
 def parseFileMap(text):
     """Parse a CDMS filemap. having the form:
     filemap :== [ varmap, varmap, ...]
@@ -532,43 +460,38 @@ def parseFileMap(text):
     indexlist :== [i,j,k,l,path]
     """
     result, n = parselist(text, parseVarMap)
-    if n < len(text):
-        raise CDMSError("Parsing cdms_filemap near " + text[n:n + _NPRINT])
+    if n<len(text):
+        raise CDMSError("Parsing cdms_filemap near "+text[n:n+_NPRINT])
     return result
 
 
 # A CDMS dataset consists of a CDML/XML file and one or more data files
-from .cudsinterface import cuDataset
-
-
+from cudsinterface import cuDataset
 class Dataset(CdmsObj, cuDataset):
-
-    def __init__(self, uri, mode,
-                 datasetNode=None, parent=None, datapath=None):
-        if datasetNode is not None and datasetNode.tag != 'dataset':
+    def __init__(self, uri, mode, datasetNode=None, parent=None, datapath=None):
+        if datasetNode is not None and datasetNode.tag !='dataset':
             raise CDMSError('Node is not a dataset node')
-        CdmsObj.__init__(self, datasetNode)
-        for v in ['datapath',
-                  'variables',
-                  'axes',
-                  'grids',
-                  'xlinks',
-                  'dictdict',
-                  'default_variable_name',
-                  'parent',
-                  'uri',
-                  'mode']:
+        CdmsObj.__init__(self,datasetNode)
+        for v in [ 'datapath',
+                   'variables',
+                   'axes',
+                   'grids',
+                   'xlinks',
+                   'dictdict',
+                   'default_variable_name',
+                   'parent',
+                   'uri',
+                   'mode']:
             if not v in self.__cdms_internals__:
-                val = self.__cdms_internals__ + [v, ]
+                val = self.__cdms_internals__+[v,]
                 self.___cdms_internals__ = val
-
+                
         cuDataset.__init__(self)
         self.parent = parent
         self.uri = uri
         self.mode = mode
             # Path of data files relative to parent db.
-            # Note: .directory is the location of data relative to the location
-            # of the XML file
+            # Note: .directory is the location of data relative to the location of the XML file
         self.datapath = datapath
         self.variables = {}
         self.axes = {}
@@ -576,20 +499,19 @@ class Dataset(CdmsObj, cuDataset):
         self.xlinks = {}
         self._gridmap_ = {}
             # Gridmap:(latname,lonname,order,maskname,gridclass) => grid
-        (scheme, netloc, xmlpath, parameters,
-         query, fragment) = urlparse.urlparse(uri)
+        (scheme,netloc,xmlpath,parameters,query,fragment)=urlparse.urlparse(uri)
         self._xmlpath_ = xmlpath
         # Dictionary of dictionaries, keyed on node tags
-        self.dictdict = {'variable': self.variables,
-                         'axis': self.axes,
-                         'rectGrid': self.grids,
-                         'curveGrid': self.grids,
-                         'genericGrid': self.grids,
-                         'xlink': self.xlinks
-                         }
+        self.dictdict = {'variable':self.variables, 
+                         'axis':self.axes, 
+                         'rectGrid':self.grids, 
+                         'curveGrid':self.grids,
+                         'genericGrid':self.grids,
+                         'xlink':self.xlinks
+                        }
         # Dataset IDs are external, so may not have been defined yet.
-        if not hasattr(self, 'id'):
-            self.id = '<None>'
+        if not hasattr(self,'id'):
+            self.id='<None>'
         self._status_ = 'open'
         self._convention_ = convention.getDatasetConvention(self)
 
@@ -598,7 +520,7 @@ class Dataset(CdmsObj, cuDataset):
             coordsaux = self._convention_.getDsetnodeAuxAxisIds(datasetNode)
 
             for node in datasetNode.getIdDict().values():
-                if node.tag == 'variable':
+                if node.tag=='variable':
                     if node.id in coordsaux:
                         if node.getDomain().getChildCount() == 1:
                             obj = DatasetAuxAxis1D(self, node.id, node)
@@ -606,22 +528,22 @@ class Dataset(CdmsObj, cuDataset):
                             obj = DatasetAxis2D(self, node.id, node)
                     else:
                         obj = DatasetVariable(self, node.id, node)
-                    self.variables[node.id] = obj
-                elif node.tag == 'axis':
-                    obj = Axis(self, node)
-                    self.axes[node.id] = obj
-                elif node.tag == 'rectGrid':
-                    obj = RectGrid(self, node)
-                    self.grids[node.id] = obj
-                elif node.tag == 'xlink':
+                    self.variables[node.id]=obj
+                elif node.tag=='axis':
+                    obj = Axis(self,node)
+                    self.axes[node.id]=obj
+                elif node.tag=='rectGrid':
+                    obj = RectGrid(self,node)
+                    self.grids[node.id]=obj
+                elif node.tag=='xlink':
                     obj = Xlink(node)
-                    self.xlinks[node.id] = obj
+                    self.xlinks[node.id]=obj
                 else:
                     dict = self.dictdict.get(node.tag)
                     if dict is not None:
-                        dict[node.id] = node
+                        dict[node.id]=node
                     else:
-                        self.dictdict[node.tag] = {node.id: node}
+                        self.dictdict[node.tag] = {node.id:node}
 
             # Initialize grid domains
             for grid in self.grids.values():
@@ -633,11 +555,7 @@ class Dataset(CdmsObj, cuDataset):
                     maskname = ""
                 else:
                     maskname = mask.id
-                self._gridmap_[(
-                               latname,
-                               lonname,
-                               grid.getOrder(),
-                               maskname)] = grid
+                self._gridmap_[(latname, lonname, grid.getOrder(), maskname)] = grid
 
             # Initialize variable domains.
             for var in self.variables.values():
@@ -647,43 +565,40 @@ class Dataset(CdmsObj, cuDataset):
 
                 # Get grid information for the variable. gridkey has the form
                 # (latname,lonname,order,maskname,abstract_class).
-                gridkey, lat, lon = var.generateGridkey(
-                    self._convention_, self.variables)
+                gridkey, lat, lon = var.generateGridkey(self._convention_, self.variables)
 
                 # If the variable is gridded, lookup the grid. If no such grid exists,
-                # create a unique gridname, create the grid, and add to the
-                # gridmap.
+                # create a unique gridname, create the grid, and add to the gridmap.
                 if gridkey is None:
                     grid = None
                 else:
                     grid = self._gridmap_.get(gridkey)
                     if grid is None:
-                        if hasattr(var, 'grid_type'):
+                        if hasattr(var,'grid_type'):
                             gridtype = var.grid_type
                         else:
                             gridtype = "generic"
 
                         candidateBasename = None
                         if gridkey[4] == 'rectGrid':
-                            gridshape = (len(lat), len(lon))
+                            gridshape = (len(lat),len(lon))
                         elif gridkey[4] == 'curveGrid':
                             gridshape = lat.shape
                         elif gridkey[4] == 'genericGrid':
                             gridshape = lat.shape
-                            candidateBasename = 'grid_%d' % gridshape
+                            candidateBasename = 'grid_%d'%gridshape
                         else:
-                            gridshape = (len(lat), len(lon))
+                            gridshape = (len(lat),len(lon))
 
                         if candidateBasename is None:
-                            candidateBasename = 'grid_%dx%d' % gridshape
-                        if candidateBasename not in self.grids:
+                            candidateBasename = 'grid_%dx%d'%gridshape
+                        if not self.grids.has_key(candidateBasename):
                             gridname = candidateBasename
                         else:
                             foundname = 0
-                            for i in range(97, 123):  # Lower-case letters
-                                candidateName = candidateBasename + \
-                                    '_' + chr(i)
-                                if candidateName not in self.grids:
+                            for i in range(97,123): # Lower-case letters
+                                candidateName = candidateBasename+'_'+chr(i)
+                                if not self.grids.has_key(candidateName):
                                     gridname = candidateName
                                     foundname = 1
                                     break
@@ -691,16 +606,11 @@ class Dataset(CdmsObj, cuDataset):
                             if not foundname:
                                 print 'Warning: cannot generate a grid for variable', var.id
                                 continue
-
+                            
                         # Create the grid
                         if gridkey[4] == 'rectGrid':
-                            node = cdmsNode.RectGridNode(
-                                gridname,
-                                lat.id,
-                                lon.id,
-                                gridtype,
-                                gridkey[2])
-                            grid = RectGrid(self, node)
+                            node = cdmsNode.RectGridNode(gridname, lat.id, lon.id, gridtype, gridkey[2])
+                            grid = RectGrid(self,node)
                             grid.initDomain(self.axes, self.variables)
                         elif gridkey[4] == 'curveGrid':
                             grid = DatasetCurveGrid(lat, lon, gridname, self)
@@ -741,39 +651,34 @@ class Dataset(CdmsObj, cuDataset):
                     # but now there _may_ be an additional item before path...
                     for varm1 in varmap:
                         tstart, tend, levstart, levend = varm1[0:4]
-                        if (len(varm1) >= 6):
+                        if (len(varm1)>=6):
                             forecast = varm1[4]
                         else:
                             forecast = None
                         path = varm1[-1]
-                        self._filemap_[(
-                                       varname,
-                                       tstart,
-                                       levstart,
-                                       forecast)] = path
+                        self._filemap_[(varname, tstart, levstart, forecast)] = path
                         if tstart is not None:
-                            timemap[
-                                (tstart, tend)] = 1  # Collect unique (tstart, tend) tuples
+                            timemap[(tstart, tend)] = 1 # Collect unique (tstart, tend) tuples
                         if levstart is not None:
                             levmap[(levstart, levend)] = 1
                         if forecast is not None:
-                            fcmap[(forecast, forecast)] = 1
+                            fcmap[(forecast,forecast)] = 1
                     tkeys = timemap.keys()
-                    if len(tkeys) > 0:
+                    if len(tkeys)>0:
                         tkeys.sort()
                         tpart = map(lambda x: list(x), tkeys)
                     else:
                         tpart = None
                     levkeys = levmap.keys()
-                    if len(levkeys) > 0:
+                    if len(levkeys)>0:
                         levkeys.sort()
                         levpart = map(lambda x: list(x), levkeys)
                     else:
                         levpart = None
                     fckeys = fcmap.keys()
-                    if len(fckeys) > 0:
+                    if len(fckeys)>0:
                         fckeys.sort()
-                    if varname in self.variables:
+                    if self.variables.has_key(varname):
                         self.variables[varname]._varpart_ = [tpart, levpart]
 
     def getConvention(self):
@@ -781,7 +686,7 @@ class Dataset(CdmsObj, cuDataset):
         return self._convention_
 
     # Get a dictionary of objects with the given tag
-    def getDictionary(self, tag):
+    def getDictionary(self,tag):
         return self.dictdict[tag]
 
     # Synchronize writes with data/metadata files
@@ -802,24 +707,24 @@ class Dataset(CdmsObj, cuDataset):
         self.parent = None
         self._status_ = 'closed'
 
-# Note: Removed to allow garbage collection of reference cycles
-# def __del__(self):
-# if cdmsobj._debug==1:
-# print 'Deleting dataset',self.id
-# self.close()
-
+##  Note: Removed to allow garbage collection of reference cycles
+##     def __del__(self):
+##         if cdmsobj._debug==1:
+##             print 'Deleting dataset',self.id
+##         self.close()
+    
     # Create an axis
     # 'name' is the string name of the Axis
     # 'ar' is the 1-D data array, or None for an unlimited axis
     # Return an axis object.
-    def createAxis(self, name, ar):
+    def createAxis(self,name,ar):
         pass
 
     # Create an implicit rectilinear grid. lat, lon, and mask are objects.
     # order and type are strings
-    def createRectGrid(self, id, lat, lon, order, type="generic", mask=None):
+    def createRectGrid(self,id, lat, lon, order, type="generic", mask=None):
         node = cdmsNode.RectGridNode(id, lat.id, lon.id, type, order, mask.id)
-        grid = RectGrid(self, node)
+        grid = RectGrid(self,node)
         grid.initDomain(self.axes, self.variables)
         self.grids[grid.id] = grid
 #        self._gridmap_[gridkey] = grid
@@ -829,31 +734,31 @@ class Dataset(CdmsObj, cuDataset):
     # 'datatype' is a CDMS datatype
     # 'axisnames' is a list of axes or grids
     # Return a variable object.
-    def createVariable(self, name, datatype, axisnames):
+    def createVariable(self,name,datatype,axisnames):
         pass
 
     # Search for a pattern in a string-valued attribute. If attribute is None,
     # search all string attributes. If tag is 'dataset', just check the dataset,
     # else check all nodes in the dataset of class type matching the tag. If tag
     # is None, search the dataset and all objects contained in it.
-    def searchPattern(self, pattern, attribute, tag):
+    def searchPattern(self,pattern,attribute,tag):
         resultlist = []
         if tag is not None:
-            tag = tag.lower()
-        if tag in ('dataset', None):
-            if self.searchone(pattern, attribute) == 1:
+            tag = string.lower(tag)
+        if tag in ('dataset',None):
+            if self.searchone(pattern,attribute)==1:
                 resultlist = [self]
             else:
                 resultlist = []
         if tag is None:
             for dict in self.dictdict.values():
                 for obj in dict.values():
-                    if obj.searchone(pattern, attribute):
+                    if obj.searchone(pattern,attribute):
                         resultlist.append(obj)
-        elif tag != 'dataset':
+        elif tag!='dataset':
             dict = self.dictdict[tag]
             for obj in dict.values():
-                if obj.searchone(pattern, attribute):
+                if obj.searchone(pattern,attribute):
                     resultlist.append(obj)
         return resultlist
 
@@ -861,24 +766,24 @@ class Dataset(CdmsObj, cuDataset):
     # search all string attributes. If tag is 'dataset', just check the dataset,
     # else check all nodes in the dataset of class type matching the tag. If tag
     # is None, search the dataset and all objects contained in it.
-    def matchPattern(self, pattern, attribute, tag):
+    def matchPattern(self,pattern,attribute,tag):
         resultlist = []
         if tag is not None:
-            tag = tag.lower()
-        if tag in ('dataset', None):
-            if self.matchone(pattern, attribute) == 1:
+            tag = string.lower(tag)
+        if tag in ('dataset',None):
+            if self.matchone(pattern,attribute)==1:
                 resultlist = [self]
             else:
                 resultlist = []
         if tag is None:
             for dict in self.dictdict.values():
                 for obj in dict.values():
-                    if obj.matchone(pattern, attribute):
+                    if obj.matchone(pattern,attribute):
                         resultlist.append(obj)
-        elif tag != 'dataset':
+        elif tag!='dataset':
             dict = self.dictdict[tag]
             for obj in dict.values():
-                if obj.matchone(pattern, attribute):
+                if obj.matchone(pattern,attribute):
                     resultlist.append(obj)
         return resultlist
 
@@ -889,13 +794,13 @@ class Dataset(CdmsObj, cuDataset):
     # If 'variable', 'axis', etc., it is applied only to that type of object
     # in the dataset. If None, it is applied to all objects, including
     # the dataset itself.
-    def searchPredicate(self, predicate, tag):
+    def searchPredicate(self,predicate,tag):
         resultlist = []
         if tag is not None:
-            tag = tag.lower()
-        if tag in ('dataset', None):
+            tag = string.lower(tag)
+        if tag in ('dataset',None):
             try:
-                if predicate(*(self,)) == 1:
+                if apply(predicate,(self,))==1:
                     resultlist.append(self)
             except AttributeError:
                 pass
@@ -903,15 +808,15 @@ class Dataset(CdmsObj, cuDataset):
             for dict in self.dictdict.values():
                 for obj in dict.values():
                     try:
-                        if predicate(*(obj,)) == 1:
+                        if apply(predicate,(obj,))==1:
                             resultlist.append(obj)
                     except AttributeError:
                         pass
-        elif tag != "dataset":
+        elif tag!="dataset":
             dict = self.dictdict[tag]
             for obj in dict.values():
                 try:
-                    if predicate(*(obj,)) == 1:
+                    if apply(predicate,(obj,))==1:
                         resultlist.append(obj)
                 except:
                     pass
@@ -923,7 +828,8 @@ class Dataset(CdmsObj, cuDataset):
         for var in self.variables.values():
             for path, stuple in var.getPaths():
                 pathdict[path] = 1
-        result = sorted(pathdict.keys())
+        result = pathdict.keys()
+        result.sort()
         return result
 
     # Open a data file associated with this dataset.
@@ -933,36 +839,33 @@ class Dataset(CdmsObj, cuDataset):
 
         # Opened via a local XML file?
         if self.parent is None:
-            path = os.path.join(self.datapath, filename)
-            if cdmsobj._debug == 1:
-                sys.stdout.write(path + '\n')
-                sys.stdout.flush()
-            f = Cdunif.CdunifFile(path, mode)
+            path = os.path.join(self.datapath,filename)
+            if cdmsobj._debug==1:
+                sys.stdout.write(path+'\n'); sys.stdout.flush()
+            f = Cdunif.CdunifFile(path,mode)
             return f
 
         # Opened via a database
         else:
             dburls = self.parent.url
-            if not isinstance(dburls, type([])):
+            if type(dburls)!=type([]):
                 dburls = [dburls]
 
             # Try first to open as a local file
             for dburl in dburls:
                 if os.path.isabs(self.directory):
-                    fileurl = os.path.join(self.directory, filename)
+                    fileurl = os.path.join(self.directory,filename)
                 else:
                     try:
-                        fileurl = os.path.join(dburl, self.datapath, filename)
+                        fileurl = os.path.join(dburl,self.datapath,filename)
                     except:
-                        print 'Error joining', repr(dburl), self.datapath, filename
+                        print 'Error joining',`dburl`,self.datapath,filename
                         raise
-                (scheme, netloc, path, parameters, query,
-                 fragment) = urlparse.urlparse(fileurl)
-                if scheme in ['file', ''] and os.path.isfile(path):
-                    if cdmsobj._debug == 1:
-                        sys.stdout.write(fileurl + '\n')
-                        sys.stdout.flush()
-                    f = Cdunif.CdunifFile(path, mode)
+                (scheme,netloc,path,parameters,query,fragment)=urlparse.urlparse(fileurl)
+                if scheme in ['file',''] and os.path.isfile(path):
+                    if cdmsobj._debug==1:
+                        sys.stdout.write(fileurl+'\n'); sys.stdout.flush()
+                    f = Cdunif.CdunifFile(path,mode)
                     return f
 
             # See if request manager is being used for file transfer
@@ -972,40 +875,32 @@ class Dataset(CdmsObj, cuDataset):
                 lcbase = db.lcBaseDN
                 lcpath = self.getLogicalCollectionDN(lcbase)
 
-                # File location is logical collection path combined with
-                # relative filename
+                # File location is logical collection path combined with relative filename
                 fileDN = (self.uri, filename)
-                path = cache.getFile(
-                    filename,
-                    fileDN,
-                    lcpath=lcpath,
-                    userid=db.userid,
-                    useReplica=db.useReplica)
+                path = cache.getFile(filename, fileDN, lcpath=lcpath, userid=db.userid, useReplica=db.useReplica)
                 try:
-                    f = Cdunif.CdunifFile(path, mode)
+                    f = Cdunif.CdunifFile(path,mode)
                 except:
                     # Try again, in case another process clobbered this file
-                    path = cache.getFile(fileurl, fileDN)
-                    f = Cdunif.CdunifFile(path, mode)
+                    path = cache.getFile(fileurl,fileDN)
+                    f = Cdunif.CdunifFile(path,mode)
                 return f
 
             # Try to read via FTP:
 
             for dburl in dburls:
-                fileurl = os.path.join(dburl, self.datapath, filename)
-                (scheme, netloc, path, parameters, query,
-                 fragment) = urlparse.urlparse(fileurl)
-                if scheme == 'ftp':
+                fileurl = os.path.join(dburl,self.datapath,filename)
+                (scheme,netloc,path,parameters,query,fragment)=urlparse.urlparse(fileurl)
+                if scheme=='ftp':
                     cache = self.parent.enableCache()
-                    fileDN = (self.uri, filename)  # Global file name
-                    path = cache.getFile(fileurl, fileDN)
+                    fileDN = (self.uri, filename) # Global file name
+                    path = cache.getFile(fileurl,fileDN)
                     try:
-                        f = Cdunif.CdunifFile(path, mode)
+                        f = Cdunif.CdunifFile(path,mode)
                     except:
-                        # Try again, in case another process clobbered this
-                        # file
-                        path = cache.getFile(fileurl, fileDN)
-                        f = Cdunif.CdunifFile(path, mode)
+                        # Try again, in case another process clobbered this file
+                        path = cache.getFile(fileurl,fileDN)
+                        f = Cdunif.CdunifFile(path,mode)
                     return f
 
             # File not found
@@ -1018,9 +913,9 @@ class Dataset(CdmsObj, cuDataset):
         if hasattr(self, "lc"):
             dn = self.lc
         else:
-            dn = "lc=%s" % self.id
+            dn = "lc=%s"%self.id
         if base is not None:
-            dn = "%s,%s" % (dn, base)
+            dn = "%s,%s"%(dn,base)
         return dn
 
     def getVariable(self, id):
@@ -1032,8 +927,7 @@ class Dataset(CdmsObj, cuDataset):
         axes defined on latitude or longitude, excluding weights and bounds."""
         retval = self.variables.values()
         if spatial:
-            retval = filter(lambda x: x.id[0:7] != "bounds_" and x.id[0:8] != "weights_" and (
-                (x.getLatitude() is not None) or (x.getLongitude() is not None) or (x.getLevel() is not None)), retval)
+            retval = filter(lambda x: x.id[0:7]!="bounds_" and x.id[0:8]!="weights_" and ((x.getLatitude() is not None) or (x.getLongitude() is not None) or (x.getLevel() is not None)), retval)
         return retval
 
     def getAxis(self, id):
@@ -1045,40 +939,38 @@ class Dataset(CdmsObj, cuDataset):
         return self.grids.get(id)
 
     def __repr__(self):
-        return "<Dataset: '%s', URI: '%s', mode: '%s', status: %s>" % (self.id, self.uri, self.mode, self._status_)
-
-# internattr.add_internal_attribute (Dataset, 'datapath',
-# 'variables',
-# 'axes',
-# 'grids',
-# 'xlinks',
-# 'dictdict',
-# 'default_variable_name',
-# 'parent',
-# 'uri',
-# 'mode')
-
+        return "<Dataset: '%s', URI: '%s', mode: '%s', status: %s>"%(self.id, self.uri, self.mode, self._status_)
+
+## internattr.add_internal_attribute (Dataset, 'datapath',
+##                                             'variables',
+##                                             'axes',
+##                                             'grids',
+##                                             'xlinks',
+##                                             'dictdict',
+##                                             'default_variable_name',
+##                                             'parent',
+##                                             'uri',
+##                                             'mode')
 
 class CdmsFile(CdmsObj, cuDataset):
-
-    def __init__(self, path, mode, hostObj=None, mpiBarrier=False):
+    def __init__(self, path, mode, hostObj = None, mpiBarrier=False):
 
         if mpiBarrier:
             MPI.COMM_WORLD.Barrier()
 
         CdmsObj.__init__(self, None)
         cuDataset.__init__(self)
-        value = self.__cdms_internals__ + ['datapath',
-                                           'variables',
-                                           'axes',
-                                           'grids',
-                                           'xlinks',
-                                           'dictdict',
-                                           'default_variable_name',
-                                           'id',
-                                           'uri',
-                                           'parent',
-                                           'mode']
+        value = self.__cdms_internals__+['datapath',
+                                'variables',
+                                'axes',
+                                'grids',
+                                'xlinks',
+                                'dictdict',
+                                'default_variable_name',
+                                'id',
+                                'uri',
+                                'parent',
+                                'mode']
         self.___cdms_internals__ = value
         self.id = path
         if "://" in path:
@@ -1087,14 +979,14 @@ class CdmsFile(CdmsObj, cuDataset):
             self.uri = "file://" + os.path.abspath(os.path.expanduser(path))
         self._mode_ = mode
         try:
-            if mode[0].lower() == "w":
+            if mode[0].lower()=="w":
                 try:
                     os.remove(path)
                 except:
                     pass
-            _fileobj_ = Cdunif.CdunifFile(path, mode)
-        except Exception as err:
-            raise CDMSError('Cannot open file %s (%s)' % (path, err))
+            _fileobj_ = Cdunif.CdunifFile (path, mode)
+        except Exception,err:
+            raise CDMSError('Cannot open file %s (%s)'%(path,err))
         self._file_ = _fileobj_   # Cdunif file object
         self.variables = {}
         self.axes = {}
@@ -1102,40 +994,33 @@ class CdmsFile(CdmsObj, cuDataset):
         self.xlinks = {}
         self._gridmap_ = {}
 
-        # self.attributes returns the Cdunif file dictionary.
-# self.replace_external_attributes(self._file_.__dict__)
-        for att in self._file_.__dict__.keys():
-            self.__dict__.__setitem__(att, self._file_.__dict__[att])
-            self.attributes[att] = self._file_.__dict__[att]
+        # self.attributes returns the Cdunif file dictionary. 
+##         self.replace_external_attributes(self._file_.__dict__)
+        for att in  self._file_.__dict__.keys():
+            self.__dict__.__setitem__(att,self._file_.__dict__[att])
+            self.attributes[att]=self._file_.__dict__[att]
         self._boundAxis_ = None         # Boundary axis for cell vertices
-        if self._mode_ == 'w':
+        if self._mode_=='w':
             self.Conventions = convention.CFConvention.current
         self._status_ = 'open'
         self._convention_ = convention.getDatasetConvention(self)
 
         try:
-
+            
             # A mosaic variable with coordinates attached, but the coordinate variables reside in a
-            # different file. Add the coordinate variables to the mosaic
-            # variables list.
+            # different file. Add the coordinate variables to the mosaic variables list.
             if not hostObj is None:
                 for name in self._file_.variables.keys():
                     if 'coordinates' in dir(self._file_.variables[name]):
-                        coords = self._file_.variables[
-                            name].coordinates.split()
+                        coords = self._file_.variables[name].coordinates.split()
                         for coord in coords:
                             if not coord in self._file_.variables.keys():
-                                cdunifvar = Cdunif.CdunifFile(
-                                    hostObj.gridVars[coord][0],
-                                    mode)
-                                self._file_.variables[
-                                    coord] = cdunifvar.variables[
-                                        coord]
-
+                                cdunifvar = Cdunif.CdunifFile(hostObj.gridVars[coord][0], mode)
+                                self._file_.variables[coord] = cdunifvar.variables[coord]
+                
             # Get lists of 1D and auxiliary coordinate axes
             coords1d = self._convention_.getAxisIds(self._file_.variables)
-            coordsaux = self._convention_.getAxisAuxIds(
-                self._file_.variables, coords1d)
+            coordsaux = self._convention_.getAxisAuxIds(self._file_.variables, coords1d)
 
             # Build variable list
             for name in self._file_.variables.keys():
@@ -1144,15 +1029,12 @@ class CdmsFile(CdmsObj, cuDataset):
                     if name in coordsaux:
                         # Put auxiliary coordinate axes with variables, since there may be
                         # a dimension with the same name.
-                        if len(cdunifvar.shape) == 2:
-                            self.variables[name] = FileAxis2D(
-                                self, name, cdunifvar)
+                        if len(cdunifvar.shape)==2:
+                            self.variables[name] = FileAxis2D(self, name, cdunifvar)
                         else:
-                            self.variables[name] = FileAuxAxis1D(
-                                self, name, cdunifvar)
+                            self.variables[name] = FileAuxAxis1D(self, name, cdunifvar)
                     else:
-                        self.variables[name] = FileVariable(
-                            self, name, cdunifvar)
+                        self.variables[name] = FileVariable(self,name,cdunifvar)
 
             # Build axis list
             for name in self._file_.dimensions.keys():
@@ -1162,7 +1044,7 @@ class CdmsFile(CdmsObj, cuDataset):
                     cdunifvar = self._file_.variables[name]
                 else:
                     cdunifvar = None
-                self.axes[name] = FileAxis(self, name, cdunifvar)
+                self.axes[name] = FileAxis(self,name,cdunifvar)
 
             # Attach boundary variables
             for name in coordsaux:
@@ -1170,12 +1052,7 @@ class CdmsFile(CdmsObj, cuDataset):
                 bounds = self._convention_.getVariableBounds(self, var)
                 var.setBounds(bounds)
 
-            self.dictdict = {
-                'variable': self.variables,
-                'axis': self.axes,
-                'rectGrid': self.grids,
-                'curveGrid': self.grids,
-                'genericGrid': self.grids}
+            self.dictdict = {'variable':self.variables, 'axis':self.axes, 'rectGrid':self.grids, 'curveGrid':self.grids, 'genericGrid':self.grids}
 
             # Initialize variable domains
             for var in self.variables.values():
@@ -1185,44 +1062,41 @@ class CdmsFile(CdmsObj, cuDataset):
             for var in self.variables.values():
                 # Get grid information for the variable. gridkey has the form
                 # (latname,lonname,order,maskname, abstract_class).
-                gridkey, lat, lon = var.generateGridkey(
-                    self._convention_, self.variables)
+                gridkey, lat, lon = var.generateGridkey(self._convention_, self.variables)
 
                 # If the variable is gridded, lookup the grid. If no such grid exists,
-                # create a unique gridname, create the grid, and add to the
-                # gridmap.
+                # create a unique gridname, create the grid, and add to the gridmap.
                 if gridkey is None:
                     grid = None
                 else:
                     grid = self._gridmap_.get(gridkey)
                     if grid is None:
 
-                        if hasattr(var, 'grid_type'):
+                        if hasattr(var,'grid_type'):
                             gridtype = var.grid_type
                         else:
                             gridtype = "generic"
 
                         candidateBasename = None
                         if gridkey[4] == 'rectGrid':
-                            gridshape = (len(lat), len(lon))
+                            gridshape = (len(lat),len(lon))
                         elif gridkey[4] == 'curveGrid':
                             gridshape = lat.shape
                         elif gridkey[4] == 'genericGrid':
                             gridshape = lat.shape
-                            candidateBasename = 'grid_%d' % gridshape
+                            candidateBasename = 'grid_%d'%gridshape
                         else:
-                            gridshape = (len(lat), len(lon))
+                            gridshape = (len(lat),len(lon))
 
                         if candidateBasename is None:
-                            candidateBasename = 'grid_%dx%d' % gridshape
-                        if candidateBasename not in self.grids:
+                            candidateBasename = 'grid_%dx%d'%gridshape
+                        if not self.grids.has_key(candidateBasename):
                             gridname = candidateBasename
                         else:
                             foundname = 0
-                            for i in range(97, 123):  # Lower-case letters
-                                candidateName = candidateBasename + \
-                                    '_' + chr(i)
-                                if candidateName not in self.grids:
+                            for i in range(97,123): # Lower-case letters
+                                candidateName = candidateBasename+'_'+chr(i)
+                                if not self.grids.has_key(candidateName):
                                     gridname = candidateName
                                     foundname = 1
                                     break
@@ -1233,36 +1107,20 @@ class CdmsFile(CdmsObj, cuDataset):
 
                         # Create the grid
                         if gridkey[4] == 'rectGrid':
-                            grid = FileRectGrid(
-                                self,
-                                gridname,
-                                lat,
-                                lon,
-                                gridkey[2],
-                                gridtype)
+                            grid = FileRectGrid(self, gridname, lat, lon, gridkey[2], gridtype)
                         else:
-                            if gridkey[3] != '':
-                                if gridkey[3] in self.variables:
+                            if gridkey[3]!='':
+                                if self.variables.has_key(gridkey[3]):
                                     maskvar = self.variables[gridkey[3]]
                                 else:
-                                    print 'Warning: mask variable %s not found' % gridkey[3]
+                                    print 'Warning: mask variable %s not found'%gridkey[3]
                                     maskvar = None
                             else:
                                 maskvar = None
                             if gridkey[4] == 'curveGrid':
-                                grid = FileCurveGrid(
-                                    lat,
-                                    lon,
-                                    gridname,
-                                    parent=self,
-                                    maskvar=maskvar)
+                                grid = FileCurveGrid(lat, lon, gridname, parent=self, maskvar=maskvar)
                             else:
-                                grid = FileGenericGrid(
-                                    lat,
-                                    lon,
-                                    gridname,
-                                    parent=self,
-                                    maskvar=maskvar)
+                                grid = FileGenericGrid(lat, lon, gridname, parent=self, maskvar=maskvar)
                         self.grids[grid.id] = grid
                         self._gridmap_[gridkey] = grid
 
@@ -1273,45 +1131,45 @@ class CdmsFile(CdmsObj, cuDataset):
             raise
 
     # setattr writes external global attributes to the file
-    def __setattr__(self, name, value):
-# s = self.get_property_s(name)
-# if s is not None:
-# print '....handler'
-# s(self, name, value)
-# return
-        self.__dict__[name] = value  # attributes kept in sync w/file
-        if not name in self.__cdms_internals__ and name[0] != '_':
+    def __setattr__ (self, name, value):
+##         s = self.get_property_s(name)
+##         if s is not None:
+##             print '....handler'
+##             s(self, name, value)
+##             return
+        self.__dict__[name] =  value #attributes kept in sync w/file
+        if not name in self.__cdms_internals__ and name[0]!='_':
             setattr(self._file_, name, value)
-            self.attributes[name] = value
-
-# getattr reads external global attributes from the file
-# def __getattr__ (self, name):
-# g = self.get_property_g(name)
-# if g is not None:
-# return g(self, name)
-# if name in self.__cdms_internals__:
-# try:
-# return self.__dict__[name]
-# except KeyError:
-# raise AttributeError("%s instance has no attribute %s." % \
-# (self.__class__.__name__, name))
-# else:
-# return getattr(self._file_,name)
+            self.attributes[name]=value
+
+##     # getattr reads external global attributes from the file
+##     def __getattr__ (self, name):
+## ##         g = self.get_property_g(name)
+## ##         if g is not None:
+## ##             return g(self, name)
+##         if name in self.__cdms_internals__:
+##             try:
+##                 return self.__dict__[name]
+##             except KeyError:
+##                 raise AttributeError("%s instance has no attribute %s." % \
+##                            (self.__class__.__name__, name))
+##         else:
+##             return getattr(self._file_,name)
 
     # delattr deletes external global attributes in the file
     def __delattr__(self, name):
-# d = self.get_property_d(name)
-# if d is not None:
-# d(self, name)
-# return
+##         d = self.get_property_d(name)
+##         if d is not None:
+##             d(self, name)
+##             return
         try:
             del self.__dict__[name]
         except KeyError:
-            raise AttributeError("%s instance has no attribute %s." %
-                                 (self.__class__.__name__, name))
+            raise AttributeError("%s instance has no attribute %s." % \
+                  (self.__class__.__name__, name))
         if not name in self.__cdms_internals__:
             delattr(self._file_, name)
-            if(name in self.attributes.keys()):
+            if( name in self.attributes.keys() ):
                 del(self.attributes[name])
 
     def sync(self):
@@ -1321,12 +1179,12 @@ class CdmsFile(CdmsObj, cuDataset):
    None :: (None) (0) yep
    :::
    """
-        if self._status_ == "closed":
+        if self._status_=="closed":
             raise CDMSError(FileWasClosed + self.id)
         self._file_.sync()
 
     def close(self):
-        if self._status_ == "closed":
+        if self._status_=="closed":
             return
         if hasattr(self, 'dictdict'):
             for dict in self.dictdict.values():
@@ -1337,21 +1195,21 @@ class CdmsFile(CdmsObj, cuDataset):
         self._file_.close()
         self._status_ = 'closed'
 
-# Note: Removed to allow garbage collection of reference cycles
-# def __del__(self):
-# if cdmsobj._debug==1:
-# print 'Deleting file',self.id
-# If the object has been deallocated due to open error,
-# it will not have an attribute .dictdict
-# if hasattr(self,"dictdict") and self.dictdict != {}:
-# self.close()
+##  Note: Removed to allow garbage collection of reference cycles
+##     def __del__(self):
+##         if cdmsobj._debug==1:
+##             print 'Deleting file',self.id
+##         # If the object has been deallocated due to open error,
+##         # it will not have an attribute .dictdict
+##         if hasattr(self,"dictdict") and self.dictdict != {}:
+##             self.close()
 
     # Create an axis
     # 'name' is the string name of the Axis
     # 'ar' is the 1-D data array, or None for an unlimited axis
     # Set unlimited to true to designate the axis as unlimited
     # Return an axis object.
-    def createAxis(self, name, ar, unlimited=0):
+    def createAxis(self,name,ar,unlimited=0):
         """
         Create an axis
         'name' is the string name of the Axis
@@ -1370,36 +1228,36 @@ class CdmsFile(CdmsObj, cuDataset):
         axis :: (cdms2.axis.FileAxis) (0) file axis whose id is name
         :::
         """
-        if self._status_ == "closed":
+        if self._status_=="closed":
             raise CDMSError(FileWasClosed + self.id)
         cufile = self._file_
-        if ar is None or (unlimited == 1 and getNetcdfUseParallelFlag() == 0):
-            cufile.createDimension(name, None)
+        if ar is None or (unlimited==1 and getNetcdfUseParallelFlag()==0):
+            cufile.createDimension(name,None)
             if ar is None:
                 typecode = numpy.float
             else:
                 typecode = ar.dtype.char
         else:
-            cufile.createDimension(name, len(ar))
+            cufile.createDimension(name,len(ar))
             typecode = ar.dtype.char
 
         # Compatibility: revert to old typecode for cdunif
         typecode = typeconv.oldtypecodes[typecode]
-        cuvar = cufile.createVariable(name, typecode, (name,))
+        cuvar = cufile.createVariable(name,typecode,(name,))
 
         # Cdunif should really create this extra dimension info:
         #   (units,typecode,filename,varname_local,dimension_type,ncid)
-        cufile.dimensioninfo[name] = ('', typecode, name, '', 'global', -1)
+        cufile.dimensioninfo[name] = ('',typecode,name,'','global',-1)
 
         # Note: like netCDF-3, cdunif does not support 64-bit integers.
         # If ar has dtype int64 on a 64-bit machine, cuvar will be a 32-bit int,
         # and ar must be downcast.
         if ar is not None:
-            if ar.dtype.char != 'l':
+            if ar.dtype.char!='l':
                 cuvar[0:len(ar)] = numpy.ma.filled(ar)
             else:
                 cuvar[0:len(ar)] = numpy.ma.filled(ar).astype(cuvar.typecode())
-        axis = FileAxis(self, name, cuvar)
+        axis = FileAxis(self,name,cuvar)
         self.axes[name] = axis
         return axis
 
@@ -1416,24 +1274,23 @@ class CdmsFile(CdmsObj, cuDataset):
         :::
         Input:::
         name :: (str) (0) dimension name
-        axislen :: (int) (1)
+        axislen :: (int) (1) 
         :::
         Output:::
         axis :: (cdms2.axis.FileVirtualAxis) (0) file axis whose id is name
         :::
         """
-        if self._status_ == "closed":
+        if self._status_=="closed":
             raise CDMSError(FileWasClosed + self.id)
         cufile = self._file_
         cufile.createDimension(name, axislen)
-        cufile.dimensioninfo[name] = ('', 'f', name, '', 'global', -1)
+        cufile.dimensioninfo[name] = ('','f',name,'','global',-1)
         axis = FileVirtualAxis(self, name, axislen)
         self.axes[name] = axis
         return axis
 
     # Copy axis description and data from another axis
-    def copyAxis(self, axis, newname=None,
-                 unlimited=0, index=None, extbounds=None):
+    def copyAxis(self, axis, newname=None, unlimited=0, index=None, extbounds=None):
         """
         Copy axis description and data from another axis
         :::
@@ -1450,25 +1307,24 @@ class CdmsFile(CdmsObj, cuDataset):
         axis :: (cdms2.axis.FileAxis/cdms2.axis.FileVirtualAxis) (0) copy of input axis
         :::
         """
-        if newname is None:
-            newname = axis.id
+        if newname is None: newname=axis.id
 
         # If the axis already exists and has the same values, return existing
-        if newname in self.axes:
+        if self.axes.has_key(newname):
             newaxis = self.axes[newname]
             if newaxis.isVirtual():
-                if len(axis) != len(newaxis):
-                    raise DuplicateAxisError(DuplicateAxis + newname)
-            elif unlimited == 0 or (unlimited == 1 and getNetcdfUseParallelFlag() != 0):
-                if len(axis) != len(newaxis) or numpy.alltrue(numpy.less(numpy.absolute(newaxis[:] - axis[:]), 1.e-5)) == 0:
-                    raise DuplicateAxisError(DuplicateAxis + newname)
+                if len(axis)!=len(newaxis):
+                    raise DuplicateAxisError(DuplicateAxis+newname)
+            elif unlimited==0 or (unlimited==1 and getNetcdfUseParallelFlag()!=0):
+                if len(axis)!=len(newaxis) or numpy.alltrue(numpy.less(numpy.absolute(newaxis[:]-axis[:]),1.e-5))==0:
+                    raise DuplicateAxisError(DuplicateAxis+newname)
             else:
                 if index is None:
-                    isoverlap, index = isOverlapVector(axis[:], newaxis[:])
+                    isoverlap, index = isOverlapVector(axis[:],newaxis[:])
                 else:
                     isoverlap = 1
                 if isoverlap:
-                    newaxis[index:index + len(axis)] = axis[:]
+                    newaxis[index:index+len(axis)] = axis[:]
                     if extbounds is None:
                         axisBounds = axis.getBounds()
                     else:
@@ -1476,7 +1332,7 @@ class CdmsFile(CdmsObj, cuDataset):
                     if axisBounds is not None:
                         newaxis.setBounds(axisBounds)
                 else:
-                    raise DuplicateAxisError(DuplicateAxis + newname)
+                    raise DuplicateAxisError(DuplicateAxis+newname)
 
         elif axis.isVirtual():
             newaxis = self.createVirtualAxis(newname, len(axis))
@@ -1491,8 +1347,8 @@ class CdmsFile(CdmsObj, cuDataset):
                 else:
                     boundsid = None
                 newaxis.setBounds(bounds, persistent=1, boundsid=boundsid)
-            for attname, attval in axis.attributes.items():
-                if attname not in ["datatype", "id", "length", "isvar", "name_in_file", "partition"]:
+            for attname,attval in axis.attributes.items():
+                if attname not in ["datatype", "id","length","isvar","name_in_file","partition"]:
                     setattr(newaxis, attname, attval)
         return newaxis
 
@@ -1538,7 +1394,7 @@ class CdmsFile(CdmsObj, cuDataset):
         :::
         """
         if newname is None:
-            if hasattr(grid, 'id'):
+            if hasattr(grid,'id'):
                 newname = grid.id
             else:
                 newname = 'Grid'
@@ -1555,26 +1411,20 @@ class CdmsFile(CdmsObj, cuDataset):
         lon.designateLongitude(persistent=1)
 
         # If the grid name already exists, and is the same, just return it
-        if newname in self.grids:
+        if self.grids.has_key(newname):
             newgrid = self.grids[newname]
             newlat = newgrid.getLatitude()
             newlon = newgrid.getLongitude()
             if ((newlat is not lat) or
                 (newlon is not lon) or
                 (newgrid.getOrder() != grid.getOrder()) or
-                    (newgrid.getType() != grid.getType())):
+                (newgrid.getType() != grid.getType())):
                 raise DuplicateGrid(newname)
 
         # else create a new grid and copy metadata
         else:
             newmask = grid.getMask()    # Get the mask array
-            newgrid = self.createRectGrid(
-                newname,
-                lat,
-                lon,
-                grid.getOrder(),
-                grid.getType(),
-                None)
+            newgrid = self.createRectGrid(newname, lat, lon, grid.getOrder(), grid.getType(), None)
             newgrid.setMask(newmask)    # Set the mask array, non-persistently
             for attname in grid.attributes.keys():
                 setattr(newgrid, attname, getattr(grid, attname))
@@ -1587,7 +1437,7 @@ class CdmsFile(CdmsObj, cuDataset):
     # 'axesOrGrids' is a list of axes, grids. (Note: this should be
     #   generalized to allow subintervals of axes and/or grids)
     # Return a variable object.
-    def createVariable(self, name, datatype, axesOrGrids, fill_value=None):
+    def createVariable(self,name,datatype,axesOrGrids,fill_value=None):
         """
         Create a variable
         'name' is the string name of the Variable
@@ -1607,7 +1457,7 @@ class CdmsFile(CdmsObj, cuDataset):
         axis :: (cdms2.fvariable.FileVariable) (0) file variable
         :::
         """
-        if self._status_ == "closed":
+        if self._status_=="closed":
             raise CDMSError(FileWasClosed + self.id)
         cufile = self._file_
         if datatype in CdDatatypes:
@@ -1615,77 +1465,75 @@ class CdmsFile(CdmsObj, cuDataset):
         else:
             numericType = datatype
 
-        # dimensions = map(lambda x: x.id, axes)
+        #dimensions = map(lambda x: x.id, axes)
         # Make a list of names of axes for _Cdunif
         dimensions = []
         for obj in axesOrGrids:
             if isinstance(obj, FileAxis):
                 dimensions.append(obj.id)
             elif isinstance(obj, FileRectGrid):
-                dimensions = dimensions + \
-                    [obj.getAxis(0).id, obj.getAxis(1).id]
+                dimensions = dimensions + [obj.getAxis(0).id, obj.getAxis(1).id]
             else:
                 raise InvalidDomain
 
         try:
             # Compatibility: revert to old typecode for cdunif
             numericType = typeconv.oldtypecodes[numericType]
-            cuvar = cufile.createVariable(name, numericType, tuple(dimensions))
-        except Exception as err:
+            cuvar = cufile.createVariable(name,numericType,tuple(dimensions))
+        except Exception,err:
             print err
-            raise CDMSError("Creating variable " + name)
-        var = FileVariable(self, name, cuvar)
+            raise CDMSError("Creating variable "+name)
+        var = FileVariable(self,name,cuvar)
         var.initDomain(self.axes)
         self.variables[name] = var
-        if fill_value is not None:
-            var.setMissing(fill_value)
+        if fill_value is not None: var.setMissing(fill_value)
         return var
 
     # Create a variable from an existing variable, and copy the metadata
-# def createVariableCopy(self, var, newname=None):
+##     def createVariableCopy(self, var, newname=None):
 
-# if newname is None: newname=var.id
-# if self.variables.has_key(newname):
-# raise DuplicateVariable(newname)
+##         if newname is None: newname=var.id
+##         if self.variables.has_key(newname):
+##             raise DuplicateVariable(newname)
 
 
-# Create axes if necessary
-# axislist = []
-# for (axis,start,length,true_length) in var.getDomain():
-# try:
-# newaxis = self.copyAxis(axis)
-# except DuplicateAxisError:
+##         # Create axes if necessary
+##         axislist = []
+##         for (axis,start,length,true_length) in var.getDomain():
+##             try:
+##                 newaxis = self.copyAxis(axis)
+##             except DuplicateAxisError:
 
-# Create a unique axis name
-# setit = 0
-# for i in range(97,123): # Lower-case letters
-# try:
-# newaxis = self.copyAxis(axis,axis.id+'_'+chr(i))
-# setit = 1
-# break
-# except DuplicateAxisError:
-# continue
+##                 # Create a unique axis name
+##                 setit = 0
+##                 for i in range(97,123): # Lower-case letters
+##                     try:
+##                         newaxis = self.copyAxis(axis,axis.id+'_'+chr(i))
+##                         setit = 1
+##                         break
+##                     except DuplicateAxisError:
+##                         continue
 
-# if setit==0: raise DuplicateAxisError(DuplicateAxis+axis.id)
+##                 if setit==0: raise DuplicateAxisError(DuplicateAxis+axis.id)
 
-# axislist.append(newaxis)
+##             axislist.append(newaxis)
 
-# Create the new variable
-# datatype = cdmsNode.NumericToCdType.get(var.dtype.char)
-# newvar = self.createVariable(newname, datatype, axislist)
+##         # Create the new variable
+##         datatype = cdmsNode.NumericToCdType.get(var.dtype.char)
+##         newvar = self.createVariable(newname, datatype, axislist)
 
-# Copy variable metadata
-# for attname in var.attributes.keys():
-# if attname not in ["id", "datatype"]:
-# setattr(newvar, attname, getattr(var, attname))
+##         # Copy variable metadata
+##         for attname in var.attributes.keys():
+##             if attname not in ["id", "datatype"]:
+##                 setattr(newvar, attname, getattr(var, attname))
 
-# return newvar
+##         return newvar
 
     # Search for a pattern in a string-valued attribute. If attribute is None,
     # search all string attributes. If tag is 'cdmsFile', just check the dataset,
     # else check all nodes in the dataset of class type matching the tag. If tag
     # is None, search the dataset and all objects contained in it.
-    def searchPattern(self, pattern, attribute, tag):
+    def searchPattern(self,pattern,attribute,tag):
         """
         Search for a pattern in a string-valued attribute. If attribute is None, search all string attributes. If tag is not None, it must match the internal node tag.
         :::
@@ -1695,26 +1543,26 @@ class CdmsFile(CdmsObj, cuDataset):
         tag :: (str/None) (2) node tag
         :::
         Output:::
-        result :: (list) (0)
+        result :: (list) (0) 
         :::
         """
         resultlist = []
         if tag is not None:
-            tag = tag.lower()
-        if tag in ('cdmsFile', None, 'dataset'):
-            if self.searchone(pattern, attribute) == 1:
+            tag = string.lower(tag)
+        if tag in ('cdmsFile',None,'dataset'):
+            if self.searchone(pattern,attribute)==1:
                 resultlist = [self]
             else:
                 resultlist = []
         if tag is None:
             for dict in self.dictdict.values():
                 for obj in dict.values():
-                    if obj.searchone(pattern, attribute):
+                    if obj.searchone(pattern,attribute):
                         resultlist.append(obj)
-        elif tag not in ('cdmsFile', 'dataset'):
+        elif tag not in ('cdmsFile','dataset'):
             dict = self.dictdict[tag]
             for obj in dict.values():
-                if obj.searchone(pattern, attribute):
+                if obj.searchone(pattern,attribute):
                     resultlist.append(obj)
         return resultlist
 
@@ -1722,7 +1570,7 @@ class CdmsFile(CdmsObj, cuDataset):
     # search all string attributes. If tag is 'cdmsFile', just check the dataset,
     # else check all nodes in the dataset of class type matching the tag. If tag
     # is None, search the dataset and all objects contained in it.
-    def matchPattern(self, pattern, attribute, tag):
+    def matchPattern(self,pattern,attribute,tag):
         """
         Match for a pattern in a string-valued attribute. If attribute is None, search all string attributes. If tag is not None, it must match the internal node tag.
         :::
@@ -1732,26 +1580,26 @@ class CdmsFile(CdmsObj, cuDataset):
         tag :: (str/None) (2) node tag
         :::
         Output:::
-        result :: (list) (0)
+        result :: (list) (0) 
         :::
         """
         resultlist = []
         if tag is not None:
-            tag = tag.lower()
-        if tag in ('cdmsFile', None, 'dataset'):
-            if self.matchone(pattern, attribute) == 1:
+            tag = string.lower(tag)
+        if tag in ('cdmsFile',None,'dataset'):
+            if self.matchone(pattern,attribute)==1:
                 resultlist = [self]
             else:
                 resultlist = []
         if tag is None:
             for dict in self.dictdict.values():
                 for obj in dict.values():
-                    if obj.matchone(pattern, attribute):
+                    if obj.matchone(pattern,attribute):
                         resultlist.append(obj)
-        elif tag not in ('cdmsFile', 'dataset'):
+        elif tag not in ('cdmsFile','dataset'):
             dict = self.dictdict[tag]
             for obj in dict.values():
-                if obj.matchone(pattern, attribute):
+                if obj.matchone(pattern,attribute):
                     resultlist.append(obj)
         return resultlist
 
@@ -1762,7 +1610,7 @@ class CdmsFile(CdmsObj, cuDataset):
     # If 'variable', 'axis', etc., it is applied only to that type of object
     # in the dataset. If None, it is applied to all objects, including
     # the dataset itself.
-    def searchPredicate(self, predicate, tag):
+    def searchPredicate(self,predicate,tag):
         """
         Apply a truth-valued predicate. Return a list containing a single instance: [self] if the predicate is true and either tag is None or matches the object node tag. If the predicate returns false, return an empty list
         :::
@@ -1771,15 +1619,15 @@ class CdmsFile(CdmsObj, cuDataset):
         tag :: (str/None) (1) node tag
         :::
         Output:::
-        result :: (list) (0)
+        result :: (list) (0) 
         :::
         """
         resultlist = []
         if tag is not None:
-            tag = tag.lower()
-        if tag in ('cdmsFile', None, 'dataset'):
+            tag = string.lower(tag)
+        if tag in ('cdmsFile',None,'dataset'):
             try:
-                if predicate(*(self,)) == 1:
+                if apply(predicate,(self,))==1:
                     resultlist.append(self)
             except AttributeError:
                 pass
@@ -1787,22 +1635,21 @@ class CdmsFile(CdmsObj, cuDataset):
             for dict in self.dictdict.values():
                 for obj in dict.values():
                     try:
-                        if predicate(*(obj,)) == 1:
+                        if apply(predicate,(obj,))==1:
                             resultlist.append(obj)
                     except AttributeError:
                         pass
-        elif tag not in ('dataset', 'cdmsFile'):
+        elif tag not in ('dataset','cdmsFile'):
             dict = self.dictdict[tag]
             for obj in dict.values():
                 try:
-                    if predicate(*(obj,)) == 1:
+                    if apply(predicate,(obj,))==1:
                         resultlist.append(obj)
                 except:
                     pass
         return resultlist
 
-    def createVariableCopy(
-        self, var, id=None, attributes=None, axes=None, extbounds=None,
+    def createVariableCopy(self, var, id=None, attributes=None, axes=None, extbounds=None,
                               extend=0, fill_value=None, index=None, newname=None, grid=None):
         """Define a new variable, with the same axes and attributes as in <var>.
         This does not copy the data itself.
@@ -1838,10 +1685,10 @@ class CdmsFile(CdmsObj, cuDataset):
         :::
         """
         if newname is None:
-            newname = var.id
+            newname=var.id
         if id is not None:
             newname = id
-        if newname in self.variables:
+        if self.variables.has_key(newname):
             raise DuplicateVariable(newname)
 
         # Determine the extended axis name if any
@@ -1850,12 +1697,12 @@ class CdmsFile(CdmsObj, cuDataset):
         else:
             sourceAxislist = axes
 
-        if var.rank() == 0:      # scalars are not extensible
+        if var.rank()==0:      # scalars are not extensible
             extend = 0
-
-        if extend in (1, None):
+            
+        if extend in (1,None):
             firstAxis = sourceAxislist[0]
-            if firstAxis is not None and (extend == 1 or firstAxis.isTime()):
+            if firstAxis is not None and (extend==1 or firstAxis.isTime()):
                 extendedAxis = firstAxis.id
             else:
                 extendedAxis = None
@@ -1865,31 +1712,24 @@ class CdmsFile(CdmsObj, cuDataset):
         # Create axes if necessary
         axislist = []
         for axis in sourceAxislist:
-            if extendedAxis is None or axis.id != extendedAxis:
+            if extendedAxis is None or axis.id!=extendedAxis:
                 try:
                     newaxis = self.copyAxis(axis)
                 except DuplicateAxisError:
 
                     # Create a unique axis name
                     setit = 0
-                    for i in range(97, 123):  # Lower-case letters
+                    for i in range(97,123): # Lower-case letters
                         try:
-                            newaxis = self.copyAxis(
-                                axis,
-                                axis.id + '_' + chr(i))
+                            newaxis = self.copyAxis(axis,axis.id+'_'+chr(i))
                             setit = 1
                             break
                         except DuplicateAxisError:
                             continue
 
-                    if setit == 0:
-                        raise DuplicateAxisError(DuplicateAxis + axis.id)
+                    if setit==0: raise DuplicateAxisError(DuplicateAxis+axis.id)
             else:
-                newaxis = self.copyAxis(
-                    axis,
-                    unlimited=1,
-                    index=index,
-                    extbounds=extbounds)
+                newaxis = self.copyAxis(axis, unlimited=1, index=index, extbounds=extbounds)
 
             axislist.append(newaxis)
 
@@ -1897,29 +1737,25 @@ class CdmsFile(CdmsObj, cuDataset):
         if attributes is None:
             attributes = var.attributes
             try:
-                attributes['missing_value'] = var.missing_value
-            except Exception as err:
+                attributes['missing_value']=var.missing_value
+            except Exception,err:
                 print err
                 pass
             try:
                 if fill_value is None:
-                    if('_FillValue' in attributes.keys()):
-                        attributes['_FillValue'] = numpy.array(
-                            var._FillValue).astype(var.dtype)
-                        attributes['missing_value'] = numpy.array(
-                            var._FillValue).astype(var.dtype)
-                    if('missing_value' in attributes.keys()):
-                        attributes['_FillValue'] = numpy.array(
-                            var.missing_value).astype(var.dtype)
-                        attributes['missing_value'] = numpy.array(
-                            var.missing_value).astype(var.dtype)
+                    if( '_FillValue' in attributes.keys() ):
+                       attributes['_FillValue']=numpy.array(var._FillValue).astype(var.dtype)
+                       attributes['missing_value']=numpy.array(var._FillValue).astype(var.dtype)
+                    if( 'missing_value' in attributes.keys() ):
+                       attributes['_FillValue']=numpy.array(var.missing_value).astype(var.dtype)
+                       attributes['missing_value']=numpy.array(var.missing_value).astype(var.dtype)
                 else:
-                    attributes['_FillValue'] = fill_value
-                    attributes['missing_value'] = fill_value
+                    attributes['_FillValue']=fill_value
+                    attributes['missing_value']=fill_value
             except:
                 pass
-            if "name" in attributes:
-                if attributes['name'] != var.id:
+            if attributes.has_key("name"):
+                if attributes['name']!=var.id:
                     del(attributes['name'])
 
         # Create grid as necessary
@@ -1928,7 +1764,7 @@ class CdmsFile(CdmsObj, cuDataset):
         if grid is not None:
             coords = grid.writeToFile(self)
             if coords is not None:
-                coordattr = "%s %s" % (coords[0].id, coords[1].id)
+                coordattr = "%s %s"%(coords[0].id, coords[1].id)
                 if attributes is None:
                     attributes = {'coordinates': coordattr}
                 else:
@@ -1937,19 +1773,19 @@ class CdmsFile(CdmsObj, cuDataset):
         # Create the new variable
         datatype = cdmsNode.NumericToCdType.get(var.typecode())
         newvar = self.createVariable(newname, datatype, axislist)
-        for attname, attval in attributes.items():
+        for attname,attval in attributes.items():
             if attname not in ["id", "datatype", "parent"]:
                 setattr(newvar, attname, attval)
                 if (attname == "_FillValue") or (attname == "missing_value"):
-                    setattr(newvar, "_FillValue", attval)
-                    setattr(newvar, "missing_value", attval)
+                   setattr(newvar, "_FillValue", attval)
+                   setattr(newvar, "missing_value", attval)
 
         if fill_value is not None:
             newvar.setMissing(fill_value)
 
         return newvar
 
-    def write(self, var, attributes=None, axes=None, extbounds=None, id=None,
+    def write(self, var, attributes=None, axes=None, extbounds=None, id=None, \
               extend=None, fill_value=None, index=None, typecode=None, dtype=None, pack=False):
         """Write var to the file. If the variable is not yet defined in the file,
         a definition is created. By default, the time dimension of the variable is defined as the
@@ -1990,17 +1826,15 @@ class CdmsFile(CdmsObj, cuDataset):
         :::
         """
         if _showCompressWarnings:
-            if (Cdunif.CdunifGetNCFLAGS("shuffle") != 0) or (Cdunif.CdunifGetNCFLAGS("deflate") != 0) or (Cdunif.CdunifGetNCFLAGS("deflate_level") != 0):
+            if  (Cdunif.CdunifGetNCFLAGS("shuffle")!=0) or (Cdunif.CdunifGetNCFLAGS("deflate")!=0) or (Cdunif.CdunifGetNCFLAGS("deflate_level")!=0):
                 import warnings
-                warnings.warn(
-                    "Files are written with compression and shuffling\nYou can query different values of compression using the functions:\ncdms2.getNetcdfShuffleFlag() returning 1 if shuffling is enabled, 0 otherwise\ncdms2.getNetcdfDeflateFlag() returning 1 if deflate is used, 0 otherwise\ncdms2.getNetcdfDeflateLevelFlag() returning the level of compression for the deflate method\n\nIf you want to turn that off or set different values of compression use the functions:\nvalue = 0\ncdms2.setNetcdfShuffleFlag(value) ## where value is either 0 or 1\ncdms2.setNetcdfDeflateFlag(value) ## where value is either 0 or 1\ncdms2.setNetcdfDeflateLevelFlag(value) ## where value is a integer between 0 and 9 included\n\nTurning all values to 0 will produce NetCDF3 Classic files\nTo Force NetCDF4 output with classic format and no compressing use:\ncdms2.setNetcdf4Flag(1)\nNetCDF4 file with no shuffling or defalte and noclassic will be open for parallel i/o",
-                    Warning)
-
+                warnings.warn("Files are written with compression and shuffling\nYou can query different values of compression using the functions:\ncdms2.getNetcdfShuffleFlag() returning 1 if shuffling is enabled, 0 otherwise\ncdms2.getNetcdfDeflateFlag() returning 1 if deflate is used, 0 otherwise\ncdms2.getNetcdfDeflateLevelFlag() returning the level of compression for the deflate method\n\nIf you want to turn that off or set different values of compression use the functions:\nvalue = 0\ncdms2.setNetcdfShuffleFlag(value) ## where value is either 0 or 1\ncdms2.setNetcdfDeflateFlag(value) ## where value is either 0 or 1\ncdms2.setNetcdfDeflateLevelFlag(value) ## where value is a integer between 0 and 9 included\n\nTurning all values to 0 will produce NetCDF3 Classic files\nTo Force NetCDF4 output with classic format and no compressing use:\ncdms2.setNetcdf4Flag(1)\nNetCDF4 file with no shuffling or defalte and noclassic will be open for parallel i/o",Warning)
+                
         # Make var an AbstractVariable
         if dtype is None and typecode is not None:
             dtype = typeconv.convtypecode2(typecode)
         typecode = dtype
-        if typecode is not None and var.dtype.char != typecode:
+        if typecode is not None and var.dtype.char!=typecode:
             var = var.astype(typecode)
         var = asVariable(var, writeable=0)
 
@@ -2009,26 +1843,25 @@ class CdmsFile(CdmsObj, cuDataset):
             varid = var.id
         else:
             varid = id
-        if varid in self.variables:
+        if self.variables.has_key(varid):
             if pack:
-                raise CDMSError(
-                    "You cannot pack an existing variable %s " %
-                    varid)
+              raise CDMSError("You cannot pack an existing variable %s " % varid)
             v = self.variables[varid]
         else:
-            if pack is not False:
-                typ = numpy.int16
-                n = 16
-            else:
-                typ = var.dtype
-            v = self.createVariableCopy(
-                var.astype(typ), attributes=attributes, axes=axes, extbounds=extbounds,
-                id=varid, extend=extend, fill_value=fill_value, index=index)
+          if pack is not False:
+              typ = numpy.int16
+              n = 16
+          else:
+            typ = var.dtype
+          v = self.createVariableCopy(var.astype(typ), attributes=attributes, axes=axes, extbounds=extbounds,
+              id=varid, extend=extend, fill_value=fill_value, index=index)
+
+
 
         # If var has typecode numpy.int, and v is created from var, then v will have
         # typecode numpy.int32. (This is a Cdunif 'feature'). This causes a downcast error
         # for numpy versions 23+, so make the downcast explicit.
-        if var.typecode() == numpy.int and v.typecode() == numpy.int32 and pack is False:
+        if var.typecode()==numpy.int and v.typecode()==numpy.int32 and pack is False:
             var = var.astype(numpy.int32)
 
         # Write
@@ -2038,22 +1871,21 @@ class CdmsFile(CdmsObj, cuDataset):
             sourceAxislist = axes
 
         vrank = var.rank()
-        if vrank == 0:      # scalars are not extensible
+        if vrank==0:      # scalars are not extensible
             extend = 0
         else:
             vec1 = sourceAxislist[0]
-
-        if extend == 0 or (extend is None and not vec1.isTime()):
-            if vrank > 0:
+            
+        if extend==0 or (extend is None and not vec1.isTime()):
+            if vrank>0:
                 if pack is not False:
-                    v[:] = numpy.zeros(var.shape, typ)
+                  v[:] = numpy.zeros(var.shape,typ)
                 else:
-                    v[:] = var.astype(v.dtype)
+                  v[:] = var.astype(v.dtype)
             else:
                 v.assignValue(var.getValue())
         else:
-            # Determine if the first dimension of var overlaps the first
-            # dimension of v
+            # Determine if the first dimension of var overlaps the first dimension of v
             vec2 = v.getAxis(0)
             if extbounds is None:
                 bounds1 = vec1.getBounds()
@@ -2063,51 +1895,47 @@ class CdmsFile(CdmsObj, cuDataset):
                 isoverlap, index = isOverlapVector(vec1[:], vec2[:])
             else:
                 isoverlap = 1
-            if isoverlap == 1:
-                v[index:index + len(vec1)] = var.astype(v.dtype)
-                vec2[index:index + len(vec1)] = vec1[:].astype(vec2[:].dtype)
+            if isoverlap==1:
+                v[index:index+len(vec1)] = var.astype(v.dtype)
+                vec2[index:index+len(vec1)] = vec1[:].astype(vec2[:].dtype)
                 if bounds1 is not None:
                     vec2.setBounds(bounds1, persistent=1, index=index)
             else:
-                raise CDMSError(
-                    'Cannot write variable %s: the values of dimension %s=%s, do not overlap the extended dimension %s values: %s' %
-                    (varid, vec1.id, repr(vec1[:]), vec2.id, repr(vec2[:])))
+                raise CDMSError('Cannot write variable %s: the values of dimension %s=%s, do not overlap the extended dimension %s values: %s'%(varid, vec1.id,`vec1[:]`,vec2.id,`vec2[:]`))
 
-        # pack implementation source:
-        # https://www.unidata.ucar.edu/software/netcdf/docs/BestPractices.html
+        # pack implementation source: https://www.unidata.ucar.edu/software/netcdf/docs/BestPractices.html
         if pack:
-            M = var.max()
-            m = var.min()
-            scale_factor = (M - m) / (pow(2, n) - 2)
-            add_offset = (M + m) / 2.
-            missing = -pow(2, n - 1)
-            v.setMissing(-pow(2, n - 1))
-            scale_factor = scale_factor.astype(var.dtype)
-            add_offset = add_offset.astype(var.dtype)
-            tmp = (var - add_offset) / scale_factor
-            tmp = numpy.round(tmp)
-            tmp = tmp.astype(typ)
-            v[:] = tmp.filled()
-            v.scale_factor = scale_factor.astype(var.dtype)
-            v.add_offset = add_offset.astype(var.dtype)
-            if not hasattr(var, "valid_min"):
-                v.valid_min = m.astype(var.dtype)
-            if not hasattr(var, "valid_max"):
-                v.valid_max = M.astype(var.dtype)
+          M = var.max()
+          m = var.min()
+          scale_factor = (M-m)/(pow(2,n)-2)
+          add_offset = (M+m)/2.
+          missing = -pow(2,n-1)
+          v.setMissing(-pow(2,n-1))
+          scale_factor = scale_factor.astype(var.dtype)
+          add_offset = add_offset.astype(var.dtype)
+          tmp = (var-add_offset)/scale_factor
+          tmp= numpy.round(tmp)
+          tmp=tmp.astype(typ)
+          v[:] = tmp.filled()
+          v.scale_factor = scale_factor.astype(var.dtype)
+          v.add_offset = add_offset.astype(var.dtype)
+          if not hasattr(var,"valid_min"):
+            v.valid_min = m.astype(var.dtype)
+          if not hasattr(var,"valid_max"):
+            v.valid_max = M.astype(var.dtype)
         return v
 
-    def write_it_yourself(self, obj):
+    def write_it_yourself( self, obj ):
         """Tell obj to write itself to self (already open for writing), using its
         writeg method (AbstractCurveGrid has such a method, for example).  If no
         such method be available, writeToFile will be used.  If that is not
         available, then self.write(obj) will be called to try to write obj as
         a variable."""
-        # This method was formerly called writeg and just wrote an
-        # AbstractCurveGrid.
-        if (hasattr(obj, 'writeg') and callable(getattr(obj, 'writeg'))):
-            obj.writeg(self)
-        elif (hasattr(obj, 'writeToFile') and callable(getattr(obj, 'writeToFile'))):
-            obj.writeToFile(self)
+        # This method was formerly called writeg and just wrote an AbstractCurveGrid.
+        if ( hasattr(obj,'writeg') and callable(getattr(obj,'writeg')) ):
+            obj.writeg( self )
+        elif ( hasattr(obj,'writeToFile') and callable(getattr(obj,'writeToFile')) ):
+            obj.writeToFile( self )
         else:
             self.write(obj)
 
@@ -2120,7 +1948,7 @@ class CdmsFile(CdmsObj, cuDataset):
         :::
         Output:::
         variable :: (cdms2.fvariable.FileVariable/None) (0) file variable
-        :::
+        :::        
         """
         return self.variables.get(id)
 
@@ -2133,12 +1961,11 @@ class CdmsFile(CdmsObj, cuDataset):
         :::
         Output:::
         variables :: ([cdms2.fvariable.FileVariable]) (0) file variables
-        :::
+        :::        
 """
         retval = self.variables.values()
         if spatial:
-            retval = filter(lambda x: x.id[0:7] != "bounds_" and x.id[0:8] != "weights_" and (
-                (x.getLatitude() is not None) or (x.getLongitude() is not None) or (x.getLevel() is not None)), retval)
+            retval = filter(lambda x: x.id[0:7]!="bounds_" and x.id[0:8]!="weights_" and ((x.getLatitude() is not None) or (x.getLongitude() is not None) or (x.getLevel() is not None)), retval)
         return retval
 
     def getAxis(self, id):
@@ -2149,7 +1976,7 @@ class CdmsFile(CdmsObj, cuDataset):
         :::
         Output:::
         axis :: (cdms2.axis.FileAxis/None) (0) file axis
-        :::
+        :::        
         """
         return self.axes.get(id)
 
@@ -2162,11 +1989,11 @@ class CdmsFile(CdmsObj, cuDataset):
         :::
         Output:::
         grid :: (cdms2.hgrid.FileCurveGrid/cdms2.gengrid.FileGenericGrid/cdms2.grid.FileRectGrid/None) (0) file axis
-        :::
+        :::        
         """
         return self.grids.get(id)
 
-    def getBoundsAxis(self, n, boundid=None):
+    def getBoundsAxis(self, n,boundid=None):
         """Get a bounds axis of length n. Create the bounds axis if necessary.
         :::
         Input:::
@@ -2177,31 +2004,30 @@ class CdmsFile(CdmsObj, cuDataset):
         :::
         """
         if boundid is None:
-            if n == 2:
+            if n==2:
                 boundid = "bound"
             else:
-                boundid = "bound_%d" % n
-
-        if boundid in self.axes:
+                boundid = "bound_%d"%n
+            
+        if self.axes.has_key(boundid):
             boundaxis = self.axes[boundid]
         else:
             boundaxis = self.createVirtualAxis(boundid, n)
         return boundaxis
 
     def __repr__(self):
-        filerep = repr(self._file_)
-        loc = filerep.find("file")
-        if loc == -1:
-            loc = 0
-        return "<CDMS " + filerep[loc:-1] + ", status: %s>" % self._status_
-
-# internattr.add_internal_attribute (CdmsFile, 'datapath',
-# 'variables',
-# 'axes',
-# 'grids',
-# 'xlinks',
-# 'dictdict',
-# 'default_variable_name',
-# 'id',
-# 'parent',
-# 'mode')
+        filerep = `self._file_`
+        loc = string.find(filerep,"file")
+        if loc==-1: loc=0
+        return "<CDMS "+filerep[loc:-1]+", status: %s>"%self._status_
+
+## internattr.add_internal_attribute (CdmsFile, 'datapath',
+##                                             'variables',
+##                                             'axes',
+##                                             'grids',
+##                                             'xlinks',
+##                                             'dictdict',
+##                                             'default_variable_name',
+##                                             'id',
+##                                             'parent',
+##                                             'mode')
diff --git a/Packages/cdms2/Lib/error.py b/Packages/cdms2/Lib/error.py
index a8e3091b7..df73aa688 100644
--- a/Packages/cdms2/Lib/error.py
+++ b/Packages/cdms2/Lib/error.py
@@ -1,7 +1,5 @@
 "Error object for cdms module"
 
-
 class CDMSError (Exception):
-
-    def __init__(self, args="Unspecified error from package cdms"):
+    def __init__ (self, args="Unspecified error from package cdms"):
         self.args = (args,)
diff --git a/Packages/cdms2/Lib/forecast.py b/Packages/cdms2/Lib/forecast.py
index f3a6a6cd6..0c08ab922 100644
--- a/Packages/cdms2/Lib/forecast.py
+++ b/Packages/cdms2/Lib/forecast.py
@@ -7,58 +7,54 @@ import cdms2
 import copy
 from cdms2 import CDMSError
 
-
-def two_times_from_one(t):
+def two_times_from_one( t ):
     """Input is a time representation, either as the long int used in the cdscan
     script, or a string in the format "2010-08-25 15:26:00", or as a cdtime comptime
     (component time) object.
     Output is the same time, both as a long _and_ as a comptime."""
-    if t == 0:
-        t = 0
-    if isinstance(t, str):
+    if t==0:
+        t = 0L
+    if isinstance(t,str):
         t = cdtime.s2c(t)
-    if (isinstance(t, long) or isinstance(t, int)) and t > 1000000000:
+    if (isinstance(t,long) or isinstance(t,int)) and t>1000000000L :
         tl = t
-        year = tl / 1000000000
-        rem = tl % 1000000000
-        month = rem / 10000000
-        rem = rem % 10000000
-        day = rem / 100000
+        year = tl / 1000000000L
+        rem =  tl % 1000000000L
+        month = rem / 10000000L
+        rem =   rem % 10000000L
+        day =     rem / 100000
         allsecs = rem % 100000
-        sec = allsecs % 60
-        allmins = allsecs / 60
-        min = allmins % 60
-        hour = allmins / 60
-        tc = cdtime.comptime(year, month, day, hour, min, sec)
+        sec =     allsecs%60
+        allmins = allsecs/60
+        min =  allmins%60
+        hour = allmins/60
+        tc = cdtime.comptime(year,month,day,hour,min,sec)
     else:
         # I'd like to check that t is type comptime, but although Python
         # prints the type as <type 'comptime'> it won't recognize as a type
         # comptime or anything similar.  Note that cdtime.comptime is a C
         # function available from Python.
         tc = t
-        tl = tc.year * 1000000000
-        tl += tc.month * 10000000
-        tl += tc.day * 100000
+        tl = tc.year * 1000000000L
+        tl += tc.month * 10000000L
+        tl += tc.day   * 100000
         tl += tc.hour * 3600
-        tl += tc.minute * 60
+        tl += tc.minute *60
         tl += tc.second.__int__()
-    return tl, tc
-
+    return tl,tc
 
-def comptime(t):
+def comptime( t ):
     """Input is a time representation, either as the long int used in the cdscan
     script, or a string in the format "2010-08-25 15:26:00", or as a cdtime comptime
     (component time) object.
     Output is the same time a cdtime.comptime (component time)."""
-    tl, tc = two_times_from_one(t)
+    tl,tc = two_times_from_one( t )
     return tc
 
-
 class forecast():
-
     """represents a forecast starting at a single time"""
 
-    def __init__(self, tau0time, dataset_list, path="."):
+    def __init__( self, tau0time, dataset_list, path="." ):
         """tau0time is the first time of the forecast, i.e. the time at which tau=0.
         dataset_list is used to get the forecast file from the forecast time.
         Each list item should look like this example:
@@ -69,33 +65,33 @@ class forecast():
         N.B.  This is like a CdmsFile.  Creating a forecast means opening a file,
         so later on you should call forecast.close() to close it.
         """
-        self.fctl, self.fct = two_times_from_one(tau0time)
+        self.fctl, self.fct = two_times_from_one( tau0time )
 
-        filenames = [l[5] for l in dataset_list if l[4] == self.fctl]
-        if len(filenames) > 0:
+        filenames = [ l[5] for l in dataset_list if l[4]==self.fctl ]
+        if len(filenames)>0:
             filename = filenames[0]
         else:
-            raise CDMSError("Cannot find filename for forecast %d" % self.fctl)
+            raise CDMSError, "Cannot find filename for forecast %d"%self.fctl
         self.filename = path + '/' + filename
-        self.file = cdms2.open(self.filename)
+        self.file = cdms2.open( self.filename )
 
-    def close(self):
+    def close( self ):
         self.file.close()
 
-    def __call__(self, varname):
+    def __call__( self, varname ):
         """Reads the specified variable from this forecast's file."""
         return self.file(varname)
 
-    def __getitem__(self, varname):
+    def __getitem__( self, varname ):
         """Reads variable attributes from this forecast's file."""
         return self.file.__getitem__(varname)
 
     def __repr__(self):
-        return "<forecast from %s>" % (self.fct)
+        return "<forecast from %s>"%(self.fct)
     __str__ = __repr__
 
 
-def available_forecasts(dataset_file, path="."):
+def available_forecasts( dataset_file, path="." ):
     """Returns a list of forecasts (as their generating times) which are
     available through the specified cdscan-generated dataset xml file.
     The forecasts are given in 64-bit integer format, but can be converted
@@ -103,18 +99,16 @@ def available_forecasts(dataset_file, path="."):
     This function may help in choosing the right arguments for initializing
     a "forecasts" (forecast set) object.
     """
-    dataset = cdms2.openDataset(dataset_file, dpath=path)
-    fm = cdms2.dataset.parseFileMap(dataset.cdms_filemap)
-    alltimesl = [f[4] for f in fm[0][1]]  # 64-bit (long) integers
+    dataset=cdms2.openDataset( dataset_file, dpath=path )
+    fm=cdms2.dataset.parseFileMap(dataset.cdms_filemap)
+    alltimesl =[ f[4] for f in fm[0][1] ]  # 64-bit (long) integers
     dataset.close()
     return alltimesl
 
-
 class forecasts():
-
     """represents a set of forecasts"""
 
-    def __init__(self, dataset_file, forecast_times, path="."):
+    def __init__( self, dataset_file, forecast_times, path="." ):
         """Creates a set of forecasts.  Normally you do it by something like
         f = forecasts( 'file.xml', (min_time, max_time) )
         or
@@ -123,9 +117,9 @@ class forecasts():
         f = forecasts( 'file.xml', [ time1, time2, time3, time4, time5 ] )
 
         where the two or three arguments are::
-
+        
         1. the name of a dataset xml file generated by "cdscan --forecast ..."
-
+        
         2. Times here are the times when the forecasts began (tau=0, aka reference time).
         (i) If you use a 2-item tuple, forecasts will be chosen which start at a time
         t between the min and max times, e.g. min_time <= t < max_time .
@@ -144,78 +138,72 @@ class forecasts():
         2006012300000 for the first second of January 23, 2006, or as
         component times (comptime) in the cdtime module, or as
         a string in the format "2010-08-25 15:26:00".
-
+        
         3. An optional path for the data files; use this if the xml file
         contains filenames without complete paths.
-
+         
         As for the forecast class, this opens files when initiated, so when you
         are finished with the forecasts, you should close the files by calling
         forecasts.close() .
         """
 
         # Create dataset_list to get a forecast file from each forecast time.
-        self.dataset = cdms2.openDataset(dataset_file, dpath=path)
-        fm = cdms2.dataset.parseFileMap(self.dataset.cdms_filemap)
-        self.alltimesl = [f[4] for f in fm[0][1]]  # 64-bit (long) integers
+        self.dataset=cdms2.openDataset( dataset_file, dpath=path )
+        fm=cdms2.dataset.parseFileMap(self.dataset.cdms_filemap)
+        self.alltimesl =[ f[4] for f in fm[0][1] ]  # 64-bit (long) integers
         dataset_list = fm[0][1]
         for f in fm[1:]:
             dataset_list.extend(f[1])
 
-        mytimesl = self.forecast_times_to_list(forecast_times)
+        mytimesl = self.forecast_times_to_list( forecast_times )
         if mytimesl == []:
-            raise CDMSError(
-                "bad forecast_times argument to forecasts.__init__")
-        self.fcs = [forecast(t, dataset_list, path) for t in mytimesl]
+            raise CDMSError, "bad forecast_times argument to forecasts.__init__"
+        self.fcs = [ forecast( t, dataset_list, path ) for t in mytimesl ]
 
-    def forecast_times_to_list(self, forecast_times):
+    def forecast_times_to_list( self, forecast_times ):
         """For internal list, translates a "forecast_times" argument of __init__ or
         other methods, into a list of times."""
-        if isinstance(forecast_times, tuple):
-            if len(forecast_times) <= 2:
+        if type(forecast_times) is tuple:
+            if len(forecast_times)<=2:
                 openclosed = 'co'
             else:
                 openclosed = forecast_times[2]
-            mytimesl = self.time_interval_to_list(
-                forecast_times[
-                    0],
-                forecast_times[
-                    1],
-                openclosed)
+            mytimesl = self.time_interval_to_list( forecast_times[0], forecast_times[1], openclosed )
             return mytimesl
-        elif isinstance(forecast_times, list):
+        elif type(forecast_times) is list:
             return forecast_times
         elif forecast_times == 'All':
             return self.alltimesl
         else:
             return []
 
-    def time_interval_to_list(self, tlo, thi, openclosed='co'):
+    def time_interval_to_list( self, tlo, thi, openclosed='co' ):
         """For internal use, translates a time interval to a list of times.
         """
-        if not isinstance(tlo, long):  # make tlo a long integer
-            tlo, tdummy = two_times_from_one(tlo)
-        if not isinstance(thi, long):  # make thi a long integer
-            thi, tdummy = two_times_from_one(thi)
+        if type(tlo) is not long:  # make tlo a long integer
+            tlo, tdummy = two_times_from_one( tlo )
+        if type(thi) is not long:  # make thi a long integer
+            thi, tdummy = two_times_from_one( thi )
         oclo = openclosed[0]
         ochi = openclosed[1]
-        if oclo == 'c':
-            mytimesl = [t for t in self.alltimesl if t >= tlo]
+        if oclo=='c':
+            mytimesl = [ t for t in self.alltimesl if t>=tlo ]
         else:
-            mytimesl = [t for t in self.alltimesl if t > tlo]
-        if ochi == 'c':
-            mytimesl = [t for t in mytimesl if t <= thi]
+            mytimesl = [ t for t in self.alltimesl if t>tlo ]
+        if ochi=='c':
+            mytimesl = [ t for t in mytimesl if t<=thi ]
         else:
-            mytimesl = [t for t in mytimesl if t < thi]
+            mytimesl = [ t for t in mytimesl if t<thi ]
         return mytimesl
 
-    def reduce_inplace(self, min_time, max_time, openclosed='co'):
+    def reduce_inplace( self, min_time, max_time, openclosed='co' ):
         """ For a forecasts object f, f( min_time, max_time ) will reduce the
         scope of f, to forecasts whose start time t has min_time<=t<max_time.
         This is done in place, i.e. any other forecasts in f will be discarded.
         If slice notation were possible for forecasts (it's not because we need
         too many bits to represent time), this function would do the same as
         f = f[min_time : max_time ]
-
+        
         The optional openclosed argument lets you specify the treatment of
         the endpoints min_time, max_time.  The first character should be 'c' if you want
         to include min_time in the new scope of f, or 'o' to exclude it.  Similarly,
@@ -227,15 +215,15 @@ class forecasts():
 
         Times can be the usual long integers, strings, or cdtime component times.
         """
-        mytimesl = self.time_interval_to_list(min_time, max_time, openclosed)
-        self.fcs = [f for f in self.fcs if (f.fctl in mytimesl)]
+        mytimesl = self.time_interval_to_list( min_time, max_time, openclosed )
+        self.fcs = [ f for f in self.fcs if ( f.fctl in mytimesl ) ]
 
-    def close(self):
+    def close( self ):
         self.dataset.close()
         for fc in self.fcs:
             fc.close()
 
-    def __call__(self, varname, forecast_times='All'):
+    def __call__( self, varname, forecast_times='All' ):
         """Reads the specified variable for all the specified forecasts.
         Creates and returns a new variable which is dimensioned by forecast
         as well as the original variable's dimensions.
@@ -259,58 +247,55 @@ class forecasts():
         if forecast_times == 'All':
             varfcs = self.fcs
         else:
-            mytimesl = self.forecast_times_to_list(forecast_times)
-            varfcs = [f for f in self.fcs if (f.fctl in mytimesl)]
-        vars = [fc(varname) for fc in varfcs]
+            mytimesl = self.forecast_times_to_list( forecast_times )
+            varfcs = [ f for f in self.fcs if ( f.fctl in mytimesl ) ]
+        vars = [ fc(varname) for fc in varfcs ]
 
         # Create the variable from the data, with mask:
         v0 = vars[0]
-        a = numpy.asarray([v.data for v in vars])
+        a = numpy.asarray([ v.data for v in vars ])
         if v0._mask == False:
             m = False
-            v = cdms2.tvariable.TransientVariable(a)
+            v = cdms2.tvariable.TransientVariable( a )
         else:
-            m = numpy.asarray([v._mask for v in vars])
-            v = cdms2.tvariable.TransientVariable(
-                a, mask=m, fill_value=v0._fill_value)
+            m = numpy.asarray([ v._mask for v in vars])
+            v = cdms2.tvariable.TransientVariable( a, mask=m, fill_value=v0._fill_value )
 
         # Domain-related attributes:
             # We get the tomain from __getitem__ to make sure that fcs[var] is consistent
             # with fcs(var)
-        fvd = self.__getitem__(varname, varfcs).domain
+        fvd = self.__getitem__(varname,varfcs).domain
         v._TransientVariable__domain = fvd
         # former domain code, not using __getitem:
         # ltvd = len(v0._TransientVariable__domain)
         # v._TransientVariable__domain[1:ltvd+1] = v0._TransientVariable__domain[0:ltvd]
-        # v._TransientVariable__domain[0] = self.forecast_axis( varname, varfcs
-        # )
-        if hasattr(v0, 'coordinates'):
+        # v._TransientVariable__domain[0] = self.forecast_axis( varname, varfcs )
+        if hasattr( v0, 'coordinates' ):
             v.coordinates = 'iforecast ' + v0.coordinates
 
         # Other attributes, all those for which I've seen nontrivial values in a
         # real example (btw, the _isfield one was wrong!) :
         # It would be better to do a list comprehension over v0.attribures.keys(),
-        # if I could be sure that that wouldn't transfer something
-        # inappropriate.
-        if hasattr(v0, 'id'):
+        # if I could be sure that that wouldn't transfer something inappropriate.
+        if hasattr( v0, 'id' ):
             v.id = v0.id
-        if hasattr(v0, 'long_name'):
+        if hasattr( v0, 'long_name' ):
             v.long_name = v0.long_name
-        if hasattr(v0, 'standard_name'):
+        if hasattr( v0, 'standard_name' ):
             v.standard_name = v0.standard_name
-        if hasattr(v0, 'base_name'):
+        if hasattr( v0, 'base_name' ):
             v.base_name = v0.base_name
-        if hasattr(v0, 'units'):
+        if hasattr( v0, 'units' ):
             v.units = v0.units
-        if hasattr(v0, '_isfield'):
+        if hasattr( v0, '_isfield' ):
             v._isfield = v0._isfield
         return v
 
-    def forecast_axis(self, varname, fcss=None):
+    def forecast_axis( self, varname, fcss=None ):
         """returns a tuple (axis,start,length,true_length) where axis is in the
         forecast direction.  If a list of forecasts be specified, the axis' data will
         be limited to them."""
-        if fcss is None:
+        if fcss==None:
             fcss = self.fcs
         axis = None
         domitem1 = None
@@ -319,7 +304,7 @@ class forecasts():
 
         var = self.dataset[varname]
         # ... var is a DatasetVariable, used here just for two of its domain's axes
-        dom = copy.deepcopy(getattr(var, 'domain', []))
+        dom = copy.deepcopy(getattr(var,'domain',[]))
         # ...this 'domain' attribute has an element with an axis, etc.
         # representing all forecasts; so we want to cut it down to match
         # those forecasts in fcss.
@@ -330,33 +315,33 @@ class forecasts():
             # axis is a axis.Axis and the rest of the tuple is int's.
             # I don't know what true_length is, but it doesn't seem to get used
             # anywhere, and is normally the same as length.
-            if getattr(domitem[0], 'id', None) == 'fctau0':
+            if getattr(domitem[0],'id',None)=='fctau0':
                 # Force the axis to match fcss :
                 # More precisely the long int times fcss[i].fctl should match
-                # the axis data. The axis partition and .length need changing
-                # too.
+                # the axis data. The axis partition and .length need changing too.
                 domitem1 = 0
                 domitem2 = len(fcss)
                 domitem3 = len(fcss)
                 axis = copy.copy(domitem[0])
-                axis._data_ = [f.fctl for f in fcss]
+                axis._data_ = [ f.fctl for f in fcss ]
                 axis.length = len(axis._data_)
                 axis.partition = axis.partition[0:axis.length]
                 axis.axis = 'F'
                 axis.standard_name = 'forecast_reference_time'
                 timeaxis = var.getTime()
-                if not hasattr(axis, 'calendar') and timeaxis:
+                if not hasattr(axis,'calendar') and timeaxis:
                     axis.calendar = timeaxis.calendar
+                
+        return ( axis, domitem1, domitem2, domitem3 )
 
-        return (axis, domitem1, domitem2, domitem3)
 
-    def __getitem__(self, varname, fccs=None):
+    def __getitem__( self, varname, fccs=None ):
         """returns whatever the forecast set has that matches the given
         attribute, normally a DatasetVariable.  The optional argument fccs
         is a list of forecasts to be passed on to forecast_axis().
         """
-        if not isinstance(varname, str):
-            raise CDMSError("bad argument to forecasts[]")
+        if type(varname) is not str :
+            raise CDMSError, "bad argument to forecasts[]"
 
         var = self.dataset[varname]
         # var is a DatasetVariable and consists of lots of attributes.
@@ -364,19 +349,20 @@ class forecasts():
         # The attribute which needs to be changed is 'domain' - it will normally
         # have an element with an axis, etc. representing all forecasts; so we
         # want to cut it down to match those forecasts in self.fcs.
-        dom = copy.deepcopy(getattr(var, 'domain', []))
+        dom = copy.deepcopy(getattr(var,'domain',[]))
         for i in range(len(dom)):
             domitem = dom[i]
-            if getattr(domitem[0], 'id', None) == 'fctau0':
-                dom[i] = self.forecast_axis(varname, fccs)
-        setattr(var, 'domain', dom)
-
+            if getattr(domitem[0],'id',None)=='fctau0':
+                dom[i] = self.forecast_axis(varname,fccs)
+        setattr(var,'domain',dom)
+                
         return var
 
     def __repr__(self):
         l = len(self.fcs)
-        if l == 0:
+        if l==0:
             return "<forecasts - None>"
         else:
-            return "<forecasts from %s,...,%s>" % (self.fcs[0].fct, self.fcs[l - 1].fct)
+            return "<forecasts from %s,...,%s>"%(self.fcs[0].fct,self.fcs[l-1].fct)
     __str__ = __repr__
+
diff --git a/Packages/cdms2/Lib/fvariable.py b/Packages/cdms2/Lib/fvariable.py
index 2f41df8a6..4271e12c6 100644
--- a/Packages/cdms2/Lib/fvariable.py
+++ b/Packages/cdms2/Lib/fvariable.py
@@ -1,35 +1,33 @@
-# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
-# Further modified to be pure new numpy June 24th 2008
+## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by 
+## Further modified to be pure new numpy June 24th 2008
 
 "CDMS File-based variables."
 import numpy
-from . import typeconv
+import typeconv
+import types
 import re
 
-from .cdmsobj import Max32int
-from .variable import DatasetVariable
-from .error import CDMSError
-from .sliceut import reverseSlice
-from .avariable import AbstractVariable
+from cdmsobj import Max32int
+from variable import DatasetVariable
+from error import CDMSError
+from sliceut import reverseSlice
+from avariable import AbstractVariable
 from cdms2 import Cdunif
 from Cdunif import CdunifError
 
 FileClosed = "Cannot read from closed file, variable: "
 FileClosedWrite = "Cannot write to a closed file, variable: "
 
-
 class FileVariable(DatasetVariable):
-
     "A variable in a single file."
-
-    def __init__(self, parent, varname, cdunifobj=None):
+    def __init__(self,parent,varname,cdunifobj=None):
         DatasetVariable.__init__(self, parent, varname)
         self._obj_ = cdunifobj
         if cdunifobj is not None:
             for attname, attval in cdunifobj.__dict__.items():
                 self.__dict__[attname] = attval
-                self.attributes[attname] = attval
-        val = self.__cdms_internals__ + ['name_in_file', ]
+                self.attributes[attname]=attval
+        val = self.__cdms_internals__+['name_in_file',]
         self.___cdms_internals__ = val
 
     # Initialize the domain
@@ -41,7 +39,7 @@ class FileVariable(DatasetVariable):
             start = 0
             length = len(axis)
             truelen = length
-            self.domain.append((axis, start, length, truelen))
+            self.domain.append((axis,start,length,truelen))
 
     def typecode(self):
         # Compatibility: convert to new typecode
@@ -49,44 +47,43 @@ class FileVariable(DatasetVariable):
         tc = typeconv.convtypecode2(tc).char
         return tc
 
-    def assignValue(self, data):
+    def assignValue(self,data):
         if self.parent is None:
-            raise CDMSError(FileClosedWrite + self.id)
+            raise CDMSError, FileClosedWrite+self.id
         if numpy.ma.isMaskedArray(data):
-            if data.mask is not numpy.ma.nomask and not numpy.ma.allclose(data.mask, 0):
-                saveFill = data.fill_value
-                if self.getMissing() is None:
-                    self.setMissing(saveFill)
-                else:
-                    data.set_fill_value(self.getMissing())
+          if data.mask is not numpy.ma.nomask and not numpy.ma.allclose(data.mask,0):
+            saveFill = data.fill_value
+            if self.getMissing() is None:
+                self.setMissing(saveFill)
+            else:
+                data.set_fill_value(self.getMissing())
         self._obj_.assignValue(numpy.ma.filled(data))
         if numpy.ma.isMaskedArray(data):
-            if data.mask is not numpy.ma.nomask and not numpy.ma.allclose(data.mask, 0):
-                data.set_fill_value(saveFill)
+          if data.mask is not numpy.ma.nomask and not numpy.ma.allclose(data.mask,0):
+            data.set_fill_value(saveFill)
 
-    def expertSlice(self, initslicelist):
+    def expertSlice (self, initslicelist):
         # Handle negative slices
-        revlist = []
-            # Slices to apply to result if reversals needed
+        revlist = []                    # Slices to apply to result if reversals needed
         slist = []                      # Slices with positive strides
         haveReversals = 0               # True iff result array needs reversing
-        i = 0
+        i=0
         for s in initslicelist:
-            if s.step < 0:
+            if s.step<0:
                 axislen = self.shape[i]
-                slist.append(reverseSlice(s, axislen))
-                revlist.append(slice(None, None, -1))
+                slist.append(reverseSlice(s,axislen))
+                revlist.append(slice(None,None,-1))
                 haveReversals = 1
             else:
                 slist.append(s)
-                revlist.append(slice(None, None, 1))
+                revlist.append(slice(None,None,1))
             i += 1
 
         if self.parent is None:
-            raise CDMSError(FileClosed + self.id)
+            raise CDMSError, FileClosed+self.id
         if self.rank() == 0:
             return self._obj_.getValue()
-        result = self._obj_.getitem(*slist)
+        result = apply(self._obj_.getitem,slist)
 
         # If slices with negative strides were input, apply the appropriate
         # reversals.
@@ -97,43 +94,43 @@ class FileVariable(DatasetVariable):
 
     def __setitem__(self, index, value):
         if self.parent is None:
-            raise CDMSError(FileClosedWrite + self.id)
+            raise CDMSError, FileClosedWrite+self.id
         if numpy.ma.isMaskedArray(value):
-            if value.mask is not numpy.ma.nomask and not numpy.ma.allclose(value.mask, 0):
-                saveFill = value.fill_value
-                if self.getMissing() is None:
-                    self.setMissing(saveFill)
-                else:
-                    value.set_fill_value(self.getMissing())
-        self._obj_.setitem(*(index, numpy.ma.filled(value)))
+          if value.mask is not numpy.ma.nomask and not numpy.ma.allclose(value.mask,0):
+            saveFill = value.fill_value
+            if self.getMissing() is None:
+                self.setMissing(saveFill)
+            else:
+                value.set_fill_value(self.getMissing())
+        apply(self._obj_.setitem,(index,numpy.ma.filled(value)))
         if numpy.ma.isMaskedArray(value):
-            if value.mask is not numpy.ma.nomask and not numpy.ma.allclose(value.mask, 0):
-                value.set_fill_value(saveFill)
+          if value.mask is not numpy.ma.nomask and not numpy.ma.allclose(value.mask,0):
+            value.set_fill_value(saveFill)
 
     def __setslice__(self, low, high, value):
         if self.parent is None:
-            raise CDMSError(FileClosedWrite + self.id)
+            raise CDMSError, FileClosedWrite+self.id
 
         # Hack to prevent netCDF overflow error on 64-bit architectures
         high = min(Max32int, high)
-        if high == Max32int and self.rank() == 0:
-            high = 1
-
+        if high == Max32int and self.rank()==0:
+          high=1
+        
         if numpy.ma.isMaskedArray(value):
-            if value.mask is not numpy.ma.nomask and not numpy.ma.allclose(value.mask, 0):
-                saveFill = value.fill_value
-                if self.getMissing() is None:
-                    self.setMissing(saveFill)
-                else:
-                    value.set_fill_value(self.getMissing())
-        self._obj_.setslice(*(low, high, numpy.ma.filled(value)))
+          if value.mask is not numpy.ma.nomask and not numpy.ma.allclose(value.mask,0):
+            saveFill = value.fill_value
+            if self.getMissing() is None:
+                self.setMissing(saveFill)
+            else:
+                value.set_fill_value(self.getMissing())
+        apply(self._obj_.setslice,(low,high,numpy.ma.filled(value)))
         if numpy.ma.isMaskedArray(value):
-            if value.mask is not numpy.ma.nomask and not numpy.ma.allclose(value.mask, 0):
-                value.set_fill_value(saveFill)
+          if value.mask is not numpy.ma.nomask and not numpy.ma.allclose(value.mask,0):
+            value.set_fill_value(saveFill)
 
-    def _getShape(self):
+    def _getShape (self):
         if self.parent is None:
-            raise CDMSError(FileClosed + self.id)
+            raise CDMSError, FileClosed+self.id
         return self._obj_.shape
 
     # Write external attributes to the file.
@@ -142,15 +139,13 @@ class FileVariable(DatasetVariable):
     # that the value is propagated to the external file.
     def __setattr__(self, name, value):
         if hasattr(self, "parent") and self.parent is None:
-            raise CDMSError(FileClosedWrite + self.id)
+            raise CDMSError, FileClosedWrite+self.id
         if (not name in self.__cdms_internals__) and (value is not None):
             try:
                 setattr(self._obj_, name, value)
             except CdunifError:
-                raise CDMSError(
-                    "Setting %s.%s=%s" %
-                    (self.id, name, repr(value)))
-            self.attributes[name] = value
+                raise CDMSError, "Setting %s.%s=%s"%(self.id,name,`value`)
+            self.attributes[name]=value
         self.__dict__[name] = value
 
     # Delete external file attributes.
@@ -162,23 +157,23 @@ class FileVariable(DatasetVariable):
             try:
                 delattr(self._obj_, name)
             except CdunifError:
-                raise CDMSError("Deleting %s.%s" % (self.id, name))
+                raise CDMSError, "Deleting %s.%s"%(self.id,name)
             del(self.attributes[name])
         del self.__dict__[name]
 
     def getValue(self, squeeze=1):
         """Return the entire set of values."""
         if self.parent is None:
-            raise CDMSError(FileClosed + self.id)
-        if self.rank() > 0:
+            raise CDMSError, FileClosed+self.id
+        if self.rank()>0:
             return self.getSlice(Ellipsis, squeeze=squeeze)
         else:
             return self._obj_.getValue()
-
+    
     def __len__(self):
         " Length of first dimension. "
         if self.parent is None:
-            raise CDMSError(FileClosed + self.id)
+            raise CDMSError, FileClosed+self.id
         return len(self._obj_)
 
 #    def __repr__(self):
@@ -187,4 +182,5 @@ class FileVariable(DatasetVariable):
 #        else:
 #            return "<Variable: %s, file: **CLOSED**>"%self.id
 
-    shape = property(_getShape, None)
+
+    shape = property(_getShape,None)
diff --git a/Packages/cdms2/Lib/gengrid.py b/Packages/cdms2/Lib/gengrid.py
index 5fad339b7..1204733bc 100644
--- a/Packages/cdms2/Lib/gengrid.py
+++ b/Packages/cdms2/Lib/gengrid.py
@@ -1,15 +1,15 @@
-# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
-# Further modified to be pure new numpy June 24th 2008
+## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by 
+## Further modified to be pure new numpy June 24th 2008
 
 """CDMS Generic Grids"""
 
 import numpy
-# import PropertiedClasses
-from . import bindex
-from .error import CDMSError
-from .grid import LongitudeType, LatitudeType, VerticalType, TimeType, CoordTypeToLoc
-from .hgrid import AbstractHorizontalGrid
-from .axis import allclose
+## import PropertiedClasses
+import bindex
+from error import CDMSError
+from grid import LongitudeType, LatitudeType, VerticalType, TimeType, CoordTypeToLoc
+from hgrid import AbstractHorizontalGrid
+from axis import allclose
 
 MethodNotImplemented = "Method not yet implemented"
 
@@ -19,7 +19,7 @@ class AbstractGenericGrid(AbstractHorizontalGrid):
         """Create a generic grid.
         """
         if latAxis.shape != lonAxis.shape:
-            raise CDMSError('Latitude and longitude axes must have the same shape.')
+            raise CDMSError, 'Latitude and longitude axes must have the same shape.'
         AbstractHorizontalGrid.__init__(self, latAxis, lonAxis, id, maskvar, tempmask, node)
         self._index_ = None
 
@@ -35,17 +35,17 @@ class AbstractGenericGrid(AbstractHorizontalGrid):
     def getMesh(self, transpose=None):
         """Generate a mesh array for the meshfill graphics method.
         'transpose' is for compatibility with other grid types, is ignored."""
-        from . import MV2 as MV
+        import MV2 as MV
         if self._mesh_ is None:
-            LAT = 0
-            LON = 1
+            LAT=0
+            LON=1
             latbounds, lonbounds = self.getBounds()
             if latbounds is None or lonbounds is None:
-                raise CDMSError('No boundary data is available for grid %s'%self.id)
+                raise CDMSError, 'No boundary data is available for grid %s'%self.id
             nvert = latbounds.shape[-1]
-            mesh = numpy.zeros((self.size(), 2, nvert), latbounds.dtype.char)
-            mesh[:, LAT,:] = MV.filled(latbounds)
-            mesh[:, LON,:] = MV.filled(lonbounds)
+            mesh = numpy.zeros((self.size(),2,nvert),latbounds.dtype.char)
+            mesh[:,LAT,:] = MV.filled(latbounds)
+            mesh[:,LON,:] = MV.filled(lonbounds)
             self._mesh_ = mesh
         return self._mesh_
 
@@ -101,9 +101,9 @@ class AbstractGenericGrid(AbstractHorizontalGrid):
         gridcenterlon.units = "degrees"
         gridimask = cufile.createVariable("grid_imask", numpy.int, ("grid_size",))
         gridimask.units = "unitless"
-        gridcornerlat = cufile.createVariable("grid_corner_lat", numpy.float, ("grid_size", "grid_corners"))
+        gridcornerlat = cufile.createVariable("grid_corner_lat", numpy.float, ("grid_size","grid_corners"))
         gridcornerlat.units = "degrees"
-        gridcornerlon = cufile.createVariable("grid_corner_lon", numpy.float, ("grid_size", "grid_corners"))
+        gridcornerlon = cufile.createVariable("grid_corner_lon", numpy.float, ("grid_size","grid_corners"))
         gridcornerlon.units = "degrees"
 
         griddims[:] = numpy.array([ngrid], numpy.int32)
@@ -162,8 +162,8 @@ class AbstractGenericGrid(AbstractHorizontalGrid):
                 i = k
             k += 1
 
-        if i == -1:
-            raise RuntimeError('Grid lat/lon domains do not match variable domain')
+        if i==-1:
+            raise RuntimeError, 'Grid lat/lon domains do not match variable domain'
 
         return ((islice, ), (inewaxis, ))
 
@@ -193,10 +193,10 @@ class AbstractGenericGrid(AbstractHorizontalGrid):
         lonspec = spec[CoordTypeToLoc[LongitudeType]]
         latlin = numpy.ma.filled(self._lataxis_)
         lonlin = numpy.ma.filled(self._lonaxis_)
-        lonlin = numpy.ma.where(numpy.ma.greater_equal(lonlin, 360.0), lonlin-360.0, lonlin)
+        lonlin = numpy.ma.where(numpy.ma.greater_equal(lonlin,360.0), lonlin-360.0, lonlin)
         points = bindex.intersectHorizontalGrid(latspec, lonspec, latlin, lonlin, index)
-        if len(points) == 0:
-            raise CDMSError('No data in the specified region, longitude=%s, latitude=%s'%(repr(lonspec), repr(latspec)))
+        if len(points)==0:
+            raise CDMSError, 'No data in the specified region, longitude=%s, latitude=%s'%(`lonspec`, `latspec`)
 
         fullmask = numpy.ones(ncell)
         numpy.put(fullmask, points, 0)
@@ -205,7 +205,7 @@ class AbstractGenericGrid(AbstractHorizontalGrid):
         submask = fullmask[imin:imax]
 
         cellid = self.getAxis(0).id
-        indexspecs = {cellid:slice(imin, imax)}
+        indexspecs = {cellid:slice(imin,imax)}
 
         return submask, indexspecs
 
@@ -253,9 +253,9 @@ class AbstractGenericGrid(AbstractHorizontalGrid):
             result = self.clone()
             for i in missing:
                 for item in axes:
-                    if (len(selfaxes[i]) == len(item)) and allclose(selfaxes[i], item):
-                        result._lataxis_.setAxis(i, item)
-                        result._lonaxis_.setAxis(i, item)
+                    if (len(selfaxes[i])==len(item)) and allclose(selfaxes[i], item):
+                        result._lataxis_.setAxis(i,item)
+                        result._lonaxis_.setAxis(i,item)
                         break
                 else:
                     result = None
@@ -268,7 +268,7 @@ class AbstractGenericGrid(AbstractHorizontalGrid):
         having the same length as the number of cells in the grid, similarly
         for flatlon."""
         if self._flataxes_ is None:
-            from . import MV2 as MV
+            import MV2 as MV
             alat = MV.filled(self.getLatitude())
             alon = MV.filled(self.getLongitude())
             self._flataxes_ = (alat, alon)
@@ -280,11 +280,11 @@ class AbstractGenericGrid(AbstractHorizontalGrid):
         result = self.clone()
         result.id = gridid
         return result
-    shape = property(_getShape, None)
+    shape = property(_getShape,None)
     
-# PropertiedClasses.set_property (AbstractGenericGrid, 'shape',
-# AbstractGenericGrid._getShape, nowrite=1,
-# nodelete=1)
+## PropertiedClasses.set_property (AbstractGenericGrid, 'shape', 
+##                                   AbstractGenericGrid._getShape, nowrite=1,
+##                                   nodelete=1)
 
 class DatasetGenericGrid(AbstractGenericGrid):
 
@@ -295,7 +295,7 @@ class DatasetGenericGrid(AbstractGenericGrid):
         self.parent = parent
 
     def __repr__(self):
-        return "<DatasetGenericGrid, id: %s, shape: %s>"%(self.id, repr(self.shape))
+        return "<DatasetGenericGrid, id: %s, shape: %s>"%(self.id, `self.shape`)
 
 class FileGenericGrid(AbstractGenericGrid):
 
@@ -306,7 +306,7 @@ class FileGenericGrid(AbstractGenericGrid):
         self.parent = parent
 
     def __repr__(self):
-        return "<FileGenericGrid, id: %s, shape: %s>"%(self.id, repr(self.shape))
+        return "<FileGenericGrid, id: %s, shape: %s>"%(self.id, `self.shape`)
 
 class TransientGenericGrid(AbstractGenericGrid):
 
@@ -321,7 +321,7 @@ class TransientGenericGrid(AbstractGenericGrid):
         AbstractGenericGrid.__init__(self, latAxis, lonAxis, id, maskvar, tempmask)
 
     def __repr__(self):
-        return "<TransientGenericGrid, id: %s, shape: %s>"%(self.id, repr(self.shape))
+        return "<TransientGenericGrid, id: %s, shape: %s>"%(self.id, `self.shape`)
 
     def toGenericGrid(self, gridid=None):
         if gridid is None:
@@ -338,20 +338,21 @@ def readScripGenericGrid(fileobj, dims, whichType, whichGrid):
     whichType is the type of file, either "grid" or "mapping"
     if whichType is "mapping", whichGrid is the choice of grid, either "source" or "destination"
     """
-    from .auxcoord import TransientAuxAxis1D
-    from .coord import TransientVirtualAxis
+    import string
+    from auxcoord import TransientAuxAxis1D
+    from coord import TransientVirtualAxis
 
     convention = 'SCRIP'
     if 'S' in fileobj.variables.keys():
         convention = 'NCAR'
-        if whichType == "grid":
+        if whichType=="grid":
             gridCornerLatName = 'grid_corner_lat'
             gridCornerLonName = 'grid_corner_lon'
             gridMaskName = 'grid_imask'
             gridCenterLatName = 'grid_center_lat'
             gridCenterLonName = 'grid_center_lon'
             titleName = 'title'
-        elif whichGrid == "destination":
+        elif whichGrid=="destination":
             gridCornerLatName = 'yv_b'
             gridCornerLonName = 'xv_b'
             gridMaskName = 'mask_b'
@@ -366,14 +367,14 @@ def readScripGenericGrid(fileobj, dims, whichType, whichGrid):
             gridCenterLonName = 'xc_a'
             titleName = 'source_grid'
     else:
-        if whichType == "grid":
+        if whichType=="grid":
             gridCornerLatName = 'grid_corner_lat'
             gridCornerLonName = 'grid_corner_lon'
             gridMaskName = 'grid_imask'
             gridCenterLatName = 'grid_center_lat'
             gridCenterLonName = 'grid_center_lon'
             titleName = 'title'
-        elif whichGrid == "destination":
+        elif whichGrid=="destination":
             gridCornerLatName = 'dst_grid_corner_lat'
             gridCornerLonName = 'dst_grid_corner_lon'
             gridMaskName = 'dst_grid_imask'
@@ -399,38 +400,38 @@ def readScripGenericGrid(fileobj, dims, whichType, whichGrid):
         ni = dims[0]
 
     boundsshape = (ni, ncorners)
-    if hasattr(cornerLat, 'units') and cornerLat.units.lower()[0:6] == 'radian':
+    if hasattr(cornerLat, 'units') and string.lower(cornerLat.units)[0:6]=='radian':
         cornerLat = (cornerLat*(180.0/numpy.pi)).reshape(boundsshape)
         cornerLon = (cornerLon*(180.0/numpy.pi)).reshape(boundsshape)
 
-    iaxis = TransientVirtualAxis("i", ni)
+    iaxis = TransientVirtualAxis("i",ni)
 
-    if gridMaskName in vardict:
+    if vardict.has_key(gridMaskName):
         # SCRIP convention: 0 for invalid data
         # numpy.ma convention: 1 for invalid data
         mask = 1 - fileobj(gridMaskName)
     else:
         mask = None
         
-    if gridCenterLatName in vardict:
+    if vardict.has_key(gridCenterLatName):
         centerLat = fileobj(gridCenterLatName)
-        if hasattr(centerLat, "units") and centerLat.units.lower() == 'radians':
+        if hasattr(centerLat, "units") and string.lower(centerLat.units)=='radians':
             centerLat *= (180.0/numpy.pi)
     else:
-        centerLat = cornerLat[:,:, 0]
+        centerLat = cornerLat[:,:,0]
 
-    if gridCenterLonName in vardict:
+    if vardict.has_key(gridCenterLonName):
         centerLon = fileobj(gridCenterLonName)
-        if hasattr(centerLon, "units") and centerLon.units.lower() == 'radians':
+        if hasattr(centerLon, "units") and string.lower(centerLon.units)=='radians':
             centerLon *= (180.0/numpy.pi)
     else:
-        centerLon = cornerLon[:,:, 0]
+        centerLon = cornerLon[:,:,0]
 
-    if hasattr(fileobj, titleName):
+    if hasattr(fileobj,titleName):
         gridid = getattr(fileobj, titleName)
-        gridid = sgridid.strip().replace(' ', '_')
+        gridid = string.replace(string.strip(gridid), ' ','_')
     else:
-        gridid = "<None>"
+        gridid="<None>"
 
     lataxis = TransientAuxAxis1D(centerLat, axes=(iaxis,), bounds=cornerLat,
                               attributes={'units':'degrees_north'}, id="latitude")
diff --git a/Packages/cdms2/Lib/grid.py b/Packages/cdms2/Lib/grid.py
index e2612d315..9930f263a 100644
--- a/Packages/cdms2/Lib/grid.py
+++ b/Packages/cdms2/Lib/grid.py
@@ -1,14 +1,15 @@
-# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
-# Further modified to be pure new numpy June 24th 2008
+## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by 
+## Further modified to be pure new numpy June 24th 2008
 
 """CDMS Grid objects"""
+import types
 import re
-from .error import CDMSError
+from error import CDMSError
 import numpy #, PropertiedClasses, internattr
 # import regrid2._regrid
 import copy, string, sys
-from .cdmsobj import CdmsObj
-from .axis import TransientAxis, createAxis, createUniformLatitudeAxis, createUniformLongitudeAxis, getAutoBounds, createGaussianAxis, lookupArray, isSubsetVector
+from cdmsobj import CdmsObj
+from axis import TransientAxis, createAxis, createUniformLatitudeAxis, createUniformLongitudeAxis, getAutoBounds, createGaussianAxis, lookupArray, isSubsetVector
 import cdtime
 
 MethodNotImplemented = "Method not yet implemented"
@@ -20,10 +21,10 @@ _classifyGrids = 1                      # Determine the type of grid from the gr
 # (if any). If 'off', the value of .grid_type overrides the classification.
 def setClassifyGrids(mode):
     global _classifyGrids
-    if mode == 'on':
-        _classifyGrids = 1
-    elif mode == 'off':
-        _classifyGrids = 0
+    if mode=='on':
+        _classifyGrids=1
+    elif mode=='off':
+        _classifyGrids=0
 
 # Create a transient rectilinear grid
 def createRectGrid(lat, lon, order="yx", type="generic", mask=None):
@@ -33,7 +34,7 @@ def createRectGrid(lat, lon, order="yx", type="generic", mask=None):
 def createUniformGrid(startLat, nlat, deltaLat, startLon, nlon, deltaLon, order="yx", mask=None):
     lat = createUniformLatitudeAxis(startLat, nlat, deltaLat)
     lon = createUniformLongitudeAxis(startLon, nlon, deltaLon)
-    return createRectGrid(lat, lon, order, "uniform", mask)
+    return createRectGrid(lat,lon,order,"uniform",mask)
 
 # Generate a grid for calculating the global mean. The grid is a single
 # zone covering the range of the input grid
@@ -41,41 +42,41 @@ def createGlobalMeanGrid(grid):
     inlat = grid.getLatitude()
     inlatBounds, inlonBounds = grid.getBounds()
     outlatArray = numpy.array([(inlat[0] + inlat[-1])/2.0])
-    outlatBounds = numpy.array([[inlatBounds[0, 0], inlatBounds[-1, 1]]])
+    outlatBounds = numpy.array([[inlatBounds[0,0], inlatBounds[-1,1]]])
     outlat = createAxis(outlatArray, outlatBounds)
     outlat.units = inlat.units
 
     inlon = grid.getLongitude()
     outlonArray = numpy.array([(inlon[0] + inlon[-1])/2.0])
-    outlonBounds = numpy.array([[inlonBounds[0, 0], inlonBounds[-1, 1]]])
+    outlonBounds = numpy.array([[inlonBounds[0,0], inlonBounds[-1,1]]])
     outlon = createAxis(outlonArray, outlonBounds)
     outlon.units = inlon.units
 
-    return createRectGrid(outlat, outlon, grid.getOrder())
+    return createRectGrid(outlat,outlon,grid.getOrder())
 
 # Generate a grid for zonal averaging. The grid has the same latitudes
 # as the input grid, and a single longitude.
 def createZonalGrid(grid):
     inlat = grid.getLatitude()
     outlatBounds, inlonBounds = grid.getBounds()
-    outlat = createAxis(inlat[:], outlatBounds)
+    outlat = createAxis(inlat[:],outlatBounds)
     outlat.units = inlat.units
 
     inlon = grid.getLongitude()
     outlonArray = numpy.array([(inlon[0] + inlon[-1])/2.0])
-    outlonBounds = numpy.array([[inlonBounds[0, 0], inlonBounds[-1, 1]]])
+    outlonBounds = numpy.array([[inlonBounds[0,0], inlonBounds[-1,1]]])
     outlon = createAxis(outlonArray, outlonBounds)
     outlon.units = inlon.units
 
-    return createRectGrid(outlat, outlon, grid.getOrder())
+    return createRectGrid(outlat,outlon,grid.getOrder())
 
 # Generate a generic (untyped) grid from lat, lon vectors
 def createGenericGrid(latArray, lonArray, latBounds=None, lonBounds=None, order="yx", mask=None):
-    lat = createAxis(latArray, latBounds)
+    lat = createAxis(latArray,latBounds)
     lat.units = "degrees_north"
-    lon = createAxis(lonArray, lonBounds)
+    lon = createAxis(lonArray,lonBounds)
     lon.units = "degrees_east"
-    return createRectGrid(lat, lon, order, "generic", mask)
+    return createRectGrid(lat,lon,order,"generic",mask)
 
 def createGaussianGrid(nlats, xorigin=0.0, order="yx"):
     """ createGaussianGrid(nlats, xorigin=0.0)
@@ -96,7 +97,7 @@ TimeType = 'time'
 CoordinateTypes = [LongitudeType, LatitudeType, VerticalType, TimeType]
 
 # Note: no time dimensions in grids.
-CoordTypeToLoc = {LongitudeType: 0, LatitudeType: 1, VerticalType: 2}
+CoordTypeToLoc = {LongitudeType:0, LatitudeType:1, VerticalType:2}
 
 def defaultRegion():
     """Return a specification for a default (full) region."""
@@ -125,27 +126,27 @@ def setRegionSpecs(grid, coordSpec, coordType, resultSpec):
 
     Note that time coordinate types are not permitted.
     """
-
-    if (coordSpec is None) or (coordSpec == ':'):
+    
+    if (coordSpec is None) or (coordSpec==':'):
         canonSpec = None
-    elif isinstance(coordSpec, tuple):
-        if len(coordSpec) == 2:
-            canonSpec = (coordSpec[0], coordSpec[1], 'cc', None)
-        elif len(coordSpec) == 3:
-            canonSpec = (coordSpec[0], coordSpec[1], coordSpec[2], None)
-        elif len(coordSpec) != 4:
-            raise CDMSError('Invalid coordinate specification: %s'%repr(coordSpec))
-    elif isinstance(coordSpec, (int, float)):
+    elif type(coordSpec) is types.TupleType:
+        if len(coordSpec)==2:
+            canonSpec = (coordSpec[0],coordSpec[1],'cc',None)
+        elif len(coordSpec)==3:
+            canonSpec = (coordSpec[0],coordSpec[1],coordSpec[2],None)
+        elif len(coordSpec)!=4:
+            raise CDMSError, 'Invalid coordinate specification: %s'%`coordSpec`
+    elif type(coordSpec) in [types.IntType, types.FloatType]:
         canonSpec = (coordSpec, coordSpec, 'cc', None)
     else:
-        raise CDMSError('Invalid coordinate specification: %s'%repr(coordSpec))
+        raise CDMSError, 'Invalid coordinate specification: %s'%`coordSpec`
 
     coordLoc = CoordTypeToLoc[coordType]
     if coordLoc is None:
-        raise CDMSError('Invalid coordinate type: %s'%coordType)
+        raise CDMSError, 'Invalid coordinate type: %s'%coordType
 
     if resultSpec[coordLoc] is not None:
-        raise CDMSError('Multiple specifications for coordinate type %s'%coordType)
+        raise CDMSError, 'Multiple specifications for coordinate type %s'%coordType
     resultSpec[coordLoc] = canonSpec
 
 class AbstractGrid (CdmsObj):
@@ -153,14 +154,13 @@ class AbstractGrid (CdmsObj):
     def __init__ (self, node):
         CdmsObj.__init__ (self, node)
         self.id = '<None>' # String identifier
-        if node is not None and hasattr(node, 'id'):
-            self.id = node.id
+        if node is not None and hasattr(node,'id'): self.id = node.id
         self.parent = None #Dataset containing this grid
         self._flataxes_ = None
         self._mesh_ = None
 
     def listall (self, all=None):
-        result = []
+        result=[]
         result.append('Grid has Python id %s.' % hex(id(self)))
         return result
 
@@ -171,27 +171,26 @@ class AbstractGrid (CdmsObj):
 
     def info(self, flag=None, device=None):
         "Write info about slab; include dimension values and weights if flag"
-        if device is None:
-            device = sys.stdout
+        if device is None: device = sys.stdout
         device.write(str(self))
 
     def writeToFile(self, file):
         """Write self to a CdmsFile file, returning CF coordinates attribute, or None if not applicable"""
-        raise CDMSError(MethodNotImplemented)
+        raise CDMSError, MethodNotImplemented
 
     def subSlice(self, *specs, **keys):
         """Get a subgrid based on an argument list <specs> of slices."""
-        raise CDMSError(MethodNotImplemented)
+        raise CDMSError, MethodNotImplemented
 
     def hasCoordType(self, coordType):
         """Return 1 iff self has the coordinate type."""
         return 0
 
     def getAxisList(self):
-        axes = []
-        for i in range(len(self._order_)):
-            axes.append(self.getAxis(i))
-        return axes
+      axes =[]
+      for i in range(len(self._order_)):
+        axes.append(self.getAxis(i))
+      return axes
 
     def isClose(self, g):
         """Return 1 if g is 'close enough' to self to be considered equal, 0 if not."""
@@ -207,31 +206,31 @@ class AbstractGrid (CdmsObj):
 
     def clone(self, copyData=1):
         """Make a copy of self."""
-        raise CDMSError(MethodNotImplemented)
+        raise CDMSError, MethodNotImplemented
 
     def flatAxes(self):
         """Return (flatlat, flatlon) where flatlat is a raveled NumPy array
         having the same length as the number of cells in the grid, similarly
         for flatlon."""
-        raise CDMSError(MethodNotImplemented)
+        raise CDMSError, MethodNotImplemented
 
     def size(self):
         "Return number of cells in the grid"
-        raise CDMSError(MethodNotImplemented)
+        raise CDMSError, MethodNotImplemented
 
     def writeScrip(self, cdunifFile):
         "Write a grid to a SCRIP file"
-        raise CDMSError(MethodNotImplemented)
+        raise CDMSError, MethodNotImplemented
 
 class AbstractRectGrid(AbstractGrid):
     """AbstractRectGrid defines the interface for rectilinear grids:
        grids which can be decomposed into 1-D latitude and longitude axes
     """
-    gridtypes = ['gaussian', 'uniform', 'equalarea', 'generic']
+    gridtypes = ['gaussian','uniform','equalarea','generic']
 
     def __init__ (self, node):
         AbstractGrid.__init__ (self, node)
-        val = self.__cdms_internals__ + ['id', ]
+        val = self.__cdms_internals__ + ['id',]
         self.___cdms_internals__ = val
 
     def listall (self, all=None):
@@ -246,14 +245,14 @@ class AbstractRectGrid(AbstractGrid):
 
     def _getshape (self):
         if self._order_ == "yx":
-            return (len(self._lataxis_), len(self._lonaxis_))
+            return (len(self._lataxis_),len(self._lonaxis_))
         else:
-            return (len(self._lonaxis_), len(self._lataxis_))
+            return (len(self._lonaxis_),len(self._lataxis_))
 
     # Get the n-th axis. naxis is 0 or 1.
     def getAxis(self, naxis):
         ind = self._order_[naxis]
-        if ind == 'x':
+        if ind=='x':
             axis = self.getLongitude()
         else:
             axis = self.getLatitude()
@@ -261,7 +260,7 @@ class AbstractRectGrid(AbstractGrid):
 
     def getBounds(self):
         latbnds, lonbnds = (self._lataxis_.getExplicitBounds(), self._lonaxis_.getExplicitBounds())
-        if (latbnds is None or lonbnds is None) and getAutoBounds() in [1, 2]:
+        if (latbnds is None or lonbnds is None) and getAutoBounds() in [1,2]:
             nlatbnds, nlonbnds = self.genBounds()
             if latbnds is None:
                 latbnds = nlatbnds
@@ -277,10 +276,10 @@ class AbstractRectGrid(AbstractGrid):
         return self._lonaxis_
 
     def getMask(self):
-        raise CDMSError(MethodNotImplemented)
+        raise CDMSError, MethodNotImplemented
 
-    def setMask(self, mask, permanent=0):
-        raise CDMSError(MethodNotImplemented)
+    def setMask(self,mask,permanent=0):
+        raise CDMSError, MethodNotImplemented
 
     def getOrder(self):
         return self._order_
@@ -289,10 +288,8 @@ class AbstractRectGrid(AbstractGrid):
         return self._gridtype_
 
     def setType(self, gridtype):
-        if gridtype == 'linear':
-            gridtype = 'uniform'
-        if gridtype == 'unknown':
-            gridtype = 'generic'
+        if gridtype=='linear': gridtype='uniform'
+        if gridtype=='unknown': gridtype='generic'
         # assert gridtype in AbstractRectGrid.gridtypes, 'Grid type must be one of %s'%`AbstractRectGrid.gridtypes`
         self._gridtype_ = gridtype
 
@@ -304,24 +301,22 @@ class AbstractRectGrid(AbstractGrid):
 
         latBounds, lonBounds = self.getBounds()
         latBounds = (numpy.pi/180.0) * latBounds
-        latWeights = 0.5 * numpy.absolute(numpy.sin(latBounds[:, 1]) - numpy.sin(latBounds[:, 0]))
+        latWeights = 0.5 * numpy.absolute(numpy.sin(latBounds[:,1]) - numpy.sin(latBounds[:,0]))
 
-        lonWeights = numpy.absolute((lonBounds[:, 1] - lonBounds[:, 0]))/360.0
+        lonWeights = numpy.absolute((lonBounds[:,1] - lonBounds[:,0]))/360.0
 
         return latWeights, lonWeights
 
     # Create a transient grid for the index (tuple) intervals.
-    def subGrid(self, latinterval, loninterval):
-        if latinterval is None:
-            latinterval = (0, len(self._lataxis_))
-        if loninterval is None:
-            loninterval = (0, len(self._lonaxis_))
-
-        latobj = self._lataxis_.subaxis(latinterval[0], latinterval[1])
-        lonobj = self._lonaxis_.subaxis(loninterval[0], loninterval[1])
+    def subGrid(self,latinterval, loninterval):
+        if latinterval is None: latinterval = (0, len(self._lataxis_))
+        if loninterval is None: loninterval = (0, len(self._lonaxis_))
+            
+        latobj = self._lataxis_.subaxis(latinterval[0],latinterval[1])
+        lonobj = self._lonaxis_.subaxis(loninterval[0],loninterval[1])
         maskArray = self.getMask()
         if maskArray is not None:
-            if self._order_ == "yx":
+            if self._order_=="yx":
                 submask = maskArray[latinterval[0]:latinterval[1], loninterval[0]:loninterval[1]]
             else:
                 submask = maskArray[loninterval[0]:loninterval[1], latinterval[0]:latinterval[1]]
@@ -329,7 +324,7 @@ class AbstractRectGrid(AbstractGrid):
             submask = None
 
         return TransientRectGrid(latobj, lonobj, self._order_, self._gridtype_, submask)
-
+        
     # Same as subGrid, for coordinates
     def subGridRegion(self, latRegion, lonRegion):
         latInterval = self._lataxis_.mapInterval(latRegion)
@@ -338,7 +333,7 @@ class AbstractRectGrid(AbstractGrid):
 
     # Return a transient grid which is the transpose of this grid
     def transpose(self):
-        if self._order_ == "yx":
+        if self._order_=="yx":
             neworder = "xy"
         else:
             neworder = "yx"
@@ -364,69 +359,65 @@ class AbstractRectGrid(AbstractGrid):
 
         CLOSE_ENOUGH = 1.e-3
         lat = self.getLatitude()
-        if len(lat) == 1:
-            return ('generic', 1, 0)
+        if len(lat)==1:
+            return ('generic',1,0)
 
         latar = lat[:]
-        if lat[0] < lat[-1]:              # increasing?
-            hassouth = (abs(lat[0]+90.0) < 1.e-2)
-            hasnorth = (abs(lat[-1]-90.0) < 1.e-2)
-            if hassouth:
-                latar = latar[1:]
-            if hasnorth:
-                latar = latar[:-1]
+        if lat[0]<lat[-1]:              # increasing?
+            hassouth = (abs(lat[0]+90.0)<1.e-2)
+            hasnorth = (abs(lat[-1]-90.0)<1.e-2)
+            if hassouth: latar = latar[1:]
+            if hasnorth: latar = latar[:-1]
         else:                           # decreasing
-            hassouth = (abs(lat[-1]+90.0) < 1.e-2)
-            hasnorth = (abs(lat[0]-90.0) < 1.e-2)
-            if hassouth:
-                latar = latar[:-1]
-            if hasnorth:
-                latar = latar[1:]
+            hassouth = (abs(lat[-1]+90.0)<1.e-2)
+            hasnorth = (abs(lat[0]-90.0)<1.e-2)
+            if hassouth: latar = latar[:-1]
+            if hasnorth: latar = latar[1:]
         nlats = len(latar)
 
         # Get the related Gaussian latitude
-        gausslatns, wts, bnds = regrid2._regrid.gridattr(len(latar), 'gaussian')
+        gausslatns, wts, bnds = regrid2._regrid.gridattr(len(latar),'gaussian')
         gausslatsn = gausslatns[::-1]
         diffs = latar[1:]-latar[:-1]
-        equalareans, wts, bnds = regrid2._regrid.gridattr(len(latar), 'equalarea')
+        equalareans, wts, bnds = regrid2._regrid.gridattr(len(latar),'equalarea')
         equalareasn = equalareans[::-1]
 
         # Get the Gaussian lats for len+1, in case this is a boundary
-        dumlat, dumwt, bndsplusns = regrid2._regrid.gridattr(len(latar)+1, 'gaussian')
+        dumlat, dumwt, bndsplusns = regrid2._regrid.gridattr(len(latar)+1,'gaussian')
         bndsplussn = bndsplusns[::-1]
 
         # Look for N-S equality
         isoffset = 0
-        if numpy.alltrue(numpy.less(numpy.absolute(latar[:]-gausslatns), CLOSE_ENOUGH)):
+        if numpy.alltrue(numpy.less(numpy.absolute(latar[:]-gausslatns),CLOSE_ENOUGH)):
             actualType = 'gaussian'
 
-        elif numpy.alltrue(numpy.less(numpy.absolute(latar[:]-gausslatsn), CLOSE_ENOUGH)):
+        elif numpy.alltrue(numpy.less(numpy.absolute(latar[:]-gausslatsn),CLOSE_ENOUGH)):
             actualType = 'gaussian'
 
         # Check for zone (offset) variable
-        elif numpy.alltrue(numpy.less(numpy.absolute(latar[:]-bndsplusns[1:-1]), CLOSE_ENOUGH)):
+        elif numpy.alltrue(numpy.less(numpy.absolute(latar[:]-bndsplusns[1:-1]),CLOSE_ENOUGH)):
             actualType = 'gaussian'
             isoffset = 1
             nlats = nlats+1
 
-        elif numpy.alltrue(numpy.less(numpy.absolute(latar[:]-bndsplussn[1:-1]), CLOSE_ENOUGH)):
+        elif numpy.alltrue(numpy.less(numpy.absolute(latar[:]-bndsplussn[1:-1]),CLOSE_ENOUGH)):
             actualType = 'gaussian'
             isoffset = 1
             nlats = nlats+1
 
-        elif numpy.alltrue(numpy.less(numpy.absolute(diffs-diffs[0]), CLOSE_ENOUGH)):
+        elif numpy.alltrue(numpy.less(numpy.absolute(diffs-diffs[0]),CLOSE_ENOUGH)):
             actualType = 'uniform'
 
-        elif numpy.alltrue(numpy.less(numpy.absolute(latar[:]-equalareans), CLOSE_ENOUGH)):
+        elif numpy.alltrue(numpy.less(numpy.absolute(latar[:]-equalareans),CLOSE_ENOUGH)):
             actualType = 'equalarea'
 
-        elif numpy.alltrue(numpy.less(numpy.absolute(latar[:]-equalareasn), CLOSE_ENOUGH)):
+        elif numpy.alltrue(numpy.less(numpy.absolute(latar[:]-equalareasn),CLOSE_ENOUGH)):
             actualType = 'equalarea'
 
         else:
             actualType = 'generic'
 
-        return (actualType, nlats, isoffset)
+        return (actualType,nlats,isoffset)
 
     # Generate a best guess at grid info within a family of grids (list of grids)
     # Return a tuple (type,coverage,nlats,isoffset, basegrid, latindex) where:
@@ -446,23 +437,21 @@ class AbstractRectGrid(AbstractGrid):
         coverage = 'global'
         basegrid = None
         latindex = None
-        if gridtype == 'generic':
+        if gridtype=='generic':
             # Look for truncated grids: such that grid is a subset of grid2
             found = 0
             for grid2 in gridlist:
-                if self.id == grid2.id:
-                    continue
+                if self.id==grid2.id: continue
                 lat = self.getLatitude()
                 lon = self.getLongitude()
                 lat2 = grid2.getLatitude()
                 lon2 = grid2.getLongitude()
-                if len(lat) > len(lat2) or len(lon) > len(lon2):
-                    continue
-                latIsSubset, latindex = isSubsetVector(lat[:], lat2[:], 1.e-2)
-                lonIsSubset, lonindex = isSubsetVector(lon[:], lon2[:], 1.e-2)
+                if len(lat)>len(lat2) or len(lon)>len(lon2): continue
+                latIsSubset, latindex = isSubsetVector(lat[:],lat2[:],1.e-2)
+                lonIsSubset, lonindex = isSubsetVector(lon[:],lon2[:],1.e-2)
                 if latIsSubset and lonIsSubset:
                     found = 1
-                    if len(lat2) > nlats:
+                    if len(lat2)>nlats:
                         coverage = 'regional'
                     nlats = len(lat2)
                     basegrid = grid2.id
@@ -474,13 +463,13 @@ class AbstractRectGrid(AbstractGrid):
     def genBounds(self):
         import regrid2._regrid
 
-        if hasattr(self, "parent") and self.parent is not None:
+        if hasattr(self,"parent") and self.parent is not None:
             gridfamily = self.parent.grids.values()
         else:
             gridfamily = []
 
         gridtype, coverage, nlats, isoffset, basegrid, latindex = self.classifyInFamily(gridfamily)
-        if _classifyGrids == 0:
+        if _classifyGrids==0:
             gridtypenew = self.getType()
             if gridtypenew in AbstractRectGrid.gridtypes:
                 gridtype = gridtypenew
@@ -488,33 +477,31 @@ class AbstractRectGrid(AbstractGrid):
         # Get latitude bounds
         lat = self.getLatitude()
         ascending = (lat[0] < lat[-1])
-        if gridtype == 'gaussian':
+        if gridtype=='gaussian':
             pts, wts, bnds = regrid2._regrid.gridattr(nlats, 'gaussian')
-            if ascending:
-                bnds = bnds[::-1]
-            latbnds = numpy.zeros((len(lat), 2), numpy.float)
-            latbnds[:, 0] = bnds[:-1]
-            latbnds[:, 1] = bnds[1:]
-            latbnds[0,:] = numpy.maximum(-90.0, numpy.minimum(90.0, latbnds[0,:]))
-            latbnds[-1,:] = numpy.maximum(-90.0, numpy.minimum(90.0, latbnds[-1,:]))
-        elif gridtype == 'equalarea':
+            if ascending: bnds = bnds[::-1]
+            latbnds = numpy.zeros((len(lat),2),numpy.float)
+            latbnds[:,0] = bnds[:-1]
+            latbnds[:,1] = bnds[1:]
+            latbnds[0,:] = numpy.maximum(-90.0, numpy.minimum(90.0,latbnds[0,:]))
+            latbnds[-1,:] = numpy.maximum(-90.0, numpy.minimum(90.0,latbnds[-1,:]))
+        elif gridtype=='equalarea':
             pts, wts, bnds = regrid2._regrid.gridattr(nlats, 'equalarea')
-            if ascending:
-                bnds = bnds[::-1]
-            latbnds = numpy.zeros((len(lat), 2), numpy.float)
-            latbnds[:, 0] = bnds[:-1]
-            latbnds[:, 1] = bnds[1:]
-            latbnds[0,:] = numpy.maximum(-90.0, numpy.minimum(90.0, latbnds[0,:]))
-            latbnds[-1,:] = numpy.maximum(-90.0, numpy.minimum(90.0, latbnds[-1,:]))
+            if ascending: bnds = bnds[::-1]
+            latbnds = numpy.zeros((len(lat),2),numpy.float)
+            latbnds[:,0] = bnds[:-1]
+            latbnds[:,1] = bnds[1:]
+            latbnds[0,:] = numpy.maximum(-90.0, numpy.minimum(90.0,latbnds[0,:]))
+            latbnds[-1,:] = numpy.maximum(-90.0, numpy.minimum(90.0,latbnds[-1,:]))
         else:
             latbnds = lat.genGenericBounds()
 
         # Get longitude bounds
         lon = self.getLongitude()
-        if len(lon) > 1:
+        if len(lon)>1:
             lonbnds = lon.genGenericBounds()
         else:
-            lonbnds = numpy.array([[lon[0]-180.0, lon[0]+180.0]], numpy.float)
+            lonbnds = numpy.array([[lon[0]-180.0, lon[0]+180.0]],numpy.float)
 
         return (latbnds, lonbnds)
 
@@ -524,27 +511,27 @@ class AbstractRectGrid(AbstractGrid):
     def getMesh(self):
         """Generate a mesh array for the meshfill graphics method."""
         if self._mesh_ is None:
-            LAT = 0
-            LON = 1
+            LAT=0
+            LON=1
             latbounds, lonbounds = self.getBounds()
             if latbounds is None or lonbounds is None:
-                raise CDMSError('No boundary data is available for grid %s'%self.id)
+                raise CDMSError, 'No boundary data is available for grid %s'%self.id
             ny = len(self._lataxis_)
             nx = len(self._lonaxis_)
             lenmesh = ny*nx
-            mesh = numpy.zeros((lenmesh, 2, 4), latbounds.dtype.char)
-            broadlat = numpy.repeat(latbounds[:, numpy.newaxis,:], nx, axis=1)
-            broadlat.shape = (lenmesh, 2)
-            broadlon = numpy.repeat(lonbounds[numpy.newaxis,:,:], ny, axis=0)
-            broadlon.shape = (lenmesh, 2)
-            mesh[:, LAT, 0] = broadlat[:, 0]
-            mesh[:, LAT, 1] = broadlat[:, 0]
-            mesh[:, LAT, 2] = broadlat[:, 1]
-            mesh[:, LAT, 3] = broadlat[:, 1]
-            mesh[:, LON, 0] = broadlon[:, 0]
-            mesh[:, LON, 1] = broadlon[:, 1]
-            mesh[:, LON, 2] = broadlon[:, 1]
-            mesh[:, LON, 3] = broadlon[:, 0]
+            mesh = numpy.zeros((lenmesh,2,4),latbounds.dtype.char)
+            broadlat = numpy.repeat(latbounds[:,numpy.newaxis,:],nx,axis=1)
+            broadlat.shape = (lenmesh,2)
+            broadlon = numpy.repeat(lonbounds[numpy.newaxis,:,:],ny,axis=0)
+            broadlon.shape=(lenmesh,2)
+            mesh[:,LAT,0] = broadlat[:,0]
+            mesh[:,LAT,1] = broadlat[:,0]
+            mesh[:,LAT,2] = broadlat[:,1]
+            mesh[:,LAT,3] = broadlat[:,1]
+            mesh[:,LON,0] = broadlon[:,0]
+            mesh[:,LON,1] = broadlon[:,1]
+            mesh[:,LON,2] = broadlon[:,1]
+            mesh[:,LON,3] = broadlon[:,0]
             self._mesh_ = mesh
         return self._mesh_
 
@@ -556,7 +543,7 @@ class AbstractRectGrid(AbstractGrid):
         if self._flataxes_ is None:
             alat = self.getLatitude()[:]
             alon = self.getLongitude()[:]
-            alatflat = numpy.repeat(alat[:, numpy.newaxis], len(alon), axis=1)
+            alatflat = numpy.repeat(alat[:,numpy.newaxis], len(alon), axis=1)
             alonflat = numpy.repeat(alon[numpy.newaxis,:], len(alat), axis=0)
             self._flataxes_ = (numpy.ravel(alatflat), numpy.ravel(alonflat))
         return self._flataxes_
@@ -578,8 +565,8 @@ class AbstractRectGrid(AbstractGrid):
         'gridid' is the string identifier of the resulting curvilinear grid object.
         """
 
-        from .coord import TransientVirtualAxis, TransientAxis2D
-        from .hgrid import TransientCurveGrid
+        from coord import TransientVirtualAxis, TransientAxis2D
+        from hgrid import TransientCurveGrid
 
         lat = self._lataxis_[:]
         lon = self._lonaxis_[:]
@@ -612,37 +599,37 @@ class AbstractRectGrid(AbstractGrid):
             ax, ay = lon, lat
             bx, by = blon, blat
             nx, ny = nlon, nlat
-
+            
         centerX = numpy.outer(numpy.ones(ny), ax)
         centerY = numpy.outer(ay, numpy.ones(nx))
 
         # Create corner latitudes (in yx order), ensuring counterclockwise direction
         cy = numpy.zeros((ny, 4), numpy.float)
-        if (by[0, 0] <= by[0, 1]):
+        if (by[0,0]<= by[0,1]):
             incr = 1
         else:
             incr = 0
-        cy[:, 0] = by[:, 1-incr]
-        cy[:, 1] = by[:, 1-incr]
-        cy[:, 2] = by[:, incr]
-        cy[:, 3] = by[:, incr]
-        cornerY = numpy.repeat(cy[:, numpy.newaxis,:], nx, axis=1)
-
+        cy[:,0] = by[:,1-incr]
+        cy[:,1] = by[:,1-incr]
+        cy[:,2] = by[:,incr]
+        cy[:,3] = by[:,incr]
+        cornerY = numpy.repeat(cy[:,numpy.newaxis,:], nx, axis=1)
+        
         # Create corner longitudes (in yx order), ensuring counterclockwise direction
         cx = numpy.zeros((nx, 4), numpy.float)
-        if (bx[0, 0] <= bx[0, 1]):
+        if (bx[0,0]<= bx[0,1]):
             incr = 1
         else:
             incr = 0
-        cx[:, 0] = bx[:, 1-incr]
-        cx[:, 1] = bx[:, incr]
-        cx[:, 2] = bx[:, incr]
-        cx[:, 3] = bx[:, 1-incr]
+        cx[:,0] = bx[:,1-incr]
+        cx[:,1] = bx[:,incr]
+        cx[:,2] = bx[:,incr]
+        cx[:,3] = bx[:,1-incr]
         cornerX = numpy.repeat(cx[numpy.newaxis,:,:], ny, axis=0)
 
-        iaxis = TransientVirtualAxis("i", ny) # First axis
-        jaxis = TransientVirtualAxis("j", nx) # Second axis
-
+        iaxis = TransientVirtualAxis("i",ny) # First axis
+        jaxis = TransientVirtualAxis("j",nx) # Second axis
+        
         centerLat = centerY
         centerLon = centerX
         cornerLat = cornerY
@@ -652,7 +639,7 @@ class AbstractRectGrid(AbstractGrid):
             centerLon = centerY
             cornerLat = cornerX
             cornerLon = cornerY
-
+            
 
         lataxis = TransientAxis2D(centerLat, axes=(iaxis, jaxis), bounds=cornerLat,
                                   attributes={'units':latunits}, id="latitude")
@@ -667,40 +654,39 @@ class AbstractRectGrid(AbstractGrid):
         gengrid = curvegrid.toGenericGrid(gridid=gridid)
         return gengrid
 
-    shape = property(_getshape, None)
-
-# PropertiedClasses.set_property (AbstractRectGrid, 'shape',
-# AbstractRectGrid._getshape,
-# nowrite=1,
-# nodelete=1)
+    shape = property(_getshape,None)
+   
+## PropertiedClasses.set_property (AbstractRectGrid, 'shape', 
+##                                 AbstractRectGrid._getshape, 
+##                                 nowrite=1,
+##                                 nodelete=1)
 
-# internattr.add_internal_attribute (AbstractRectGrid, 'id', 'parent')
+## internattr.add_internal_attribute (AbstractRectGrid, 'id', 'parent')
 
 class RectGrid(AbstractRectGrid):
 
     def __init__(self,parent,rectgridNode=None):
         if rectgridNode is not None and rectgridNode.tag != 'rectGrid':
-            raise CDMSError('Node is not a grid node')
-        AbstractRectGrid.__init__(self, rectgridNode)
+            raise CDMSError, 'Node is not a grid node'
+        AbstractRectGrid.__init__(self,rectgridNode)
         self.parent = parent
 
     # Set pointers to related structural elements: lon, lat axes, order, mask
     def initDomain(self, axisdict, vardict):
-        if self.latitude not in axisdict:
-            raise CDMSError('No such latitude: %s'%repr(self.latitude))
-        if self.longitude not in axisdict:
-            raise CDMSError('No such longitude: %s'%repr(self.longitude))
+        if not axisdict.has_key(self.latitude):
+            raise CDMSError, 'No such latitude: %s'%`self.latitude`
+        if not axisdict.has_key(self.longitude):
+            raise CDMSError, 'No such longitude: %s'%`self.longitude`
         self._lataxis_ = axisdict[self.latitude]
         self._lonaxis_ = axisdict[self.longitude]
         self._order_ = self.order
         self._gridtype_ = self.attributes.get('type')
-        if self._gridtype_ is None:
-            self._gridtype_ = "generic"
-        if hasattr(self, "mask"):
+        if self._gridtype_ is None: self._gridtype_ = "generic"
+        if hasattr(self,"mask"):
             self._maskVar_ = vardict.get(self.mask)
         else:
             self._maskVar_ = None
-
+    
     def getMask(self):
         if self._maskVar_ is None:
             # return numpy.ones(self.shape)
@@ -711,7 +697,7 @@ class RectGrid(AbstractRectGrid):
     def getMaskVar(self):
         return self._maskVar_
 
-# internattr.add_internal_attribute(RectGrid)
+## internattr.add_internal_attribute(RectGrid)
 
 class FileRectGrid(AbstractRectGrid):
 
@@ -721,8 +707,8 @@ class FileRectGrid(AbstractRectGrid):
         self.parent = parent
         self._lataxis_ = latobj
         self._lonaxis_ = lonobj
-        if not order in ["yx", "xy"]:
-            raise CDMSError('Grid order must be "yx" or "xy"')
+        if not order in ["yx","xy"]:
+            raise CDMSError, 'Grid order must be "yx" or "xy"'
         self._order_ = order
         self.setType(gridtype)
         self._maskVar_ = maskobj        # FileVariable of mask
@@ -746,25 +732,24 @@ class FileRectGrid(AbstractRectGrid):
     # Set the mask to array 'mask'. If persistent == 1, modify permanently
     # in the file, else set as a temporary mask.
     def setMask(self,mask,persistent=0):
-        if persistent != 0:
-            raise CDMSError(MethodNotImplemented)
+        if persistent!=0: raise CDMSError, MethodNotImplemented
         if mask is None:
             self._tempMask_ = None
         else:
-            assert isinstance(mask, numpy.ndarray), 'Mask must be a numpy array'
-            assert mask.shape == self.shape, 'Mask must have shape %s'%repr(self.shape)
+            assert type(mask)==numpy.ndarray, 'Mask must be a numpy array'
+            assert mask.shape==self.shape,'Mask must have shape %s'%`self.shape`
             self._tempMask_ = copy.copy(mask)
 
     def getMaskVar(self):
         return self._maskVar_
 
-# internattr.add_internal_attribute(FileRectGrid)
+## internattr.add_internal_attribute(FileRectGrid)
 
 # In-memory rectilinear grid
 class TransientRectGrid(AbstractRectGrid):
     "Grids that live in memory only."
     def __init__(self, latobj, lonobj, order, gridtype, maskarray=None):
-        AbstractRectGrid.__init__(self, None)
+        AbstractRectGrid.__init__(self,None)
         if latobj.__class__ != TransientAxis:
             latobj = TransientAxis(latobj[:], latobj.getBounds())
         if lonobj.__class__ != TransientAxis:
@@ -773,8 +758,8 @@ class TransientRectGrid(AbstractRectGrid):
         self._lataxis_.designateLatitude()
         self._lonaxis_ = lonobj
         self._lonaxis_.designateLongitude()
-        if not order in ["yx", "xy"]:
-            raise CDMSError('Grid order must be "yx" or "xy"')
+        if not order in ["yx","xy"]:
+            raise CDMSError, 'Grid order must be "yx" or "xy"'
         self._order_ = order
         self.setType(gridtype)
         self.setMask(maskarray)        # numpy mask array
@@ -790,17 +775,17 @@ class TransientRectGrid(AbstractRectGrid):
     # with persistent versions, is ignored.
     def setMask(self,mask, persistent=0):
         if mask is not None:
-            if not isinstance(mask, numpy.ndarray):
-                raise CDMSError('Mask must be a numpy array')
+            if type(mask)!=numpy.ndarray:
+               raise CDMSError, 'Mask must be a numpy array'
             if mask.shape != self.shape:
-                raise CDMSError('Mask must have shape %s'%repr(self.shape))
+               raise CDMSError, 'Mask must have shape %s'%`self.shape`
         self._maskArray_ = copy.copy(mask)
 
     def setBounds(self, latBounds, lonBounds):
         self._lataxis_.setBounds(latBounds)
         self._lonaxis_.setBounds(lonBounds)
 
-# internattr.add_internal_attribute(TransientRectGrid)
+## internattr.add_internal_attribute(TransientRectGrid)
 
 def isGrid(grid):
     """
@@ -816,8 +801,9 @@ def writeScripGrid(path, grid, gridTitle=None):
     grid is a CDMS grid object.
     gridTitle is a string ID for the grid.
     """
-
+    
     import Cdunif
-    f = Cdunif.CdunifFile(path, 'w')
+    f = Cdunif.CdunifFile(path,'w')
     grid.writeScrip(f, gridTitle)
     f.close()
+
diff --git a/Packages/cdms2/Lib/gsHost.py b/Packages/cdms2/Lib/gsHost.py
index 4933e7f49..343a3c842 100644
--- a/Packages/cdms2/Lib/gsHost.py
+++ b/Packages/cdms2/Lib/gsHost.py
@@ -5,7 +5,7 @@ A file-like object to access a host file, the single entry point
 to an entire gridspec data file layout.
 
 Dave Kindig and Alex Pletzer, Tech-X (2011)
-This code is provided with the hope that it will be useful.
+This code is provided with the hope that it will be useful. 
 No guarantee is provided whatsoever. Use at your own risk.
 """
 
@@ -24,8 +24,7 @@ except:
     # raise ImportError, 'Error: could not import pycf'
     print 'Error: could not import pycf'
 
-
-def open(hostfile, mode='r'):
+def open(hostfile, mode = 'r'):
     """
     Open host file
     @param hostfile host file
@@ -35,19 +34,17 @@ def open(hostfile, mode='r'):
     outHostFile = Host(hostfile, mode)
     return outHostFile
 
-
 class Host:
-
     """
     A LibCF/GRIDSPEC host file object. This acts as the single point of entry to
     a GRIDSPEC aggregation. Variables and grids can be requested solely through
-    the Host object, which is a hybrid between a variable and file object.
+    the Host object, which is a hybrid between a variable and file object. 
     Host relies on the libcf shared object. As such, if there is a problem
     consult http://www.unidata.ucar.edu/software/libcf/docs/libcf/ for details
     on building host files and all related GRIDSPEC files.
     """
 
-    def __init__(self, hostfile, mode='r'):
+    def __init__(self, hostfile, mode = 'r'):
         """
         Constructor
         @param hostfile path to the host
@@ -57,41 +54,42 @@ class Host:
         self.__initialize()
         self.uri = hostfile
         self.mode = mode
-
+        
         # Data dir based on location of hostfile
         if mode != 'r':
-            raise CDMSError('Only read mode is supported for host file')
+            raise CDMSError, 'Only read mode is supported for host file'
 
         for sosuffix in '.so', '.dylib', '.dll', '.a':
             self.libcfdll = CDLL(LIBCF + sosuffix)
             if self.libcfdll:
                 break
 
-        if self.libcfdll is None:
-            raise CDMSError('libcf not installed or incorrect path\n  ')
+        if self.libcfdll == None: 
+            raise CDMSError, 'libcf not installed or incorrect path\n  '
 
         libcfdll = self.libcfdll
 
         status = libcfdll.nccf_def_host_from_file(hostfile,
-                                                  byref(self.hostId_ct))
+                                               byref(self.hostId_ct))
         if status != 0:
-            raise CDMSError("ERROR: not a valid host file %s (status=%d)" %
-                            (hostfile, status))
+            raise CDMSError, \
+                "ERROR: not a valid host file %s (status=%d)" % \
+                (hostfile, status)
 
         # Attach global attrs
-        libcfdll.nccf_def_global_from_file(hostfile,
-                                           byref(self.globalId_ct))
+        libcfdll.nccf_def_global_from_file( hostfile, \
+                                            byref(self.globalId_ct))
 
         # get the global attributes from the file
         natts = c_int(-1)
-        attName_ct = c_char_p(" " * (libCFConfig.NC_MAX_NAME + 1))
-        attValu_ct = c_char_p(" " * (libCFConfig.NC_MAX_NAME + 1))
-        self.libcfdll.nccf_inq_global_natts(self.globalId_ct, byref(natts))
+        attName_ct = c_char_p(" " * (libCFConfig.NC_MAX_NAME+1))
+        attValu_ct = c_char_p(" " * (libCFConfig.NC_MAX_NAME+1))
+        self.libcfdll.nccf_inq_global_natts( self.globalId_ct, byref(natts))
         for i in range(natts.value):
-            self.libcfdll.nccf_inq_global_attval(self.globalId_ct,
-                                                 i, attName_ct,
-                                                 attValu_ct)
-            if attName_ct.value not in self.attributes:
+            self.libcfdll.nccf_inq_global_attval(self.globalId_ct, \
+                                                     i, attName_ct, \
+                                                     attValu_ct)
+            if not self.attributes.has_key( attName_ct.value ):
                 self.attributes[attName_ct.value] = attValu_ct.value
 
         self.id = hostfile
@@ -99,28 +97,28 @@ class Host:
         i_ct = c_int()
         status = libcfdll.nccf_inq_host_ngrids(self.hostId_ct, byref(i_ct))
         self.nGrids = i_ct.value
-        status = libcfdll.nccf_inq_host_nstatdatafiles(self.hostId_ct,
-                                                       byref(i_ct))
+        status = libcfdll.nccf_inq_host_nstatdatafiles(self.hostId_ct, \
+                                                           byref(i_ct))
         self.nStatDataFiles = i_ct.value
-        status = libcfdll.nccf_inq_host_ntimedatafiles(self.hostId_ct,
-                                                       byref(i_ct))
+        status = libcfdll.nccf_inq_host_ntimedatafiles(self.hostId_ct, \
+                                                           byref(i_ct))
 
         self.nTimeDataFiles = i_ct.value
-        status = libcfdll.nccf_inq_host_ntimeslices(self.hostId_ct,
-                                                    byref(i_ct))
+        status = libcfdll.nccf_inq_host_ntimeslices(self.hostId_ct, \
+                                                        byref(i_ct))
         self.nTimeSliceFiles = i_ct.value
 
-        fName_ct = c_char_p(" " * (libCFConfig.NC_MAX_NAME + 1))
-        gName_ct = c_char_p(" " * (libCFConfig.NC_MAX_NAME + 1))
+        fName_ct = c_char_p(" " * (libCFConfig.NC_MAX_NAME+1))
+        gName_ct = c_char_p(" " * (libCFConfig.NC_MAX_NAME+1))
 
-        self.dimensions = {"nGrids": self.nGrids,
+        self.dimensions = {"nGrids": self.nGrids, 
                            "nStatDataFiles": self.nStatDataFiles,
                            "nTimeDataFiles": self.nTimeDataFiles,
-                           "nTimeSliceFiles": self.nTimeSliceFiles}
+                           "nTimeSliceFiles":self.nTimeSliceFiles }
 
         # Mosaic filename (use getMosaic to return the connectivity)
         mosaicFilename = c_char_p(" " * (libCFConfig.NC_MAX_NAME + 1))
-        status = libcfdll.nccf_inq_host_mosaicfilename(self.hostId_ct,
+        status = libcfdll.nccf_inq_host_mosaicfilename(self.hostId_ct, 
                                                        mosaicFilename)
         self.mosaicFilename = mosaicFilename.value
 
@@ -133,9 +131,9 @@ class Host:
         # static data
         for vfindx in range(self.nStatDataFiles):
             for gfindx in range(self.nGrids):
-                status = libcfdll.nccf_inq_host_statfilename(self.hostId_ct,
-                                                             vfindx, gfindx,
-                                                             fName_ct)
+                status = libcfdll.nccf_inq_host_statfilename(self.hostId_ct, 
+                                                          vfindx, gfindx, 
+                                                          fName_ct)
                 statFilenames.append(fName_ct.value)
                 f = cdms2.open(fName_ct.value, 'r')
                 varNames = f.listvariable()
@@ -144,12 +142,12 @@ class Host:
                     # Add coordinate names a local list of coordinates
                     if 'coordinates' in dir(f[vn]):
                         for coord in f[vn].coordinates.split():
-                            if not coord in coordinates:
+                            if not coord in coordinates: 
                                 coordinates.append(coord)
-                    if vn not in self.statVars:
+                    if not self.statVars.has_key(vn):
                         # allocate
-                        self.statVars[vn] = ["" for ig in
-                                             range(self.nGrids)]
+                        self.statVars[vn] = ["" for ig in \
+                                                 range(self.nGrids)] 
 
                     # set file name
                     self.statVars[vn][gfindx] = fName_ct.value
@@ -160,11 +158,11 @@ class Host:
             for tfindx in range(self.nTimeSliceFiles):
                 for gfindx in range(self.nGrids):
                     status = \
-                        libcfdll.nccf_inq_host_timefilename(self.hostId_ct,
-                                                            vfindx,
-                                                            tfindx,
-                                                            gfindx,
-                                                            fName_ct)
+                        libcfdll.nccf_inq_host_timefilename(self.hostId_ct, 
+                                                            vfindx, \
+                                                                tfindx, \
+                                                                gfindx, \
+                                                              fName_ct)
                     timeFilenames.append(fName_ct.value)
                     f = cdms2.open(fName_ct.value, 'r')
                     varNames = f.listvariable()
@@ -172,13 +170,13 @@ class Host:
                         # Add coordinate names a local list of coordinates
                         if 'coordinates' in dir(f[vn]):
                             for coord in f[vn].coordinates.split():
-                                if not coord in coordinates:
+                                if not coord in coordinates: 
                                     coordinates.append(coord)
-                        if vn not in self.timeVars:
+                        if not self.timeVars.has_key(vn):
                             # allocate
                             self.timeVars[vn] = \
-                                [["" for it in range(self.nTimeSliceFiles)]
-                                 for ig in range(self.nGrids)]
+                                [["" for it in range(self.nTimeSliceFiles)] \
+                                     for ig in range(self.nGrids)]
                         # set file name
                         self.timeVars[vn][gfindx][tfindx] = fName_ct.value
                     f.close()
@@ -186,12 +184,12 @@ class Host:
         # Grid names and data. Must come after time and static file dictionaries
         # because they define the coordinates.
         for gfindx in range(self.nGrids):
-            status = libcfdll.nccf_inq_host_gridfilename(self.hostId_ct,
-                                                         gfindx,
-                                                         fName_ct)
-            status = libcfdll.nccf_inq_host_gridname(self.hostId_ct,
-                                                     gfindx,
-                                                     gName_ct)
+            status = libcfdll.nccf_inq_host_gridfilename(self.hostId_ct, 
+                                                      gfindx, 
+                                                      fName_ct)
+            status = libcfdll.nccf_inq_host_gridname(self.hostId_ct, 
+                                                      gfindx, 
+                                                      gName_ct)
 
             varNames = cdms2.open(fName_ct.value, 'r').listvariable()
             for vn in varNames:
@@ -206,22 +204,23 @@ class Host:
         # Populate the variables dictionary, avoid the grids
         self.variables = {}
         for item in self.statVars.keys():
-            self.variables[item] = StaticFileVariable(self, item)
+            self.variables[item] = StaticFileVariable(self, item) 
         for item in self.timeVars.keys():
             self.variables[item] = TimeFileVariable(self, item)
 
+
     def __initialize(self):
         """
-        private method to inititialze the hostObj and for use in reseting
+        private method to inititialze the hostObj and for use in reseting 
         the hostObj on close
         """
 
-        self.mode = ''
+        self.mode     = ''
         self.libcfdll = None
-        self.uri = ''
-        self.id = ''
+        self.uri      = ''
+        self.id       = ''
         self._status_ = ''
-
+        
         # ctypes variables
         self.hostId_ct = c_int(-1)
         self.globalId_ct = c_int(-1)
@@ -229,10 +228,10 @@ class Host:
         # number of grid files
         self.nGrids = 0
 
-        # number of static var files
+        # number of static var files 
         self.nStatDataFiles = 0
 
-        # number of time dependent var files
+        # number of time dependent var files 
         self.nTimeDataFiles = 0
 
         # number of time files
@@ -252,14 +251,14 @@ class Host:
         self.statVars = {}
 
         # global attributes
-        self.attributes = {}
+        self.attributes = {}   
 
     def getMosaic(self):
         """
         Get the mosaic filename
         @return mfn Mosaic filename
         """
-        from .gsMosaic import Mosaic
+        from gsMosaic import Mosaic
         mfn = Mosaic(self.mosaicFilename, "r")
 
         return mfn
@@ -283,10 +282,10 @@ class Host:
         """
         return self.gridName.values()
 
-    def getStatFilenames(self, varName=None):
+    def getStatFilenames(self, varName = None):
         """
         Return a list of static variable filenames
-        @param varName variable name (or None if all the static file names are to
+        @param varName variable name (or None if all the static file names are to 
                        be returned)
         @return list the file names corresponding to varName
         """
@@ -295,7 +294,7 @@ class Host:
         # return all the static var filenames
         return self.statVars.values()
 
-    def getTimeFilenames(self, varName=None):
+    def getTimeFilenames(self, varName = None):
         """
         Return a list of time dependent variable filenames
         @param varName variable name. None for all variables
@@ -312,7 +311,7 @@ class Host:
         @return list of coordinate names
         """
         return self.gridVars.keys()
-
+    
     def getNumGrids(self):
         """
         Get number of grids (tiles)
@@ -323,7 +322,7 @@ class Host:
 
     def getNumStatDataFiles(self):
         """
-        Get number of static data files
+        Get number of static data files 
         @return number static files
         """
         return self.nStatDataFiles
@@ -335,7 +334,7 @@ class Host:
         """
         return self.nTimeDataFiles
 
-    def listvariable(self, gstype=None):
+    def listvariable(self, gstype = None):
         """
         @param type Grid, Static, Time Dependent or None
         @return list of all variables, including static and time dependent, Default = None
@@ -357,9 +356,9 @@ class Host:
         # Raise error
         else:
             text = 'type must be "Static", "Time", None or empty'
-            raise CDMSError(text)
+            raise CDMSError, text
 
-    def listvariables(self, type=None):
+    def listvariables(self, type = None):
         """
         Synonymous to listvariable
         @param type Grid, Static, Time Dependent or None
@@ -374,9 +373,9 @@ class Host:
         @return attributes list
         """
         fName = ""
-        if varName in self.statVars:
+        if self.statVars.has_key(varName):
             fName = self.statVars[varName][0]
-        elif varName in self.timeVars:
+        elif self.timeVars.has_key(varName):
             fName = self.timeVars[varName][0][0]
         if fName:
             var = cdms2.open(fName, 'r')(varName)
@@ -398,12 +397,12 @@ class Host:
         @return [nGrids, (n0, n1, ...)]
         """
         return self.dimensions.keys()
-
+        
     def listglobal(self):
         """
         List global attributes of host file
         @return a list of the global attributes in the file
-        """
+        """ 
         return self.attributes.keys()
 
     def getglobal(self, attName):
@@ -411,10 +410,10 @@ class Host:
         Get the value of the global attribute
         @param [attName] - global attribute name
         @return attribute value
-        """
+        """        
         return self.attributes[attName]
 
-    def listall(self, varName=None, all=None):
+    def listall(self, varName = None, all = None):
         """
         Get info about data from the file.
         @param varName variable name
@@ -422,12 +421,11 @@ class Host:
         @return information about file.
         """
 
-        if varName is None:
-            return None
+        if varName is None: return None 
         var = self.getVariable(varName)
-        return var.listall(all=all)
+        return var.listall(all = all)
 
-    def showall(self, varName=None, all=None, device=None):
+    def showall(self, varName = None, all = None, device = None):
         """
         Get info about data from the file.
         @param varName variable name
@@ -435,12 +433,9 @@ class Host:
         @param device output device
         @return information about file.
         """
-        import sys
-        import string
-        if device is None:
-            device = sys.stdout
-        if varName is None:
-            return None
+        import sys, string
+        if device is None: device=sys.stdout
+        if varName is None: return None 
         var = self.getVariable(varName)
         alist = var.listall(all=all)
         device.write(string.join(alist, "\n"))
@@ -453,22 +448,22 @@ class Host:
         self.__initialize()
         self._status_ = 'closed'
 
-    def __repr__(self):
+    def __repr__(self): 
         """
         Python repr()
         @return res Print statement
         """
         res = "< '%s',  URI: '%s', MODE: '%s', STATUS: '%s',\n libcf: %s >" % \
-            (self.__class__, self.uri, self.mode,
+            ( self.__class__, self.uri, self.mode, 
               self._status_, self.libcfdll)
-        return res
+        return res 
 
     def __del__(self):
         """
         Free the host file from memory
         """
-        if self.hostId_ct.value >= 0:
-            self.libcfdll.nccf_free_host(self.hostId_ct)
+        if self.hostId_ct.value >= 0: 
+            self.libcfdll.nccf_free_host( self.hostId_ct )
         self.hostId_ct.value = -1
 
 # NOTE: There is no __call__ method for host files.
@@ -480,12 +475,12 @@ class Host:
         @return list of cdms2 file variables, one for each grid
         """
         # Static variables
-        if varName in self.statVars:
+        if self.statVars.has_key(varName):
             staticFV = StaticFileVariable(self, varName)
             return staticFV
 
         # Time variables
-        elif varName in self.timeVars:
+        elif self.timeVars.has_key(varName):
             timeVariables = TimeFileVariable(self, varName)
             return timeVariables
 
@@ -513,9 +508,8 @@ class Host:
         @return value
         """
         return self.attributes[name]
-
-#
-
+    
+##############################################################################
 
 def test():
     import sys
@@ -526,20 +520,20 @@ def test():
     from optparse import OptionParser
     parser = OptionParser()
     parser.add_option("-f", "--file", dest="hostFilename",
-                      help="host file name")
+                  help="host file name")
 
     options, args = parser.parse_args()
     if not options.hostFilename:
-        print """need to provide a host file, use -h
+        print """need to provide a host file, use -h 
 to get a full list of options"""
         sys.exit(1)
 
     print 'open file..., create grdspec file object...'
     gf = cdms2.open(options.hostFilename)
-    if gf._status_ == 'closed':
+    if gf._status_ == 'closed': 
         print "File not opened"
         sys.exit(1)
-    print
+    print 
     print "type=", type(gf)
     print 'listvariable...'
     print gf.listvariable()
@@ -558,15 +552,15 @@ to get a full list of options"""
     print 'acess time dependent data...', "V" in gf.listvariables()
     print gf['V'][0].size
 
+
     # Test the mosaic
     print 'getMosaic...', 'getMosaic' in dir(gf)
     mosaic = gf.getMosaic()
-    for c in mosaic.coordinate_names:
+    for c in mosaic.coordinate_names: 
         print c
-    for t in mosaic.tile_contacts:
+    for t in mosaic.tile_contacts: 
         print "%s -> %s" % (t, mosaic.tile_contacts[t])
 
-#
+##############################################################################
 
-if __name__ == "__main__":
-    test()
+if __name__ == "__main__": test()
diff --git a/Packages/cdms2/Lib/gsMosaic.py b/Packages/cdms2/Lib/gsMosaic.py
index 983030222..2592ada8c 100644
--- a/Packages/cdms2/Lib/gsMosaic.py
+++ b/Packages/cdms2/Lib/gsMosaic.py
@@ -3,7 +3,7 @@
 """
 A file-like object to access mosaic.
 Dave Kindig and Alex Pletzer, Tech-X (2011)
-This code is provided with the hope that it will be useful.
+This code is provided with the hope that it will be useful. 
 No guarantee is provided whatsoever. Use at your own risk.
 """
 
@@ -11,7 +11,7 @@ No guarantee is provided whatsoever. Use at your own risk.
 from re import search, sub
 from ctypes import c_char_p, c_int, CDLL, byref
 
-# numpy
+# numpy 
 from numpy import zeros, reshape
 
 # CDAT
@@ -24,13 +24,12 @@ from cdms2.error import CDMSError
 try:
     from pycf import libCFConfig, __path__
 except:
-    raise ImportError('Error: could not import pycf')
+    raise ImportError, 'Error: could not import pycf'
 
-LIBCFDIR = __path__[0] + "/pylibcf"
-libCF = libCFConfig
+LIBCFDIR  = __path__[0] + "/pylibcf"
+libCF  = libCFConfig
 
-
-def open(uri, mode='r'):
+def open(uri, mode = 'r'):
     """
     Open mosaic file
     @param mosaicfile mosaic file
@@ -41,7 +40,6 @@ def open(uri, mode='r'):
     outMosaicFile = Mosaic(uri, mode)
     return outMosaicFile
 
-
 def getSlab(strg):
     """
     From a string return a tuple of slice objects
@@ -60,29 +58,26 @@ def getSlab(strg):
             step = 1
             startIndex = int(m.group(1))
             endIndex = int(m.group(2))
-            if endIndex < startIndex:
-                step = -1
+            if endIndex < startIndex: step = -1
             slc = slice(startIndex, endIndex, step)
             res.append(slc)
     return tuple(res)
 
-
 class Mosaic:
-
     """
     Define a mosaic.
     """
 
-    def __init__(self, uri, mode='r'):
+    def __init__(self, uri, mode = 'r'):
         """
         Constructor
         @param uri Filename with path
         @param mode read/write. Currently only read is supported
         """
 
-        self.id = uri
-        self.mode = mode
-        self.uri = uri
+        self.id      = uri
+        self.mode    = mode
+        self.uri     = uri
         self._status = 'Open'
 
         self.mosaicId_ct = c_int(-1)
@@ -94,44 +89,41 @@ class Mosaic:
 
         libcfdll = self.lib
 
-        self.file_type = ""
-        self.contact_map = {}
-        self.tile_contacts = {}
+        self.file_type           = ""
+        self.contact_map         = {}
+        self.tile_contacts       = {}
         self.tile_contacts_compl = {}
-        self.coordinate_names = []
-        self.tile_names = []
+        self.coordinate_names    = []
+        self.tile_names          = []
 
-        status = libcfdll.nccf_def_mosaic_from_file(uri, "",
+        status = libcfdll.nccf_def_mosaic_from_file(uri, "", 
                                                     byref(self.mosaicId_ct))
 
         if status != 0:
-            raise CDMSError("ERROR: %s is not a valid mosaic file (status = %d)" %
-                            (uri, status))
+            raise CDMSError, "ERROR: %s is not a valid mosaic file (status = %d)" % \
+                (uri, status)
 
         # Get some sizes
-        nGrids = c_int(-1)
-        ndims = c_int(-1)
-        ncontacts = c_int(-1)
+        nGrids         = c_int(-1)
+        ndims          = c_int(-1)
+        ncontacts      = c_int(-1)
         libcfdll.nccf_inq_mosaic_ndims(self.mosaicId_ct, byref(ndims))
         libcfdll.nccf_inq_mosaic_ngrids(self.mosaicId_ct, byref(nGrids))
         libcfdll.nccf_inq_mosaic_ncontacts(self.mosaicId_ct, byref(ncontacts))
 
         # Build the character arrays
         separator_ct = libCF.CF_TILE_SEPARATOR
-        contact_map_ct = c_char_p(" " * (libCF.NC_MAX_NAME + 1))
-        tile_contact_ct = c_char_p(" " * (libCF.NC_MAX_NAME + 1))
-        tile_name_ct = c_char_p(" " * (libCF.NC_MAX_NAME + 1))
+        contact_map_ct  = c_char_p(" " * (libCF.NC_MAX_NAME+1))
+        tile_contact_ct = c_char_p(" " * (libCF.NC_MAX_NAME+1))
+        tile_name_ct    = c_char_p(" " * (libCF.NC_MAX_NAME+1))
         coord_ct = (c_char_p * ndims.value)()
 
         for iDim in range(ndims.value):
-            coord_ct[iDim] = " " * (libCF.NC_MAX_NAME + 1)
+            coord_ct[iDim] = " " * (libCF.NC_MAX_NAME+1)
 
         # Get the grid names
         for igrid in range(nGrids.value):
-            libcfdll.nccf_inq_mosaic_gridname(
-                self.mosaicId_ct,
-                igrid,
-                tile_name_ct)
+            libcfdll.nccf_inq_mosaic_gridname(self.mosaicId_ct, igrid, tile_name_ct)
             tname = str(tile_name_ct)
             self.tile_names.append(tname)
 
@@ -143,24 +135,24 @@ class Mosaic:
 
         # Get the contact map information
         for iContact in range(ncontacts.value):
-            status = libcfdll.nccf_inq_mosaic_contactmap(self.mosaicId_ct,
-                                                         iContact, contact_map_ct)
-            status = libcfdll.nccf_inq_mosaic_tilecontact(self.mosaicId_ct,
-                                                          iContact, tile_contact_ct)
+            status = libcfdll.nccf_inq_mosaic_contactmap(self.mosaicId_ct, \
+                                                       iContact, contact_map_ct)
+            status = libcfdll.nccf_inq_mosaic_tilecontact(self.mosaicId_ct, \
+                                                        iContact, tile_contact_ct)
 
-            tN1, tN2 = tile_contact_ct.value.split(separator_ct)
+            tN1, tN2             = tile_contact_ct.value.split(separator_ct)
             tileName1, tileName2 = tN1.strip(), tN2.strip()
-            s1, s2 = contact_map_ct.value.split(separator_ct)
+            s1, s2               = contact_map_ct.value.split(separator_ct)
 
             # slice objects
             slab1 = getSlab(s1.strip())
             slab2 = getSlab(s2.strip())
 
             # Create the tile contact dictionary. Non symmetric.
-            if tileName1 not in self.tile_contacts:
+            if not self.tile_contacts.has_key(tileName1):
                 self.tile_contacts[tileName1] = {}
             # The complement to tile_contacts
-            if tileName2 not in self.tile_contacts_compl:
+            if not self.tile_contacts_compl.has_key(tileName2):
                 self.tile_contacts_compl[tileName2] = {}
 
             # Attach the contact map (slab) between the tiles
@@ -192,13 +184,13 @@ class Mosaic:
             for sl in slab:
                 b = sl.start
                 e = sl.stop + 1
-                newsl = slice(max(b - 1, 0), max(e - 1, -1), sl.step)
+                newsl = slice(max(b-1, 0), max(e-1, -1), sl.step)
                 newslab.append(newsl)
             newslabs.append(tuple(newslab))
         slab1, slab2 = newslabs
-
+    
         return (slab1, slab2)
-
+    
     def getSeamGrids(self, coordData):
         """
         Retrieve the seem grids between two cell centered tiles
@@ -211,33 +203,32 @@ class Mosaic:
                 # Get the seam data
                 result.append(self.getSeamData(tn1, tn2, coordData))
 
-                # Get the triangle data. Need to find the three cells
+                # Get the triangle data. Need to find the three cells 
                 # comprising a corner.
                 if tn2 in self.tile_contacts.keys():
-                    t1n = self.tile_contacts[tn1].keys()
-                    t2n = self.tile_contacts[tn2].keys()
+                    t1n = self.tile_contacts[tn1].keys() 
+                    t2n = self.tile_contacts[tn2].keys() 
 
                     # Look for a tile in the main list. Now compare the adjacent
                     # tiles to 1 and 2 until there is match. Now we have tile 3
                     for tn3 in t1n:
                         if tn3 in t1n and tn3 in t2n:
                             cornerIndex = self.getCornerData(tn1, tn2, tn3)
-
                             def getCornerInfo(data, cornerindex):
                                 lon = data.getLongitude()
                                 lat = data.getLatitude()
                                 c1 = data[cornerindex]
                                 n1 = lon[cornerindex]
                                 t1 = lat[cornerindex]
-                                lonatts = {'units': lon.units,
-                                           'standard_name': lon.standard_name}
-                                latatts = {'units': lat.units,
-                                           'standard_name': lat.standard_name}
+                                lonatts = {'units':lon.units, 
+                                           'standard_name':lon.standard_name}
+                                latatts = {'units':lat.units, 
+                                           'standard_name':lat.standard_name}
 
                                 return c1, n1, t1, lonatts, latatts
 
                             def popCorner(d1, d2, d3, dtype):
-                                corner = zeros((2, 2), dtype=dtype)
+                                corner = zeros((2, 2), dtype = dtype)
                                 if 'data' in dir(d1):
                                     corner[0, 0] = d1.data
                                     corner[0, 1] = d2.data
@@ -251,9 +242,7 @@ class Mosaic:
                                 return corner
 
                             c1, n1, t1, lonAtts, latAtts = \
-                                getCornerInfo(
-                                    coordData[tn1],
-                                            cornerIndex[0])
+                                        getCornerInfo(coordData[tn1], cornerIndex[0])
                             c2, n2, t2, lonAtts, latAtts = \
                                 getCornerInfo(coordData[tn2], cornerIndex[1])
                             c3, n3, t3, lonAtts, latAtts = \
@@ -264,27 +253,21 @@ class Mosaic:
                             lon_dtype = coordData[tn1].getLongitude().dtype
                             lat_dtype = coordData[tn1].getLatitude().dtype
                             corner = popCorner(c1, c2, c3, dtype)
-                            lon = popCorner(n1, n2, n3, lon_dtype)
-                            lat = popCorner(t1, t2, t3, lat_dtype)
-                            gridid = 'corner_%d_%d_%d' % (coordData[tn1].gridIndex,
-                                                          coordData[
-                                tn2].gridIndex,
-                                coordData[tn3].gridIndex)
-                            gridAtts = {
-                                'lon': lonAtts,
-                                'lat': latAtts,
-                                'gridid': gridid}
-                            cornerGrid = self.createSeamGrid(
-                                lon, lat, gridAtts)
-
-                            cornerTV = cdms2.createVariable(corner,
-                                                            axes=cornerGrid.getAxisList(
-                                                            ),
-                                                            grid=cornerGrid,
-                                                            attributes=coordData[
-                                                            tn1].attributes,
-                                                            id=gridid)
-
+                            lon    = popCorner(n1, n2, n3, lon_dtype)
+                            lat    = popCorner(t1, t2, t3, lat_dtype)
+                            gridid = 'corner_%d_%d_%d' % (coordData[tn1].gridIndex, \
+                                                           coordData[tn2].gridIndex, 
+                                                           coordData[tn3].gridIndex)
+                            gridAtts = {'lon':lonAtts, 'lat':latAtts, 'gridid':gridid}
+                            cornerGrid = self.createSeamGrid(lon, lat, gridAtts)
+
+                            cornerTV = cdms2.createVariable(corner, 
+                                             axes = cornerGrid.getAxisList(), 
+                                             grid = cornerGrid, 
+                                             attributes = coordData[tn1].attributes, 
+                                             id = gridid)
+                    
+                                
         return (result, cornerTV)
 
     def getCornerData(self, tileName1, tileName2, tileName3):
@@ -293,9 +276,9 @@ class Mosaic:
         @tileName1 Tile name of first grid (tile)
         @tileName2 Tile name of second grid (tile)
         @tileName3 Tile name of third grid (tile)
-        @return tuple of data marking the corners of the corner grid
+        @return tuple of data marking the corners of the corner grid        
         """
-
+        
         # Get the slabs and account for cell centers
         s1, s2 = self.tile_contacts[tileName1][tileName2]
         s3, s4 = self.tile_contacts[tileName1][tileName3]
@@ -310,18 +293,12 @@ class Mosaic:
         c5, c6 = self.getContactCornerIndex(s5, s6)
 
         # Set the tuple containing the corner indices in j, i order.
-        if c1 == 0 and c3 == 1:
-            pair1 = (s1[c1].start, s3[c3].start)
-        if c1 == 1 and c3 == 0:
-            pair1 = (s3[c3].start, s1[c1].start)
-        if c2 == 0 and c5 == 1:
-            pair2 = (s2[c2].start, s5[c5].start)
-        if c2 == 1 and c5 == 0:
-            pair2 = (s5[c5].start, s2[c2].start)
-        if c4 == 0 and c6 == 1:
-            pair3 = (s4[c4].start, s6[c6].start)
-        if c4 == 1 and c6 == 0:
-            pair3 = (s6[c6].start, s4[c4].start)
+        if c1 == 0 and c3 == 1: pair1 = (s1[c1].start, s3[c3].start)
+        if c1 == 1 and c3 == 0: pair1 = (s3[c3].start, s1[c1].start)
+        if c2 == 0 and c5 == 1: pair2 = (s2[c2].start, s5[c5].start)
+        if c2 == 1 and c5 == 0: pair2 = (s5[c5].start, s2[c2].start)
+        if c4 == 0 and c6 == 1: pair3 = (s4[c4].start, s6[c6].start)
+        if c4 == 1 and c6 == 0: pair3 = (s6[c6].start, s4[c4].start)
 
         return (pair1, pair2, pair3)
 
@@ -349,7 +326,7 @@ class Mosaic:
         @return attrs Attributes for eash plus the gridid
         """
         pass
-
+        
     def createSeamGrid(self, x, y, attrs):
         """
         Return the coordinate data associated with variable.
@@ -360,37 +337,34 @@ class Mosaic:
         LONSTR = 'lon'
         LATSTR = 'lat'
 
+
         # Get the dimensions
         xdim = x.shape
         ydim = y.shape
 
-        if xdim != ydim:
-            raise CDMSError("Dimension of coordinates grids don't match")
+        if xdim != ydim: 
+            raise CDMSError, "Dimension of coordinates grids don't match"
 
         nj = xdim[0]
         ni = xdim[1]
 
         # Define the axes, verifying the lon and lat grids
-        jaxis = TransientVirtualAxis("j", nj)
-        iaxis = TransientVirtualAxis("i", ni)
-
-        if search(LONSTR, attrs['lon']['standard_name']):
-            lon = x
-        if search(LONSTR, attrs['lat']['standard_name']):
-            lon = y
-        if search(LATSTR, attrs['lon']['standard_name']):
-            lat = x
-        if search(LATSTR, attrs['lat']['standard_name']):
-            lat = y
-
-        lataxis = TransientAxis2D(lat,
-                                  axes=(jaxis, iaxis),
-                                  attributes=attrs['lat'],
-                                  id=attrs['lat']['standard_name'])
-        lonaxis = TransientAxis2D(lon,
-                                  axes=(jaxis, iaxis),
-                                  attributes=attrs['lon'],
-                                  id=attrs['lon']['standard_name'])
+        jaxis = TransientVirtualAxis("j",nj)
+        iaxis = TransientVirtualAxis("i",ni)
+
+        if search(LONSTR, attrs['lon']['standard_name']): lon = x
+        if search(LONSTR, attrs['lat']['standard_name']): lon = y
+        if search(LATSTR, attrs['lon']['standard_name']): lat = x
+        if search(LATSTR, attrs['lat']['standard_name']): lat = y
+
+        lataxis = TransientAxis2D(lat, 
+                       axes=(jaxis, iaxis), 
+                       attributes=attrs['lat'], 
+                       id=attrs['lat']['standard_name'])
+        lonaxis = TransientAxis2D(lon, 
+                       axes=(jaxis, iaxis), 
+                       attributes=attrs['lon'], 
+                       id=attrs['lon']['standard_name'])
 
         # Define the combined grid
         grid = TransientCurveGrid(lataxis, lonaxis, id=attrs['gridid'])
@@ -406,7 +380,7 @@ class Mosaic:
         """
 
         slab1, slab2 = self.tile_contacts[tileName][otherTileName]
-
+    
         # Convert to cell centered slabs
         slab1, slab2 = self.getCellCenteredSlab(slab1, slab2)
         d1 = inputData[tileName]
@@ -423,12 +397,11 @@ class Mosaic:
 
         data1, lon1, lat1 = createNewVar(inputData[tileName], slab1)
         data2, lon2, lat2 = createNewVar(inputData[otherTileName], slab2)
-
+        
         # Remove dimensions of size 1.
         shape = []
         for d in data1.shape:
-            if d != 1:
-                shape.append(d)
+            if d != 1: shape.append(d)
 
         newshape = tuple(shape + [2])
         shape = tuple(shape)
@@ -442,22 +415,21 @@ class Mosaic:
         newLat[:, 0] = reshape(lat1[:], shape)
         newLat[:, 1] = reshape(lat2, shape)
         gridid = 'seam_tile%d_tile%d' % (data1.gridIndex, data2.gridIndex)
-        gridAtts = {
-            'lon': {'units': l1.units, 'standard_name': l1.standard_name},
-                    'lat':
-                        {'units': t1.units, 'standard_name': t1.standard_name},
-                    'gridid': gridid}
+        gridAtts = {'lon':{'units':l1.units, 'standard_name':l1.standard_name}, \
+                    'lat':{'units':t1.units, 'standard_name':t1.standard_name}, \
+                    'gridid':gridid}
         seamGrid = self.createSeamGrid(newLon, newLat, gridAtts)
 
         dataAtts = {'gridid': gridid}
-        newData = cdms2.createVariable(newVar,
-                                       axes=seamGrid.getAxisList(),
-                                       grid=seamGrid,
-                                       attributes=d1.attributes,
-                                       id=dataAtts['gridid'])
+        newData = cdms2.createVariable(newVar, 
+                         axes = seamGrid.getAxisList(), 
+                         grid = seamGrid, 
+                         attributes = d1.attributes, 
+                         id = dataAtts['gridid'])
 
         return newData
 
+    
     def getCoordinateNames(self):
         """
         Get the coordinate names for a mosaic
@@ -467,7 +439,7 @@ class Mosaic:
 
     def __repr__(self):
         res = "<Mosaic: '%s',  URI: '%s', mode: '%s', status: '%s' >" % \
-            (self.id, self.uri, self.mode, self._status)
+            ( self.id, self.uri, self.mode, self._status)
         return res
 
     def __call__(self):
@@ -476,8 +448,7 @@ class Mosaic:
     def __del__(self):
         self.lib.nccf_free_mosaic(self.mosaicId_ct)
 
-#
-
+#############################################################################
 
 def test():
     import os.path
@@ -489,7 +460,7 @@ def test():
     """
     parser = OptionParser()
     parser.add_option("-f", "--file", dest="mfile",
-                      help="full path to mosaic file")
+                  help="full path to mosaic file")
 
     options, args = parser.parse_args()
     if not options.mfile:
@@ -503,16 +474,12 @@ def test():
     m = open(options.mfile)
 
     print "\nCoordinate Names"
-    for c in m.coordinate_names:
-        print c
+    for c in m.coordinate_names: print c
 
     print "\nTile Contacts"
-    for t in m.tile_contacts:
-        print "%s -> %s" % (t, m.tile_contacts[t])
+    for t in m.tile_contacts: print "%s -> %s" % (t, m.tile_contacts[t])
     print "\nTile Contacts Complement"
-    for t in m.tile_contacts_compl:
-        print "%s -> %s" % (t, m.tile_contacts_compl[t])
+    for t in m.tile_contacts_compl: print "%s -> %s" % (t, m.tile_contacts_compl[t])
     print
 
-if __name__ == "__main__":
-    test()
+if __name__ == "__main__": test()
diff --git a/Packages/cdms2/Lib/gsStaticVariable.py b/Packages/cdms2/Lib/gsStaticVariable.py
index 5a1910fe2..0332e1415 100644
--- a/Packages/cdms2/Lib/gsStaticVariable.py
+++ b/Packages/cdms2/Lib/gsStaticVariable.py
@@ -3,12 +3,13 @@
 """
 A variable-like object extending over multiple tiles
 Dave Kindig and Alex Pletzer, Tech-X Corp. (2011)
-This code is provided with the hope that it will be useful.
+This code is provided with the hope that it will be useful. 
 No guarantee is provided whatsoever. Use at your own risk.
 """
 
 import operator
 import cdms2
+import types
 from cdms2.error import CDMSError
 from cdms2.hgrid import AbstractCurveGrid, TransientCurveGrid, FileCurveGrid
 from cdms2.coord import TransientAxis2D, TransientVirtualAxis
@@ -17,7 +18,6 @@ from cdms2.coord import FileAxis2D
 from cdms2.gengrid import FileGenericGrid
 from cdms2.fvariable import FileVariable
 from cdms2.axis import FileAxis
-from functools import reduce
 
 try:
     from pycf import libCFConfig as libcf
@@ -25,7 +25,6 @@ except:
 #    raise ImportError, 'Error: could not import pycf'
     pass
 
-
 def createTransientGrid(gFName, coordinates):
     """
     Return the coordinate data associated with variable.
@@ -37,7 +36,7 @@ def createTransientGrid(gFName, coordinates):
 
     fh = cdms2.open(gFName)
     gridid = None
-    if libcf.CF_GRIDNAME in fh.attributes.keys():
+    if libcf.CF_GRIDNAME in fh.attributes.keys(): 
         gridid = getattr(fh, libcf.CF_GRIDNAME)
     xn, yn = coordinates.split()
 
@@ -48,8 +47,8 @@ def createTransientGrid(gFName, coordinates):
     xdim = x.shape
     ydim = y.shape
 
-    if xdim != ydim:
-        raise CDMSError("Dimension of coordinates grids don't match")
+    if xdim != ydim: 
+        raise CDMSError, "Dimension of coordinates grids don't match"
 
     ni = xdim[1]
     nj = xdim[0]
@@ -57,39 +56,32 @@ def createTransientGrid(gFName, coordinates):
     lonstr = 'lon'
     latstr = 'lat'
 
-    if re.search(lonstr, x.standard_name):
-        lon = x
-    if re.search(lonstr, y.standard_name):
-        lon = y
-    if re.search(latstr, x.standard_name):
-        lat = x
-    if re.search(latstr, y.standard_name):
-        lat = y
+    if re.search(lonstr, x.standard_name): lon = x
+    if re.search(lonstr, y.standard_name): lon = y
+    if re.search(latstr, x.standard_name): lat = x
+    if re.search(latstr, y.standard_name): lat = y
 
     # Define the axes, verifying the lon and lat grids
     iaxis = TransientVirtualAxis("i", ni)
     jaxis = TransientVirtualAxis("j", nj)
 
-    lataxis = TransientAxis2D(lat,
-                              axes=(iaxis, jaxis),
-                              attributes={'units': lat.units},
-                              id=lat.standard_name)
-    lonaxis = TransientAxis2D(lon,
-                              axes=(iaxis, jaxis),
-                              attributes={'units': lon.units},
-                              id=lon.standard_name)
+    lataxis = TransientAxis2D(lat, 
+                   axes=(iaxis, jaxis), 
+                   attributes={'units': lat.units}, 
+                   id=lat.standard_name)
+    lonaxis = TransientAxis2D(lon, 
+                   axes=(iaxis, jaxis), 
+                   attributes={'units': lon.units}, 
+                   id=lon.standard_name)
 
     # Define the combined grid
     grid = TransientCurveGrid(lataxis, lonaxis, id=gridid)
     return grid
 
-
 class StaticVariable:
-
     """
     Constructor
     """
-
     def __init__(self, StaticVariable, hostObj, varName):
         """
         Constructor - Contains methods applicable to both file and transient static variables
@@ -97,12 +89,12 @@ class StaticVariable:
         @param hostObj The host file object
         @param varName for the id
         """
-        StaticVariable.id = varName
+        StaticVariable.id     = varName
         StaticVariable.nGrids = hostObj.nGrids
 
         StaticVariable.vars = []
         if StaticVariable.nGrids > 0:
-            StaticVariable.vars = [None] * StaticVariable.nGrids
+            StaticVariable.vars = [None]*StaticVariable.nGrids
 
     def __getitem__(self, gridIndex):
         """
@@ -160,13 +152,10 @@ class StaticVariable:
             return self.vars[0].typecode()
         return None
 
-
 class StaticFileVariable(StaticVariable):
-
     """
     Static variable extending over multiple grid files
     """
-
     def __init__(self, hostObj, varName):
         """
         Create a list of file variable with grid attached
@@ -185,11 +174,8 @@ class StaticFileVariable(StaticVariable):
             gn = gridFilenames[gridIndex]
 
             # Open the files
-            f = cdms2.open(fn, mode)
-                           # Need f and u because they serve slightly different
-                           # purposes
-            u = CdunifFile(fn, mode)
-                           # f.axes exists while axes is not a part of u
+            f = cdms2.open(fn, mode)   # Need f and u because they serve slightly different purposes
+            u = CdunifFile(fn, mode)   # f.axes exists while axes is not a part of u
 #            u.variables[varName].gridIndex = gridIndex
             g = CdunifFile(gn, mode)
 
@@ -202,22 +188,20 @@ class StaticFileVariable(StaticVariable):
             coordsaux = f._convention_.getAxisAuxIds(u.variables, coords1d)
 
             # Convert the variable into a FileVariable
-            f.variables[varName] = FileVariable(
-                f, varName, u.variables[varName])
+            f.variables[varName] = FileVariable(f, varName, u.variables[varName])
 
             # Add the coordinates to the file
             for coord in coords:
                 f.variables[coord] = g.variables[coord]
                 f.variables[coord] = FileAxis2D(f, coord, g.variables[coord])
-
+            
             # Build the axes
             for key in f.axes.keys():
                 f.axes[key] = FileAxis(f, key, None)
 
             # Set the boundaries
             for coord in coords:
-                bounds = f._convention_.getVariableBounds(
-                    f, f.variables[coord])
+                bounds = f._convention_.getVariableBounds(f, f.variables[coord])
                 f.variables[coord].setBounds(bounds)
 
             # Initialize the domain
@@ -225,35 +209,26 @@ class StaticFileVariable(StaticVariable):
                 var.initDomain(f.axes)
 
             # Add the grid
-            gridkey, lat, lon = f.variables[
-                varName].generateGridkey(f._convention_, f.variables)
+            gridkey, lat, lon = f.variables[varName].generateGridkey(f._convention_, f.variables)
             gridname = "grid_%dx%d" % lat.shape
-# grid = FileGenericGrid(lat, lon, gridname, parent = f, maskvar = None)
-            grid = FileCurveGrid(
-                lat,
-                lon,
-                gridname,
-                parent=f,
-                maskvar=None)
+#            grid = FileGenericGrid(lat, lon, gridname, parent = f, maskvar = None)
+            grid = FileCurveGrid(lat, lon, gridname, parent = f, maskvar = None)
             f.variables[varName]._grid_ = grid
             self.vars[gridIndex] = f.variables[varName]
         self._repr_string = "StaticFileVariable"
 
-    def listall(self, all=None):
+    def listall(self, all = None):
         """
         Gain access to cdms2 listall method. Requires a StaticFileVariable
         @param all
         @returns list
         """
-        return self[0].listall(all=all)
-
+        return self[0].listall(all = all)
 
 class StaticTransientVariable(StaticVariable):
-
     """
     Static variable extending over multiple grid files
     """
-
     def __init__(self, hostObj, varName):
         """
         Constructor
@@ -273,17 +248,15 @@ class StaticTransientVariable(StaticVariable):
             # name of the file containing coordinate data
             gFName = gridFilenames[gridIndex]
 
-            fh = cdms2.open(fName, hostObj=hostObj)
+            fh = cdms2.open(fName, hostObj = hostObj)
             gh = cdms2.open(gFName)
 
             vr = fh(varName)
-            vr.gridIndex = gridIndex
+            vr.gridIndex    = gridIndex
 
             grid = None
             if 'coordinates' in vr.attributes.keys():
-                grid = createTransientGrid(
-                    gFName,
-                    vr.attributes['coordinates'])
+                grid = createTransientGrid(gFName, vr.attributes['coordinates'])
             atts = dict(vr.attributes)
             atts.update(gh.attributes)
             if libcf.CF_GRIDNAME in fh.attributes.keys():
@@ -291,19 +264,18 @@ class StaticTransientVariable(StaticVariable):
 
             # Create the variable
             if grid:
-                var = cdms2.createVariable(vr,
-                                           axes=grid.getAxisList(),
-                                           grid=grid,
-                                           attributes=atts,
-                                           id=vr.standard_name)
-            else:
+                var = cdms2.createVariable(vr, 
+                                axes = grid.getAxisList(), 
+                                grid = grid, 
+                                attributes = atts, 
+                                id = vr.standard_name)
+            else: 
                 var = vr
             self.vars[gridIndex] = var
         self._repr_string = "StaticTransientVariable"
 
-
 def test():
     pass
 
-if __name__ == '__main__':
-    test()
+if __name__ == '__main__': test()
+ 
diff --git a/Packages/cdms2/Lib/gsTimeVariable.py b/Packages/cdms2/Lib/gsTimeVariable.py
index 0a0c4d571..1f4268fb7 100644
--- a/Packages/cdms2/Lib/gsTimeVariable.py
+++ b/Packages/cdms2/Lib/gsTimeVariable.py
@@ -23,13 +23,10 @@ from cdms2.fvariable import FileVariable
 from cdms2.axis import FileAxis, TransientAxis
 from cdms2.axis import concatenate as axisConcatenate
 
-
 class TimeAggregatedFileVariable:
-
     """
     Constructor Class for aggregating a time dependant variable across files.
     """
-
     def __init__(self, gridIndex, listOfFVs, hostObj):
         """
         @param gridIndex Index of requested grid
@@ -39,12 +36,10 @@ class TimeAggregatedFileVariable:
         self.fvs = listOfFVs
         self.gridIndex = gridIndex
         self.hostObj = hostObj
-        self.nTimeStepFiles = hostObj.nTimeSliceFiles * \
-            hostObj.nTimeDataFiles * hostObj.nGrids
+        self.nTimeStepFiles = hostObj.nTimeSliceFiles * hostObj.nTimeDataFiles * hostObj.nGrids
         it = self.getTimeAxisIndex(self.fvs[0].getAxisList())
         self.nTimeStepsPerFile = (self.fvs[0].shape)[it]
-        self.nTimeStepsPerVariable = hostObj.nTimeSliceFiles * \
-            self.nTimeStepsPerFile
+        self.nTimeStepsPerVariable = hostObj.nTimeSliceFiles * self.nTimeStepsPerFile
 
     def __call__(self, *args, **kwargs):
         """
@@ -70,7 +65,7 @@ class TimeAggregatedFileVariable:
         @param slc Integer, slice or tuple of slices. If tuple 0 is time
         @return sliced variable
         """
-
+        
         if isinstance(slc, int):
             # return FileVariable
             return self.fvs[slc]
@@ -81,12 +76,10 @@ class TimeAggregatedFileVariable:
             axes = self.fvs[0].getAxisList()
             timeAxisIndex = self.getTimeAxisIndex(axes)
             if timeAxisIndex is None:
-                CDMSError, "No time axis in :\n" + axes
+                CDMSError, "No time axis in :\n"  + axes
             if isinstance(slc[timeAxisIndex], slice):
-                (fileInds, timeStepInds) = self.getTimeFileIndex(
-                    slc[timeAxisIndex])
-                tv = self.createTransientVariableFromIndices(
-                    fileInds, timeStepInds)
+                (fileInds, timeStepInds) = self.getTimeFileIndex(slc[timeAxisIndex])
+                tv = self.createTransientVariableFromIndices(fileInds, timeStepInds)
                 newslc = self.buildSlice(slc, tv.getAxisList())
                 return tv[newslc]
             elif isinstance(slc[timeAxisIndex], int):
@@ -94,15 +87,13 @@ class TimeAggregatedFileVariable:
                 timeIndex = slc[timeAxisIndex] % nTSF
 
                 # Get just the file needed for the index slice requested.
-                tv = self.createTransientVariableFromIndices(
-                    fileIndex, timeIndex)
+                tv = self.createTransientVariableFromIndices(fileIndex, timeIndex)
                 newslc = self.buildSlice(slc, axes)
                 return tv[newslc]
 
         elif isinstance(slc, slice):
             (fileInds, timeStepInds) = self.getTimeFileIndex(slc)
-            tv = self.createTransientVariableFromIndices(
-                fileInds, timeStepInds)
+            tv = self.createTransientVariableFromIndices(fileInds, timeStepInds)
             return tv
 
     def __len__(self):
@@ -124,10 +115,8 @@ class TimeAggregatedFileVariable:
         timI2 = []
         filI2 = []
 
-        if timeslc.step is None:
-            step = 1
-        else:
-            step = timeslc.step
+        if timeslc.step is None: step = 1
+        else: step = timeslc.step
         stop = timeslc.stop
         if timeslc.stop >= nTSV:
             stop = nTSV
@@ -139,7 +128,7 @@ class TimeAggregatedFileVariable:
                 timI1.append(tt[indx])
                 filI1.append(ii[indx])
             else:
-                if ii[indx] == ii[indx - 1]:
+                if ii[indx] == ii[indx-1]:
                     timI1.append(tt[indx])
                     filI1.append(ii[indx])
                 else:
@@ -163,8 +152,7 @@ class TimeAggregatedFileVariable:
         @return the index - None if time not found
         """
         for indx, axis in enumerate(inAxes):
-            if axis.isTime():
-                return indx
+            if axis.isTime(): return indx
             return None
 
     def buildSlice(self, inslc, inAxes):
@@ -180,9 +168,8 @@ class TimeAggregatedFileVariable:
         newslc = []
         for cslc, axis in zip(inslc, inAxes):
             if axis.isTime():
-                if isinstance(cslc, int):
-                    # Omit slice - the new variable has only the shape of the
-                    # grid.
+                if type(cslc) is int:
+                    # Omit slice - the new variable has only the shape of the grid.
                     continue
                 else:
                     newslc.append(slice(None, None, None))
@@ -226,13 +213,13 @@ class TimeAggregatedFileVariable:
         Aggregate a time file variable. Start and End Indices use slice notation.
         @param fileIndices the file indices to aggregate across
         @param timeIndices which time steps with in each file
-        @return aggregated time dep. variable. Has shape of full grid.
+        @return aggregated time dep. variable. Has shape of full grid. 
                 Subset the grid after exiting.
         """
         from numpy import reshape
         firsttime = True
         nTSF = self.nTimeStepsPerFile
-        if not isinstance(fileIndices, int):
+        if type(fileIndices) is not int:
             for files, times in zip(fileIndices, timeIndices):
                 for indx, file in enumerate(files):
                     # Should make these slices.
@@ -244,21 +231,19 @@ class TimeAggregatedFileVariable:
                     # Insert the new time axis.
                     axisTime = self.fvs[file].getTime()
                     timeAxis = TransientAxis([file * nTSF + times[indx]],
-                                             attributes=axisTime.attributes,
-                                             id=axisTime.id)
-                    axes = self.buildAxes(
-                        timeAxis,
-                        self.fvs[file].getAxisList())
+                                              attributes = axisTime.attributes,
+                                              id = axisTime.id)
+                    axes = self.buildAxes(timeAxis, self.fvs[file].getAxisList())
 
                     # shape --> tm1.shape = (1, :, :)
                     tm1 = reshape(cvar, tuple([1] + list(cvar.shape)))
 
                     # Attach needed items
                     var = cdms2.createVariable(tm1,
-                                               axes=axes,
-                                               grid=grid,
-                                               attributes=atts,
-                                               id=cvar.standard_name)
+                            axes = axes,
+                            grid = grid,
+                            attributes = atts,
+                            id = cvar.standard_name)
 
                     # Create cdms2 transient variable
                     if firsttime:
@@ -268,31 +253,26 @@ class TimeAggregatedFileVariable:
                         # insert the new time axis.
                         taA = new.getTime()
                         newTime = axisConcatenate((taA, timeAxis),
-                                                  attributes=axisTime.attributes,
-                                                  id=axisTime.id)
-                        axes = self.buildAxes(
-                            newTime,
-                            self.fvs[file].getAxisList())
+                                                  attributes = axisTime.attributes,
+                                                  id = axisTime.id)
+                        axes = self.buildAxes(newTime, self.fvs[file].getAxisList())
 
                         tmp = MV2concatenate((new, var))
                         new = cdms2.createVariable(tmp,
-                                                   axes=axes,
-                                                   grid=grid,
-                                                   attributes=atts,
-                                                   id=cvar.standard_name)
+                                axes = axes,
+                                grid = grid,
+                                attributes = atts,
+                                id = cvar.standard_name)
 
         else:
             new = self.fvs[fileIndices][timeIndices]
 
         return new
 
-
 class TimeFileVariable:
-
     """
     Construct an aggregated time dependant variable.
     """
-
     def __init__(self, hostObj, varName):
         """
         Create a list of file variable with grid attached
@@ -317,12 +297,8 @@ class TimeFileVariable:
 
                 # Open the files
                 fn = hostObj.timeVars[varName][gridIndex][timeFileIndex]
-                f = cdms2.open(
-                    fn,
-                    mode)   # Need f and u because they serve slightly different purposes
-                u = CdunifFile(
-                    fn,
-                    mode)   # f.axes exists while axes is not a part of u
+                f = cdms2.open(fn, mode)   # Need f and u because they serve slightly different purposes
+                u = CdunifFile(fn, mode)   # f.axes exists while axes is not a part of u
 #                u.variables[varName].gridIndex = gridIndex
 
                 # Turn the coordinates into a list
@@ -334,14 +310,12 @@ class TimeFileVariable:
                 coordsaux = f._convention_.getAxisAuxIds(u.variables, coords1d)
 
                 # Convert the variable into a FileVariable
-                f.variables[varName] = FileVariable(
-                    f, varName, u.variables[varName])
+                f.variables[varName] = FileVariable(f, varName, u.variables[varName])
 
                 # Add the coordinates to the file
                 for coord in coords:
                     f.variables[coord] = g.variables[coord]
-                    f.variables[coord] = FileAxis2D(
-                        f, coord, g.variables[coord])
+                    f.variables[coord] = FileAxis2D(f, coord, g.variables[coord])
 
                 # Build the axes
                 for key in f.axes.keys():
@@ -349,8 +323,7 @@ class TimeFileVariable:
 
                 # Set the boundaries
                 for coord in coords:
-                    bounds = f._convention_.getVariableBounds(
-                        f, f.variables[coord])
+                    bounds = f._convention_.getVariableBounds(f, f.variables[coord])
                     f.variables[coord].setBounds(bounds)
 
                 # Initialize the domain
@@ -358,16 +331,10 @@ class TimeFileVariable:
                     var.initDomain(f.axes)
 
                 # Add the grid
-                gridkey, lat, lon = f.variables[
-                    varName].generateGridkey(f._convention_, f.variables)
+                gridkey, lat, lon = f.variables[varName].generateGridkey(f._convention_, f.variables)
                 gridname = ("grid%d_" % gridIndex) + "%dx%d" % lat.shape
-# grid = FileGenericGrid(lat, lon, gridname, parent = f, maskvar = None)
-                grid = FileCurveGrid(
-                    lat,
-                    lon,
-                    gridname,
-                    parent=f,
-                    maskvar=None)
+#                grid = FileGenericGrid(lat, lon, gridname, parent = f, maskvar = None)
+                grid = FileCurveGrid(lat, lon, gridname, parent = f, maskvar = None)
                 f.variables[varName]._grid_ = grid
                 vars.append(f.variables[varName])
 
@@ -376,23 +343,23 @@ class TimeFileVariable:
 
         self._repr_string = "TimeFileVariable"
 
-    def listall(self, all=None):
+    def listall(self, all = None):
         """
         Gain access to cdms2 listall method. Requires a TimeFileVariable
         @param all
         @returns list
         """
-        return self[0][0].listall(all=all)
+        return self[0][0].listall(all = all)
 
-    def showall(self, all=None, device=None):
+    def showall(self, all = None, device = None):
         """
         Gain access to cdms2 showall method
         Requires a TimeFileVariable
         @param all
-        @param device
+        @param device 
         @returns list
         """
-        return self[0][0][:].showall(all=all, device=device)
+        return self[0][0][:].showall(all = all, device = device)
 
     def __getitem__(self, gridIndex):
         """
@@ -400,13 +367,11 @@ class TimeFileVariable:
         """
         return self.vars[gridIndex]
 
-#
-# DEPRECIATED - Testing required to fully remove #################
-#
-
+###############################################################################
+############## DEPRECIATED - Testing required to fully remove #################
+###############################################################################
 
 class TimeTransientVariable:
-
     def __init__(self, hostObj, varName, **slicekwargs):
         """
         Constructor
@@ -437,18 +402,15 @@ class TimeTransientVariable:
 
                 for timeFileIndex in range(hostObj.nTimeDataFiles):
 
-                    fName = hostObj.timeDepVars[
-                        varName][
-                            gridIndex][
-                                timeFileIndex]
+                    fName = hostObj.timeDepVars[varName][gridIndex][timeFileIndex]
                     fh = cdms2.open(fName, hostObj=hostObj)
 
                     # TransientVariable
                     var = fh(varName, **slicekwargs)
 
                     # Attach the grid to the variable
-                    grid = cdms2.gsStaticVariable.createTransientGrid(gFName,
-                                                                      var.attributes['coordinates'])
+                    grid = cdms2.gsStaticVariable.createTransientGrid(gFName, \
+                                         var.attributes['coordinates'])
                     axis0 = var.getAxis(0)
                     gridaxes = grid.getAxisList()
                     axes = [axis0] + list(gridaxes)
@@ -458,21 +420,21 @@ class TimeTransientVariable:
                     # Create cdms2 transient variable
                     if timeFileIndex == 0:
                         new = cdms2.createVariable(var,
-                                                   axes=axes,
-                                                   grid=grid,
-                                                   attributes=atts,
-                                                   id=var.standard_name)
+                                axes = axes,
+                                grid = grid,
+                                attributes = atts,
+                                id = var.standard_name)
                     else:
-                        tmp = MV2concatenate((new, var))
+                        tmp =MV2concatenate((new, var))
                         axis0 = tmp.getAxis(0)
                         gridaxes = grid.getAxisList()
                         axes = [axis0, gridaxes[0], gridaxes[1]]
 #                        new.append(tmp)
                         new = cdms2.createVariable(tmp,
-                                                   axes=axes,
-                                                   grid=grid,
-                                                   attributes=atts,
-                                                   id=var.standard_name)
+                                axes = axes,
+                                grid = grid,
+                                attributes = atts,
+                                id = var.standard_name)
                     fh.close()
 
                 # Add the variable to the index
@@ -481,10 +443,10 @@ class TimeTransientVariable:
         self._repr_string = "TimeTransientVariable"
 
 
-#
+###################################################################
 
 def test():
     pass
 
-if __name__ == '__main__':
-    test()
+if __name__ == '__main__': test()
+
diff --git a/Packages/cdms2/Lib/gui.py b/Packages/cdms2/Lib/gui.py
index 44fab4cb6..65e13cd8c 100644
--- a/Packages/cdms2/Lib/gui.py
+++ b/Packages/cdms2/Lib/gui.py
@@ -5,7 +5,6 @@ from cdms import cache
 
 _progressParent = None                  # Parent frame of progress gui
 
-
 def setProgressParent(parent):
     """
     Enable the FTP progress GUI, and set the parent frame.
@@ -13,9 +12,7 @@ def setProgressParent(parent):
     """
     global _progressParent
     _progressParent = parent
-    cache.useWindow()
-                    # Notify cache module that window dialogs should be used.
-
+    cache.useWindow()                   # Notify cache module that window dialogs should be used.
 
 def getProgressParent():
     """
@@ -24,7 +21,6 @@ def getProgressParent():
     """
     return _progressParent
 
-
 def updateProgressGui(blocknum, blocksize, size, prog):
     """
     Callback function for the FTP progress dialog.
@@ -35,28 +31,25 @@ def updateProgressGui(blocknum, blocksize, size, prog):
 
     Return: 0 to signal that a cancel has been received, 1 to continue reading.
     """
-    sizekb = size / 1024
-    percent = min(100, int(100.0 * float(blocknum * blocksize) / float(size)))
-    if percent < 100:
-        noInterrupt = prog.Update(
-            percent, "Read: %3d%% of %dK" %
-            (percent, sizekb))
+    sizekb = size/1024L
+    percent = min(100,int(100.0*float(blocknum*blocksize)/float(size)))
+    if percent<100:
+        noInterrupt = prog.Update(percent,"Read: %3d%% of %dK"%(percent,sizekb))
     else:
         noInterrupt = 1                    # Don't interrupt - finish up cleanly
         prog.Destroy()
-    if noInterrupt == 0:
+    if noInterrupt==0:
         prog.Destroy()
     return noInterrupt
 
-
 class CdProgressDialog(wxProgressDialog):
 
     # <frame> is the parent frame.
     # filename is the file being read.
-
     def __init__(self, frame, filename):
-        wxProgressDialog.__init__(self, "FTP: %s" % filename,
-                                  "Connecting ...",
-                                  100,
-                                  frame,
-                                  wxPD_CAN_ABORT | wxPD_APP_MODAL | wxPD_REMAINING_TIME)
+        wxProgressDialog.__init__(self,"FTP: %s"%filename,
+                         "Connecting ...",
+                         100,
+                         frame,
+                         wxPD_CAN_ABORT | wxPD_APP_MODAL | wxPD_REMAINING_TIME)
+
diff --git a/Packages/cdms2/Lib/hgrid.py b/Packages/cdms2/Lib/hgrid.py
index aa09ca8c5..56758ad72 100644
--- a/Packages/cdms2/Lib/hgrid.py
+++ b/Packages/cdms2/Lib/hgrid.py
@@ -1,5 +1,5 @@
-# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
-# Further modified to be pure new numpy June 24th 2008
+## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by 
+## Further modified to be pure new numpy June 24th 2008
 
 """CDMS HorizontalGrid objects"""
 
@@ -7,20 +7,19 @@ import numpy
 import cdms2
 import os
 import os.path
-# import PropertiedClasses
-from .error import CDMSError
-from .grid import AbstractGrid, LongitudeType, LatitudeType, VerticalType, TimeType, CoordTypeToLoc
-from .coord import TransientVirtualAxis
-from .axis import getAutoBounds, allclose
-import bindex, _bindex
-from functools import reduce
+## import PropertiedClasses
+from error import CDMSError
+from grid import AbstractGrid, LongitudeType, LatitudeType, VerticalType, TimeType, CoordTypeToLoc
+from coord import TransientVirtualAxis
+from axis import getAutoBounds, allclose
+import bindex,_bindex
 
 MethodNotImplemented = "Method not yet implemented"
 
 def _flatten(boundsar):
     boundsshape = boundsar.shape
-    if len(boundsshape) > 2:
-        newshape = (reduce((lambda x, y: x*y), boundsshape[:-1], 1), boundsshape[-1])
+    if len(boundsshape)>2:
+        newshape = (reduce((lambda x,y: x*y), boundsshape[:-1], 1), boundsshape[-1])
         boundsar.shape = newshape
     return boundsar
 
@@ -41,17 +40,17 @@ class AbstractHorizontalGrid(AbstractGrid):
 
     # Generate default bounds
     def genBounds(self):
-        raise CDMSError(MethodNotImplemented)
+        raise CDMSError, MethodNotImplemented
 
     # Get the n-th axis. naxis is 0 or 1.
     def getAxis(self, naxis):
-        raise CDMSError(MethodNotImplemented)
+        raise CDMSError, MethodNotImplemented
 
     def getBounds(self):
         """Get the grid cell boundaries, as a tuple (latitudeBounds, longitudeBounds)
         """
         latbnds, lonbnds = (self._lataxis_.getExplicitBounds(), self._lonaxis_.getExplicitBounds())
-        if (latbnds is None or lonbnds is None) and getAutoBounds() in [1, 2]:
+        if (latbnds is None or lonbnds is None) and getAutoBounds() in [1,2]:
             nlatbnds, nlonbnds = self.genBounds()
             if latbnds is None:
                 latbnds = nlatbnds
@@ -77,27 +76,27 @@ class AbstractHorizontalGrid(AbstractGrid):
 
     def getMesh(self):
         """Get the mesh array used by the meshfill plot."""
-        raise CDMSError(MethodNotImplemented)
+        raise CDMSError, MethodNotImplemented
 
     def getWeightsArray(self):
         """Return normalized area weights, as an array of the same
         shape as the grid.
         """
-        raise CDMSError(MethodNotImplemented)
+        raise CDMSError, MethodNotImplemented
 
     def listall (self, all=None):
-        result = []
+        result=[]
         result.append('Grid has Python id %s.' % hex(id(self)))
         return result
 
-    def setMask(self, mask, permanent=0):
+    def setMask(self,mask,permanent=0):
         self._maskVar_ = mask
 
     def subGridRegion(self, latRegion, lonRegion):
-        raise CDMSError(MethodNotImplemented)
+        raise CDMSError, MethodNotImplemented
 
     def hasCoordType(self, coordType):
-        return ((coordType == LatitudeType) or (coordType == LongitudeType))
+        return ((coordType==LatitudeType) or (coordType==LongitudeType))
 
     def checkConvex(self):
         """Check that each cell of the grid is convex in lon-lat space, with nodes defined counter-clockwise.
@@ -117,10 +116,10 @@ class AbstractHorizontalGrid(AbstractGrid):
         for n0 in range(nnode):
             n1 = (n0+1)%nnode
             n2 = (n1+1)%nnode
-            vec0lon = lonb[:, n1] - lonb[:, n0]
-            vec0lat = latb[:, n1] - latb[:, n0]
-            vec1lon = lonb[:, n2] - lonb[:, n1]
-            vec1lat = latb[:, n2] - latb[:, n1]
+            vec0lon = lonb[:,n1] - lonb[:,n0]
+            vec0lat = latb[:,n1] - latb[:,n0]
+            vec1lon = lonb[:,n2] - lonb[:,n1]
+            vec1lat = latb[:,n2] - latb[:,n1]
             cross = vec0lon*vec1lat - vec0lat*vec1lon
 
             mask = where(less(cross, 0.0), 1, 0)
@@ -171,24 +170,24 @@ class AbstractHorizontalGrid(AbstractGrid):
             for node in range(2*nnode):
                 n0 = node%nnode
                 n1 = (n0+1)%nnode
-                vec0lon = lonb2[k, n1]-lonb2[k, n0]
-                if vec0lon > threshold:
-                    lonb2[k, n1] -= 360.0
-                elif vec0lon < -threshold:
-                    lonb2[k, n1] += 360.0
+                vec0lon = lonb2[k,n1]-lonb2[k,n0]
+                if vec0lon>threshold:
+                    lonb2[k,n1] -= 360.0
+                elif vec0lon<-threshold:
+                    lonb2[k,n1] += 360.0
 
             # If the cross-product test still fails, restore
             # the original values and add to the nonConvexCells list
             for n0 in range(nnode):
                 n1 = (n0+1)%nnode
                 n2 = (n1+1)%nnode
-                vec0lon = lonb2[k, n1] - lonb2[k, n0]
-                vec0lat = latb2[k, n1] - latb2[k, n0]
-                vec1lon = lonb2[k, n2] - lonb2[k, n1]
-                vec1lat = latb2[k, n2] - latb2[k, n1]
+                vec0lon = lonb2[k,n1] - lonb2[k,n0]
+                vec0lat = latb2[k,n1] - latb2[k,n0]
+                vec1lon = lonb2[k,n2] - lonb2[k,n1]
+                vec1lat = latb2[k,n2] - latb2[k,n1]
                 cross = vec0lon*vec1lat - vec0lat*vec1lon
 
-                if cross < 0:
+                if cross<0:
                     lonb2[k] = savelons
                     newbadcells.append(nonConvexCells[k])
                     break
@@ -208,7 +207,7 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
         """Create a curvilinear grid.
         """
         if latAxis.shape != lonAxis.shape:
-            raise CDMSError('Latitude and longitude axes must have the same shape.')
+            raise CDMSError, 'Latitude and longitude axes must have the same shape.'
         AbstractHorizontalGrid.__init__(self, latAxis, lonAxis, id, maskvar, tempmask, node)
         self._index_ = None
 
@@ -218,7 +217,7 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
         return TransientCurveGrid(newlat, newlon, id=self.id)
 
     def __repr__(self):
-        return "<CurveGrid, id: %s, shape: %s>"%(self.id, repr(self.shape))
+        return "<CurveGrid, id: %s, shape: %s>"%(self.id, `self.shape`)
     __str__ = __repr__
 
     def getMesh(self, transpose=None):
@@ -227,20 +226,20 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
         latbounds and lonbounds according to the tuple, (1,0,2) in this case.
         """
         if self._mesh_ is None:
-            LAT = 0
-            LON = 1
+            LAT=0
+            LON=1
             latbounds, lonbounds = self.getBounds()
-# following work aronud a numpy.ma bug
-# latbounds=latbounds.filled()
-# lonbounds=lonbounds.filled()
+##             ## following work aronud a numpy.ma bug
+##             latbounds=latbounds.filled()
+##             lonbounds=lonbounds.filled()
             if latbounds is None or lonbounds is None:
-                raise CDMSError('No boundary data is available for grid %s'%self.id)
-            if (transpose is not None) and (transpose[1] == 0):
-                latbounds = numpy.transpose(latbounds, (1, 0, 2))
-                lonbounds = numpy.transpose(lonbounds, (1, 0, 2))
-            mesh = numpy.zeros((self.size(), 2, latbounds.shape[-1]), latbounds.dtype.char)
-            mesh[:, LAT,:] = numpy.reshape(latbounds, (self.size(), latbounds.shape[-1]))
-            mesh[:, LON,:]  = numpy.reshape(lonbounds, (self.size(), latbounds.shape[-1]))
+                raise CDMSError, 'No boundary data is available for grid %s'%self.id
+            if (transpose is not None) and (transpose[1]==0):
+                latbounds = numpy.transpose(latbounds, (1,0,2))
+                lonbounds = numpy.transpose(lonbounds, (1,0,2))
+            mesh = numpy.zeros((self.size(),2,latbounds.shape[-1]),latbounds.dtype.char)
+            mesh[:,LAT,:] = numpy.reshape(latbounds,(self.size(),latbounds.shape[-1]))
+            mesh[:,LON,:]  = numpy.reshape(lonbounds,(self.size(),latbounds.shape[-1]))
             self._mesh_ = mesh
         return self._mesh_
 
@@ -292,9 +291,9 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
         mask.shape = (ngrid,)
 
         clat = numpy.ma.filled(copy.copy(blat))
-        clat.shape = (ngrid, 4)
+        clat.shape = (ngrid,4)
         clon = numpy.ma.filled(copy.copy(blon))
-        clon.shape = (ngrid, 4)
+        clon.shape = (ngrid,4)
 
         # Write the file
         if gridTitle is None:
@@ -310,12 +309,12 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
         gridcenterlon.units = "degrees"
         gridimask = cufile.createVariable("grid_imask", 'i', ("grid_size",))
         gridimask.units = "unitless"
-        gridcornerlat = cufile.createVariable("grid_corner_lat", 'd', ("grid_size", "grid_corners"))
+        gridcornerlat = cufile.createVariable("grid_corner_lat", 'd', ("grid_size","grid_corners"))
         gridcornerlat.units = "degrees"
-        gridcornerlon = cufile.createVariable("grid_corner_lon", 'd', ("grid_size", "grid_corners"))
+        gridcornerlon = cufile.createVariable("grid_corner_lon", 'd', ("grid_size","grid_corners"))
         gridcornerlon.units = "degrees"
 
-        griddims[:] = numpy.array([nj, ni], numpy.int32)
+        griddims[:] = numpy.array([nj,ni], numpy.int32)
         gridcenterlat[:] = centerLat
         gridcenterlon[:] = centerLon
         gridimask[:] = mask
@@ -325,9 +324,9 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
     def toGenericGrid(self, gridid=None):
 
         import copy
-        from .auxcoord import TransientAuxAxis1D
-        from .coord import TransientVirtualAxis
-        from .gengrid import TransientGenericGrid
+        from auxcoord import TransientAuxAxis1D
+        from coord import TransientVirtualAxis
+        from gengrid import TransientGenericGrid
 
         lat = numpy.ma.filled(self._lataxis_)
         latunits = self._lataxis_.units
@@ -346,11 +345,11 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
             mask.shape = (ngrid,)
 
         cornerLat = numpy.ma.filled(copy.copy(blat))
-        cornerLat.shape = (ngrid, 4)
+        cornerLat.shape = (ngrid,4)
         cornerLon = numpy.ma.filled(copy.copy(blon))
-        cornerLon.shape = (ngrid, 4)
+        cornerLon.shape = (ngrid,4)
 
-        iaxis = TransientVirtualAxis("cell", ngrid)
+        iaxis = TransientVirtualAxis("cell",ngrid)
 
         lataxis = TransientAuxAxis1D(centerLat, axes=(iaxis,), bounds=cornerLat,
                                   attributes={'units':latunits}, id="latitude")
@@ -382,21 +381,21 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
         The file, normally a CdmsFile, should already be open for writing
         and will be closed."""
         import time
-        from .tvariable import TransientVariable
+        from tvariable import TransientVariable
         
         # Set attributes
-        if ( hasattr(file, 'Conventions') ):
-            if ( file.Conventions.find('Gridspec') < 0 ):
+        if ( hasattr(file,'Conventions') ):
+            if ( file.Conventions.find('Gridspec')<0 ):
                 file.Conventions = file.Conventions + ' Gridspec-0.0'
         else:
             file.Conventions = 'Gridspec-0.0'
-        if ( hasattr(file, 'gs_filetypes') ):
-            if ( file.gs_filetypes.find('Curvilinear_Tile') < 0 ):
+        if ( hasattr(file,'gs_filetypes') ):
+            if ( file.gs_filetypes.find('Curvilinear_Tile')<0 ):
                 file.gs_filetypes = file.gs_filetypes + ' Curvilinear_Tile'
         else:
             file.gs_filetypes = 'Curvilinear_Tile'
-        t = time.time()
-        id = int((t-int(t))*1.0e9)
+        t=time.time()
+        id=int((t-int(t))*1.0e9)
         file.gs_id = id
         file.gs_originalfilename = os.path.basename( file.id )
 
@@ -412,19 +411,19 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
                        getattr( file, 'history', '' ) + newhistory
 
         # former tile variable and attributes
-        if ( hasattr(self, 'long_name') and self.long_name != None ):
+        if ( hasattr(self,'long_name') and self.long_name!=None ):
             file.long_name = self.long_name
         else:
             file.long_name = 'gridspec_tile'
         # gs_geometryType is no longer required of Gridspec files, but as yet
         # there is no other proposal for describing the geometry (July 2010)
-        if ( hasattr(self, 'gs_geometryType') and self.gs_geometryType != None):
+        if ( hasattr(self,'gs_geometryType') and self.gs_geometryType!=None):
             file.gs_geometryType = self.gs_geometryType
         else:
             file.gs_geometryType = 'spherical'
         # gs_discretizationType is no longer required of Gridspec files, but it's
         # harmless and may come in useful
-        if ( hasattr(self, 'gs_discretizationType') and self.gs_discretizationType != None ):
+        if ( hasattr(self,'gs_discretizationType') and self.gs_discretizationType!=None ):
             file.gs_discretizationType = self.gs_discretizationType
         else:
             file.gs_discretizationType = 'logically_rectangular'
@@ -435,11 +434,11 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
         # Set up and write variables.  When written, cdms writes not only the arrays
         # but also their coordinates, e.g. gs_nip.
         
-        x = self._lonaxis_
-        if ( not hasattr(x, 'units') ):
+        x=self._lonaxis_
+        if ( not hasattr(x,'units') ):
             print "Warning, no units found for longitude"
             x.units = 'degree_east'
-        if ( not hasattr(x, 'standard_name') ):
+        if ( not hasattr(x,'standard_name') ):
             print "Warning, no standard_name found for longitude axis"
             x.standard_name = 'longitude'
         if ( x.standard_name == 'geographic_longitude'):
@@ -449,11 +448,11 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
         # _lonaxis_ is a TransientAxis2D, hence a TransientVariable
         # But I don't know where the attribute _TransientVariable__domain comes from
         
-        y = self._lataxis_
-        if ( not hasattr(y, 'units') ):
+        y=self._lataxis_
+        if ( not hasattr(y,'units') ):
             print "Warning, no units found for latitude"
             y.units = 'degree_north'
-        if ( not hasattr(y, 'standard_name') ):
+        if ( not hasattr(y,'standard_name') ):
             print "Warning, no standard_name found for latitude axis"
             y.standard_name = 'latitude'
         if ( y.standard_name == 'geographic_latitude'):
@@ -461,18 +460,18 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
             y.standard_name = 'latitude'
         y.id = file.gs_latv
 
-        if( not hasattr(x, '_TransientVariable__domain') ):
+        if( not hasattr(x,'_TransientVariable__domain') ):
             # There probably doesn't exist enough information to write a correct
             # grid, but this will help.
             x._TransientVariable__domain = [ (x,), (y,) ]
-        x._TransientVariable__domain[0][0].id = 'gs_njp'
-        x._TransientVariable__domain[1][0].id = 'gs_nip'
-        if ( not hasattr(y, '_TransientVariable__domain') ) :
+        x._TransientVariable__domain[0][0].id='gs_njp'
+        x._TransientVariable__domain[1][0].id='gs_nip'
+        if ( not hasattr(y,'_TransientVariable__domain') ) :
             # There probably doesn't exist enough information to write a correct
             # grid, but this will help.
             y._TransientVariable__domain = [ (x,), (y,) ]
-        y._TransientVariable__domain[0][0].id = 'gs_njp'
-        y._TransientVariable__domain[1][0].id = 'gs_nip'
+        y._TransientVariable__domain[0][0].id='gs_njp'
+        y._TransientVariable__domain[1][0].id='gs_nip'
 
         file.write(x)
         file.write(y)
@@ -487,12 +486,12 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
         # The functionality (other than checking gsfile) is now done by the writeg
         # method above.
         if ( not hasattr( self, "gsfile" ) ):
-            self.gsfile = None
-            self.gspath = None
-        if ( self.gsfile != None ):
+            self.gsfile=None
+            self.gspath=None
+        if ( self.gsfile!=None ):
             return ( tcg.gsfile, tcg.gspath )
         else:
-            raise RuntimeError('The libCF/Gridspec API does not provide for writing CurveGrids<<<')
+            raise RuntimeError, 'The libCF/Gridspec API does not provide for writing CurveGrids<<<'
 
     def init_from_gridspec( self, filename ):
         """reads to grid from a Gridspec-compliant file.  The filename should be a
@@ -576,8 +575,8 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
                 j = k
             k += 1
 
-        if i == -1 or j == -1:
-            raise RuntimeError('Grid lat/lon domains do not match variable domain')
+        if i==-1 or j==-1:
+            raise RuntimeError, 'Grid lat/lon domains do not match variable domain'
 
         return ((islice, jslice), (inewaxis, jnewaxis))
 
@@ -585,14 +584,14 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
         """Get the grid index"""
         if self._index_ is None:
             # Trying to stick in Stephane Raynaud's patch for autodetection
-            nj, ni = self._lataxis_.shape
+            nj,ni = self._lataxis_.shape
             dlon = numpy.max(self._lonaxis_)-numpy.min(self._lonaxis_)
-            dx = max(dlon/ni, dlon/nj)
+            dx = max(dlon/ni,dlon/nj)
             dlat = numpy.max(self._lataxis_)-numpy.min(self._lataxis_)
-            dy = max(dlat/ni, dlat/nj)
+            dy = max(dlat/ni,dlat/nj)
             latlin = numpy.ravel(numpy.ma.filled(self._lataxis_))
             lonlin = numpy.ravel(numpy.ma.filled(self._lonaxis_))
-            _bindex.setDeltas(dx, dy)
+            _bindex.setDeltas(dx,dy)
             self._index_ = bindex.bindexHorizontalGrid(latlin, lonlin)
 
         return self._index_
@@ -615,12 +614,12 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
         latlin = numpy.ravel(numpy.ma.filled(self._lataxis_))
         lonlin = numpy.ravel(numpy.ma.filled(self._lonaxis_))
         points = bindex.intersectHorizontalGrid(latspec, lonspec, latlin, lonlin, index)
-        if len(points) == 0:
-            raise CDMSError('No data in the specified region, longitude=%s, latitude=%s'%(repr(lonspec), repr(latspec)))
+        if len(points)==0:
+            raise CDMSError, 'No data in the specified region, longitude=%s, latitude=%s'%(`lonspec`, `latspec`)
 
         fullmask = numpy.ones(ni*nj)
         numpy.put(fullmask, points, 0)
-        fullmask = numpy.reshape(fullmask, (ni, nj))
+        fullmask = numpy.reshape(fullmask, (ni,nj))
         
         iind = points/nj
         jind = points - iind*nj
@@ -629,7 +628,7 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
 
         yid = self.getAxis(0).id
         xid = self.getAxis(1).id
-        indexspecs = {yid:slice(imin, imax), xid:slice(jmin, jmax)}
+        indexspecs = {yid:slice(imin,imax), xid:slice(jmin,jmax)}
 
         return submask, indexspecs
 
@@ -678,9 +677,9 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
             used = []                   # axes already matched
             for i in missing:
                 for item in axes:
-                    if (item not in used) and len(selfaxes[i]) == len(item) and allclose(selfaxes[i], item):
-                        result._lataxis_.setAxis(i, item)
-                        result._lonaxis_.setAxis(i, item)
+                    if (item not in used) and len(selfaxes[i])==len(item) and allclose(selfaxes[i], item):
+                        result._lataxis_.setAxis(i,item)
+                        result._lonaxis_.setAxis(i,item)
                         used.append(item)
                         break
                 else:
@@ -694,18 +693,18 @@ class AbstractCurveGrid(AbstractHorizontalGrid):
         having the same length as the number of cells in the grid, similarly
         for flatlon."""
         if self._flataxes_ is None:
-            from . import MV2 as MV
+            import MV2 as MV
             alat = MV.filled(self.getLatitude())
             alon = MV.filled(self.getLongitude())
             alatflat = numpy.ravel(alat)
             alonflat = numpy.ravel(alon)
             self._flataxes_ = (alatflat, alonflat)
         return self._flataxes_
-    shape = property(_getShape, None)
+    shape = property(_getShape,None)
     
-# PropertiedClasses.set_property (AbstractCurveGrid, 'shape',
-# AbstractCurveGrid._getShape, nowrite=1,
-# nodelete=1)
+## PropertiedClasses.set_property (AbstractCurveGrid, 'shape', 
+##                                   AbstractCurveGrid._getShape, nowrite=1,
+##                                   nodelete=1)
 
 class DatasetCurveGrid(AbstractCurveGrid):
 
@@ -716,7 +715,7 @@ class DatasetCurveGrid(AbstractCurveGrid):
         self.parent = parent
 
     def __repr__(self):
-        return "<DatasetCurveGrid, id: %s, shape: %s>"%(self.id, repr(self.shape))
+        return "<DatasetCurveGrid, id: %s, shape: %s>"%(self.id, `self.shape`)
 
 class FileCurveGrid(AbstractCurveGrid):
 
@@ -727,7 +726,7 @@ class FileCurveGrid(AbstractCurveGrid):
         self.parent = parent
 
     def __repr__(self):
-        return "<FileCurveGrid, id: %s, shape: %s>"%(self.id, repr(self.shape))
+        return "<FileCurveGrid, id: %s, shape: %s>"%(self.id, `self.shape`)
 
 class TransientCurveGrid(AbstractCurveGrid):
 
@@ -742,7 +741,7 @@ class TransientCurveGrid(AbstractCurveGrid):
         AbstractCurveGrid.__init__(self, latAxis, lonAxis, id, maskvar, tempmask)
 
     def __repr__(self):
-        return "<TransientCurveGrid, id: %s, shape: %s>"%(self.id, repr(self.shape))
+        return "<TransientCurveGrid, id: %s, shape: %s>"%(self.id, `self.shape`)
 
     def toCurveGrid(self, gridid=None):
         if gridid is None:
@@ -759,17 +758,18 @@ def readScripCurveGrid(fileobj, dims, whichType, whichGrid):
     whichType is the type of file, either "grid" or "mapping"
     if whichType is "mapping", whichGrid is the choice of grid, either "source" or "destination"
     """
-    from .coord import TransientAxis2D
+    import string
+    from coord import TransientAxis2D
 
     if 'S' in fileobj.variables.keys():
-        if whichType == "grid":
+        if whichType=="grid":
             gridCornerLatName = 'grid_corner_lat'
             gridCornerLonName = 'grid_corner_lon'
             gridMaskName = 'grid_imask'
             gridCenterLatName = 'grid_center_lat'
             gridCenterLonName = 'grid_center_lon'
             titleName = 'title'
-        elif whichGrid == "destination":
+        elif whichGrid=="destination":
             gridCornerLatName = 'yv_b'
             gridCornerLonName = 'xv_b'
             gridMaskName = 'mask_b'
@@ -784,14 +784,14 @@ def readScripCurveGrid(fileobj, dims, whichType, whichGrid):
             gridCenterLonName = 'xc_a'
             titleName = 'source_grid'
     else:
-        if whichType == "grid":
+        if whichType=="grid":
             gridCornerLatName = 'grid_corner_lat'
             gridCornerLonName = 'grid_corner_lon'
             gridMaskName = 'grid_imask'
             gridCenterLatName = 'grid_center_lat'
             gridCenterLonName = 'grid_center_lon'
             titleName = 'title'
-        elif whichGrid == "destination":
+        elif whichGrid=="destination":
             gridCornerLatName = 'dst_grid_corner_lat'
             gridCornerLonName = 'dst_grid_corner_lon'
             gridMaskName = 'dst_grid_imask'
@@ -814,17 +814,17 @@ def readScripCurveGrid(fileobj, dims, whichType, whichGrid):
     nj = dims[0]
     gridshape = (ni, nj)
     boundsshape = (ni, nj, ncorners)
-    if hasattr(cornerLat, 'units') and cornerLat.units.lower()[0:6] == 'radian':
+    if hasattr(cornerLat, 'units') and string.lower(cornerLat.units)[0:6]=='radian':
         cornerLat = (cornerLat*(180.0/numpy.pi)).reshape(boundsshape)
         cornerLon = (cornerLon*(180.0/numpy.pi)).reshape(boundsshape)
     else:
         cornerLat = cornerLat.reshape(boundsshape)
         cornerLon = cornerLon.reshape(boundsshape)
 
-    iaxis = TransientVirtualAxis("i", ni)
-    jaxis = TransientVirtualAxis("j", nj)
+    iaxis = TransientVirtualAxis("i",ni)
+    jaxis = TransientVirtualAxis("j",nj)
 
-    if gridMaskName in vardict:
+    if vardict.has_key(gridMaskName):
         # SCRIP convention: 0 for invalid data
         # numpy.ma convention: 1 for invalid data
         mask = 1 - fileobj(gridMaskName)
@@ -832,27 +832,27 @@ def readScripCurveGrid(fileobj, dims, whichType, whichGrid):
     else:
         mask = None
         
-    if gridCenterLatName in vardict:
+    if vardict.has_key(gridCenterLatName):
         centerLat = fileobj(gridCenterLatName).reshape(gridshape)
         gclat = fileobj[gridCenterLatName]
-        if hasattr(gclat, "units") and gclat.units.lower() == 'radians':
+        if hasattr(gclat, "units") and string.lower(gclat.units)=='radians':
             centerLat *= (180.0/numpy.pi)
     else:
-        centerLat = cornerLat[:,:, 0]
+        centerLat = cornerLat[:,:,0]
 
-    if gridCenterLonName in vardict:
+    if vardict.has_key(gridCenterLonName):
         centerLon = fileobj(gridCenterLonName).reshape(gridshape)
         gclon = fileobj[gridCenterLonName]
-        if hasattr(gclon, "units") and gclon.units.lower() == 'radians':
+        if hasattr(gclon, "units") and string.lower(gclon.units)=='radians':
             centerLon *= (180.0/numpy.pi)
     else:
-        centerLon = cornerLon[:,:, 0]
+        centerLon = cornerLon[:,:,0]
 
-    if hasattr(fileobj, titleName):
+    if hasattr(fileobj,titleName):
         gridid = getattr(fileobj, titleName)
-        gridid = gridid.strip().replace(' ', '_')
+        gridid = string.replace(string.strip(gridid), ' ','_')
     else:
-        gridid = "<None>"
+        gridid="<None>"
 
     lataxis = TransientAxis2D(centerLat, axes=(iaxis, jaxis), bounds=cornerLat,
                               attributes={'units':'degrees_north'}, id="latitude")
diff --git a/Packages/cdms2/Lib/internattr.py b/Packages/cdms2/Lib/internattr.py
new file mode 100644
index 000000000..ff6ebeb0c
--- /dev/null
+++ b/Packages/cdms2/Lib/internattr.py
@@ -0,0 +1,157 @@
+"InternalAttributes (implmentation class for CDMS)"
+import types
+import PropertiedClasses
+_PCLASS = PropertiedClasses.PropertiedClass
+class AttributeDict:
+    """An attribute dictionary."""
+    def __init__ (self, owner):
+        self._owner = owner
+    
+    def __getitem__ (self, name):
+        if self.has_key(name):
+            return self._owner.__dict__[name]
+        else:
+            raise KeyError, "%s instance has no external attribute %s" % \
+                   (self._owner.__class__.__name__, name)
+
+    def __setitem__ (self, name, value):
+        if self._owner.is_internal_attribute(name):
+            raise RuntimeError, 'Cannot set internal name in external attribute dictionary.'
+        self._owner.__dict__[name] = value
+
+    def clear (self):
+        self._owner.__dict__.clear()
+
+    def get (self, name, default=None):
+        if self.has_key(name):
+            return self._owner.__dict__[name]
+        else:
+            return default
+
+    def has_key(self, name):
+        d = self._owner.__dict__
+        if d.has_key(name) and not self._owner.is_internal_attribute(name):
+            return 1
+        else:
+            return 0
+
+    def items (self):
+        result = []
+        for name, value in self._owner.__dict__.items():
+            if self._owner.is_internal_attribute(name): continue
+            result.append((name, value))
+        return result
+    
+    def keys (self):
+        result = []
+        for name in self._owner.__dict__.keys():
+            if self._owner.is_internal_attribute(name): continue
+            result.append(name)
+        return result
+
+    def update(self, d):
+        for name, value in d.items():
+            if self._owner.is_internal_attribute(name):
+                raise RuntimeError, "Cannot update attribute dict with internal name"
+        self._owner.__dict__[name] = value
+
+    def values (self):
+        result = []
+        for name, value in self._owner.__dict__.items():
+            if self._owner.is_internal_attribute(name): continue
+            result.append(value)
+        return result
+
+    def __repr__(self):
+        return 'AttributeDict (' + \
+        repr(self._owner.__dict__) + \
+        ')'
+
+    def __str__(self):
+        return str(self._owner.__dict__)
+    
+class InternalAttributesClass (_PCLASS):
+    def _getattributes (self, name):
+        """Return a dictionary-like object of the non-internal attributes."""
+        return AttributeDict(self)
+
+    def is_internal_attribute (self, name):
+        """is_internal_attribute(name) is true if name is internal."""
+        if name[0] == '_' or name in self.__class__._internal:
+            return 1
+        return 0
+
+    def replace_external_attributes(self, newAttributes):
+        """replace_external_attributes(newAttributes)
+           Replace the external attributes with dictionary newAttributes.
+        """
+        if not isinstance(newAttributes, types.DictType) and \
+           not isinstance(newAttributes, AttributeDict):
+            raise ValueError, "Argument must be a dictionary"
+        for n in self.__dict__.keys():
+            if not self.is_internal_attribute(n):
+                del self.__dict__[n]
+        for n, v in newAttributes.items():
+            self.__dict__[n] = v
+
+def initialize_internal_attributes (C):
+    "Prepare a class for life as a child of InternalAttributesClass."
+    if C.__dict__.has_key('_internal'): return
+    if not issubclass(C, InternalAttributesClass):
+        raise ValueError, 'Must be subclass of InternalAttributesClass'
+    PropertiedClasses.initialize_property_class (C)
+    C._internal = []
+    for CP in C.__bases__:
+        if issubclass(CP, InternalAttributesClass):
+            initialize_internal_attributes(CP)
+            for name in CP._internal:
+                C._internal.append(name)
+    
+def add_internal_attribute (C, *aname):
+    """add_internal_attribute (C, name, ...)
+       Make attributes name, ... internal in class C.
+    """
+    initialize_internal_attributes(C)
+    for name in aname:
+        if not name in C._internal:
+            C._internal.append(name)
+
+PropertiedClasses.set_property(InternalAttributesClass, 'attributes', 
+                               InternalAttributesClass._getattributes, 
+                               nowrite=1, nodelete=1)
+
+if __name__ == '__main__':
+    class Test(InternalAttributesClass):
+        def __init__ (self):
+            self.node = None
+            self.parent = None
+            self.__dict__['ro'] = 1
+            self.__hide = 3
+            self._p = 4
+            self.value = 1
+
+    PropertiedClasses.set_property(Test, 'ro', nowrite=1, nodelete=1)
+    add_internal_attribute(Test, 'node', 'parent', 'ro')
+
+    t1 = Test()
+    assert t1.value == 1
+    assert not t1.attributes.has_key('__hide')
+    assert not t1.attributes.has_key('_p')
+    assert t1._p == 4
+    t1.value = 2
+    assert t1.value == 2
+    assert 'value' in t1.attributes.keys()
+    t1.b = t1.value + 1
+    assert t1.b == 3
+    assert t1.b == t1.attributes['b']
+    t1.node = 'me'
+    t1.parent = 'dad'
+    assert t1.node == 'me'
+    assert 'node' not in t1.attributes.keys()
+    assert t1.ro == 1
+    try:
+        t1.ro == 2
+    except AttributeError:
+        pass
+    assert t1.ro == 1
+    print "Test passed."
diff --git a/Packages/cdms2/Lib/mvBaseWriter.py b/Packages/cdms2/Lib/mvBaseWriter.py
index db80b843e..5f099c704 100644
--- a/Packages/cdms2/Lib/mvBaseWriter.py
+++ b/Packages/cdms2/Lib/mvBaseWriter.py
@@ -3,14 +3,13 @@
 """
 Abstract class for writing data into file
 
-This code is provided with the hope that it will be useful.
+This code is provided with the hope that it will be useful. 
 No guarantee is provided whatsoever. Use at your own risk.
 
 Alex Pletzer, Tech-X Corp. (2011)
 """
 
-from . import mvSphereMesh
-
+import mvSphereMesh
 
 class BaseWriter:
 
@@ -18,7 +17,7 @@ class BaseWriter:
         """
         Constructor
         @param var a cdms2 variable
-        @param sphereRadius radius of the sphere upon which the grid will
+        @param sphereRadius radius of the sphere upon which the grid will 
                             be projected
         @param maxElev max elevation/depth normalized to the sphere radius
         """
@@ -27,12 +26,12 @@ class BaseWriter:
 
         self.shape = sphere_mesh.shape
 
-        # there is currently a bug in vizSchema which causes
-        # visit to crash if the leading index is 1, this is
+        # there is currently a bug in vizSchema which causes 
+        # visit to crash if the leading index is 1, this is 
         # a workaround the problem
         if self.shape[0] == 1:
-            self.shape = list(sphere_mesh.shape[1:]) + [1, ]
-
+            self.shape = list(sphere_mesh.shape[1:]) + [1,]
+        
         self.mesh = sphere_mesh.getXYZCoords(sphereRadius)
 
     def write(self, filename):
@@ -40,5 +39,5 @@ class BaseWriter:
         Write data to file. This method is overloaded.
         @param filename file name
         """
-        raise NotImplementedError(
-            'write method not implemented in derived class')
+        raise NotImplementedError, \
+            'write method not implemented in derived class'
diff --git a/Packages/cdms2/Lib/mvCdmsRegrid.py b/Packages/cdms2/Lib/mvCdmsRegrid.py
index 24c169acf..6cc0adf8a 100644
--- a/Packages/cdms2/Lib/mvCdmsRegrid.py
+++ b/Packages/cdms2/Lib/mvCdmsRegrid.py
@@ -5,13 +5,13 @@ David Kindig and Alex Pletzer, Tech-X Corp. (2012)
 This code is provided with the hope that it will be useful.
 No guarantee is provided whatsoever. Use at your own risk.
 """
+import types
 import operator
 import re
 import numpy
 import cdms2
-from .error import CDMSError
+from error import CDMSError
 import regrid2
-from functools import reduce
 
 def _areCellsOk(cornerCoords, mask=None):
     """
@@ -44,8 +44,8 @@ def _areCellsOk(cornerCoords, mask=None):
     # compute area elements in Cartesian space
     lat0 = numpy.array(cornerCoords[0][ :-1,  :-1], numpy.float64)
     lat1 = numpy.array(cornerCoords[0][ :-1, 1:  ], numpy.float64)
-    lat2 = numpy.array(cornerCoords[0][1:, 1:  ], numpy.float64)
-    lat3 = numpy.array(cornerCoords[0][1:,  :-1], numpy.float64)
+    lat2 = numpy.array(cornerCoords[0][1:  , 1:  ], numpy.float64)
+    lat3 = numpy.array(cornerCoords[0][1:  ,  :-1], numpy.float64)
 
     the0 = lat0*numpy.pi/180.
     the1 = lat1*numpy.pi/180.
@@ -53,8 +53,8 @@ def _areCellsOk(cornerCoords, mask=None):
     the3 = lat3*numpy.pi/180.
     lam0 = numpy.array(cornerCoords[1][ :-1,  :-1], numpy.float64)*numpy.pi/180.
     lam1 = numpy.array(cornerCoords[1][ :-1, 1:  ], numpy.float64)*numpy.pi/180.
-    lam2 = numpy.array(cornerCoords[1][1:, 1:  ], numpy.float64)*numpy.pi/180.
-    lam3 = numpy.array(cornerCoords[1][1:,  :-1], numpy.float64)*numpy.pi/180.
+    lam2 = numpy.array(cornerCoords[1][1:  , 1:  ], numpy.float64)*numpy.pi/180.
+    lam3 = numpy.array(cornerCoords[1][1:  ,  :-1], numpy.float64)*numpy.pi/180.
     
     x0, y0, z0 = projectToSphere(the0, lam0)
     x1, y1, z1 = projectToSphere(the1, lam1)
@@ -129,7 +129,7 @@ def _areCellsOk(cornerCoords, mask=None):
     if len(inds[0]) > 0:
         # package the result
         badCellIndices = [(inds[0][i], inds[1][i]) for i in range(len(inds[0]))]
-        bcis1 = [(inds[0][i], inds[1][i]+1) for i in range(len(inds[0]))]
+        bcis1 = [(inds[0][i]  , inds[1][i]+1) for i in range(len(inds[0]))]
         bcis2 = [(inds[0][i]+1, inds[1][i]+1) for i in range(len(inds[0]))]
         bcis3 = [(inds[0][i]+1, inds[1][i]  ) for i in range(len(inds[0]))]
         badCellCoords = [[(cornerCoords[0][badCellIndices[i]], cornerCoords[1][badCellIndices[i]]),
@@ -160,10 +160,10 @@ def _buildBounds(bounds):
         bnd[:-1] = bounds[..., 0]
         bnd[ -1] = bounds[ -1, 1]
     elif len(bndShape) > 1:
-        bnd[:-1, :-1] = bounds[:,:, 0]
-        bnd[:-1,  -1] = bounds[:, -1, 1]
+        bnd[:-1, :-1] = bounds[  :,  :, 0]
+        bnd[:-1,  -1] = bounds[  :, -1, 1]
         bnd[ -1,  -1] = bounds[ -1, -1, 2]
-        bnd[ -1, :-1] = bounds[ -1,:, 3]
+        bnd[ -1, :-1] = bounds[ -1,  :, 3]
 
     return bnd
 
@@ -382,9 +382,8 @@ coordMin = %7.2f, boundMin = %7.2f, coordMax = %7.2f, boundMax = %7.2f
 
         # If LibCF handleCut is True, the bounds are needed to extend the grid
         # close the cut at the top
-        if re.search('LibCF', regridTool, re.I) and 'handleCut' in args:
-            if args['handleCut']:
-                srcBounds = getBoundList(srcCoords)
+        if re.search('LibCF', regridTool, re.I) and args.has_key('handleCut'):
+            if args['handleCut']: srcBounds = getBoundList(srcCoords)
 
         srcCoordsArrays = [numpy.array(sc) for sc in srcCoords]
         dstCoordsArrays = [numpy.array(dc) for dc in dstCoords]
@@ -441,7 +440,7 @@ coordMin = %7.2f, boundMin = %7.2f, coordMax = %7.2f, boundMax = %7.2f
                              **args)
 
         # fill in diagnostic data
-        if 'diag' in args:
+        if args.has_key('diag'):
             self.regridObj.fillInDiagnosticData(diag = args['diag'], rootPe = 0)
 
         # construct the axis list for dstVar
@@ -451,7 +450,7 @@ coordMin = %7.2f, boundMin = %7.2f, coordMax = %7.2f, boundMax = %7.2f
         attrs = {}
         for a in srcVar.attributes:
             v = srcVar.attributes[a]
-            if isinstance(v, basestring):
+            if type(v) is types.StringType:
                 attrs[a] = v
 
         # if the missing value is present in the destination data, set
diff --git a/Packages/cdms2/Lib/mvSphereMesh.py b/Packages/cdms2/Lib/mvSphereMesh.py
index 1a5469c9c..2d4b7abad 100644
--- a/Packages/cdms2/Lib/mvSphereMesh.py
+++ b/Packages/cdms2/Lib/mvSphereMesh.py
@@ -3,24 +3,23 @@
 """
 Class for representing grids on the sphere
 Alex Pletzer, Tech-X Corp. (2011)
-This code is provided with the hope that it will be useful.
+This code is provided with the hope that it will be useful. 
 No guarantee is provided whatsoever. Use at your own risk.
 """
 
 import numpy
-from functools import reduce
-
+from types import NoneType
 
 class SphereMesh:
-
+    
     def __init__(self, var, sphereThickness=0.1):
         """
         Constructor
         @param var cdms2 variable
-        @param sphereThickness thickness of the shell in normalized
+        @param sphereThickness thickness of the shell in normalized 
                                sphere radius
         """
-
+       
         self.isRectilinear = True
         self.ndims = 0
         self.elvPositiveDown = False
@@ -35,17 +34,17 @@ class SphereMesh:
 
         # compute the min/max of elevation, needed
         # for normalization
-        if elvs is not None:
+        if type(elvs) != NoneType:
             self.minElv = min(elvs[:])
             self.maxElv = max(elvs[:])
             if hasattr(elvs, 'positive'):
                 if getattr(elvs, 'positive') == 'down':
                     self.elvPositiveDown = True
 
-        # determine the dimensionality and
+        # determine the dimensionality and 
         # whether the grid is rectilinear
         for axis in lons, lats, elvs:
-            if axis is not None:
+            if type(axis) != NoneType:
                 self.ndims += 1
                 if len(axis.shape) != 1:
                     self.isRectilinear = False
@@ -54,43 +53,37 @@ class SphereMesh:
         if self.isRectilinear:
             self.shape = []
             for axis in lons, lats, elvs:
-                if axis is not None:
-                    self.shape.append(len(axis))
+                if type(axis) != NoneType:
+                    self.shape.append( len(axis) )
             self.shape.reverse()
 
         while len(self.shape) < 3:
-            self.shape = [1, ] + list(self.shape)
+            self.shape = [1,] + list(self.shape)
 
         # store lon, lat, elv as a curvilinear grid
         if self.isRectilinear:
             # apply tensore product of axes to generat curvilinear coordinates
-            if elvs is not None:
-                self.elvs = numpy.outer(
-                    numpy.outer(
-                        numpy.ones(self.shape[:0],
-                                   numpy.float32),
-                        elvs),
-                                        numpy.ones(self.shape[0 + 1:], numpy.float32)).reshape(self.shape)
+            if type(elvs) != NoneType:
+                self.elvs = numpy.outer(numpy.outer( numpy.ones(self.shape[:0], numpy.float32), elvs),
+                                        numpy.ones(self.shape[0+1:], numpy.float32)).reshape(self.shape)
             else:
-                self.elvs = numpy.zeros(self.shape, numpy.float32)
-            self.lats = numpy.outer(
-                numpy.outer(numpy.ones(self.shape[:1], numpy.float32), lats),
-                                    numpy.ones(self.shape[1 + 1:], numpy.float32)).reshape(self.shape)
-            self.lons = numpy.outer(
-                numpy.outer(numpy.ones(self.shape[:2], numpy.float32), lons),
-                                    numpy.ones(self.shape[2 + 1:], numpy.float32)).reshape(self.shape)
-
+                self.elvs = numpy.zeros( self.shape, numpy.float32 )
+            self.lats = numpy.outer(numpy.outer( numpy.ones(self.shape[:1], numpy.float32), lats),
+                                    numpy.ones(self.shape[1+1:], numpy.float32)).reshape(self.shape)
+            self.lons = numpy.outer(numpy.outer( numpy.ones(self.shape[:2], numpy.float32), lons),
+                                    numpy.ones(self.shape[2+1:], numpy.float32)).reshape(self.shape)
+    
         else:
             # already in curvilinear form
             self.lons = lons[:]
             self.lats = lats[:]
-            if elvs is not None:
+            if type(elvs) != NoneType:
                 self.elvs = elvs[:]
             else:
-                self.elvs = numpy.zeros(self.shape, numpy.float32)
+                self.elvs = numpy.zeros( self.shape, numpy.float32 )
 
         # reshape as flat arrays
-        sz = reduce(lambda x, y: x * y, self.shape)
+        sz = reduce(lambda x, y: x*y, self.shape)
         self.lons = numpy.reshape(self.lons, (sz,))
         self.lats = numpy.reshape(self.lats, (sz,))
         self.elvs = numpy.reshape(self.elvs, (sz,))
@@ -98,33 +91,32 @@ class SphereMesh:
     def getXYZCoords(self, sphereRadius=1.0):
         """
         Get the curvilinear cartesian coordinates
-        @param sphereRadius radius of sphere
+        @param sphereRadius radius of sphere 
         @return mesh
         """
-        sz = reduce(lambda x, y: x * y, self.shape)
-        rr = sphereRadius * (1.0 + self.elvs)
+        sz = reduce(lambda x, y: x*y, self.shape)
+        rr = sphereRadius*(1.0 + self.elvs)
         diffElv = self.maxElv - self.minElv
-        rr = sphereRadius * numpy.ones(self.lons.shape, numpy.float32)
+        rr = sphereRadius*numpy.ones(self.lons.shape, numpy.float32 )
         if diffElv != 0:
-            coeff = sphereRadius * self.sphereThickness / diffElv
+            coeff = sphereRadius*self.sphereThickness/diffElv
             if self.elvPositiveDown:
                 # depth
-                rr += coeff * (self.maxElv - self.elvs)
+                rr += coeff*(self.maxElv - self.elvs)
             else:
                 # height
-                rr += coeff * (self.elvs - self.minElv)
+                rr += coeff*(self.elvs - self.minElv)
 
-        mesh = numpy.zeros((sz, 3), numpy.float32)
-        cosLats = numpy.cos(self.lats * numpy.pi / 180.)
-        mesh[:, 0] = rr * numpy.cos(self.lons * numpy.pi / 180.) * cosLats
-        mesh[:, 1] = rr * numpy.sin(self.lons * numpy.pi / 180.) * cosLats
-        mesh[:, 2] = rr * numpy.sin(self.lats * numpy.pi / 180.)
+        mesh = numpy.zeros( (sz, 3), numpy.float32 )
+        cosLats = numpy.cos( self.lats*numpy.pi/180. )
+        mesh[:, 0] = rr*numpy.cos(self.lons*numpy.pi/180.)*cosLats
+        mesh[:, 1] = rr*numpy.sin(self.lons*numpy.pi/180.)*cosLats
+        mesh[:, 2] = rr*numpy.sin(self.lats*numpy.pi/180.)
         return mesh
 
-#
+#####################################################################
 # Tests
 
-
 def test2DRect():
     """
     Test data on 2D rectilinear grid
@@ -132,18 +124,17 @@ def test2DRect():
     import cdms2
     from numpy import pi, cos, sin
     nlat, nlon = 12, 15
-    grid = cdms2.createUniformGrid(-0.0, nlat, 60. / (nlat - 1),
-                                   0., nlon, 30. / nlon)
+    grid = cdms2.createUniformGrid(-0.0, nlat, 60./(nlat-1), 
+                                    0., nlon, 30./nlon)
     lons = grid.getLongitude()
     lats = grid.getLatitude()
-    data = numpy.outer(cos(3 * pi * lats[:] / 180.0),
-                       sin(5 * pi * lons[:] / 180.0))
-    var = cdms2.createVariable(data, id='fake_data_2d_rect',
+    data = numpy.outer(cos(3*pi*lats[:]/180.0), 
+                       sin(5*pi*lons[:]/180.0))
+    var = cdms2.createVariable(data, id='fake_data_2d_rect', 
                                axes=(lats, lons))
     sphere_mesh = SphereMesh(var, 0.1)
     print sphere_mesh.getXYZCoords()
 
-
 def test2D():
     """
     Test data on 2D curvilinear grid
@@ -153,34 +144,33 @@ def test2D():
     from cdms2.hgrid import TransientCurveGrid
     from numpy import pi, cos, sin
     nlat, nlon = 3, 4
-    dlon, dlat = 60.0 / float(nlon - 1), 30.0 / float(nlat - 1)
-    lons1D = numpy.array([0.0 + i * dlon for i in range(nlon)])
-    lats1D = numpy.array([0.0 + j * dlat for j in range(nlat)])
+    dlon, dlat = 60.0/float(nlon - 1), 30.0/float(nlat - 1)
+    lons1D = numpy.array([0.0 + i*dlon for i in range(nlon)])
+    lats1D = numpy.array([0.0 + j*dlat for j in range(nlat)])
     lons = numpy.outer(numpy.ones((nlat,)), lons1D)
     lats = numpy.outer(lats1D, numpy.ones((nlon,)))
-    data = cos(3 * pi * lats / 180.0) * sin(5 * pi * lons / 180.0)
+    data = cos(3*pi*lats/180.0) * sin(5*pi*lons/180.0)
     # create grid
     iaxis = TransientVirtualAxis("i", nlon)
     jaxis = TransientVirtualAxis("j", nlat)
-    lataxis = TransientAxis2D(lats,
-                              axes=(jaxis, iaxis),
-                              attributes={'units': 'degree_north'},
-                              id='lats')
-    lonaxis = TransientAxis2D(lons,
-                              axes=(jaxis, iaxis),
-                              attributes={'units': 'degree_east'},
-                              id='lons')
-    grid = TransientCurveGrid(lataxis, lonaxis, id='lats_lons')
-
-    var = cdms2.createVariable(data, id='fake_data_2d',
-                               axes=grid.getAxisList(),
-                               grid=grid,
-                               attributes={'coordinates': 'lats lons'},
+    lataxis = TransientAxis2D(lats, 
+                       axes=(jaxis, iaxis), 
+                       attributes={'units': 'degree_north'}, 
+                       id='lats')
+    lonaxis = TransientAxis2D(lons, 
+                       axes=(jaxis, iaxis), 
+                       attributes={'units': 'degree_east'}, 
+                       id='lons')
+    grid =  TransientCurveGrid(lataxis, lonaxis, id='lats_lons')
+
+    var = cdms2.createVariable(data, id='fake_data_2d', 
+                               axes = grid.getAxisList(),
+                               grid = grid,
+                               attributes = {'coordinates': 'lats lons'},
                                )
     sphere_mesh = SphereMesh(var)
     print sphere_mesh.getXYZCoords()
 
-
 def test3DRect():
     """
     Test data on 3d rectilinear grid
@@ -188,30 +178,29 @@ def test3DRect():
     import cdms2
     from numpy import pi, cos, sin, exp
     nelv, nlat, nlon = 3, 4, 5
-    delv, dlon, dlat = 90000. / float(nelv - 1), \
-        60.0 / float(nlon - 1), 30.0 / float(nlat - 1)
-    elvs1D = numpy.array([100000 - i * delv for i in range(nelv)])
-    lons1D = numpy.array([0.0 + i * dlon for i in range(nlon)])
-    lats1D = numpy.array([0.0 + i * dlat for i in range(nlat)])
+    delv, dlon, dlat = 90000./float(nelv-1), \
+        60.0/float(nlon-1), 30.0/float(nlat-1)
+    elvs1D = numpy.array([100000 - i*delv for i in range(nelv)])
+    lons1D = numpy.array([0.0 + i*dlon for i in range(nlon)])
+    lats1D = numpy.array([0.0 + i*dlat for i in range(nlat)])
     # any order should work
-    lons = numpy.zeros((nlon, nlat, nelv), numpy.float32)
-    lats = numpy.zeros((nlon, nlat, nelv), numpy.float32)
-    elvs = numpy.zeros((nlon, nlat, nelv), numpy.float32)
-    data = numpy.zeros((nlon, nlat, nelv), numpy.float32)
+    lons = numpy.zeros( (nlon, nlat, nelv), numpy.float32 )
+    lats = numpy.zeros( (nlon, nlat, nelv), numpy.float32 )
+    elvs = numpy.zeros( (nlon, nlat, nelv), numpy.float32 )
+    data = numpy.zeros( (nlon, nlat, nelv), numpy.float32 )
     for i in range(nlon):
         for j in range(nlat):
             for k in range(nelv):
                 elvs[i, j, k] = elvs1D[k]
                 lats[i, j, k] = lats1D[j]
                 lons[i, j, k] = lons1D[i]
-                data[i, j, k] = cos(3 * pi * lats[i, j, k] / 180.) * \
-                    sin(5 * pi * lons[i, j, k] / 180.) * exp(-elvs[i, j, k])
-    var = cdms2.createVariable(data, id='fake_data_3d_rect',
+                data[i, j, k] = cos(3*pi*lats[i, j, k]/180.) * \
+                    sin(5*pi*lons[i, j, k]/180.) * exp(-elvs[i, j, k])
+    var = cdms2.createVariable(data, id='fake_data_3d_rect', 
                                axes=(elvs, lats, lons))
     sphere_mesh = SphereMesh(var)
     print sphereMesh.getXYZCoords()
 
-
 def test3DposDown():
     """
     Test 3d data with elev positive down. Need to work with 1D axes.
@@ -220,33 +209,31 @@ def test3DposDown():
     import cdms2
     import numpy
     nlev, nlat, nlon = 4, 5, 6
-    dlev, dlat, dlon = 5000. / \
-        float(nlev - 1), 180. / float(nlat - 1), 360. / float(nlon - 1)
+    dlev, dlat, dlon = 5000./float(nlev-1), 180./float(nlat-1), 360./float(nlon-1)
     levs1d = numpy.arange(0., 5001., dlev)
-    lats1d = numpy.array([0. - i * dlat for i in range(nlat)])
-    lons1d = numpy.array([0. - i * dlon for i in range(nlon)])
+    lats1d = numpy.array([0. - i*dlat for i in range(nlat)])
+    lons1d = numpy.array([0. - i*dlon for i in range(nlon)])
     data = numpy.zeros((nlev, nlat, nlon), numpy.float32)
 
     for k in range(nlev):
         for j in range(nlat):
             for i in range(nlon):
-                data[k, j, i] = numpy.cos(3 * numpy.pi * lats1d[j] / 180.) * \
-                    numpy.sin(5 * numpy.pi * lons1d[i] / 180.) * \
+                data[k, j, i] = numpy.cos(3*numpy.pi*lats1d[j]/180.) * \
+                                numpy.sin(5*numpy.pi*lons1d[i]/180.) * \
                                 numpy.exp(-levs1d[k])
 
-    a1 = cdms2.axis.TransientAxis(levs1d, id='levels',
-                                  attributes={'positive': 'down'})
-    a2 = cdms2.axis.TransientAxis(lats1d, id='latitude')
-    a3 = cdms2.axis.TransientAxis(lons1d, id='longitude')
-    var = cdms2.createVariable(data, id='pos_down_3d_data',
-                               axes=(a1, a2, a3))
+    a1 = cdms2.axis.TransientAxis(levs1d, id = 'levels', 
+                                  attributes = {'positive':'down'})
+    a2 = cdms2.axis.TransientAxis(lats1d, id = 'latitude')
+    a3 = cdms2.axis.TransientAxis(lons1d, id = 'longitude')
+    var = cdms2.createVariable(data, id = 'pos_down_3d_data',
+                               axes = (a1, a2, a3))
     sphereMesh = SphereMesh(var)
     aa = sphereMesh.getXYZCoords()
     bb = aa.reshape((4, 5, 6, 3))
-    for i in range(nlev):
-        print levs1d[i], bb[i, 0, 0, :]
+    for i in range(nlev): print levs1d[i], bb[i, 0, 0, :]
 
-if __name__ == '__main__':
+if __name__ == '__main__': 
 #    test2DRect()
 #    test2D()
 #    test3DRect()
diff --git a/Packages/cdms2/Lib/mvVTKSGWriter.py b/Packages/cdms2/Lib/mvVTKSGWriter.py
index fd2327245..353d8b19b 100644
--- a/Packages/cdms2/Lib/mvVTKSGWriter.py
+++ b/Packages/cdms2/Lib/mvVTKSGWriter.py
@@ -3,14 +3,13 @@
 """
 Write data to VTK file format using the structured grid format
 Alex Pletzer, Tech-X Corp. (2011)
-This code is provided with the hope that it will be useful.
+This code is provided with the hope that it will be useful. 
 No guarantee is provided whatsoever. Use at your own risk.
 """
 
 import numpy
 import time
-from . import mvBaseWriter
-
+import mvBaseWriter
 
 class VTKSGWriter(mvBaseWriter.BaseWriter):
 
@@ -30,10 +29,10 @@ class VTKSGWriter(mvBaseWriter.BaseWriter):
         npts = self.mesh.shape[0]
         print >> f, 'POINTS %d float' % npts
         for i in range(npts):
-            print >> f, '%f %f %f' % tuple(self.mesh[i, :])
+            print >> f, '%f %f %f' % tuple(self.mesh[i,:])
         n0, n1, n2 = self.shape
         # nodal data
-        print >> f, 'POINT_DATA %d' % (n0 * n1 * n2)
+        print >> f, 'POINT_DATA %d' % (n0*n1*n2)
         print >> f, 'SCALARS %s float' % (self.var.id)
         print >> f, 'LOOKUP_TABLE default'
         if n0 > 1:
@@ -44,34 +43,34 @@ class VTKSGWriter(mvBaseWriter.BaseWriter):
         else:
             for j in range(n1):
                 for i in range(n2):
-                    print >> f, '%f' % self.var[j, i]
+                    print >> f, '%f' % self.var[j, i]            
         f.close()
 
 
-#
+######################################################################
 
 def test2DRect():
     import cdms2
     from numpy import pi, cos, sin
     nlat, nlon = 6, 10
-    grid = cdms2.createUniformGrid(-0.0, nlat, 60. / (nlat - 1),
-                                   0., nlon, 30. / nlon)
+    grid = cdms2.createUniformGrid(-0.0, nlat, 60./(nlat-1), 
+                                    0., nlon, 30./nlon)
     lons = grid.getLongitude()
     lats = grid.getLatitude()
-    data = numpy.outer(cos(3 * pi * lats[:] / 180.0),
-                       sin(5 * pi * lons[:] / 180.0))
-    var = cdms2.createVariable(data, id='fake_data_2d_rect',
+    data = numpy.outer(cos(3*pi*lats[:]/180.0), 
+                       sin(5*pi*lons[:]/180.0))
+    var = cdms2.createVariable(data, id='fake_data_2d_rect', 
                                axes=(lats, lons))
     vw = VTKSGWriter(var)
     vw.write('test2DRect_SG.vtk')
 
-
 def test3D():
     import cdms2
     var = cdms2.open('sample_data/ta_ncep_87-6-88-4.nc', 'r')('ta')
-    vw = VTKSGWriter(var[0, 0:10, 0:20, 0:30])
+    vw = VTKSGWriter(var[0,0:10,0:20,0:30])
     vw.write('test3D_SG.vtk')
 
-if __name__ == '__main__':
+if __name__ == '__main__': 
     test2DRect()
     test3D()
+    
diff --git a/Packages/cdms2/Lib/mvVTKUGWriter.py b/Packages/cdms2/Lib/mvVTKUGWriter.py
index e712efaf7..50dcb1195 100644
--- a/Packages/cdms2/Lib/mvVTKUGWriter.py
+++ b/Packages/cdms2/Lib/mvVTKUGWriter.py
@@ -3,14 +3,13 @@
 """
 Write data to VTK file format using the unstructured grid format
 Alex Pletzer, Tech-X Corp. (2011)
-This code is provided with the hope that it will be useful.
+This code is provided with the hope that it will be useful. 
 No guarantee is provided whatsoever. Use at your own risk.
 """
 
 import numpy
 import time
-from . import mvBaseWriter
-
+import mvBaseWriter
 
 class VTKUGWriter(mvBaseWriter.BaseWriter):
 
@@ -27,9 +26,9 @@ class VTKUGWriter(mvBaseWriter.BaseWriter):
         npts = self.mesh.shape[0]
         print >> f, 'POINTS %d float' % npts
         for i in range(npts):
-            print >> f, '%f %f %f' % tuple(self.mesh[i, :])
+            print >> f, '%f %f %f' % tuple(self.mesh[i,:])
         n0, n1, n2 = self.shape
-        ncells = (n0 - 1) * (n1 - 1) * (n2 - 1)
+        ncells = (n0 - 1)*(n1 - 1)*(n2 - 1)
         if ncells != 0:
             # 3d
             ntot = ncells * (8 + 1)
@@ -37,17 +36,17 @@ class VTKUGWriter(mvBaseWriter.BaseWriter):
             for k in range(n0 - 1):
                 for j in range(n1 - 1):
                     for i in range(n2 - 1):
-                        index = i + n2 * (j + n1 * k)
+                        index = i + n2*(j + n1*k)
                         print >> f, '8 %d %d %d %d %d %d %d %d' % \
-                            (index, index + 1, index + 1 + n2, index + n2,
-                             index + n1 * n2, index + n1 * n2 + 1,
-                             index + n1 * n2 + 1 + n2, index + n1 * n2 + n2)
+                            (index, index+1, index+1+n2, index+n2, 
+                             index+n1*n2, index+n1*n2+1, 
+                             index+n1*n2+1+n2, index+n1*n2+n2)
             print >> f, 'CELL_TYPES %d' % ncells
             for i in range(ncells):
                 # hexahedron
                 print >> f, 12
             # nodal data
-            print >> f, 'POINT_DATA %d' % (n0 * n1 * n2)
+            print >> f, 'POINT_DATA %d' % (n0*n1*n2)
             print >> f, 'SCALARS %s float' % (self.var.id)
             print >> f, 'LOOKUP_TABLE default'
             for k in range(n0):
@@ -56,52 +55,52 @@ class VTKUGWriter(mvBaseWriter.BaseWriter):
                         print >> f, '%f' % self.var[k, j, i]
         else:
             # 2d
-            ncells = (n1 - 1) * (n2 - 1)
+            ncells = (n1 - 1)*(n2 - 1)
             ntot = ncells * (4 + 1)
             print >> f, 'CELLS %d %d' % (ncells, ntot)
             for j in range(n1 - 1):
                 for i in range(n2 - 1):
-                    index = i + n2 * j
+                    index = i + n2*j
                     print >> f, '4 %d %d %d %d' % \
-                        (index, index + 1, index + 1 + n2, index + n2)
+                        (index, index+1, index+1+n2, index+n2)
             print >> f, 'CELL_TYPES %d' % ncells
             for i in range(ncells):
                 # quad
                 print >> f, 9
             # nodal data
-            print >> f, 'POINT_DATA %d' % (n0 * n1 * n2)
+            print >> f, 'POINT_DATA %d' % (n0*n1*n2)
             print >> f, 'SCALARS %s float' % (self.var.id)
             print >> f, 'LOOKUP_TABLE default'
             for j in range(n1):
                 for i in range(n2):
-                    print >> f, '%f' % self.var[j, i]
+                    print >> f, '%f' % self.var[j, i]   
         f.close()
 
 
-#
+######################################################################
 
 def test2DRect():
     import cdms2
     from numpy import pi, cos, sin
     nlat, nlon = 6, 10
-    grid = cdms2.createUniformGrid(-0.0, nlat, 60. / (nlat - 1),
-                                   0., nlon, 30. / nlon)
+    grid = cdms2.createUniformGrid(-0.0, nlat, 60./(nlat-1), 
+                                    0., nlon, 30./nlon)
     lons = grid.getLongitude()
     lats = grid.getLatitude()
-    data = numpy.outer(cos(3 * pi * lats[:] / 180.0),
-                       sin(5 * pi * lons[:] / 180.0))
-    var = cdms2.createVariable(data, id='fake_data_2d_rect',
+    data = numpy.outer(cos(3*pi*lats[:]/180.0), 
+                       sin(5*pi*lons[:]/180.0))
+    var = cdms2.createVariable(data, id='fake_data_2d_rect', 
                                axes=(lats, lons))
     vw = VTKUGWriter(var)
     vw.write('test2DRect.vtk')
 
-
 def test3D():
     import cdms2
     var = cdms2.open('sample_data/ta_ncep_87-6-88-4.nc', 'r')('ta')
-    vw = VTKUGWriter(var[0, 0:10, 0:20, 0:30])
+    vw = VTKUGWriter(var[0,0:10,0:20,0:30])
     vw.write('test3D.vtk')
 
-if __name__ == '__main__':
+if __name__ == '__main__': 
     test2DRect()
     test3D()
+    
diff --git a/Packages/cdms2/Lib/mvVsWriter.py b/Packages/cdms2/Lib/mvVsWriter.py
index 72bb31526..aed81a79f 100644
--- a/Packages/cdms2/Lib/mvVsWriter.py
+++ b/Packages/cdms2/Lib/mvVsWriter.py
@@ -3,15 +3,14 @@
 """
 Write data to VizSchema compliant file
 Alex Pletzer, Tech-X Corp. (2011)
-This code is provided with the hope that it will be useful.
+This code is provided with the hope that it will be useful. 
 No guarantee is provided whatsoever. Use at your own risk.
 """
 
 import numpy
-from . import mvBaseWriter
+import mvBaseWriter
 import re
 
-
 class VsWriter(mvBaseWriter.BaseWriter):
 
     def write(self, filename):
@@ -22,59 +21,58 @@ class VsWriter(mvBaseWriter.BaseWriter):
         try:
             import tables
         except:
-            raise ImportError('You must have pytables installed')
-
+            raise ImportError, 'You must have pytables installed'
+        
         if filename.find('.vsh5') < 0 and filename.find('.h5') < 0:
-            filename += '.vsh5'  # VizSchema hdf5 format
+            filename += '.vsh5' # VizSchema hdf5 format
 
         # open file
         h5file = tables.openFile(filename, 'w')
         # put mesh
         meshid = 'mesh_' + self.var.id
-        mdata = numpy.reshape(self.mesh, self.shape + [3, ])
+        mdata = numpy.reshape(self.mesh, self.shape + [3,])
         mset = h5file.createArray("/", meshid, mdata)
         mset.attrs.vsType = "mesh"
         mset.attrs.vsKind = "structured"
         mset.attrs.vsIndexOrder = "compMinorC"
         # data
-        dset = h5file.createArray("/", self.var.id,
+        dset = h5file.createArray("/", self.var.id, 
                                   numpy.reshape(self.var, self.shape))
         dset.attrs.vsType = "variable"
         dset.attrs.vsMesh = meshid
         # additional attributes
         for a in self.var.attributes:
             # Skip mpi objects
-            if re.match('mpi', a.lower()):
+            if re.match('mpi',a.lower()):
                 continue
             setattr(dset.attrs, a, getattr(self.var, a))
         # close file
         h5file.close()
 
-#
-
+######################################################################
 
 def test2DRect():
     import cdms2
     from numpy import pi, cos, sin
     nlat, nlon = 3, 4
-    grid = cdms2.createUniformGrid(-0.0, nlat, 60. / (nlat - 1),
-                                   0., nlon, 30. / nlon)
+    grid = cdms2.createUniformGrid(-0.0, nlat, 60./(nlat-1), 
+                                    0., nlon, 30./nlon)
     lons = grid.getLongitude()
     lats = grid.getLatitude()
-    data = numpy.outer(cos(3 * pi * lats[:] / 180.0),
-                       sin(5 * pi * lons[:] / 180.0))
-    var = cdms2.createVariable(data, id='fake_data_2d_rect',
+    data = numpy.outer(cos(3*pi*lats[:]/180.0), 
+                       sin(5*pi*lons[:]/180.0))
+    var = cdms2.createVariable(data, id='fake_data_2d_rect', 
                                axes=(lats, lons))
     vw = VsWriter(var)
     vw.write('test2DRect.vsh5')
 
-
 def test3D():
     import cdms2
     var = cdms2.open('sample_data/ta_ncep_87-6-88-4.nc', 'r')('ta')
-    vw = VsWriter(var[0, 0:10, 0:20, 0:30])
+    vw = VsWriter(var[0,0:10,0:20,0:30])
     vw.write('test3D.vsh5')
 
-if __name__ == '__main__':
+if __name__ == '__main__': 
     test2DRect()
     test3D()
+    
diff --git a/Packages/cdms2/Lib/restApi.py b/Packages/cdms2/Lib/restApi.py
index 159d50112..2b5ef1059 100644
--- a/Packages/cdms2/Lib/restApi.py
+++ b/Packages/cdms2/Lib/restApi.py
@@ -1,3 +1,4 @@
+import cdms2
 import urllib2
 import xml.etree.ElementTree
 try:
@@ -5,136 +6,116 @@ try:
 except:
     pass
 import os
-# import bz2
-
+#import bz2
 
 class esgfConnectionException(Exception):
     pass
-
-
 class esgfDatasetException(Exception):
     pass
-
-
 class esgfFilesException(Exception):
     pass
-    # def __init__(self,value):
-    # self.value=value
-    # def __repr__(self):
-    # msg =  "rest API error: %s" % repr(value)
-    # print msg
-    # return msg
-
+    ## def __init__(self,value):
+    ##     self.value=value
+    ## def __repr__(self):
+    ##     msg =  "rest API error: %s" % repr(value)
+    ##     print msg
+    ##     return msg
 
 class FacetConnection(object):
-
-    def __init__(self, host='pcmdi9.llnl.gov'):
-        self.rqst = "http://%s/esg-search/search?facets=*&type=Dataset&limit=1&latest=true" % host
-        self.rqst_count = "http://%s/esg-search/search?facets=*&type=File&limit=0&latest=true" % host
+    def __init__(self,host='pcmdi9.llnl.gov'):
+        self.rqst="http://%s/esg-search/search?facets=*&type=Dataset&limit=1&latest=true" % host
+        self.rqst_count="http://%s/esg-search/search?facets=*&type=File&limit=0&latest=true" % host
         self.EsgfObjectException = esgfConnectionException
-
-    def get_xmlelement(self, facet_param=None):
+    def get_xmlelement(self,facet_param=None):
         try:
-            rqst = self.rqst
+            rqst=self.rqst
             if facet_param:
-                rqst = rqst + '&%s' % facet_param
-            # print rqst
+                rqst=rqst+'&%s'%facet_param        
+            #print rqst
             url = urllib2.urlopen(rqst)
-        except Exception as msg:
-            raise self.EsgfObjectException(msg)
+        except Exception,msg:
+             raise self.EsgfObjectException(msg)
         r = url.read()
         try:
             e = xml.etree.ElementTree.fromstring(r)
             return e
-        except Exception as err:
-            raise self.EsgfObjectException(
-                "Could not interpret server's results: %s" %
-                err)
-
-    def make_facet_dict(self, xmlelement):
-        facet_dict = {}
+        except Exception,err:
+            raise self.EsgfObjectException("Could not interpret server's results: %s" % err)
+    def make_facet_dict(self,xmlelement):
+        facet_dict={}
         for lst in xmlelement.findall('lst'):
-            if lst.get('name') == 'facet_counts':
-                myelement = lst
+            if lst.get('name')=='facet_counts':
+                myelement=lst
                 for node in myelement.findall('lst'):
-                    if node.get('name') == 'facet_fields':
+                    if node.get('name')=='facet_fields':
                         for child in node.getchildren():
-                            facet_name = child.get('name')
-                            facet_dict[facet_name] = []
+                            facet_name=child.get('name')
+                            facet_dict[facet_name]=[]
                             for grandchild in child.getchildren():
-                                facet_dict[facet_name].append(
-                                    "%s (%s)" %
-                                    (str(grandchild.get('name')), str(grandchild.text)))
+                                facet_dict[facet_name].append("%s (%s)"%(str(grandchild.get('name')),str(grandchild.text)))
         return facet_dict
-
-    def get_xmlelement_count(self, facet_param=None):
+    def get_xmlelement_count(self,facet_param=None):
         try:
-            rqst = self.rqst_count
+            rqst=self.rqst_count
             if facet_param:
-                rqst = rqst + '&%s' % facet_param
-                # print rqst
+                rqst=rqst+'&%s'%facet_param        
+                #print rqst
             url = urllib2.urlopen(rqst)
-        except Exception as msg:
-            raise self.EsgfObjectException(msg)
+        except Exception,msg:
+             raise self.EsgfObjectException(msg)
         r = url.read()
         try:
             e = xml.etree.ElementTree.fromstring(r)
             return e
-        except Exception as err:
-            raise self.EsgfObjectException(
-                "Could not interpret server's results: %s" %
-                err)
+        except Exception,err:
+            raise self.EsgfObjectException("Could not interpret server's results: %s" % err)
 
-    def make_facet_dict_count(self, xmlelement):
-        myelementlist = xmlelement.findall('result')
-        count = None
+    def make_facet_dict_count(self,xmlelement):
+        myelementlist=xmlelement.findall('result')
+        count=None
         if len(myelementlist) > 0:
-            myelement = myelementlist[0]
-            count = int(myelement.get('numFound'))
+            myelement=myelementlist[0]
+            count=int(myelement.get('numFound'))
         return count
 
-validSearchTypes = ["Dataset", "File"]  # "ById","ByTimeStamp"]
-
-
+validSearchTypes =  ["Dataset","File"]#"ById","ByTimeStamp"]
 class esgfConnection(object):
-
-    def __init__(self, host, port=80, timeout=15, limit=None, offset=0,
-                 mapping=None, datasetids=None, fileids=None, restPath=None):
-        self.port = port
-        url = str(host).replace("://", "^^^---^^^")
-        sp = url.split("/")
-        host = sp[0].replace("^^^---^^^", "://")
+    def __init__(self,host,port=80,timeout=15,limit=None,offset=0,mapping=None,datasetids=None,fileids=None,restPath=None):
+        self.port=port
+        url=str(host).replace("://","^^^---^^^")
+        sp= url.split("/")
+        host = sp[0].replace("^^^---^^^","://")
         if restPath is None:
             restPath = "/".join(sp[1:])
-            if len(restPath) == 0:
-                self.restPath = "/esg-search/search"
+            if len(restPath)==0:
+                self.restPath="/esg-search/search"
             else:
-                self.restPath = restPath
+                self.restPath=restPath
         else:
-            self.restPath = restPath
-        self.host = host
-        # self.host="esg-datanode.jpl.nasa.gov"
+            self.restPath=restPath
+        self.host=host
+        #self.host="esg-datanode.jpl.nasa.gov"
         self.defaultSearchType = "Dataset"
         self.EsgfObjectException = esgfConnectionException
-        self.validSearchTypes = validSearchTypes
-        self.validSearchTypes = ["Dataset", ]
-        all = self._search("facets=*", searchType=None)
-        # Now figure out the facet fields
+        self.validSearchTypes=validSearchTypes
+        self.validSearchTypes=["Dataset",]
+        all = self._search("facets=*",searchType=None)
+        ## Now figure out the facet fields
         self.serverOrder = []
         for e in all:
-            if e.tag == "lst" and "name" in e.keys() and e.get("name") == "responseHeader":
-                # ok found the Header
+            if e.tag=="lst" and "name" in e.keys() and e.get("name")=="responseHeader":
+                ## ok found the Header
                 for s in e:
-                    if s.get("name") == "params":
-                        params = s
+                    if s.get("name")=="params":
+                        params=s
                         break
-                self.params = {"text": None, "limit": limit, "offset": offset}
-                self.searchableKeys = set(["text", "limit", "offset"])
+                self.params={"text":None,"limit":limit,"offset":offset}
+                self.searchableKeys=set(["text","limit","offset"])
                 for p in params:
-                    if p.get("name") == "facet.field":
+                    if p.get("name")=="facet.field":
                         for f in p:
                             self.serverOrder.append(f.text)
-                            self.params[f.text] = None
+                            self.params[f.text]=None
                             self.searchableKeys.add(f.text)
 
         self.keys = self.params.keys
@@ -142,68 +123,61 @@ class esgfConnection(object):
         self.values = self.params.values
 
         if datasetids is not None:
-            self.datasetids = genutil.StringConstructor(datasetids)
+            self.datasetids=genutil.StringConstructor(datasetids)
         else:
-            self.datasetids = None
+            self.datasetids=None
         if fileids is not None:
-            self.fileids = genutil.StringConstructor(fileids)
+            self.fileids=genutil.StringConstructor(fileids)
             if datasetids is not None:
-                self.fileids.template = self.fileids.template.replace(
-                    "%(datasetid)", self.datasetids.template)
+                self.fileids.template=self.fileids.template.replace("%(datasetid)",self.datasetids.template)
         elif self.datasetids is not None:
-            self.fileids = genutil.StringConstructor(
-                "%s.%%(filename)" %
-                self.datasetids.template)
+            self.fileids=genutil.StringConstructor("%s.%%(filename)" % self.datasetids.template)
         else:
-            self.fileids = None
-        # self.setMapping(mapping)
-        self.mapping = mapping
-
-    # def setUserOrder(self,value):
-    # self.userOrder=value
-    # def getUserOrder(self):
-    # return self.userOrder
-    # order=property(getUserOrder,setUserOrder)
-    def __getitem__(self, key):
+            self.fileids=None
+        #self.setMapping(mapping)
+        self.mapping=mapping                    
+            
+    ## def setUserOrder(self,value):
+    ##     self.userOrder=value
+    ## def getUserOrder(self):
+    ##     return self.userOrder
+    ## order=property(getUserOrder,setUserOrder)
+    def __getitem__(self,key):
         try:
             val = self.params[key]
         except:
             raise self.EsgfObjectException("Invalid key: %s" % repr(key))
         return val
-
-    def __setitem__(self, key, value):
-        if key not in self.params.keys():
-            raise self.EsgfObjectException(
-                "Invalid key: %s, valid keys are: %s" %
-                (repr(key), repr(self.params.keys())))
-        self.params[key] = value
+    def __setitem__(self,key,value):
+        if not key in self.params.keys():
+            raise self.EsgfObjectException("Invalid key: %s, valid keys are: %s" % (repr(key),repr(self.params.keys())))
+        self.params[key]=value
         return
 
-    def _search(self, search="", searchType=None, stringType=False):
+                            
+    def _search(self,search="",searchType=None,stringType=False):
         if searchType is None:
-            searchType = self.defaultSearchType
-        if searchType not in self.validSearchTypes:
-            raise self.EsgfObjectException(
-                "Valid Search types are: %s" %
-                repr(self.validSearchTypes))
-        while search[0] == "&":
-            search = search[1:]
-        rqst = "%s/?type=%s&%s" % (self.restPath, searchType, search)
-        # print "REQUEST: %s%s" % (self.host,rqst)
-        myhost = str(self.host)
-        myport = str(self.port)
-        if myhost.find("://") > -1:
-            urltype = ""
+            searchType=self.defaultSearchType
+        if not searchType in self.validSearchTypes:
+            raise self.EsgfObjectException("Valid Search types are: %s" % repr(self.validSearchTypes))
+        while search[0]=="&":
+            search=search[1:]
+        rqst = "%s/?type=%s&%s" % (self.restPath,searchType,search)
+        #print "REQUEST: %s%s" % (self.host,rqst)
+        myhost=str(self.host)
+        myport=str(self.port)
+        if myhost.find("://")>-1:
+            urltype=""
         else:
-            urltype = "http://"
+            urltype="http://"
         try:
-            rqst = "%s%s:%s/%s" % (urltype, myhost, myport, rqst)
-            tmp = rqst[6:].replace("//", "/")
-            rqst = rqst[:6] + tmp
-            # print "Request:%s"%rqst
+            rqst="%s%s:%s/%s" % (urltype,myhost,myport,rqst)
+            tmp=rqst[6:].replace("//","/")
+            rqst=rqst[:6]+tmp
+            #print "Request:%s"%rqst
             url = urllib2.urlopen(rqst)
-        except Exception as msg:
-            raise self.EsgfObjectException(msg)
+        except Exception,msg:
+             raise self.EsgfObjectException(msg)
         r = url.read()
         if stringType:
             return r
@@ -211,496 +185,539 @@ class esgfConnection(object):
             try:
                 e = xml.etree.ElementTree.fromstring(r)
                 return e
-            except Exception as err:
-                raise self.EsgfObjectException(
-                    "Could not interpret server's results: %s" %
-                    err)
+            except Exception,err:
+                raise self.EsgfObjectException("Could not interpret server's results: %s" % err)
 
-    def generateRequest(self, stringType=False, **keys):
+    def generateRequest(self,stringType=False,**keys):
         search = ""
-        params = {"limit": self["limit"], "offset": self["offset"]}
+        params={"limit":self["limit"],"offset":self["offset"]}
 
-        # for k in self.keys():
-        # if self[k] is not None and k in self.searchableKeys and k!="type":
-        # params[k]=self[k]
+        ## for k in self.keys():
+        ##     if self[k] is not None and k in self.searchableKeys and k!="type":
+        ##         params[k]=self[k]
 
+        
         for k in keys.keys():
-            if k in ["stringType", "type"]:
+            if k == "stringType":
+                stringType=keys[k]
+                continue
+            elif k == "type":
                 continue
+            ## elif not k in self.searchableKeys:
+            ##     raise self.EsgfObjectException("Invalid key: %s, valid keys are: %s" % (repr(k),repr(self.params.keys())))
             if keys[k] is not None:
-                params[k] = keys[k]
+                params[k]=keys[k]
 
         search = ""
         for k in params.keys():
-            if isinstance(params[k], list):
+            if isinstance(params[k],list):
                 for v in params[k]:
-                    if isinstance(v, str):
-                        v = v.strip()
-                    search += "&%s=%s" % (k, v)
+                    if isinstance(v,str):
+                        v=v.strip()
+                    search+="&%s=%s" % (k,v)
             else:
                 v = params[k]
-                if isinstance(v, str):
-                    v = v.strip()
-                search += "&%s=%s" % (k, v)
+                if isinstance(v,str):
+                    v=v.strip()
+                search+="&%s=%s" % (k,v)
 
-# search = "&".join(map(lambda x : "%s=%s" % (x[0],x[1]), params.items()))
-        search = search.replace(" ", "%20")
+#        search = "&".join(map(lambda x : "%s=%s" % (x[0],x[1]), params.items()))
+        search=search.replace(" ","%20")
         return search
-
-    def request(self, **keys):
-        numFound = 0
+    
+    def request(self,**keys):
+        numFound=0
         cont = True
-        r = []
+        r=[]
         limit = self["limit"]
         while cont:
-            # print "Continuing",limit
-            self["offset"] = numFound
-            if limit is None or limit > 1000:
-                self["limit"] = 1000
+            #print "Continuing",limit
+            self["offset"]=numFound
+            if limit is None or limit>1000:
+                self["limit"]=1000
             search = self.generateRequest(**keys)
-            stringType = keys.get("stringType", False)
-            r.append(self._search(search, stringType=stringType))
-            if numFound == 0:
+            stringType=keys.get("stringType",False)
+            r.append(self._search(search,stringType=stringType))
+            if numFound==0:
                 for s in r[0][:]:
-                    if s.tag == "result":
+                    if s.tag=="result":
                         n = int(s.get("numFound"))
-            numFound += self["limit"]
+            numFound+=self["limit"]
             if limit is None:
-                if numFound >= n:
+                if numFound>=n:
                     cont = False
             else:
-                if numFound >= limit:
-                    cont = False
-            # print "N is:",numFound,n
-        self["limit"] = limit
-        self["offset"] = 0
+                if numFound>=limit:
+                    cont=False
+            #print "N is:",numFound,n
+        self["limit"]=limit
+        self["offset"]=0
         return r
-
-    def extractTag(self, f):
-        out = None
-        if f.tag == "str":
-            out = f.text
-        elif f.tag == "arr":
-            out = []
+    
+    def extractTag(self,f):
+        out=None
+        if f.tag=="str":
+            out=f.text
+        elif f.tag=="arr":
+            out=[]
             for sub in f[:]:
                 out.append(self.extractTag(sub))
-
-        elif f.tag == "float":
+            
+        elif f.tag=="float":
             out = float(f.text)
-        elif f.tag == "int":
+        elif f.tag=="int":
             out = int(f.text)
-        elif f.tag == "date":
-            # Convert to cdtime?
-            out = f.text
+        elif f.tag=="date":
+            ## Convert to cdtime?
+            out =f.text
         else:
-            out = f
-        if isinstance(out, list) and len(out) == 1:
-            out = out[0]
+            out=f
+        if isinstance(out,list) and len(out)==1:
+            out=out[0]
         return out
-
-    def searchDatasets(self, **keys):
+        
+    def searchDatasets(self,**keys):
         resps = self.request(**keys)
-        stringType = keys.get("stringType", False)
+        stringType=keys.get("stringType",False)
         if stringType:
-            return resps
+            return resp
         datasets = []
         for resp in resps:
             for r in resp[:]:
-                if r.tag == "result":
-                    # Ok let's go thru these datasets
+                if r.tag=="result":
+                    ##Ok let's go thru these datasets
                     for d in r[:]:
-                        tmpkeys = {}
+                        #print "************************************************"
+                        tmpkeys={}
                         for f in d[:]:
                             k = f.get("name")
-                            tmpkeys[k] = self.extractTag(f)
-                        if tmpkeys["type"] == "Dataset":
-                            datasets.append(
-                                esgfDataset(host=self.host,
-                                            port=self.port,
-                                            limit=1000,
-                                            offset=0,
-                                            mapping=self.mapping,
-                                            datasetids=self.datasetids,
-                                            fileids=self.fileids,
-                                            keys=tmpkeys,
-                                            originalKeys=keys,
-                                            restPath=self.restPath))
+                            tmpkeys[k]=self.extractTag(f)
+                        if tmpkeys["type"]=="Dataset":
+                            datasetid = tmpkeys["id"]
+                            #print datasetid,self.restPath
+                            #print "KEYS FOR DATASET",keys.keys()
+                            datasets.append(esgfDataset(host=self.host,port=self.port,limit=1000,offset=0,mapping=self.mapping,datasetids=self.datasetids,fileids=self.fileids,keys=tmpkeys,originalKeys=keys,restPath=self.restPath))
         return datasets
 
-
 class esgfDataset(esgfConnection):
-
-    def __init__(self, host=None, port=80, limit=1000, offset=0, mapping=None,
-                 datasetids=None, fileids=None, _http=None, restPath=None, keys={}, originalKeys={}):
+    def __init__(self,host=None,port=80,limit=1000,offset=0,mapping=None,datasetids=None,fileids=None,_http=None,restPath=None,keys={},originalKeys={}):
         if host is None:
             raise esgfDatasetException("You need to pass url")
-        self.host = host
-        # self.host="esg-datanode.jpl.nasa.gov"
-        self.port = port
-        self.defaultSearchType = "File"
+        self.host=host
+        #self.host="esg-datanode.jpl.nasa.gov"
+        self.port=port
+        self.defaultSearchType="File"
         if restPath is None:
-            self.restPath = "/esg-search/search"
+            self.restPath="/esg-search/search"
         else:
-            self.restPath = restPath
+            self.restPath=restPath
         if datasetids is None:
             if "dataset_id_template_" in keys:
-                tmp = keys["dataset_id_template_"]
-                if tmp[:5] == "cmip5":
-                    tmp = tmp.replace("valid_institute", "institute")
-                    tmp = "%(project)" + tmp[5:]
-                self.datasetids = genutil.StringConstructor(
-                    tmp.replace(")s", ")"))
-            elif "project" in keys and keys["project"] == "cmip5":
-                self.datasetids = genutil.StringConstructor(
-                    "%(project).%(product).%(institute).%(model).%(experiment).%(time_frequency).%(realm).%(cmor_table).%(ensemble)")  # noqa
+                tmp=keys["dataset_id_template_"]
+                if tmp[:5]=="cmip5":
+                    tmp = tmp.replace("valid_institute","institute")
+                    tmp="%(project)"+tmp[5:]
+                self.datasetids = genutil.StringConstructor(tmp.replace(")s",")"))
+            elif "project" in keys and keys["project"]=="cmip5":
+                self.datasetids = genutil.StringConstructor("%(project).%(product).%(institute).%(model).%(experiment).%(time_frequency).%(realm).%(cmor_table).%(ensemble)")
             else:
-                self.datasetids = None
-        if isinstance(datasetids, genutil.StringConstructor):
-            self.datasetids = datasetids
-        elif isinstance(datasetids, str):
-            self.datasetids = genutil.StringConstructor(datasetids)
+                self.datasetids=None
+        if isinstance(datasetids,genutil.StringConstructor):
+            self.datasetids=datasetids
+        elif isinstance(datasetids,str):
+            self.datasetids=genutil.StringConstructor(datasetids)
         if fileids is not None:
-            if isinstance(fileids, genutil.StringConstructor):
-                self.fileids = fileids
+            if isinstance(fileids,genutil.StringConstructor):
+                self.fileids=fileids
             else:
-                self.fileids = genutil.StringConstructor(fileids)
+                self.fileids=genutil.StringConstructor(fileids)
             if self.datasetids is not None:
-                self.fileids.template = self.fileids.template.replace(
-                    "%(datasetid)", self.datasetids.template)
+                self.fileids.template=self.fileids.template.replace("%(datasetid)",self.datasetids.template)
         elif self.datasetids is not None:
-            self.fileids = genutil.StringConstructor(
-                "%s.%%(filename)" %
-                self.datasetids.template)
+            self.fileids=genutil.StringConstructor("%s.%%(filename)" % self.datasetids.template)
         else:
-            self.fileids = None
-        self.originalKeys = originalKeys
-        self.validSearchTypes = validSearchTypes
-        self.validSearchTypes = ["File", ]
+            self.fileids=None
+        self.originalKeys=originalKeys
+        self.validSearchTypes=validSearchTypes
+        self.validSearchTypes=["File",]
         self.EsgfObjectException = esgfDatasetException
-        self.params = keys
+        self.params=keys
         self.keys = self.params.keys
         self.items = self.params.items
         self.values = self.params.values
-        self.params["limit"] = limit
-        self.params["offset"] = offset
-        self.mapping = mapping
-        self.resp = None
+        #self.id=self["id"]
+        self.params["limit"]=limit
+        self.params["offset"]=offset
+        self.mapping=mapping
+        #print "SEARCHING DS:",originalKeys
+        self.resp=None
         self.cacheTime = None
-
-    def _extractFiles(self, resp, **inKeys):
-        # We need to stick in there the bit from Luca to fill in the matching
-        # key from facet for now it's empty
-        files = []
+#        self.search()
+#        self.remap()
+        
+        ## Ok now we need to "map" this according to the user wishes
+
+           
+
+    ## def mappedItems():
+    ##     mapped=[]
+    ##     mapppoint=self.mapped
+    ##     for k in self.mapping.keys():
+    ##         keys=[]
+    ##         level=[k,mappoint.keys()]
+    ##         mappoint
+    def _extractFiles(self,resp,**inKeys):
+        ## We need to stick in there the bit from Luca to fill in the matching key from facet for now it's empty
+        files=[]
+        skipped = ["type","title","timestamp","service","id","score","file_url","service_type"]
         for r in resp[:]:
-            if r.tag == "result":
+            if r.tag=="result":
                 for d in r[:][:]:
-                    keys = {}
+                    keys={}
                     for f in d[:]:
                         k = f.get("name")
-                        keys[k] = self.extractTag(f)
-                    if keys["type"] == "File":
-                        files.append(esgfFile(**keys))
+                        keys[k]=self.extractTag(f)
+                    if keys["type"]=="File":
+                        ## if self["id"]=="obs4MIPs.NASA-JPL.AIRS.mon":
+                        ##     verbose=True
+                        ## else:
+                        ##     verbose=False
+                        ## #verbose=True
+                        ## if verbose: print "OK",keys["variable"],keys["file_id"],self["id"]
+                        ## if verbose: print "FILEIDS:",self.fileids
+                        ## if verbose: print "Fileids:",self.fileids.template
+                        ## if verbose: print "keys:",keys
+                        ## if self.fileids is not None:
+                        ##     try:
+                        ##         if verbose: print "file:",keys["file_id"],self.fileids.template
+                        ##         k2 = self.fileids.reverse(keys["file_id"])
+                        ##         if verbose: print "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",k2
+                        ##         for k in k2.keys():
+                        ##             keys[k]=k2[k]
+                        ##     except:
+                        ##         if verbose: print "Failed:",ids[i].text,self.fileids.template
+                        ##         pass
+                        ## if verbose: print "KEYS FOR FILE:",keys.keys()
+                        ## if verbose: print "INKEYS:",inKeys.keys()
+                        ## matched = True
+                        ## matchWithKeys = {}
+                        ## for k in self.keys():
+                        ##     if k in self.originalKeys.keys():
+                        ##         matchWithKeys[k]=self.originalKeys[k]
+                        ##     else:
+                        ##         matchWithKeys[k]=self[k]
+                        ## for s in skipped:
+                        ##     try:
+                        ##         matchWithKeys.pop(s)
+                        ##     except:
+                        ##         pass
+                        ## for k in inKeys.keys():
+                        ##     matchWithKeys[k]=inKeys[k]
+                        ## if verbose: print "matching:",matchWithKeys.keys()
+                        ## for k in keys.keys():
+                        ##     if k in matchWithKeys.keys():
+                        ##         if verbose: print "Testing:",k,keys[k]
+                        ##         v = matchWithKeys[k]
+                        ##         if isinstance(v,(str,int,float)):
+                        ##             if verbose: print "\tComparing with:",v
+                        ##             if v != keys[k]:
+                        ##                 matched = False
+                        ##                 if verbose: print "\t\tNOPE"
+                        ##                 break
+                        ##         elif isinstance(v,list):
+                        ##             if verbose: print "\tComparing with (and %i more):%s"%(len(v),v[0]),v
+                        ##             if not keys[k] in v:
+                        ##                 matched = False
+                        ##                 if verbose: print "\t\tNOPE"
+                        ##                 break
+                        ##         else:
+                        ##             print "\twould compare %s with type: %s if I knew how to" % (str(v),type(v))
+                        ## if verbose: print keys["file_id"],matched
+                        ## if matched :
+                        ##     for k in self.keys():
+                        ##         if not k in keys.keys():
+                        ##             keys[k]=self[k]
+                        ##     print "KEYS:",keys
+                            files.append(esgfFile(**keys))
         return files
-
+            
     def info(self):
         print self
 
     def __str__(self):
         st = "Dataset Information\nid: %s\nKeys:\n" % self.id
         for k in self.keys():
-            st += "\t%s : %s\n" % (k, self[k])
+            st+="\t%s : %s\n" % (k,self[k])
         return st
-
+        
     def clearWebCache(self):
         self.resp = None
 
-    def saveCache(self, target="."):
+    def saveCache(self,target="."):
         if self.resp is None:
             return
         if os.path.isdir(target):
-            target = os.path.join(target, "esgfDatasetsCache.pckl")
+            target = os.path.join(target,"esgfDatasetsCache.pckl")
         if os.path.exists(target):
-            f = open(target)
-            # dict=eval(bz2.decompress(f.read()))
-            dict = eval(f.read())
+            f=open(source)
+            #dict=eval(bz2.decompress(f.read()))
+	    dict=eval(f.read())
             f.close()
         else:
-            dict = {}
-        dict[self.id] = [self["timestamp"],
-                         xml.etree.ElementTree.tostring(
-                         self.resp),
-                         self.originalKeys]
-        f = open(target, "w")
-        # f.write(bz2.compress(repr(self.cache)))
+            dict={}
+        dict[self.id]=[self["timestamp"],xml.etree.ElementTree.tostring(self.resp),self.originalKeys]
+        f=open(target,"w")
+        #f.write(bz2.compress(repr(self.cache)))
         f.write(repr(self.cache))
         f.close()
-
-    def loadCache(self, source):
-        if isinstance(source, dict):
-            dict = source
+        
+    def loadCache(self,source):
+        if isinstance(source,dict):
+            dict=source
         else:
             if os.path.isdir(source):
-                source = os.path.join(source, "esgfDatasetsCache.pckl")
+                source = os.path.join(source,"esgfDatasetsCache.pckl")
             if os.path.exists(source):
-                f = open(source)
-                # dict=eval(bz2.decompress(f.read()))
-                dict = eval(f.read())
+                f=open(source)
+                #dict=eval(bz2.decompress(f.read()))
+                dict=eval(f.read())
                 f.close()
             else:
-                dict = {}
-        vals = dict.get(self.id, ["", None, {}])
+                dict={}
+        vals = dict.get(self.id,["",None,{}])
         if vals[1] is not None:
-            self.cacheTime = vals[0]
-            self.resp = xml.etree.ElementTree.fromstring(vals[0])
-            self.originalKeys = vals[1]
-
+            self.cacheTime=vals[0]
+            self.resp=xml.etree.ElementTree.fromstring(vals[0])
+            self.originalKeys=vals[1]
+        
     def clearOriginalQueryCache(self):
-        self.originalKeys = {}
+        self.originalKeys={}
 
     def clear(self):
         self.clearWebCache()
         self.clearOriginalQueryCache()
-
-    def search(self, **keys):
-        # search = self.generateRequest(**keys)
-        stringType = keys.get("stringType", False)
+    
+    def search(self,**keys):
+        #search = self.generateRequest(**keys)
+        stringType=keys.get("stringType",False)
         keys.update(self.originalKeys)
-        st = ""
-        if "limit" not in keys:
-            keys["limit"] = [self["limit"]]
-        if "offset" not in keys:
-            keys["offset"] = [self["offset"]]
+        st=""
+        if not "limit" in keys:
+            keys["limit"]=[self["limit"]]
+        if not "offset" in keys:
+            keys["offset"]=[self["offset"]]
         for k in keys:
-            if k in ["searchString", "stringType", ]:
+            if k in ["searchString","stringType",]:
                 continue
             for v in keys[k]:
-                st += "&%s=%s" % (k, v)
-            # st+="&%s=%s" % (k,keys[k])
-        # if self.resp is None:
-            # self.resp = self._search("dataset_id=%s%s" %
-            # (self["id"],st),stringType=stringType)
-        self.resp = self._search(st, stringType=stringType)
+                st+="&%s=%s"%(k,v)    
+            #st+="&%s=%s" % (k,keys[k])
+        #if self.resp is None:
+            #self.resp = self._search("dataset_id=%s%s" % (self["id"],st),stringType=stringType)
+        self.resp = self._search(st,stringType=stringType)
         if stringType:
             return self.resp
-        return esgfFiles(self._extractFiles(self.resp, **keys), self)
+        return esgfFiles(self._extractFiles(self.resp,**keys),self)
 
 
 class esgfFiles(object):
-
-    def __init__(self, files, parent,
-                 mapping=None, datasetids=None, fileids=None):
-        self._files = files
-        if not isinstance(parent, esgfDataset):
+    def __init__(self,files,parent,mapping=None,datasetids=None,fileids=None):
+        self._files=files
+        if not isinstance(parent,esgfDataset):
             raise esgfFilesException("parent must be an esgfDataset instance")
-        self.parent = parent
+        self.parent=parent
         self.EsgfObjectException = esgfFilesException
         if datasetids is None:
-            datasetids = parent.datasetids
-        if isinstance(datasetids, genutil.StringConstructor):
-            self.datasetids = datasetids
-        elif isinstance(datasetids, str):
-            self.datasetids = genutil.StringConstructor(datasetids)
+            datasetids=parent.datasetids
+        if isinstance(datasetids,genutil.StringConstructor):
+            self.datasetids=datasetids
+        elif isinstance(datasetids,str):
+            self.datasetids=genutil.StringConstructor(datasetids)
         else:
-            self.datasetids = None
+            self.datasetids=None
         if fileids is not None:
-            if isinstance(fileids, genutil.StringConstructor):
-                self.fileids = fileids
+            if isinstance(fileids,genutil.StringConstructor):
+                self.fileids=fileids
             else:
-                self.fileids = genutil.StringConstructor(fileids)
+                self.fileids=genutil.StringConstructor(fileids)
             if self.datasetids is not None:
-                self.fileids.template = self.fileids.template.replace(
-                    "%(datasetid)", self.datasetids.template)
+                self.fileids.template=self.fileids.template.replace("%(datasetid)",self.datasetids.template)
         elif self.datasetids is not None:
-            self.fileids = genutil.StringConstructor(
-                "%s.%%(filename)" %
-                self.datasetids.template)
+            self.fileids=genutil.StringConstructor("%s.%%(filename)" % self.datasetids.template)
         else:
-            self.fileids = parent.fileids
+            self.fileids=parent.fileids
         if mapping is None:
-            mapping = parent.mapping
+            mapping=parent.mapping
         self.setMapping(mapping)
         self.remap()
-        self.projects_dict = {
-            "CMIP5": "%(project).%(product).%(institute).%(model).%(experiment).%(time_frequency).%(realm).%(cmor_table).%(ensemble)"  # noqa
-            }
-
-    def __getitem__(self, item):
-        if isinstance(item, int):
+        self.projects_dict = {"CMIP5": "%(project).%(product).%(institute).%(model).%(experiment).%(time_frequency).%(realm).%(cmor_table).%(ensemble)" }
+        
+    def __getitem__(self,item):
+        if isinstance(item,int):
             return self._files[item]
-        elif isinstance(item, str):
+        elif isinstance(item,str):
             for f in self._files:
-                if f["id"] == item:
+                if f["id"]==item:
                     return f
-        elif isinstance(item, slice):
+        elif isinstance(item,slice):
             return self._files[item]
         else:
             raise esgfFilesException("unknown item type: %s" % type(item))
-
-    def __setitem__(self, item):
+    def __setitem__(self,item):
         raise esgfFilesException("You cannot set items")
-
     def __len__(self):
         return len(self._files)
-
     def getMapping(self):
-        if isinstance(self.mapping, genutil.StringConstructor):
+        if isinstance(self.mapping,genutil.StringConstructor):
             return self.mapping.template
         else:
             return self.mapping
-
     def getMappingKeys(self):
-        if isinstance(self.mapping, genutil.StringConstructor):
+        if isinstance(self.mapping,genutil.StringConstructor):
             return self.mapping.keys()
         else:
             return None
-
-    def setMapping(self, mapping):
+    def setMapping(self,mapping):
         if mapping is None:
-            self.mapping = ""
+            self.mapping=""
             if self.datasetids is not None:
-                self.mapping = self.datasetids
+                self.mapping=self.datasetids
             else:
                 for k in self.parent.keys():
-                    if k not in ["limit", "offset", "text"]:
-                        self.mapping += "%%(%s)" % k
+                    if not k in ["limit","offset","text"]:
+                        self.mapping+="%%(%s)" % k
         else:
-            self.mapping = mapping
-        # print "Stage 1 mapping:",self.mapping
-        if not isinstance(self.mapping, genutil.StringConstructor):
+            self.mapping=mapping
+        #print "Stage 1 mapping:",self.mapping
+        if not isinstance(self.mapping,genutil.StringConstructor):
             if self.datasetids is not None:
-                self.mapping = self.mapping.replace(
-                    "%(datasetid)",
-                    self.datasetids.template)
+                self.mapping=self.mapping.replace("%(datasetid)",self.datasetids.template)
             self.mapping = genutil.StringConstructor(self.mapping)
-        # print "Stage 2:",self.mapping.template
-
-        # vk = self.parent.keys()
-        # for k in self.mapping.keys():
-        # ok = False
-        # if self.datasetids is not None:
-        # vk += self.datasetids.keys()
-        # if k in self.datasetids.keys():
-        # ok = True
-        # if self.fileids is not None:
-        # vk+=self.fileids.keys()
-        # if k in self.fileids.keys():
-        # ok = True
-        # if k in self.parent.keys():
-        # ok=True
-        # Ok second to last hope... Matching to datasetids
-        # if isinstance(self.datasetids,genutil.StringConstructor) and ok is False:
-        # try:
-        # mapid = self.datasetids.reverse(self.parent.id)
-        # vk+=mapid.keys()
-        # if k in mapid.keys():
-        # ok = True
-
-        # except:
-        # print "Couldn't map: %s to %s" % (self.parent.id,self.datasetids.template)
-        # pass
-        # if ok is False:
-        # vk = set(vk)
-        # raise self.EsgfObjectException("Invalid mapping key: %s, valid keys
-        # are: %s" % (k,sorted(vk)))
-
-    def remap(self, mapping=None, verbose=False):
+        #print "Stage 2:",self.mapping.template
+
+        ## vk = self.parent.keys()
+        ## for k in self.mapping.keys():
+        ##     ok = False
+        ##     if self.datasetids is not None:
+        ##         vk += self.datasetids.keys()
+        ##         if k in self.datasetids.keys():
+        ##             ok = True
+        ##     if self.fileids is not None:
+        ##         vk+=self.fileids.keys()
+        ##         if k in self.fileids.keys():
+        ##             ok = True
+        ##     if k in self.parent.keys():
+        ##         ok=True
+        ##     ## Ok second to last hope... Matching to datasetids
+        ##     if isinstance(self.datasetids,genutil.StringConstructor) and ok is False:
+        ##         try:
+        ##             mapid = self.datasetids.reverse(self.parent.id)
+        ##             vk+=mapid.keys()
+        ##             if k in mapid.keys():
+        ##                 ok = True
+                        
+        ##         except:
+        ##             #print "Couldn't map: %s to %s" % (self.parent.id,self.datasetids.template)
+        ##             pass
+        ##     if ok is False:
+        ##         vk = set(vk)
+        ##         raise self.EsgfObjectException("Invalid mapping key: %s, valid keys are: %s" % (k,sorted(vk)))
+            
+    def remap(self,mapping=None,verbose=False):
         if mapping is None:
             thismapping = self.mapping
         else:
             thismapping = mapping
-        self.mapped = {}
+        self.mapped={}
         savedmapping = thismapping
-        # print "Remap:",self.mapping.template
-        # if verbose: print "################ REMAPPING: %s: %s
-        # #############################" %
-        # (thismapping.template,repr(thismapping.keys()))
+        #print "Remap:",self.mapping.template
+        ## if verbose: print "################ REMAPPING: %s: %s #############################" % (thismapping.template,repr(thismapping.keys()))
         for f in self._files:
-            mappoint = self.mapped
-            tabs = ""
-            nok = 0
+            mappoint=self.mapped
+            tabs=""
+            nok=0
             nlevels = len(thismapping.keys())
-            # print "This mapping",thismapping.template,nlevels
+            #print "This mapping",thismapping.template,nlevels
             if nlevels == 0:
-                # ok no mapping, let's try to figure this one out
+                ## ok no mapping, let's try to figure this one out
                 if 'dataset_id_template_' in f.keys():
-                    # print "We are good to go"
-                    ds = f['dataset_id_template_'].replace(")s", ")")
+                    #print "We are good to go"
+                    ds = f['dataset_id_template_'].replace(")s",")")
                     thismapping = genutil.StringConstructor(ds)
             for k in thismapping.keys():
-                # if verbose: print tabs,"keys:",k,"File keys:",f.keys()
-                # if k == self.mapping.keys()[0]:
-                # f.matched.keys()
-                # else:
-                # if verbose: print
+                ## if verbose: print tabs,"keys:",k,"File keys:",f.keys()
+                ## if k == self.mapping.keys()[0]:
+                ##     f.matched.keys()
+                ## else:
+                ##     ## if verbose: print
                 if k in f.keys():
-                    # if verbose: print tabs,k,f[k]
-                    nok += 1
+                    ## if verbose: print tabs,k,f[k]
+                    nok+=1
                     cont = f[k]
-                    if not isinstance(cont, (str, int, float)):
+                    if not isinstance(cont,(str,int,float)):
                         break
-                    if cont not in mappoint.keys():
-                        mappoint[cont] = {}
+                    if not cont in mappoint.keys():
+                        mappoint[cont]={}
                 elif k in self.parent.keys():
-                    # if verbose: print tabs,k,f[k]
-                    nok += 1
+                    ## if verbose: print tabs,k,f[k]
+                    nok+=1
                     cont = self[k]
-                    if cont not in mappoint.keys():
-                        mappoint[cont] = {}
-                elif isinstance(self.fileids, genutil.StringConstructor):
+                    if not cont in mappoint.keys():
+                        mappoint[cont]={}
+                elif isinstance(self.fileids,genutil.StringConstructor):
                     try:
                         mapid = self.fileids.reverse(self.parent.id)
+                        ## if verbose:
+                            ## print "MAPID:",k,mapid
                         if k in mapid.keys():
-                            nok += 1
+                            ## if verbose: print tabs,k,mapid[k]
+                            nok+=1
                             cont = mapid[k]
-                            if cont not in mappoint.keys():
-                                mappoint[cont] = {}
+                            if not cont in mappoint.keys():
+                                mappoint[cont]={}
                     except:
                         break
                 else:
                     break
-                mappoint = mappoint[cont]
-                tabs += "\t"
-            tmp = mappoint.get("files", [])
+                mappoint=mappoint[cont]
+                tabs+="\t"
+            tmp = mappoint.get("files",[])
             tmp.append(f)
             mappoint["files"] = tmp
             thismapping = savedmapping
-        # if verbose: print "################ REMAPPED: %s
-        # #############################" % (thismapping,)
-
+        ## if verbose: print "################ REMAPPED: %s #############################" % (thismapping,)
 
 class esgfFile(object):
-
-    def __init__(self, **keys):
-        self.__items__ = keys
+    def __init__(self,**keys):
+        self.__items__=keys
         self.keys = self.__items__.keys
         self.items = self.__items__.items
         self.values = self.__items__.values
 
-        services = []
-        # print "Keys:",self.keys()
-        # print self["url"]
-        S = self["url"]
-        if isinstance(S, str):
-            S = [S, ]
+        services=[]
+        #print "Keys:",self.keys()
+        #print self["url"]
+        S=self["url"]
+        if isinstance(S,str):
+            S=[S,]
         for service in S:
-            url, s2, s1 = service.split("|")
-            setattr(self, s1, url)
+            url,s2,s1 = service.split("|")
+            setattr(self,s1,url)
             services.append(s1)
-        self.services = services
-        self.id = self["id"]
+        self.services=services
+        self.id=self["id"]
 
-    def __getitem__(self, key):
+    def __getitem__(self,key):
         val = self.__items__[key]
         return val
-
-    def __setitem__(self, key, value):
-        self.__items__[key] = value
+    
+    def __setitem__(self,key,value):
+        self.__items__[key]=value
         return
 
     def __str__(self):
-        st = "File Information\nid: %s\nParent Dataset: %s" % (
-            self["id"], self["dataset_id"])
-        st += "Matched keys: %s\n" % (repr(self.__items__))
+        st = "File Information\nid: %s\nParent Dataset: %s" % (self["id"],self["dataset_id"])
+        st+="Matched keys: %s\n" % (repr(self.__items__))
         for service in self.services:
-            st += "service: %s @ %s\n" % (service, getattr(self, service))
+            st+="service: %s @ %s\n" % (service,getattr(self,service))
         return st[:-1]
diff --git a/Packages/cdms2/Lib/selectors.py b/Packages/cdms2/Lib/selectors.py
index 9ec6c6721..b2ee04bc6 100644
--- a/Packages/cdms2/Lib/selectors.py
+++ b/Packages/cdms2/Lib/selectors.py
@@ -1,47 +1,42 @@
 
 """Classes to support easy selection of climate data"""
-from .axis import axisMatches
-from .error import CDMSError
-from .grid import AbstractRectGrid, defaultRegion, setRegionSpecs, LongitudeType, LatitudeType, TimeType, VerticalType
+import string, types, cdtime
+from axis import axisMatches
+from error import CDMSError
+from grid import AbstractRectGrid, defaultRegion, setRegionSpecs, LongitudeType, LatitudeType, TimeType, VerticalType
 
 _debug = 0
-
-
 class SelectorError (CDMSError):
-
     "The exception type for errors in the selector packages"
-
-    def __init__(self, args):
+    def __init__ (self, args):
         self.args = args
 
-
 class Selector:
-
     """Selector class"""
-
-    def __init__(self, *args, **kwargs):
+    def __init__ (self, *args, **kwargs):
         """Positional args are SelectorComponents or Selectors
          Keyword args and their value are passed to kwselect to create
-         selectors. All the selector components are put into the
+         selectors. All the selector components are put into the 
          components list of this Selector, along with all the components
          of any Selector arguments.
         """
         self.__components = []
         self.refine(*args, **kwargs)
         for a in args:
-            if isinstance(a, SelectorComponent):
+            if isinstance(a,SelectorComponent):
                 try:
-                    self.__str__ = a.__str__
+                    self.__str__=a.__str__
                 except:
                     pass
 
-    def components(self):
+
+    def components (self):
         "List of selector components, each an instance of SelectorComponent."
         return self.__components[:]
-
-    def refine(self, *args, **kwargs):
-        """Add components to this selector using the same syntax as the
-         constructor. Ignores non-keyword arguments that are not
+    
+    def refine (self, *args, **kwargs):        
+        """Add components to this selector using the same syntax as the 
+         constructor. Ignores non-keyword arguments that are not 
          SelectorComponents or Selectors.
         """
         for a in args:
@@ -51,27 +46,27 @@ class Selector:
                 self.__components.append(a)
             elif isinstance(a, Selector):
                 for x in a.components():
-                    self.refine(x)
+                    self.refine(x)  
             else:
                 self.refine(positionalComponent(a))
 
         for k, v in kwargs.items():
-            self.refine(kwselect(k, v))
-
-    def __repr__(self):
+               self.refine(kwselect(k, v))
+ 
+    def __repr__ (self):
         s = 'Selector('
         sep = ''
         for c in self.__components:
             s = s + sep + repr(c)
             sep = ', '
         return s + ')'
-
-    def __and__(self, other):
-        """Implements the & operator, which returns
+    
+    def __and__ (self, other):
+        """Implements the & operator, which returns 
            self.clone() refined by other
         """
         if not isinstance(other, Selector):
-            raise SelectorError('Cannot combine Selector with non-selector')
+            raise SelectorError, 'Cannot combine Selector with non-selector'
         s = self.clone()
         s.refine(other)
         return s
@@ -80,7 +75,7 @@ class Selector:
         "Makes a copy of this Selector."
         return Selector(*self.__components)
 
-    def __call__(self, *args, **kwargs):
+    def __call__ (self, *args, **kwargs):
         """Return a new selector consisting of this one refined by the given arguments.
            Arguments are as per the constructor or method refine.
         """
@@ -97,31 +92,31 @@ class Selector:
            Options modify the result of the selection. The options and
            their default values are:
                -- raw = 0: if 1, return an numpy.ma only
-               -- squeeze = 0:  If 1, eliminate any dimensions of length 1
+               -- squeeze = 0:  If 1, eliminate any dimensions of length 1 
                                 from the result.
-               -- order = None: If given, is a string such as
+               -- order = None: If given, is a string such as 
                                 variable.getOrder()
                                 returns. Result is permuted into this order.
-               -- grid = None:  If given, is a grid object; result is
+               -- grid = None:  If given, is a grid object; result is 
                                 regridded onto this grid.
            Each of the components contributes arguments suitable for the
-           subRegion call in class cdms.AbstractVariable. If a component
+           subRegion call in class cdms.AbstractVariable. If a component 
            is to modify the same axis as a previous component, its application
            is postponed. subRegion is called and the result is then fed
-           to each of the components' "post" method. This returns a
+           to each of the components' "post" method. This returns a 
            possibly modified result, which becomes the input to the next
-           component's post method.
+           component's post method. 
 
            This procedure is repeated until no more components are postponed.
            Then the options are applied to the result in the order
-           listed above, and the result is returned.
+           listed above, and the result is returned. 
 
            Execption SelectorError is thrown if the selection is
            impossible.
 
            The result is a TransientVariable and id(variable) <> id(result)
            even if there are no components.
-        """
+        """  
         d = kwargs.copy()
         raw = d.setdefault('raw', 0)
         squeeze = d.setdefault('squeeze', 0)
@@ -130,14 +125,13 @@ class Selector:
         del d['squeeze'], d['grid'], d['order'], d['raw']
         # make the selector
         s = self(*args, **d)
-        return s.unmodified_select(variable,
-                                   squeeze=squeeze,
-                                   order=order,
-                                   grid=grid,
+        return s.unmodified_select(variable, 
+                                   squeeze=squeeze, 
+                                   order=order, 
+                                   grid=grid, 
                                    raw=raw)
 
-    def unmodified_select(
-            self, variable, raw=0, squeeze=0, order=None, grid=None):
+    def unmodified_select(self, variable, raw=0, squeeze=0, order=None, grid=None):
         "Select using this selector without further modification"
         result = variable
         components = self.components()
@@ -149,80 +143,71 @@ class Selector:
             newcomponents = []
             specs = defaultRegion()
             for c in components:
-                if c.specifyGrid(variable, vargrid, specs):  # specs is modified
+                if c.specifyGrid(variable, vargrid, specs): # specs is modified
                     newcomponents.append(c)
             components = newcomponents
             if specs != defaultRegion():
                 vgindices = result.getGridIndices()
                 mask, indexspecs = vargrid.intersect(specs)
                 result = result(**indexspecs)
-                result = result.setMaskFromGridMask(
-                    mask,
-                    vgindices)  # Propagate the grid mask to result
+                result = result.setMaskFromGridMask(mask, vgindices) # Propagate the grid mask to result
 
         # Now select on non-coordinate components.
         while(components):
             axes = result.getAxisList()
-            if _debug:
-                print "Axes:", axes
-            specifications = [':'] * len(axes)
-            confined_by = [None] * len(axes)
-            aux = {}  # for extra state
+            if _debug: print "Axes:", axes
+            specifications = [':']*len(axes)
+            confined_by = [None]*len(axes)
+            aux = {} # for extra state 
             overflow = []
-            if _debug:
-                print "Component list:", components
+            if _debug: print "Component list:", components
             for c in components:
                 if c.specify(result, axes, specifications, confined_by, aux):
-                    if _debug:
-                        print 'Defer ' + repr(c)
+                    if _debug: print 'Defer ' + repr(c)
                     overflow.append(c)
                 elif _debug:
                     print "After applying", c, ":"
-                    print "specifications=", specifications
+                    print  "specifications=", specifications
                     print "Confined_by", confined_by
                     print "aux", aux
                     print "-----------------"
-            if _debug:
+            if _debug: 
                 print 'About to call subRegion:', specifications
             fetched = result.subRegion(*specifications)
             axismap = range(len(axes))
             for c in components:
-                if c in overflow:
-                    continue
-                fetched = c.post(fetched, result, axes, specifications,
+                if c in overflow: continue
+                fetched = c.post(fetched, result, axes, specifications, 
                                  confined_by, aux, axismap)
             if not len(overflow) < len(components):
-                raise SelectorError(
-                    'Internal selector error, infinite loop detected.')
+                raise SelectorError, \
+                  'Internal selector error, infinite loop detected.'
             components = overflow
             result = fetched
 
         if squeeze != 0 or \
            order is not None or \
            grid is not None or \
-           raw != 0 or \
-           result is variable:
-            # result is variable when there are no components, for example.
+           raw !=0 or \
+           result is variable: 
+     # result is variable when there are no components, for example.
             return result.subRegion(squeeze=squeeze, order=order, grid=grid,
                                     raw=raw)
         else:
             return result
-
-
+             
 class SelectorComponent:
-
     """Base class representing selection for a given set of axes.
     """
-
-    def specify(self, slab, axes, specifications, confined_by, aux):
-        """Refine the specification suitable for slab.subRegion
+    def specify (self, slab, axes, specifications, confined_by, aux):
+        """Refine the specification suitable for slab.subRegion 
            Set confined_by to yourself for each axis you confine.
-           If you would normally confine an axis to ':', don't,
+           If you would normally confine an axis to ':', don't, 
            unless you *require* that axis not be confined by other
            components.
-
+           
            Returning:
-              Return 1 if you wish to skip your turn. You'll be called
+              Return 1 if you wish to skip your turn. You'll be called 
               later with the results of the other selectors.
 
               Raise a SelectorError exception if you can't do your job.
@@ -233,10 +218,10 @@ class SelectorComponent:
               Store any info you want in dictionary aux[id(self)]
         """
         return 0
-
+    
     def specifyGrid(self, var, grid, specs):
         """Refine the specification suitable for grid.intersect().
-
+        
         'var' is a variable.
         'grid' is the grid associated with the variable.
         'specs' is the result set of specifications, of the form defined in the grid module.
@@ -250,53 +235,47 @@ class SelectorComponent:
         """
         return 1
 
-    def post(self, fetched, slab, axes,
-             specifications, confined_by, aux, axismap):
+    def post (self, fetched, slab, axes, specifications, confined_by, aux, axismap):
         """Post-process fetched if desired, return new value.
-           Arguments slab, axes, specifications, confined_by, and aux are
-           pre-subRegion call.
-
-           axismap gives the indices of fetched's axes in axes and should
+           Arguments slab, axes, specifications, confined_by, and aux are 
+           pre-subRegion call. 
+           
+           axismap gives the indices of fetched's axes in axes and should 
            be modified as required by this method.  Set axismap[i] to None to
            indicate that you have eliminated an axis.
         """
         return fetched
-
-
+    
 class axisComponent (SelectorComponent):
-
     "A SelectorComponent that confines exactly one axis or coordinate dimension (e.g. latitude)."
-
-    def __init__(self, id, spec):
+    def __init__ (self, id, spec):
         self.id = id
         self.spec = spec
 
-    def specify(self, slab, axes, specifications, confined_by, aux):
+    def specify (self, slab, axes, specifications, confined_by, aux):
         "Do specification for axis self.id; skip if axis not present."
         for i in range(len(axes)):
             if axisMatches(axes[i], self.id):
-                if confined_by[i] is None:
-                    specifications[i] = self.spec
-                    confined_by[i] = self
-                    return 0
-                else:
-                    return 1
+               if confined_by[i] is None:
+                   specifications[i] = self.spec
+                   confined_by[i] = self
+                   return 0
+               else:
+                   return 1
         return 0
 
-    def __repr__(self):
-        s = repr(self.__class__) + \
-            '("' + self.id + '", ' + repr(self.spec) + ')'
+    def __repr__ (self):
+        s = repr(self.__class__)+'("'+self.id+'", '+repr(self.spec) + ')'
         return s
-
-
+        
 class coordinateComponent(axisComponent):
-
     "A SelectorComponent that confines exactly one coordinate dimension (e.g., latitude)"
 
     def __init__(self, id, spec):
         axisComponent.__init__(self, id, spec)
 
     def specifyGrid(self, var, grid, specs):
+
         "Determine if this component confines the grid, and if so set the specs and return 1"
         if grid.hasCoordType(self.id):
             setRegionSpecs(grid, self.spec, self.id, specs)
@@ -304,52 +283,42 @@ class coordinateComponent(axisComponent):
         else:
             return 1
 
-
 class requiredComponent (SelectorComponent):
-
     """Checks to see that a specific id axis must be present."""
-
-    def __init__(self, ids):
+    def __init__ (self, ids):
         """Checks to see that a specific axis or axes must be present.
            Initialize with a sequence of ids.
         """
         self.ids = ids
-
-    def specify(self, slab, axes, specifications, confined_by, aux):
+        
+    def specify (self, slab, axes, specifications, confined_by, aux):
         """Doesn't confine but checks for existance."""
         for id in self.ids:
             for i in range(len(axes)):
                 if axisMatches(axes[i], id):
                     break
             else:
-                raise SelectorError(
-                    'Required axis %s not present in this variable.' %
-                    (id,))
+                raise SelectorError, \
+                      'Required axis %s not present in this variable.' % (id,)
         return 0
 
-
 class indexComponent (axisComponent):
-
-    """An axisComponent that confines exactly one axis by
-       specifying indices.
+    """An axisComponent that confines exactly one axis by 
+       specifying indices. 
     """
-
-    def __init__(self, id, start=None, stop=None, stride=None):
+    def __init__ (self, id, start=None, stop=None, stride=None):
         self.id = id
-        self.spec = slice(start, stop, stride)
-
+        self.spec = slice(start,stop, stride)
 
 class indexedComponent (SelectorComponent):
-
-    """A SelectorComponent that confines exactly one axis
-       whose index is given.
+    """A SelectorComponent that confines exactly one axis  
+       whose index is given. 
     """
-
-    def __init__(self, index, value):
+    def __init__ (self, index, value):
         self.index = index
         self.spec = value
 
-    def specify(self, slab, axes, specifications, confined_by, aux):
+    def specify (self, slab, axes, specifications, confined_by, aux):
         "Do the specification for axis whose index is self.index."
         i = self.index
         if confined_by[i] is None:
@@ -359,17 +328,15 @@ class indexedComponent (SelectorComponent):
         else:
             return 1
 
-
 class positionalComponent (SelectorComponent):
-
     """A SelectorComponent that confines the next axis available.
     """
-
-    def __init__(self, v):
+    def __init__ (self, v):
         self.v = v
 
-    def specify(self, slab, axes, specifications, confined_by, aux):
+    def specify (self, slab, axes, specifications, confined_by, aux):
         "Find the next unconfined axis and confine it."
+        n = 0
         for i in range(len(axes)):
             if confined_by[i] is None:
                 specifications[i] = self.v
@@ -377,74 +344,65 @@ class positionalComponent (SelectorComponent):
                 aux[id(self)] = i
                 return 0
         else:
-            raise SelectorError('positional component cannot be applied, insufficent rank:' +
-                                repr(self))
+            raise SelectorError, \
+            'positional component cannot be applied, insufficent rank:' +\
+             repr(self)
 
-    def __repr__(self):
+    def __repr__ (self):
         s = repr(self.__class__) + '(' + repr(self.v) + ')'
         return s
-
-
-def longitude(*value):
+    
+def longitude (*value):
     "Creates default selector corresponding to keyword longitude = value"
     if not value:
         return all
     if len(value) == 1:
         value = value[0]
-    if value == ':':
-        return all
+    if value == ':': return all
     return Selector(coordinateComponent(LongitudeType, value))
-
-
-def latitude(*value):
+    
+def latitude (*value):
     "Creates default selector corresponding to keyword latitude = value"
     if not value:
         return all
     if len(value) == 1:
         value = value[0]
-    if value == ':':
-        return all
+    if value == ':': return all
     return Selector(coordinateComponent(LatitudeType, value))
-
-
-def time(*value):
+    
+def time (*value):
     """Creates a default selector corresponding to keyword time=value
     """
     if not value:
         return all
     if len(value) == 1:
         value = value[0]
-    if value == ':':
-        return all
+    if value == ':': return all
     return Selector(coordinateComponent(TimeType, value))
 
-
-def level(*value):
+def level (*value):
     "Creates default selector corresponding to keyword level = value"
     if not value:
         return all
     if len(value) == 1:
         value = value[0]
-    if value == ':':
-        return all
+    if value == ':': return all
     return Selector(coordinateComponent(VerticalType, value))
 
-
 def required(values):
     """Creates a selector that requires a certain axis to be present."""
     if values is None:
         return all
-    if isinstance(values, basestring):
+    if isinstance(values, types.StringType):
         values = (values,)
     return Selector(requiredComponent(values))
 
-
-def kwselect(k, value):
+def kwselect (k, value):
     """Turn a keyword/value pair into a SelectorComponent
        The words latitude, longitude, time, and level are
        used to pass value to the routine of the same name.
        Otherise, axis is called using k as the id.
-    """
+    """ 
     kx = k[0:3].lower()
     if kx == 'lat':
         return latitude(value)
@@ -458,25 +416,17 @@ def kwselect(k, value):
         return required(value)
     else:
         return Selector(requiredComponent((k,)), axisComponent(k, value))
-
+    
 all = Selector()
 
-
-def timeslice(start=None, stop=None, stride=None):
+def timeslice (start=None,stop=None,stride=None):
     return Selector(indexComponent('time', start, stop, stride))
-
-
-def latitudeslice(start=None, stop=None, stride=None):
+def latitudeslice (start=None,stop=None,stride=None):
     return Selector(indexComponent('latitude', start, stop, stride))
-
-
-def longitudeslice(start=None, stop=None, stride=None):
+def longitudeslice (start=None,stop=None,stride=None):
     return Selector(indexComponent('longitude', start, stop, stride))
-
-
-def levelslice(start=None, stop=None, stride=None):
+def levelslice (start=None,stop=None,stride=None):
     return Selector(indexComponent('level', start, stop, stride))
-
-
-def setslice(id, start=None, stop=None, stride=None):
+def setslice (id, start=None,stop=None,stride=None):
     return Selector(indexComponent(id, start, stop, stride))
+
diff --git a/Packages/cdms2/Lib/slabinterface.py b/Packages/cdms2/Lib/slabinterface.py
index a0fc8910e..e08b49ea5 100644
--- a/Packages/cdms2/Lib/slabinterface.py
+++ b/Packages/cdms2/Lib/slabinterface.py
@@ -1,67 +1,64 @@
-# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
-# Further modified to be pure new numpy June 24th 2008
+## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by 
+## Further modified to be pure new numpy June 24th 2008
 
 "Read part of the old cu slab interface implemented over CDMS"
 import numpy
-import sys
-from .error import CDMSError
-from .axis import std_axis_attributes
+import string, types, sys
+from error import CDMSError
+from axis import std_axis_attributes
 import cdms2 as cdms
 
-
 class Slab:
-
     """Slab is the cu api
        This is an abstract class to inherit in AbstractVariable
        About axes:
        weight and bounds attributes always set but may be None
-       if bounds are None, getdimattribute returns result of querying the
+       if bounds are None, getdimattribute returns result of querying the 
        axis.
     """
     std_slab_atts = ['filename',
-                     'missing_value',
-                     'comments',
-                     'grid_name',
-                     'grid_type',
-                     'time_statistic',
-                     'long_name',
-                     'units']
-
-    def __init__(self):
+                'missing_value',
+                'comments',
+                'grid_name',
+                'grid_type',
+                'time_statistic',
+                'long_name',
+                'units']
+    def __init__ (self):
         pass
 
-    def getattribute(self, name):
+    def getattribute (self, name):
         "Get the attribute name."
-        defaultdict = {'filename': 'N/A',
-                       'comments': '',
-                       'grid_name': 'N/A',
-                       'grid_type': 'N/A',
-                       'time_statistic': '',
-                       'long_name': '',
-                       'units': ''}
+        defaultdict = {'filename':'N/A',
+                       'comments':'',
+                       'grid_name':'N/A',
+                       'grid_type':'N/A',
+                       'time_statistic':'',
+                       'long_name':'',
+                       'units':''}
         result = None
-        if name in defaultdict.keys() and not hasattr(self, name):
-            if name == 'filename':
-                if (not hasattr(self, 'parent')) or self.parent is None:
+        if name in defaultdict.keys() and not hasattr(self,name):
+            if name=='filename':
+                if (not hasattr(self,'parent')) or self.parent is None:
                     result = ''
                 else:
                     result = self.parent.id
 
-            elif name == 'grid_name':
+            elif name=='grid_name':
                 grid = self.getGrid()
                 if grid is None:
                     result = defaultdict[name]
                 else:
                     result = grid.id
-            elif name == 'grid_type':
+            elif name=='grid_type':
                 grid = self.getGrid()
                 if grid is None:
                     result = defaultdict[name]
-                elif isinstance(grid, cdms.grid.TransientRectGrid):
+                elif isinstance(grid,cdms.grid.TransientRectGrid):
                     result = grid.getType()
-                elif isinstance(grid, cdms.gengrid.AbstractGenericGrid):
+                elif isinstance(grid,cdms.gengrid.AbstractGenericGrid):
                     result = 'GenericGrid'
-                elif isinstance(grid, cdms.hgrid.AbstractCurveGrid):
+                elif isinstance(grid,cdms.hgrid.AbstractCurveGrid):
                     result = 'CurvilinearGrid'
             else:
                 result = defaultdict[name]
@@ -70,23 +67,23 @@ class Slab:
                 result = getattr(self, name)
             except AttributeError:
                 result = None
-
+            
         return result
 
-    def setattribute(self, name, value):
+    def setattribute (self, name, value):
         "Set the attribute name to value."
         setattr(self, name, value)
 
-    def createattribute(self, name, value):
+    def createattribute (self, name, value):
         "Create an attribute and set its name to value."
         setattr(self, name, value)
 
-    def deleteattribute(self, name):
+    def deleteattribute (self, name):
         "Delete the named attribute."
         if hasattr(self, name):
             delattr(self, name)
 
-    def listattributes(self):
+    def listattributes (self):
         "Return a list of attribute names."
         return self.attributes.keys()
 
@@ -95,11 +92,10 @@ class Slab:
         a = self.getAxis(dim)
         result = []
         for x in std_axis_attributes + a.attributes.keys():
-            if x not in result:
-                result.append(x)
+            if not x in result: result.append(x)
         return result
 
-    def getdimattribute(self, dim, field):
+    def getdimattribute (self, dim, field):
         """Get the attribute named field from the dim'th dimension.
          For bounds returns the old cu one-dimensional version.
         """
@@ -125,37 +121,38 @@ class Slab:
                 return g.getWeights()[0]
             elif d.isLongitude():
                 return g.getWeights()[1]
-            else:  # should be impossible, actually
+            else: #should be impossible, actually
                 return numpy.ones(len(d))
 
         elif field == "bounds":
             b = d.getBounds()
             n = b.shape[0]
-            result = numpy.zeros(n + 1, b.dtype.char)
-            result[0:-1] = b[:, 0]
-            result[-1] = b[-1, 1]
+            result = numpy.zeros(n+1, b.dtype.char)
+            result[0:-1] = b[:,0]
+            result[-1] = b[-1,1]
             return result
-        elif field in d.attributes:
+        elif d.attributes.has_key(field):
             return d.attributes[field]
         else:
-            raise CDMSError("No %s attribute on given axis." % field)
-
+            raise CDMSError, "No %s attribute on given axis." % field
+            
+          
     def showdim(self):
-        "Show the dimension attributes and values."
+        "Show the dimension attributes and values." 
         result = []
         for nd in range(self.rank()):
-            result.append('** Dimension ' + str(nd + 1) + ' **')
+            result.append('** Dimension ' + str(nd+1) + ' **')
             result = result + self.getAxis(nd).listall(1)
-        print '\n'.join(result)
+        print string.join(result, '\n')
 
     def listdimnames(self):
         "Return a list of the names of the dimensions."
-        result = []
+        result=[]
         for nd in range(self.rank()):
             result.append(self.getdimattribute(nd, 'name'))
         return result
 
-    def listall(self, all=None):
+    def listall (self, all=None):
         "Get list of info about this slab."
         vname = self.id
         result = []
@@ -165,10 +162,8 @@ class Slab:
         for x in Slab.std_slab_atts:
             result.append(x + ": " + str(self.getattribute(x)))
         for x in self.attributes.keys():
-            if x in Slab.std_slab_atts:
-                continue
-            if x == 'name':
-                continue
+            if x in Slab.std_slab_atts: continue
+            if x == 'name': continue
             result.append(x + ": " + str(self.attributes[x]))
         g = self.getGrid()
         if g is None:
@@ -176,29 +171,29 @@ class Slab:
         else:
             result = result + g.listall(all)
         for nd in range(self.rank()):
-            result.append('** Dimension ' + str(nd + 1) + ' **')
+            result.append('** Dimension ' + str(nd+1) + ' **')
             result = result + self.getAxis(nd).listall(all)
         result.append('*** End of description for %s ***' % vname)
         return result
 
     def info(self, flag=None, device=None):
         "Write info about slab; include dimension values and weights if flag"
-        if device is None:
-            device = sys.stdout
-        device.write('\n'.join(self.listall(all=flag)))
+        if device is None: device = sys.stdout
+        device.write(string.join(self.listall(all=flag), "\n"))
         device.write("\n")
 
-
-def cdms_bounds2cu_bounds(b):
+def cdms_bounds2cu_bounds (b):
     "Bounds are  len(v) by 2 in cdms but len(v)+1 in cu"
-    cub = numpy.ma.zeros(len(b) + 1, numpy.float32)
-    if len(b) > 1:
-        if (b[0, 0] < b[0, 1]) == (b[0, 0] < b[-1, 0]):
-            cub[0] = b[0, 0]
-            cub[1:] = b[:, 1]
+    cub = numpy.ma.zeros(len(b)+1, numpy.float32)
+    b1 = b.astype(numpy.float32)
+    if len(b)>1:
+        if (b[0,0]<b[0,1]) == (b[0,0]<b[-1,0]):
+            cub[0] = b[0,0]
+            cub[1:] = b[:,1]
         else:
-            cub[0] = b[0, 1]
-            cub[1:] = b[:, 0]
+            cub[0] = b[0,1]
+            cub[1:] = b[:,0]
     else:
         cub[:] = b[0]
-    return numpy.array(cub)
+    return numpy.array( cub )
+    
diff --git a/Packages/cdms2/Lib/sliceut.py b/Packages/cdms2/Lib/sliceut.py
index 4b8b55821..e69e83262 100644
--- a/Packages/cdms2/Lib/sliceut.py
+++ b/Packages/cdms2/Lib/sliceut.py
@@ -6,41 +6,41 @@
 # Returns a slice, or None if the intersection is empty.
 
 
-def sliceIntersect(aSlice, interval):
-    p0, p1 = interval
+def sliceIntersect(aSlice,interval):
+    p0,p1 = interval
     i = aSlice.start
     j = aSlice.stop
     k = aSlice.step
     if k is None:
-        k = 1
+        k=1
 
     # If the slice has a negative step, generate the
     # equivalent slice with positive step
-    irev = 0
-    if k < 0:
+    irev=0
+    if k<0:
         k = -k
-        pk = ((j - i + k) / k) * k + i
-        j = i + 1
+        pk = ((j-i+k)/k)*k+i
+        j = i+1
         i = pk
         irev = 1
 
     # Calculate the intersection for an increasing slice
-    px = ((p0 - i + k - 1) / k) * k + i
-    a = max(px, i)
-    b = min(j, p1)
-    if a < b:
-        if k == 1:
-            newSlice = slice(a, b)
+    px = ((p0-i+k-1)/k)*k+i
+    a = max(px,i)
+    b = min(j,p1)
+    if a<b:
+        if k==1:
+            newSlice = slice(a,b)
         else:
-            newSlice = slice(a, b, k)
+            newSlice = slice(a,b,k)
     else:
         newSlice = None
 
     # Reverse the slice if necessary
-    if irev == 1 and newSlice is not None:
-        px = -((-b + a + k) / k * k - a)
-        newSlice = slice(px, a - 1, -k)
-
+    if irev==1 and newSlice is not None:
+        px = -((-b+a+k)/k*k-a)
+        newSlice = slice(px,a-1,-k)
+    
     return newSlice
 
 # Intersect a slice with a partition. The partition is a list of
@@ -50,23 +50,21 @@ def sliceIntersect(aSlice, interval):
 # in the same order as in the partition. If the intersection is empty,
 # the result is an empty list.
 
-
-def slicePartition(aSlice, partition):
+def slicePartition(aSlice,partition):
     result = []
     for interval in partition:
-        intslice = sliceIntersect(aSlice, interval)
+        intslice = sliceIntersect(aSlice,interval)
         if intslice is not None:
-            result.append((interval, intslice))
+            result.append((interval,intslice))
     return result
 
-
 def lenSlice(aSlice):
     "Return the number of values associated with a slice"
 
     step = aSlice.step
     if step is None:
         step = 1
-    if step > 0:
+    if step>0:
         start = aSlice.start
         stop = aSlice.stop
     else:
@@ -74,131 +72,121 @@ def lenSlice(aSlice):
         stop = aSlice.start
         step = -step
 
-    return ((stop - start - 1) / step + 1)
-
+    return ((stop-start-1)/step + 1)
 
-def reverseSlice(s, size):
+def reverseSlice(s,size):
     """For 'reversed' slices (slices with negative stride),
     return an equivalent slice with positive step. For positive
     strides, just return the slice unchanged.
     """
-    if s.step > 0 or s.step is None:
+    if s.step>0 or s.step is None:
         return s
 
     i = s.start
     j = s.stop
     k = s.step
     if i is None:
-        i = size - 1
-    elif i < 0:
-        i = i % size
+        i=size-1
+    elif i<0:
+        i = i%size
     if j is None:
-        j = -1
-    elif -size - 1 < j < 0:
-        j = j % size
-
-    if i < -size or j < -size - 1:
-        raise 'Invalid slice', repr(s)
+        j=-1
+    elif -size-1<j<0:
+        j = j%size
+    
+    if i<-size or j<-size-1:
+        raise 'Invalid slice',`s`
 
     k = -k
-    pk = ((j - i + k) / k) * k + i
-    j = i + 1
-    i = pk % size
+    pk = ((j-i+k)/k)*k+i
+    j = i+1
+    i = pk%size
 
-# if j==size:
-# j = None
+##     if j==size:
+##         j = None
 
-    return slice(i, j, k)
+    return slice(i,j,k)
 
 
-def splitSlice(s, size):
+def splitSlice(s,size):
     """For a 'wraparound' slice, return two equivalent slices
     within the range 0..size-1."""
-    i, j, k = s.start, s.stop, s.step
-    if k > 0:
-        wrap1 = slice(i, size, k)
-        wrap2 = slice((i - size) % k, j - size, k)
+    i,j,k = s.start,s.stop,s.step
+    if k>0:
+        wrap1 = slice(i,size,k)
+        wrap2 = slice((i-size)%k, j-size, k)
     else:
-        wrap1 = slice(i - size, None, k)
-        wrap2 = slice(size + (i - size) % k, j, k)
-    return (wrap1, wrap2)
+        wrap1 = slice(i-size, None, k)
+        wrap2 = slice(size+(i-size)%k, j, k)
+    return (wrap1,wrap2)
 
 
-def splitSliceExt(s, size):
+def splitSliceExt(s,size):
     """
     mf 20010330 --
     For a 'wraparound' slice, return N equivalent slices
     within the range 0...(N*size) N = anything"""
-    i, j, k = s.start, s.stop, s.step
+    i,j,k = s.start,s.stop,s.step
 
     # slice of form [i:] sets j to large int
-    if j > 2000000000:
+    if j>2000000000L:
         j = size
 
-    _debug = 0
-    if(_debug):
-        print "SSSS0: ", i, j, k
-
-    wrap = []
-
-    if k > 0:
-
-        iter = 0
-        if(_debug):
-            print "SSSS1: iter ", iter, j, size, k
-        while(j > 0):
-            if(_debug):
-                print " "
-            if(_debug):
-                print "SSSS2: iter", iter, j, size, k
-            jo = size
-            if(iter > 0):
-                jo = size + 1
-            if(_debug):
-                print "SSSS3: iter", iter, j, jo
-            if(j < size):
-                jo = j
-            if(_debug):
-                print "SSSS4: iter", iter, j, jo
-            wrap.append(slice(i, jo, k))
-            j = j - size
-            i = 0
-            iter = iter + 1
-
+    _debug=0
+    if(_debug): print "SSSS0: ",i,j,k
+
+    wrap=[]
+
+    if k>0:
+
+        iter=0
+        if(_debug): print "SSSS1: iter ",iter,j,size,k
+        while(j>0):
+            if(_debug): print " "
+            if(_debug): print "SSSS2: iter",iter,j,size,k
+            jo=size
+            if(iter>0): jo=size+1
+            if(_debug): print "SSSS3: iter",iter,j,jo
+            if(j<size): jo=j
+            if(_debug): print "SSSS4: iter",iter,j,jo
+            wrap.append(slice(i,jo,k))
+            j=j-size
+            i=0
+            iter=iter+1
+            
     else:
 
-        wraprev = []
-        iter = 0
-        if(_debug):
-            print "SSSS1 neg: iter ", iter, i, j, size, k
-        while(i >= 0):
-            if(_debug):
-                print " "
-            if(_debug):
-                print "SSSS2 neg: iter", iter, i, j, size, k
-            io = size - 1
-            if(_debug):
-                print "SSSS3 neg: iter", iter, i, j, io
-            if(i < size):
-                io = i
-            if(_debug):
-                print "SSSS4 neg: iter", iter, i, j, io
-
-            # mf 20010405 python does not return nothing for
-            # slice(size-1,size-1,-1); force it
-            if(not (io == size - 1 and j == size - 1)):
-                wraprev.append(slice(io, j, k))
-
-            i = i - size
-            j = None
-            iter = iter + 1
+        wraprev=[]
+        iter=0
+        if(_debug): print "SSSS1 neg: iter ",iter,i,j,size,k
+        while(i>=0):
+            if(_debug): print " "
+            if(_debug): print "SSSS2 neg: iter",iter,i,j,size,k
+            io=size-1
+            if(_debug): print "SSSS3 neg: iter",iter,i,j,io
+            if(i<size): io=i
+            if(_debug): print "SSSS4 neg: iter",iter,i,j,io
+            
+            # mf 20010405 python does not return nothing for slice(size-1,size-1,-1); force it
+            if( not ( io==size-1 and j==size-1 ) ):
+                wraprev.append(slice(io,j,k))
+            
+            i=i-size
+            j=None
+            iter=iter+1
         #
         # reverse
         #
-        for k in range(0, len(wraprev)):
-            kk = len(wraprev) - k - 1
+        for k in range(0,len(wraprev)):
+            kk=len(wraprev)-k-1
             wrap.append(wraprev[kk])
-            if(_debug):
-                print "SSSS5 neg: ", kk, wraprev[kk]
+            if(_debug): print "SSSS5 neg: ",kk,wraprev[kk]
 
     return (wrap)
+
+
+
+
+
+
+
diff --git a/Packages/cdms2/Lib/tvariable.py b/Packages/cdms2/Lib/tvariable.py
index c78ab81ca..152875adf 100644
--- a/Packages/cdms2/Lib/tvariable.py
+++ b/Packages/cdms2/Lib/tvariable.py
@@ -1,4 +1,4 @@
-# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
+# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by 
 # Further modified to be pure new numpy June 24th 2008
 
 """
@@ -8,18 +8,19 @@ Contains also the write part of the old cu interface.
 """
 import json
 import re
-from . import typeconv
+import types
+import typeconv
 import numpy
 from numpy import sctype2char
-from .error import CDMSError
-from .avariable import AbstractVariable
+from error import CDMSError
+from avariable import AbstractVariable
 
-from .axis import createAxis, AbstractAxis
-from .grid import createRectGrid, AbstractRectGrid
-from .hgrid import AbstractCurveGrid
-from .gengrid import AbstractGenericGrid
+from axis import createAxis, AbstractAxis
+from grid import createRectGrid, AbstractRectGrid
+from hgrid import AbstractCurveGrid
+from gengrid import AbstractGenericGrid
 
-# dist array support
+# dist array support 
 HAVE_MPI = False
 try:
     from mpi4py import MPI
@@ -30,43 +31,38 @@ except:
 
 id_builtin = id  # built_in gets clobbered by keyword
 
-
 def fromJSON(jsn):
     """ Recreate a TV from a dumped jsn object"""
     D = json.loads(jsn)
 
-    # First recreates the axes
-    axes = []
+    ## First recreates the axes
+    axes=[]
     for a in D["_axes"]:
-        ax = createAxis(
-            numpy.array(a["_values"],
-                        dtype=a["_dtype"]),
-            id=a["id"])
-        for k, v in a.iteritems():
-            if k not in ["_values", "id", "_dtype"]:
-                setattr(ax, k, v)
+        ax = createAxis(numpy.array(a["_values"],dtype=a["_dtype"]),id=a["id"])
+        for k,v in a.iteritems():
+            if not k in ["_values","id","_dtype"]:
+                setattr(ax,k,v)
         axes.append(ax)
-    # Now prep the variable
-    V = createVariable(D["_values"], id=D["id"], typecode=D["_dtype"])
+    ## Now prep the variable
+    V= createVariable(D["_values"],id=D["id"],typecode=D["_dtype"])
     V.setAxisList(axes)
-    for k, v in D.iteritems():
-        if k not in ["id", "_values", "_axes", "_grid", "_fill_value", "_dtype", ]:
-            setattr(V, k, v)
+    for k,v in D.iteritems():
+        if not k in ["id","_values","_axes","_grid","_fill_value","_dtype",]:
+            setattr(V,k,v)
     V.set_fill_value(D["_fill_value"])
     return V
 
 
-class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
-
+class TransientVariable(AbstractVariable,numpy.ma.MaskedArray):
     "An in-memory variable."
     variable_count = 0
     _missing = numpy.ma.MaskedArray.fill_value
 
+
     def _getShape(self):
         return self._data.shape
 
-    shape = property(_getShape, None)
-
+    shape = property(_getShape,None)
     def iscontiguous(self):
         return self.flags['CONTIGUOUS']
 
@@ -75,82 +71,79 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
         out = numpy.ascontiguousarray(d)
         m = numpy.ma.getmask(self)
         if m is not numpy.ma.nomask:
-            m = numpy.ascontiguousarray(m)
-        out = TransientVariable(out, mask=m, attributes=self.attributes)
+            m= numpy.ascontiguousarray(m)
+        out = TransientVariable(out,mask=m,attributes=self.attributes)
         out.setAxisList(self.getAxisList())
         out.setMissing(self.getMissing())
         return out
-
+    
     ascontiguous = ascontiguousarray
-
+    
     def asma(self):
-        return numpy.ma.array(self._data, mask=self._mask)
-
-    def _update_from(self, obj):
-        numpy.ma.MaskedArray._update_from(self, obj)
-        if not hasattr(self, '___cdms_internals__'):
-            self.__dict__[
-                '___cdms_internals__'] = [
-                    '__cdms_internals__',
-                    '___cdms_internals__',
-                    '_node_',
-                    'parent',
-                    'attributes',
-                    'shape']
-        if not hasattr(self, 'attributes'):
-            self.attributes = {}
-        self._grid_ = getattr(obj, '_grid_', None)
+        return numpy.ma.array(self._data,mask=self._mask)
+    
+    def _update_from(self,obj):
+        numpy.ma.MaskedArray._update_from(self,obj)
+        if not hasattr(self,'___cdms_internals__'):
+            self.__dict__['___cdms_internals__']=['__cdms_internals__','___cdms_internals__','_node_','parent','attributes','shape']
+        if not hasattr(self,'attributes'):
+            self.attributes={}
+        self._grid_ = getattr(obj,'_grid_',None)
         try:
-            for nm, val in obj.__dict__.items():
-                if nm[0] == '_':
+            for nm,val in obj.__dict__.items():
+                if nm[0]=='_':
+##                     print nm
                     pass
+##                     self.__dict__[nm]=val
                 else:
-                    setattr(self, nm, val)
-        except Exception:
+                    setattr(self,nm,val)
+        except Exception,err:
             pass
-        id = getattr(self, 'id', None)
+        id = getattr(self,'id',None)
         if id is None:
-            TransientVariable.variable_count += 1
-            id = 'variable_' + str(TransientVariable.variable_count)
-            self.id = id
-        self.name = getattr(obj, 'name', id)
-        if not hasattr(self, '__domain'):
+            TransientVariable.variable_count+=1
+            id = 'variable_'+str(TransientVariable.variable_count)
+            self.id=id
+        self.name = getattr(obj,'name',id)
+        if not hasattr(self,'__domain'):
             self.initDomain(axes=None)
 
-    def __array_finalize__(self, obj):
-        numpy.ma.MaskedArray.__array_finalize__(self, obj)
+
+    def __array_finalize__(self,obj):
+        numpy.ma.MaskedArray.__array_finalize__(self,obj)
         return
 
-    __mul__ = AbstractVariable.__mul__
-    __rmul__ = AbstractVariable.__rmul__
-    __imul__ = AbstractVariable.__imul__
-    __abs__ = AbstractVariable.__abs__
-    __neg__ = AbstractVariable.__neg__
-    __add__ = AbstractVariable.__add__
-    __iadd__ = AbstractVariable.__iadd__
-    __radd__ = AbstractVariable.__radd__
+    
+    __mul__    = AbstractVariable.__mul__
+    __rmul__   = AbstractVariable.__rmul__
+    __imul__   = AbstractVariable.__imul__
+    __abs__    = AbstractVariable.__abs__
+    __neg__    = AbstractVariable.__neg__
+    __add__    = AbstractVariable.__add__
+    __iadd__   = AbstractVariable.__iadd__
+    __radd__   = AbstractVariable.__radd__
     __lshift__ = AbstractVariable.__lshift__
     __rshift__ = AbstractVariable.__rshift__
-    __sub__ = AbstractVariable.__sub__
-    __rsub__ = AbstractVariable.__rsub__
-    __isub__ = AbstractVariable.__isub__
-    __div__ = AbstractVariable.__div__
-    __rdiv__ = AbstractVariable.__rdiv__
-    __idiv__ = AbstractVariable.__idiv__
-    __pow__ = AbstractVariable.__pow__
-    __eq__ = AbstractVariable.__eq__
-    __ne__ = AbstractVariable.__ne__
-    __lt__ = AbstractVariable.__lt__
-    __le__ = AbstractVariable.__le__
-    __gt__ = AbstractVariable.__gt__
-    __ge__ = AbstractVariable.__ge__
-    __sqrt__ = AbstractVariable.__sqrt__
-
-    def __init__(self, data, typecode=None, copy=1, savespace=0,
+    __sub__    = AbstractVariable.__sub__
+    __rsub__   = AbstractVariable.__rsub__    
+    __isub__   = AbstractVariable.__isub__    
+    __div__    = AbstractVariable.__div__
+    __rdiv__   = AbstractVariable.__rdiv__
+    __idiv__   = AbstractVariable.__idiv__
+    __pow__   = AbstractVariable.__pow__
+    __eq__    = AbstractVariable.__eq__
+    __ne__    = AbstractVariable.__ne__
+    __lt__    = AbstractVariable.__lt__
+    __le__    = AbstractVariable.__le__
+    __gt__    = AbstractVariable.__gt__
+    __ge__    = AbstractVariable.__ge__
+    __sqrt__    = AbstractVariable.__sqrt__
+
+    def __init__(self,data, typecode=None, copy=1, savespace=0, 
                  mask=numpy.ma.nomask, fill_value=None, grid=None,
-                 axes=None, attributes=None, id=None, copyaxes=1, dtype=None,
-                 order=False, no_update_from=False, **kargs):
-        """createVariable (self, data, typecode=None, copy=0, savespace=0,
+                 axes=None, attributes=None, id=None, copyaxes=1, dtype=None, 
+                 order=False, no_update_from=False,**kargs):
+        """createVariable (self, data, typecode=None, copy=0, savespace=0, 
                  mask=None, fill_value=None, grid=None,
                  axes=None, attributes=None, id=None, dtype=None, order=False)
            The savespace argument is ignored, for backward compatibility only.
@@ -158,68 +151,69 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
         try:
             if data.fill_value is not None:
                 self._setmissing(data.fill_value)
-                fill_value = data.fill_value
+                fill_value=data.fill_value
         except:
             pass
         if fill_value is not None:
-            self._setmissing(fill_value)
-        if attributes is not None and "_FillValue" in attributes.keys():
-            self._setmissing(attributes["_FillValue"])
+           self._setmissing(fill_value)
+        if attributes is not None  and "_FillValue" in attributes.keys():
+           self._setmissing(attributes["_FillValue"])
 
-        # tile index, None means no mosaic
+        # tile index, None means no mosaic 
         self.tileIndex = None
-
+        
         # Compatibility: assuming old typecode, map to new
         if dtype is None and typecode is not None:
             dtype = typeconv.convtypecode2(typecode)
         typecode = sctype2char(dtype)
-        if isinstance(data, tuple):
+        if type(data) is types.TupleType:
             data = list(data)
-
-        AbstractVariable.__init__(self)
+        
+        AbstractVariable.__init__ (self)
 
         if isinstance(data, AbstractVariable):
             if not isinstance(data, TransientVariable):
                 data = data.subSlice()
-# if attributes is None: attributes = data.attributes
+##             if attributes is None: attributes = data.attributes
             if axes is None and not no_update_from:
                 axes = map(lambda x: x[0], data.getDomain())
             if grid is None and not no_update_from:
                 grid = data.getGrid()
                 if (grid is not None) and (not isinstance(grid, AbstractRectGrid)) \
-                        and (not grid.checkAxes(axes)):
-                    grid = grid.reconcile(
-                        axes)  # Make sure grid and axes are consistent
+                                      and (not grid.checkAxes(axes)):
+                    grid = grid.reconcile(axes) # Make sure grid and axes are consistent
+
+        ncopy = (copy!=0)
+
 
         # Initialize the geometry
         if grid is not None:
-            copyaxes = 0                  # Otherwise grid axes won't match domain.
+            copyaxes=0                  # Otherwise grid axes won't match domain.
         if axes is not None:
-            self.initDomain(axes, copyaxes=copyaxes)
-        # Note: clobbers the grid, so set the grid after.
+            self.initDomain(axes, copyaxes=copyaxes)           # Note: clobbers the grid, so set the grid after.
         if grid is not None:
             self.setGrid(grid)
-
+ 
         # Initialize the attributes
         if attributes is not None:
             for key, value in attributes.items():
-                if (key in ['shape', 'flat', 'imaginary', 'real'] or key[0] == '_') and key not in ['_FillValue']:
-                    raise CDMSError('Bad key in attributes: ' + key)
+                if (key in ['shape','flat','imaginary','real'] or key[0]=='_') and key not in ['_FillValue']:
+                    raise CDMSError, 'Bad key in attributes: ' + key
                 elif key == 'missing_value':
-                    # ignore if fill value given explicitly
+                    #ignore if fill value given explicitly
                     if fill_value is None:
                         self._setmissing(value)
-                elif key not in ['scale_factor', 'add_offset']:
+                elif key not in ['scale_factor','add_offset']:
                     setattr(self, key, value)
 
         # Sync up missing_value attribute and the fill value.
         self.missing_value = self._getmissing()
         self._FillValue = self._getmissing()
         if id is not None:
-            if not isinstance(id, (unicode, str)):
-                raise CDMSError('id must be a string')
+            if not isinstance(id,(unicode,str)): 
+                raise CDMSError, 'id must be a string'
             self.id = id
-        elif hasattr(data, 'id'):
+        elif hasattr(data,'id'):
             self.id = data.id
 
         if self.id is None:
@@ -234,21 +228,22 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
         self.__mpiWindows = {}
         self.__mpiType = self.__getMPIType()
 
+
     def _getmissing(self):
         return self._missing
 
-    def _setmissing(self, value):
-        self._missing = numpy.array(value).astype(self.dtype)
+    def _setmissing(self,value):
+        self._missing=numpy.array(value).astype(self.dtype)
 
-    missing = property(_getmissing, _setmissing)
-    fill_value = property(_getmissing, _setmissing)
-    _FillValue = property(_getmissing, _setmissing)
-    missing_value = property(_getmissing, _setmissing)
+    missing       = property(_getmissing,_setmissing)
+    fill_value    = property(_getmissing,_setmissing)
+    _FillValue    = property(_getmissing,_setmissing)
+    missing_value = property(_getmissing,_setmissing)
 
-    def __new__(cls, data, typecode=None, copy=0, savespace=0,
-                mask=numpy.ma.nomask, fill_value=None, grid=None,
-                axes=None, attributes=None, id=None, copyaxes=1, dtype=None, order=False, **kargs):
-        """createVariable (self, data, typecode=None, copy=0, savespace=0,
+    def __new__(cls, data, typecode=None, copy=0, savespace=0, 
+                 mask=numpy.ma.nomask, fill_value=None, grid=None,
+                 axes=None, attributes=None, id=None, copyaxes=1, dtype=None, order=False,**kargs):
+        """createVariable (self, data, typecode=None, copy=0, savespace=0, 
                  mask=None, fill_value=None, grid=None,
                  axes=None, attributes=None, id=None, dtype=None, order=False)
            The savespace argument is ignored, for backward compatibility only.
@@ -257,67 +252,68 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
         if dtype is None and typecode is not None:
             dtype = typeconv.convtypecode2(typecode)
         typecode = sctype2char(dtype)
-        if isinstance(data, tuple):
+        if type(data) is types.TupleType:
             data = list(data)
         if isinstance(data, AbstractVariable):
             if not isinstance(data, TransientVariable):
                 data = data.subSlice()
         if isinstance(data, numpy.ma.MaskedArray):
             try:
-                if fill_value is None:
-                    fill_value = data.fill_value
+                if fill_value is None: fill_value = data.fill_value
             except:
                 pass
 
-        ncopy = (copy != 0)
+        ncopy = (copy!=0)
         if mask is None:
             try:
                 mask = data.mask
-            except Exception:
+            except Exception,err:
                 mask = numpy.ma.nomask
 
         # Handle the case where ar[i:j] returns a single masked value
         if data is numpy.ma.masked:
-            # shape = tuple(len(axes)*[1])
+            #shape = tuple(len(axes)*[1])
             data = numpy.ma.masked.data
-            # data.shape = shape
+            #data.shape = shape
             mask = numpy.ma.masked.mask
-            # mask.shape = shape
-# if data.getattr('mask',None) is not numpy.ma.nomask:
-# mask = data.mask
-# print 'passing:',mask.shape,data.shape,numpy.shape(cls)
+            #mask.shape = shape
+##         if data.getattr('mask',None) is not numpy.ma.nomask:
+##             mask = data.mask
+##         print 'passing:',mask.shape,data.shape,numpy.shape(cls)
         if fill_value is not None:
             fill_value = numpy.array(fill_value).astype(dtype)
         else:
             fill_value = numpy.ma.MaskedArray(1).astype(dtype).item()
 
-        self = numpy.ma.MaskedArray.__new__(cls, data, dtype=dtype,
-                                            copy=ncopy,
-                                            mask=mask,
-                                            fill_value=fill_value,
-                                            subok=False,
-                                            order=order)
 
+        self = numpy.ma.MaskedArray.__new__(cls, data, dtype = dtype,
+                                      copy = ncopy,
+                                      mask = mask,
+                                      fill_value = fill_value,
+                                      subok = False,
+                                      order = order)
+
+            
+        
         return self
 
     # typecode = numpy.ma.array.typecode
     def typecode(self):
         return self.dtype.char
 
-    def assignValue(self, data):
+    def assignValue(self,data):
         self[...] = data
 
     def getValue(self, squeeze=1):
         return self.filled()
 
-    def expertSlice(self, slicelist):
+    def expertSlice (self, slicelist):
         return numpy.ma.MaskedArray.__getitem__(self, slicelist)
 
-    def initDomain(self, axes, copyaxes=1):
-        # lazy evaluation via getAxis to avoid creating axes that aren't ever
-        # used.
+    def initDomain (self, axes, copyaxes=1):
+        # lazy evaluation via getAxis to avoid creating axes that aren't ever used.
         newgrid = None
-        self.__domain = [None] * self.rank()
+        self.__domain = [None]*self.rank()
         if axes is not None:
             flataxes = []
             try:
@@ -330,59 +326,50 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
                 elif isinstance(item, AbstractRectGrid) or isinstance(item, AbstractCurveGrid):
                     flataxes.append(item.getAxis(0))
                     flataxes.append(item.getAxis(1))
-                    copyaxes = 0
+                    copyaxes=0
                     newgrid = item
                 elif isinstance(item, AbstractGenericGrid):
                     flataxes.append(item.getAxis(0))
-                    copyaxes = 0
+                    copyaxes=0
                     newgrid = item
                 else:
-                    raise CDMSError(
-                        "Invalid item in axis list:\n" + repr(item))
+                    raise CDMSError, "Invalid item in axis list:\n"+`item`
             if len(flataxes) != self.rank():
-                raise CDMSError("Wrong number of axes to initialize domain.")
+                raise CDMSError, "Wrong number of axes to initialize domain."
             for i in range(len(flataxes)):
                 if flataxes[i] is not None:
-                    if (not flataxes[i].isVirtual()) and copyaxes == 1:
+                    if (not flataxes[i].isVirtual()) and copyaxes==1:
                         self.copyAxis(i, flataxes[i])
                     else:
-                        self.setAxis(
-                            i,
-                            flataxes[i])  # No sense copying a virtual axis.
+                        self.setAxis(i, flataxes[i]) # No sense copying a virtual axis.
             if newgrid is not None:     # Do this after setting the axes, so the grid is consistent
                 self.setGrid(newgrid)
 
     def getDomain(self):
         for i in range(self.rank()):
             if self.__domain[i] is None:
-                self.getAxis(i)  # will force a fill in
+                junk = self.getAxis(i)  # will force a fill in
         return self.__domain
 
-    def getAxis(self, n):
-        if n < 0:
-            n = n + self.rank()
+    def getAxis (self, n):
+        if n < 0: n = n + self.rank()
         if self.__domain[n] is None:
             length = numpy.ma.size(self, n)
-            # axis = createAxis(numpy.ma.arange(numpy.ma.size(self, n),
-            # typecode=numpy.Float))
-            axis = createAxis(
-                numpy.ma.arange(numpy.ma.size(self, n), dtype=numpy.float_))
+            # axis = createAxis(numpy.ma.arange(numpy.ma.size(self, n), typecode=numpy.Float))
+            axis = createAxis(numpy.ma.arange(numpy.ma.size(self, n), dtype=numpy.float_))
             axis.id = "axis_" + str(n)
             self.__domain[n] = (axis, 0, length, length)
         return self.__domain[n][0]
-
-    def setAxis(self, n, axis, savegrid=0):
+        
+    def setAxis (self, n, axis, savegrid=0):
         """Set n axis of self to a copy of axis. (0-based index)
         """
-        if n < 0:
-            n = n + self.rank()
+        if n < 0: n = n + self.rank()
         axislen = self.shape[n]
-        if len(axis) != axislen:
-            raise CDMSError(
-                "axis length %d does not match corresponding dimension %d" %
-                (len(axis), axislen))
+        if len(axis)!=axislen:
+            raise CDMSError,"axis length %d does not match corresponding dimension %d"%(len(axis),axislen)
         if not isinstance(axis, AbstractAxis):
-            raise CDMSError("copydimension, other not a slab.")
+            raise CDMSError,"copydimension, other not a slab."
         self.__domain[n] = (axis, 0, len(axis), len(axis))
 
     def setAxisList(self, axislist):
@@ -390,28 +377,27 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
         for i in range(len(axislist)):
             self.setAxis(i, axislist[i])
 
-    def copyAxis(self, n, axis):
+    def copyAxis (self, n, axis):
         """Set n axis of self to a copy of axis. (0-based index)
            Invalidates grid.
         """
-        if n < 0:
-            n = n + self.rank()
+        if n < 0: n = n + self.rank()
         if not isinstance(axis, AbstractAxis):
-            raise CDMSError("copydimension, other not an axis.")
+            raise CDMSError,"copydimension, other not an axis."
         isGeneric = [False]
         b = axis.getBounds(isGeneric)
         mycopy = createAxis(axis[:], b, genericBounds=isGeneric[0])
         mycopy.id = axis.id
         for k, v in axis.attributes.items():
-            setattr(mycopy, k, v)
-        self.setAxis(n, mycopy)
-
-    def copyDomain(self, other):
+           setattr(mycopy, k, v)
+        self.setAxis (n, mycopy)
+   
+    def copyDomain (self, other):
         "Set the axes and grid by copying variable other."
         if not isinstance(other, AbstractVariable):
-            raise CDMSError("copyDomain, other not a variable.")
+            raise CDMSError,"copyDomain, other not a variable."
         if self.rank() != other.rank():
-            raise CDMSError("copyDomain, ranks do not match.")
+            raise CDMSError, "copyDomain, ranks do not match."
         for i in range(self.rank()):
             self.copyAxis(i, other.getAxis(i))
         self.setGrid(other.getGrid())
@@ -422,24 +408,22 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
             for i in range(self.rank()):
                 ax = self.getAxis(i)
                 if ax.isLatitude():
-                    order = order + 'y'
+                    order = order+'y'
                     lat = ax
                 elif ax.isLongitude():
-                    order = order + 'x'
+                    order = order+'x'
                     lon = ax
-                if len(order) == 2:
-                    break
+                if len(order)==2: break
 
-            if order in ['yx', 'xy']:
-                self._grid_ = createRectGrid(lat, lon, order)
+            if order in ['yx','xy']:
+                self._grid_ = createRectGrid(lat,lon,order)
         return self._grid_
 
-    def astype(self, tc):
+    def astype (self, tc):
         "return self as array of given type."
-        maresult = numpy.ma.MaskedArray.astype(self, tc)
-        return TransientVariable(
-            maresult, copy=0, axes=self.getAxisList(), fill_value=self.fill_value,
-            attributes=self.attributes, id=self.id, grid=self.getGrid())
+        maresult = numpy.ma.MaskedArray.astype(self,tc)
+        return TransientVariable(maresult, copy=0, axes=self.getAxisList(), fill_value=self.fill_value,
+                                 attributes=self.attributes, id=self.id, grid=self.getGrid())
 
     def setMaskFromGridMask(self, mask, gridindices):
         """Set the mask for self, given a grid mask and the variable domain
@@ -455,18 +439,18 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
                 shapeprep.append(self.shape[i])
 
         # Broadcast mask
-        if tprep != []:
+        if tprep!=[]:
             newshape = tuple(shapeprep + list(mask.shape))
             bigmask = numpy.resize(mask, newshape)
 
             # Generate the tranpose vector
             t = tuple(tprep + list(gridindices))
-            tinv = [0] * len(t)
+            tinv = [0]*len(t)
             for i in range(len(t)):
                 tinv[t[i]] = i
 
             # And reshape to fit the variable
-            if tinv != range(len(tinv)):
+            if tinv!=range(len(tinv)):
                 bigmask = numpy.transpose(bigmask, tuple(tinv))
 
         else:
@@ -481,25 +465,25 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
         return result
 
 # Old cu interface
-    def copydimension(self, idim, other, jdim):
-        """Set idim dimension of self to variable other's jdim'th
+    def copydimension (self, idim, other, jdim):
+        """Set idim dimension of self to variable other's jdim'th 
            This is for old cu compatibility. Use copyAxis for new code.
         """
         if not isinstance(other, AbstractVariable):
-            raise CDMSError("copydimension, other not a variable.")
+            raise CDMSError,"copydimension, other not a variable."
         a = other.getAxis(jdim)
         self.copyAxis(idim, a)
 
     def setdimattribute(self, dim, field, value):
         "Set the attribute named field from the dim'th dimension."
         if dim < 0 or dim >= self.rank():
-            raise CDMSError("setdimattribute, dim out of bounds.")
+            raise CDMSError, "setdimattribute, dim out of bounds."
         d = self.getAxis(dim)
         if field == "name":
-            if not isinstance(value, basestring):
-                raise CDMSError("setdimattribute: name not a string")
+            if not type(value) == types.StringType:
+               raise CDMSError, "setdimattribute: name not a string"
             d.id = value
-
+            
         elif field == "values":
             # note -- invalidates grid, may break old code.
             a = createAxis(numpy.ma.filled(value[:]))
@@ -509,30 +493,29 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
             self.setAxis(dim, a)
 
         elif field == "units":
-            if not isinstance(value, basestring):
-                raise CDMSError("setdimattribute: units not a string")
+            if not type(value) == types.StringType:
+               raise CDMSError, "setdimattribute: units not a string"
             d.units = value
 
         elif field == "weights":
             # Well, you can't really do this without modifying the grid
-            raise CDMSError("setdimattribute weights not implemented.")
+            raise CDMSError, "setdimattribute weights not implemented."
 
         elif field == "bounds":
             if value is None:
-                d.setBounds(None)
+               d.setBounds(None)
             else:
-                b = numpy.ma.filled(value)
-                if numpy.ma.rank(b) == 2:
-                    d.setBounds(b)
-                elif numpy.ma.rank(b) == 1:
-                    b1 = numpy.zeros((len(b) - 1, 2), b.dtype.char)
-                    b1[:, 0] = b[:-1]
-                    b1[:, 1] = b[1:]
-                    d.setBounds(b1)
-                else:
-                    raise CDMSError(
-                        "setdimattribute, bounds improper shape: " +
-                        b.shape)
+               b = numpy.ma.filled(value)
+               if numpy.ma.rank(b) == 2:
+                   d.setBounds(b)
+               elif numpy.ma.rank(b) == 1:
+                   b1 = numpy.zeros((len(b)-1,2), b.dtype.char)
+                   b1[:,0] = b[:-1]
+                   b1[:,1] = b[1:]
+                   d.setBounds(b1)
+               else:
+                   raise CDMSError, \
+                   "setdimattribute, bounds improper shape: " + b.shape
         else:
             setattr(d, field, value)
 
@@ -543,57 +526,57 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
         result = createVariable(self, copy=copyData)
         return result
 
-    def dumps(self, *args, **kargs):
-        # Probably need something for curv/gen grids
+    def dumps(self,*args,**kargs):
+        ## Probably need something for curv/gen grids
         """ Dumps Variable to a jason object, args are passed directly to json.dump"""
-        J = {}
-        for k, v in self.attributes.iteritems():
-            if k == "autoApiInfo":
+        J={}
+        for k,v in self.attributes.iteritems():
+            if k=="autoApiInfo":
                 continue
-            J[k] = v
-        J['id'] = self.id
-        axes = []
+            J[k]=v
+        J['id']=self.id
+        axes=[]
         for a in self.getAxisList():
-            ax = {}
-            for A, v in a.attributes.iteritems():
-                ax[A] = v
-            ax['id'] = a.id
-            ax["_values"] = a[:].tolist()
-            ax["_dtype"] = a[:].dtype.char
+            ax={}
+            for A,v in a.attributes.iteritems():
+                ax[A]=v
+            ax['id']=a.id
+            ax["_values"]=a[:].tolist()
+            ax["_dtype"]=a[:].dtype.char
             axes.append(ax)
-        J["_axes"] = axes
-        J["_values"] = self[:].filled(self.fill_value).tolist()
-        J["_fill_value"] = float(self.fill_value)
-        J["_dtype"] = self.typecode()
-        J["_grid"] = None  # self.getGrid()
-        return json.dumps(J, *args, **kargs)
+        J["_axes"]=axes
+        J["_values"]=self[:].filled(self.fill_value).tolist()
+        J["_fill_value"]=float(self.fill_value)
+        J["_dtype"]=self.typecode()
+        J["_grid"]=None #self.getGrid()
+        return json.dumps(J,*args,**kargs)
 
     def isEncoded(self):
         "Transient variables are not encoded"
         return 0
 
-    def __len__(self):
+    def __len__ (self):
         "Length of first dimension"
-        if self.rank() > 0:
-            (axis, start, length, true_length) = self.getDomain()[0]
+        if self.rank()>0:
+            (axis,start,length,true_length) = self.getDomain()[0]
         else:
             length = 0
         return length
 
-    def __str__(self):
+    def __str__ (self):
         return numpy.ma.MaskedArray.__str__(self)
 
-    def __repr__(self):
+    def __repr__ (self):
         return self.id + '\n' + numpy.ma.MaskedArray.__repr__(self) + '\n'
 
     def set_fill_value(self, value):
         "Set missing value attribute and fill value"
         AbstractVariable.setMissing(self, value)
-        # self.__dict__['_fill_value'] = self.missing_value
-        # Fix submitted by Ghislain Picard, this was broken with numpy 1.5
-        numpy.ma.MaskedArray.set_fill_value(self, value)
+        #self.__dict__['_fill_value'] = self.missing_value
+        ## Fix submitted by Ghislain Picard, this was broken with numpy 1.5
+        numpy.ma.MaskedArray.set_fill_value(self,value)
 
-    def setMissing(self, value):
+    def setMissing (self, value):
         "Set missing value attribute and fill value"
         self.set_fill_value(value)
 
@@ -614,7 +597,7 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
         """
         return self.tileIndex
 
-    def toVisit(self, filename, format='Vs', sphereRadius=1.0,
+    def toVisit(self, filename, format='Vs', sphereRadius=1.0, 
                 maxElev=0.1):
         """
         Save data to file for postprocessing by the VisIt visualization tool
@@ -623,20 +606,21 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
         sphereRadius: radius of the earth
         maxElev: maximum elevation for representation on the sphere
         """
-        from . import mvVTKSGWriter
-        from . import mvVsWriter
+        import mvSphereMesh
+        import mvVTKSGWriter
+        import mvVsWriter
         try:
             # required by mvVsWriter
-            import tables  # noqa
+            import tables
         except:
-            # fall back
+            # fall back 
             format = 'VTK'
 
         def generateTimeFileName(filename, tIndex, tIndexMax, suffix):
-            ndigits = len('%d' % tIndexMax)
-            itdigits = len('%d' % tIndex)
-            tiStr = '0' * (ndigits - itdigits) + ('%d' % tIndex)
-            return re.sub(r'\.' + suffix, '_%s.%s' % (tiStr, suffix),
+            ndigits = len('%d'%tIndexMax)
+            itdigits = len('%d'%tIndex)
+            tiStr = '0'*(ndigits-itdigits) + ('%d'%tIndex)
+            return re.sub(r'\.' + suffix, '_%s.%s' % (tiStr, suffix), 
                           filename)
 
         # determine whether data are time dependent
@@ -650,48 +634,46 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
                 counter += 1
                 if axis == 'time':
                     timeIndex = counter
-
-        if timeAxis is None or timeIndex == -1:
+        
+        if timeAxis == None or timeIndex == -1:
             # static data
             if format == 'VTK':
                 vw = mvVTKSGWriter.VTKSGWriter(self, maxElev)
-                if filename.find('.vtk') == -1:
+                if filename.find('.vtk') == -1: 
                     filename += '.vtk'
                 vw.write(filename)
             else:
                 vw = mvVsWriter.VsWriter(self, maxElev)
-                if filename.find('.vsh5') == -1:
+                if filename.find('.vsh5') == -1: 
                     filename += '.vsh5'
                 vw.write(filename)
         else:
             # time dependent data
             tIndexMax = len(timeAxis)
             for tIndex in range(tIndexMax):
-                sliceOp = 'self[' + (
-                    ':,' * timeIndex) + ('%d,' %
-                                         tIndex) + '...]'
+                sliceOp = 'self[' + (':,'*timeIndex) + ('%d,'%tIndex) + '...]'
                 var = eval(sliceOp)
                 if format == 'VTK':
                     if filename.find('.vtk') == -1:
                         filename += '.vtk'
-                    tFilename = generateTimeFileName(filename,
+                    tFilename = generateTimeFileName(filename, 
                                                      tIndex, tIndexMax, 'vtk')
                     vw = mvVTKSGWriter.VTKSGWriter(var, maxElev)
                     vw.write(tFilename)
                 else:
                     if filename.find('.h5') == -1:
                         filename += '.h5'
-                    tFilename = generateTimeFileName(filename,
+                    tFilename = generateTimeFileName(filename, 
                                                      tIndex, tIndexMax, 'h5')
                     vw = mvVsWriter.VsWriter(var, maxElev)
                     vw.write(tFilename)
-
-    # Following are distributed array methods, they require mpi4py
+       
+    # Following are distributed array methods, they require mpi4py 
     # to be installed
 
     def setMPIComm(self, comm):
         """
-        Set the MPI communicator. This is a no-op if MPI
+        Set the MPI communicator. This is a no-op if MPI 
         is not available.
         """
         if HAVE_MPI:
@@ -718,7 +700,7 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
     def exposeHalo(self, ghostWidth=1):
         """
         Expose the halo to other processors. The halo is the region
-        within the local MPI data domain that is accessible to other
+        within the local MPI data domain that is accessible to other 
         processors. The halo encompasses the edge of the data region
         and has thickness ghostWidth.
 
@@ -735,8 +717,9 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
                     # given direction, a 1 represents a layer of
                     # thickness ghostWidth on the high index side,
                     # -1 on the low index side.
-                    winId = tuple([0 for i in range(dim)] + [drect] +
-                                  [0 for i in range(dim + 1, ndims)])
+                    winId = tuple( [0 for i in range(dim) ] \
+                                   + [drect] + \
+                                   [0 for i in range(dim+1, ndims) ] )
 
                     slce = slice(0, ghostWidth)
                     if drect == 1:
@@ -745,19 +728,19 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
                     slab = self.__getSlab(dim, slce)
 
                     # create the MPI window
-                    dataSrc = numpy.zeros(self[slab].shape, self.dtype)
-                    dataDst = numpy.zeros(self[slab].shape, self.dtype)
+                    dataSrc = numpy.zeros(self[slab].shape, self.dtype) 
+                    dataDst = numpy.zeros(self[slab].shape, self.dtype) 
                     self.__mpiWindows[winId] = {
                         'slab': slab,
                         'dataSrc': dataSrc,
                         'dataDst': dataDst,
                         'window': MPI.Win.Create(dataSrc, comm=self.__mpiComm),
-                    }
-
+                        }
+                
     def getHaloEllipsis(self, side):
         """
-        Get the ellipsis for a given halo side.
-
+        Get the ellipsis for a given halo side. 
+        
         side - a tuple of zeros and one +1 or -1.  To access
                the "north" side for instance, set side=(1, 0),
                (-1, 0) to access the south side, (0, 1) the east
@@ -765,7 +748,7 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
 
         Return none if halo was not exposed (see exposeHalo)
         """
-        if HAVE_MPI and side in self.__mpiWindows:
+        if HAVE_MPI and self.__mpiWindows.has_key(side):
             return self.__mpiWindows[side]['slab']
         else:
             return None
@@ -773,20 +756,20 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
     def fetchHaloData(self, pe, side):
         """
         Fetch the halo data from another processor. The halo side
-        is a subdomain of the halo that is exposed to other
+        is a subdomain of the halo that is exposed to other 
         processors. It is an error to call this method when
         MPI is not enabled. This is a collective method (must
         be called by all processes), which involves synchronization
         of data among all processors.
 
         pe       -  processor owning the halo data. This is a no
-                    operation when pe is None.
+                    operation when pe is None. 
         side     -  a tuple of zeros and one +1 or -1.  To access
                     the "north" side for instance, set side=(1, 0),
                     (-1, 0) to access the south side, (0, 1) the east
-                    side, etc.
+                    side, etc. 
 
-        Note: collective, all procs must invoke this method. If some
+        Note: collective, all procs must invoke this method. If some 
         processors should not fetch then pass None for pe.
         """
         if HAVE_MPI:
@@ -799,37 +782,37 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
             dataSrc[...] = self[slab]
 
             win = iw['window']
-            win.Fence()  # get the data ready
+            win.Fence() # get the data ready
             if pe is not None:
-                win.Get([dataDst, self.__mpiType], pe)
-            win.Fence()  # make sure the communication completed
+                win.Get( [dataDst, self.__mpiType], pe )
+            win.Fence() # make sure the communication completed
             return dataDst
         else:
-            raise CDMSError('Must have MPI to invoke fetchHaloData')
+            raise CDMSError, 'Must have MPI to invoke fetchHaloData'
 
     def freeHalo(self):
         """
-        Free the MPI windows attached to the halo. This must be
+        Free the MPI windows attached to the halo. This must be 
         called before MPI_Finalize.
         """
         for iw in self.__mpiWindows:
-            self.__mpiWindows[iw]['window'].Free()
+            self.__mpiWindows[iw]['window'].Free()        
 
     def __getSlab(self, dim, slce):
         """
         Get slab. A slab is a multi-dimensional slice extending in
         all directions except along dim where slce applies
-
+        
         dim      - dimension (0=first index, 1=2nd index...)
         slce     - python slice object along dimension dim
-
+        
         return slab
         """
         ndims = len(self.shape)
-
-        slab = [slice(0, None) for i in range(dim)] \
-            + [slce] + \
-            [slice(0, None) for i in range(dim + 1, ndims)]
+        
+        slab = [ slice(0, None) for i in range(dim) ] \
+                    + [slce] + \
+                  [ slice(0, None) for i in range(dim+1, ndims) ]
         return tuple(slab)
 
     def __getMPIType(self):
@@ -853,54 +836,50 @@ class TransientVariable(AbstractVariable, numpy.ma.MaskedArray):
             elif dtyp == numpy.int8:
                 typ = MPI.INT8_T
             else:
-                return None
+                return None          
         else:
             return typ
 
-# PropertiedClasses.set_property(TransientVariable, 'shape',
-# nowrite=1, nodelete=1)
-
+## PropertiedClasses.set_property(TransientVariable, 'shape', 
+##                                nowrite=1, nodelete=1)
 
-def createVariable(*args, **kargs):
-    if kargs.get("fromJSON", False):
+def createVariable(*args,**kargs):
+    if kargs.get("fromJSON",False):
         return fromJSON(*args)
     else:
-        return TransientVariable(*args, **kargs)
+        return TransientVariable(*args,**kargs)
 
-
-def isVariable(s):
+def isVariable (s):
     "Is s a variable?"
     return isinstance(s, AbstractVariable)
 
-
 def asVariable(s, writeable=1):
-    """Returns s if s is a Variable; if writeable is 1, return
-       s if s is a TransientVariable. If s is not a variable of
+    """Returns s if s is a Variable; if writeable is 1, return 
+       s if s is a TransientVariable. If s is not a variable of 
        the desired type, attempt to make it so and return that.
        If we fail raise CDMSError
     """
     target_class = AbstractVariable
-    if writeable:
-        target_class = TransientVariable
+    if writeable: target_class = TransientVariable
     if isinstance(s, target_class):
         return s
     elif isinstance(s, AbstractVariable):
         return s.subSlice()
-
+    
     try:
         result = createVariable(s)
     except CDMSError:
-        result = None
-
+        result =  None
+    
     # if result.dtype.char == numpy.ma.PyObject:
     if issubclass(result.dtype.type, numpy.object_):
         result = None
     if result is None:
-        raise CDMSError("asVariable could not make a Variable from the input.")
+        raise CDMSError, "asVariable could not make a Variable from the input."
     return result
 
 if __name__ == '__main__':
-    for s in [(20,), (4, 5)]:
+    for s in [(20,), (4,5)]:
         x = numpy.arange(20)
         x.shape = s
         t = createVariable(x)
@@ -909,24 +888,21 @@ if __name__ == '__main__':
         assert numpy.ma.allclose(x, t)
         assert t.dtype.char == numpy.int
         assert numpy.ma.size(t) == numpy.ma.size(x)
-        assert numpy.ma.size(t, 0) == len(t)
-        assert numpy.ma.allclose(
-            t.getAxis(0)[:], numpy.ma.arange(numpy.ma.size(t, 0)))
+        assert numpy.ma.size(t,0) == len(t)
+        assert numpy.ma.allclose(t.getAxis(0)[:], numpy.ma.arange(numpy.ma.size(t,0)))
         t.missing_value = -99
         assert t.missing_value == -99
         assert t.fill_value == -99
-    t = createVariable(numpy.ma.arange(5), mask=[0, 0, 0, 1, 0])
-    t.set_fill_value(1000)
+    t = createVariable(numpy.ma.arange(5), mask=[0,0,0,1,0])
+    t.set_fill_value (1000)
     assert t.fill_value == 1000
     assert t.missing_value == 1000
     t.missing_value = -99
     assert t[2] == 2
     t[3] = numpy.ma.masked
     assert t[3] is numpy.ma.masked
-    f = createVariable(
-        numpy.ma.arange(5, typecode=numpy.float32), mask=[0, 0, 0, 1, 0])
-    f2 = createVariable(
-        numpy.ma.arange(5, typecode=numpy.float32), mask=[0, 0, 0, 1, 0])
+    f = createVariable(numpy.ma.arange(5, typecode=numpy.float32), mask=[0,0,0,1,0])
+    f2 = createVariable(numpy.ma.arange(5, typecode=numpy.float32), mask=[0,0,0,1,0])
     f[3] = numpy.ma.masked
     assert f[3] is numpy.ma.masked
     assert numpy.ma.allclose(2.0, f[2])
@@ -936,6 +912,6 @@ if __name__ == '__main__':
     assert t.getdimattribute(0, 'name') == 'fudge'
     f2b = f2.getdimattribute(0, 'bounds')
     t.setdimattribute(0, 'bounds', f2b)
-    assert numpy.ma.allclose(
-        f.getdimattribute(0, 'bounds'), f2.getdimattribute(0, 'bounds'))
+    assert numpy.ma.allclose(f.getdimattribute(0,'bounds'), f2.getdimattribute(0,'bounds'))
     print "Transient Variable test passed ok."
+
diff --git a/Packages/cdms2/Lib/typeconv.py b/Packages/cdms2/Lib/typeconv.py
index e63ad64d3..0f2bd2c18 100644
--- a/Packages/cdms2/Lib/typeconv.py
+++ b/Packages/cdms2/Lib/typeconv.py
@@ -1,26 +1,24 @@
-import numpy as np
 __all__ = ['oldtype2dtype', 'convtypecode', 'convtypecode2', 'oldtypecodes']
 
+import numpy as np
 
 oldtype2dtype = {'1': np.dtype(np.byte),
                  's': np.dtype(np.short),
-                 #                 'i': np.dtype(np.intc),
-                 #                 'l': np.dtype(int),
-                 #                 'b': np.dtype(np.ubyte),
+#                 'i': np.dtype(np.intc),
+#                 'l': np.dtype(int),
+#                 'b': np.dtype(np.ubyte),
                  'w': np.dtype(np.ushort),
                  'u': np.dtype(np.uintc),
-                 #                 'f': np.dtype(np.single),
-                 #                 'd': np.dtype(float),
-                 #                 'F': np.dtype(np.csingle),
-                 #                 'D': np.dtype(complex),
-                 #                 'O': np.dtype(object),
-                 #                 'c': np.dtype('c'),
+#                 'f': np.dtype(np.single),
+#                 'd': np.dtype(float),
+#                 'F': np.dtype(np.csingle),
+#                 'D': np.dtype(complex),
+#                 'O': np.dtype(object),
+#                 'c': np.dtype('c'),
                  None: np.dtype(int)
-                 }
+    }
 
 # converts typecode=None to int
-
-
 def convtypecode(typecode, dtype=None):
     if dtype is None:
         try:
@@ -30,10 +28,8 @@ def convtypecode(typecode, dtype=None):
     else:
         return dtype
 
-# if both typecode and dtype are None
+#if both typecode and dtype are None
 #  return None
-
-
 def convtypecode2(typecode, dtype=None):
     if dtype is None:
         if typecode is None:
@@ -49,12 +45,10 @@ def convtypecode2(typecode, dtype=None):
 _changedtypes = {'B': 'b',
                  'b': '1',
                  'h': 's',
-                 # 'H': 'w',
+##                  'H': 'w',
                  'I': 'u'}
 
-
 class _oldtypecodes(dict):
-
     def __getitem__(self, obj):
         char = np.dtype(obj).char
         try:
diff --git a/Packages/cdms2/Lib/variable.py b/Packages/cdms2/Lib/variable.py
index c96dd5e21..a1f3f7f7d 100644
--- a/Packages/cdms2/Lib/variable.py
+++ b/Packages/cdms2/Lib/variable.py
@@ -1,16 +1,22 @@
-# Automatically adapted for numpy.oldnumeric Aug 01, 2007 by
+## Automatically adapted for numpy.oldnumeric Aug 01, 2007 by 
 
 """
 DatasetVariable: Dataset-based variables
 """
+from cdms2 import Cdunif
 import numpy
-from . import cdmsNode
+import cdmsNode
 import cdtime
 import copy
-from .cdmsobj import getPathFromTemplate, Max32int
-from .avariable import AbstractVariable
-from .sliceut import *  # noqa
-from .error import CDMSError
+import os
+import string
+import sys
+import types
+import cdmsobj
+from cdmsobj import CdmsObj, getPathFromTemplate, Max32int
+from avariable import AbstractVariable
+from sliceut import *
+from error import CDMSError
 
 InvalidGridElement = "Grid domain elements are not yet implemented: "
 InvalidRegion = "Invalid region: "
@@ -20,47 +26,44 @@ TooManyPartitions = "Variable has too many partitioned axes, max is two: "
 WriteNotImplemented = "Dataset write operation not implemented"
 FileClosed = "Cannot read from closed file or dataset, variable: "
 
-
 def timeindex(value, units, basetime, delta, delunits, calendar):
     """ Calculate (t - basetime)/delu
     where t = reltime(value, units)
     and delu is the time interval (delta, delunits) (e.g., 1 month).
     """
     tval = cdtime.reltime(value, units)
-    tounits = "%s since %s" % (delunits, basetime)
+    tounits = "%s since %s"%(delunits, basetime)
     newval = tval.torel(tounits, calendar)
-    return int(newval.value / delta)
-
+    return int(newval.value/delta)
 
 class DatasetVariable(AbstractVariable):
 
-    def __init__(self, parent, id, variableNode=None):
+    def __init__(self,parent,id, variableNode=None):
         """ "Variable (parent, variableNode=None)"
            variableNode is the variable tree node, if any.
            parent is the containing dataset instance.
         """
-        AbstractVariable.__init__(self, parent, variableNode)
-        val = self.__cdms_internals__ + ['domain', 'name_in_file']
+        AbstractVariable.__init__ (self, parent, variableNode)
+        val = self.__cdms_internals__ + ['domain','name_in_file']
         self.___cdms_internals__ = val
         self.id = id
         self.domain = []
         # Get self.name_in_file from the .xml file if present
         if not hasattr(self, 'name_in_file'):
             self.name_in_file = id
-
+            
         # if self.attributes.has_key('name_in_file'):
         #     self.name_in_file = self.attributes['name_in_file']
-        if variableNode is not None:
-            self._numericType_ = cdmsNode.CdToNumericType.get(
-                variableNode.datatype)
+        if variableNode is not None:          
+            self._numericType_ = cdmsNode.CdToNumericType.get(variableNode.datatype)
         else:
             self._numericType_ = numpy.float
         assert self.id is not None
-
-    def __len__(self):
+        
+    def __len__ (self):
         "Length of first dimension"
-        if len(self.domain) > 0:
-            (axis, start, length, true_length) = self.domain[0]
+        if len(self.domain)>0:
+            (axis,start,length,true_length) = self.domain[0]
         else:
             length = 0
 
@@ -71,34 +74,33 @@ class DatasetVariable(AbstractVariable):
 #            parentid = self.parent.id
 #        else:
 #            parentid = "**CLOSED**"
-# return "<Variable: %s, dataset: %s, shape: %s>"%(self.id, parentid,
-# `self.shape`)
+#        return "<Variable: %s, dataset: %s, shape: %s>"%(self.id, parentid, `self.shape`)
 
     def __getitem__(self, key):
         if self.parent is None:
-            raise CDMSError(FileClosed + str(self.id))
+            raise CDMSError, FileClosed+str(self.id)
         return AbstractVariable.__getitem__(self, key)
-
+        
     def getValue(self, squeeze=1):
         """Return the entire set of values."""
         if self.parent is None:
-            raise CDMSError(FileClosed + self.id)
+            raise CDMSError, FileClosed+self.id
         return self.getSlice(Ellipsis, squeeze=squeeze)
-
+    
     def __getslice__(self, low, high):
         if self.parent is None:
-            raise CDMSError(FileClosed + self.id)
+            raise CDMSError, FileClosed+self.id
 
         # Hack to prevent netCDF overflow error on 64-bit architectures
         high = min(Max32int, high)
-
+        
         return AbstractVariable.__getslice__(self, low, high)
 
     def __setitem__(self, index, value):
-        raise CDMSError(WriteNotImplemented)
+        raise CDMSError, WriteNotImplemented
 
     def __setslice__(self, low, high, value):
-        raise CDMSError(WriteNotImplemented)
+        raise CDMSError, WriteNotImplemented
 
     def _getShape(self):
         return self.getShape()
@@ -108,19 +110,19 @@ class DatasetVariable(AbstractVariable):
         return numpy.dtype(tc)
 
     def getShape(self):
-        shape = []
-        for (axis, start, length, true_length) in self.domain:
+        shape=[]
+        for (axis,start,length,true_length) in self.domain:
             shape.append(length)
         return tuple(shape)
 
-    def typecode(self):
-        return numpy.dtype(self._numericType_).char
+    def typecode (self):
+      return numpy.dtype(self._numericType_).char
 
     def size(self):
         "Number of elements."
         n = 1
         for k in self.shape:
-            n = k * n
+            n = k*n
         return n
 
     def initDomain(self, axisdict, griddict):
@@ -133,39 +135,38 @@ class DatasetVariable(AbstractVariable):
             if domelem is None:
                 domelem = griddict.get(dename)
                 if grid is None:
-                    raise CDMSError(NoSuchAxisOrGrid + dename)
+                    raise CDMSError, NoSuchAxisOrGrid + dename
                 else:
-                    raise CDMSError(InvalidGridElement + dename)
+                    raise CDMSError, InvalidGridElement + dename
             partlenstr = denode.getExternalAttr('partition_length')
             if partlenstr is not None:
-                truelen = int(partlenstr)
+                truelen = string.atoi(partlenstr)
             else:
                 truelen = denode.length
             self.domain.append((domelem, denode.start, denode.length, truelen))
 
     # Get the template
     def getTemplate(self):
-        if hasattr(self, 'template'):
+        if hasattr(self,'template'):
             template = self.template
-        elif hasattr(self.parent, 'template'):
+        elif hasattr(self.parent,'template'): 
             template = self.parent.template
         else:
             template = None
         return template
 
-    def getAxis(self, n):
-        if n < 0:
-            n = n + self.rank()
+    def getAxis (self, n):
+        if n < 0: n = n + self.rank()
         return self.domain[n][0]
 
-    def getDomain(self):
+    def getDomain (self):
         return self.domain
 
     # Get the paths associated with the interval region specified
     # by 'intervals'. This incorporates most of the logic of __getitem__,
     # without actually reading the data.
-    #
-    # 'specs' is a list of interval range specifications as defined
+    # 
+    # 'specs' is a list of interval range specifications as defined 
     # for getSlice.
     #
     # The function returns a list of tuples of the form (path,slicelist),
@@ -177,11 +178,11 @@ class DatasetVariable(AbstractVariable):
     #   f = Cdunif.CdunifFile(path,'r')
     #   var = f.variables[self.name_in_file]
     #   data = apply(var.getitem,slicelist)
-    #
+    #   
     def getPaths(self, *specs, **keys):
 
         # Create an equivalent list of slices
-        speclist = self._process_specs(specs, keys)
+        speclist = self._process_specs (specs, keys)
         slicelist = self.specs2slices(speclist)
 
         # Generate the filelist
@@ -191,20 +192,20 @@ class DatasetVariable(AbstractVariable):
         result = []
         if partitionSlices is None:
             pass
-        elif npart == 0:
+        elif npart==0:
             filename, slicelist = partitionSlices
             if filename is not None:
                 result.append((filename, tuple(slicelist)))
-        elif npart == 1:
+        elif npart==1:
             for filename, slicelist in partitionSlices:
                 if filename is not None:
                     result.append((filename, tuple(slicelist)))
-        elif npart == 2:
+        elif npart==2:
             for filelist in partitionSlices:
                 for filename, slicelist in filelist:
                     if filename is not None:
                         result.append((filename, tuple(slicelist)))
-
+                
         return result
 
     def genMatch(self, axis, interval, matchnames):
@@ -218,34 +219,34 @@ class DatasetVariable(AbstractVariable):
         returns the modified matchnames tuple.
         """
         if axis.isTime():
-            if hasattr(self.parent, 'cdms_filemap'):
+            if hasattr(self.parent,'cdms_filemap'):
                 start = interval[0]
                 end = interval[1]
             else:                       # Use template method
                 time0 = axis[interval[0]]
-                time1 = axis[interval[1] - 1]
-                isabs = (axis.units.find(" as ") != -1)
+                time1 = axis[interval[1]-1]
+                isabs = (string.find(axis.units," as ")!=-1)
                 if isabs:
-                    start = cdtime.abstime(time0, axis.units)
-                    end = cdtime.abstime(time1, axis.units)
+                    start = cdtime.abstime(time0,axis.units)
+                    end = cdtime.abstime(time1,axis.units)
                 else:
                     cal = axis.getCalendar()
-                    start = cdtime.reltime(time0, axis.units).tocomp(cal)
-                    end = cdtime.reltime(time1, axis.units).tocomp(cal)
+                    start = cdtime.reltime(time0,axis.units).tocomp(cal)
+                    end = cdtime.reltime(time1,axis.units).tocomp(cal)
             matchnames[1] = start
             matchnames[2] = end
         elif axis.isForecast():
             start = axis.getValue()[interval[0]]
-            end = axis.getValue()[interval[1] - 1]
+            end   = axis.getValue()[interval[1]-1]
             matchnames[5] = start
             matchnames[6] = end
         else:
-            if hasattr(self.parent, 'cdms_filemap'):
+            if hasattr(self.parent,'cdms_filemap'):
                 start = interval[0]
                 end = interval[1]
             else:
                 start = int(axis[interval[0]])
-                end = int(axis[interval[1] - 1])
+                end = int(axis[interval[1]-1])
             matchnames[3] = start
             matchnames[4] = end
 
@@ -255,13 +256,12 @@ class DatasetVariable(AbstractVariable):
         """Lookup or generate the file path, depending on whether a filemap
         or template is present.
         """
-        if hasattr(self.parent, 'cdms_filemap'):
+        if hasattr(self.parent,'cdms_filemap'):
             id, tstart, tend, levstart, levend, fcstart, fcend = matchnames
-            filename = self.parent._filemap_[
-                (self.id, tstart, levstart, fcstart)]
+            filename = self.parent._filemap_[(self.id, tstart, levstart, fcstart)]
             # ... filemap uses dataset IDs
         else:
-            filename = getPathFromTemplate(template, matchnames)
+            filename = getPathFromTemplate(template,matchnames)
         return filename
 
     def getPartition(self, axis):
@@ -270,7 +270,7 @@ class DatasetVariable(AbstractVariable):
         get the partition from the _varpart_ attribute, otherwise (for templating) use
         axis.partition.
         """
-        if hasattr(self.parent, 'cdms_filemap'):
+        if hasattr(self.parent,'cdms_filemap'):
             if axis.isTime():
                 partition = self._varpart_[0]
             elif axis.isForecast():
@@ -281,7 +281,7 @@ class DatasetVariable(AbstractVariable):
             partition = axis.partition
         return partition
 
-    def expertPaths(self, slist):
+    def expertPaths (self, slist):
         """ expertPaths(self, slicelist)
         takes a list of slices,
         returns a 3-tuple: (npart, dimensionlist, partitionSlices) where:
@@ -318,7 +318,7 @@ class DatasetVariable(AbstractVariable):
 
         # Handle rank-0 variables separately
         if self.rank() == 0:
-            matchnames = [realid, None, None, None, None, None, None]
+            matchnames = [realid,None,None,None,None,None,None]
             filename = self.getFilePath(matchnames, template)
 
             result = (0, (), (filename, []))
@@ -327,162 +327,162 @@ class DatasetVariable(AbstractVariable):
         # Find the number of partitioned axes
         npart = 0
         ndim = 0
-        for (axis, start, length, true_length) in self.domain:
-            if hasattr(axis, 'partition'):
-                npart = npart + 1
-                if npart == 1:
+        for (axis,start,length,true_length) in self.domain:
+            if hasattr(axis,'partition'):
+                npart = npart+1
+                if npart==1:
+                    part1 = axis
                     npart1 = ndim
-                elif npart == 2:
+                elif npart==2:
+                    part2 = axis
                     npart2 = ndim
                 else:
-                    raise CDMSError(TooManyPartitions + variable.id)
-            ndim = ndim + 1
+                    raise CDMSError,  TooManyPartitions + variable.id
+            ndim = ndim+1
 
         # If no partitioned axes, just read the data
-        if npart == 0:
-            matchnames = [realid, None, None, None, None, None, None]
+        if npart==0:
+            matchnames = [realid,None,None,None,None,None,None]
             filename = self.getFilePath(matchnames, template)
             result = (0, (), (filename, slicelist))
 
         # If one partitioned axes:
-        elif npart == 1:
+        elif npart==1:
 
             # intersect the slice and partition for that axis
             slice1 = slicelist[npart1]
-            (axis, startelem, length, true_length) = self.domain[npart1]
+            (axis,startelem,length,true_length) = self.domain[npart1]
             partition = slicePartition(slice1, self.getPartition(axis))
-            if partition == []:
+            if partition==[]:
                 return (1, (npart1,), None)
 
             # For each (interval, partslice) in the partition:
             resultlist = []
             (firstinterval, firstslice) = partition[0]
             prevhigh = firstinterval[0]
-            for (interval, partslice) in partition:
+            for (interval,partslice) in partition:
 
                 # If the previous interval high is less than
                 # the current interval low value, interpose
                 # missing data.
                 low = interval[0]
-                if prevhigh < low:
-                    missing_interval = (prevhigh, low)
+                if prevhigh<low:
+                    missing_interval = (prevhigh,low)
                     missing_slice = sliceIntersect(slice1, missing_interval)
 
                     # Note: if the slice has a stride>1, it might not intersect,
                     # so don't interpose missing data in this case.
                     if missing_slice is not None:
                         slicelist[npart1] = missing_slice
-                        resultlist.append((None, copy.copy(slicelist)))
+                        resultlist.append((None,copy.copy(slicelist)))
                 prevhigh = interval[1]
 
                 # generate the filename
-                matchnames = [realid, None, None, None, None, None, None]
+                matchnames = [realid, None, None, None, None,None,None]
                 matchnames = self.genMatch(axis, interval, matchnames)
                 filename = self.getFilePath(matchnames, template)
 
                 # adjust the partslice for the interval offset
                 # and replace in the slice list
-                filestart = partslice.start - interval[0]
-                filestop = partslice.stop - interval[0]
-                fileslice = slice(filestart, filestop, partslice.step)
+                filestart = partslice.start-interval[0]
+                filestop = partslice.stop-interval[0]
+                fileslice = slice(filestart,filestop,partslice.step)
                 slicelist[npart1] = fileslice
 
-                resultlist.append((filename, copy.copy(slicelist)))
+                resultlist.append((filename,copy.copy(slicelist)))
 
-            result = (1, (npart1,), resultlist)
+            result = (1,(npart1,),resultlist)
 
         # If two partitioned axes, 2-D version of previous case
-        if npart == 2:
+        if npart==2:
             slice1 = slicelist[npart1]
             slice2 = slicelist[npart2]
-            (axis1, startelem1, length1, true_length1) = self.domain[npart1]
-            (axis2, startelem2, length2, true_length2) = self.domain[npart2]
+            (axis1,startelem1,length1,true_length1) = self.domain[npart1]
+            (axis2,startelem2,length2,true_length2) = self.domain[npart2]
             partition1 = slicePartition(slice1, self.getPartition(axis1))
             partition2 = slicePartition(slice2, self.getPartition(axis2))
-            if partition1 == [] or partition2 == []:
-                return (2, (npart1, npart2), None)
+            if partition1==[] or partition2==[]:
+                return (2, (npart1,npart2), None)
 
             # For each (interval, partslice) in the partition:
             resultlist = []
             (firstinterval1, firstslice1) = partition1[0]
             prevhigh1 = firstinterval1[0]
-            for (interval1, partslice1) in partition1:
+            for (interval1,partslice1) in partition1:
 
                 # If the previous interval high is less than
                 # the current interval low value, interpose
                 # missing data.
                 low = interval1[0]
-                if prevhigh1 < low:
-                    missing_interval = (prevhigh1, low)
+                if prevhigh1<low:
+                    missing_interval = (prevhigh1,low)
                     missing_slice = sliceIntersect(slice1, missing_interval)
                     if missing_slice is not None:
                         slicelist[npart1] = missing_slice
-                        resultlist.append([(None, copy.copy(slicelist))])
+                        resultlist.append( [(None,copy.copy(slicelist))] )
                 prevhigh1 = interval1[1]
 
                 # generate matchnames
-                matchnames = [realid, None, None, None, None, None, None]
+                matchnames = [realid, None, None, None, None,None,None]
                 matchnames = self.genMatch(axis1, interval1, matchnames)
 
                 # adjust the partslice for the interval offset
                 # and replace in the slice list
-                filestart = partslice1.start - interval1[0]
-                filestop = partslice1.stop - interval1[0]
-                fileslice = slice(filestart, filestop, partslice1.step)
+                filestart = partslice1.start-interval1[0]
+                filestop = partslice1.stop-interval1[0]
+                fileslice = slice(filestart,filestop,partslice1.step)
                 slicelist[npart1] = fileslice
 
                 chunklist = []
                 (firstinterval2, firstslice2) = partition2[0]
                 prevhigh2 = firstinterval2[0]
-                for (interval2, partslice2) in partition2:
+                for (interval2,partslice2) in partition2:
 
                     # If the previous interval high is less than
                     # the current interval low value, interpose
                     # missing data.
                     low = interval2[0]
-                    if prevhigh2 < low:
-                        missing_interval = (prevhigh2, low)
-                        missing_slice = sliceIntersect(
-                            slice1, missing_interval)
+                    if prevhigh2<low:
+                        missing_interval = (prevhigh2,low)
+                        missing_slice = sliceIntersect(slice1, missing_interval)
                         if missing_slice is not None:
                             slicelist[npart2] = missing_slice
-                            chunklist.append((None, copy.copy(slicelist)))
+                            chunklist.append((None,copy.copy(slicelist)))
                     prevhigh2 = interval2[1]
 
                     # generate the filename
                     matchnames = self.genMatch(axis2, interval2, matchnames)
                     filename = self.getFilePath(matchnames, template)
 
-                    filestart = partslice2.start - interval2[0]
-                    filestop = partslice2.stop - interval2[0]
-                    fileslice = slice(filestart, filestop, partslice2.step)
+                    filestart = partslice2.start-interval2[0]
+                    filestop = partslice2.stop-interval2[0]
+                    fileslice = slice(filestart,filestop,partslice2.step)
                     slicelist[npart2] = fileslice
 
-                    chunklist.append((filename, copy.copy(slicelist)))
+                    chunklist.append((filename,copy.copy(slicelist)))
 
                 resultlist.append(chunklist)
 
-            result = (2, (npart1, npart2), resultlist)
+            result = (2,(npart1,npart2),resultlist)
 
         return result
 
-    def expertSlice(self, initslist):
+    def expertSlice (self, initslist):
 
         # Handle negative slices
-        revlist = []
-        # Slices to apply to result if reversals needed
+        revlist = []                    # Slices to apply to result if reversals needed
         slist = []                      # Slices with positive strides
         haveReversals = 0               # True iff result array needs reversing
-        i = 0
+        i=0
         for s in initslist:
-            if s.step < 0:
+            if s.step<0:
                 axislen = self.shape[i]
-                slist.append(reverseSlice(s, axislen))
-                revlist.append(slice(None, None, -1))
+                slist.append(reverseSlice(s,axislen))
+                revlist.append(slice(None,None,-1))
                 haveReversals = 1
             else:
                 slist.append(s)
-                revlist.append(slice(None, None, 1))
+                revlist.append(slice(None,None,1))
             i += 1
 
         # This does most of the work
@@ -494,17 +494,18 @@ class DatasetVariable(AbstractVariable):
         for i in range(len(self.domain)):
             if self.domain[i][0].isForecast():
                 fci = i
+                fcv = initslist[i].start
                 break
 
         # If no intersection, return an 'empty' array.
         if partitionSlices is None:
-            return numpy.ma.zeros((0,), self._numericType_)
+            return numpy.ma.zeros((0,),self._numericType_)
 
         # Handle rank-0 variables separately
         if self.rank() == 0:
             filename, dumlist = partitionSlices
 
-            f = self.parent.openFile(filename, 'r')
+            f = self.parent.openFile(filename,'r')
             try:
                 var = f.variables[self.name_in_file]
                 result = var.getValue()
@@ -513,36 +514,32 @@ class DatasetVariable(AbstractVariable):
             return result
 
         # If no partitioned axes, just read the data
-        if npart == 0:
+        if npart==0:
             filename, slicelist = partitionSlices
 
-            f = self.parent.openFile(filename, 'r')
+            f = self.parent.openFile(filename,'r')
             try:
                 var = f.variables[self.name_in_file]
-                if fci is None:
-                    result = self._returnArray(
-                        var.getitem(*tuple(slicelist)),
-                        0)
+                if fci==None:
+                    result = self._returnArray(apply(var.getitem,tuple(slicelist)),0)
                 else:
                     # If there's a forecast axis, the file doesn't know about it so
                     # don't use it in slicing data out of the file.
-                    result = self._returnArray(
-                        var.getitem(
-                            *tuple(slicelist[0:fci] + slicelist[fci + 1:])),
-                        0)
+                    result = self._returnArray( apply( var.getitem, \
+                                   tuple( slicelist[0:fci]+slicelist[fci+1:] ) ), \
+                                                0 )
                     # But the result still needs an index in the forecast direction,
-                    # which is simple to do because there is only one forecast
-                    # per file:
-                    result.resize(map(lenSlice, slicelist))
+                    # which is simple to do because there is only one forecast per file:
+                    result.resize( map(lenSlice,slicelist) )
 
             finally:
                 f.close()
             sh = result.shape
             if 0 in sh:
-                raise CDMSError(IndexError + 'Coordinates out of Domain')
+                raise CDMSError, IndexError + 'Coordinates out of Domain'
 
         # If one partitioned axes:
-        elif npart == 1:
+        elif npart==1:
 
             npart1 = idims[0]
             resultlist = []
@@ -551,47 +548,44 @@ class DatasetVariable(AbstractVariable):
                 # If the slice is missing, interpose missing data
                 if filename is None:
                     shapelist = map(lenSlice, slicelist)
-                    chunk = numpy.ma.zeros(
-                        tuple(shapelist),
-                        self._numericType_)
+                    chunk = numpy.ma.zeros(tuple(shapelist),self._numericType_)
                     chunk[...] = numpy.ma.masked
 
                 # else read the data and close the file
                 else:
-                    f = self.parent.openFile(filename, 'r')
+                    f = self.parent.openFile(filename,'r')
                     try:
                         var = f.variables[self.name_in_file]
-                        if fci is None:
-                            chunk = var.getitem(*tuple(slicelist))
+                        if fci==None:
+                            chunk = apply(var.getitem,tuple(slicelist))
                         else:
                             # If there's a forecast axis, the file doesn't know about it so
                             # don't use it in slicing data out of the file.
-                            chunk = var.getitem(
-                                *tuple(slicelist[0:fci] + slicelist[fci + 1:]))
+                            chunk = apply( var.getitem, \
+                                           tuple( slicelist[0:fci]+slicelist[fci+1:] ) )
                             # But the chunk still needs an index in the forecast direction,
-                            # which is simple to do because there is only one
-                            # forecast per file:
-                            chunk.resize(map(lenSlice, slicelist))
+                            # which is simple to do because there is only one forecast per file:
+                            chunk.resize( map(lenSlice,slicelist) )
 
                     finally:
                         f.close()
                     sh = chunk.shape
                     if 0 in sh:
-                        raise CDMSError('Coordinates out of Domain')
+                        raise CDMSError, 'Coordinates out of Domain'
 
-                resultlist.append(self._returnArray(chunk, 0))
+                resultlist.append(self._returnArray(chunk,0))
 
             # Combine the chunks into a single array
             # Note: This works because slicelist is the same length
             # as the domain, and var.getitem returns a chunk
             # with singleton dimensions included. This means that
             # npart1 corresponds to the correct dimension of chunk.
-            result = numpy.ma.concatenate(resultlist, axis=npart1)
+            result = numpy.ma.concatenate(resultlist,axis=npart1)
             for chunk in resultlist:
                 del(chunk)
 
         # If two partitioned axes, 2-D version of previous case
-        if npart == 2:
+        if npart==2:
             npart1, npart2 = idims
 
             resultlist = []
@@ -602,45 +596,42 @@ class DatasetVariable(AbstractVariable):
                     # If the slice is missing, interpose missing data
                     if filename is None:
                         shapelist = map(lenSlice, slicelist)
-                        chunk = numpy.ma.zeros(
-                            tuple(shapelist),
-                            self._numericType_)
+                        chunk = numpy.ma.zeros(tuple(shapelist),self._numericType_)
                         chunk[...] = numpy.ma.masked
 
                     # else read the data and close the file
                     else:
-                        f = self.parent.openFile(filename, 'r')
+                        f = self.parent.openFile(filename,'r')
                         try:
                             var = f.variables[self.name_in_file]
-                            if fci is None:
-                                chunk = var.getitem(*tuple(slicelist))
+                            if fci==None:
+                                chunk = apply(var.getitem,tuple(slicelist))
                             else:
                                 # If there's a forecast axis, the file doesn't know about it so
                                 # don't use it in slicing data out of the file.
-                                chunk = var.getitem(
-                                    *tuple(slicelist[0:fci] + slicelist[fci + 1:]))
+                                chunk = apply( var.getitem, \
+                                               tuple( slicelist[0:fci]+slicelist[fci+1:] ) )
                                 # But the chunk still needs an index in the forecast direction,
-                                # which is simple to do because there is only
-                                # one forecast per file:
-                                chunk.resize(map(lenSlice, slicelist))
+                                # which is simple to do because there is only one forecast per file:
+                                chunk.resize( map(lenSlice,slicelist) )
 
                         finally:
                             f.close()
                         sh = chunk.shape
                         if 0 in sh:
-                            raise CDMSError('Coordinates out of Domain')
-                    chunklist.append(self._returnArray(chunk, 0))
+                            raise CDMSError, 'Coordinates out of Domain'
+                    chunklist.append(self._returnArray(chunk,0))
 
                 # Note: This works because slicelist is the same length
                 # as the domain, and var.getitem returns a chunk
                 # with singleton dimensions included. This means that
                 # npart1 corresponds to the correct dimension of chunk.
-                bigchunk = numpy.ma.concatenate(chunklist, axis=npart2)
+                bigchunk = numpy.ma.concatenate(chunklist,axis=npart2)
                 for chunk in chunklist:
                     del(chunk)
                 resultlist.append(bigchunk)
 
-            result = numpy.ma.concatenate(resultlist, axis=npart1)
+            result = numpy.ma.concatenate(resultlist,axis=npart1)
             for bigchunk in resultlist:
                 del(bigchunk)
 
@@ -651,15 +642,16 @@ class DatasetVariable(AbstractVariable):
 
         return result
 
-    shape = property(_getShape, None)
-# shape = _getShape
-    dtype = property(_getdtype, None)
 
-# PropertiedClasses.set_property (DatasetVariable, 'shape',
-# DatasetVariable._getShape, nowrite=1,
-# nodelete=1)
-# PropertiedClasses.set_property (DatasetVariable, 'dtype',
-# DatasetVariable._getdtype, nowrite=1,
-# nodelete=1)
+    shape = property(_getShape,None)
+##     shape = _getShape
+    dtype = property(_getdtype,None)
+    
+## PropertiedClasses.set_property (DatasetVariable, 'shape', 
+##                                   DatasetVariable._getShape, nowrite=1,
+##                                   nodelete=1)
+## PropertiedClasses.set_property (DatasetVariable, 'dtype', 
+##                                   DatasetVariable._getdtype, nowrite=1,
+##                                   nodelete=1)
 
-# internattr.add_internal_attribute(DatasetVariable, 'domain')
+## internattr.add_internal_attribute(DatasetVariable, 'domain')
diff --git a/Packages/cdms2/Lib/xlink.py b/Packages/cdms2/Lib/xlink.py
new file mode 100644
index 000000000..870b5fafd
--- /dev/null
+++ b/Packages/cdms2/Lib/xlink.py
@@ -0,0 +1,9 @@
+"""
+CDMS Xlink objects - pointers to other objects
+"""
+class Xlink(CdmsObj):
+    def __init__(self,xlinkNode=None):
+        assert xlinkNode is None or xlinkNode.tag=='xlink',\
+               'Node is not a link node'
+        CdmsObj.__init__(self,xlinkNode)
+
-- 
GitLab