r24420 - in /tags/3.2.3: dep_check.py relax.py -- July 02, 2014 - 17:46

Author: bugman
Date: Wed Jul  2 17:46:33 2014
New Revision: 24420

URL: http://svn.gna.org/viewcvs/relax?rev=24420&view=rev
Log:
Ported a critical fix for MS Windows to allow relax to run from the trunk.

The command used was:
svn merge -r24418:24419 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk .


Modified:
    tags/3.2.3/dep_check.py
    tags/3.2.3/relax.py

Modified: tags/3.2.3/dep_check.py
URL: 
http://svn.gna.org/viewcvs/relax/tags/3.2.3/dep_check.py?rev=24420&r1=24419&r2=24420&view=diff
==============================================================================
--- tags/3.2.3/dep_check.py     (original)
+++ tags/3.2.3/dep_check.py     Wed Jul  2 17:46:33 2014
@@ -87,7 +87,7 @@
 # Readline module (avoiding the damned ^[[?1034h escape code on Linux 
systems).
 try:
     import os
-    if os.environ['TERM'] == 'xterm':
+    if 'TERM' in os.environ and os.environ['TERM'] == 'xterm':
         os.environ['TERM'] = 'linux'
     import readline
     readline_module = True

Modified: tags/3.2.3/relax.py
URL: 
http://svn.gna.org/viewcvs/relax/tags/3.2.3/relax.py?rev=24420&r1=24419&r2=24420&view=diff
==============================================================================
--- tags/3.2.3/relax.py (original)
+++ tags/3.2.3/relax.py Wed Jul  2 17:46:33 2014
@@ -38,7 +38,7 @@
 
 # Eliminate the ^[[?1034h escape code being produced on Linux systems by the 
import of the readline module.
 import os
-if os.environ['TERM'] == 'xterm':
+if 'TERM' in os.environ and os.environ['TERM'] == 'xterm':
     os.environ['TERM'] = 'linux'
 
 # Set up the Python 2 and 3 work-arounds.