r26520 - in /trunk/gui: interpreter.py misc.py -- November 11, 2014 - 14:34

Author: bugman
Date: Tue Nov 11 14:34:12 2014
New Revision: 26520

URL: http://svn.gna.org/viewcvs/relax?rev=26520&view=rev
Log:
Python 3 fixes via 2to3 - elimination of all apply() calls.

This only affects the GUI which cannot run in Python 3 yet as wxPython is not 
Python 3 compatible
yet.

The command used was:
2to3 -j 4 -w -f apply .


Modified:
    trunk/gui/interpreter.py
    trunk/gui/misc.py

Modified: trunk/gui/interpreter.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/interpreter.py?rev=26520&r1=26519&r2=26520&view=diff
==============================================================================
--- trunk/gui/interpreter.py    (original)
+++ trunk/gui/interpreter.py    Tue Nov 11 14:34:12 2014
@@ -106,7 +106,7 @@
 
         # Execute the user function.
         try:
-            apply(fn, args, kwds)
+            fn(*args, **kwds)
 
         # Catch all RelaxErrors.
         except AllRelaxErrors:
@@ -300,7 +300,7 @@
             # Execute the user function, catching errors (the nested 
try-except statements within the try-finally statements are for Python 2.4 
and earlier support).
             try:
                 try:
-                    apply(fn, args, kwds)
+                    fn(*args, **kwds)
 
                 # Catch all RelaxErrors.
                 except AllRelaxErrors:

Modified: trunk/gui/misc.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/misc.py?rev=26520&r1=26519&r2=26520&view=diff
==============================================================================
--- trunk/gui/misc.py   (original)
+++ trunk/gui/misc.py   Tue Nov 11 14:34:12 2014
@@ -303,7 +303,7 @@
 
     # Apply the function.
     try:
-        apply(fn, args, kargs)
+        fn(*args, **kargs)
 
     # Catch RelaxErrors.
     except AllRelaxErrors: