Skip to content

Commit 5a5577d

Browse files
yangskyboxlabsgitster
authored andcommitted
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 <[email protected]> Reviewed-by: Ben Keene <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d38208a commit 5a5577d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

git-p4.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,14 +1395,14 @@ def getUserMapFromPerforceServer(self):
13951395
for (key, val) in self.users.items():
13961396
s += "%s\t%s\n" % (key.expandtabs(1), val.expandtabs(1))
13971397

1398-
open(self.getUserCacheFilename(), "wb").write(s)
1398+
open(self.getUserCacheFilename(), 'w').write(s)
13991399
self.userMapFromPerforceServer = True
14001400

14011401
def loadUserMapFromCache(self):
14021402
self.users = {}
14031403
self.userMapFromPerforceServer = False
14041404
try:
1405-
cache = open(self.getUserCacheFilename(), "rb")
1405+
cache = open(self.getUserCacheFilename(), 'r')
14061406
lines = cache.readlines()
14071407
cache.close()
14081408
for line in lines:

0 commit comments

Comments
 (0)