Author: bugman
Date: Mon Jan 7 18:00:06 2008
New Revision: 4448
URL: http://svn.gna.org/viewcvs/relax?rev=4448&view=rev
Log:
Merged revisions 4447 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3
........
r4447 | bugman | 2008-01-07 17:59:23 +0100 (Mon, 07 Jan 2008) | 5 lines
Added the quit argument to the run() class method.
This is to allow the system/functional tests to run this method and to ask
relax not to quit.
........
Modified:
branches/N_state_model/ (props changed)
branches/N_state_model/prompt/interpreter.py
Propchange: branches/N_state_model/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: branches/N_state_model/prompt/interpreter.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/prompt/interpreter.py?rev=4448&r1=4447&r2=4448&view=diff
==============================================================================
--- branches/N_state_model/prompt/interpreter.py (original)
+++ branches/N_state_model/prompt/interpreter.py Mon Jan 7 18:00:06 2008
@@ -139,11 +139,14 @@
self._Vmd = Vmd(relax)
- def run(self):
+ def run(self, quit=True):
"""Run the python interpreter.
The namespace of this function is the namespace seen inside the
interpreter. All user
accessible functions, classes, etc, should be placed in this
namespace.
+
+ @param quit: If true, the default, then relax will exit after
running this function.
+ @type quit: bool
"""
# Python modules.
@@ -224,7 +227,7 @@
self.intro = 1
# Run the script.
- run_script(intro=self.relax.intro_string, local=self.local,
script_file=self.relax.script_file, quit=1)
+ run_script(intro=self.relax.intro_string, local=self.local,
script_file=self.relax.script_file, quit=quit)
# Test for the dummy mode for generating documentation (then exit).
elif hasattr(self.relax, 'dummy_mode'):
r4448 - in /branches/N_state_model: ./ prompt/interpreter.py