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

Fix keyring for Python 3

Browse source
This commit is contained in:
Markus Unterwaditzer 2014-06-11 23:09:25 +02:00
parent 179d9bc393
commit 7d26f7f8fd
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
vdirsyncer/utils/__init__.py
View file

@ -11,7 +11,7 @@ import os
import requests import requests
from .. import log, exceptions from .. import log, exceptions
from .compat import urlparse from .compat import urlparse, get_raw_input
logger = log.get(__name__) logger = log.get(__name__)
@ -164,7 +164,7 @@ def get_password(username, resource):
answer = None answer = None
while answer not in ['', 'y', 'n']: while answer not in ['', 'y', 'n']:
prompt = 'Save this password in the keyring? [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': if answer == 'y':
keyring.set_password(password_key_prefix + resource, keyring.set_password(password_key_prefix + resource,
username, password) username, password)

2
vdirsyncer/utils/compat.py
View file

@ -20,6 +20,7 @@ if PY2:
text_type = unicode # flake8: noqa text_type = unicode # flake8: noqa
iteritems = lambda x: x.iteritems() iteritems = lambda x: x.iteritems()
itervalues = lambda x: x.itervalues() itervalues = lambda x: x.itervalues()
get_raw_input = raw_input
else: else:
import urllib.parse as urlparse import urllib.parse as urlparse
urlquote_plus = urlparse.quote_plus urlquote_plus = urlparse.quote_plus
@ -27,3 +28,4 @@ else:
text_type = str text_type = str
iteritems = lambda x: x.items() iteritems = lambda x: x.items()
itervalues = lambda x: x.values() itervalues = lambda x: x.values()
get_raw_input = input