Fix import order issues introduced by a previous commit. (pantsbuild#…

…4156)

Also picks up a few other stray issues from before that.

contrib/go/src/python/pants/contrib/go/tasks/go_thrift_gen.py

@@ -9,16 +9,16 @@
 import re
 import subprocess
 
-from twitter.common.collections import OrderedSet
-
 from pants.base.build_environment import get_buildroot
 from pants.base.exceptions import TaskError
 from pants.base.workunit import WorkUnitLabel
 from pants.binaries.thrift_binary import ThriftBinary
-from pants.contrib.go.targets.go_thrift_library import GoThriftGenLibrary, GoThriftLibrary
 from pants.task.simple_codegen_task import SimpleCodegenTask
 from pants.util.dirutil import safe_mkdir
 from pants.util.memo import memoized_property
+from twitter.common.collections import OrderedSet
+
+from pants.contrib.go.targets.go_thrift_library import GoThriftGenLibrary, GoThriftLibrary
 
 
 class GoThriftGen(SimpleCodegenTask):

contrib/scrooge/src/python/pants/contrib/scrooge/tasks/scrooge_gen.py

@@ -10,8 +10,8 @@
 import tempfile
 from collections import defaultdict, namedtuple
 
-from pants.backend.codegen.thrift.java.thrift_defaults import ThriftDefaults
 from pants.backend.codegen.thrift.java.java_thrift_library import JavaThriftLibrary
+from pants.backend.codegen.thrift.java.thrift_defaults import ThriftDefaults
 from pants.backend.jvm.tasks.nailgun_task import NailgunTask
 from pants.base.exceptions import TargetDefinitionException, TaskError
 from pants.build_graph.address import Address

contrib/scrooge/tests/python/pants_test/contrib/scrooge/tasks/test_java_thrift_library_fingerprint_strategy.py

@@ -5,8 +5,8 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
-from pants.backend.codegen.thrift.java.thrift_defaults import ThriftDefaults
 from pants.backend.codegen.thrift.java.java_thrift_library import JavaThriftLibrary
+from pants.backend.codegen.thrift.java.thrift_defaults import ThriftDefaults
 from pants_test.base_test import BaseTest
 
 from pants.contrib.scrooge.tasks.java_thrift_library_fingerprint_strategy import \

src/python/pants/backend/codegen/protobuf/java/register.py

@@ -5,8 +5,8 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
-from pants.backend.codegen.protobuf.java.protobuf_gen import ProtobufGen
 from pants.backend.codegen.protobuf.java.java_protobuf_library import JavaProtobufLibrary
+from pants.backend.codegen.protobuf.java.protobuf_gen import ProtobufGen
 from pants.build_graph.build_file_aliases import BuildFileAliases
 from pants.goal.task_registrar import TaskRegistrar as task
 

src/python/pants/backend/codegen/ragel/java/register.py

@@ -5,8 +5,8 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
-from pants.backend.codegen.ragel.java.ragel_gen import RagelGen
 from pants.backend.codegen.ragel.java.java_ragel_library import JavaRagelLibrary
+from pants.backend.codegen.ragel.java.ragel_gen import RagelGen
 from pants.build_graph.build_file_aliases import BuildFileAliases
 from pants.goal.task_registrar import TaskRegistrar as task
 

src/python/pants/backend/codegen/register.py

@@ -17,8 +17,8 @@
 from pants.backend.codegen.thrift.java.apache_thrift_gen import ApacheThriftGen
 from pants.backend.codegen.thrift.java.java_thrift_library import JavaThriftLibrary
 from pants.backend.codegen.thrift.python.python_thrift_library import PythonThriftLibrary
-from pants.backend.codegen.wire.java.wire_gen import WireGen
 from pants.backend.codegen.wire.java.java_wire_library import JavaWireLibrary
+from pants.backend.codegen.wire.java.wire_gen import WireGen
 from pants.build_graph.build_file_aliases import BuildFileAliases
 from pants.goal.task_registrar import TaskRegistrar as task
 

src/python/pants/backend/codegen/subsystems/thrift_defaults.py

@@ -5,8 +5,8 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
-from pants.base.deprecated import deprecated_module
 from pants.backend.codegen.thrift.java.thrift_defaults import ThriftDefaults
+from pants.base.deprecated import deprecated_module
 
 
 deprecated_module('1.5.0', 'Use pants.backend.codegen.thrift.java.thrift_defaults instead')

