Fix linting errors

salt/states/composer.py

@@ -39,7 +39,6 @@ the location of composer in the state.
 '''
 
 # Import salt libs
-import salt.utils
 from salt.exceptions import CommandExecutionError, CommandNotFoundError
 
 

salt/states/git.py

@@ -22,7 +22,6 @@ import os.path
 import shutil
 
 # Import salt libs
-import salt.utils
 from salt.exceptions import CommandExecutionError
 
 log = logging.getLogger(__name__)

salt/states/npm.py

@@ -20,7 +20,6 @@ for the package which provides npm (simply ``npm`` in most cases). Example:
 '''
 
 # Import salt libs
-import salt.utils
 from salt.exceptions import CommandExecutionError, CommandNotFoundError
 
 
@@ -94,7 +93,7 @@ def installed(name,
         pkg_list = [name]
 
     try:
-        installed_pkgs = __salt__['npm.list'](dir=dir, runas=runas, env=env)
+        installed_pkgs = __salt__['npm.list'](dir=dir, runas=user, env=env)
     except (CommandNotFoundError, CommandExecutionError) as err:
         ret['result'] = False
         ret['comment'] = 'Error looking up {0!r}: {1}'.format(name, err)

salt/states/postgres_group.py

@@ -14,7 +14,6 @@ The postgres_group module is used to create and manage Postgres groups.
 # Import Python libs
 
 # Import salt libs
-import salt.utils
 import logging
 
 # Salt imports

salt/states/postgres_user.py

@@ -14,7 +14,6 @@ The postgres_users module is used to create and manage Postgres users.
 # Import Python libs
 
 # Import salt libs
-import salt.utils
 import logging
 
 # Salt imports

salt/states/pyenv.py

@@ -48,9 +48,6 @@ This is how a state configuration could look like:
 # Import python libs
 import re
 
-# Import salt libs
-import salt.utils
-
 
 def _check_pyenv(ret, user=None):
     '''

salt/states/rvm.py

@@ -105,9 +105,6 @@ configuration could look like:
 # Import python libs
 import re
 
-# Import salt libs
-import salt.utils
-
 
 def _check_rvm(ret, user=None):
     '''

salt/states/supervisord.py

@@ -17,8 +17,6 @@ Interaction with the Supervisor daemon
 # Import python libs
 import logging
 
-# Import salt libs
-import salt.utils
 
 log = logging.getLogger(__name__)
 

salt/states/zcbuildout.py

@@ -40,7 +40,6 @@ Available Functions
 import sys
 
 # Import salt libs
-import salt.utils
 from salt._compat import string_types
 
 # Define the module's virtual name