diff --git a/vdirsyncer/utils/__init__.py b/vdirsyncer/utils/__init__.py index 246c2ec..b8197e5 100644 --- a/vdirsyncer/utils/__init__.py +++ b/vdirsyncer/utils/__init__.py @@ -11,7 +11,7 @@ import os import requests from .. import log, exceptions -from .compat import urlparse +from .compat import urlparse, get_raw_input logger = log.get(__name__) @@ -164,7 +164,7 @@ def get_password(username, resource): answer = None while answer not in ['', 'y', 'n']: prompt = 'Save this password in the keyring? [y/N] ' - answer = raw_input(prompt).lower() + answer = get_raw_input(prompt).lower() if answer == 'y': keyring.set_password(password_key_prefix + resource, username, password) diff --git a/vdirsyncer/utils/compat.py b/vdirsyncer/utils/compat.py index 94dc822..cdc03f6 100644 --- a/vdirsyncer/utils/compat.py +++ b/vdirsyncer/utils/compat.py @@ -20,6 +20,7 @@ if PY2: text_type = unicode # flake8: noqa iteritems = lambda x: x.iteritems() itervalues = lambda x: x.itervalues() + get_raw_input = raw_input else: import urllib.parse as urlparse urlquote_plus = urlparse.quote_plus @@ -27,3 +28,4 @@ else: text_type = str iteritems = lambda x: x.items() itervalues = lambda x: x.values() + get_raw_input = input