r14147 - in /branches/gui_testing: ./ generic_fns/structure/main.py -- August 04, 2011 - 18:08

Author: bugman
Date: Thu Aug  4 18:08:58 2011
New Revision: 14147

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

........
  r14146 | bugman | 2011-08-04 18:08:13 +0200 (Thu, 04 Aug 2011) | 5 lines
  
  Fix for the structure.vectors user function.
  
  It no longer complains about a PDB already loaded when no PDB has been 
loaded.
........

Modified:
    branches/gui_testing/   (props changed)
    branches/gui_testing/generic_fns/structure/main.py

Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Aug  4 18:08:58 2011
@@ -1,1 +1,1 @@
-/1.3:1-14110
+/1.3:1-14146

Modified: branches/gui_testing/generic_fns/structure/main.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/generic_fns/structure/main.py?rev=14147&r1=14146&r2=14147&view=diff
==============================================================================
--- branches/gui_testing/generic_fns/structure/main.py (original)
+++ branches/gui_testing/generic_fns/structure/main.py Thu Aug  4 18:08:58 
2011
@@ -36,7 +36,7 @@
 from generic_fns import pipes
 from generic_fns.structure.internal import Internal
 from generic_fns.structure.scientific import Scientific_data
-from relax_errors import RelaxError, RelaxFileError, RelaxNoPdbError, 
RelaxNoSequenceError, RelaxPdbError
+from relax_errors import RelaxError, RelaxFileError, RelaxNoPdbError, 
RelaxNoSequenceError
 from relax_io import get_file_path, open_write_file, write_spin_data
 from relax_warnings import RelaxWarning, RelaxNoPDBFileWarning, 
RelaxZeroVectorWarning
 
@@ -358,7 +358,7 @@
 
     # Test if the PDB file has been loaded.
     if not hasattr(cdp, 'structure'):
-        raise RelaxPdbError
+        raise RelaxNoPdbError
 
     # Test if sequence data is loaded.
     if not exists_mol_res_spin_data():