##// END OF EJS Templates
tests: unconditionalize some imports...
Gregory Szorc -
r49722:f547a5de default
parent child Browse files
Show More
@@ -57,8 +57,10 b' import json'
57 import multiprocessing
57 import multiprocessing
58 import os
58 import os
59 import platform
59 import platform
60 import queue
60 import random
61 import random
61 import re
62 import re
63 import shlex
62 import shutil
64 import shutil
63 import signal
65 import signal
64 import socket
66 import socket
@@ -73,20 +75,7 b' import uuid'
73 import xml.dom.minidom as minidom
75 import xml.dom.minidom as minidom
74
76
75 WINDOWS = os.name == r'nt'
77 WINDOWS = os.name == r'nt'
76
78 shellquote = shlex.quote
77 try:
78 import Queue as queue
79 except ImportError:
80 import queue
81
82 try:
83 import shlex
84
85 shellquote = shlex.quote
86 except (ImportError, AttributeError):
87 import pipes
88
89 shellquote = pipes.quote
90
79
91
80
92 processlock = threading.Lock()
81 processlock = threading.Lock()
General Comments 0
You need to be logged in to leave comments. Login now