r19917 - in /branches/relax_disp: ./ user_functions/spectrum.py -- June 06, 2013 - 20:17

Author: bugman
Date: Thu Jun  6 20:17:21 2013
New Revision: 19917

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

........
  r19916 | bugman | 2013-06-06 20:17:09 +0200 (Thu, 06 Jun 2013) | 6 lines
  
  Partial fix for bug ##20873 (https://gna.org/bugs/?20873).
  
  The spectrum_id argument for the spectrum.read_intensities user function 
can now be both a string
  and a list of strings.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/user_functions/spectrum.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun  6 20:17:21 2013
@@ -1,1 +1,1 @@
-/trunk:1-19914
+/trunk:1-19916

Modified: branches/relax_disp/user_functions/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/spectrum.py?rev=19917&r1=19916&r2=19917&view=diff
==============================================================================
--- branches/relax_disp/user_functions/spectrum.py (original)
+++ branches/relax_disp/user_functions/spectrum.py Thu Jun  6 20:17:21 2013
@@ -233,7 +233,7 @@
 )
 uf.add_keyarg(
     name = "spectrum_id",
-    py_type = "str",
+    py_type = "str_or_str_list",
     desc_short = "spectrum ID string",
     desc = "The unique spectrum ID string to associate with the peak 
intensity values."
 )