From de7faf462b19fd3c3ce726ea4b72e17f63017402 Mon Sep 17 00:00:00 2001 From: Mike Gerber Date: Mon, 25 May 2015 21:13:57 +0200 Subject: [PATCH] Support Python 3.x --- check_kernel | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/check_kernel b/check_kernel index b6d91d0..a732d8b 100755 --- a/check_kernel +++ b/check_kernel @@ -52,9 +52,16 @@ class Version(object): def proc_version(): + """Return the content of /proc/version""" + + proc_version = None + + # Not using a with statement here, to support Python 2.4 v = open('/proc/version', 'r') - proc_version = v.next() - v.close() + try: + proc_version = v.read() + finally: + v.close() return proc_version @@ -122,7 +129,7 @@ def installed_kernel_versions_debian(): def installed_kernel_versions_fedora(): rpm_out = check_output( ['rpm', '--queryformat=%{VERSION}-%{RELEASE}\n', '-q', 'kernel']) - rpm_out = rpm_out.strip() + rpm_out = rpm_out.decode('ascii', 'ignore').strip() versions = rpm_out.split('\n') versions = [clean_kernel_version(v) for v in versions]