diff options
| author | tkikuchi <> | 2005-05-08 12:32:27 +0000 |
|---|---|---|
| committer | tkikuchi <> | 2005-05-08 12:32:27 +0000 |
| commit | d9378753acda90d6b08aebcc2e08cc6e654ab580 (patch) | |
| tree | f19ffb8fe969b7c324689c9c5a7332f0c857c12b | |
| parent | 3be6bfd499c2e2714c197dabc90c625171bc2c4c (diff) | |
| download | mailman2-d9378753acda90d6b08aebcc2e08cc6e654ab580.tar.gz mailman2-d9378753acda90d6b08aebcc2e08cc6e654ab580.tar.xz mailman2-d9378753acda90d6b08aebcc2e08cc6e654ab580.zip | |
Fix UnicodeDecodeError and UnicodeEncodeError to UnicodeError.
Both are introduced in Python2.3. UnicodeError catches both.
| -rw-r--r-- | Mailman/Commands/cmd_subscribe.py | 2 | ||||
| -rw-r--r-- | Mailman/Handlers/Decorate.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Mailman/Commands/cmd_subscribe.py b/Mailman/Commands/cmd_subscribe.py index 2b3304b4..5dac09ad 100644 --- a/Mailman/Commands/cmd_subscribe.py +++ b/Mailman/Commands/cmd_subscribe.py @@ -88,7 +88,7 @@ def process(res, args): h = make_header(decode_header(realname)) # BAW: in Python 2.2, use just unicode(h) realname = h.__unicode__() - except UnicodeDecodeError: + except UnicodeError: realname = u'' # Coerce to byte string if uh contains only ascii try: diff --git a/Mailman/Handlers/Decorate.py b/Mailman/Handlers/Decorate.py index 433629c6..1b756192 100644 --- a/Mailman/Handlers/Decorate.py +++ b/Mailman/Handlers/Decorate.py @@ -56,7 +56,7 @@ def process(mlist, msg, msgdata): username = mlist.getMemberName(member) or None try: username = username.encode(Utils.GetCharSet(d['user_language'])) - except (AttributeError, UnicodeEncodeError): + except (AttributeError, UnicodeError): username = member d['user_name'] = username d['user_optionsurl'] = mlist.GetOptionsURL(member) |