X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=TLD_Builder%2Facl.py;h=88ed536daf0f761169d3a1659c59b818d3451777;hb=9ea122b00e3a99b16246e1e38576916a2e25c0aa;hp=cf69fe8fee133f764597b906af06b10d6be5ca5d;hpb=92949e17161a53bfb4a60099e22b58ad63abce4c;p=tld-builder.git

diff --git a/TLD_Builder/acl.py b/TLD_Builder/acl.py
index cf69fe8..88ed536 100644
--- a/TLD_Builder/acl.py
+++ b/TLD_Builder/acl.py
@@ -1,10 +1,7 @@
 # vi: encoding=utf-8 ts=8 sts=4 sw=4 et
 
 import sys
-if sys.version_info[0] == 2:
-    import ConfigParser
-else:
-    import configparser as ConfigParser
+import configparser as ConfigParser
 import string
 import fnmatch
 import os
@@ -25,7 +22,7 @@ class User:
         self.change_requester = False
 
         if p.has_option(login, "gpg_emails"):
-            self.gpg_emails = string.split(p.get(login, "gpg_emails"))
+            self.gpg_emails = p.get(login, "gpg_emails").split()
         else:
             log.panic("acl: [%s] has no gpg_emails" % login)
 
@@ -39,8 +36,8 @@ class User:
             self.change_requester = True
 
         if p.has_option(login, "privs"):
-            for p in string.split(p.get(login, "privs")):
-                l = string.split(p, ":")
+            for p in p.get(login, "privs").split():
+                l = p.split(":")
                 if len(l) == 2:
                     p+=":*"
                 if len(l) not in (2,3) or l[0] == "" or l[1] == "":
@@ -113,12 +110,12 @@ class ACL_Conf:
         p.readfp(open(path.acl_conf))
         self.users = {}
         for login in p.sections():
-            if self.users.has_key(login):
+            if login in self.users:
                 log.panic("acl: duplicate login: %s" % login)
                 continue
             user = User(p, login)
             for e in user.gpg_emails:
-                if self.users.has_key(e):
+                if e in self.users:
                     log.panic("acl: user email colision %s <-> %s" % \
                               (self.users[e].login, login))
                 else:
@@ -128,7 +125,7 @@ class ACL_Conf:
 
     def user_by_email(self, ems):
         for e in ems:
-            if self.users.has_key(e):
+            if e in self.users:
                 return self.users[e]
         return None
 
@@ -136,7 +133,7 @@ class ACL_Conf:
         return self.users[l]
 
     def user(self, l):
-        if not self.users.has_key(l):
+        if not l in self.users:
             log.panic("no such user: %s" % l)
         return self.users[l]