2to3 -f except

[sfa.git] / sfa / client / multiclient.py

diff --git a/sfa/client/multiclient.py b/sfa/client/multiclient.py
index 75573ed..6bdf2b2 100644 (file)
--- a/sfa/client/multiclient.py
+++ b/sfa/client/multiclient.py
@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 import threading
 import traceback
 import time
@@ -15,7 +17,7 @@ def ThreadedMethod(callable, results, errors):
             def run(self):
                 try:
                     results.put(callable(*args, **kwds))
-                except Exception, e:
+                except Exception as e:
                     logger.log_exc('MultiClient: Error in thread: ')
                     errors.put(traceback.format_exc())
                     
@@ -95,14 +97,14 @@ if __name__ == '__main__':
     def f(name, n, sleep=1):
         nums = []
         for i in range(n, n+5):
-            print "%s: %s" % (name, i)
+            print("%s: %s" % (name, i))
             nums.append(i)
             time.sleep(sleep)
         return nums
     def e(name, n, sleep=1):
         nums = []
         for i in range(n, n+3) + ['n', 'b']:
-            print "%s: 1 + %s:" % (name, i)
+            print("%s: 1 + %s:" % (name, i))
             nums.append(i + 1)
             time.sleep(sleep)
         return nums