PEP8+python exceptions

chaos_monkey/control.py

@@ -1,14 +1,16 @@
 import json
 import logging
-import requests
 import platform
-import monkeyfs
-from network.info import local_ips, check_internet_access
 from socket import gethostname
-from config import WormConfiguration, GUID
-from transport.tcp import TcpProxy
-from transport.http import HTTPConnectProxy
+
+import requests
+
+import monkeyfs
 import tunnel
+from config import WormConfiguration, GUID
+from network.info import local_ips, check_internet_access
+from transport.http import HTTPConnectProxy
+from transport.tcp import TcpProxy
 
 __author__ = 'hoffer'
 
@@ -60,7 +62,7 @@ class ControlClient(object):
                                       timeout=20)
                 break
 
-            except Exception, exc:
+            except Exception as exc:
                 WormConfiguration.current_server = ""
                 LOG.warn("Error connecting to control server %s: %s", server, exc)
 
@@ -83,13 +85,13 @@ class ControlClient(object):
         try:
             monkey = {}
             if ControlClient.proxies:
-                monkey['tunnel'] = ControlClient.proxies.get('https')            
+                monkey['tunnel'] = ControlClient.proxies.get('https')
             reply = requests.patch("https://%s/api/monkey/%s" % (WormConfiguration.current_server, GUID),
                                    data=json.dumps(monkey),
                                    headers={'content-type': 'application/json'},
                                    verify=False,
                                    proxies=ControlClient.proxies)
-        except Exception, exc:
+        except Exception as exc:
             LOG.warn("Error connecting to control server %s: %s",
                      WormConfiguration.current_server, exc)
             return {}
@@ -97,7 +99,7 @@ class ControlClient(object):
     @staticmethod
     def send_telemetry(tele_type='general', data=''):
         if not WormConfiguration.current_server:
-            return        
+            return
         try:
             telemetry = {'monkey_guid': GUID, 'telem_type': tele_type, 'data': data}
             reply = requests.post("https://%s/api/telemetry" % (WormConfiguration.current_server,),
@@ -105,20 +107,20 @@ class ControlClient(object):
                                   headers={'content-type': 'application/json'},
                                   verify=False,
                                   proxies=ControlClient.proxies)
-        except Exception, exc:
+        except Exception as exc:
             LOG.warn("Error connecting to control server %s: %s",
                      WormConfiguration.current_server, exc)
 
     @staticmethod
     def load_control_config():
         if not WormConfiguration.current_server:
-            return        
+            return
         try:
             reply = requests.get("https://%s/api/monkey/%s" % (WormConfiguration.current_server, GUID),
                                  verify=False,
                                  proxies=ControlClient.proxies)
 
-        except Exception, exc:
+        except Exception as exc:
             LOG.warn("Error connecting to control server %s: %s",
                      WormConfiguration.current_server, exc)
             return
@@ -126,7 +128,7 @@ class ControlClient(object):
         try:
             unknown_variables = WormConfiguration.from_dict(reply.json().get('config'))
             LOG.info("New configuration was loaded from server: %r" % (WormConfiguration.as_dict(),))
-        except Exception, exc:
+        except Exception as exc:
             # we don't continue with default conf here because it might be dangerous
             LOG.error("Error parsing JSON reply from control server %s (%s): %s",
                       WormConfiguration.current_server, reply._content, exc)
@@ -141,11 +143,11 @@ class ControlClient(object):
             return
         try:
             requests.patch("https://%s/api/monkey/%s" % (WormConfiguration.current_server, GUID),
-                                data=json.dumps({'config_error': True}),
-                                headers={'content-type': 'application/json'},
-                                verify=False,
-                                proxies=ControlClient.proxies)
-        except Exception, exc:
+                           data=json.dumps({'config_error': True}),
+                           headers={'content-type': 'application/json'},
+                           verify=False,
+                           proxies=ControlClient.proxies)
+        except Exception as exc:
             LOG.warn("Error connecting to control server %s: %s", WormConfiguration.current_server, exc)
             return {}
 
@@ -215,7 +217,7 @@ class ControlClient(object):
                 if size == monkeyfs.getsize(dest_file):
                     return dest_file
 
-        except Exception, exc:
+        except Exception as exc:
             LOG.warn("Error connecting to control server %s: %s",
                      WormConfiguration.current_server, exc)
 
@@ -243,7 +245,7 @@ class ControlClient(object):
             else:
                 return None, None
 
-        except Exception, exc:
+        except Exception as exc:
             LOG.warn("Error connecting to control server %s: %s",
                      WormConfiguration.current_server, exc)
 
@@ -253,7 +255,7 @@ class ControlClient(object):
     def create_control_tunnel():
         if not WormConfiguration.current_server:
             return None
-        
+
         my_proxy = ControlClient.proxies.get('https', '').replace('https://', '')
         if my_proxy:
             proxy_class = TcpProxy