Skip to content

Fix #116 #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sigmavirus24 merged 1 commit into from
Sep 12, 2015
Merged

Fix #116 #117

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions twine/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from __future__ import absolute_import, division, print_function
from __future__ import unicode_literals

import os
import os.path
import functools
import getpass
Expand Down Expand Up @@ -113,6 +114,14 @@ def get_userpass_value(cli_value, config, key, prompt_strategy):
else:
return prompt_strategy()


def password_prompt(prompt_text): # Always expects unicode for our own sanity
prompt = prompt_text
# Workaround for https://github.com/pypa/twine/issues/116
if os.name == 'nt' and sys.version_info < (3, 0):
prompt = prompt_text.encode('utf8')
return functools.partial(getpass.getpass, prompt=prompt)

get_username = functools.partial(
get_userpass_value,
key='username',
Expand All @@ -121,7 +130,5 @@ def get_userpass_value(cli_value, config, key, prompt_strategy):
get_password = functools.partial(
get_userpass_value,
key='password',
prompt_strategy=functools.partial(
getpass.getpass, 'Enter your password: ',
),
prompt_strategy=password_prompt('Enter your password: '),
)
⚡