util: always use subprocess

mercurial/util.py

@@ -44,9 +44,7 def sha1(s):
             _sha1 = sha.sha
     return _sha1(s)
 
-try:
     import subprocess
-    subprocess.Popen  # trigger ImportError early
     closefds = os.name == 'posix'
     def popen2(cmd, mode='t', bufsize=-1):
         p = subprocess.Popen(cmd, shell=True, bufsize=bufsize,
@@ -69,12 +67,6 try:
         p.tochild = p.stdin
         p.childerr = p.stderr
         return p
-except ImportError:
-    subprocess = None
-    from popen2 import Popen3
-    popen2 = os.popen2
-    popen3 = os.popen3
-
 
 def version():
     """Return version information if available."""

tests/run-tests.py

@@ -11,9 +11,13 import difflib
 import errno
 import optparse
 import os
-try:
     import subprocess
-    subprocess.Popen  # trigger ImportError early
+import shutil
+import signal
+import sys
+import tempfile
+import time
+
     closefds = os.name == 'posix'
     def Popen4(cmd, bufsize=-1):
         p = subprocess.Popen(cmd, shell=True, bufsize=bufsize,
@@ -24,14 +28,6 try:
         p.tochild = p.stdin
         p.childerr = p.stderr
         return p
-except ImportError:
-    subprocess = None
-    from popen2 import Popen4
-import shutil
-import signal
-import sys
-import tempfile
-import time
 
 # reserved exit code to skip test (used by hghave)
 SKIPPED_STATUS = 80