Attempt to fix more pylint errors and warnings

Related to saltstack#27089 Saltcloud virtualbox provider
LoveIsGrief · Feb 11, 2016 · 7965eaa · 7965eaa
1 parent 4eab39e
commit 7965eaa
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/salt/cloud/clouds/virtualbox.py b/salt/cloud/clouds/virtualbox.py
@@ -14,7 +14,6 @@
     __opts__ : contains the options used to run Salt Cloud,
         as well as a set of configuration and environment variables
 """
-
 # Import python libs
 import logging
 

diff --git a/salt/utils/virtualbox.py b/salt/utils/virtualbox.py
@@ -189,7 +189,7 @@ def vb_get_network_adapters(machine_name=None, machine=None):
             )
             network_adapter["properties"] = inetwork_adapter.getProperties("")
             network_adapters.append(network_adapter)
-        except:
+        except Exception:
             pass
 
     return network_adapters
@@ -285,7 +285,6 @@ def vb_get_network_addresses(machine_name=None, machine=None):
                     ip_addresses.append(address)
             except Exception as e:
                 log.debug(e.message)
-                pass
 
     return ip_addresses
 

diff --git a/tests/utils/test_timeout.py b/tests/utils/test_timeout.py
@@ -4,7 +4,7 @@
 
 import time
 
-from utils.timeout import wait_for
+from salt.utils.timeout import wait_for
 
 log = logging.getLogger(__name__)