svn commit: r1800117 - /subversion/trunk/tools/dist/release.py

[da...@apache.org]

Author: danielsh
Date: Wed Jun 28 05:08:23 2017
New Revision: 1800117

URL: http://svn.apache.org/viewvc?rev=1800117&view=rev
Log:
release.py: Remove a workaround for Python ≤2.6.  The workaround was broken
(the function ignored its actual arguments) and is obsolete (we require
Python ≥2.7 nowadays).

* tools/dist/release.py
  (check_output): Delete.  We assume Python ≥2.7, which provides
    subprocess.check_output natively.

Modified:
    subversion/trunk/tools/dist/release.py

Modified: subversion/trunk/tools/dist/release.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1800117&r1=1800116&r2=1800117&view=diff
==============================================================================
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Wed Jun 28 05:08:23 2017
@@ -63,22 +63,6 @@ except ImportError:
     import ezt
 
 
-try:
-    subprocess.check_output
-except AttributeError:
-    def check_output(cmd):
-        proc = subprocess.Popen(['svn', 'list', dist_dev_url],
-                                stdout=subprocess.PIPE,
-                                stderr=subprocess.PIPE)
-        (stdout, stderr) = proc.communicate()
-        rc = proc.wait()
-        if rc or stderr:
-            logging.error('%r failed with stderr %r', cmd, stderr)
-            raise subprocess.CalledProcessError(rc, cmd)
-        return stdout
-    subprocess.check_output = check_output
-    del check_output
-
 # Our required / recommended release tool versions by release branch
 tool_versions = {
   'trunk' : {