From b71d61d34e71d6a0f6a92355d6b6d4e91d9498fe Mon Sep 17 00:00:00 2001 From: Rostislav Krasny Date: Fri, 24 Jan 2020 22:29:54 +0200 Subject: [PATCH] Make _preserve_encoding in platform_utils_win32 compatible with Python 3 Bug: https://crbug.com/gerrit/12145 Change-Id: I01d1ef96ff7b474f55ed42ecc13bd5943006d3b5 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/251833 Reviewed-by: Mike Frysinger Tested-by: Rostislav Krasny --- platform_utils_win32.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/platform_utils_win32.py b/platform_utils_win32.py index 31e00c1..b5c21fe 100644 --- a/platform_utils_win32.py +++ b/platform_utils_win32.py @@ -16,6 +16,7 @@ import errno +from pyversion import is_python3 from ctypes import WinDLL, get_last_error, FormatError, WinError, addressof from ctypes import c_buffer from ctypes.wintypes import BOOL, BOOLEAN, LPCWSTR, DWORD, HANDLE, POINTER, c_ubyte @@ -208,6 +209,10 @@ def readlink(path): def _preserve_encoding(source, target): """Ensures target is the same string type (i.e. unicode or str) as source.""" + + if is_python3(): + return target + if isinstance(source, unicode): return unicode(target) return str(target)