X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;fp=ud-generate;h=770db6abe06d1203872581fdc0726bef53ddf031;hb=4eaa444b9eb4c9d24cd2790f99a690054bf2f806;hp=4b589c598aa95ab930713ad441c8ffb16be66d74;hpb=fe67fab54bca15f4820e4f0a911023ed10a743b7;p=mirror%2Fuserdir-ldap.git diff --git a/ud-generate b/ud-generate index 4b589c5..770db6a 100755 --- a/ud-generate +++ b/ud-generate @@ -184,9 +184,9 @@ def IsInGroup(account, allowed, current_host): return False def Die(File, F, Fdb): - if F != None: + if F is not None: F.close() - if Fdb != None: + if Fdb is not None: Fdb.close() try: os.remove(File + ".tmp") @@ -198,10 +198,10 @@ def Die(File, F, Fdb): pass def Done(File, F, Fdb): - if F != None: + if F is not None: F.close() os.rename(File + ".tmp", File) - if Fdb != None: + if Fdb is not None: Fdb.close() os.rename(File + ".tdb.tmp", File + ".tdb") @@ -848,7 +848,7 @@ def GenDNS(accounts, File): F.write(Line) Host = Split[0] + DNSZone - if BSMTPCheck.match(Line) != None: + if BSMTPCheck.match(Line) is not None: F.write("; Has BSMTP\n") # Write some identification information @@ -989,7 +989,7 @@ def GenBSMTP(accounts, File, HomePrefix): Line = " ".join(Split) + "\n" Host = Split[0] + DNSZone - if BSMTPCheck.match(Line) != None: + if BSMTPCheck.match(Line) is not None: F.write("%s: user=%s group=Debian file=%s%s/bsmtp/%s\n"%(Host, a['uid'], HomePrefix, a['uid'], Host))