From: Yang Zhao Date: Thu, 28 Nov 2019 01:28:06 GMT Subject: [RFC PATCH 3/4] git-p4: open .gitp4-usercache.txt in text mode Message-ID: <20191128012807.3103-4-yang.zhao@skyboxlabs.com> In-Reply-To: <20191128012807.3103-1-yang.zhao@skyboxlabs.com> Opening .gitp4-usercache.txt in text mode makes python 3 happy without explicitly adding encoding and decoding. Signed-off-by: Yang Zhao --- git-p4.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-p4.py b/git-p4.py index d79cbf7005..6821d6aafd 100755 --- a/git-p4.py +++ b/git-p4.py @@ -1387,14 +1387,14 @@ def getUserMapFromPerforceServer(self): for (key, val) in self.users.items(): s += "%s\t%s\n" % (key.expandtabs(1), val.expandtabs(1)) - open(self.getUserCacheFilename(), "wb").write(s) + open(self.getUserCacheFilename(), 'w', encoding='utf-8').write(s) self.userMapFromPerforceServer = True def loadUserMapFromCache(self): self.users = {} self.userMapFromPerforceServer = False try: - cache = open(self.getUserCacheFilename(), "rb") + cache = open(self.getUserCacheFilename(), 'r', encoding='utf-8') lines = cache.readlines() cache.close() for line in lines: -- 2.24.0.windows.2