From 723a1a2fb24b39da53514da3e0e90dc251ccdae3 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Fri, 25 Nov 2016 15:46:14 +0100 Subject: [PATCH] Fix regressions on python2 Closes: #845489 --- initdutils.py | 1 + lsb_release.py | 8 +++++++- test/test_lsb_release.py | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/initdutils.py b/initdutils.py index f2e90a8..9276047 100644 --- a/initdutils.py +++ b/initdutils.py @@ -1,4 +1,5 @@ # Support for scanning init scripts for LSB info +from __future__ import print_function import re, sys, os import pickle diff --git a/lsb_release.py b/lsb_release.py index 0c4b078..221a321 100644 --- a/lsb_release.py +++ b/lsb_release.py @@ -28,9 +28,15 @@ import warnings import csv def get_distro_info(origin='Debian'): + try: + FileNotFoundException = FileNotFoundError + except NameError: + # There is no FileNotFoundError in python2 + FileNotFoundException = IOError + try: csvfile = open('/usr/share/distro-info/%s.csv' % origin.lower()) - except FileNotFoundError: + except FileNotFoundException: # Unknown distro, fallback to Debian csvfile = open('/usr/share/distro-info/debian.csv') diff --git a/test/test_lsb_release.py b/test/test_lsb_release.py index 082bea3..478380d 100644 --- a/test/test_lsb_release.py +++ b/test/test_lsb_release.py @@ -135,7 +135,7 @@ class TestLSBRelease(unittest.TestCase): self.assertEqual(lr.parse_apt_policy(),supposed_output) # Add a third fake entry, unordered, with non-ascii chars (#675618) os.environ['TEST_APT_CACHE3'] = '754' - supposed_output.append((754, {'origin': 'Jérôme Helvète', 'suite': '5uiTe', 'component': 'C03p0nent', 'label': '1ABel'})) + supposed_output.append((754, {'origin': u'Jérôme Helvète', 'suite': '5uiTe', 'component': 'C03p0nent', 'label': '1ABel'})) self.assertEqual(lr.parse_apt_policy(),supposed_output) os.environ.pop('TEST_APT_CACHE1') os.environ.pop('TEST_APT_CACHE2') -- 2.30.2