r17029 - in /branches/interatomic: ./ generic_fns/sequence.py -- June 22, 2012 - 15:16

Author: bugman
Date: Fri Jun 22 15:16:50 2012
New Revision: 17029

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

........
  r17028 | bugman | 2012-06-22 15:15:56 +0200 (Fri, 22 Jun 2012) | 5 lines
  
  The sequence.read user function now fails with a RelaxError if no sequence 
data was loaded.
  
  This is for better user feedback.
........

Modified:
    branches/interatomic/   (props changed)
    branches/interatomic/generic_fns/sequence.py

Propchange: branches/interatomic/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jun 22 15:16:50 2012
@@ -1,1 +1,1 @@
-/trunk:1-17021
+/trunk:1-17028

Modified: branches/interatomic/generic_fns/sequence.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/generic_fns/sequence.py?rev=17029&r1=17028&r2=17029&view=diff
==============================================================================
--- branches/interatomic/generic_fns/sequence.py (original)
+++ branches/interatomic/generic_fns/sequence.py Fri Jun 22 15:16:50 2012
@@ -313,6 +313,10 @@
             spin_nums.append(spin_num)
             spin_names.append(spin_name)
 
+    # No data, so fail.
+    if not len(spin_names):
+        raise RelaxError("No sequence data could be loaded.")
+
     # Write the data.
     write_spin_data(sys.stdout, mol_names=mol_names, res_nums=res_nums, 
res_names=res_names, spin_nums=spin_nums, spin_names=spin_names)