diff options
author | Frederic Lepied <flepied@mandriva.com> | 2002-02-14 00:54:42 +0000 |
---|---|---|
committer | Frederic Lepied <flepied@mandriva.com> | 2002-02-14 00:54:42 +0000 |
commit | 18bdd894c2026fcdc31ebd8b58fa9313ccdff476 (patch) | |
tree | da2d72377d8eb468e56bd99248b7cf49838f84a3 /share/Perms.py | |
parent | 243db9ef7ae3fc061fc841c51b8c6f20490b3df7 (diff) | |
download | msec-18bdd894c2026fcdc31ebd8b58fa9313ccdff476.tar msec-18bdd894c2026fcdc31ebd8b58fa9313ccdff476.tar.gz msec-18bdd894c2026fcdc31ebd8b58fa9313ccdff476.tar.bz2 msec-18bdd894c2026fcdc31ebd8b58fa9313ccdff476.tar.xz msec-18bdd894c2026fcdc31ebd8b58fa9313ccdff476.zip |
corrected warnings reported by pychecker
Diffstat (limited to 'share/Perms.py')
-rwxr-xr-x | share/Perms.py | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/share/Perms.py b/share/Perms.py index 374f3ed..7069831 100755 --- a/share/Perms.py +++ b/share/Perms.py @@ -30,54 +30,54 @@ except IOError: comment_regex = re.compile('^\s*#|^\s*$') -user = {} -group = {} -userid = {} -groupid = {} +USER = {} +GROUP = {} +USERID = {} +GROUPID = {} def get_user_id(name): try: - return user[name] + return USER[name] except KeyError: try: - user[name] = pwd.getpwnam(name)[2] + USER[name] = pwd.getpwnam(name)[2] except KeyError: error(_('user name %s not found') % name) - user[name] = -1 - return user[name] + USER[name] = -1 + return USER[name] def get_user_name(id): try: - return userid[id] + return USERID[id] except KeyError: try: - userid[id] = pwd.getpwuid(id)[0] + USERID[id] = pwd.getpwuid(id)[0] except KeyError: error(_('user name not found for id %d') % id) - userid[id] = str(id) - return userid[id] + USERID[id] = str(id) + return USERID[id] def get_group_id(name): try: - return group[name] + return GROUP[name] except KeyError: try: - group[name] = grp.getgrnam(name)[2] + GROUP[name] = grp.getgrnam(name)[2] except KeyError: error(_('group name %s not found') % name) - group[name] = -1 - return group[name] + GROUP[name] = -1 + return GROUP[name] def get_group_name(id): try: - return groupid[id] + return GROUPID[id] except KeyError: try: - groupid[id] = grp.getgrgid(id)[0] + GROUPID[id] = grp.getgrgid(id)[0] except KeyError: error(_('group name not found for id %d') % id) - groupid[id] = str(id) - return groupid[id] + GROUPID[id] = str(id) + return GROUPID[id] assoc = {} @@ -181,8 +181,6 @@ def chmod(f, newperm): return 1 if __name__ == '__main__': - import sys - import Config import getopt _interactive = sys.stdin.isatty() |