sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rely on Python 3 to decode stdout.

Browse source
This commit is contained in:
Markus Unterwaditzer 2014-09-13 14:56:29 +02:00
parent 14f7da4e04
commit 37551b376f
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
vdirsyncer/utils/__init__.py
View file

@ -187,15 +187,12 @@ def _password_from_command(username, host):
command[0] = expand_path(command[0]) command[0] = expand_path(command[0])
try: try:
proc = subprocess.Popen(command + [username, host], stdout = subprocess.check_output(command + [username, host],
stdout=subprocess.PIPE) universal_newlines=True)
password = proc.stdout.read().decode('utf-8').strip() return stdout.strip()
except OSError as e: except OSError as e:
logger.warning('Failed to execute command: {}\n{}'. logger.warning('Failed to execute command: {}\n{}'.
format(' '.join(command), str(e))) format(' '.join(command), str(e)))
return None
return password
class _FingerprintAdapter(requests.adapters.HTTPAdapter): class _FingerprintAdapter(requests.adapters.HTTPAdapter):