r3104 - /1.3/data/__init__.py -- March 08, 2007 - 05:20

Author: bugman
Date: Thu Mar  8 05:20:20 2007
New Revision: 3104

URL: http://svn.gna.org/viewcvs/relax?rev=3104&view=rev
Log:
The Data class has been converted from an 'object' type to a 'DictType'.

The Singleton set up has been appropriately modified.


Modified:
    1.3/data/__init__.py

Modified: 1.3/data/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/data/__init__.py?rev=3104&r1=3103&r2=3104&view=diff
==============================================================================
--- 1.3/data/__init__.py (original)
+++ 1.3/data/__init__.py Thu Mar  8 05:20:20 2007
@@ -22,7 +22,7 @@
 
 # Python module imports.
 from re import match
-from types import DictType, ListType
+from types import DictType
 
 
 __all__ = [ 'data_classes',
@@ -30,10 +30,8 @@
             'diff_tensor_auto_objects',
             'main' ]
 
-# Global data.
-##############
 
-class Data(object):
+class Data(DictType):
     """The relax data storage object."""
 
     # Singleton initialisation, the reference to the single instance of this 
class.
@@ -54,7 +52,7 @@
 
         # Create a new instance if none exists.
         if self.__instance is None:
-            self.__instance = object.__new__(self, *args, **kargs)
+            self.__instance = DictType.__new__(self, *args, **kargs)
 
         # Return the class instance.
         return self.__instance