src/python/pants/backend/codegen/targets/java_antlr_library.py

@@ -5,8 +5,8 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
-from pants.base.deprecated import deprecated_module
 from pants.backend.codegen.antlr.java.java_antlr_library import JavaAntlrLibrary
+from pants.base.deprecated import deprecated_module
 
 
 deprecated_module('1.5.0', 'Use pants.backend.codegen.antlr.java instead')

src/python/pants/backend/codegen/targets/java_protobuf_library.py

@@ -5,8 +5,8 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
-from pants.base.deprecated import deprecated_module
 from pants.backend.codegen.protobuf.java.java_protobuf_library import JavaProtobufLibrary
+from pants.base.deprecated import deprecated_module
 
 
 deprecated_module('1.5.0', 'Use pants.backend.codegen.protobuf.java instead')

src/python/pants/backend/codegen/targets/java_ragel_library.py

@@ -5,8 +5,8 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
-from pants.base.deprecated import deprecated_module
 from pants.backend.codegen.ragel.java.java_ragel_library import JavaRagelLibrary
+from pants.base.deprecated import deprecated_module
 
 
 deprecated_module('1.5.0', 'Use pants.backend.codegen.ragel.java instead')

src/python/pants/backend/codegen/targets/java_thrift_library.py

@@ -5,8 +5,8 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
-from pants.base.deprecated import deprecated_module
 from pants.backend.codegen.thrift.java.java_thrift_library import JavaThriftLibrary
+from pants.base.deprecated import deprecated_module
 
 
 deprecated_module('1.5.0', 'Use pants.backend.codegen.thrift.java instead')

src/python/pants/backend/codegen/targets/java_wire_library.py

@@ -5,8 +5,8 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
-from pants.base.deprecated import deprecated_module
 from pants.backend.codegen.wire.java.java_wire_library import JavaWireLibrary
+from pants.base.deprecated import deprecated_module
 
 
 deprecated_module('1.5.0', 'Use pants.backend.codegen.wire.java instead')

src/python/pants/backend/codegen/targets/jaxb_library.py

@@ -5,8 +5,8 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
-from pants.base.deprecated import deprecated_module
 from pants.backend.codegen.jaxb.jaxb_library import JaxbLibrary
+from pants.base.deprecated import deprecated_module
 
 
 deprecated_module('1.5.0', 'Use pants.backend.codegen.jaxb instead')

src/python/pants/backend/codegen/targets/python_antlr_library.py

@@ -5,8 +5,8 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
-from pants.base.deprecated import deprecated_module
 from pants.backend.codegen.antlr.python.python_antlr_library import PythonAntlrLibrary
+from pants.base.deprecated import deprecated_module
 
 
 deprecated_module('1.5.0', 'Use pants.backend.codegen.antlr.python instead')

src/python/pants/backend/codegen/targets/python_thrift_library.py

@@ -5,8 +5,8 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
-from pants.base.deprecated import deprecated_module
 from pants.backend.codegen.thrift.python.python_thrift_library import PythonThriftLibrary
+from pants.base.deprecated import deprecated_module
 
 
 deprecated_module('1.5.0', 'Use pants.backend.codegen.thrift.python instead')

src/python/pants/backend/codegen/tasks/antlr_gen.py

@@ -5,8 +5,8 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
-from pants.base.deprecated import deprecated_module
 from pants.backend.codegen.antlr.java.antlr_gen import AntlrGen
+from pants.base.deprecated import deprecated_module
 
 
 deprecated_module('1.5.0', 'Use pants.backend.codegen.antlr.java instead')

src/python/pants/backend/codegen/tasks/apache_thrift_gen.py

@@ -5,8 +5,8 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
-from pants.base.deprecated import deprecated_module
 from pants.backend.codegen.thrift.java.apache_thrift_gen import ApacheThriftGen
+from pants.base.deprecated import deprecated_module
 
 
 deprecated_module('1.5.0', 'Use pants.backend.codegen.thrift.java instead')

src/python/pants/backend/codegen/tasks/jaxb_gen.py

@@ -5,8 +5,8 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
-from pants.base.deprecated import deprecated_module
 from pants.backend.codegen.jaxb.jaxb_gen import JaxbGen
+from pants.base.deprecated import deprecated_module
 
 
 deprecated_module('1.5.0', 'Use pants.backend.codegen.jaxb instead')

