Skip to content

Commit

Permalink
A global isort fix.
Browse files Browse the repository at this point in the history
Not sure how these got past CI.

Testing Done:
Noticed these borked files in an unrelated branch.

I ran `./build-support/bin/isort.sh -f` to generate
this diff in full.

CI is away here:
  https://travis-ci.org/pantsbuild/pants/builds/72036259

Bugs closed: 1846

Reviewed at https://rbcommons.com/s/twitter/r/2510/
  • Loading branch information
jsirois committed Jul 21, 2015
1 parent 55eda37 commit 77fcc3d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 11 deletions.
1 change: 0 additions & 1 deletion src/python/pants/backend/jvm/tasks/ivy_task_mixin.py
Original file line number Diff line number Diff line change
Expand Up @@ -309,4 +309,3 @@ def _get_ivy_args(mapdir):
'-symlink',
]
return ivy_args

6 changes: 3 additions & 3 deletions src/python/pants/java/nailgun_executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
import time
from collections import namedtuple

from six import string_types
from twitter.common.collections import maybe_list

from pants.base.build_environment import get_buildroot
from pants.java.executor import Executor, SubprocessExecutor
from pants.java.nailgun_client import NailgunClient
from pants.pantsd.process_manager import ProcessGroup, ProcessManager
from pants.util.dirutil import safe_open

from six import string_types
from twitter.common.collections import maybe_list


logger = logging.getLogger(__name__)

Expand Down
6 changes: 3 additions & 3 deletions src/python/pants/pantsd/process_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
unicode_literals, with_statement)

from contextlib import contextmanager
import logging
import os
import signal
import subprocess
import time
import traceback
from contextlib import contextmanager

import psutil

from pants.base.build_environment import get_buildroot
from pants.util.dirutil import safe_delete, safe_mkdir, safe_open

import psutil


logger = logging.getLogger(__name__)

Expand Down
8 changes: 4 additions & 4 deletions tests/python/pants_test/pantsd/test_process_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
unicode_literals, with_statement)

from collections import namedtuple
import os
import subprocess
import unittest

from pants.pantsd.process_manager import ProcessGroup, ProcessManager
from pants.util.contextutil import temporary_dir
from collections import namedtuple

import mock
import psutil

from pants.pantsd.process_manager import ProcessGroup, ProcessManager
from pants.util.contextutil import temporary_dir


PATCH_OPTS = dict(autospec=True, spec_set=True)

Expand Down

0 comments on commit 77fcc3d

Please sign in to comment.