Fix linter errors

alisw · Apr 1, 2022 · 21a75c8 · 21a75c8
1 parent a9eb661
commit 21a75c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/alibuild_helpers/cmd.py b/alibuild_helpers/cmd.py
@@ -10,6 +10,7 @@
 # Keep the linter happy
 if sys.version_info[0] >= 3:
   basestring = str
+  unicode = None
 
 
 def is_string(s):
@@ -36,6 +37,7 @@ def decode_with_fallback(data):
     return unicode(data, "utf-8")  # utf-8 is a safe assumption
   elif not isinstance(data, unicode):
     return unicode(str(data))
+  return data
 
 
 def getoutput(command):

diff --git a/alibuild_helpers/utilities.py b/alibuild_helpers/utilities.py
@@ -22,10 +22,6 @@ class SpecError(Exception):
 
 asList = lambda x : x if type(x) == list else [x]
 
-# Keep the linter happy
-if sys.version_info[0] >= 3:
-  unicode = None
-
 def star():
   return re.sub("build.*$", "", basename(sys.argv[0]).lower())