|
|
@ -283,7 +283,10 @@ class process(StdoutableProcess):
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
for line in self.readByLine():
|
|
|
|
for line in self.readByLine():
|
|
|
|
pass
|
|
|
|
pass
|
|
|
|
return self.cacheresult.decode(encoding="UTF-8")
|
|
|
|
try:
|
|
|
|
|
|
|
|
return self.cacheresult.decode(encoding="UTF-8")
|
|
|
|
|
|
|
|
except UnicodeDecodeError as e:
|
|
|
|
|
|
|
|
return self.cacheresult.decode(encoding="UTF-16")
|
|
|
|
except KeyboardInterrupt:
|
|
|
|
except KeyboardInterrupt:
|
|
|
|
self.kill()
|
|
|
|
self.kill()
|
|
|
|
raise KeyboardInterrupt
|
|
|
|
raise KeyboardInterrupt
|
|
|
|