r11014 - /1.3/prompt/interpreter.py -- March 16, 2010 - 18:05

Author: bugman
Date: Tue Mar 16 18:05:47 2010
New Revision: 11014

URL: http://svn.gna.org/viewcvs/relax?rev=11014&view=rev
Log:
Reverted r9348 as this breaks on Mac OS X newline characters!!!!  Retarded 
python 3.0!

The command used was:
[edau@localhost relax-1.3]$ svn merge -r9348:9347 .
--- Reverse-merging r9348 into '.':
U    prompt/interpreter.py

.....
  r9348 | bugman | 2009-08-21 10:50:08 +0200 (Fri, 21 Aug 2009) | 18 lines
  Changed paths:
     M /1.3/prompt/interpreter.py

  The execfile statement has been replaced with a call to the exec(compile()) 
function.

  This was done with the python 2.x to 3.x script with the commands:
  2to3 -w -f exec relax .

  The change is in preparation for Python 3.0, and relax still works with 
Python versions 2.4, 2.5,
  and 2.6.  The syntax has changed from:

  execfile(script_file, local)

  to:

  exec(compile(open(script_file).read(), script_file, 'exec'), local)

  Hmmm, not much of a language simplification!
.....


Modified:
    1.3/prompt/interpreter.py

Modified: 1.3/prompt/interpreter.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/prompt/interpreter.py?rev=11014&r1=11013&r2=11014&view=diff
==============================================================================
--- 1.3/prompt/interpreter.py (original)
+++ 1.3/prompt/interpreter.py Tue Mar 16 18:05:47 2010
@@ -426,7 +426,7 @@
 
     # Execute the script.
     try:
-        exec(compile(open(script_file).read(), script_file, 'exec'), local)
+        execfile(script_file, local)
 
     # Catch ctrl-C.
     except KeyboardInterrupt: