X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-forwardlist;h=68c8c1d7d1fb1b830658d726a7a11cdeb473ff57;hb=refs%2Fheads%2Fsalsa;hp=727cfd9b24e9369fc5448c6ddd1f112a987ecb82;hpb=198bda079d03f7251b50f95e6a28c1fb046e616a;p=mirror%2Fuserdir-ldap.git diff --git a/ud-forwardlist b/ud-forwardlist index 727cfd9..68c8c1d 100755 --- a/ud-forwardlist +++ b/ud-forwardlist @@ -21,7 +21,7 @@ while (1): if File == "": break; - # Attempt to determine the UID + # Attempt to determine the UID try: User = pwd.getpwuid(os.stat(File)[stat.ST_UID])[0]; except KeyError: @@ -37,13 +37,13 @@ while (1): break; if Line2[0] == '#' or Line2[0] == '\n': continue; - if Line == None: + if Line is None: Line = Line2; else: break; # If we got more than one line or no lines at all it is invalid - if Line == None or Line == "" or Line2 != "": + if Line is None or Line == "" or Line2 != "": print "Invalid1", File; continue; @@ -55,7 +55,7 @@ while (1): # Split off the address part Address = AddressSplit.match(Line); - if Address == None: + if Address is None: # Or parse a qmail adddress.. Address = Line; if Address[0] == '&':