r26912 - in /branches/frame_order_cleanup: ./ pipe_control/pymol_control.py -- December 03, 2014 - 11:06

Author: bugman
Date: Wed Dec  3 11:06:21 2014
New Revision: 26912

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

........
  r26907 | bugman | 2014-12-03 08:50:18 +0100 (Wed, 03 Dec 2014) | 3 lines
  
  Grammar fix for a warning from the pymol.display user function.
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/pipe_control/pymol_control.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Dec  3 11:06:21 2014
@@ -1 +1 @@
-/trunk:1-26902
+/trunk:1-26911

Modified: branches/frame_order_cleanup/pipe_control/pymol_control.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/pymol_control.py?rev=26912&r1=26911&r2=26912&view=diff
==============================================================================
--- branches/frame_order_cleanup/pipe_control/pymol_control.py  (original)
+++ branches/frame_order_cleanup/pipe_control/pymol_control.py  Wed Dec  3 
11:06:21 2014
@@ -149,7 +149,7 @@
             for mol in model.mol:
                 # No file path.
                 if not hasattr(mol, 'file_name'):
-                    warn(RelaxWarning("Cannot display the current molecular 
data in PyMOL as it has not be exported as a PDB file."))
+                    warn(RelaxWarning("Cannot display the current molecular 
data in PyMOL as it has not been exported as a PDB file."))
                     continue
 
                 # The file path as the current directory.