diff -r 346af7687c6f -r 89a2afe31e82 mercurial/utils/stringutil.py --- a/mercurial/utils/stringutil.py Fri Nov 27 17:00:00 2020 -0500 +++ b/mercurial/utils/stringutil.py Fri Nov 27 17:03:29 2020 -0500 @@ -494,15 +494,15 @@ @attr.s(hash=True) class mailmapping(object): - '''Represents a username/email key or value in - a mailmap file''' + """Represents a username/email key or value in + a mailmap file""" email = attr.ib() name = attr.ib(default=None) def _ismailmaplineinvalid(names, emails): - '''Returns True if the parsed names and emails + """Returns True if the parsed names and emails in a mailmap entry are invalid. >>> # No names or emails fails @@ -522,7 +522,7 @@ >>> emails = [b'proper@email.com', b'commit@email.com'] >>> _ismailmaplineinvalid(names, emails) False - ''' + """ return not emails or not names and len(emails) < 2 @@ -597,11 +597,13 @@ continue mailmapkey = mailmapping( - email=emails[-1], name=names[-1] if len(names) == 2 else None, + email=emails[-1], + name=names[-1] if len(names) == 2 else None, ) mailmap[mailmapkey] = mailmapping( - email=emails[0], name=names[0] if names else None, + email=emails[0], + name=names[0] if names else None, ) return mailmap @@ -659,7 +661,7 @@ def isauthorwellformed(author): - '''Return True if the author field is well formed + """Return True if the author field is well formed (ie "Contributor Name ") >>> isauthorwellformed(b'Good Author ') @@ -676,7 +678,7 @@ False >>> isauthorwellformed(b'Bad Author ') False - ''' + """ return _correctauthorformat.match(author) is not None