summaryrefslogtreecommitdiff
path: root/django/contrib/auth
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2012-08-08 19:08:05 +0200
committerClaude Paroz <claude@2xlibre.net>2012-08-08 19:53:11 +0200
commitb8e49d70f2bbbb9008dbbf9d8b0dee46dcf25fa6 (patch)
tree03dc8a308b318573351616c42f4c74d370f6ffea /django/contrib/auth
parentb1517a310a0a9aa416bc479397d5a7b402be64e2 (diff)
[py3] Replaced raw_input by input
The six addition has been borrowed from: https://bitbucket.org/gutworth/six/changeset/733ef740
Diffstat (limited to 'django/contrib/auth')
-rw-r--r--django/contrib/auth/management/__init__.py5
-rw-r--r--django/contrib/auth/management/commands/createsuperuser.py5
2 files changed, 6 insertions, 4 deletions
diff --git a/django/contrib/auth/management/__init__.py b/django/contrib/auth/management/__init__.py
index 100acb6c5b..7abd2abcf4 100644
--- a/django/contrib/auth/management/__init__.py
+++ b/django/contrib/auth/management/__init__.py
@@ -9,6 +9,7 @@ import unicodedata
from django.contrib.auth import models as auth_app
from django.db.models import get_models, signals
from django.contrib.auth.models import User
+from django.utils.six.moves import input
def _get_permission_codename(action, opts):
@@ -66,10 +67,10 @@ def create_superuser(app, created_models, verbosity, db, **kwargs):
msg = ("\nYou just installed Django's auth system, which means you "
"don't have any superusers defined.\nWould you like to create one "
"now? (yes/no): ")
- confirm = raw_input(msg)
+ confirm = input(msg)
while 1:
if confirm not in ('yes', 'no'):
- confirm = raw_input('Please enter either "yes" or "no": ')
+ confirm = input('Please enter either "yes" or "no": ')
continue
if confirm == 'yes':
call_command("createsuperuser", interactive=True, database=db)
diff --git a/django/contrib/auth/management/commands/createsuperuser.py b/django/contrib/auth/management/commands/createsuperuser.py
index f3f1a7b671..6e0d0bc754 100644
--- a/django/contrib/auth/management/commands/createsuperuser.py
+++ b/django/contrib/auth/management/commands/createsuperuser.py
@@ -12,6 +12,7 @@ from django.contrib.auth.management import get_default_username
from django.core import exceptions
from django.core.management.base import BaseCommand, CommandError
from django.db import DEFAULT_DB_ALIAS
+from django.utils.six.moves import input
from django.utils.translation import ugettext as _
RE_VALID_USERNAME = re.compile('[\w.@+-]+$')
@@ -76,7 +77,7 @@ class Command(BaseCommand):
input_msg = 'Username'
if default_username:
input_msg += ' (leave blank to use %r)' % default_username
- username = raw_input(input_msg + ': ')
+ username = input(input_msg + ': ')
if default_username and username == '':
username = default_username
if not RE_VALID_USERNAME.match(username):
@@ -94,7 +95,7 @@ class Command(BaseCommand):
# Get an email
while 1:
if not email:
- email = raw_input('E-mail address: ')
+ email = input('E-mail address: ')
try:
is_valid_email(email)
except exceptions.ValidationError: