summaryrefslogtreecommitdiffstats
path: root/Lib/packaging
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-09-19 14:21:37 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-09-19 14:21:37 (GMT)
commit1cbd2ab4044dbef8e1c7cb0b694f30049f42e7f6 (patch)
tree9b15764cdc5a7e8ee5d3692516a5cf4c1f15b37c /Lib/packaging
parentbecf1c58572f29d4f35f448194e3ef9c535e3be0 (diff)
downloadcpython-1cbd2ab4044dbef8e1c7cb0b694f30049f42e7f6.zip
cpython-1cbd2ab4044dbef8e1c7cb0b694f30049f42e7f6.tar.gz
cpython-1cbd2ab4044dbef8e1c7cb0b694f30049f42e7f6.tar.bz2
Avoid matching '' or 'yn' when asking for 'y' or 'n' in interactive code
Diffstat (limited to 'Lib/packaging')
-rw-r--r--Lib/packaging/command/register.py2
-rw-r--r--Lib/packaging/create.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/packaging/command/register.py b/Lib/packaging/command/register.py
index 67cda80..59805f7 100644
--- a/Lib/packaging/command/register.py
+++ b/Lib/packaging/command/register.py
@@ -178,7 +178,7 @@ Your selection [default 1]: ''')
'will be faster.\n(the login will be stored in %s)',
get_pypirc_path())
choice = 'X'
- while choice.lower() not in 'yn':
+ while choice.lower() not in ('y', 'n'):
choice = input('Save your login (y/N)?')
if not choice:
choice = 'n'
diff --git a/Lib/packaging/create.py b/Lib/packaging/create.py
index 34a8c82..59b448d 100644
--- a/Lib/packaging/create.py
+++ b/Lib/packaging/create.py
@@ -121,7 +121,7 @@ def ask_yn(question, default=None, helptext=None):
question += ' (y/n)'
while True:
answer = ask(question, default, helptext, required=True)
- if answer and answer[0].lower() in 'yn':
+ if answer and answer[0].lower() in ('y', 'n'):
return answer[0].lower()
print('\nERROR: You must select "Y" or "N".\n')