Author: bugman Date: Tue Feb 23 18:34:44 2010 New Revision: 10866 URL: http://svn.gna.org/viewcvs/relax?rev=10866&view=rev Log: Merged revisions 10865 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3 ........ r10865 | bugman | 2010-02-23 18:31:03 +0100 (Tue, 23 Feb 2010) | 5 lines The Info_box is now really a singleton - a bug in __new__() has been eliminated. ........ Modified: branches/multi_processor_merge/ (props changed) branches/multi_processor_merge/info.py Propchange: branches/multi_processor_merge/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Tue Feb 23 18:34:44 2010 @@ -1,1 +1,1 @@ -/1.3:1-10862 +/1.3:1-10865 Modified: branches/multi_processor_merge/info.py URL: http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/info.py?rev=10866&r1=10865&r2=10866&view=diff ============================================================================== --- branches/multi_processor_merge/info.py (original) +++ branches/multi_processor_merge/info.py Tue Feb 23 18:34:44 2010 @@ -32,7 +32,7 @@ -class Info_box: +class Info_box(object): """A container storing information about relax.""" # Class variable for storing the class instance. @@ -85,7 +85,7 @@ # First initialisation. if self.instance is None: - self.instance = dict.__new__(self, *args, **kargs) + self.instance = object.__new__(self, *args, **kargs) # Already initialised, so return the instance. return self.instance