From b96bcf71fcfd23eb2e5c636f8eee626c11c14960 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Tue, 23 Feb 2016 20:20:57 +0100 Subject: Python 3 fix for Tomcat.get_major_version() I forgot to decode the output of subprocess.check_call(). All other places decode bytes to text properly. --- base/server/python/pki/server/__init__.py | 1 + 1 file changed, 1 insertion(+) (limited to 'base/server/python') diff --git a/base/server/python/pki/server/__init__.py b/base/server/python/pki/server/__init__.py index cb246aaa1..26418d45c 100644 --- a/base/server/python/pki/server/__init__.py +++ b/base/server/python/pki/server/__init__.py @@ -471,6 +471,7 @@ class Tomcat(object): # run "tomcat version" output = subprocess.check_output(['/usr/sbin/tomcat', 'version']) + output = output.decode('utf-8') # find "Server version: Apache Tomcat/." match = re.search(r'^Server version:[^/]*/(\d+).*$', output, re.MULTILINE) -- cgit