Lint fixes for getgroupall code

salt/modules/cmdmod.py

@@ -74,7 +74,7 @@ def _chugid(runas):
         gid = __salt__['group.info'](group_name)['gid']
         if (gid not in supgroups_seen
            and not supgroups_seen.add(gid)):
-                supgroups.append(gid)
+            supgroups.append(gid)
 
     # No logging can happen on this function
     #

salt/modules/mac_user.py

@@ -5,7 +5,6 @@
 
 # Import python libs
 try:
-    import grp
     import pwd
 except ImportError:
     pass

salt/modules/pw_user.py

@@ -5,7 +5,6 @@
 
 # Import python libs
 try:
-    import grp
     import pwd
 except ImportError:
     pass

salt/modules/solaris_user.py

@@ -5,7 +5,6 @@
 
 # Import python libs
 try:
-    import grp
     import pwd
 except ImportError:
     pass

salt/modules/useradd.py

@@ -7,7 +7,6 @@
 import re
 
 try:
-    import grp
     import pwd
 except ImportError:
     pass

salt/states/user.py

@@ -26,7 +26,6 @@
 
 # Import python libs
 import logging
-import sys
 
 # Import salt libs
 import salt.utils

salt/utils/__init__.py

@@ -2097,6 +2097,7 @@ def repack_dictlist(data):
             ret.update(element)
     return ret
 
+
 def get_group_list(user=None, include_default=True):
     '''
     Returns a list of all of the system group names of which the user
@@ -2111,7 +2112,7 @@ def get_group_list(user=None, include_default=True):
         try:
             group_names = list(os.getgrouplist(user, pwd.getpwnam(user).pw_gid))
             log.trace('os.getgrouplist for user {0!r}: {1!r}'.format(user, group_names))
-        except:
+        except Exception:
             pass
     else:
         # Try pysss.getgrouplist
@@ -2120,7 +2121,7 @@ def get_group_list(user=None, include_default=True):
             import pysss
             group_names = list(pysss.getgrouplist(user))
             log.trace('pysss.getgrouplist for user {0!r}: {1!r}'.format(user, group_names))
-        except:
+        except Exception:
             pass
     if group_names is None:
         # Fall back to generic code