Author: bugman Date: Thu Jul 7 11:44:26 2011 New Revision: 13480 URL: http://svn.gna.org/viewcvs/relax?rev=13480&view=rev Log: The user function object is now stored as self.uf in the user function page objects. Modified: branches/gui_testing/gui/user_functions/base.py Modified: branches/gui_testing/gui/user_functions/base.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/user_functions/base.py?rev=13480&r1=13479&r2=13480&view=diff ============================================================================== --- branches/gui_testing/gui/user_functions/base.py (original) +++ branches/gui_testing/gui/user_functions/base.py Thu Jul 7 11:44:26 2011 @@ -105,19 +105,19 @@ # Get the user function. if len(self.uf_path) == 1: - uf = uf_class + self.uf = uf_class else: - uf = getattr(uf_class, self.uf_path[1]) + self.uf = getattr(uf_class, self.uf_path[1]) # Set the user function title. - if hasattr(uf, '_doc_title_short'): - self.title = uf._doc_title_short + if hasattr(self.uf, '_doc_title_short'): + self.title = self.uf._doc_title_short else: - self.title = uf._doc_title + self.title = self.uf._doc_title # Set the main text to the description doc. - if hasattr(uf, '_doc_desc'): - self.main_text = uf._doc_title + '\n\n' + self._format_text(uf._doc_desc) + if hasattr(self.uf, '_doc_desc'): + self.main_text = self.uf._doc_title + '\n\n' + self._format_text(self.uf._doc_desc) # Remove trailing newlines. if self.main_text[-1] == '\n':