Fix regressions on python2

Closes: #845489

diff --git a/initdutils.py b/initdutils.py
index f2e90a8f75546b259ecc36e4e4b8cf71a0d0b736..9276047d5ff7eb125bc14f02cddcdf019d62a299 100644 (file)
--- 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 0c4b0783bc3366d48b98e4127ed8911364ac6ad7..221a3214b1143d03ae819432ef7d072a6fc6b742 100644 (file)
--- 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 082bea3e7921d209300868ae9bae3fa62c090b0d..478380d8e8b184ae2c031d6d9fb1e5fc1968e7a7 100644 (file)
--- 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')