summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--git_config.py4
-rw-r--r--subcmds/abandon.py4
-rw-r--r--subcmds/status.py9
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
21import json 21import json
22import os 22import os
23import re 23import re
24import signal
24import ssl 25import ssl
25import subprocess 26import subprocess
26import sys 27import sys
@@ -41,7 +42,6 @@ else:
41 urllib.request = urllib2 42 urllib.request = urllib2
42 urllib.error = urllib2 43 urllib.error = urllib2
43 44
44from signal import SIGTERM
45from error import GitError, UploadError 45from error import GitError, UploadError
46import platform_utils 46import platform_utils
47from repo_trace import Trace 47from 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
17from __future__ import print_function 17from __future__ import print_function
18
19from collections import defaultdict
18import sys 20import sys
21
19from command import Command 22from command import Command
20from collections import defaultdict
21from git_command import git 23from git_command import git
22from progress import Progress 24from 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
17from __future__ import print_function 17from __future__ import print_function
18 18
19import glob
20import itertools
21import os
22
19from command import PagedCommand 23from command import PagedCommand
20 24
21try: 25try:
@@ -23,11 +27,6 @@ try:
23except ImportError: 27except ImportError:
24 import dummy_threading as _threading 28 import dummy_threading as _threading
25 29
26import glob
27
28import itertools
29import os
30
31from color import Coloring 30from color import Coloring
32import platform_utils 31import platform_utils
33 32