r16291 - in /branches/uf_redesign/prompt: base_class.py interpreter.py -- May 13, 2012 - 17:51

Author: bugman
Date: Sun May 13 17:51:53 2012
New Revision: 16291

URL: http://svn.gna.org/viewcvs/relax?rev=16291&view=rev
Log:
Shifted the prompt ps1, ps2 and ps3 variables into the 'interpreter' module.

This is the only place they are used, so they are better there.


Modified:
    branches/uf_redesign/prompt/base_class.py
    branches/uf_redesign/prompt/interpreter.py

Modified: branches/uf_redesign/prompt/base_class.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/prompt/base_class.py?rev=16291&r1=16290&r2=16291&view=diff
==============================================================================
--- branches/uf_redesign/prompt/base_class.py (original)
+++ branches/uf_redesign/prompt/base_class.py Sun May 13 17:51:53 2012
@@ -40,20 +40,6 @@
     width = 80
 else:
     width = 100
-
-
-# Module variables.
-###################
-
-# The prompts (to change the Python prompt, as well as the function print 
outs).
-PS1_ORIG = 'relax> '
-PS2_ORIG = 'relax| '
-PS3_ORIG = '\n%s' % PS1_ORIG
-
-# Coloured text.
-PS1_COLOUR = "%s%s%s" % (ansi.relax_prompt, PS1_ORIG, ansi.end)
-PS2_COLOUR = "%s%s%s" % (ansi.relax_prompt, PS2_ORIG, ansi.end)
-PS3_COLOUR = "\n%s%s%s" % (ansi.relax_prompt, PS1_ORIG, ansi.end)
 
 
 def _bold_text(text):

Modified: branches/uf_redesign/prompt/interpreter.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/prompt/interpreter.py?rev=16291&r1=16290&r2=16291&view=diff
==============================================================================
--- branches/uf_redesign/prompt/interpreter.py (original)
+++ branches/uf_redesign/prompt/interpreter.py Sun May 13 17:51:53 2012
@@ -41,7 +41,6 @@
 
 # relax module imports.
 from info import Info_box
-from prompt.base_class import PS1_ORIG, PS2_ORIG, PS3_ORIG, PS1_COLOUR, 
PS2_COLOUR, PS3_COLOUR
 from prompt.command import Ls, Lh, Ll, system
 from prompt.gpl import GPL
 from prompt.help import _Helper, _Helper_python
@@ -51,6 +50,20 @@
 from relax_errors import AllRelaxErrors, RelaxBinError, RelaxError, 
RelaxNoneError, RelaxStrError
 from status import Status; status = Status()
 from user_functions.data import Uf_info; uf_info = Uf_info()
+
+
+# Module variables.
+###################
+
+# The prompts (to change the Python prompt, as well as the function print 
outs).
+PS1_ORIG = 'relax> '
+PS2_ORIG = 'relax| '
+PS3_ORIG = '\n%s' % PS1_ORIG
+
+# Coloured text.
+PS1_COLOUR = "%s%s%s" % (ansi.relax_prompt, PS1_ORIG, ansi.end)
+PS2_COLOUR = "%s%s%s" % (ansi.relax_prompt, PS2_ORIG, ansi.end)
+PS3_COLOUR = "\n%s%s%s" % (ansi.relax_prompt, PS1_ORIG, ansi.end)
 
 
 class Interpreter: