Mercurial > public > mercurial-scm > hg
comparison mercurial/mail.py @ 43330:910827a2cb20 stable
py3: decode encoding literal before passing to .decode()
bytes.decode(<encoding>) wants an str as "encoding" parameter,
it raises a TypeError if given a bytestring. encoding.encoding and
encoding.fallbackencoding are bytes values.
| author | Denis Laxalde <denis.laxalde@logilab.fr> |
|---|---|
| date | Thu, 24 Oct 2019 14:28:20 +0200 |
| parents | ef81de93143e |
| children | fdc3af52305b |
comparison
equal
deleted
inserted
replaced
| 43329:33506cb43642 | 43330:910827a2cb20 |
|---|---|
| 340 # know that's wrong. | 340 # know that's wrong. |
| 341 try: | 341 try: |
| 342 s.decode('ascii') | 342 s.decode('ascii') |
| 343 except UnicodeDecodeError: | 343 except UnicodeDecodeError: |
| 344 for ics in (encoding.encoding, encoding.fallbackencoding): | 344 for ics in (encoding.encoding, encoding.fallbackencoding): |
| 345 ics = pycompat.sysstr(ics) | |
| 345 try: | 346 try: |
| 346 u = s.decode(ics) | 347 u = s.decode(ics) |
| 347 except UnicodeDecodeError: | 348 except UnicodeDecodeError: |
| 348 continue | 349 continue |
| 349 for ocs in sendcharsets: | 350 for ocs in sendcharsets: |