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
+import requests
-from transport.http import HTTPConnectProxy
+
+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)
 
@@ -89,7 +91,7 @@ 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)
             return {}
@@ -105,7 +107,7 @@ 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)
 
@@ -118,7 +120,7 @@ class ControlClient(object):
                                  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)
@@ -145,7 +147,7 @@ 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)
             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)