diff options
Diffstat (limited to 'Mailman/versions.py')
| -rw-r--r-- | Mailman/versions.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Mailman/versions.py b/Mailman/versions.py index 4b3990684..77a88056c 100644 --- a/Mailman/versions.py +++ b/Mailman/versions.py @@ -34,8 +34,6 @@ run again until another version change is detected. import logging -from types import ListType, StringType - from Mailman import mm_cfg from Mailman import Message from Mailman import Utils @@ -268,12 +266,12 @@ def UpdateOldVars(l, stored_state): # transfer the list data type for holding members and digest members # to the dict data type starting file format version 11 # - if type(l.members) is ListType: + if isinstance(l.members, list): members = {} for m in l.members: members[m] = 1 l.members = members - if type(l.digest_members) is ListType: + if isinstance(l.digest_members, list): dmembers = {} for dm in l.digest_members: dmembers[dm] = 1 @@ -293,7 +291,7 @@ def UpdateOldVars(l, stored_state): if k.lower() <> k: l.members[k.lower()] = Utils.LCDomain(k) del l.members[k] - elif type(l.members[k]) == StringType and k == l.members[k].lower(): + elif isinstance(l.members[k], str) and k == l.members[k].lower(): # already converted pass else: @@ -302,7 +300,7 @@ def UpdateOldVars(l, stored_state): if k.lower() <> k: l.digest_members[k.lower()] = Utils.LCDomain(k) del l.digest_members[k] - elif type(l.digest_members[k]) == StringType and \ + elif isinstance(l.digest_members[k], str) and \ k == l.digest_members[k].lower(): # already converted pass |