Chad has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386206 )
Change subject: Pylint nitpicks: clean up import orders ...................................................................... Pylint nitpicks: clean up import orders --- M conftool/configuration.py M conftool/tests/integration/__init__.py M conftool/tests/integration/test_syncer.py M conftool/tests/integration/test_tool.py M conftool/tests/unit/test_action.py M conftool/tests/unit/test_loader.py M conftool/tests/unit/test_syncer.py 7 files changed, 12 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/conftool refs/changes/06/386206/1 diff --git a/conftool/configuration.py b/conftool/configuration.py index 1972639..a171c24 100644 --- a/conftool/configuration.py +++ b/conftool/configuration.py @@ -1,5 +1,5 @@ -import yaml import collections +import yaml from conftool import _log diff --git a/conftool/tests/integration/__init__.py b/conftool/tests/integration/__init__.py index a207875..31977ce 100644 --- a/conftool/tests/integration/__init__.py +++ b/conftool/tests/integration/__init__.py @@ -1,5 +1,4 @@ import logging -import mock import os import shutil import subprocess @@ -7,6 +6,8 @@ import time import unittest +import mock + from conftool import configuration, setup_irc, IRCSocketHandler from conftool.kvobject import KVObject diff --git a/conftool/tests/integration/test_syncer.py b/conftool/tests/integration/test_syncer.py index 5a534b0..19d1239 100644 --- a/conftool/tests/integration/test_syncer.py +++ b/conftool/tests/integration/test_syncer.py @@ -1,11 +1,12 @@ import os +import shutil +import tempfile import contextlib from conftool.cli import syncer from conftool import service, node from conftool.tests.integration import IntegrationTestBase -import tempfile + import yaml -import shutil @contextlib.contextmanager diff --git a/conftool/tests/integration/test_tool.py b/conftool/tests/integration/test_tool.py index 08dd81b..0f03c67 100644 --- a/conftool/tests/integration/test_tool.py +++ b/conftool/tests/integration/test_tool.py @@ -1,9 +1,9 @@ from contextlib import contextmanager +import os +from StringIO import StringIO +import sys import json import mock -import os -import sys -from StringIO import StringIO from conftool.cli import syncer, tool from conftool.tests.integration import IntegrationTestBase, test_base diff --git a/conftool/tests/unit/test_action.py b/conftool/tests/unit/test_action.py index 7a68c3a..a9b762e 100644 --- a/conftool/tests/unit/test_action.py +++ b/conftool/tests/unit/test_action.py @@ -1,5 +1,5 @@ -import mock import unittest +import mock from conftool import configuration from conftool.action import Action, ActionError diff --git a/conftool/tests/unit/test_loader.py b/conftool/tests/unit/test_loader.py index d7f8371..b1bcced 100644 --- a/conftool/tests/unit/test_loader.py +++ b/conftool/tests/unit/test_loader.py @@ -1,6 +1,6 @@ -import mock import os import unittest +import mock from conftool import loader from conftool.kvobject import KVObject, Entity, FreeSchemaEntity from conftool import configuration diff --git a/conftool/tests/unit/test_syncer.py b/conftool/tests/unit/test_syncer.py index 0f43813..d103c3a 100644 --- a/conftool/tests/unit/test_syncer.py +++ b/conftool/tests/unit/test_syncer.py @@ -1,6 +1,6 @@ -import mock import os import unittest +import mock from conftool import configuration, loader from conftool.cli.syncer import Syncer, EntitySyncer -- To view, visit https://gerrit.wikimedia.org/r/386206 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic05fe537fc40a3595031f787b898139658590fdf Gerrit-PatchSet: 1 Gerrit-Project: operations/software/conftool Gerrit-Branch: master Gerrit-Owner: Chad <ch...@wikimedia.org> Gerrit-Reviewer: ใในใ <c...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
