Author: bugman Date: Mon Nov 14 17:14:33 2011 New Revision: 14999 URL: http://svn.gna.org/viewcvs/relax?rev=14999&view=rev Log: Merged r14998 from the main 1.3 line as this is essential for the user manual compilation. The command used was: svn merge -r14997:14998 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3 Modified: tags/1.3.13/prompt/molecule.py Modified: tags/1.3.13/prompt/molecule.py URL: http://svn.gna.org/viewcvs/relax/tags/1.3.13/prompt/molecule.py?rev=14999&r1=14998&r2=14999&view=diff ============================================================================== --- tags/1.3.13/prompt/molecule.py (original) +++ tags/1.3.13/prompt/molecule.py Mon Nov 14 17:14:33 2011 @@ -102,8 +102,8 @@ ["mol_type", "The type of molecule."]] create._doc_desc = """ This adds a new molecule data container to the relax data storage object. The same molecule name cannot be used more than once. The molecule type need not be specified. However, if given, it should be one of""" - for i in range(len(ALLOWED_MOL_TYPES)): - create._doc_desc = "%s '%s'," % (create._doc_desc, ALLOWED_MOL_TYPES[i]) + for _i in range(len(ALLOWED_MOL_TYPES)): + create._doc_desc = "%s '%s'," % (create._doc_desc, ALLOWED_MOL_TYPES[_i]) create._doc_desc = "%s or '%s'." % (create._doc_desc, ALLOWED_MOL_TYPES[-1]) create._doc_examples = """ To create the molecules 'Ap4Aase', 'ATP', and 'MgF4', type: @@ -228,8 +228,8 @@ This allows the type of the molecule to be specified. It can be one of: """ - for i in range(len(ALLOWED_MOL_TYPES)): - type._doc_desc = "%s '%s',\n" % (type._doc_desc, ALLOWED_MOL_TYPES[i]) + for _i in range(len(ALLOWED_MOL_TYPES)): + type._doc_desc = "%s '%s',\n" % (type._doc_desc, ALLOWED_MOL_TYPES[_i]) type._doc_desc = "%s '%s'.\n" % (type._doc_desc, ALLOWED_MOL_TYPES[-1]) type._doc_examples = """ To set the molecule 'Ap4Aase' to the 'protein' type, type one of: