Skip to content

Commit

Permalink
git-p4: open .gitp4-usercache.txt in text mode
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
yangskyboxlabs authored and gitster committed Jan 15, 2020
1 parent d38208a commit 5a5577d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions git-p4.py
Original file line number Diff line number Diff line change
Expand Up @@ -1395,14 +1395,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').write(s)
self.userMapFromPerforceServer = True

def loadUserMapFromCache(self):
self.users = {}
self.userMapFromPerforceServer = False
try:
cache = open(self.getUserCacheFilename(), "rb")
cache = open(self.getUserCacheFilename(), 'r')
lines = cache.readlines()
cache.close()
for line in lines:
Expand Down

0 comments on commit 5a5577d

Please sign in to comment.