mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-08-11 17:54:06 +02:00
Code Activity

Fix python2 regression in util.helper.decode_it

Browse Source 
In commit 276d6e2439 ("Do not use the
chardet module in util.helper.decode_it") util.helper.decode_it was
changed to always decode the passed object if it has a decode method.
Since a python2 str has a decode method, the new code tries to utf-8
decode the passed str. As a result, a unicode object is returned (if
the decoding worked). Since a unicode object is not an instance of
type str, all subsequent isinstance(decoded_obj, str) checks evaluate
to False, which break some codepaths.
In order to fix this, restore the old python2 behavior (that is, if
the passed object is a str, it is not decode it). This change does not
affect the python3 codepaths.

Fixes: #814 ("osc log | fails")
This commit is contained in:
Marcus Huewe
2020-06-25 15:38:14 +02:00
parent 050c94dcf3
commit d85030b72d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osc/util/helper.py
View File

@@ -56,14 +56,14 @@ def decode_list(ilist):
def decode_it(obj):
"""Decode the given object.
"""Decode the given object unless it is a str.
If the given object has no decode method, the object itself is
If the given object is a str or has no decode method, the object itself is
returned. Otherwise, try to decode the object using utf-8. If this
fails due to a UnicodeDecodeError, try to decode the object using
latin-1.
"""
if not hasattr(obj, 'decode'):
if isinstance(obj, str) or not hasattr(obj, 'decode'):
return obj
try:
return obj.decode('utf-8')