From 1ea96acaf56acee692fe6f5668644962231be5e1 Mon Sep 17 00:00:00 2001 From: Andrew Godwin Date: Sun, 19 Jan 2014 17:14:31 +0000 Subject: [PATCH] Fix unicode default input on py3 --- django/db/migrations/questioner.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/django/db/migrations/questioner.py b/django/db/migrations/questioner.py index ae75b47d03..d2e63659a2 100644 --- a/django/db/migrations/questioner.py +++ b/django/db/migrations/questioner.py @@ -3,7 +3,7 @@ import os import sys from django.apps import apps -from django.utils import datetime_safe +from django.utils import datetime_safe, six from django.utils.six.moves import input from .loader import MIGRATIONS_MODULE_NAME @@ -97,7 +97,13 @@ class InteractiveMigrationQuestioner(MigrationQuestioner): print("Please enter the default value now, as valid Python") print("The datetime module is available, so you can do e.g. datetime.date.today()") while True: - code = input(">>> ").decode(sys.stdin.encoding) + if six.PY3: + # Six does not correctly abstract over the fact that + # py3 input returns a unicode string, while py2 raw_input + # returns a bytestring. + code = input(">>> ") + else: + code = input(">>> ").decode(sys.stdin.encoding) if not code: print("Please enter some code, or 'exit' (with no quotes) to exit.") elif code == "exit":