[cig-commits] r18939 - in short/3D/PyLith/branches/v1.6-stable/pylith: bc faults feassemble friction materials meshio
brad at geodynamics.org
brad at geodynamics.org
Mon Sep 19 14:01:33 PDT 2011
Author: brad
Date: 2011-09-19 14:01:33 -0700 (Mon, 19 Sep 2011)
New Revision: 18939
Modified:
short/3D/PyLith/branches/v1.6-stable/pylith/bc/BoundaryCondition.py
short/3D/PyLith/branches/v1.6-stable/pylith/bc/DirichletBC.py
short/3D/PyLith/branches/v1.6-stable/pylith/faults/Fault.py
short/3D/PyLith/branches/v1.6-stable/pylith/feassemble/FIATLagrange.py
short/3D/PyLith/branches/v1.6-stable/pylith/feassemble/FIATSimplex.py
short/3D/PyLith/branches/v1.6-stable/pylith/friction/FrictionModel.py
short/3D/PyLith/branches/v1.6-stable/pylith/materials/Material.py
short/3D/PyLith/branches/v1.6-stable/pylith/meshio/DataWriterVTK.py
short/3D/PyLith/branches/v1.6-stable/pylith/meshio/OutputSolnSubset.py
Log:
Change syntax of exception catch for compatibility with Python 4.2 (except ValueError as err -> except ValueError, err).
Modified: short/3D/PyLith/branches/v1.6-stable/pylith/bc/BoundaryCondition.py
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/pylith/bc/BoundaryCondition.py 2011-09-19 17:30:41 UTC (rev 18938)
+++ short/3D/PyLith/branches/v1.6-stable/pylith/bc/BoundaryCondition.py 2011-09-19 21:01:33 UTC (rev 18939)
@@ -147,7 +147,7 @@
ModuleBoundaryCondition.label(self, self.inventory.label)
self.upDir = map(float, self.inventory.upDir)
self.perfLogger = self.inventory.perfLogger
- except ValueError as err:
+ except ValueError, err:
aliases = ", ".join(self.aliases)
raise ValueError("Error while configuring boundary condition "
"(%s):\n%s" % (aliases, err.message))
Modified: short/3D/PyLith/branches/v1.6-stable/pylith/bc/DirichletBC.py
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/pylith/bc/DirichletBC.py 2011-09-19 17:30:41 UTC (rev 18938)
+++ short/3D/PyLith/branches/v1.6-stable/pylith/bc/DirichletBC.py 2011-09-19 21:01:33 UTC (rev 18939)
@@ -117,7 +117,7 @@
try:
BoundaryCondition._configure(self)
TimeDependentPoints._configure(self)
- except ValueError as err:
+ except ValueError, err:
aliases = ", ".join(self.aliases)
raise ValueError("Error while configuring Dirichlet boundary condition "
"(%s):\n%s" % (aliases, err.message))
Modified: short/3D/PyLith/branches/v1.6-stable/pylith/faults/Fault.py
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/pylith/faults/Fault.py 2011-09-19 17:30:41 UTC (rev 18938)
+++ short/3D/PyLith/branches/v1.6-stable/pylith/faults/Fault.py 2011-09-19 21:01:33 UTC (rev 18939)
@@ -233,7 +233,7 @@
ModuleFault.id(self, self.inventory.matId)
ModuleFault.label(self, self.inventory.faultLabel)
self.perfLogger = self.inventory.perfLogger
- except ValueError as err:
+ except ValueError, err:
aliases = ", ".join(self.aliases)
raise ValueError("Error while configuring fault "
"(%s):\n%s" % (aliases, err.message))
Modified: short/3D/PyLith/branches/v1.6-stable/pylith/feassemble/FIATLagrange.py
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/pylith/feassemble/FIATLagrange.py 2011-09-19 17:30:41 UTC (rev 18938)
+++ short/3D/PyLith/branches/v1.6-stable/pylith/feassemble/FIATLagrange.py 2011-09-19 21:01:33 UTC (rev 18939)
@@ -414,7 +414,7 @@
if self.order == -1:
self.order = self.degree+1
- except ValueError as err:
+ except ValueError, err:
aliases = ", ".join(self.aliases)
raise ValueError("Error while configuring quadrature "
"(%s):\n%s" % (aliases, err.message))
Modified: short/3D/PyLith/branches/v1.6-stable/pylith/feassemble/FIATSimplex.py
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/pylith/feassemble/FIATSimplex.py 2011-09-19 17:30:41 UTC (rev 18938)
+++ short/3D/PyLith/branches/v1.6-stable/pylith/feassemble/FIATSimplex.py 2011-09-19 21:01:33 UTC (rev 18939)
@@ -165,7 +165,7 @@
self.order = self.inventory.order
if self.order == -1:
self.order = self.degree
- except ValueError as err:
+ except ValueError, err:
aliases = ", ".join(self.aliases)
raise ValueError("Error while configuring quadrature "
"(%s):\n%s" % (aliases, err.message))
Modified: short/3D/PyLith/branches/v1.6-stable/pylith/friction/FrictionModel.py
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/pylith/friction/FrictionModel.py 2011-09-19 17:30:41 UTC (rev 18938)
+++ short/3D/PyLith/branches/v1.6-stable/pylith/friction/FrictionModel.py 2011-09-19 21:01:33 UTC (rev 18939)
@@ -128,7 +128,7 @@
self.dbInitialState(self.inventory.dbInitialState)
self.perfLogger = self.inventory.perfLogger
- except ValueError as err:
+ except ValueError, err:
aliases = ", ".join(self.aliases)
raise ValueError("Error while configuring friction model "
"(%s):\n%s" % (aliases, err.message))
Modified: short/3D/PyLith/branches/v1.6-stable/pylith/materials/Material.py
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/pylith/materials/Material.py 2011-09-19 17:30:41 UTC (rev 18938)
+++ short/3D/PyLith/branches/v1.6-stable/pylith/materials/Material.py 2011-09-19 21:01:33 UTC (rev 18939)
@@ -191,7 +191,7 @@
self.quadrature = self.inventory.quadrature
self.perfLogger = self.inventory.perfLogger
- except ValueError as err:
+ except ValueError, err:
aliases = ", ".join(self.aliases)
raise ValueError("Error while configuring material "
"(%s):\n%s" % (aliases, err.message))
Modified: short/3D/PyLith/branches/v1.6-stable/pylith/meshio/DataWriterVTK.py
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/pylith/meshio/DataWriterVTK.py 2011-09-19 17:30:41 UTC (rev 18938)
+++ short/3D/PyLith/branches/v1.6-stable/pylith/meshio/DataWriterVTK.py 2011-09-19 21:01:33 UTC (rev 18939)
@@ -90,7 +90,7 @@
"""
try:
DataWriter._configure(self)
- except ValueError as err:
+ except ValueError, err:
aliases = ", ".join(self.aliases)
raise ValueError("Error while configuring VTK output "
"(%s):\n%s" % (aliases, err.message))
Modified: short/3D/PyLith/branches/v1.6-stable/pylith/meshio/OutputSolnSubset.py
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/pylith/meshio/OutputSolnSubset.py 2011-09-19 17:30:41 UTC (rev 18938)
+++ short/3D/PyLith/branches/v1.6-stable/pylith/meshio/OutputSolnSubset.py 2011-09-19 21:01:33 UTC (rev 18939)
@@ -158,7 +158,7 @@
ModuleOutputSolnSubset.vertexFilter(self, self.inventory.vertexFilter)
if not isinstance(self.inventory.cellFilter, NullComponent):
ModuleOutputSolnSubset.cellFilter(self, self.inventory.cellFilter)
- except ValueError as err:
+ except ValueError, err:
aliases = ", ".join(self.aliases)
raise ValueError("Error while configuring output over boundary "
"(%s):\n%s" % (aliases, err.message))
More information about the CIG-COMMITS
mailing list