mirror of
https://github.com/openSUSE/osc.git
synced 2024-11-14 08:16:15 +01:00
d85030b72d
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")
92 lines
2.2 KiB
Python
92 lines
2.2 KiB
Python
# Copyright (C) 2018 SUSE Linux. All rights reserved.
|
|
# This program is free software; it may be used, copied, modified
|
|
# and distributed under the terms of the GNU General Public Licence,
|
|
# either version 2, or (at your option) any later version.
|
|
|
|
try:
|
|
import html
|
|
except ImportError:
|
|
import cgi as html
|
|
|
|
from osc import oscerr
|
|
|
|
def cmp_to_key(mycmp):
|
|
""" Converts a cmp= function into a key= function.
|
|
"""
|
|
|
|
class K(object):
|
|
def __init__(self, obj, *args):
|
|
self.obj = obj
|
|
|
|
def __lt__(self, other):
|
|
return mycmp(self.obj, other.obj) < 0
|
|
|
|
def __gt__(self, other):
|
|
return mycmp(self.obj, other.obj) > 0
|
|
|
|
def __eq__(self, other):
|
|
return mycmp(self.obj, other.obj) == 0
|
|
|
|
def __le__(self, other):
|
|
return mycmp(self.obj, other.obj) <= 0
|
|
|
|
def __ge__(self, other):
|
|
return mycmp(self.obj, other.obj) >= 0
|
|
|
|
def __ne__(self, other):
|
|
return mycmp(self.obj, other.obj) != 0
|
|
|
|
def __hash__(self):
|
|
raise TypeError('hash not implemented')
|
|
|
|
return K
|
|
|
|
|
|
def decode_list(ilist):
|
|
""" Decodes the elements of a list if needed
|
|
"""
|
|
|
|
dlist = []
|
|
for elem in ilist:
|
|
if not isinstance(elem, str):
|
|
dlist.append(decode_it(elem))
|
|
else:
|
|
dlist.append(elem)
|
|
return dlist
|
|
|
|
|
|
def decode_it(obj):
|
|
"""Decode the given object unless it is a str.
|
|
|
|
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 isinstance(obj, str) or not hasattr(obj, 'decode'):
|
|
return obj
|
|
try:
|
|
return obj.decode('utf-8')
|
|
except UnicodeDecodeError:
|
|
return obj.decode('latin-1')
|
|
|
|
|
|
def raw_input(*args):
|
|
try:
|
|
import builtins
|
|
func = builtins.input
|
|
except ImportError:
|
|
#python 2.7
|
|
import __builtin__
|
|
func = __builtin__.raw_input
|
|
|
|
try:
|
|
return func(*args)
|
|
except EOFError:
|
|
# interpret ctrl-d as user abort
|
|
raise oscerr.UserAbort()
|
|
|
|
|
|
def _html_escape(data):
|
|
return html.escape(data, quote=False)
|