From 37551b376f57f52e67bf3c45033a99dec8060632 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Sat, 13 Sep 2014 14:56:29 +0200 Subject: [PATCH] Rely on Python 3 to decode stdout. --- vdirsyncer/utils/__init__.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/vdirsyncer/utils/__init__.py b/vdirsyncer/utils/__init__.py index 52d0513..556b2f6 100644 --- a/vdirsyncer/utils/__init__.py +++ b/vdirsyncer/utils/__init__.py @@ -187,15 +187,12 @@ def _password_from_command(username, host): command[0] = expand_path(command[0]) try: - proc = subprocess.Popen(command + [username, host], - stdout=subprocess.PIPE) - password = proc.stdout.read().decode('utf-8').strip() + stdout = subprocess.check_output(command + [username, host], + universal_newlines=True) + return stdout.strip() except OSError as e: logger.warning('Failed to execute command: {}\n{}'. format(' '.join(command), str(e))) - return None - - return password class _FingerprintAdapter(requests.adapters.HTTPAdapter):