[PATCH 5 of 8 v3] tests: make test-simplemerge use absolute_import

[timeless]

Check code complains otherwise.
On Apr 15, 2016 4:44 AM, "Pierre-Yves David" <pierre-yves.david at ens-lyon.org>
wrote:

>
>
> On 04/13/2016 01:01 PM, Pulkit Goyal wrote:
>
>> # HG changeset patch
>> # User Pulkit Goyal <7895pulkit at gmail.com>
>> # Date 1460575866 -19800
>> #      Thu Apr 14 01:01:06 2016 +0530
>> # Node ID 551933c67bb9787cc4392900f2dc267ffccf2f94
>> # Parent  1ae998c1d09433e33c1bb1d0db80c5a3dddb93a8
>> tests: make test-simplemerge use absolute_import
>>
>> diff --git a/tests/test-check-py3-compat.t b/tests/test-check-py3-compat.t
>> --- a/tests/test-check-py3-compat.t
>> +++ b/tests/test-check-py3-compat.t
>> @@ -63,7 +63,6 @@
>>     tests/test-pathencode.py not using absolute_import
>>     tests/test-pathencode.py requires print_function
>>     tests/test-run-tests.py not using absolute_import
>> -  tests/test-simplemerge.py not using absolute_import
>>     tests/test-trusted.py requires print_function
>>     #if py3exe
>> diff --git a/tests/test-simplemerge.py b/tests/test-simplemerge.py
>> --- a/tests/test-simplemerge.py
>> +++ b/tests/test-simplemerge.py
>> @@ -13,10 +13,16 @@
>>   # You should have received a copy of the GNU General Public License
>>   # along with this program; if not, see <http://www.gnu.org/licenses/>.
>>   +from __future__ import absolute_import
>> +
>>   import unittest
>> -from unittest import TestCase
>> -from mercurial import util, simplemerge, error
>> +from mercurial import (
>> +    error,
>> +    simplemerge,
>> +    util,
>> +)
>>   +testcase=unittest.TestCase
>>
>
> You want space around the "=" and I don't see any reason to change the
> class case. Can you fix these and resend?
>
> --
> Pierre-Yves David
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20160415/9566db41/attachment.html>