[PATCH 01 of 10] contrib: have import-checker work mostly with native strings for mod names
Martin von Zweigbergk
martinvonz at google.com
Mon Aug 28 16:50:05 UTC 2017
On Mon, Aug 28, 2017 at 6:57 AM, Augie Fackler <raf at durin42.com> wrote:
>
>> On Aug 28, 2017, at 02:55, Martin von Zweigbergk <martinvonz at google.com> wrote:
>>
>> On Wed, Aug 23, 2017 at 7:55 AM, Augie Fackler <raf at durin42.com> wrote:
>>> # HG changeset patch
>>> # User Augie Fackler <raf at durin42.com>
>>> # Date 1503421161 14400
>>> # Tue Aug 22 12:59:21 2017 -0400
>>> # Node ID e915b9703f675b2f76c512347ddff0f6c65a9748
>>> # Parent edf503e5dfd408f900f3bad0a6923573813e276b
>>> contrib: have import-checker work mostly with native strings for mod names
>>>
>>> Module names are a bit awkward to deal with portably otherwise.
>>>
>>> diff --git a/contrib/import-checker.py b/contrib/import-checker.py
>>> --- a/contrib/import-checker.py
>>> +++ b/contrib/import-checker.py
>>> @@ -147,6 +147,8 @@ def fromlocalfunc(modulename, localmods)
>>>>>> fromlocal2('bar', 2)
>>> ('foo.bar', 'foo.bar.__init__', True)
>>> """
>>> + if not isinstance(modulename, str):
>>> + modulename = modulename.decode('ascii')
>>
>> Should this be 'if isinstance(modulename, bytes)' instead? That seems
>> clearer to me.
>
> Clearer, but wrong, because str == bytes on Python 2 and you'd end up decoding to a unicode rather than to a native string.
Ah, I think I had gotten this backwards, thinking this was converting
*to* bytes, so my comments didn't make much sense. Sorry about the
noise.
More information about the Mercurial-devel
mailing list