Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/mail.py @ 47031:f38bf44e077f stable
black: make codebase compatible with black v21.4b2 and v20.8b1
I don't know what exact version of black made it care about these whitespace
differences, but this is the version I got when I just installed it with
`pip3 install black`.
I'm intentionally not increasing the version of black required, as I don't want
to force everyone to upgrade their version of black, and these fixes are
backwards compatible with black v20.8b1. If there are more issues in the future
and this becomes a maintenance burden I may do so in a future change.
Tested with both versions of black (I got the older version via
`pip3 install black==20.8b1`)
Differential Revision: https://phab.mercurial-scm.org/D10539
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Fri, 30 Apr 2021 16:13:02 -0700 |
parents | 106402245301 |
children | 6000f5b25c9b |
comparison
equal
deleted
inserted
replaced
47030:bd2ed1032b4e | 47031:f38bf44e077f |
---|---|
267 ) | 267 ) |
268 | 268 |
269 | 269 |
270 def codec2iana(cs): | 270 def codec2iana(cs): |
271 # type: (str) -> str | 271 # type: (str) -> str |
272 '''''' | 272 ''' ''' |
273 cs = email.charset.Charset(cs).input_charset.lower() | 273 cs = email.charset.Charset(cs).input_charset.lower() |
274 | 274 |
275 # "latin1" normalizes to "iso8859-1", standard calls for "iso-8859-1" | 275 # "latin1" normalizes to "iso8859-1", standard calls for "iso-8859-1" |
276 if cs.startswith("iso") and not cs.startswith("iso-"): | 276 if cs.startswith("iso") and not cs.startswith("iso-"): |
277 return "iso-" + cs[3:] | 277 return "iso-" + cs[3:] |