diff options
-rw-r--r-- | git_config.py | 4 | ||||
-rw-r--r-- | subcmds/abandon.py | 4 | ||||
-rw-r--r-- | subcmds/status.py | 9 |
3 files changed, 9 insertions, 8 deletions
diff --git a/git_config.py b/git_config.py index 054f5c64..cee33e92 100644 --- a/git_config.py +++ b/git_config.py | |||
@@ -21,6 +21,7 @@ import errno | |||
21 | import json | 21 | import json |
22 | import os | 22 | import os |
23 | import re | 23 | import re |
24 | import signal | ||
24 | import ssl | 25 | import ssl |
25 | import subprocess | 26 | import subprocess |
26 | import sys | 27 | import sys |
@@ -41,7 +42,6 @@ else: | |||
41 | urllib.request = urllib2 | 42 | urllib.request = urllib2 |
42 | urllib.error = urllib2 | 43 | urllib.error = urllib2 |
43 | 44 | ||
44 | from signal import SIGTERM | ||
45 | from error import GitError, UploadError | 45 | from error import GitError, UploadError |
46 | import platform_utils | 46 | import platform_utils |
47 | from repo_trace import Trace | 47 | from repo_trace import Trace |
@@ -494,7 +494,7 @@ def close_ssh(): | |||
494 | 494 | ||
495 | for p in _master_processes: | 495 | for p in _master_processes: |
496 | try: | 496 | try: |
497 | os.kill(p.pid, SIGTERM) | 497 | os.kill(p.pid, signal.SIGTERM) |
498 | p.wait() | 498 | p.wait() |
499 | except OSError: | 499 | except OSError: |
500 | pass | 500 | pass |
diff --git a/subcmds/abandon.py b/subcmds/abandon.py index f3478129..5d56abf7 100644 --- a/subcmds/abandon.py +++ b/subcmds/abandon.py | |||
@@ -15,9 +15,11 @@ | |||
15 | # limitations under the License. | 15 | # limitations under the License. |
16 | 16 | ||
17 | from __future__ import print_function | 17 | from __future__ import print_function |
18 | |||
19 | from collections import defaultdict | ||
18 | import sys | 20 | import sys |
21 | |||
19 | from command import Command | 22 | from command import Command |
20 | from collections import defaultdict | ||
21 | from git_command import git | 23 | from git_command import git |
22 | from progress import Progress | 24 | from progress import Progress |
23 | 25 | ||
diff --git a/subcmds/status.py b/subcmds/status.py index b594bd89..8537e6c5 100644 --- a/subcmds/status.py +++ b/subcmds/status.py | |||
@@ -16,6 +16,10 @@ | |||
16 | 16 | ||
17 | from __future__ import print_function | 17 | from __future__ import print_function |
18 | 18 | ||
19 | import glob | ||
20 | import itertools | ||
21 | import os | ||
22 | |||
19 | from command import PagedCommand | 23 | from command import PagedCommand |
20 | 24 | ||
21 | try: | 25 | try: |
@@ -23,11 +27,6 @@ try: | |||
23 | except ImportError: | 27 | except ImportError: |
24 | import dummy_threading as _threading | 28 | import dummy_threading as _threading |
25 | 29 | ||
26 | import glob | ||
27 | |||
28 | import itertools | ||
29 | import os | ||
30 | |||
31 | from color import Coloring | 30 | from color import Coloring |
32 | import platform_utils | 31 | import platform_utils |
33 | 32 | ||