The command used was:
[edau@... 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!
.....