src/python/pants/backend/codegen/tasks/protobuf_gen.py

@@ -5,8 +5,8 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
-from pants.base.deprecated import deprecated_module
 from pants.backend.codegen.protobuf.java.protobuf_gen import ProtobufGen
+from pants.base.deprecated import deprecated_module
 
 
 deprecated_module('1.5.0', 'Use pants.backend.codegen.protobuf.java instead')

src/python/pants/backend/codegen/tasks/ragel_gen.py

@@ -5,8 +5,8 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
-from pants.base.deprecated import deprecated_module
 from pants.backend.codegen.ragel.java.ragel_gen import RagelGen
+from pants.base.deprecated import deprecated_module
 
 
 deprecated_module('1.5.0', 'Use pants.backend.codegen.ragel.java instead')

src/python/pants/backend/codegen/tasks/wire_gen.py

@@ -5,8 +5,8 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
-from pants.base.deprecated import deprecated_module
 from pants.backend.codegen.wire.java.wire_gen import WireGen
+from pants.base.deprecated import deprecated_module
 
 
 deprecated_module('1.5.0', 'Use pants.backend.codegen.wire.java instead')

src/python/pants/backend/codegen/thrift/java/apache_thrift_gen.py

@@ -12,8 +12,8 @@
 
 from twitter.common.collections import OrderedSet
 
-from pants.backend.codegen.thrift.java.thrift_defaults import ThriftDefaults
 from pants.backend.codegen.thrift.java.java_thrift_library import JavaThriftLibrary
+from pants.backend.codegen.thrift.java.thrift_defaults import ThriftDefaults
 from pants.backend.jvm.targets.java_library import JavaLibrary
 from pants.base.build_environment import get_buildroot
 from pants.base.exceptions import TargetDefinitionException, TaskError

src/python/pants/backend/codegen/wire/java/register.py

@@ -5,8 +5,8 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
-from pants.backend.codegen.wire.java.wire_gen import WireGen
 from pants.backend.codegen.wire.java.java_wire_library import JavaWireLibrary
+from pants.backend.codegen.wire.java.wire_gen import WireGen
 from pants.build_graph.build_file_aliases import BuildFileAliases
 from pants.goal.task_registrar import TaskRegistrar as task
 

src/python/pants/backend/python/register.py

@@ -13,16 +13,16 @@
 from pants.backend.python.targets.python_library import PythonLibrary
 from pants.backend.python.targets.python_requirement_library import PythonRequirementLibrary
 from pants.backend.python.targets.python_tests import PythonTests
+from pants.backend.python.tasks2.gather_sources import GatherSources
+from pants.backend.python.tasks2.python_run import PythonRun as PythonRun2
+from pants.backend.python.tasks2.resolve_requirements import ResolveRequirements
+from pants.backend.python.tasks2.select_interpreter import SelectInterpreter
 from pants.backend.python.tasks.pytest_run import PytestRun
 from pants.backend.python.tasks.python_binary_create import PythonBinaryCreate
 from pants.backend.python.tasks.python_isort import IsortPythonTask
 from pants.backend.python.tasks.python_repl import PythonRepl
 from pants.backend.python.tasks.python_run import PythonRun
 from pants.backend.python.tasks.setup_py import SetupPy
-from pants.backend.python.tasks2.gather_sources import GatherSources
-from pants.backend.python.tasks2.resolve_requirements import ResolveRequirements
-from pants.backend.python.tasks2.select_interpreter import SelectInterpreter
-from pants.backend.python.tasks2.python_run import PythonRun as PythonRun2
 from pants.build_graph.build_file_aliases import BuildFileAliases
 from pants.build_graph.resources import Resources
 from pants.goal.task_registrar import TaskRegistrar as task

src/python/pants/backend/python/tasks2/select_interpreter.py

@@ -7,7 +7,7 @@
 
 import os
 
-from pex.interpreter import PythonInterpreter, PythonIdentity
+from pex.interpreter import PythonIdentity, PythonInterpreter
 
 from pants.backend.python.interpreter_cache import PythonInterpreterCache
 from pants.backend.python.python_setup import PythonRepos, PythonSetup

tests/python/pants_test/backend/codegen/antlr/java/test_antlr_gen.py

@@ -12,8 +12,8 @@
 
 from twitter.common.dirutil.fileset import Fileset
 
