r18821 - in /branches/frame_order_testing: ./ specific_fns/api_base.py -- March 13, 2013 - 16:20

Author: bugman
Date: Wed Mar 13 16:20:29 2013
New Revision: 18821

URL: http://svn.gna.org/viewcvs/relax?rev=18821&view=rev
Log:
Merged revisions 18819-18820 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r18819 | bugman | 2013-03-13 16:18:17 +0100 (Wed, 13 Mar 2013) | 5 lines
  
  Shifted all of the documentation variables to the top of the specific 
API_base class.
  
  This is for better organisation.
........
  r18820 | bugman | 2013-03-13 16:19:05 +0100 (Wed, 13 Mar 2013) | 5 lines
  
  Added the write_doc class variable to the specific analysis API class as a 
empty string.
  
  This is to fix the unit tests.
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/specific_fns/api_base.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar 13 16:20:29 2013
@@ -1,1 +1,1 @@
-/trunk:1-18817
+/trunk:1-18820

Modified: branches/frame_order_testing/specific_fns/api_base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/api_base.py?rev=18821&r1=18820&r2=18821&view=diff
==============================================================================
--- branches/frame_order_testing/specific_fns/api_base.py (original)
+++ branches/frame_order_testing/specific_fns/api_base.py Wed Mar 13 16:20:29 
2013
@@ -37,6 +37,14 @@
     All the methods here are prototype methods.  To identify that the method 
is not available for certain analysis types, if called a RelaxImplementError 
is raised if called.
     """
 
+    # Empty documentation strings.
+    default_value_doc = ""
+    eliminate_doc = ""
+    return_data_name_doc = ""
+    set_doc = ""
+    write_doc = ""
+
+
     def __init__(self):
         """Set up the specific objects."""
 
@@ -183,8 +191,6 @@
         return self.PARAMS.get_type(param)
 
 
-    # Empty documentation string.
-    default_value_doc = ""
     def default_value(self, param):
         """Return the default parameter values.
 
@@ -233,8 +239,6 @@
         raise RelaxImplementError('duplicate_data')
 
 
-    # Empty documentation string.
-    eliminate_doc = ""
     def eliminate(self, name, value, model_info, args, sim=None):
         """Model elimination method.
 
@@ -555,8 +559,6 @@
         return self.PARAMS.get_desc(name)
 
 
-    # Empty documentation string.
-    return_data_name_doc = ""
     def return_data_name(self, param):
         """Return a unique identifying string for the given parameter.
 
@@ -638,10 +640,6 @@
         raise RelaxImplementError('return_value')
 
 
-    # Empty documentation string.
-    set_doc = ""
-
-
     def set_error(self, model_info, index, error):
         """Set the model parameter errors.