Fix python 2 exception handling

Incorporated changes from FoldingAtHome#55
nikolaik · Mar 22, 2020 · d57193c · d57193c
1 parent b2cb272
commit d57193c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/SConstruct b/SConstruct
@@ -3,8 +3,8 @@ import os
 env = Environment(ENV = os.environ)
 try:
     env.Tool('config', toolpath = [os.environ.get('CBANG_HOME')])
-except Exception, e:
-    raise Exception, 'CBANG_HOME not set?\n' + str(e)
+except Exception as e:
+    raise Exception('CBANG_HOME not set?\n' + str(e))
 
 env.CBLoadTools('packager run_distutils osx fah-client-version')
 env.CBAddVariables(
@@ -14,7 +14,7 @@ conf = env.CBConfigure()
 # Version
 try:
     version = env.FAHClientVersion()
-except Exception, e:
+except Exception as e:
     print(e)
     version = '0.0.0'
     env.Replace(PACKAGE_VERSION = version)

diff --git a/fah/FAHControl.py b/fah/FAHControl.py
@@ -1062,9 +1062,9 @@ def save_client_config(self, client):
 
             return True
 
-        except Exception as msg:
+        except Exception as err:
             self.set_status('Save Failed')
-            self.error(msg)
+            self.error(err)
             return False