Some more Python 3 fixes

hhorak · Jan 27, 2014 · 85a946e · 85a946e
1 parent 2fcb979
commit 85a946e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/rpmquality/RpmQuality.py b/rpmquality/RpmQuality.py
@@ -76,7 +76,8 @@ def performAll(self):
         if not os.path.isdir(self._working_dir):
             os.makedirs(self._working_dir, 0o755)
 
-        self._modules = dict(self._basic_modules.items() + self._extra_modules.items())
+        self._modules = self._basic_modules.copy()
+        self._modules.update(self._extra_modules.items())
         for module_name in self._modules:
             # where we want results (log), working directory, etc.
             log_file = os.path.join(self._logs_location, "%s.log" % module_name)

diff --git a/rpmquality/modules/RpmLint.py b/rpmquality/modules/RpmLint.py
@@ -1,6 +1,7 @@
 import re
 import subprocess
 import DefaultModule
+import locale
 
 class RpmLint(DefaultModule.DefaultModule):
     """
@@ -48,8 +49,9 @@ def perform(self):
             files_checked = 0
             try:
                 print("Calling %s %s" % ("rpmlint", package))
-                out = subprocess.check_output(["rpmlint", package])
-
+                encoding = locale.getdefaultlocale()[1]
+                out = subprocess.check_output(["rpmlint", package]).decode(encoding)
+
             except subprocess.CalledProcessError as e:
                 out = e.output