RepoMirrors/selinux
1
0
Fork 0
mirror of https://github.com/SELinuxProject/selinux synced 2025-01-11 16:09:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

python/chcat: improve the code readability

Browse Source 
flake8 reports many warnings for chcat:

    chcat:7:1: E265 block comment should start with '# '
    chcat:29:1: F401 'string' imported but unused
    chcat:44:1: E722 do not use bare 'except'
    chcat:104:9: F841 local variable 'e' is assigned to but never used
    chcat:144:9: F841 local variable 'e' is assigned to but never used
    chcat:186:9: F841 local variable 'e' is assigned to but never used
    chcat:234:9: F841 local variable 'e' is assigned to but never used
    chcat:262:9: F841 local variable 'e' is assigned to but never used
    chcat:281:5: F841 local variable 'e' is assigned to but never used
    chcat:385:9: E722 do not use bare 'except'
    chcat:402:1: E305 expected 2 blank lines after class or function definition, found 1
    chcat:436:5: F841 local variable 'e' is assigned to but never used

Fix all of them.

Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org>
This commit is contained in:
Nicolas Iooss 2018-12-09 15:23:22 +01:00 committed by Petr Lautrbach
parent 2923d9d21e
commit 69c56bd2f6
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
python/chcat/chcat
View File

@ -4,7 +4,7 @@
# #
# chcat is a script that allows you modify the Security label on a file # chcat is a script that allows you modify the Security label on a file
# #
#` Author: Daniel Walsh <dwalsh@redhat.com> # Author: Daniel Walsh <dwalsh@redhat.com>
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as # modify it under the terms of the GNU General Public License as
@ -26,7 +26,6 @@ import subprocess
import sys import sys
import os import os
import pwd import pwd
import string
import getopt import getopt
import selinux import selinux
import seobject import seobject
@ -41,7 +40,7 @@ try:
localedir="/usr/share/locale", localedir="/usr/share/locale",
codeset='utf-8', codeset='utf-8',
**kwargs) **kwargs)
except: except ImportError:
try: try:
import builtins import builtins
builtins.__dict__['_'] = str builtins.__dict__['_'] = str
@ -101,7 +100,7 @@ def chcat_user_add(newcat, users):
cmd = ["semanage", "login", "-m", "-r", new_serange, "-s", user[0], u] cmd = ["semanage", "login", "-m", "-r", new_serange, "-s", user[0], u]
try: try:
subprocess.check_call(cmd, stderr=subprocess.STDOUT, shell=False) subprocess.check_call(cmd, stderr=subprocess.STDOUT, shell=False)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError:
errors += 1 errors += 1
return errors return errors
@ -141,7 +140,7 @@ def chcat_add(orig, newcat, objects, login_ind):
cmd = ["chcon", "-l", "%s:%s" % (sensitivity, cat_string), f] cmd = ["chcon", "-l", "%s:%s" % (sensitivity, cat_string), f]
try: try:
subprocess.check_call(cmd, stderr=subprocess.STDOUT, shell=False) subprocess.check_call(cmd, stderr=subprocess.STDOUT, shell=False)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError:
errors += 1 errors += 1
return errors return errors
@ -183,7 +182,7 @@ def chcat_user_remove(newcat, users):
try: try:
subprocess.check_call(cmd, stderr=subprocess.STDOUT, shell=False) subprocess.check_call(cmd, stderr=subprocess.STDOUT, shell=False)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError:
errors += 1 errors += 1
return errors return errors
@ -231,7 +230,7 @@ def chcat_remove(orig, newcat, objects, login_ind):
cmd = ["chcon", "-l", new_serange, f] cmd = ["chcon", "-l", new_serange, f]
try: try:
subprocess.check_call(cmd, stderr=subprocess.STDOUT, shell=False) subprocess.check_call(cmd, stderr=subprocess.STDOUT, shell=False)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError:
errors += 1 errors += 1
return errors return errors
@ -259,7 +258,7 @@ def chcat_user_replace(newcat, users):
cmd = ["semanage", "login", "-m", "-r", new_serange, "-s", user[0], u] cmd = ["semanage", "login", "-m", "-r", new_serange, "-s", user[0], u]
try: try:
subprocess.check_call(cmd, stderr=subprocess.STDOUT, shell=False) subprocess.check_call(cmd, stderr=subprocess.STDOUT, shell=False)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError:
errors += 1 errors += 1
return errors return errors
@ -268,6 +267,7 @@ def chcat_replace(newcat, objects, login_ind):
if login_ind == 1: if login_ind == 1:
return chcat_user_replace(newcat, objects) return chcat_user_replace(newcat, objects)
errors = 0 errors = 0
# newcat[0] is the sensitivity level, newcat[1:] are the categories
if len(newcat) == 1: if len(newcat) == 1:
new_serange = newcat[0] new_serange = newcat[0]
else: else:
@ -278,7 +278,7 @@ def chcat_replace(newcat, objects, login_ind):
cmd = ["chcon", "-l", new_serange] + objects cmd = ["chcon", "-l", new_serange] + objects
try: try:
subprocess.check_call(cmd, stderr=subprocess.STDOUT, shell=False) subprocess.check_call(cmd, stderr=subprocess.STDOUT, shell=False)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError:
errors += 1 errors += 1
return errors return errors
@ -382,7 +382,7 @@ def listusercats(users):
if len(users) == 0: if len(users) == 0:
try: try:
users.append(os.getlogin()) users.append(os.getlogin())
except: except OSError:
users.append(pwd.getpwuid(os.getuid()).pw_name) users.append(pwd.getpwuid(os.getuid()).pw_name)
verify_users(users) verify_users(users)
@ -399,6 +399,7 @@ def error(msg):
print("%s: %s" % (sys.argv[0], msg)) print("%s: %s" % (sys.argv[0], msg))
sys.exit(1) sys.exit(1)
if __name__ == '__main__': if __name__ == '__main__':
if selinux.is_selinux_mls_enabled() != 1: if selinux.is_selinux_mls_enabled() != 1:
error("Requires a mls enabled system") error("Requires a mls enabled system")
@ -433,7 +434,7 @@ if __name__ == '__main__':
except getopt.error as error: except getopt.error as error:
errorExit(_("Options Error %s ") % error.msg) errorExit(_("Options Error %s ") % error.msg)
except ValueError as e: except ValueError:
usage() usage()
if delete_ind: if delete_ind: