Fix some nits.

src/python/pants/authentication/BUILD

@@ -1,3 +1,6 @@
+# Copyright 2014 Pants project contributors (see CONTRIBUTORS.md).
+# Licensed under the Apache License, Version 2.0 (see LICENSE).
+
 from pants.authentication.netrc_util import Netrc
 
 netrc = Netrc()

src/python/pants/authentication/__init__.py

@@ -1,2 +0,0 @@
-# Copyright 2014 Pants project contributors (see CONTRIBUTORS.md).
-# Licensed under the Apache License, Version 2.0 (see LICENSE).

src/python/pants/authentication/netrc_util.py

@@ -1,7 +1,8 @@
 # Copyright 2014 Pants project contributors (see CONTRIBUTORS.md).
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
-from __future__ import print_function
+from __future__ import (nested_scopes, generators, division, absolute_import, with_statement,
+                        print_function, unicode_literals)
 
 import collections
 import os

src/python/pants/backend/__init__.py

@@ -1,5 +0,0 @@
-# Copyright 2014 Pants project contributors (see CONTRIBUTORS.md).
-# Licensed under the Apache License, Version 2.0 (see LICENSE).
-
-from __future__ import (nested_scopes, generators, division, absolute_import, with_statement,
-                        print_function, unicode_literals)

src/python/pants/backend/jvm/ivy_utils.py

@@ -252,10 +252,6 @@ def _generate_ivy(self, targets, jars, excludes, ivyxml, confs):
       generator.write(output)
 
   def _calculate_classpath(self, targets):
-
-    def is_jardependant(target):
-      return target.is_jar_library
-
     jars = OrderedDict()
     excludes = set()
 

src/python/pants/backend/jvm/targets/artifact.py

@@ -4,11 +4,9 @@
 from __future__ import (nested_scopes, generators, division, absolute_import, with_statement,
                         print_function, unicode_literals)
 
-from twitter.common.collections import maybe_list
 from twitter.common.lang import Compatibility
 
 from pants.base.build_manual import manual
-from pants.backend.jvm.targets.repository import Repository
 
 
 @manual.builddict(tags=["jvm"])

src/python/pants/backend/jvm/targets/jar_dependency.py

@@ -176,10 +176,10 @@ def with_artifact(self, name=None, type_=None, ext=None, url=None, configuration
       extension, but not necessarily. For instance, ivy files are of type 'ivy' but have 'xml' as
       their file extension.
     :param ext: The file extension of the published artifact.
-    :param conf: The public configuration in which this artifact is published. The '*' wildcard can
-      be used to designate all public configurations.
     :param url: The url at which this artifact can be found if it isn't located at the standard
       location in the repository.
+    :param configuration: The public configuration in which this artifact is published. The '*' wildcard can
+      be used to designate all public configurations.
     :param classifier: The maven classifier of this artifact.
     """
     artifact = Artifact(name or self.name, type_=type_, ext=ext, url=url, conf=configuration,

src/python/pants/backend/jvm/targets/jar_library.py

@@ -4,14 +4,9 @@
 from __future__ import (nested_scopes, generators, division, absolute_import, with_statement,
                         print_function, unicode_literals)
 
-from functools import partial
-
-from twitter.common.collections import OrderedSet, maybe_list
-
 from pants.base.build_manual import manual
 from pants.base.payload import JarLibraryPayload
 from pants.base.target import Target
-from pants.backend.jvm.targets.jar_dependency import JarDependency
 
 
 @manual.builddict(tags=["anylang"])

src/python/pants/backend/jvm/targets/java_library.py

@@ -5,7 +5,6 @@
                         print_function, unicode_literals)
 
 from pants.base.build_manual import manual
-from pants.base.exceptions import TargetDefinitionException
 from pants.backend.jvm.targets.exportable_jvm_library import ExportableJvmLibrary
 
 

src/python/pants/backend/jvm/targets/jvm_target.py

@@ -11,7 +11,6 @@
 from pants.base.target import Target
 from pants.backend.jvm.targets.jar_library import JarLibrary
 from pants.backend.jvm.targets.jarable import Jarable
-from pants.backend.core.targets.resources import Resources
 
 
 class JvmTarget(Target, Jarable):

src/python/pants/backend/jvm/targets/scala_library.py

@@ -4,12 +4,7 @@
 from __future__ import (nested_scopes, generators, division, absolute_import, with_statement,
                         print_function, unicode_literals)
 
-from twitter.common.collections import maybe_list
-
-from pants.base.address import SyntheticAddress
 from pants.base.build_manual import manual
-from pants.base.target import Target
-from pants.base.exceptions import TargetDefinitionException
 from pants.backend.jvm.targets.exportable_jvm_library import ExportableJvmLibrary
 
 

src/python/pants/backend/jvm/tasks/depmap.py

@@ -160,6 +160,8 @@ def output_deps(outputted, dep, parent=None):
         if parent:
           output.append('  "%s" -> "%s";' % (self._dep_id(parent)[0], self._dep_id(dep)[0]))
 
+        # TODO: This is broken. 'dependency' doesn't exist here, and we don't have
+        # internal_dependencies any more anyway.
         if self._is_jvm(dependency):
           for internal_dependency in dependency.internal_dependencies:
             output += output_deps(outputted, internal_dependency, dependency)

src/python/pants/backend/jvm/tasks/filedeps.py

@@ -5,7 +5,6 @@
                         print_function, unicode_literals)
 
 import itertools
-import os
 
 from pants.backend.jvm.targets.jvm_binary import JvmApp
 from pants.backend.core.tasks.console_task import ConsoleTask

src/python/pants/backend/jvm/tasks/jar_publish.py

@@ -406,7 +406,7 @@ def parse_jarcoordinate(coordinate):
         return org, name
       else:
         try:
-          address = Address.parse(get_buildroot(), coordinate)
+          address = Address.parse(get_buildroot(), coordinate)  # TODO: This is broken.
           try:
             target = Target.get(address)
             if not target:

src/python/pants/base/config.py

@@ -4,7 +4,6 @@
 from __future__ import (nested_scopes, generators, division, absolute_import, with_statement,
                         print_function, unicode_literals)
 
-
 try:
   import ConfigParser
 except ImportError:

src/python/pants/base/source_root.py

@@ -12,6 +12,7 @@
 from pants.base.build_manual import manual
 from pants.base.exceptions import TargetDefinitionException
 
+
 @manual.builddict()
 class SourceRoot(object):
   """Allows registration of a source root for a set of targets.

src/python/pants/commands/command.py

@@ -4,13 +4,9 @@
 from __future__ import (nested_scopes, generators, division, absolute_import, with_statement,
                         print_function, unicode_literals)
 
-import os
-
 from twitter.common.collections import OrderedSet
 
 from pants.base.build_file import BuildFile
-from pants.base.build_file_parser import BuildFileParser
-from pants.base.build_graph import BuildGraph
 from pants.base.config import Config
 from pants.base.target import Target
 from pants.base.workunit import WorkUnit

src/python/pants/goal/context.py

@@ -9,7 +9,6 @@
 from collections import defaultdict
 from contextlib import contextmanager
 
-from twitter.common.collections import OrderedSet
 from twitter.common.dirutil import Lock
 from twitter.common.process import ProcessProviderFactory
 from twitter.common.process.process_provider import ProcessProvider

src/python/pants/java/util.py

@@ -5,7 +5,6 @@
                         print_function, unicode_literals)
 
 import os
-import re
 
 from pants.base.workunit import WorkUnit
 from pants.java.executor import Executor, SubprocessExecutor

src/python/pants/net/http/__init__.py

@@ -1,12 +0,0 @@
-# Copyright 2014 Pants project contributors (see CONTRIBUTORS.md).
-# Licensed under the Apache License, Version 2.0 (see LICENSE).
-
-from __future__ import (nested_scopes, generators, division, absolute_import, with_statement,
-                        print_function, unicode_literals)
-
-from pants.net.http.fetcher import Fetcher
-
-
-__all__ = (
-  'Fetcher'
-)

src/python/pants/pants_doc/__init__.py

@@ -1,12 +0,0 @@
-# Copyright 2014 Pants project contributors (see CONTRIBUTORS.md).
-# Licensed under the Apache License, Version 2.0 (see LICENSE).
-
-from __future__ import (nested_scopes, generators, division, absolute_import, with_statement,
-                        print_function, unicode_literals)
-
-from pants.pants_doc.doc_builder import DocBuilder
-
-
-__all__ = [
-  'DocBuilder',
-]