Bug 1192957 - Mass-update python import style using isort

To fix pre-existing deviations from the style that will be enforced on
Travis in the next commit.

tests/autoclassify/test_classify_failures.py

@@ -1,8 +1,11 @@
 from django.core.management import call_command
 
-from treeherder.model.models import Matcher, Repository
 from treeherder.autoclassify.matchers import PreciseTestMatcher
-from .utils import test_line, create_failure_lines
+from treeherder.model.models import (Matcher,
+                                     Repository)
+
+from .utils import (create_failure_lines,
+                    test_line)
 
 
 def test_classify_test_failure(activate_responses, jm, eleven_jobs_stored, initial_data,

tests/autoclassify/test_detect_intermittents.py

@@ -1,9 +1,13 @@
 from django.core.management import call_command
 
-from treeherder.model.models import Matcher, Repository, ClassifiedFailure
-from treeherder.autoclassify.matchers import PreciseTestMatcher
 from treeherder.autoclassify.detectors import TestFailureDetector
-from .utils import test_line, create_failure_lines
+from treeherder.autoclassify.matchers import PreciseTestMatcher
+from treeherder.model.models import (ClassifiedFailure,
+                                     Matcher,
+                                     Repository)
+
+from .utils import (create_failure_lines,
+                    test_line)
 
 
 def test_detect_intermittents(activate_responses, jm, eleven_jobs_stored, initial_data,

tests/client/test_treeherder_client.py

@@ -8,9 +8,12 @@
 from mock import patch
 
 from treeherder.client import (TreeherderArtifact,
-                               TreeherderArtifactCollection, TreeherderAuth,
-                               TreeherderClient, TreeherderClientError,
-                               TreeherderJob, TreeherderJobCollection,
+                               TreeherderArtifactCollection,
+                               TreeherderAuth,
+                               TreeherderClient,
+                               TreeherderClientError,
+                               TreeherderJob,
+                               TreeherderJobCollection,
                                TreeherderResultSet,
                                TreeherderResultSetCollection,
                                TreeherderRevision)

tests/e2e/conftest.py

@@ -2,7 +2,8 @@
 
 import pytest
 import simplejson as json
-from django.template import Context, Template
+from django.template import (Context,
+                             Template)
 
 from tests import test_utils
 from treeherder.client import TreeherderJobCollection

tests/e2e/test_client_job_ingestion.py

@@ -3,11 +3,13 @@
 import pytest
 from mock import MagicMock
 
-from treeherder.client.thclient import TreeherderAuth, client
+from treeherder.client.thclient import (TreeherderAuth,
+                                        client)
 from treeherder.etl.oauth_utils import OAuthCredentials
 from treeherder.log_parser.parsers import StepParser
 from treeherder.model import error_summary
-from treeherder.model.derived import ArtifactsModel, JobsModel
+from treeherder.model.derived import (ArtifactsModel,
+                                      JobsModel)
 
 
 @pytest.fixture

tests/e2e/test_perf_ingestion.py

@@ -1,8 +1,8 @@
+from test_client_job_ingestion import do_post_collection
 from tests.sampledata import SampleData
 from treeherder.client.thclient import client
-from treeherder.perf.models import (PerformanceSignature, PerformanceDatum)
-
-from test_client_job_ingestion import do_post_collection
+from treeherder.perf.models import (PerformanceDatum,
+                                    PerformanceSignature)
 
 
 def test_post_talos_artifact(test_project, test_repository, result_set_stored,

tests/etl/test_buildapi.py

@@ -6,8 +6,10 @@
 from django.conf import settings
 from django.core.cache import cache
 
-from treeherder.etl.buildapi import (CACHE_KEYS, Builds4hJobsProcess,
-                                     PendingJobsProcess, RunningJobsProcess)
+from treeherder.etl.buildapi import (CACHE_KEYS,
+                                     Builds4hJobsProcess,
+                                     PendingJobsProcess,
+                                     RunningJobsProcess)
 
 
 @pytest.fixture

tests/etl/test_classification_mirroring.py

@@ -2,6 +2,7 @@
 from time import time
 
 from datadiff import diff
+
 from treeherder.etl.classification_mirroring import ElasticsearchDocRequest
 from treeherder.model.derived import ArtifactsModel
 

tests/etl/test_job_loader.py

@@ -1,4 +1,5 @@
 import copy
+
 import pytest
 
 from treeherder.etl.job_loader import JobLoader

tests/etl/test_job_schema.py

@@ -1,8 +1,9 @@
-import pytest
 import jsonschema
+import pytest
 
 from treeherder.etl.schema import job_json_schema
 
+
 # The test data in this file are a representative sample-set from
 # production Treeherder
 

tests/etl/test_perf_data_adapters.py

@@ -4,10 +4,13 @@
 
 from tests.sampledata import SampleData
 from treeherder.etl.perf_data_adapters import TalosDataAdapter
-from treeherder.model.models import (MachinePlatform, Option,
-                                     OptionCollection, Repository,
+from treeherder.model.models import (MachinePlatform,
+                                     Option,
+                                     OptionCollection,
+                                     Repository,
                                      RepositoryGroup)
-from treeherder.perf.models import PerformanceSignature, PerformanceDatum
+from treeherder.perf.models import (PerformanceDatum,
+                                    PerformanceSignature)
 
 
 class TalosDataAdapterTest(TestCase):

tests/etl/test_pushlog.py

@@ -4,7 +4,8 @@
 import responses
 from django.core.cache import cache
 
-from treeherder.etl.pushlog import HgPushlogProcess, MissingHgPushlogProcess
+from treeherder.etl.pushlog import (HgPushlogProcess,
+                                    MissingHgPushlogProcess)
 
 
 def test_ingest_hg_pushlog(jm, initial_data, test_base_dir,

tests/log_parser/test_store_error_summary.py

@@ -1,8 +1,11 @@
 import responses
-from django.core.management import call_command
 from django.conf import settings
+from django.core.management import call_command
+
+from treeherder.model.models import (FailureLine,
+                                     Repository,
+                                     RepositoryGroup)
 
-from treeherder.model.models import FailureLine, Repository, RepositoryGroup
 from ..sampledata import SampleData
 
 

tests/model/commands/test_init_datasource.py

@@ -1,7 +1,9 @@
 import pytest
 from django.core.management import call_command
 
-from treeherder.model.models import Datasource, Repository, RepositoryGroup
+from treeherder.model.models import (Datasource,
+                                     Repository,
+                                     RepositoryGroup)
 
 
 @pytest.fixture

tests/model/derived/test_artifacts_model.py

@@ -2,7 +2,8 @@
 
 import pytest
 
-from treeherder.model.derived import ArtifactsModel, JobsModel
+from treeherder.model.derived import (ArtifactsModel,
+                                      JobsModel)
 
 xfail = pytest.mark.xfail
 

tests/model/derived/test_jobs_model.py

@@ -5,7 +5,8 @@
 from django.core.management import call_command
 
 from tests import test_utils
-from tests.sample_data_generator import job_data, result_set
+from tests.sample_data_generator import (job_data,
+                                         result_set)
 from treeherder.model.derived import ArtifactsModel
 
 slow = pytest.mark.slow

tests/model/derived/test_refdata.py

@@ -1,11 +1,13 @@
 import json
 import os
 import time
-from datetime import datetime, timedelta
+from datetime import (datetime,
+                      timedelta)
 
 import pytest
 
-from treeherder.model.models import Repository, RepositoryGroup
+from treeherder.model.models import (Repository,
+                                     RepositoryGroup)
 
 
 @pytest.fixture

tests/test_utils.py

@@ -4,7 +4,8 @@
 from webtest.app import TestApp
 
 from tests.sampledata import SampleData
-from treeherder.client import TreeherderAuth, TreeherderClient
+from treeherder.client import (TreeherderAuth,
+                               TreeherderClient)
 from treeherder.etl.oauth_utils import OAuthCredentials
 from treeherder.model.derived.refdata import RefDataManager
 from treeherder.webapp.wsgi import application

tests/webapp/api/test_artifact_api.py

@@ -3,9 +3,11 @@
 import pytest
 from django.core.urlresolvers import reverse
 
-from treeherder.client.thclient import TreeherderAuth, client
+from treeherder.client.thclient import (TreeherderAuth,
+                                        client)
 from treeherder.etl.oauth_utils import OAuthCredentials
-from treeherder.model.derived import ArtifactsModel, JobsModel
+from treeherder.model.derived import (ArtifactsModel,
+                                      JobsModel)
 
 xfail = pytest.mark.xfail
 

tests/webapp/api/test_auth.py

@@ -1,11 +1,13 @@
 import oauth2 as oauth
+import pytest
 from django.contrib.auth.models import User
-from django.core.urlresolvers import resolve, reverse
+from django.core.urlresolvers import (resolve,
+                                      reverse)
 from mohawk import Sender
-import pytest
 from rest_framework.decorators import APIView
 from rest_framework.response import Response
 from rest_framework.test import APIRequestFactory
+
 from treeherder.credentials.models import Credentials
 from treeherder.etl.oauth_utils import OAuthCredentials
 from treeherder.webapp.api import permissions

tests/webapp/api/test_throttling.py

@@ -1,7 +1,8 @@
+from hawkrest import HawkAuthentication
 from rest_framework.response import Response
 from rest_framework.test import APIRequestFactory
 from rest_framework.views import APIView
-from hawkrest import HawkAuthentication
+
 from treeherder.webapp.api import throttling
 
 

treeherder/autoclassify/detectors.py

@@ -1,5 +1,7 @@
 import logging
-from abc import ABCMeta, abstractmethod
+from abc import (ABCMeta,
+                 abstractmethod)
+
 from treeherder.model import models
 
 logger = logging.getLogger(__name__)

treeherder/autoclassify/management/commands/autoclassify.py

@@ -1,10 +1,13 @@
 import logging
 from collections import defaultdict
 
-from django.core.management.base import BaseCommand, CommandError
+from django.core.management.base import (BaseCommand,
+                                         CommandError)
 
 from treeherder.autoclassify import matchers
-from treeherder.model.models import FailureLine, Matcher, FailureMatch
+from treeherder.model.models import (FailureLine,
+                                     FailureMatch,
+                                     Matcher)
 
 logger = logging.getLogger(__name__)
 

treeherder/autoclassify/management/commands/detect_intermittents.py

@@ -1,10 +1,13 @@
 import logging
 
-from django.core.management.base import BaseCommand, CommandError
+from django.core.management.base import (BaseCommand,
+                                         CommandError)
 
 from treeherder.autoclassify import detectors
 from treeherder.model.derived import JobsModel
-from treeherder.model.models import FailureLine, Matcher
+from treeherder.model.models import (FailureLine,
+                                     Matcher)
+
 from .autoclassify import match_errors
 
 logger = logging.getLogger(__name__)

treeherder/autoclassify/management/commands/matchers.py

@@ -1,4 +1,5 @@
-from django.core.management.base import BaseCommand, make_option
+from django.core.management.base import (BaseCommand,
+                                         make_option)
 
 from treeherder.model.models import Matcher
 

treeherder/autoclassify/matchers.py

@@ -1,5 +1,6 @@
 import logging
-from abc import ABCMeta, abstractmethod
+from abc import (ABCMeta,
+                 abstractmethod)
 from collections import namedtuple
 
 from treeherder.model import models

treeherder/autoclassify/tasks.py

@@ -2,6 +2,7 @@
 
 from celery import task
 from django.core.management import call_command
+
 from treeherder import celery_app
 
 logger = logging.getLogger(__name__)

treeherder/credentials/forms.py

@@ -1,4 +1,6 @@
-from django.forms import ModelForm, Textarea, TextInput
+from django.forms import (ModelForm,
+                          Textarea,
+                          TextInput)
 
 from .models import Credentials
 

treeherder/credentials/views.py

@@ -1,8 +1,10 @@
 from django.contrib.auth.decorators import login_required
 from django.core.urlresolvers import reverse_lazy
 from django.utils.decorators import method_decorator
-from django.views.generic.edit import CreateView, DeleteView
-from django.views.generic import DetailView, ListView
+from django.views.generic import (DetailView,
+                                  ListView)
+from django.views.generic.edit import (CreateView,
+                                       DeleteView)
 
 from .forms import CredentialsForm
 from .models import Credentials

treeherder/embed/urls.py

@@ -1,4 +1,5 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import (patterns,
+                              url)
 
 from .views import ResultsetStatusView
 

treeherder/etl/buildapi.py

@@ -6,8 +6,10 @@
 from django.core.cache import cache
 
 from treeherder.client import TreeherderJobCollection
-from treeherder.etl import buildbot, common
-from treeherder.etl.mixins import JsonExtractorMixin, OAuthLoaderMixin
+from treeherder.etl import (buildbot,
+                            common)
+from treeherder.etl.mixins import (JsonExtractorMixin,
+                                   OAuthLoaderMixin)
 from treeherder.model.models import Datasource
 
 logger = logging.getLogger(__name__)

treeherder/etl/classification_mirroring.py

@@ -5,7 +5,8 @@
 import simplejson as json
 from django.conf import settings
 
-from treeherder.model.derived import ArtifactsModel, JobsModel
+from treeherder.model.derived import (ArtifactsModel,
+                                      JobsModel)
 
 logger = logging.getLogger(__name__)
 

treeherder/etl/job_loader.py

@@ -1,11 +1,12 @@
 import logging
-import jsonschema
 import time
-from dateutil import parser
 from collections import defaultdict
 
-from treeherder.model.derived.jobs import JobsModel
+import jsonschema
+from dateutil import parser
+
 from treeherder.etl.schema import job_json_schema
+from treeherder.model.derived.jobs import JobsModel
 
 logger = logging.getLogger(__name__)