r8882 - in /branches/bmrb: ./ prompt/molecule.py -- February 27, 2009 - 14:37

Author: bugman
Date: Fri Feb 27 14:37:57 2009
New Revision: 8882

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

........
  r8879 | bugman | 2009-02-27 14:31:58 +0100 (Fri, 27 Feb 2009) | 5 lines
  
  Allowed molecule.name() to name unnamed molecules.
  
  I.e. the mol_id arg can be None.
........

Modified:
    branches/bmrb/   (props changed)
    branches/bmrb/prompt/molecule.py

Propchange: branches/bmrb/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Feb 27 14:37:57 2009
@@ -1,1 +1,1 @@
-/1.3:1-8862
+/1.3:1-8881

Modified: branches/bmrb/prompt/molecule.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/prompt/molecule.py?rev=8882&r1=8881&r2=8882&view=diff
==============================================================================
--- branches/bmrb/prompt/molecule.py (original)
+++ branches/bmrb/prompt/molecule.py Fri Feb 27 14:37:57 2009
@@ -242,8 +242,8 @@
             print text
 
         # Residue identification string.
-        if type(mol_id) != str:
-            raise RelaxStrError, ('molecule identification string', mol_id)
+        if mol_id and type(mol_id) != str:
+            raise RelaxNoneStrError, ('molecule identification string', 
mol_id)
 
         # New molecule name.
         if type(name) != str: