Merge pull request #362 from simphony/revert-data-internalization

Problem: `data` property should be a reference

scripts/generate.py

@@ -646,7 +646,7 @@ def populate_data(self, contents):
         self.methods.append('''
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
         ''')
 
         self.methods.append('''

setup.cfg

@@ -4,4 +4,3 @@ exclude = doc/*
 
 [build_meta]
 repotag=555be66fc307899a5a9bcd8fe91760f58c487115
-

setup.py

@@ -87,7 +87,7 @@ def run(self):
             "cuba.yml")
 
         if not (os.path.exists(cuba_yml) and os.path.exists(metadata_yml)):
-            print (textwrap.dedent("""
+            print(textwrap.dedent("""
                 Cannot open simphony-metadata YAML files.
                 Please specify an appropriate path to the simphony-metadata
                 git repository in setup.cfg.
@@ -122,7 +122,7 @@ def run(self):
             check_call(cmd_args + ["simphony/core/keywords.py"])
             check_call(cmd_args + ["--recursive", "simphony/cuds/meta/"])
         except OSError:
-            print (textwrap.dedent("""
+            print(textwrap.dedent("""
                 Failed to run yapf. Make sure it is installed in your
                 python environment, by running
 
@@ -143,6 +143,8 @@ def write_version_py(filename=None):
         fh.write(ver % VERSION)
     finally:
         fh.close()
+
+
 write_version_py()
 
 # main setup configuration class

simphony/cuds/meta/atom.py

@@ -39,7 +39,7 @@ def definition(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/atomistic.py

@@ -25,7 +25,7 @@ def definition(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/base_centered_monoclinic_lattice.py

@@ -43,7 +43,7 @@ def models(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/base_centered_orthorhombic_lattice.py

@@ -43,7 +43,7 @@ def models(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/basis.py

@@ -42,7 +42,7 @@ def definition(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/berendsen.py

@@ -73,7 +73,7 @@ def variables(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/bird_carreau_model.py

@@ -96,7 +96,7 @@ def variables(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/body_centered_cubic_lattice.py

@@ -43,7 +43,7 @@ def models(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/body_centered_orthorhombic_lattice.py

@@ -43,7 +43,7 @@ def models(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/body_centered_tetragonal_lattice.py

@@ -43,7 +43,7 @@ def models(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/bond.py

@@ -40,7 +40,7 @@ def definition(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/boundary.py

@@ -42,7 +42,7 @@ def definition(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/box.py

@@ -58,7 +58,7 @@ def definition(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/bravais_lattice.py

@@ -96,7 +96,7 @@ def models(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/cell.py

@@ -24,7 +24,7 @@ def definition(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/cfd.py

@@ -172,7 +172,7 @@ def variables(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/compressibility_model.py

@@ -37,7 +37,7 @@ def variables(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/computational_method.py

@@ -31,7 +31,7 @@ def definition(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/computational_model.py

@@ -25,7 +25,7 @@ def definition(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/condition.py

@@ -25,7 +25,7 @@ def definition(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/constant_electrostatic_field_model.py

@@ -52,7 +52,7 @@ def variables(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/continuum.py

@@ -25,7 +25,7 @@ def definition(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/coulomb.py

@@ -70,7 +70,7 @@ def variables(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/coulomb_friction_force.py

@@ -56,7 +56,7 @@ def variables(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/cross_power_law_model.py

@@ -96,7 +96,7 @@ def variables(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/cubic_lattice.py

@@ -43,7 +43,7 @@ def models(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/cuds_component.py

@@ -50,7 +50,7 @@ def definition(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/cuds_item.py

@@ -22,7 +22,7 @@ def definition(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/data_set.py

@@ -31,7 +31,7 @@ def definition(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/dem.py

@@ -31,7 +31,7 @@ def definition(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/dirichlet.py

@@ -64,7 +64,7 @@ def definition(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/dissipation_force.py

@@ -56,7 +56,7 @@ def variables(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/edge.py

@@ -24,7 +24,7 @@ def definition(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/electronic.py

@@ -25,7 +25,7 @@ def definition(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/electrostatic_model.py

@@ -37,7 +37,7 @@ def variables(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/empty.py

@@ -64,7 +64,7 @@ def definition(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/engine.py

@@ -30,7 +30,7 @@ def engine_feature(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/engine_feature.py

@@ -35,7 +35,7 @@ def computational_method(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):

simphony/cuds/meta/face.py

@@ -24,7 +24,7 @@ def definition(self):
 
     @property
     def data(self):
-        return DataContainer(self._data)
+        return self._data
 
     @data.setter
     def data(self, new_data):