[PATCH 4 of 4] mpatch: implement cffi version of mpatch

Maciej Fijalkowski fijall at gmail.com
Thu Jun 23 02:51:32 EDT 2016


ok, the next problem is:

import os
import cffi

"Imports not lexically sorted"

import cffi
import os

"Stdlib import follows non-stdlib import"

what do I do?

On Wed, Jun 22, 2016 at 5:11 PM, Augie Fackler <raf at durin42.com> wrote:
>
>> On Jun 22, 2016, at 3:06 AM, Maciej Fijalkowski <fijall at gmail.com> wrote:
>>
>> This seems to be the diff necessary (to Augie's wip branch)
>>
>> https://paste.pound-python.org/show/CMz1afIMKS0r7369G3Jr/
>>
>> This fails test-check-py3 for stupid reasons.
>>
>> Augie: how should I submit that patch, given all the rebasing and stuff?
>
> Apply the patch, use histedit to fold it into the old version of 4 of 4, rebase to @, and mail again.
>
> (That’s my advice, but I’m only half paying attention this week.)
>
>>
>> Best regards,
>> Maciej Fijalkowski
>>
>> On Tue, Jun 21, 2016 at 1:55 PM, Yuya Nishihara <yuya at tcha.org> wrote:
>>> On Mon, 20 Jun 2016 17:04:25 +0200, Maciej Fijalkowski wrote:
>>>> er ok, so there is no good way to do imports that way? At least I
>>>> didn't find any that would not make the linter barf (using from
>>>> mercurial). Can we do something that special cases ".." here?
>>>
>>>>>>>>> +from .. import modulepolicy, policynocffi
>>>>>>>>> +
>>>>>>>>> from . import pycompat
>>>
>>> from . import (
>>>    policy,
>>>    pycompat,
>>> )
>>>
>>> I don't know if it works for mercurial/__init__.py, but we won't have to
>>> care because modulepolicy constants has been moved to policy.py.
>


More information about the Mercurial-devel mailing list