--HG--
branch : pmacs2
This commit is contained in:
~d6 2020-09-04 00:03:00 -04:00
parent 15d4e61f65
commit da30e73ed1
3 changed files with 12 additions and 8 deletions

View File

@ -5,7 +5,10 @@ class DataBuffer(Buffer):
def __init__(self, name, data): def __init__(self, name, data):
Buffer.__init__(self) Buffer.__init__(self)
self._name = name self._name = name
self.lines = data.split("\n") if type(data) == bytes:
self.lines = data.decode('UTF-8').split('\n')
else:
self.lines = data.split("\n")
def name(self): def name(self):
return self._name return self._name
def close(self): def close(self):

View File

@ -186,7 +186,7 @@ class GitBlame(VcBlame):
if not m: if not m:
raise VcException("couldn't parse %r" % line) raise VcException("couldn't parse %r" % line)
groups = m.groups() groups = m.groups()
fields = [s.decode('UTF-8') for s in groups[:-1]] fields = list(groups[:-1])
del fields[1] del fields[1]
if fields[1] == 'Not Committed Yet': if fields[1] == 'Not Committed Yet':
fields[1] = '' fields[1] = ''

13
util.py
View File

@ -137,12 +137,13 @@ except:
dict.__repr__(self)) dict.__repr__(self))
def decode(s): def decode(s):
for coding in ('utf-8', 'latin-1'): return s
try: #for coding in ('utf-8', 'latin-1'):
return s.decode(coding) # try:
except: # return s.decode(coding)
pass # except:
return s.decode('ascii', 'replace') # pass
#return s.decode('ascii', 'replace')
def communicate(cmd, stdin=None, stderr=True, shell=False): def communicate(cmd, stdin=None, stderr=True, shell=False):
if stderr: if stderr: