@matheusbsbs / matheus-bagliano / commits / 5a5577d808
Fork 0

git-p4: open .gitp4-usercache.txt in text mode

Opening .gitp4-usercache.txt in text mode makes python 3 happy without explicitly adding encoding and decoding. Signed-off-by: Yang Zhao <yang.zhao@skyboxlabs.com> Reviewed-by: Ben Keene <seraphire@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Yang Zhao committed Dec 13, 2019 at 15:52 UTC 5a5577d808668a7859c5009ddfa18b097368ba2c
1 file changed +2 -2
git-p4.py
+2 -2
@@ -1395,14 +1395,14 @@ class P4UserMap:
1395 for (key, val) in self.users.items():
1396 s += "%s\t%s\n" % (key.expandtabs(1), val.expandtabs(1))
1397
1398 - open(self.getUserCacheFilename(), "wb").write(s)
1398 + open(self.getUserCacheFilename(), 'w').write(s)
1399 self.userMapFromPerforceServer = True
1400
1401 def loadUserMapFromCache(self):
1402 self.users = {}
1403 self.userMapFromPerforceServer = False
1404 try:
1405 - cache = open(self.getUserCacheFilename(), "rb")
1405 + cache = open(self.getUserCacheFilename(), 'r')
1406 lines = cache.readlines()
1407 cache.close()
1408 for line in lines: