r24413 - in /branches/frame_order_cleanup: ./ dep_check.py relax.py -- July 02, 2014 - 15:41

Author: bugman
Date: Wed Jul  2 15:41:06 2014
New Revision: 24413

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

........
  r24412 | bugman | 2014-07-02 15:38:13 +0200 (Wed, 02 Jul 2014) | 11 lines
  
  Fix for the breakage of the relax help system. 
  
  This was reported at 
http://thread.gmane.org/gmane.science.nmr.relax.devel/6481.
  
  The problem was that the TERM environmental variable was turned off to 
avoid the GNU readline
  library on Linux systems emitting the ^[[?1034h escape code.  See the 
message at
  http://thread.gmane.org/gmane.science.nmr.relax.devel/6481/focus=6489 for 
more details.  However the
  Python help system obviously requires this environmental variable.  Now 
only if the TERM variable is
  set to 'xterm' will it be reset, and to 'linux' instead of the blank string 
''.
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/dep_check.py
    branches/frame_order_cleanup/relax.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul  2 15:41:06 2014
@@ -1 +1 @@
-/trunk:1-24407
+/trunk:1-24412

Modified: branches/frame_order_cleanup/dep_check.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/dep_check.py?rev=24413&r1=24412&r2=24413&view=diff
==============================================================================
--- branches/frame_order_cleanup/dep_check.py   (original)
+++ branches/frame_order_cleanup/dep_check.py   Wed Jul  2 15:41:06 2014
@@ -88,7 +88,7 @@
 try:
     import os
     if os.environ['TERM'] == 'xterm':
-        os.environ['TERM'] = ''
+        os.environ['TERM'] = 'linux'
     import readline
     readline_module = True
 except ImportError:

Modified: branches/frame_order_cleanup/relax.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/relax.py?rev=24413&r1=24412&r2=24413&view=diff
==============================================================================
--- branches/frame_order_cleanup/relax.py       (original)
+++ branches/frame_order_cleanup/relax.py       Wed Jul  2 15:41:06 2014
@@ -38,7 +38,8 @@
 
 # Eliminate the ^[[?1034h escape code being produced on Linux systems by the 
import of the readline module.
 import os
-os.environ['TERM'] = ''
+if os.environ['TERM'] == 'xterm':
+    os.environ['TERM'] = 'linux'
 
 # Set up the Python 2 and 3 work-arounds.
 import lib.compat