Remove legacy check_output implementation for pre-2.7 Pythons.

We still need it in integrations, because those don't require Python
2.7, but we don't need it in any of our code that runs on internal
servers.

(imported from commit 3c340567f1a372dcb4206c6af9a6e5e18005b1b8)

bots/check-rabbitmq-consumers

@@ -5,9 +5,7 @@ import time
 import optparse
 from collections import defaultdict
 import os
-
+import subprocess
-sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
-from zulip_tools import check_output
 
 states = {
     0: "OK",
@@ -35,7 +33,7 @@ parser.add_option('--min-threshold',
 
 (options, args) = parser.parse_args()
 
-output = check_output(['/usr/sbin/rabbitmqctl', 'list_consumers'], shell=False)
+output = subprocess.check_output(['/usr/sbin/rabbitmqctl', 'list_consumers'], shell=False)
 
 consumers = defaultdict(int)
 

bots/check-rabbitmq-queue

@@ -4,9 +4,7 @@ import sys
 import re
 import time
 import os
-
+import subprocess
-sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
-from zulip_tools import check_output
 
 WARN_THRESHOLD = 50
 CRIT_THRESHOLD = 100
@@ -19,7 +17,7 @@ states = {
 }
 
 re = re.compile(r'(\w+)\t(\d+)')
-output = check_output(['/usr/sbin/rabbitmqctl', 'list_queues'], shell=False)
+output = subprocess.check_output(['/usr/sbin/rabbitmqctl', 'list_queues'], shell=False)
 
 status = 0
 max_count = 0

tools/check-handlebar-templates

@@ -1,9 +1,7 @@
 #!/usr/bin/env python
 import os
 import sys
-
+import subprocess
-sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
-from zulip_tools import check_output
 
 class Record:
     pass
@@ -81,7 +79,7 @@ def validate(fn):
 
     assert state.depth == 0
 
-git_files = map(str.strip, check_output(['git', 'ls-files']).split('\n'))
+git_files = map(str.strip, subprocess.check_output(['git', 'ls-files']).split('\n'))
 
 # Check all our handlebars templates.
 templates = [fn for fn in git_files if fn.endswith('.handlebars')]

tools/lint-all

@@ -8,9 +8,6 @@ import subprocess
 from os          import path
 from collections import defaultdict
 
-sys.path.append(path.join(path.dirname(__file__), '..'))
-from zulip_tools import check_output
-
 parser = optparse.OptionParser()
 parser.add_option('--full',
     action='store_true',
@@ -40,7 +37,7 @@ api/setup.py
 
 # Categorize by language all files known to Git
 
-git_files = map(str.strip, check_output(['git', 'ls-files']).split('\n'))
+git_files = map(str.strip, subprocess.check_output(['git', 'ls-files']).split('\n'))
 by_lang   = defaultdict(list)
 
 for filepath in git_files:

tools/post-receive

@@ -32,7 +32,7 @@ import os
 import sys
 import subprocess
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
-from zulip_tools import check_output, ENDC, FAIL
+from zulip_tools import ENDC, FAIL
 
 def update_deployment(server, refname):
     return subprocess.call(["ssh", "-l", "zulip", server, "--", "env", "-u", "GIT_DIR",
@@ -69,7 +69,7 @@ for ln in sys.stdin:
                 # 0000000000000000000000000000000000000000 means we're deleting the ref
                 commits = ''
             else:
-                commits = check_output(["git", "log", "%s..%s" % (oldrev, newrev)])
+                commits = subprocess.check_output(["git", "log", "%s..%s" % (oldrev, newrev)])
 
             if '[schema]' in commits:
                 print

zulip_tools.py

@@ -1,21 +1,6 @@
 import subprocess
 import os
 
-# check_output is backported from subprocess.py in Python 2.7
-
-def check_output(*popenargs, **kwargs):
-    if 'stdout' in kwargs:
-        raise ValueError('stdout argument not allowed, it will be overridden.')
-    process = subprocess.Popen(stdout=subprocess.PIPE, *popenargs, **kwargs)
-    output, unused_err = process.communicate()
-    retcode = process.poll()
-    if retcode:
-        cmd = kwargs.get("args")
-        if cmd is None:
-            cmd = popenargs[0]
-        raise subprocess.CalledProcessError(retcode, cmd, output=output)
-    return output
-
 DEPLOYMENTS_DIR = "/home/zulip/deployments"
 LOCK_DIR = os.path.join(DEPLOYMENTS_DIR, "lock")
 TIMESTAMP_FORMAT = '%Y-%m-%d-%H-%M-%S'