[cig-commits] [commit] master: Use new style classes (56663cf)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu Dec 11 12:24:59 PST 2014
Repository : https://github.com/geodynamics/burnman
On branch : master
Link : https://github.com/geodynamics/burnman/compare/2d7ebd81fdf9d267e8b5f857254f32a158f57150...34700b536aedbd273e52cb067896b1445f669a05
>---------------------------------------------------------------
commit 56663cf1be217d591bb2d7cb38d5fbe21bbb6e80
Author: ian-r-rose <ian.r.rose at gmail.com>
Date: Thu Dec 11 12:08:42 2014 -0800
Use new style classes
>---------------------------------------------------------------
56663cf1be217d591bb2d7cb38d5fbe21bbb6e80
burnman/averaging_schemes.py | 2 +-
burnman/main.py | 2 +-
burnman/material.py | 2 +-
burnman/model.py | 2 +-
burnman/seismic.py | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/burnman/averaging_schemes.py b/burnman/averaging_schemes.py
index b61f05f..ff78dc8 100644
--- a/burnman/averaging_schemes.py
+++ b/burnman/averaging_schemes.py
@@ -6,7 +6,7 @@ import numpy as np
import warnings
-class AveragingScheme:
+class AveragingScheme(object):
"""
Base class defining an interface for determining average
elastic properties of a rock. Given a list of volume
diff --git a/burnman/main.py b/burnman/main.py
index e7d7855..eb27e74 100644
--- a/burnman/main.py
+++ b/burnman/main.py
@@ -9,7 +9,7 @@ import burnman.geotherm
import burnman.seismic
import burnman.averaging_schemes
-class ElasticProperties:
+class ElasticProperties(object):
"""
Class that contains volume, density, and moduli. This is generated for
different pressures and temperatures using
diff --git a/burnman/material.py b/burnman/material.py
index bf3ceb0..f49d9a9 100644
--- a/burnman/material.py
+++ b/burnman/material.py
@@ -3,7 +3,7 @@
# Released under GPL v2 or later.
-class Material:
+class Material(object):
"""
Base class for all materials. The main functionality is unroll() which
returns a list of objects of type :class:`~burnman.mineral.Mineral` and their molar
diff --git a/burnman/model.py b/burnman/model.py
index ff8562b..81a0dd4 100644
--- a/burnman/model.py
+++ b/burnman/model.py
@@ -7,7 +7,7 @@ from material import Material
from averaging_schemes import AveragingScheme
-class Model:
+class Model(object):
"""
planetary model realization
diff --git a/burnman/seismic.py b/burnman/seismic.py
index 74bc9eb..319160f 100644
--- a/burnman/seismic.py
+++ b/burnman/seismic.py
@@ -7,7 +7,7 @@ import matplotlib.pyplot as plt
import tools
-class Seismic1DModel:
+class Seismic1DModel(object):
"""
Base class for all the seismological models.
"""
More information about the CIG-COMMITS
mailing list