[py3] Switched to Python 3-compatible imports.

xrange/range will be dealt with in a separate commit due to the huge number of changes.

Author: aaugustin

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

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):

django/contrib/gis/db/models/sql/compiler.py

@@ -1,4 +1,4 @@
-from future_builtins import zip
+from django.utils.six.moves import zip
 
 from django.db.backends.util import truncate_name, typecast_timestamp
 from django.db.models.sql import compiler

django/contrib/gis/gdal/tests/test_geom.py

@@ -1,6 +1,6 @@
 from binascii import b2a_hex
 try:
- import cPickle as pickle
+ from django.utils.six.moves import cPickle as pickle
 except ImportError:
  import pickle
 

django/contrib/gis/geos/tests/test_geos.py

@@ -952,7 +952,8 @@ def test_extent(self):
  def test_pickle(self):
  "Testing pickling and unpickling support."
  # Using both pickle and cPickle -- just 'cause.
- import pickle, cPickle
+ from django.utils.six.moves import cPickle
+ import pickle
 
  # Creating a list of test geometries for pickling,
  # and setting the SRID on some of them.

django/contrib/gis/utils/ogrinspect.py

@@ -5,7 +5,7 @@
 
 Author: Travis Pinney, Dane Springmeyer, & Justin Bronn
 """
-from future_builtins import zip
+from django.utils.six.moves import zip
 # Requires GDAL to use.
 from django.contrib.gis.gdal import DataSource
 from django.contrib.gis.gdal.field import OFTDate, OFTDateTime, OFTInteger, OFTReal, OFTString, OFTTime

django/contrib/sessions/backends/base.py

@@ -2,7 +2,7 @@
 import time
 from datetime import datetime, timedelta
 try:
- import cPickle as pickle
+ from django.utils.six.moves import cPickle as pickle
 except ImportError:
  import pickle
 

django/contrib/sessions/backends/signed_cookies.py

@@ -1,5 +1,5 @@
 try:
- import cPickle as pickle
+ from django.utils.six.moves import cPickle as pickle
 except ImportError:
  import pickle
 

django/core/cache/backends/db.py

@@ -4,7 +4,7 @@
 from datetime import datetime
 
 try:
- import cPickle as pickle
+ from django.utils.six.moves import cPickle as pickle
 except ImportError:
  import pickle
 

django/core/cache/backends/filebased.py

@@ -5,7 +5,7 @@
 import shutil
 import time
 try:
- import cPickle as pickle
+ from django.utils.six.moves import cPickle as pickle
 except ImportError:
  import pickle