summaryrefslogtreecommitdiff
path: root/django/contrib/auth
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-07-20 16:16:57 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-07-22 09:29:56 +0200
commitca07fda2efea24cb43423b884fa4648d44e52963 (patch)
tree5c172bf2155b58e380363d3e82ca2ef14afd163f /django/contrib/auth
parent0d914d08a0d7b5a1521f498a8047971fe6cd61e7 (diff)
[py3] Switched to Python 3-compatible imports.
xrange/range will be dealt with in a separate commit due to the huge number of changes.
Diffstat (limited to 'django/contrib/auth')
-rw-r--r--django/contrib/auth/tests/basic.py6
-rw-r--r--django/contrib/auth/tests/management.py3
2 files changed, 4 insertions, 5 deletions
diff --git a/django/contrib/auth/tests/basic.py b/django/contrib/auth/tests/basic.py
index 4c2e8cd8aa..21acb2004f 100644
--- a/django/contrib/auth/tests/basic.py
+++ b/django/contrib/auth/tests/basic.py
@@ -1,8 +1,8 @@
-from django.test import TestCase
-from django.utils.unittest import skipUnless
from django.contrib.auth.models import User, AnonymousUser
from django.core.management import call_command
-from StringIO import StringIO
+from django.test import TestCase
+from django.utils.six import StringIO
+from django.utils.unittest import skipUnless
try:
import crypt as crypt_module
diff --git a/django/contrib/auth/tests/management.py b/django/contrib/auth/tests/management.py
index 8d1f7c7965..c98b7491c8 100644
--- a/django/contrib/auth/tests/management.py
+++ b/django/contrib/auth/tests/management.py
@@ -1,11 +1,10 @@
from __future__ import unicode_literals
-from StringIO import StringIO
-
from django.contrib.auth import models, management
from django.contrib.auth.management.commands import changepassword
from django.core.management.base import CommandError
from django.test import TestCase
+from django.utils.six import StringIO
class GetDefaultUsernameTestCase(TestCase):