-from pants.backend.codegen.antlr.java.java_antlr_library import JavaAntlrLibrary
 from pants.backend.codegen.antlr.java.antlr_gen import AntlrGen
+from pants.backend.codegen.antlr.java.java_antlr_library import JavaAntlrLibrary
 from pants.base.exceptions import TaskError
 from pants.build_graph.build_file_aliases import BuildFileAliases
 from pants.util.dirutil import safe_mkdtemp

tests/python/pants_test/backend/codegen/jaxb/test_jaxb_gen.py

@@ -7,9 +7,9 @@
 
 import os
 
-from pants.backend.codegen.jaxb.register import build_file_aliases as register_codegen
-from pants.backend.codegen.jaxb.jaxb_library import JaxbLibrary
 from pants.backend.codegen.jaxb.jaxb_gen import JaxbGen
+from pants.backend.codegen.jaxb.jaxb_library import JaxbLibrary
+from pants.backend.codegen.jaxb.register import build_file_aliases as register_codegen
 from pants.build_graph.register import build_file_aliases as register_core
 from pants_test.tasks.task_test_base import TaskTestBase
 

tests/python/pants_test/backend/codegen/protobuf/java/test_protobuf_gen.py

@@ -9,8 +9,8 @@
 
 from twitter.common.collections import OrderedSet
 
-from pants.backend.codegen.protobuf.java.register import build_file_aliases as register_codegen
 from pants.backend.codegen.protobuf.java.protobuf_gen import ProtobufGen
+from pants.backend.codegen.protobuf.java.register import build_file_aliases as register_codegen
 from pants.backend.jvm.register import build_file_aliases as register_jvm
 from pants.build_graph.register import build_file_aliases as register_core
 from pants_test.tasks.task_test_base import TaskTestBase

tests/python/pants_test/backend/codegen/thrift/java/test_apache_thrift_gen.py

@@ -7,8 +7,8 @@
 
 from textwrap import dedent
 
-from pants.backend.codegen.thrift.java.java_thrift_library import JavaThriftLibrary
 from pants.backend.codegen.thrift.java.apache_thrift_gen import ApacheThriftGen
+from pants.backend.codegen.thrift.java.java_thrift_library import JavaThriftLibrary
 from pants.backend.jvm.targets.java_library import JavaLibrary
 from pants.base.exceptions import TargetDefinitionException
 from pants_test.tasks.task_test_base import TaskTestBase

tests/python/pants_test/backend/codegen/thrift/java/test_thrift_defaults.py

@@ -8,8 +8,8 @@
 import uuid
 from contextlib import contextmanager
 
-from pants.backend.codegen.thrift.java.thrift_defaults import ThriftDefaults
 from pants.backend.codegen.thrift.java.java_thrift_library import JavaThriftLibrary
+from pants.backend.codegen.thrift.java.thrift_defaults import ThriftDefaults
 from pants.build_graph.target import Target
 from pants_test.base_test import BaseTest
 

tests/python/pants_test/backend/jvm/tasks/test_classmap_integration.py

@@ -44,4 +44,4 @@ def test_classmap_intransitive(self):
 
   def test_classmap_unicode(self):
     pants_run = self.do_command('classmap', self.UNICODE_TEST_TARGET, success=True)
-    self.assertIn(self.UNICODE_MAPPING, pants_run.stdout_data)
+    self.assertIn(self.UNICODE_MAPPING, pants_run.stdout_data)

tests/python/pants_test/backend/python/tasks2/test_gather_sources.py

@@ -10,8 +10,7 @@
 from pex.interpreter import PythonInterpreter
 
 from pants.backend.python.interpreter_cache import PythonInterpreterCache
-from pants.backend.python.python_setup import PythonRepos
-from pants.backend.python.python_setup import PythonSetup
+from pants.backend.python.python_setup import PythonRepos, PythonSetup
 from pants.backend.python.targets.python_library import PythonLibrary
 from pants.backend.python.tasks2.gather_sources import GatherSources
 from pants.build_graph.resources import Resources

tests/python/pants_test/task/test_task.py

@@ -11,8 +11,8 @@
 from pants.base.payload import Payload
 from pants.build_graph.target import Target
 from pants.cache.cache_setup import CacheSetup
-from pants.util.dirutil import safe_rmtree
 from pants.task.task import Task
+from pants.util.dirutil import safe_rmtree
 from pants_test.tasks.task_test_base import TaskTestBase