diff options
Diffstat (limited to 'gitdb/utils/encoding.py')
| -rw-r--r-- | gitdb/utils/encoding.py | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/gitdb/utils/encoding.py b/gitdb/utils/encoding.py index 4d270af..25ebead 100644 --- a/gitdb/utils/encoding.py +++ b/gitdb/utils/encoding.py @@ -1,31 +1,18 @@ -from gitdb.utils import compat - -if compat.PY3: - string_types = (str, ) - text_type = str -else: - string_types = (basestring, ) - text_type = unicode - - def force_bytes(data, encoding="ascii"): if isinstance(data, bytes): return data - if isinstance(data, string_types): + if isinstance(data, str): return data.encode(encoding) return data def force_text(data, encoding="utf-8"): - if isinstance(data, text_type): + if isinstance(data, str): return data if isinstance(data, bytes): return data.decode(encoding) - if compat.PY3: - return text_type(data, encoding) - else: - return text_type(data) + return str(data, encoding) |
